diff --git a/bugzilla-246783-do-not-crash-when-config-files-contain-broken-stuff.patch b/bugzilla-246783-do-not-crash-when-config-files-contain-broken-stuff.patch new file mode 100644 index 0000000..3582c86 --- /dev/null +++ b/bugzilla-246783-do-not-crash-when-config-files-contain-broken-stuff.patch @@ -0,0 +1,13 @@ +diff -ru fontconfig-2.4.2.orig/src/fcxml.c fontconfig-2.4.2/src/fcxml.c +--- fontconfig-2.4.2.orig/src/fcxml.c 2006-12-02 22:54:03.000000000 +0100 ++++ fontconfig-2.4.2/src/fcxml.c 2007-02-21 17:13:37.000000000 +0100 +@@ -557,6 +557,9 @@ + { + const FcObjectType *o; + const FcConstant *c; ++ ++ if (!expr) ++ return; + + switch (expr->op) { + case FcOpInteger: diff --git a/do-not-clean-cache-files-for-different-architectures.patch b/do-not-clean-cache-files-for-different-architectures.patch deleted file mode 100644 index d472850..0000000 --- a/do-not-clean-cache-files-for-different-architectures.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -ru fontconfig-2.4.1.orig/fc-cache/fc-cache.c fontconfig-2.4.1/fc-cache/fc-cache.c ---- fontconfig-2.4.1.orig/fc-cache/fc-cache.c 2006-09-14 03:53:49.000000000 +0200 -+++ fontconfig-2.4.1/fc-cache/fc-cache.c 2006-10-26 17:56:25.000000000 +0200 -@@ -22,6 +22,8 @@ - * PERFORMANCE OF THIS SOFTWARE. - */ - -+#include "../fc-arch/fcarch.h" -+ - #ifdef HAVE_CONFIG_H - #include - #else -@@ -40,6 +42,7 @@ - #include - #include - #include -+#include - - #if defined (_WIN32) - #define STRICT -@@ -296,6 +299,12 @@ - - if (ent->d_name[0] == '.') - continue; -+ /* skip cache files for different architectures and */ -+ /* files which are not cache files at all */ -+ if (strlen(ent->d_name) != 32 + strlen ("-" FC_ARCHITECTURE FC_CACHE_SUFFIX) || -+ strcmp(ent->d_name + 32, "-" FC_ARCHITECTURE FC_CACHE_SUFFIX)) -+ continue; -+ - file_name = FcStrPlus (dir_base, (FcChar8 *) ent->d_name); - if (!file_name) - { diff --git a/fontconfig-2.4.1.tar.bz2 b/fontconfig-2.4.1.tar.bz2 deleted file mode 100644 index 3e1fce1..0000000 --- a/fontconfig-2.4.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ca6b5f7ec66e3fa814b2a5e1132bc25b296a294d58e6b052b5a2ff68a980ca5b -size 1043078 diff --git a/fontconfig-2.4.2.tar.bz2 b/fontconfig-2.4.2.tar.bz2 new file mode 100644 index 0000000..bbb842d --- /dev/null +++ b/fontconfig-2.4.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e52aedc36cf87ab80987a28f12ca04221318fdd6a7865b53805476d62c2bb893 +size 1047591 diff --git a/fontconfig.changes b/fontconfig.changes index f256b80..dfc2383 100644 --- a/fontconfig.changes +++ b/fontconfig.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Wed Feb 21 17:25:57 CET 2007 - mfabian@suse.de + +- Bugzilla #246783: avoid crashes when config files contain + some incorrect expressions. + +------------------------------------------------------------------- +Tue Feb 20 19:02:49 CET 2007 - mfabian@suse.de + +- Bugzilla #246804: force detection of FreeMono as monospace as + well, recent versions of this font are broken and have glyphs + with wrong width. + +------------------------------------------------------------------- +Tue Feb 20 17:07:34 CET 2007 - mfabian@suse.de + +- update to 2.4.2. + + remove do-not-clean-cache-files-for-different-architectures.patch + (included upstream). + + remove improve-monospace-detection.patch and fix this in + the setup instead of in the c-code using the feature + match target="scan" (see bugzilla #246804). + ------------------------------------------------------------------- Tue Feb 06 19:16:24 CET 2007 - mfabian@suse.de @@ -17,12 +40,12 @@ Mon Nov 20 15:31:31 CET 2006 - mfabian@suse.de Wed Nov 15 20:24:23 CET 2006 - mfabian@suse.de - sync hinting and bitmap setup with fonts-config: - • Bugzilla #215602: don't use the embedded bitmaps in the IPA + + Bugzilla #215602: don't use the embedded bitmaps in the IPA fonts because they are only available in 12, 14, and 16 pixels. - • Bugzilla #215602: Don't use the autohinter for fonts where it + + Bugzilla #215602: Don't use the autohinter for fonts where it it distorts the metrics so badly that even the digits which should be monospaced are not monospaced at all anymore. - • Don't use the autohinter for good quality TrueType fonts. + + Don't use the autohinter for good quality TrueType fonts. - add some new fonts to the prefer lists. ------------------------------------------------------------------- @@ -60,9 +83,9 @@ Wed Oct 18 15:01:01 CEST 2006 - mfabian@suse.de Mon Oct 16 17:22:53 CEST 2006 - mfabian@suse.de - update to 2.4.1. - • cache files for different architectures are in different + + cache files for different architectures are in different files now - • the user specific cache has been split from a single file + + the user specific cache has been split from a single file in to seperate files for each font directory which are now stored in ~/.fontconfig/. diff --git a/fontconfig.spec b/fontconfig.spec index ec990c6..308afaa 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -1,5 +1,5 @@ # -# spec file for package fontconfig (Version 2.4.1) +# spec file for package fontconfig (Version 2.4.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -22,8 +22,8 @@ Group: System/Libraries URL: http://fontconfig.org/ Autoreqprov: on Requires: bash -Version: 2.4.1 -Release: 26 +Version: 2.4.2 +Release: 1 Summary: Library for Font Configuration # CVS can be found here: (CVS is gone, fontconfig uses git now). # $ cvs -d :pserver:anoncvs@pdx.freedesktop.org:/cvs/fontconfig login @@ -45,7 +45,6 @@ Source13: suse-hinting.conf Source14: suse-bitmaps.conf Source15: suse-font-dirs.conf Source20: local.conf.instsys -Patch1: improve-monospace-detection.patch Patch4: fc-match.patch # http://www.kde.gr.jp/~akito/patch/ # http://www.kde.gr.jp/~akito/patch/fontconfig/fontconfig-2.2.1/fontconfig-2.2.1-AppleRoman-DynaFont.patch @@ -63,7 +62,7 @@ Patch27: fc-app-dir-fix-new-new.diff Patch28: bugzilla-158573-turn-off-hinting-when-embolden.patch Patch29: fix-build-for-10.0.patch Patch30: bugzilla-179457-fix-font-file-names-for-wine.patch -Patch31: do-not-clean-cache-files-for-different-architectures.patch +Patch31: bugzilla-246783-do-not-crash-when-config-files-contain-broken-stuff.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -98,7 +97,6 @@ Authors: %if %{build_docs} < 1 tar xvf $RPM_SOURCE_DIR/%name-doc.tar.bz2 %endif -%patch1 -p1 -b .improve-monospace-detection #%patch4 -p0 -b .fc-match %patch5 -p0 -b .dynafont %patch6 -p0 -b .minmaxabs @@ -220,7 +218,21 @@ rm -rf $RPM_BUILD_ROOT %doc %{_mandir}/man3/Fc* %{myprefix}/include/fontconfig/ -%changelog -n fontconfig +%changelog +* Wed Feb 21 2007 - mfabian@suse.de +- Bugzilla #246783: avoid crashes when config files contain + some incorrect expressions. +* Tue Feb 20 2007 - mfabian@suse.de +- Bugzilla #246804: force detection of FreeMono as monospace as + well, recent versions of this font are broken and have glyphs + with wrong width. +* Tue Feb 20 2007 - mfabian@suse.de +- update to 2.4.2. + + remove do-not-clean-cache-files-for-different-architectures.patch + (included upstream). + + remove improve-monospace-detection.patch and fix this in + the setup instead of in the c-code using the feature + match target="scan" (see bugzilla #246804). * Tue Feb 06 2007 - mfabian@suse.de - fix order of changelog entries. * Wed Jan 24 2007 - mfabian@suse.de @@ -229,12 +241,12 @@ rm -rf $RPM_BUILD_ROOT - Meiryo is not good for monospace. * Wed Nov 15 2006 - mfabian@suse.de - sync hinting and bitmap setup with fonts-config: - • Bugzilla #215602: don't use the embedded bitmaps in the IPA + + Bugzilla #215602: don't use the embedded bitmaps in the IPA fonts because they are only available in 12, 14, and 16 pixels. - • Bugzilla #215602: Don't use the autohinter for fonts where it + + Bugzilla #215602: Don't use the autohinter for fonts where it it distorts the metrics so badly that even the digits which should be monospaced are not monospaced at all anymore. - • Don't use the autohinter for good quality TrueType fonts. + + Don't use the autohinter for good quality TrueType fonts. - add some new fonts to the prefer lists. * Fri Nov 10 2006 - mfabian@suse.de - choose nicer default fonts for sans-serif, serif, and monospace. @@ -254,9 +266,9 @@ rm -rf $RPM_BUILD_ROOT default font for zh_TW locale" * Mon Oct 16 2006 - mfabian@suse.de - update to 2.4.1. - • cache files for different architectures are in different + + cache files for different architectures are in different files now - • the user specific cache has been split from a single file + + the user specific cache has been split from a single file in to seperate files for each font directory which are now stored in ~/.fontconfig/. * Thu Jun 22 2006 - mfabian@suse.de diff --git a/improve-monospace-detection.patch b/improve-monospace-detection.patch deleted file mode 100644 index ac66b14..0000000 --- a/improve-monospace-detection.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ru fontconfig-2.3.93.20060116.orig/src/fcfreetype.c fontconfig-2.3.93.20060116/src/fcfreetype.c ---- fontconfig-2.3.93.20060116.orig/src/fcfreetype.c 2005-12-21 16:47:42.000000000 +0100 -+++ fontconfig-2.3.93.20060116/src/fcfreetype.c 2006-01-16 13:01:53.000000000 +0100 -@@ -2649,6 +2649,11 @@ - printf ("Bitmap extra char 0x%x\n", ucs4); - } - #endif -+ if (face->family_name != NULL && -+ (!strcmp(face->family_name,"Luxi Mono") || -+ !strcmp(face->family_name,"Nimbus Mono L"))) -+ fixed_advance = FcTrue; -+ - if (fixed_advance) - *spacing = FC_MONO; - else if (dual_advance && APPROXIMATELY_EQUAL (2 * FC_MIN (advance_one, advance_two), FC_MAX (advance_one, advance_two))) diff --git a/suse-pre-user.conf b/suse-pre-user.conf index b1370a4..e3fbf80 100644 --- a/suse-pre-user.conf +++ b/suse-pre-user.conf @@ -2,6 +2,30 @@ + + + + + + FreeMono + Luxi Mono + Nimbus Mono L + + + mono + + +