diff --git a/fix-pattern-duplicate.diff b/fix-pattern-duplicate.diff new file mode 100644 index 0000000..ae8ac69 --- /dev/null +++ b/fix-pattern-duplicate.diff @@ -0,0 +1,21 @@ +diff -ru fontconfig-2.4.2/src/fcpat.c fontconfig-2.4.2.new/src/fcpat.c +--- fontconfig-2.4.2/src/fcpat.c 2006-12-02 21:54:53.000000000 +0100 ++++ fontconfig-2.4.2.new/src/fcpat.c 2007-03-12 16:08:30.000000000 +0100 +@@ -925,10 +925,14 @@ + for (i = 0; i < orig->num; i++) + { + for (l = FcPatternEltValues(e + i); l; l = FcValueListNext(l)) +- if (!FcPatternObjectAdd (new, e[i].object, +- FcValueCanonicalize(&l->value), +- FcTrue)) ++ { ++ if (!FcPatternObjectAddWithBinding (new, e[i].object, ++ FcValueCanonicalize(&l->value), ++ l->binding, ++ FcTrue)) + goto bail1; ++ ++ } + } + + return new; diff --git a/fontconfig.changes b/fontconfig.changes index dfc2383..e8381ba 100644 --- a/fontconfig.changes +++ b/fontconfig.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Mar 12 16:01:47 CET 2007 - mfabian@suse.de + +- duplicate patterns correctly (fixes some parts of bug #244579 + for Qt4). + fix-pattern-duplicate.diff (by Stephan Kulow ). + ------------------------------------------------------------------- Wed Feb 21 17:25:57 CET 2007 - mfabian@suse.de diff --git a/fontconfig.spec b/fontconfig.spec index 308afaa..38d0579 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -23,7 +23,7 @@ URL: http://fontconfig.org/ Autoreqprov: on Requires: bash Version: 2.4.2 -Release: 1 +Release: 4 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 @@ -63,6 +63,7 @@ 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: bugzilla-246783-do-not-crash-when-config-files-contain-broken-stuff.patch +Patch32: fix-pattern-duplicate.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -113,6 +114,7 @@ Authors: #%patch29 -p1 #%patch30 -p1 %patch31 -p1 +%patch32 -p1 %build %define myprefix /usr @@ -219,6 +221,10 @@ rm -rf $RPM_BUILD_ROOT %{myprefix}/include/fontconfig/ %changelog +* Mon Mar 12 2007 - mfabian@suse.de +- duplicate patterns correctly (fixes some parts of bug #244579 + for Qt4). + fix-pattern-duplicate.diff (by Stephan Kulow ). * Wed Feb 21 2007 - mfabian@suse.de - Bugzilla #246783: avoid crashes when config files contain some incorrect expressions.