summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkira TAGOH <akira@tagoh.org>2016-06-15 20:10:38 +0900
committerAkira TAGOH <akira@tagoh.org>2016-06-15 20:10:38 +0900
commit505712d1dcc52d410aa37cd2cffbc4ceb5048656 (patch)
tree93870974d97845a39aa43262d1c673d2a679d9de
parentadd5f7329f2c54304c203e818f38867de3c1e292 (diff)
Bump version to 2.12.02.12.0
-rw-r--r--README22
-rw-r--r--configure.ac2
-rw-r--r--fontconfig/fontconfig.h4
3 files changed, 23 insertions, 5 deletions
diff --git a/README b/README
index c3ec5b84..6ebca65f 100644
--- a/README
+++ b/README
@@ -1,12 +1,30 @@
Fontconfig
Font configuration and customization library
- Version 2.11.95 (2.12 RC5)
- 2016-04-06
+ Version 2.12
+ 2016-06-15
Check INSTALL for compilation and installation instructions.
Report bugs to https://bugs.freedesktop.org in the fontconfig module.
+2.12
+
+Akira TAGOH (8):
+ Modernize fc-blanks.py
+ Update URL
+ Bug 95477 - FcAtomicLock fails when SELinux denies link() syscall with EACCES
+ 45-latin.conf: Add some Windows fonts to categorize them properly
+ Correct one for the previous change
+ Bug 95481 - Build fails on Android due to broken lconv struct
+ Add the static raw data to generate fcblanks.h
+ Remove unused code
+
+Erik de Castro Lopo (1):
+ Fix a couple of minor memory leaks
+
+Petr Filipsky (1):
+ Fix memory leak in FcDirCacheLock
+
2.11.95 (2.12 RC5)
Akira TAGOH (22):
diff --git a/configure.ac b/configure.ac
index 01013579..f8dadf15 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.11.95], [https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig])
+AC_INIT([fontconfig], [2.12.0], [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 d6dd3e93..e7604027 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -51,8 +51,8 @@ typedef int FcBool;
*/
#define FC_MAJOR 2
-#define FC_MINOR 11
-#define FC_REVISION 95
+#define FC_MINOR 12
+#define FC_REVISION 0
#define FC_VERSION ((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))