[Fontconfig] fontconfig: Branch 'master' - 5 commits

[GitLab Mirror]

 README                  |   29 +++++++++++++++++++++++++++--
 configure.ac            |    4 +++-
 doc/Makefile.am         |    2 --
 fontconfig/fontconfig.h |    2 +-
 meson.build             |    2 +-
 new-version.sh          |    2 ++
 6 files changed, 34 insertions(+), 7 deletions(-)

New commits:
commit 68e6ab544c5b9ced0bf017e7b3b1d961604b04cc
Author: Akira TAGOH <akira at tagoh.org>
Date:   Sat Nov 28 11:19:07 2020 +0900

    Update version in meson.build to sync up with configure.ac

diff --git a/meson.build b/meson.build
index debdcef..37f46a1 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('fontconfig', 'c',
-  version: '2.13.91',
+  version: '2.13.92',
   meson_version : '>= 0.50.0',
   default_options: [ 'buildtype=debugoptimized'],
 )
commit 4c2497b51169a241d5b18f00530c6479a8fa3ecc
Author: Akira TAGOH <akira at tagoh.org>
Date:   Sat Nov 28 11:11:46 2020 +0900

    new-version.sh: update version in meson.build

diff --git a/new-version.sh b/new-version.sh
index eecfd81..ab51054 100644
--- a/new-version.sh
+++ b/new-version.sh
@@ -49,6 +49,8 @@ sed -i fontconfig/fontconfig.h \
 	-e "/^#define FC_MINOR/s/[0-9][0-9]*/$minor/" \
 	-e "/^#define FC_REVISION/s/[0-9][0-9]*/$revision/"
 
+sed -i meson.build -e "/version: /s/2\.[0-9.]*/$version/"
+
 #
 # Compute pretty form of new version number
 #
commit 98764d54a7f56e11886c1d280b2613a959a6e52b
Author: Akira TAGOH <akira at tagoh.org>
Date:   Sat Nov 28 10:52:12 2020 +0900

    Update README that missed changes mistakenly

diff --git a/README b/README
index 6a0baab..e0b92df 100644
--- a/README
+++ b/README
@@ -1,12 +1,37 @@
                               Fontconfig
              Font configuration and customization library
-                      Version 2.13.91 (2.14 RC1)
-                              2019-06-10
+                      Version 2.13.92 (2.14 RC2)
+                              2019-08-09
 
 
 Check INSTALL for compilation and installation instructions.
 Report bugs to https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/new.
 
+2.13.92 (2.14 RC2)
+
+Akira TAGOH (18):
+      Fix a typo on masking face id
+      Don't clean up pre-built docs if no docbook installed.
+      Fix obtaining real path from pre-defined names for Win32
+      Fix a crash when running with FC_DEBUG=256
+      Improve the performance a bit
+      Fix a typo
+      Add English name first into a cache
+      FcConfigParseAndLoad*() should returns false on config errors
+      Clean up temporary directory for tests
+      Add docs for missing properties
+      Fix the fail on fc-cache
+      Fix memory leaks
+      Fix a memory leak in FcFreeTypeQuery*()
+      Add 35-lang-normalize.conf
+      Add FC_FONT_HAS_HINT property to see if font has hinting or not.
+      Fix failing the check of prep table in some fonts
+      Fix the fails of make check when SOURCE_DATE_EPOCH is set
+      Improve the performance a bit
+
+Egmont Koblinger (1):
+      Fix the linear interpolation during weight mapping
+
 2.13.91 (2.14 RC1)
 
 Akira TAGOH (74):
diff --git a/configure.ac b/configure.ac
index b759f5f..1b3496d 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.13.91], [https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/new])
+AC_INIT([fontconfig], [2.13.92], [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 50ecdf8..37bf653 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -53,7 +53,7 @@ typedef int		FcBool;
 
 #define FC_MAJOR	2
 #define FC_MINOR	13
-#define FC_REVISION	91
+#define FC_REVISION	92
 
 #define FC_VERSION	((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))
 
commit 776d09dbaf99780ea9ed4d88ec7f83d335c81fb7
Author: Akira TAGOH <akira at tagoh.org>
Date:   Sat Nov 28 10:46:09 2020 +0900

    Initialize shell variables to be sure

diff --git a/configure.ac b/configure.ac
index de6d810..b759f5f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,6 +90,8 @@ PKGCONFIG_REQUIRES_PRIVATELY=
 
 dnl ==========================================================================
 AC_CANONICAL_HOST
+os_win32=no
+os_darwin=no
 case "${host_os}" in
 	cygwin*|mingw*)
 		os_win32=yes
commit b80cd57fda4bc42af065b69327fab08f3ad1d997
Author: Akira TAGOH <akira at tagoh.org>
Date:   Sat Nov 28 10:45:10 2020 +0900

    Drop duplicated BUILT_SOURCES in doc/Makefile.am

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 02831b1..401c1b3 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -59,8 +59,6 @@ CLEANFILES =			\
 	confdir.sgml		\
 	func.refs		\
 	$(NULL)
-BUILT_SOURCES =			\
-	$(NULL)
 SUFFIXES =	\
 	.fncs	\
 	.sgml	\