Merge remote-tracking branch 'origin/released'

* origin/released:
  fontconfig libxcb libxcb/xcb-proto xserver mesa pixman xkbcomp git update 16 oct 2013

Conflicts:
	mesalib/src/mesa/drivers/dri/common/drisw_util.c
	pixman/pixman/pixman-mmx.c

6 files changed, 48 insertions, 12 deletions

diff --git a/fontconfig/README b/fontconfig/README
index 06f862b21..d2288a559 100644
--- a/fontconfig/README
+++ b/fontconfig/README
@@ -1,12 +1,37 @@
                               Fontconfig
              Font configuration and customization library
-                      Version 2.10.95 (2.11 RC5)
-                              2013-08-31
+                             Version 2.11
+                              2013-10-11
 
 
 Check INSTALL for compilation and installation instructions.
 Report bugs to https://bugs.freedesktop.org in the fontconfig module.
 
+2.11
+
+Akira TAGOH (15):
+      Do not create a config dir for migration when no config files nor dirs
+      Add a test case of the migration for config place
+      Fix memory leaks in FcFreeTypeQueryFace
+      Bug 68955 - Deprecate / remove FC_RASTERIZER
+      Copy all values from the font to the pattern if the pattern doesn't have the element
+      Fix a crash when FcPattern is set to null on FcFontSetList() and FcFontList()
+      Add the description of -q option to the man page
+      avoid reading config.h twice
+      clean up
+      Add the relative path for <include> to fonts.conf if the parent path is same to fonts.conf
+      Workaround the race condition issue on updating cache
+      exit with the error code when FcNameParse() failed
+      Add missing doc for FcStrListFirst and fix a typo
+      Bump libtool revision
+      Update CaseFolding.txt to Unicode 6.3
+
+Jan Alexander Steffens (heftig) (1):
+      Further changes to 30-metric-aliases.conf
+
+W. Trevor King (1):
+      doc/fccharset.fncs: Describe the map format in more detail
+
 2.10.95 (2.11 RC5)
 
 Akira TAGOH (2):
diff --git a/fontconfig/configure.ac b/fontconfig/configure.ac
index 4b631bd53..c3743f435 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.10.95], [https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig])
+AC_INIT([fontconfig], [2.11.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])])
 
@@ -42,11 +42,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=8
+LIBT_CURRENT=9
 LIBT_REVISION=0
 AC_SUBST(LIBT_CURRENT)
 AC_SUBST(LIBT_REVISION)
-LIBT_AGE=7
+LIBT_AGE=8
 
 LIBT_VERSION_INFO="$LIBT_CURRENT:$LIBT_REVISION:$LIBT_AGE"
 AC_SUBST(LIBT_VERSION_INFO)
diff --git a/fontconfig/doc/fcstrset.fncs b/fontconfig/doc/fcstrset.fncs
index 737347b00..b96489a43 100644
--- a/fontconfig/doc/fcstrset.fncs
+++ b/fontconfig/doc/fcstrset.fncs
@@ -98,12 +98,20 @@ Destroys <parameter>set</parameter>.
 Creates an iterator to list the strings in <parameter>set</parameter>.
 @@
 
+@RET@		void
+@FUNC@		FcStrListFirst
+@TYPE1@		FcStrList *			@ARG1@		list
+@PURPOSE@	get first string in iteration
+@DESC@
+Returns the first string in <parameter>list</parameter>.
+@@
+
 @RET@		FcChar8 *
 @FUNC@		FcStrListNext
 @TYPE1@		FcStrList *			@ARG1@		list	
 @PURPOSE@	get next string in iteration
 @DESC@
-Returns the next string in <parameter>set</parameter>.
+Returns the next string in <parameter>list</parameter>.
 @@
 
 @RET@		void
diff --git a/fontconfig/fc-case/CaseFolding.txt b/fontconfig/fc-case/CaseFolding.txt
index df1813d2a..cf5779f40 100644
--- a/fontconfig/fc-case/CaseFolding.txt
+++ b/fontconfig/fc-case/CaseFolding.txt
@@ -1,8 +1,8 @@
-# CaseFolding-6.2.0.txt
-# Date: 2012-08-14, 17:54:49 GMT [MD]
+# CaseFolding-6.3.0.txt
+# Date: 2012-12-20, 22:14:35 GMT [MD]
 #
 # Unicode Character Database
-# Copyright (c) 1991-2012 Unicode, Inc.
+# Copyright (c) 1991-2013 Unicode, Inc.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 # For documentation, see http://www.unicode.org/reports/tr44/
 #
diff --git a/fontconfig/fontconfig/fontconfig.h b/fontconfig/fontconfig/fontconfig.h
index e58857972..dfc48f9e3 100644
--- a/fontconfig/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig/fontconfig.h
@@ -51,8 +51,8 @@ typedef int		FcBool;
  */
 
 #define FC_MAJOR	2
-#define FC_MINOR	10
-#define FC_REVISION	95
+#define FC_MINOR	11
+#define FC_REVISION	0
 
 #define FC_VERSION	((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))
 
diff --git a/fontconfig/test/Makefile.am b/fontconfig/test/Makefile.am
index 52c63dc41..f270b5071 100644
--- a/fontconfig/test/Makefile.am
+++ b/fontconfig/test/Makefile.am
@@ -16,7 +16,7 @@ TESTDATA=4x6.pcf 8x16.pcf out.expected fonts.conf.in
 
 AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
 
-check_PROGRAMS = test-migration
+check_PROGRAMS =
 if HAVE_PTHREAD
 check_PROGRAMS += test-pthread
 test_pthread_LDADD = $(top_builddir)/src/libfontconfig.la
@@ -26,7 +26,10 @@ test_pthread_LDADD = $(top_builddir)/src/libfontconfig.la
 endif
 noinst_PROGRAMS = $(check_PROGRAMS)
 
+if !OS_WIN32
+check_PROGRAMS += test-migration
 test_migration_LDADD = $(top_builddir)/src/libfontconfig.la
+endif
 
 EXTRA_DIST=$(check_SCRIPTS) $(TESTDATA)