aboutsummaryrefslogtreecommitdiff
path: root/fontconfig
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-08-30 15:35:17 +0200
committermarha <marha@users.sourceforge.net>2013-08-30 15:35:17 +0200
commit5ebbc3a366287b631775ed3e17537580d380db8a (patch)
treef43c3d54e7c0e161c83288d83b22cbd7da49cc96 /fontconfig
parent84e570d071a041f85e2e8b92963d3390d14af5fc (diff)
downloadvcxsrv-5ebbc3a366287b631775ed3e17537580d380db8a.tar.gz
vcxsrv-5ebbc3a366287b631775ed3e17537580d380db8a.tar.bz2
vcxsrv-5ebbc3a366287b631775ed3e17537580d380db8a.zip
fontconfig mesa xserver xkeyboard-config xkbcomp git update 30 aug 2013
xserver commit 94d4e29aedc69431fa9b299ca1b67947173d7a24 xkeyboard-config commit fcb91cb1013cbdd87a6f77533f188d5934f24046 xkbcomp commit 24d18e0a844041ef82441adb16aa18cc4b4814ae fontconfig commit 071ce44c35733e54cb477cc75810cbe55025b619 mesa commit f7217b99f243738f941a5d009c68387dfadcb50a
Diffstat (limited to 'fontconfig')
-rw-r--r--fontconfig/README37
-rw-r--r--fontconfig/configure.ac2
-rw-r--r--fontconfig/fc-lang/Makefile.am1
-rw-r--r--fontconfig/fontconfig/fontconfig.h2
4 files changed, 38 insertions, 4 deletions
diff --git a/fontconfig/README b/fontconfig/README
index 8120585a7..abaf506b8 100644
--- a/fontconfig/README
+++ b/fontconfig/README
@@ -1,12 +1,45 @@
Fontconfig
Font configuration and customization library
- Version 2.10.93 (2.11 RC3)
- 2013-05-20
+ Version 2.10.94 (2.11 RC4)
+ 2013-08-29
Check INSTALL for compilation and installation instructions.
Report bugs to https://bugs.freedesktop.org in the fontconfig module.
+2.10.94 (2.11 RC4)
+
+Akira TAGOH (25):
+ Bug 64906 - FcNameParse() should ignore leading whitespace in parameters
+ Fix a comparison of constant warning with clang
+ Fix a shift count overflow on 32bit box
+ Fix a incompatible pointer warning on NetBSD
+ Add FcTypeUnknown to FcType to avoid comparison of constant -1
+ Fix the behavior of intermixed tests end edits in match
+ Ignore scandir() check on mingw
+ Use INT_MAX instead of unreliable hardcoding value
+ Add FC_UNUSED to FC_ASSERT_STATIC macro to avoid compiler warning
+ Rework to apply the intermixed test and edit elements in one-pass
+ trivial code optimization
+ Correct fontconfig.pc to add certain dependencies for build
+ Correct fontconfig.pc to add certain dependencies for static build
+ Fix wrong edit position
+ Bug 67809 - Invalid read/write with valgrind when assigning something twice
+ warn deprecated only when migration failed
+ Bug 67845 - Match on FC_SCALABLE
+ Bug 16818 - fontformat in match pattern is not respected?
+ Bug 68340 - More metric compat fonts
+ Bug 63399 - Add default aliases for Georgia, Garamond, Palatino Linotype, Trebuchet MS
+ Fix a typo
+ Fix a crash when non-builtin objects are edited
+ Fix a wrong edit position when 'kind' is different
+ Bug 68587 - copy qu.orth to quz.orth
+ Add quz.orth to Makefile.am
+
+Behdad Esfahbod (2):
+ Minor
+ Fix assertion
+
2.10.93 (2.11 RC3)
Akira TAGOH (10):
diff --git a/fontconfig/configure.ac b/fontconfig/configure.ac
index 321feced4..12d414938 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.93], [https://bugs.freedesktop.org/enger_bug.cgi?product=fontconfig])
+AC_INIT([fontconfig], [2.10.94], [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/fc-lang/Makefile.am b/fontconfig/fc-lang/Makefile.am
index 2340de4a6..6f76ee015 100644
--- a/fontconfig/fc-lang/Makefile.am
+++ b/fontconfig/fc-lang/Makefile.am
@@ -263,6 +263,7 @@ ORTH = \
pap_an.orth \
pap_aw.orth \
qu.orth \
+ quz.orth \
rn.orth \
rw.orth \
sc.orth \
diff --git a/fontconfig/fontconfig/fontconfig.h b/fontconfig/fontconfig/fontconfig.h
index 39d1b1b9c..9a667022b 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 10
-#define FC_REVISION 93
+#define FC_REVISION 94
#define FC_VERSION ((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))