Mailinglist Archive: opensuse-commit (1426 mails)
| < Previous | Next > |
commit fontconfig
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Thu, 15 Mar 2007 01:34:00 +0100
- Message-id: <20070315003400.A10E6678188@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package fontconfig
checked in at Thu Mar 15 01:34:00 CET 2007.
--------
--- fontconfig/fontconfig.changes 2007-02-22 14:18:53.000000000 +0100
+++ /mounts/work_src_done/STABLE/fontconfig/fontconfig.changes 2007-03-12 18:17:22.000000000 +0100
@@ -1,0 +2,7 @@
+Mon Mar 12 16:01:47 CET 2007 - mfabian@xxxxxxx
+
+- duplicate patterns correctly (fixes some parts of bug #244579
+ for Qt4).
+ fix-pattern-duplicate.diff (by Stephan Kulow <coolo@xxxxxxx>).
+
+-------------------------------------------------------------------
New:
----
fix-pattern-duplicate.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fontconfig.spec ++++++
--- /var/tmp/diff_new_pack.de2898/_old 2007-03-15 01:31:48.000000000 +0100
+++ /var/tmp/diff_new_pack.de2898/_new 2007-03-15 01:31:48.000000000 +0100
@@ -23,7 +23,7 @@
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@xxxxxxxxxxxxxxxxxxx:/cvs/fontconfig login
@@ -63,6 +63,7 @@
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 @@
#%patch29 -p1
#%patch30 -p1
%patch31 -p1
+%patch32 -p1
%build
%define myprefix /usr
@@ -219,6 +221,10 @@
%{myprefix}/include/fontconfig/
%changelog
+* Mon Mar 12 2007 - mfabian@xxxxxxx
+- duplicate patterns correctly (fixes some parts of bug #244579
+ for Qt4).
+ fix-pattern-duplicate.diff (by Stephan Kulow <coolo@xxxxxxx>).
* Wed Feb 21 2007 - mfabian@xxxxxxx
- Bugzilla #246783: avoid crashes when config files contain
some incorrect expressions.
++++++ fix-pattern-duplicate.diff ++++++
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;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |