pool/fontconfig
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- updated to version 2.8.0 (see README)

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/M17N/fontconfig?expand=0&rev=8
This commit is contained in:
Petr Gajdos 2009-12-07 10:13:48 +00:00 committed by Git OBS Bridge
parent 97067dae06
commit 3523b8c6d5
7 changed files with 67 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bugzilla-246783-do-not-crash-when-config-files-contain-broken-stuff.patch
View File

@ -1,7 +1,8 @@
diff -ru fontconfig-2.4.2.orig/src/fcxml.c fontconfig-2.4.2/src/fcxml.c Index: fontconfig-2.7.0/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 --- fontconfig-2.7.0.orig/src/fcxml.c
@@ -557,6 +557,9 @@ +++ fontconfig-2.7.0/src/fcxml.c
@@ -539,6 +539,9 @@ FcTypecheckExpr (FcConfigParse *parse, F
{ {
const FcObjectType *o; const FcObjectType *o;
const FcConstant *c; 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) + if (!expr)
+ return; + return;
switch (expr->op) { /* If parsing the expression failed, some nodes may be NULL */
case FcOpInteger: if (!expr)

36
fix-build-for-10.0.patch
View File

@ -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

3
fontconfig-2.7.0.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5004a4d79f6fb284d73d9f3377f668fca40bf370a0b46c63258223d7fd2e0d09
size 1251603

3
fontconfig-2.8.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fd7477f7ae1fbbca3e653ba3d294263b62f3019497c4d2df8dc960558f3636c2
size 1255996

10
fontconfig.changes
View File

@ -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 Mon Aug 31 16:14:45 CEST 2009 - tiwai@suse.de

6
fontconfig.spec
View File

@ -34,8 +34,8 @@ AutoReqProv: on
Obsoletes: fontconfig-64bit Obsoletes: fontconfig-64bit
%endif %endif
Requires: bash Requires: bash
Version: 2.7.0 Version: 2.8.0
Release: 2 Release: 3
Summary: Library for Font Configuration Summary: Library for Font Configuration
# CVS can be found here: (CVS is gone, fontconfig uses git now). # CVS can be found here: (CVS is gone, fontconfig uses git now).
# $ cvs -d :pserver:anoncvs@pdx.freedesktop.org:/cvs/fontconfig login # $ cvs -d :pserver:anoncvs@pdx.freedesktop.org:/cvs/fontconfig login
@ -63,7 +63,6 @@ Source30: 29-liberation-aliases.conf
Patch5: AppleRoman-DynaFont.patch Patch5: AppleRoman-DynaFont.patch
Patch10: conf.patch Patch10: conf.patch
Patch16: make-check.patch Patch16: make-check.patch
Patch29: fix-build-for-10.0.patch
Patch30: bugzilla-179457-fix-font-file-names-for-wine.patch Patch30: bugzilla-179457-fix-font-file-names-for-wine.patch
Patch31: bugzilla-246783-do-not-crash-when-config-files-contain-broken-stuff.patch Patch31: bugzilla-246783-do-not-crash-when-config-files-contain-broken-stuff.patch
Patch32: usr-share-doc-packages.patch Patch32: usr-share-doc-packages.patch
@ -121,7 +120,6 @@ Authors:
%patch5 -p0 -b .dynafont %patch5 -p0 -b .dynafont
%patch10 -p1 -b .fonts.conf %patch10 -p1 -b .fonts.conf
%patch16 -p1 %patch16 -p1
#%patch29 -p1
#%patch30 -p1 #%patch30 -p1
%patch31 -p1 %patch31 -p1
%patch32 -p1 %patch32 -p1

80
usr-share-doc-packages.patch
View File

@ -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 Index: fontconfig-2.7.0/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 --- fontconfig-2.7.0.orig/fc-cache/fc-cache.1
@@ -68,7 +68,7 @@ +++ fontconfig-2.7.0/fc-cache/fc-cache.1
@@ -68,7 +68,7 @@ appropriate fonts.
\fBfc-list\fR (1). \fBfc-list\fR (1).
.PP .PP
The fontconfig user's guide, in HTML format: 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" .SH "AUTHOR"
.PP .PP
This manual page was written by Keith Packard 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 Index: fontconfig-2.7.0/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 --- fontconfig-2.7.0.orig/fc-cache/fc-cache.sgml
@@ -177,7 +177,7 @@ +++ fontconfig-2.7.0/fc-cache/fc-cache.sgml
<para><command>fc-list</command> (1).</para> @@ -180,7 +180,7 @@ manpage.1: manpage.sgml
</para>
<para>The fontconfig user's guide, in HTML format: <para>The fontconfig user's guide, in HTML format:
- <filename>/usr/share/doc/fontconfig/fontconfig-user.html</filename>.</para> - <filename>/usr/share/doc/fontconfig/fontconfig-user.html</filename>.</para>
@ -22,10 +24,11 @@ diff -ru fontconfig-2.6.0//fc-cache/fc-cache.sgml fontconfig-2.6.0.new//fc-cache
</refsect1> </refsect1>
<refsect1> <refsect1>
diff -ru fontconfig-2.6.0//fc-cat/fc-cat.1 fontconfig-2.6.0.new//fc-cat/fc-cat.1 Index: fontconfig-2.7.0/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 --- fontconfig-2.7.0.orig/fc-cat/fc-cat.1
@@ -38,7 +38,7 @@ +++ fontconfig-2.7.0/fc-cat/fc-cat.1
@@ -31,7 +31,7 @@ Show version of the program and exit.
\fBfc-cache\fR (1). \fBfc-cache\fR (1).
.PP .PP
The fontconfig user's guide, in HTML format: 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" .SH "AUTHOR"
.PP .PP
This manual page was written by Patrick Lam <plam@mit.edu>\&. This manual page was written by Patrick Lam <plam@mit.edu>\&.
diff -ru fontconfig-2.6.0//fc-cat/fc-cat.sgml fontconfig-2.6.0.new//fc-cat/fc-cat.sgml Index: fontconfig-2.7.0/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 --- fontconfig-2.7.0.orig/fc-cat/fc-cat.sgml
@@ -130,7 +130,7 @@ +++ fontconfig-2.7.0/fc-cat/fc-cat.sgml
<para><command>fc-cache</command> (1).</para> @@ -139,7 +139,7 @@ manpage.1: manpage.sgml
</para>
<para>The fontconfig user's guide, in HTML format: <para>The fontconfig user's guide, in HTML format:
- <filename>/usr/share/doc/fontconfig/fontconfig-user.html</filename>.</para> - <filename>/usr/share/doc/fontconfig/fontconfig-user.html</filename>.</para>
@ -46,10 +50,11 @@ diff -ru fontconfig-2.6.0//fc-cat/fc-cat.sgml fontconfig-2.6.0.new//fc-cat/fc-ca
</refsect1> </refsect1>
<refsect1> <refsect1>
diff -ru fontconfig-2.6.0//fc-list/fc-list.1 fontconfig-2.6.0.new//fc-list/fc-list.1 Index: fontconfig-2.7.0/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 --- fontconfig-2.7.0.orig/fc-list/fc-list.1
@@ -54,7 +54,7 @@ +++ fontconfig-2.7.0/fc-list/fc-list.1
@@ -54,7 +54,7 @@ fonts.
\fBfc-cache\fR (1). \fBfc-cache\fR (1).
.PP .PP
The fontconfig user's guide, in HTML format: 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" .SH "AUTHOR"
.PP .PP
This manual page was written by Keith Packard 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 Index: fontconfig-2.7.0/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 --- fontconfig-2.7.0.orig/fc-list/fc-list.sgml
@@ -158,7 +158,7 @@ +++ fontconfig-2.7.0/fc-list/fc-list.sgml
<para><command>fc-cache</command> (1).</para> @@ -184,7 +184,7 @@ manpage.1: manpage.sgml
</para>
<para>The fontconfig user's guide, in HTML format: <para>The fontconfig user's guide, in HTML format:
- <filename>/usr/share/doc/fontconfig/fontconfig-user.html</filename>.</para> - <filename>/usr/share/doc/fontconfig/fontconfig-user.html</filename>.</para>
@ -70,10 +76,11 @@ diff -ru fontconfig-2.6.0//fc-list/fc-list.sgml fontconfig-2.6.0.new//fc-list/fc
</refsect1> </refsect1>
<refsect1> <refsect1>
diff -ru fontconfig-2.6.0//fc-match/fc-match.1 fontconfig-2.6.0.new//fc-match/fc-match.1 Index: fontconfig-2.7.0/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 --- fontconfig-2.7.0.orig/fc-match/fc-match.1
@@ -45,7 +45,7 @@ +++ fontconfig-2.7.0/fc-match/fc-match.1
@@ -45,7 +45,7 @@ Displays fonts matching
\fBfc-list\fR (1). \fBfc-list\fR (1).
.PP .PP
The fontconfig user's guide, in HTML format: 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" .SH "AUTHOR"
.PP .PP
This manual page was updated by Patrick Lam <plam@csail.mit.edu>\&. This manual page was updated by Patrick Lam <plam@csail.mit.edu>\&.
diff -ru fontconfig-2.6.0//fc-match/fc-match.sgml fontconfig-2.6.0.new//fc-match/fc-match.sgml Index: fontconfig-2.7.0/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 --- fontconfig-2.7.0.orig/fc-match/fc-match.sgml
@@ -140,7 +140,7 @@ +++ fontconfig-2.7.0/fc-match/fc-match.sgml
<para><command>fc-list</command> (1).</para> @@ -186,7 +186,7 @@ output is requested.</para>
</para>
<para>The fontconfig user's guide, in HTML format: <para>The fontconfig user's guide, in HTML format:
- <filename>/usr/share/doc/fontconfig/fontconfig-user.html</filename>.</para> - <filename>/usr/share/doc/fontconfig/fontconfig-user.html</filename>.</para>