[Fontconfig] fontconfig: Branch 'main'

[GitLab Mirror]

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

New commits:
commit c45e09df1ef235d653d56aef05012f6a3cc57979
Author: Akira TAGOH <akira at tagoh.org>
Date:   Fri Oct 21 14:14:03 2022 +0900

    Bump version to 2.14.1

diff --git a/README b/README
index de11761..4db2ff4 100644
--- a/README
+++ b/README
@@ -1,12 +1,56 @@
                               Fontconfig
              Font configuration and customization library
-                             Version 2.14
-                              2022-03-31
+                            Version 2.14.1
+                              2022-10-21
 
 
 Check INSTALL for compilation and installation instructions.
 Report bugs to https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/new.
 
+2.14.1
+
+Akira TAGOH (6):
+      Use the latest stable release image for CI for mingw
+      Real fix of 91114d18c
+      Fix test cases for wrong use of remap-dir
+      Add back sort command
+      Add config files to enable/disable antialias
+      Enable 10-sub-pixel-rgb.conf by default
+
+Alan Coopersmith (1):
+      Bump the cache version to 8 in doc/fontconfig-user.sgml
+
+Jeremy Huddleston Sequoia (3):
+      meson: Fix linking libexpat on darwin
+      meson: Use fc_templatedir and fc_baseconfigdir are used when installing configs
+      meson: Use fc_configdir where appropriate during build
+
+NorwayFun (4):
+      add Georgian
+      add Georgian
+      po: add Georgian translation
+      po: Add Georgian translation
+
+Sam James (1):
+      configure.ac: allow disabling docbook
+
+Taylor R Campbell (1):
+      Avoid misuse of ctype(3)
+
+Tim-Philipp Müller (7):
+      meson: add 'default-hinting' option
+      meson: add 'default-fonts-dirs' option
+      meson: add 'additional-fonts-dirs' option
+      meson: add 'cache-dir' option
+      meson: add 'template-dir', 'baseconfig-dir', 'config-dir', and 'xml-dir' options
+      ci: update windows image to a 2022-server based one
+      ci: update macOS image
+
+Xavier Claessens (3):
+      meson: Do not run fc-cache when installing into a DESTDIR
+      meson: Fix configuration warnings
+      link_confs.py: Fix prepending DESTDIR to absolute path
+
 2.14
 
 Alan Coopersmith (1):
diff --git a/configure.ac b/configure.ac
index 2992138..60871dc 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.0], [https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/new])
+AC_INIT([fontconfig], [2.14.1], [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 e5e7445..09292a3 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	0
+#define FC_REVISION	1
 
 #define FC_VERSION	((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))
 
diff --git a/meson.build b/meson.build
index a9ec544..6453d8c 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('fontconfig', 'c',
-  version: '2.14.0',
+  version: '2.14.1',
   meson_version : '>= 0.57.0',
   default_options: [ 'buildtype=debugoptimized'],
 )