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

[GitLab Mirror]

 README                  |   82 ++++++++++++++++++++++++++++++++++++++++++++++--
 configure.ac            |    8 ++--
 fontconfig/fontconfig.h |    2 -
 3 files changed, 85 insertions(+), 7 deletions(-)

New commits:
commit 844d8709a1f3ecab45015b24b72dd775c13b2421
Author: Akira TAGOH <akira at tagoh.org>
Date:   Thu Aug 30 17:20:15 2018 +0900

    Bump version to 2.13.1

diff --git a/README b/README
index 6fae242..fbbc140 100644
--- a/README
+++ b/README
@@ -1,12 +1,90 @@
                               Fontconfig
              Font configuration and customization library
-                             Version 2.13
-                              2018-03-06
+                            Version 2.13.1
+                              2018-08-30
 
 
 Check INSTALL for compilation and installation instructions.
 Report bugs to https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/new.
 
+2.13.1
+
+Akira TAGOH (48):
+      Use the builtin uuid for OSX
+      Fix the build issue again on MinGW with enabling nls
+      Add uuid to Requires.private in .pc only when pkgconfig macro found it
+      Allow the constant names in the range
+      Do not override locale if already set by app
+      Add the value of the constant name to the implicit object in the pattern
+      Add a testcase for FcNameParse
+      Leave the locale setting to applications
+      call setlocale
+      Fix make check fail when srcdir != builddir.
+      Do not ship fcobjshash.h
+      Fix typo in doc
+      Change the emboldening logic again
+      Bug 43367 - RFE: iterator to peek objects in FcPattern
+      Add a testrunner for conf
+      Add a test case for 90-synthetic.conf
+      Bug 106497 - better error description when problem reading font configuration
+      Bug 106459 - fc-cache doesn't use -y option for .uuid files
+      Fix leaks
+      Fix -Wstringop-truncation warning
+      Fix double-free
+      Add a test case for bz#106618
+      Update CaseFolding.txt to Unicode 11
+      Remove .uuid when no font files exists on a directory
+      Fix the leak of file handle
+      Fix memory leak
+      Fix memory leaks
+      Fix memory leak
+      Fix memory leak
+      Fix memory leak
+      Fix unterminated string issue
+      Fix array access in a null pointer dereference
+      Fix access in a null pointer dereference
+      do not pass null pointer to memcpy
+      Fix dereferencing null pointer
+      Fix a typo
+      Fix possibly dereferencing a null pointer
+      Fix allocating insufficient memory for terminating null of the string
+      Make a call fail on ENOMEM
+      Allocate sufficient memory to terminate with null
+      Drop the redundant code
+      Fix memory leak
+      Fix the build issue with gperf
+      Fix missing closing bracket in FcStrIsAbsoluteFilename()
+      Update the issue tracker URL
+      Fix distcheck fail
+      Add .gitlab-ci.yml
+      Bump the libtool revision
+
+Alexander Larsson (3):
+      Add FcCacheAllocate() helper
+      Cache: Rewrite relocated paths in earlier
+      Cache: Remove alias_table
+
+Behdad Esfahbod (4):
+      Minor: fix warnings
+      Fix name scanning
+      Share name-mapping across instances
+      Use FT_HAS_COLOR
+
+Chris Lamb (1):
+      Ensure cache checksums are deterministic
+
+Matthieu Herrb (1):
+      FcCacheFindByStat(): fix checking of nanoseconds field.
+
+Tom Anderson (7):
+      Fix undefined-shift UBSAN errors
+      Use realfilename for FcOpen in _FcConfigParse
+      Add FONTCONFIG_SYSROOT environment variable
+      Fix CFI builds
+      Fix heap use-after-free
+      Return canonicalized paths from FcConfigRealFilename
+      Fix build with CFLAGS="-std=c11 -D_GNU_SOURCE"
+
 2.13
 
 Akira TAGOH (4):
diff --git a/configure.ac b/configure.ac
index 11d1556..fb8af46 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.0], [https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/new])
+AC_INIT([fontconfig], [2.13.1], [https://gitlab.freedesktop.org/fontconfig/fontconfig/issues/new])
 AM_INIT_AUTOMAKE([1.11 parallel-tests dist-bzip2])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 045814f..bac1dda 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	0
+#define FC_REVISION	1
 
 #define FC_VERSION	((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))
 
commit e62b92231874c1a6c3e2ab9e1019a95db22ea08f
Author: Akira TAGOH <akira at tagoh.org>
Date:   Thu Aug 30 07:04:08 2018 +0000

    Bump the libtool revision

diff --git a/configure.ac b/configure.ac
index d48b83b..11d1556 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,11 +72,11 @@ dnl libtool versioning
 dnl bump revision when fixing bugs
 dnl bump current and age, reset revision to zero when adding APIs
 dnl bump current, leave age, reset revision to zero when changing/removing APIS
-LIBT_CURRENT=12
-LIBT_REVISION=1
+LIBT_CURRENT=13
+LIBT_REVISION=0
 AC_SUBST(LIBT_CURRENT)
 AC_SUBST(LIBT_REVISION)
-LIBT_AGE=11
+LIBT_AGE=12
 
 LIBT_VERSION_INFO="$LIBT_CURRENT:$LIBT_REVISION:$LIBT_AGE"
 AC_SUBST(LIBT_VERSION_INFO)