Makefile.am | 4 ++--
README | 34 ++++++++++++++++++++++++++++++++--
configure.in | 2 +-
fontconfig.pc.in | 2 +-
fontconfig/fontconfig.h | 2 +-
src/fcxml.c | 4 +++-
6 files changed, 40 insertions(+), 8 deletions(-)
New commits:
commit d0902ee0867bd11e4ff266876a69c258eee8d08d
Author: Keith Packard <keithp@xxxxxxxxxx>
Date: Sat May 24 17:52:41 2008 -0700
Bump version to 2.5.93
diff --git a/README b/README
index bab8eb1..f012a0c 100644
--- a/README
+++ b/README
@@ -1,12 +1,42 @@
Fontconfig
Font configuration and customization library
- Version 2.5.92 (2.6 RC2)
- 2008-05-03
+ Version 2.5.93 (2.6 RC3)
+ 2008-05-24
Check INSTALL for compilation and installation instructions.
Report bugs to https://bugs.freedesktop.org in the fontconfig module.
+2.5.93 (2.6 RC3)
+
+Alexey Khoroshilov (1):
+ Fix FcStrDirname documentation. (bug 16068)
+
+Behdad Esfahbod (1):
+ Persian conf update. (bug 16066).
+
+Evgeniy Stepanov (1):
+ Fix index/offset for 'decorative' matcher. Bug 15890.
+
+Glen Low (1):
+ Fix Win32 build error: install tries to run fc-cache locally (bug 15928).
+
+Keith Packard (8):
+ Call FcFini to make memory debugging easier
+ Fix a few memory tracking mistakes.
+ Add extended, caps, dunhill style mappings.
+ Freetype 2.3.5 (2007-jul-02) fixes indic font hinting. re-enable (bug 15822)
+ Add a copy of dolt.m4 to acinclude.m4.
+ Libs.private needs freetype libraries
+ Oops. Fix for bug 15928 used wrong path for installed fc-cache.
+ Ignore empty <dir></dir> elements
+
+Neskie Manuel (1):
+ Add Secwepemctsin Orthography. Bug 15996.
+
+Sayamindu Dasgupta (1):
+ FcConfigUptoDate breaks if directory mtime is in the future. Bug 14424.
+
2.5.92 (2.6 RC2)
Carlo Bramini (1):
diff --git a/configure.in b/configure.in
index c6e3311..29f109b 100644
--- a/configure.in
+++ b/configure.in
@@ -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.5.92)
+AM_INIT_AUTOMAKE(fontconfig, 2.5.93)
AM_MAINTAINER_MODE
dnl libtool versioning
diff --git a/fontconfig/fontconfig.h b/fontconfig/fontconfig.h
index 23e82f9..425fc2d 100644
--- a/fontconfig/fontconfig.h
+++ b/fontconfig/fontconfig.h
@@ -53,7 +53,7 @@ typedef int FcBool;
#define FC_MAJOR 2
#define FC_MINOR 5
-#define FC_REVISION 92
+#define FC_REVISION 93
#define FC_VERSION ((FC_MAJOR * 10000) + (FC_MINOR * 100) + (FC_REVISION))
commit 8ade2369238a0b439192a847f12fcc9748a6d73a
Author: Keith Packard <keithp@xxxxxxxxxx>
Date: Sat May 24 17:14:24 2008 -0700
Ignore empty <dir></dir> elements
An empty element would cause every file starting with the current
directory to be scanned, probably not what the user wanted.
diff --git a/src/fcxml.c b/src/fcxml.c
index a2cc02e..90c079a 100644
--- a/src/fcxml.c
+++ b/src/fcxml.c
@@ -2101,7 +2101,9 @@ FcEndElement(void *userData, const XML_Char *name)
strcat (data, "fonts");
}
#endif
- if (!FcStrUsesHome (data) || FcConfigHome ())
+ if (strlen ((char *) data) == 0)
+ FcConfigMessage (parse, FcSevereWarning, "empty font directory name ignored");
+ else if (!FcStrUsesHome (data) || FcConfigHome ())
{
if (!FcConfigAddDir (parse->config, data))
FcConfigMessage (parse, FcSevereError, "out of memory; cannot add directory %s", data);
commit 83c5c357abc8d626680943537b4dbc020d6c378c
Author: Keith Packard <keithp@xxxxxxxxxx>
Date: Sat May 24 17:01:12 2008 -0700
Oops. Fix for bug 15928 used wrong path for installed fc-cache.
fc-cache lives in $(bindir)/fc-cache, not $(bindir)/fc-cache/fc-cache.
diff --git a/Makefile.am b/Makefile.am
index b9c0321..1b78d1b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -95,8 +95,8 @@ install-data-local:
$(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \
fi; fi
@(if $(RUN_FC_CACHE_TEST); then \
- echo " $(bindir)/fc-cache/fc-cache -s -f -v"; \
- $(bindir)/fc-cache/fc-cache -s -f -v; \
+ echo " $(bindir)/fc-cache -s -f -v"; \
+ $(bindir)/fc-cache -s -f -v; \
else \
echo "***"; \
echo "*** Warning: fonts.cache not built"; \
commit e91e7efd7b0e0ca6f9f2e718541f99331447b40a
Author: Keith Packard <keithp@xxxxxxxxxx>
Date: Sat May 24 16:32:27 2008 -0700
Libs.private needs freetype libraries
To make static linking work, fontconfig.pc needs @FREETYPE_LIBS@ in
Libs.private.
diff --git a/fontconfig.pc.in b/fontconfig.pc.in
index d7c02c7..e2f6898 100644
--- a/fontconfig.pc.in
+++ b/fontconfig.pc.in
@@ -7,5 +7,5 @@ Name: Fontconfig
Description: Font configuration and customization library
Version: @VERSION@
Libs: -L${libdir} -lfontconfig
-Libs.private: @EXPAT_LIBS@
+Libs.private: @EXPAT_LIBS@ @FREETYPE_LIBS@
Cflags: -I${includedir}
_______________________________________________
Fontconfig mailing list
Fontconfig@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/fontconfig
