README | 37 +++++++++++++++++++++++++++++++++++--
configure.ac | 6 +++---
fc-blanks/Makefile.am | 1 +
fontconfig/fontconfig.h | 2 +-
src/fcblanks.c | 2 +-
5 files changed, 41 insertions(+), 7 deletions(-)
New commits:
commit 69ff6b6e260584e383c38b1b7034ddcbb23d214f
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Mon Mar 9 12:22:40 2015 +0900
Bump version to 2.11.93
diff --git a/README b/README
index 6ac1644..4a4dc30 100644
--- a/README
+++ b/README
@@ -1,12 +1,45 @@
Fontconfig
Font configuration and customization library
- Version 2.11.92 (2.12 RC2)
- 2015-01-13
+ Version 2.11.93 (2.12 RC3)
+ 2015-03-09
Check INSTALL for compilation and installation instructions.
Report bugs to https://bugs.freedesktop.org in the fontconfig module.
+2.11.93 (2.12 RC3)
+
+Akira TAGOH (18):
+ Fix a typo in docs
+ Add pkg.m4 to git
+ Fix a build fail on some non-POSIX platforms
+ ifdef'd the unnecessary code for win32
+ Fix pointer cast warning on win32
+ filter can be null
+ Copy the real size of struct dirent
+ Rework again to copy the struct dirent
+ Hardcode the blanks in the library
+ Update the script to recognize the escaped space
+ Fix a build issue when $(srcdir) != $(builddir)
+ Don't add FC_LANG when it has "und"
+ Fix the array allocation
+ Improve the performance on searching blanks
+ Fix a segfault when OOM happened.
+ Fix a bug in the previous change forFcBlanksIsMember()
+ Fix an infinite loop in FcBlanksIsMember()
+ Fix a trivial bug for dist
+
+Alan Coopersmith (1):
+ Fix configure to work with Solaris Studio compilers
+
+Behdad Esfahbod (3):
+ Fix symbol cmap handling
+ Remove dead code after previous commit
+ Simplify some more
+
+Michael Haubenwallner (1):
+ Ensure config.h is included first, bug#89336.
+
2.11.92 (2.12 RC2)
Akira TAGOH (1):
diff --git a/configure.ac b/configure.ac
index 8f0150e..bb98804 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.92], [https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig])
+AC_INIT([fontconfig], [2.11.93], [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])])
@@ -73,11 +73,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=9
+LIBT_CURRENT=10
LIBT_REVISION=0
AC_SUBST(LIBT_CURRENT)
AC_SUBST(LIBT_REVISION)
-LIBT_AGE=8
+LIBT_AGE=9
LIBT_VERSION_INFO="$LIBT_CURRENT:$LIBT_REVISION:$LIBT_AGE"
AC_SUBST(LIBT_VERSION_INFO)
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 600ed68..b14c961 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -52,7 +52,7 @@ typedef int FcBool;
#define FC_MAJOR 2
#define FC_MINOR 11
-#define FC_REVISION 92
+#define FC_REVISION 93
#define FC_VERSION ((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))
commit b75d809d1298b791f39596170950597bcfe98dd6
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Mon Mar 9 12:22:30 2015 +0900
Fix a trivial bug for dist
diff --git a/fc-blanks/Makefile.am b/fc-blanks/Makefile.am
index 5b97000..e9de1fe 100644
--- a/fc-blanks/Makefile.am
+++ b/fc-blanks/Makefile.am
@@ -32,6 +32,7 @@ $(BLANKS_H): $(TMPL) $(BLANKSPY)
mv $(BLANKS_H).tmp $(BLANKS_H) || ($(RM) $(BLANKS_H).tmp && false)
EXTRA_DIST = \
+ $(BLANKSPY) \
$(BLANKS_H) \
$(TMPL) \
$(NULL)
commit f5b1e0ab97daa0e08af8d667cabb700bb73da568
Author: Akira TAGOH <akira@xxxxxxxxx>
Date: Mon Mar 9 12:18:03 2015 +0900
Fix an infinite loop in FcBlanksIsMember()
diff --git a/src/fcblanks.c b/src/fcblanks.c
index 9ac0d5b..5132a51 100644
--- a/src/fcblanks.c
+++ b/src/fcblanks.c
@@ -93,7 +93,7 @@ FcBlanksIsMember (FcBlanks *b, FcChar32 ucs4)
middle = (lower + higher) / 2;
if (b->blanks[middle] == ucs4)
return FcTrue;
- if (lower == higher)
+ if (lower >= higher)
break;
if (b->blanks[middle] < ucs4)
lower = middle + 1;
_______________________________________________
Fontconfig mailing list
Fontconfig@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/fontconfig
