randrproto fontconfig libX11 libXdmcp libxcb mesa xkbcomp xserver git update 22 Mar 2015

xserver          commit 0a78b599b34cc8b5fe6fe82f90e90234e8ab7a56
libxcb           commit a90be9955d2c5a635f791d44db1154633b9d3322
libX11           commit 5a499ca7b064bf7e6a4fcc169f22862dce0c60c5
libXdmcp         commit 0c09444d276fbf46a0e8b427a4f6a325d0625742
xkbcomp          commit fc3e6ddb2c8e922ea80f2dc5cbc1df2102e30d99
randrproto       commit b1ba68df8a5fc113a387123ec2f312195e28e47f
fontconfig       commit 69ff6b6e260584e383c38b1b7034ddcbb23d214f
mesa             commit 397b491173f0d2df4deb44d21c170bf16840d507

6 files changed, 43 insertions, 8 deletions

diff --git a/fontconfig/README b/fontconfig/README
index 6ac164469..4a4dc307b 100644
--- a/fontconfig/README
+++ b/fontconfig/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/fontconfig/configure.ac b/fontconfig/configure.ac
index 8f0150ef5..bb9880487 100644
--- a/fontconfig/configure.ac
+++ b/fontconfig/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/fc-blanks/Makefile.am b/fontconfig/fc-blanks/Makefile.am
index 5b9700031..e9de1fe16 100644
--- a/fontconfig/fc-blanks/Makefile.am
+++ b/fontconfig/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)
diff --git a/fontconfig/fontconfig/fontconfig.h b/fontconfig/fontconfig/fontconfig.h
index 600ed6881..b14c9616c 100644
--- a/fontconfig/fontconfig/fontconfig.h
+++ b/fontconfig/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))
 
diff --git a/fontconfig/src/fcblanks.c b/fontconfig/src/fcblanks.c
index f163a8f40..5132a510f 100644
--- a/fontconfig/src/fcblanks.c
+++ b/fontconfig/src/fcblanks.c
@@ -93,8 +93,7 @@ FcBlanksIsMember (FcBlanks *b, FcChar32 ucs4)
 	middle = (lower + higher) / 2;
 	if (b->blanks[middle] == ucs4)
 	    return FcTrue;
-	if (middle == lower ||
-	    middle == higher)
+	if (lower >= higher)
 	    break;
 	if (b->blanks[middle] < ucs4)
 	    lower = middle + 1;
diff --git a/fontconfig/src/fcinit.c b/fontconfig/src/fcinit.c
index db62c21f2..6134ed40d 100644
--- a/fontconfig/src/fcinit.c
+++ b/fontconfig/src/fcinit.c
@@ -209,6 +209,8 @@ FcInitBringUptoDate (void)
     FcConfig	*config = FcConfigGetCurrent ();
     time_t	now;
 
+    if (!config)
+	return FcFalse;
     /*
      * rescanInterval == 0 disables automatic up to date
      */