aboutsummaryrefslogtreecommitdiff
path: root/fontconfig
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-07-18 10:12:07 +0200
committermarha <marha@users.sourceforge.net>2012-07-18 10:12:07 +0200
commit980040093547dc8dd563d8cb9d003aa39737eda4 (patch)
treec85afeb4affd10ee0d6001d18569510ef6488272 /fontconfig
parent01102cdf33d68a7be192a139752831ff93dee117 (diff)
parent2ff5448bcca8cba4b62026d5493cb08aaf2838d8 (diff)
downloadvcxsrv-980040093547dc8dd563d8cb9d003aa39737eda4.tar.gz
vcxsrv-980040093547dc8dd563d8cb9d003aa39737eda4.tar.bz2
vcxsrv-980040093547dc8dd563d8cb9d003aa39737eda4.zip
Merge remote-tracking branch 'origin/released'
Conflicts: mesalib/src/glsl/.gitignore xorg-server/Xext/panoramiX.c xorg-server/hw/xwin/win.h xorg-server/hw/xwin/winclipboardinit.c xorg-server/hw/xwin/winclipboardthread.c xorg-server/hw/xwin/winclipboardunicode.c xorg-server/hw/xwin/winclipboardwrappers.c xorg-server/hw/xwin/winclipboardxevents.c xorg-server/hw/xwin/wincreatewnd.c xorg-server/hw/xwin/windialogs.c xorg-server/hw/xwin/winerror.c xorg-server/hw/xwin/winmonitors.c xorg-server/hw/xwin/winmultiwindowwm.c xorg-server/hw/xwin/winprocarg.c xorg-server/hw/xwin/winwndproc.c
Diffstat (limited to 'fontconfig')
-rw-r--r--fontconfig/INSTALL2
-rw-r--r--fontconfig/README11
-rw-r--r--fontconfig/configure.ac4
-rw-r--r--fontconfig/fontconfig/fontconfig.h4
4 files changed, 15 insertions, 6 deletions
diff --git a/fontconfig/INSTALL b/fontconfig/INSTALL
index f3cf9f805..670add1f3 100644
--- a/fontconfig/INSTALL
+++ b/fontconfig/INSTALL
@@ -32,7 +32,7 @@ important steps:
6. Update the fontconfig documentation
- scp -rp doc/fontconfig-user.html doc/fontconfig-devel fontconfig.org:/srv/www.freedesktop.org/www/software/fontconfig
+ scp -rp doc/fontconfig-user.html doc/fontconfig-devel freedesktop.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 12ef05614..624ffa4ce 100644
--- a/fontconfig/README
+++ b/fontconfig/README
@@ -1,12 +1,21 @@
Fontconfig
Font configuration and customization library
- Version 2.9.92 (2.10 RC2)
+ Version 2.10.0
2012-03-11
Check INSTALL for compilation and installation instructions.
Report bugs to https://bugs.freedesktop.org in the fontconfig module.
+2.10.0
+
+Akira TAGOH (5):
+ Bug 34266 - configs silently ignored if libxml2 doesn't support SAX1 interface
+ Update CaseFolding.txt to Unicode 6.1
+ Fix a build fail with gcc 2.95, not supporting the flexible array members.
+ Bump libtool revision
+ Update INSTALL
+
2.9.92 (2.10 RC2)
Akira TAGOH (9):
diff --git a/fontconfig/configure.ac b/fontconfig/configure.ac
index 12e4d5a6c..8aa3d6ba7 100644
--- a/fontconfig/configure.ac
+++ b/fontconfig/configure.ac
@@ -34,7 +34,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.92)
+AM_INIT_AUTOMAKE(fontconfig, 2.10.0)
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
dnl libtool versioning
@@ -43,7 +43,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=1
+LIBT_REVISION=2
AC_SUBST(LIBT_CURRENT)
AC_SUBST(LIBT_REVISION)
LIBT_AGE=6
diff --git a/fontconfig/fontconfig/fontconfig.h b/fontconfig/fontconfig/fontconfig.h
index 8980b3142..41af47074 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 9
-#define FC_REVISION 92
+#define FC_MINOR 10
+#define FC_REVISION 0
#define FC_VERSION ((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))