aboutsummaryrefslogtreecommitdiff
path: root/fontconfig
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-06-28 08:12:11 +0200
committermarha <marha@users.sourceforge.net>2012-06-28 08:12:11 +0200
commit4376eeccc64a10e2a74fd0eb4184d2a144058470 (patch)
tree6a55f2d7660286e3250038228fa33d1fa1d0017e /fontconfig
parent74a24d67cefc273c717f17150b9d41607bcaf8ce (diff)
parent67551627d34fff4a0fbe719bce33a3bacb55ccef (diff)
downloadvcxsrv-4376eeccc64a10e2a74fd0eb4184d2a144058470.tar.gz
vcxsrv-4376eeccc64a10e2a74fd0eb4184d2a144058470.tar.bz2
vcxsrv-4376eeccc64a10e2a74fd0eb4184d2a144058470.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'fontconfig')
-rw-r--r--fontconfig/INSTALL4
-rw-r--r--fontconfig/README19
-rw-r--r--fontconfig/configure.ac4
-rw-r--r--fontconfig/fontconfig/fontconfig.h2
4 files changed, 23 insertions, 6 deletions
diff --git a/fontconfig/INSTALL b/fontconfig/INSTALL
index 754a32b93..f3cf9f805 100644
--- a/fontconfig/INSTALL
+++ b/fontconfig/INSTALL
@@ -25,14 +25,14 @@ important steps:
4. Copy ChangeLog-2.x.y and fontconfig-2.x.y.tar.gz to
- freedesktop.org:/srv/fontconfig.freedesktop.org/www/release
+ freedesktop.org:/srv/www.freedesktop.org/www/software/fontconfig/release
5. Update the Fontconfig Devel wiki page
http://fontconfig.org/wiki/Devel
6. Update the fontconfig documentation
- scp -rp doc/fontconfig-user.html doc/fontconfig-devel fontconfig.org:/srv/fontconfig.freedesktop.org/www
+ scp -rp doc/fontconfig-user.html doc/fontconfig-devel fontconfig.org:/srv/www.freedesktop.org/www/software/fontconfig
7. Compute md5sums for release files:
md5sum fontconfig-2.4.x.tar.gz ChangeLog-2.4.x
diff --git a/fontconfig/README b/fontconfig/README
index b9aabc85f..12ef05614 100644
--- a/fontconfig/README
+++ b/fontconfig/README
@@ -1,12 +1,29 @@
Fontconfig
Font configuration and customization library
- Version 2.9.91 (2.10 RC1)
+ Version 2.9.92 (2.10 RC2)
2012-03-11
Check INSTALL for compilation and installation instructions.
Report bugs to https://bugs.freedesktop.org in the fontconfig module.
+2.9.92 (2.10 RC2)
+
+Akira TAGOH (9):
+ Bug 50835 - Deprecate FC_GLOBAL_ADVANCE
+ Fix a typo and build fail.
+ Fix a build fail on MINGW
+ Fix the fail of make install with --disable-shared on Win32
+ clean up the lock file properly on even hardlink-not-supported filesystem.
+ Rename configure.in to configure.ac
+ Bug 18726 - RFE: help write locale-specific tests
+ Bump libtool revision
+ Update INSTALL
+
+Marius Tolzmann (2):
+ Fix newline in warning about deprecated config includes
+ Fix warning about deprecated, non-existent config includes
+
2.9.91 (2.10 RC1)
Akira TAGOH (60):
diff --git a/fontconfig/configure.ac b/fontconfig/configure.ac
index a8c1f8728..644fc1a58 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
-AM_INIT_AUTOMAKE(fontconfig, 2.9.91)
+AM_INIT_AUTOMAKE(fontconfig, 2.9.92)
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
dnl libtool versioning
@@ -42,7 +42,7 @@ 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=7
-LIBT_REVISION=0
+LIBT_REVISION=1
AC_SUBST(LIBT_CURRENT)
AC_SUBST(LIBT_REVISION)
LIBT_AGE=6
diff --git a/fontconfig/fontconfig/fontconfig.h b/fontconfig/fontconfig/fontconfig.h
index 238ab650d..8980b3142 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 9
-#define FC_REVISION 91
+#define FC_REVISION 92
#define FC_VERSION ((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))