summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkira TAGOH <akira@tagoh.org>2017-09-21 17:06:17 +0900
committerAkira TAGOH <akira@tagoh.org>2017-09-21 17:06:17 +0900
commitb546940435ebfb0df575bc7a2350d1e913919c34 (patch)
tree912fd72edfac5517dadf245ad409aaf710b30be0
parentfc08a0e9af8a5cd8b2c75d316102acc78427d9bf (diff)
Bump version to 2.12.62.12.6
-rw-r--r--README22
-rw-r--r--configure.ac2
-rw-r--r--fontconfig/fontconfig.h2
3 files changed, 22 insertions, 4 deletions
diff --git a/README b/README
index 40f807c..6f36f05 100644
--- a/README
+++ b/README
@@ -1,12 +1,30 @@
Fontconfig
Font configuration and customization library
- Version 2.12.5
- 2017-09-09
+ Version 2.12.6
+ 2017-09-21
Check INSTALL for compilation and installation instructions.
Report bugs to https://bugs.freedesktop.org in the fontconfig module.
+2.12.6
+
+Akira TAGOH (4):
+ und_zsye.orth: polish to get for NotoEmoji-Regular.ttf
+ Revert "Keep the same behavior to the return value of FcConfigParseAndLoad"
+ Fix again to keep the same behavior to the return value of FcConfigParseAndLoad
+ Update libtool revision
+
+Behdad Esfahbod (2):
+ Minor
+ [fc-query] Fix linking order
+
+David Kaspar [Dee'Kej] (1):
+ conf.d: Drop aliases for (URW)++ fonts
+
+Florian Müllner (1):
+ build: Remove references to deleted file
+
2.12.5
Akira TAGOH (17):
diff --git a/configure.ac b/configure.ac
index c9eb058..1c7652e 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.12.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig])
+AC_INIT([fontconfig], [2.12.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig])
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 ecc1d90..58bc3e2 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -53,7 +53,7 @@ typedef int FcBool;
#define FC_MAJOR 2
#define FC_MINOR 12
-#define FC_REVISION 5
+#define FC_REVISION 6
#define FC_VERSION ((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))