From 3523b8c6d5b7535b9ba99b8abbeb057c734023f04523e3f52f03c6bea09a99a7 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Mon, 7 Dec 2009 10:13:48 +0000 Subject: [PATCH] - updated to version 2.8.0 (see README) OBS-URL: https://build.opensuse.org/package/show/M17N/fontconfig?expand=0&rev=8 --- ...en-config-files-contain-broken-stuff.patch | 13 +-- fix-build-for-10.0.patch | 36 --------- fontconfig-2.7.0.tar.bz2 | 3 - fontconfig-2.8.0.tar.bz2 | 3 + fontconfig.changes | 10 +++ fontconfig.spec | 8 +- usr-share-doc-packages.patch | 80 ++++++++++--------- 7 files changed, 67 insertions(+), 86 deletions(-) delete mode 100644 fix-build-for-10.0.patch delete mode 100644 fontconfig-2.7.0.tar.bz2 create mode 100644 fontconfig-2.8.0.tar.bz2 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 index 3582c86..8c60d6f 100644 --- 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 @@ -1,7 +1,8 @@ -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 @@ +Index: fontconfig-2.7.0/src/fcxml.c +=================================================================== +--- fontconfig-2.7.0.orig/src/fcxml.c ++++ fontconfig-2.7.0/src/fcxml.c +@@ -539,6 +539,9 @@ FcTypecheckExpr (FcConfigParse *parse, F { const FcObjectType *o; const FcConstant *c; @@ -9,5 +10,5 @@ diff -ru fontconfig-2.4.2.orig/src/fcxml.c fontconfig-2.4.2/src/fcxml.c + if (!expr) + return; - switch (expr->op) { - case FcOpInteger: + /* If parsing the expression failed, some nodes may be NULL */ + if (!expr) diff --git a/fix-build-for-10.0.patch b/fix-build-for-10.0.patch deleted file mode 100644 index 9f0c5ab..0000000 --- a/fix-build-for-10.0.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -ru fontconfig-2.3.94.orig/configure.in fontconfig-2.3.94/configure.in ---- fontconfig-2.3.94.orig/configure.in 2006-03-10 15:59:31.000000000 +0100 -+++ fontconfig-2.3.94/configure.in 2006-04-04 17:25:40.000000000 +0200 -@@ -300,19 +300,19 @@ - esac - fi - --# --# Check libxml2 configuration --# -- --AC_ARG_ENABLE(libxml2, [ --enable-libxml2 Use libxml2 instead of Expat]) -- --if test "$enable_libxml2" = "yes" -o "$expat" = "no"; then -- PKG_CHECK_MODULES([LIBXML2], [libxml-2.0 >= 2.6]) -- AC_DEFINE_UNQUOTED(ENABLE_LIBXML2,1,[Use libxml2 instead of Expat]) -- -- AC_SUBST(LIBXML2_CFLAGS) -- AC_SUBST(LIBXML2_LIBS) --fi -+## -+## Check libxml2 configuration -+## -+# -+#AC_ARG_ENABLE(libxml2, [ --enable-libxml2 Use libxml2 instead of Expat]) -+# -+#if test "$enable_libxml2" = "yes" -o "$expat" = "no"; then -+# PKG_CHECK_MODULES([LIBXML2], [libxml-2.0 >= 2.6]) -+# AC_DEFINE_UNQUOTED(ENABLE_LIBXML2,1,[Use libxml2 instead of Expat]) -+# -+# AC_SUBST(LIBXML2_CFLAGS) -+# AC_SUBST(LIBXML2_LIBS) -+#fi - - # - # Set default font directory diff --git a/fontconfig-2.7.0.tar.bz2 b/fontconfig-2.7.0.tar.bz2 deleted file mode 100644 index 397ce32..0000000 --- a/fontconfig-2.7.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5004a4d79f6fb284d73d9f3377f668fca40bf370a0b46c63258223d7fd2e0d09 -size 1251603 diff --git a/fontconfig-2.8.0.tar.bz2 b/fontconfig-2.8.0.tar.bz2 new file mode 100644 index 0000000..aa555e5 --- /dev/null +++ b/fontconfig-2.8.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd7477f7ae1fbbca3e653ba3d294263b62f3019497c4d2df8dc960558f3636c2 +size 1255996 diff --git a/fontconfig.changes b/fontconfig.changes index 50cc057..6da841a 100644 --- a/fontconfig.changes +++ b/fontconfig.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Dec 7 11:14:35 CET 2009 - pgajdos@suse.cz + +- updated to version 2.8.0 (see README) + +------------------------------------------------------------------- +Tue Nov 3 19:09:16 UTC 2009 - coolo@novell.com + +- updated patches to apply with fuzz=0 + ------------------------------------------------------------------- Mon Aug 31 16:14:45 CEST 2009 - tiwai@suse.de diff --git a/fontconfig.spec b/fontconfig.spec index 7874fe7..1718dc0 100644 --- a/fontconfig.spec +++ b/fontconfig.spec @@ -24,7 +24,7 @@ BuildRequires: freetype2-devel libexpat-devel pkgconfig %if %{build_docs} BuildRequires: docbook-dsssl-stylesheets docbook-utils docbook_3 docbook_4 iso_ent jadetex libpng libxml2 libxml2-devel lynx openjade opensp perl-SGMLS sgml-skel tetex %endif -License: Public Domain, Freeware ; MIT License (or similar) +License: Public Domain, Freeware ; MIT License (or similar) Provides: XFree86:/etc/fonts/fonts.dtd Group: System/Libraries Url: http://fontconfig.org/ @@ -34,8 +34,8 @@ AutoReqProv: on Obsoletes: fontconfig-64bit %endif Requires: bash -Version: 2.7.0 -Release: 2 +Version: 2.8.0 +Release: 3 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,7 +63,6 @@ Source30: 29-liberation-aliases.conf Patch5: AppleRoman-DynaFont.patch Patch10: conf.patch Patch16: make-check.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: usr-share-doc-packages.patch @@ -121,7 +120,6 @@ Authors: %patch5 -p0 -b .dynafont %patch10 -p1 -b .fonts.conf %patch16 -p1 -#%patch29 -p1 #%patch30 -p1 %patch31 -p1 %patch32 -p1 diff --git a/usr-share-doc-packages.patch b/usr-share-doc-packages.patch index b725828..fee8339 100644 --- a/usr-share-doc-packages.patch +++ b/usr-share-doc-packages.patch @@ -1,7 +1,8 @@ -diff -ru fontconfig-2.6.0//fc-cache/fc-cache.1 fontconfig-2.6.0.new//fc-cache/fc-cache.1 ---- fontconfig-2.6.0//fc-cache/fc-cache.1 2008-05-05 17:13:40.000000000 +0200 -+++ fontconfig-2.6.0.new//fc-cache/fc-cache.1 2008-10-29 19:08:52.000000000 +0100 -@@ -68,7 +68,7 @@ +Index: fontconfig-2.7.0/fc-cache/fc-cache.1 +=================================================================== +--- fontconfig-2.7.0.orig/fc-cache/fc-cache.1 ++++ fontconfig-2.7.0/fc-cache/fc-cache.1 +@@ -68,7 +68,7 @@ appropriate fonts. \fBfc-list\fR (1). .PP The fontconfig user's guide, in HTML format: @@ -10,11 +11,12 @@ diff -ru fontconfig-2.6.0//fc-cache/fc-cache.1 fontconfig-2.6.0.new//fc-cache/fc .SH "AUTHOR" .PP This manual page was written by Keith Packard -diff -ru fontconfig-2.6.0//fc-cache/fc-cache.sgml fontconfig-2.6.0.new//fc-cache/fc-cache.sgml ---- fontconfig-2.6.0//fc-cache/fc-cache.sgml 2006-09-04 00:37:14.000000000 +0200 -+++ fontconfig-2.6.0.new//fc-cache/fc-cache.sgml 2008-10-29 19:08:59.000000000 +0100 -@@ -177,7 +177,7 @@ - fc-list (1). +Index: fontconfig-2.7.0/fc-cache/fc-cache.sgml +=================================================================== +--- fontconfig-2.7.0.orig/fc-cache/fc-cache.sgml ++++ fontconfig-2.7.0/fc-cache/fc-cache.sgml +@@ -180,7 +180,7 @@ manpage.1: manpage.sgml + The fontconfig user's guide, in HTML format: - /usr/share/doc/fontconfig/fontconfig-user.html. @@ -22,10 +24,11 @@ diff -ru fontconfig-2.6.0//fc-cache/fc-cache.sgml fontconfig-2.6.0.new//fc-cache -diff -ru fontconfig-2.6.0//fc-cat/fc-cat.1 fontconfig-2.6.0.new//fc-cat/fc-cat.1 ---- fontconfig-2.6.0//fc-cat/fc-cat.1 2008-05-05 17:13:41.000000000 +0200 -+++ fontconfig-2.6.0.new//fc-cat/fc-cat.1 2008-10-29 19:09:20.000000000 +0100 -@@ -38,7 +38,7 @@ +Index: fontconfig-2.7.0/fc-cat/fc-cat.1 +=================================================================== +--- fontconfig-2.7.0.orig/fc-cat/fc-cat.1 ++++ fontconfig-2.7.0/fc-cat/fc-cat.1 +@@ -31,7 +31,7 @@ Show version of the program and exit. \fBfc-cache\fR (1). .PP The fontconfig user's guide, in HTML format: @@ -34,11 +37,12 @@ diff -ru fontconfig-2.6.0//fc-cat/fc-cat.1 fontconfig-2.6.0.new//fc-cat/fc-cat.1 .SH "AUTHOR" .PP This manual page was written by Patrick Lam \&. -diff -ru fontconfig-2.6.0//fc-cat/fc-cat.sgml fontconfig-2.6.0.new//fc-cat/fc-cat.sgml ---- fontconfig-2.6.0//fc-cat/fc-cat.sgml 2006-12-03 00:08:03.000000000 +0100 -+++ fontconfig-2.6.0.new//fc-cat/fc-cat.sgml 2008-10-29 19:09:08.000000000 +0100 -@@ -130,7 +130,7 @@ - fc-cache (1). +Index: fontconfig-2.7.0/fc-cat/fc-cat.sgml +=================================================================== +--- fontconfig-2.7.0.orig/fc-cat/fc-cat.sgml ++++ fontconfig-2.7.0/fc-cat/fc-cat.sgml +@@ -139,7 +139,7 @@ manpage.1: manpage.sgml + The fontconfig user's guide, in HTML format: - /usr/share/doc/fontconfig/fontconfig-user.html. @@ -46,10 +50,11 @@ diff -ru fontconfig-2.6.0//fc-cat/fc-cat.sgml fontconfig-2.6.0.new//fc-cat/fc-ca -diff -ru fontconfig-2.6.0//fc-list/fc-list.1 fontconfig-2.6.0.new//fc-list/fc-list.1 ---- fontconfig-2.6.0//fc-list/fc-list.1 2008-05-05 17:13:42.000000000 +0200 -+++ fontconfig-2.6.0.new//fc-list/fc-list.1 2008-10-29 19:06:43.000000000 +0100 -@@ -54,7 +54,7 @@ +Index: fontconfig-2.7.0/fc-list/fc-list.1 +=================================================================== +--- fontconfig-2.7.0.orig/fc-list/fc-list.1 ++++ fontconfig-2.7.0/fc-list/fc-list.1 +@@ -54,7 +54,7 @@ fonts. \fBfc-cache\fR (1). .PP The fontconfig user's guide, in HTML format: @@ -58,11 +63,12 @@ diff -ru fontconfig-2.6.0//fc-list/fc-list.1 fontconfig-2.6.0.new//fc-list/fc-li .SH "AUTHOR" .PP This manual page was written by Keith Packard -diff -ru fontconfig-2.6.0//fc-list/fc-list.sgml fontconfig-2.6.0.new//fc-list/fc-list.sgml ---- fontconfig-2.6.0//fc-list/fc-list.sgml 2006-08-27 23:36:52.000000000 +0200 -+++ fontconfig-2.6.0.new//fc-list/fc-list.sgml 2008-10-29 19:08:27.000000000 +0100 -@@ -158,7 +158,7 @@ - fc-cache (1). +Index: fontconfig-2.7.0/fc-list/fc-list.sgml +=================================================================== +--- fontconfig-2.7.0.orig/fc-list/fc-list.sgml ++++ fontconfig-2.7.0/fc-list/fc-list.sgml +@@ -184,7 +184,7 @@ manpage.1: manpage.sgml + The fontconfig user's guide, in HTML format: - /usr/share/doc/fontconfig/fontconfig-user.html. @@ -70,10 +76,11 @@ diff -ru fontconfig-2.6.0//fc-list/fc-list.sgml fontconfig-2.6.0.new//fc-list/fc -diff -ru fontconfig-2.6.0//fc-match/fc-match.1 fontconfig-2.6.0.new//fc-match/fc-match.1 ---- fontconfig-2.6.0//fc-match/fc-match.1 2008-05-05 17:13:42.000000000 +0200 -+++ fontconfig-2.6.0.new//fc-match/fc-match.1 2008-10-29 19:07:54.000000000 +0100 -@@ -45,7 +45,7 @@ +Index: fontconfig-2.7.0/fc-match/fc-match.1 +=================================================================== +--- fontconfig-2.7.0.orig/fc-match/fc-match.1 ++++ fontconfig-2.7.0/fc-match/fc-match.1 +@@ -45,7 +45,7 @@ Displays fonts matching \fBfc-list\fR (1). .PP The fontconfig user's guide, in HTML format: @@ -82,11 +89,12 @@ diff -ru fontconfig-2.6.0//fc-match/fc-match.1 fontconfig-2.6.0.new//fc-match/fc .SH "AUTHOR" .PP This manual page was updated by Patrick Lam \&. -diff -ru fontconfig-2.6.0//fc-match/fc-match.sgml fontconfig-2.6.0.new//fc-match/fc-match.sgml ---- fontconfig-2.6.0//fc-match/fc-match.sgml 2006-09-04 00:37:14.000000000 +0200 -+++ fontconfig-2.6.0.new//fc-match/fc-match.sgml 2008-10-29 19:08:06.000000000 +0100 -@@ -140,7 +140,7 @@ - fc-list (1). +Index: fontconfig-2.7.0/fc-match/fc-match.sgml +=================================================================== +--- fontconfig-2.7.0.orig/fc-match/fc-match.sgml ++++ fontconfig-2.7.0/fc-match/fc-match.sgml +@@ -186,7 +186,7 @@ output is requested. + The fontconfig user's guide, in HTML format: - /usr/share/doc/fontconfig/fontconfig-user.html.