From e0927d908a12c9c140458c355b29b884a7705f2d Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 24 Mar 2014 21:12:32 +0100 Subject: fontconfig libxcb mesa xserver git update 24 Mar 2014 xserver commit bf087659f0fb747c471e26c5b287c35877818040 libxcb commit e2813e1cde893f384fa620ff3c13493beebabe0c fontconfig commit 9260b7ec39c34ce68d74e16d47917290a8c3f35a mesa commit 0d99aef6c8a940e52afcbffa7091ff9c854ba120 --- fontconfig/README | 57 ++++++++++++++++++++++++++++++++++++-- fontconfig/configure.ac | 50 ++++++++++++++++----------------- fontconfig/fontconfig/fontconfig.h | 2 +- 3 files changed, 81 insertions(+), 28 deletions(-) (limited to 'fontconfig') diff --git a/fontconfig/README b/fontconfig/README index d2288a559..8b34edcae 100644 --- a/fontconfig/README +++ b/fontconfig/README @@ -1,12 +1,65 @@ Fontconfig Font configuration and customization library - Version 2.11 - 2013-10-11 + Version 2.11.1 + 2014-03-24 Check INSTALL for compilation and installation instructions. Report bugs to https://bugs.freedesktop.org in the fontconfig module. +2.11.1 + +Akira TAGOH (31): + do not build test-migration for Win32 + Fix build issue on Debian/kFreeBSD 7.0 + Update ax_pthread.m4 to the latest version + Fix the dynamic loading issue on NetBSD + Use stat() if there are no d_type in struct dirent + Fix a build issue on Solaris 10 + Change the default weight on match to FC_WEIGHT_NORMAL + Warn if no nor elements in + Correct DTD + Re-scan font directories only when it contains subdirs + Fix typo + Bug 72086 - Check for gperf in autogen.sh + Simplify to validate the availability of posix_fadvise + Simplify to validate the availability of scandir + Fix a typo + Fix a build issue on platforms where doesn't support readlink() + Improve the performance issue on rescanning directories + Bug 73686 - confdir is not set correctly in fontconfig.pc + Update zh_hk.orth + clean up the unused files + Add missing license headers + Update the use of autotools' macro + Fix a crash issue when empty strings are set to the BDF properties + Add a doc for FcDirCacheRescan + Add missing #include in fcstat.c + Fix incompatible API on AIX with random_r and initstate_r + Fallback to lstat() in case the filesystem doesn't support d_type in struct dirent + Update doc to include the version info of `since when' + Bug 73291 - poppler does not show fl ligature + Add README describes the criteria to add/modify the orthography files + Fix autoconf warning, warning: AC_COMPILE_IFELSE was called before AC_USE_SYSTEM_EXTENSIONS + +Alan Coopersmith (3): + Leave room for null terminators in arrays + Avoid memory leak when NULL path passed to FcStrBuildFilename + Avoid null pointer dereference in FcNameParse if malloc fails + +Behdad Esfahbod (1): + Bug 72380 - Never drop first font when trimming + +Frederic Crozat (2): + Fix inversion between Tinos and Cousine in the comment + Add metric aliases for additional Google ChromeOS fonts + +Jehan (1): + Defaulting to LOCAL_APPDATA_FONTCONFIG_CACHE for Win32 build + +Ross Burton (1): + fc-cache: --sysroot option takes an argument + 2.11 Akira TAGOH (15): diff --git a/fontconfig/configure.ac b/fontconfig/configure.ac index 331bd32aa..1086a9a55 100644 --- a/fontconfig/configure.ac +++ b/fontconfig/configure.ac @@ -33,34 +33,10 @@ 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.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig]) +AC_INIT([fontconfig], [2.11.1], [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])]) -dnl Initialize libtool -LT_PREREQ([2.2]) -LT_INIT([disable-static win32-dll]) - -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_REVISION=0 -AC_SUBST(LIBT_CURRENT) -AC_SUBST(LIBT_REVISION) -LIBT_AGE=8 - -LIBT_VERSION_INFO="$LIBT_CURRENT:$LIBT_REVISION:$LIBT_AGE" -AC_SUBST(LIBT_VERSION_INFO) - -LIBT_CURRENT_MINUS_AGE=`expr $LIBT_CURRENT - $LIBT_AGE` -AC_SUBST(LIBT_CURRENT_MINUS_AGE) - -PKGCONFIG_REQUIRES= -PKGCONFIG_REQUIRES_PRIVATELY= - dnl ========================================================================== AC_CONFIG_HEADERS(config.h) @@ -87,6 +63,30 @@ else AC_MSG_RESULT($_predefined_rm) fi +dnl Initialize libtool +LT_PREREQ([2.2]) +LT_INIT([disable-static win32-dll]) + +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_REVISION=0 +AC_SUBST(LIBT_CURRENT) +AC_SUBST(LIBT_REVISION) +LIBT_AGE=8 + +LIBT_VERSION_INFO="$LIBT_CURRENT:$LIBT_REVISION:$LIBT_AGE" +AC_SUBST(LIBT_VERSION_INFO) + +LIBT_CURRENT_MINUS_AGE=`expr $LIBT_CURRENT - $LIBT_AGE` +AC_SUBST(LIBT_CURRENT_MINUS_AGE) + +PKGCONFIG_REQUIRES= +PKGCONFIG_REQUIRES_PRIVATELY= + dnl ========================================================================== case "$host" in diff --git a/fontconfig/fontconfig/fontconfig.h b/fontconfig/fontconfig/fontconfig.h index 1a283a1ce..225825127 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 0 +#define FC_REVISION 1 #define FC_VERSION ((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION)) -- cgit v1.2.3