From 8b036b61592ef3ab8d6071b7f10ff3d7017eb603270bf1aac74a0ffc6c1dc61f Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Fri, 23 Jul 2010 13:18:31 +0000 Subject: [PATCH 1/4] Accepting request 43821 from home:Mingxi_Wu:branches:M17N Copy from home:Mingxi_Wu:branches:M17N/fontconfig via accept of submit request 43821 revision 2. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/43821 OBS-URL: https://build.opensuse.org/package/show/M17N/fontconfig?expand=0&rev=20 --- 10-lcdfilter-lcddefault.conf | 9 +++++++++ fontconfig.changes | 6 ++++++ fontconfig.spec | 3 +++ 3 files changed, 18 insertions(+) create mode 100644 10-lcdfilter-lcddefault.conf diff --git a/10-lcdfilter-lcddefault.conf b/10-lcdfilter-lcddefault.conf new file mode 100644 index 0000000..ebec6df --- /dev/null +++ b/10-lcdfilter-lcddefault.conf @@ -0,0 +1,9 @@ + + + + + + lcddefault + + + diff --git a/fontconfig.changes b/fontconfig.changes index 91627d8..0d2773a 100644 --- a/fontconfig.changes +++ b/fontconfig.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jul 23 08:39:25 UTC 2010 - mxwu@novell.com + +- add 10-lcdfilter-lcddefault.conf. + * enable lcdfilter. + ------------------------------------------------------------------- Fri Jun 4 11:51:55 UTC 2010 - coolo@novell.com diff --git a/fontconfig.spec b/fontconfig.spec index deffa95..bd5684b 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -59,6 +59,7 @@ Source14: suse-bitmaps.conf Source15: suse-font-dirs.conf Source20: local.conf.instsys Source30: 29-liberation-aliases.conf +Source31: 10-lcdfilter-lcddefault.conf # 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 Patch5: AppleRoman-DynaFont.patch @@ -162,10 +163,12 @@ install -m 644 conf.d/README $RPM_BUILD_ROOT/etc/fonts/conf.d install -m 644 $RPM_SOURCE_DIR/suse*.conf $RPM_BUILD_ROOT/etc/fonts/ install -m 644 $RPM_SOURCE_DIR/local.conf.instsys $RPM_BUILD_ROOT/etc/fonts/ install -m 644 $RPM_SOURCE_DIR/29-liberation-aliases.conf $RPM_BUILD_ROOT/etc/fonts/conf.avail +install -m 644 $RPM_SOURCE_DIR/10-lcdfilter-lcddefault.conf $RPM_BUILD_ROOT/etc/fonts/conf.avail # tune links in conf.d: pushd $RPM_BUILD_ROOT/etc/fonts/conf.d ln -s ../suse-font-dirs.conf 05-suse-font-dirs.conf ln -s ../conf.avail/29-liberation-aliases.conf 29-liberation-aliases.conf + ln -s ../conf.avail/10-lcdfilter-lcddefault.conf 10-lcdfilter-lcddefault.conf rm -f 50-user.conf rm -f 51-local.conf ln -s ../suse-pre-user.conf 50-suse-pre-user.conf From 3437228fedefaed682a2ac6c0bd049af37533a621659137f880296ac824537b1 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 31 Aug 2010 13:10:09 +0000 Subject: [PATCH 2/4] - add AvantGarde, NewCenturySchoolbook, ZapfChancery and ZapfDingbats aliases into 30-urw-aliases.conf as workaround to [bnc#434676] --> added urw-aliases-whitespaces.patch - see http://bugs.freedesktop.org/show_bug.cgi?id=19128 OBS-URL: https://build.opensuse.org/package/show/M17N/fontconfig?expand=0&rev=21 --- fontconfig.changes | 9 +++++++ fontconfig.spec | 2 ++ urw-aliases-whitespaces.patch | 44 +++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 urw-aliases-whitespaces.patch diff --git a/fontconfig.changes b/fontconfig.changes index 0d2773a..3774791 100644 --- a/fontconfig.changes +++ b/fontconfig.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Aug 31 14:29:08 CEST 2010 - pgajdos@suse.cz + +- add AvantGarde, NewCenturySchoolbook, ZapfChancery and + ZapfDingbats aliases into 30-urw-aliases.conf as + workaround to [bnc#434676] + --> added urw-aliases-whitespaces.patch +- see http://bugs.freedesktop.org/show_bug.cgi?id=19128 + ------------------------------------------------------------------- Fri Jul 23 08:39:25 UTC 2010 - mxwu@novell.com diff --git a/fontconfig.spec b/fontconfig.spec index bd5684b..f727170 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -69,6 +69,7 @@ Patch30: bugzilla-179457-fix-font-file-names-for-wine.patch Patch31: bugzilla-246783-do-not-crash-when-config-files-contain-broken-stuff.patch Patch32: usr-share-doc-packages.patch Patch33: bnc438855-make-FcInitReinitialize-work-again.patch +Patch34: urw-aliases-whitespaces.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -114,6 +115,7 @@ accepts font patterns and returns the nearest matching font. %patch31 -p1 %patch32 -p1 %patch33 -p1 +%patch34 -p1 %build %configure --with-pic \ diff --git a/urw-aliases-whitespaces.patch b/urw-aliases-whitespaces.patch new file mode 100644 index 0000000..81fdc6a --- /dev/null +++ b/urw-aliases-whitespaces.patch @@ -0,0 +1,44 @@ +Index: fontconfig-2.8.0/conf.d/30-urw-aliases.conf +=================================================================== +--- fontconfig-2.8.0.orig/conf.d/30-urw-aliases.conf ++++ fontconfig-2.8.0/conf.d/30-urw-aliases.conf +@@ -9,6 +9,10 @@ + Avant Garde + URW Gothic L + ++ ++ AvantGarde ++ URW Gothic L ++ + + Bookman + URW Bookman L +@@ -17,6 +21,10 @@ + New Century Schoolbook + Century Schoolbook L + ++ ++ NewCenturySchoolbook ++ Century Schoolbook L ++ + + Palatino + URW Palladio L +@@ -26,9 +34,17 @@ + URW Chancery L + + ++ ZapfChancery ++ URW Chancery L ++ ++ + Zapf Dingbats + Dingbats + ++ ++ ZapfDingbats ++ Dingbats ++ + + + Symbol From 5b6c7ec0655217b80d9be048127400766fb9c6241a1b39c7886669022694b8f2 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 9 Sep 2010 13:13:31 +0000 Subject: [PATCH 3/4] Accepting request 47265 from M17N checked in (request 47265) OBS-URL: https://build.opensuse.org/request/show/47265 OBS-URL: https://build.opensuse.org/package/show/M17N/fontconfig?expand=0&rev=22 --- 10-lcdfilter-lcddefault.conf | 9 ------- fontconfig.changes | 15 ------------ fontconfig.spec | 5 ---- urw-aliases-whitespaces.patch | 44 ----------------------------------- 4 files changed, 73 deletions(-) delete mode 100644 10-lcdfilter-lcddefault.conf delete mode 100644 urw-aliases-whitespaces.patch diff --git a/10-lcdfilter-lcddefault.conf b/10-lcdfilter-lcddefault.conf deleted file mode 100644 index ebec6df..0000000 --- a/10-lcdfilter-lcddefault.conf +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - lcddefault - - - diff --git a/fontconfig.changes b/fontconfig.changes index 3774791..91627d8 100644 --- a/fontconfig.changes +++ b/fontconfig.changes @@ -1,18 +1,3 @@ -------------------------------------------------------------------- -Tue Aug 31 14:29:08 CEST 2010 - pgajdos@suse.cz - -- add AvantGarde, NewCenturySchoolbook, ZapfChancery and - ZapfDingbats aliases into 30-urw-aliases.conf as - workaround to [bnc#434676] - --> added urw-aliases-whitespaces.patch -- see http://bugs.freedesktop.org/show_bug.cgi?id=19128 - -------------------------------------------------------------------- -Fri Jul 23 08:39:25 UTC 2010 - mxwu@novell.com - -- add 10-lcdfilter-lcddefault.conf. - * enable lcdfilter. - ------------------------------------------------------------------- Fri Jun 4 11:51:55 UTC 2010 - coolo@novell.com diff --git a/fontconfig.spec b/fontconfig.spec index f727170..deffa95 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -59,7 +59,6 @@ Source14: suse-bitmaps.conf Source15: suse-font-dirs.conf Source20: local.conf.instsys Source30: 29-liberation-aliases.conf -Source31: 10-lcdfilter-lcddefault.conf # 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 Patch5: AppleRoman-DynaFont.patch @@ -69,7 +68,6 @@ Patch30: bugzilla-179457-fix-font-file-names-for-wine.patch Patch31: bugzilla-246783-do-not-crash-when-config-files-contain-broken-stuff.patch Patch32: usr-share-doc-packages.patch Patch33: bnc438855-make-FcInitReinitialize-work-again.patch -Patch34: urw-aliases-whitespaces.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -115,7 +113,6 @@ accepts font patterns and returns the nearest matching font. %patch31 -p1 %patch32 -p1 %patch33 -p1 -%patch34 -p1 %build %configure --with-pic \ @@ -165,12 +162,10 @@ install -m 644 conf.d/README $RPM_BUILD_ROOT/etc/fonts/conf.d install -m 644 $RPM_SOURCE_DIR/suse*.conf $RPM_BUILD_ROOT/etc/fonts/ install -m 644 $RPM_SOURCE_DIR/local.conf.instsys $RPM_BUILD_ROOT/etc/fonts/ install -m 644 $RPM_SOURCE_DIR/29-liberation-aliases.conf $RPM_BUILD_ROOT/etc/fonts/conf.avail -install -m 644 $RPM_SOURCE_DIR/10-lcdfilter-lcddefault.conf $RPM_BUILD_ROOT/etc/fonts/conf.avail # tune links in conf.d: pushd $RPM_BUILD_ROOT/etc/fonts/conf.d ln -s ../suse-font-dirs.conf 05-suse-font-dirs.conf ln -s ../conf.avail/29-liberation-aliases.conf 29-liberation-aliases.conf - ln -s ../conf.avail/10-lcdfilter-lcddefault.conf 10-lcdfilter-lcddefault.conf rm -f 50-user.conf rm -f 51-local.conf ln -s ../suse-pre-user.conf 50-suse-pre-user.conf diff --git a/urw-aliases-whitespaces.patch b/urw-aliases-whitespaces.patch deleted file mode 100644 index 81fdc6a..0000000 --- a/urw-aliases-whitespaces.patch +++ /dev/null @@ -1,44 +0,0 @@ -Index: fontconfig-2.8.0/conf.d/30-urw-aliases.conf -=================================================================== ---- fontconfig-2.8.0.orig/conf.d/30-urw-aliases.conf -+++ fontconfig-2.8.0/conf.d/30-urw-aliases.conf -@@ -9,6 +9,10 @@ - Avant Garde - URW Gothic L - -+ -+ AvantGarde -+ URW Gothic L -+ - - Bookman - URW Bookman L -@@ -17,6 +21,10 @@ - New Century Schoolbook - Century Schoolbook L - -+ -+ NewCenturySchoolbook -+ Century Schoolbook L -+ - - Palatino - URW Palladio L -@@ -26,9 +34,17 @@ - URW Chancery L - - -+ ZapfChancery -+ URW Chancery L -+ -+ - Zapf Dingbats - Dingbats - -+ -+ ZapfDingbats -+ Dingbats -+ - - - Symbol From af6c4c6111cbb7df9f4962fdb34e332010801159264142f35f64c6db071d9d7b Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Thu, 9 Sep 2010 13:13:32 +0000 Subject: [PATCH 4/4] Updating link to change in openSUSE:Factory/fontconfig revision 36.0 OBS-URL: https://build.opensuse.org/package/show/M17N/fontconfig?expand=0&rev=70cc3450ff4f66371b06730b4299e184 --- 10-lcdfilter-lcddefault.conf | 9 +++++++ fontconfig.changes | 15 ++++++++++++ fontconfig.spec | 7 +++++- urw-aliases-whitespaces.patch | 44 +++++++++++++++++++++++++++++++++++ 4 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 10-lcdfilter-lcddefault.conf create mode 100644 urw-aliases-whitespaces.patch diff --git a/10-lcdfilter-lcddefault.conf b/10-lcdfilter-lcddefault.conf new file mode 100644 index 0000000..ebec6df --- /dev/null +++ b/10-lcdfilter-lcddefault.conf @@ -0,0 +1,9 @@ + + + + + + lcddefault + + + diff --git a/fontconfig.changes b/fontconfig.changes index 91627d8..3774791 100644 --- a/fontconfig.changes +++ b/fontconfig.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Aug 31 14:29:08 CEST 2010 - pgajdos@suse.cz + +- add AvantGarde, NewCenturySchoolbook, ZapfChancery and + ZapfDingbats aliases into 30-urw-aliases.conf as + workaround to [bnc#434676] + --> added urw-aliases-whitespaces.patch +- see http://bugs.freedesktop.org/show_bug.cgi?id=19128 + +------------------------------------------------------------------- +Fri Jul 23 08:39:25 UTC 2010 - mxwu@novell.com + +- add 10-lcdfilter-lcddefault.conf. + * enable lcdfilter. + ------------------------------------------------------------------- Fri Jun 4 11:51:55 UTC 2010 - coolo@novell.com diff --git a/fontconfig.spec b/fontconfig.spec index deffa95..278c27e 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -35,7 +35,7 @@ Obsoletes: fontconfig-64bit %endif Requires: bash Version: 2.8.0 -Release: 5 +Release: 10 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 @@ -59,6 +59,7 @@ Source14: suse-bitmaps.conf Source15: suse-font-dirs.conf Source20: local.conf.instsys Source30: 29-liberation-aliases.conf +Source31: 10-lcdfilter-lcddefault.conf # 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 Patch5: AppleRoman-DynaFont.patch @@ -68,6 +69,7 @@ Patch30: bugzilla-179457-fix-font-file-names-for-wine.patch Patch31: bugzilla-246783-do-not-crash-when-config-files-contain-broken-stuff.patch Patch32: usr-share-doc-packages.patch Patch33: bnc438855-make-FcInitReinitialize-work-again.patch +Patch34: urw-aliases-whitespaces.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -113,6 +115,7 @@ accepts font patterns and returns the nearest matching font. %patch31 -p1 %patch32 -p1 %patch33 -p1 +%patch34 -p1 %build %configure --with-pic \ @@ -162,10 +165,12 @@ install -m 644 conf.d/README $RPM_BUILD_ROOT/etc/fonts/conf.d install -m 644 $RPM_SOURCE_DIR/suse*.conf $RPM_BUILD_ROOT/etc/fonts/ install -m 644 $RPM_SOURCE_DIR/local.conf.instsys $RPM_BUILD_ROOT/etc/fonts/ install -m 644 $RPM_SOURCE_DIR/29-liberation-aliases.conf $RPM_BUILD_ROOT/etc/fonts/conf.avail +install -m 644 $RPM_SOURCE_DIR/10-lcdfilter-lcddefault.conf $RPM_BUILD_ROOT/etc/fonts/conf.avail # tune links in conf.d: pushd $RPM_BUILD_ROOT/etc/fonts/conf.d ln -s ../suse-font-dirs.conf 05-suse-font-dirs.conf ln -s ../conf.avail/29-liberation-aliases.conf 29-liberation-aliases.conf + ln -s ../conf.avail/10-lcdfilter-lcddefault.conf 10-lcdfilter-lcddefault.conf rm -f 50-user.conf rm -f 51-local.conf ln -s ../suse-pre-user.conf 50-suse-pre-user.conf diff --git a/urw-aliases-whitespaces.patch b/urw-aliases-whitespaces.patch new file mode 100644 index 0000000..81fdc6a --- /dev/null +++ b/urw-aliases-whitespaces.patch @@ -0,0 +1,44 @@ +Index: fontconfig-2.8.0/conf.d/30-urw-aliases.conf +=================================================================== +--- fontconfig-2.8.0.orig/conf.d/30-urw-aliases.conf ++++ fontconfig-2.8.0/conf.d/30-urw-aliases.conf +@@ -9,6 +9,10 @@ + Avant Garde + URW Gothic L + ++ ++ AvantGarde ++ URW Gothic L ++ + + Bookman + URW Bookman L +@@ -17,6 +21,10 @@ + New Century Schoolbook + Century Schoolbook L + ++ ++ NewCenturySchoolbook ++ Century Schoolbook L ++ + + Palatino + URW Palladio L +@@ -26,9 +34,17 @@ + URW Chancery L + + ++ ZapfChancery ++ URW Chancery L ++ ++ + Zapf Dingbats + Dingbats + ++ ++ ZapfDingbats ++ Dingbats ++ + + + Symbol