[Fontconfig] fontconfig: Branch 'main'

[GitLab Mirror]

 README                  |   36 ++++++++++++++++++++++++++++++++++--
 configure.ac            |    2 +-
 fontconfig/fontconfig.h |    2 +-
 meson.build             |    2 +-
 4 files changed, 37 insertions(+), 5 deletions(-)

New commits:
commit 311f6caaa8ad251b04127b4cf394b2116ad81879
Author: Akira TAGOH <akira at tagoh.org>
Date:   Fri Jan 27 14:46:22 2023 +0900

    Bump version to 2.14.2

diff --git a/README b/README
index 6c2bf6b..4bf4d18 100644
--- a/README
+++ b/README
@@ -1,12 +1,44 @@
                               Fontconfig
              Font configuration and customization library
-                            Version 2.14.1
-                              2022-10-21
+                            Version 2.14.2
+                              2023-01-27
 
 
 Check INSTALL for compilation and installation instructions.
 Report bugs to https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/new.
 
+2.14.2
+
+Akira TAGOH (13):
+      Fix the build issue on meson when -g option is added to c_args
+      Store artifacts for meson windows CI
+      Add FC_DESKTOP_NAME property
+      Add --with-default-sub-pixel-rendering option
+      Update po-conf/POTFILES.in
+      Ignore null pointer on Fc*Destroy functions
+      Convert tabs to spaces
+      Convert more tabs to spaces in docs
+      src/meson.build: Store correct paths to fontconfig.pc.
+      Fix a typo in description for HAVE_STDATOMIC_PRIMITIVES
+      Report more detailed logs instead of assertion.
+      Add some missing constant names for weight.
+      Adujst indentation between programlisting in fontconfig-user.sgml
+
+Christopher Degawa (1):
+      meson: modify gperf test to remove sh dependency
+
+Jason Francis (1):
+      meson: Update freetype2 git repository to upstream
+
+Jean Abou Samra (1):
+      Ignore LC_CTYPE if set to "UTF-8"
+
+Ondrej Balaz (1):
+      Expand ~ in glob
+
+lilinjie (1):
+      fix typo
+
 2.14.1
 
 Akira TAGOH (6):
diff --git a/configure.ac b/configure.ac
index 0c83ce0..f9a2c36 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@ dnl This is the package version number, not the shared library
 dnl version.  This same version number must appear in fontconfig/fontconfig.h
 dnl Yes, it is a pain to synchronize version numbers.  Unfortunately, it's
 dnl not possible to extract the version number here from fontconfig.h
-AC_INIT([fontconfig], [2.14.1], [https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/new])
+AC_INIT([fontconfig], [2.14.2], [https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/new])
 AM_INIT_AUTOMAKE([1.11 parallel-tests dist-xz])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index bb258a4..bd2daff 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -53,7 +53,7 @@ typedef int		FcBool;
 
 #define FC_MAJOR	2
 #define FC_MINOR	14
-#define FC_REVISION	1
+#define FC_REVISION	2
 
 #define FC_VERSION	((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))
 
diff --git a/meson.build b/meson.build
index 13ecbed..a415d39 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('fontconfig', 'c',
-  version: '2.14.1',
+  version: '2.14.2',
   meson_version : '>= 0.57.0',
   default_options: [ 'buildtype=debugoptimized'],
 )