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

- updated to 2.9.0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/M17N/fontconfig?expand=0&rev=52
This commit is contained in:
Petr Gajdos 2012-03-21 15:00:33 +00:00 committed by Git OBS Bridge
parent b99ec86db0
commit 6dec40393d
20 changed files with 79 additions and 488 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
10-lcdfilter-lcddefault.conf
View File

@ -1,9 +0,0 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<match target="font">
<edit mode="assign" name="lcdfilter">
<const>lcddefault</const>
</edit>
</match>
</fontconfig>

18
AppleRoman-DynaFont.patch
View File

@ -1,18 +0,0 @@
--- src/fcfreetype.c~ 2004-03-02 23:54:42.000000000 +0800
+++ src/fcfreetype.c 2004-04-01 18:06:44.154517544 +0800
@@ -1204,6 +1204,7 @@
{ 0x007C, 0x7C }, /* VERTICAL LINE */
{ 0x007D, 0x7D }, /* RIGHT CURLY BRACKET */
{ 0x007E, 0x7E }, /* TILDE */
+#if 0
{ 0x00A0, 0xCA }, /* NO-BREAK SPACE */
{ 0x00A1, 0xC1 }, /* INVERTED EXCLAMATION MARK */
{ 0x00A2, 0xA2 }, /* CENT SIGN */
@@ -1332,6 +1333,7 @@
{ 0xF8FF, 0xF0 }, /* Apple logo */
{ 0xFB01, 0xDE }, /* LATIN SMALL LIGATURE FI */
{ 0xFB02, 0xDF }, /* LATIN SMALL LIGATURE FL */
+#endif
};
static const FcCharMap AppleRoman = {

20
bnc438855-make-FcInitReinitialize-work-again.patch
View File

@ -1,20 +0,0 @@
diff -rup fontconfig-2.6.0.orig//src/fccache.c fontconfig-2.6.0/src/fccache.c
--- fontconfig-2.6.0.orig//src/fccache.c 2007-11-14 01:36:41.000000000 +0100
+++ fontconfig-2.6.0/src/fccache.c 2008-11-07 17:08:46.000000000 +0100
@@ -254,6 +254,7 @@ FcDirCacheProcess (FcConfig *config, con
break;
fd = FcDirCacheOpenFile (cache_hashed, &file_stat);
if (fd >= 0) {
+ if (dir_stat.st_mtime <= file_stat.st_mtime) {
ret = (*callback) (fd, &file_stat, &dir_stat, closure);
close (fd);
if (ret)
@@ -264,6 +265,8 @@ FcDirCacheProcess (FcConfig *config, con
FcStrFree (cache_hashed);
break;
}
+ } else
+ close (fd);
}
FcStrFree (cache_hashed);
}

98
bugzilla-179457-fix-font-file-names-for-wine.patch
View File

@ -1,98 +0,0 @@
diff -ru fontconfig-2.3.94.orig/src/fcpat.c fontconfig-2.3.94/src/fcpat.c
--- fontconfig-2.3.94.orig/src/fcpat.c 2006-03-10 16:00:36.000000000 +0100
+++ fontconfig-2.3.94/src/fcpat.c 2006-06-02 13:27:57.000000000 +0200
@@ -1098,6 +1112,39 @@
return FcPatternAdd (p, object, v, FcTrue);
}
+static FcResult
+FcPatternGetFile (const FcPattern *p, const char *object, int id, FcChar8 ** s)
+{
+ const char *fn, *fpath;
+ FcChar8 *fname;
+ int size;
+
+ fn = FcPatternFindFullFname(p);
+ if (fn)
+ {
+ *s = (FcChar8 *) fn;
+ return FcResultMatch;
+ }
+
+ if (!p->bank)
+ return FcResultMatch;
+
+ fpath = FcCacheFindBankDir (p->bank);
+ size = strlen((char *)fpath) + 1 + strlen ((char *)*s) + 1;
+ fname = malloc (size);
+ if (!fname)
+ return FcResultOutOfMemory;
+
+ FcMemAlloc (FC_MEM_STRING, size);
+ strcpy ((char *)fname, (char *)fpath);
+ strcat ((char *)fname, "/");
+ strcat ((char *)fname, (char *)*s);
+
+ FcPatternAddFullFname (p, (const char *)fname);
+ *s = (FcChar8 *)fname;
+ return FcResultMatch;
+}
+
FcResult
FcPatternGet (const FcPattern *p, const char *object, int id, FcValue *v)
{
@@ -1112,6 +1159,12 @@
if (!id)
{
*v = FcValueCanonicalize(&FcValueListPtrU(l)->value);
+
+ /* Pull the FC_FILE trick here too. */
+ if (v->type == FcTypeString &&
+ FcObjectToPtr(object) == FcObjectToPtr(FC_FILE))
+ return FcPatternGetFile (p, object, id, (FcChar8 **)&(v->u.s));
+
return FcResultMatch;
}
id--;
@@ -1175,41 +1228,6 @@
if (v.type != FcTypeString)
return FcResultTypeMismatch;
- if (FcObjectToPtr(object) == FcObjectToPtr(FC_FILE))
- {
- const char *fn, *fpath;
- FcChar8 *fname;
- int size;
-
- fn = FcPatternFindFullFname(p);
- if (fn)
- {
- *s = (FcChar8 *) fn;
- return FcResultMatch;
- }
-
- if (!p->bank)
- {
- *s = (FcChar8 *) v.u.s;
- return FcResultMatch;
- }
-
- fpath = FcCacheFindBankDir (p->bank);
- size = strlen((char*)fpath) + 1 + strlen ((char *)v.u.s) + 1;
- fname = malloc (size);
- if (!fname)
- return FcResultOutOfMemory;
-
- FcMemAlloc (FC_MEM_STRING, size);
- strcpy ((char *)fname, (char *)fpath);
- strcat ((char *)fname, "/");
- strcat ((char *)fname, (char *)v.u.s);
-
- FcPatternAddFullFname (p, (const char *)fname);
- *s = (FcChar8 *)fname;
- return FcResultMatch;
- }
-
*s = (FcChar8 *) v.u.s;
return FcResultMatch;
}

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

@ -1,14 +0,0 @@
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;
+
+ if (!expr)
+ return;
/* If parsing the expression failed, some nodes may be NULL */
if (!expr)

39
conf.patch
View File

@ -1,19 +1,26 @@
diff -ru fontconfig-2.6.0.orig//conf.d/40-nonlatin.conf fontconfig-2.6.0/conf.d/40-nonlatin.conf
--- fontconfig-2.6.0.orig//conf.d/40-nonlatin.conf 2008-05-25 00:45:51.000000000 +0200
+++ fontconfig-2.6.0/conf.d/40-nonlatin.conf 2008-09-10 17:20:32.000000000 +0200
@@ -24,6 +24,7 @@
<family>ＭＳ 明朝</family>
<family>UnBatang</family>
<family>Baekmuk Batang</family>
Index: fontconfig-2.9.0/conf.d/40-nonlatin.conf
===================================================================
--- fontconfig-2.9.0.orig/conf.d/40-nonlatin.conf
+++ fontconfig-2.9.0/conf.d/40-nonlatin.conf
@@ -89,6 +89,10 @@
<family>FreeSerif</family>
<default><family>serif</family></default>
</alias>
+ <alias>
+ <family>SimSun</family>
<family>MgOpen Canonica</family>
<family>Sazanami Mincho</family>
<family>AR PL ZenKai Uni</family>
@@ -49,7 +50,6 @@
<family>ＭＳ ゴシック</family>
<family>UnDotum</family>
<family>Baekmuk Dotum</family>
+ <default><family>sans</family></default>
+ </alias>
<!--
Sans-serif faces
-->
@@ -153,10 +157,6 @@
<default><family>sans-serif</family></default>
</alias>
<alias>
- <family>SimSun</family>
- <default><family>sans-serif</family></default>
- </alias>
- <alias>
<family>MgOpen Modata</family>
<family>Sazanami Gothic</family>
<family>AR PL ShanHeiSun Uni</family>
<default><family>sans-serif</family></default>
</alias>

3
fontconfig-2.8.0.tar.bz2
View File

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

3
fontconfig-2.9.0-doc.tar.bz2 Normal file
View File

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

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

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

0
fontconfig-doc-2.8.0.tar.bz2 → fontconfig-doc-2.9.0.tar.bz2
View File

60
fontconfig-ocloexec.patch
View File

@ -1,60 +0,0 @@
--- configure.in.orig
+++ configure.in
@@ -58,7 +58,9 @@ dnl ====================================
AM_CONFIG_HEADER(config.h)
-AC_PROG_CC
+AC_PROG_CC_STDC
+AC_USE_SYSTEM_EXTENSIONS
+AC_SYS_LARGEFILE
AC_PROG_INSTALL
AC_PROG_LN_S
AC_LIBTOOL_WIN32_DLL
@@ -168,7 +170,7 @@ AC_TYPE_PID_T
# Checks for library functions.
AC_FUNC_VPRINTF
AC_FUNC_MMAP
-AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand random lrand48])
+AC_CHECK_FUNCS([geteuid getuid link memmove memset mkstemp mkostemp strchr strrchr strtol getopt getopt_long sysconf ftruncate chsize rand random lrand48])
#
# Checks for iconv
--- src/fcatomic.c.orig
+++ src/fcatomic.c
@@ -107,10 +107,14 @@ FcAtomicLock (FcAtomic *atomic)
#ifdef HAVE_LINK
strcpy ((char *) atomic->tmp, (char *) atomic->file);
strcat ((char *) atomic->tmp, TMP_NAME);
+#ifdef HAVE_MKOSTEMP
+ fd = mkostemp ((char *) atomic->tmp, O_CLOEXEC);
+#else
fd = mkstemp ((char *) atomic->tmp);
+#endif
if (fd < 0)
return FcFalse;
- f = fdopen (fd, "w");
+ f = fdopen (fd, "we");
if (!f)
{
close (fd);
--- src/fccache.c.orig
+++ src/fccache.c
@@ -202,7 +202,7 @@ FcDirCacheOpenFile (const FcChar8 *cache
if (FcStat (cache_file, file_stat) < 0)
return -1;
#endif
- fd = open((char *) cache_file, O_RDONLY | O_BINARY);
+ fd = open((char *) cache_file, O_RDONLY | O_BINARY | O_CLOEXEC);
if (fd < 0)
return fd;
#ifndef _WIN32
@@ -909,7 +909,7 @@ FcDirCacheWrite (FcCache *cache, FcConfi
if (!FcAtomicLock (atomic))
goto bail3;
- fd = open((char *)FcAtomicNewFile (atomic), O_RDWR | O_CREAT | O_BINARY, 0666);
+ fd = open((char *)FcAtomicNewFile (atomic), O_RDWR | O_CREAT | O_BINARY | O_CLOEXEC, 0666);
if (fd == -1)
goto bail4;

132
fontconfig-visibility.patch
View File

@ -1,132 +0,0 @@
--- configure.in.orig
+++ configure.in
@@ -36,7 +36,7 @@ dnl not possible to extract the version
AM_INIT_AUTOMAKE(fontconfig, 2.8.0)
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
AM_MAINTAINER_MODE
-
+AC_CONFIG_MACRO_DIR([m4])
dnl libtool versioning
dnl bump revision when fixing bugs
@@ -67,7 +67,7 @@ AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
DOLT
AC_PROG_MAKE_SET
-
+gl_VISIBILITY
dnl ==========================================================================
case "$host" in
--- /dev/null
+++ m4/visibility.m4
@@ -0,0 +1,78 @@
+# visibility.m4 serial 4 (gettext-0.18.2)
+dnl Copyright (C) 2005, 2008, 2010-2011 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Bruno Haible.
+
+dnl Tests whether the compiler supports the command-line option
+dnl -fvisibility=hidden and the function and variable attributes
+dnl __attribute__((__visibility__("hidden"))) and
+dnl __attribute__((__visibility__("default"))).
+dnl Does *not* test for __visibility__("protected") - which has tricky
+dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on
+dnl MacOS X.
+dnl Does *not* test for __visibility__("internal") - which has processor
+dnl dependent semantics.
+dnl Does *not* test for #pragma GCC visibility push(hidden) - which is
+dnl "really only recommended for legacy code".
+dnl Set the variable CFLAG_VISIBILITY.
+dnl Defines and sets the variable HAVE_VISIBILITY.
+
+AC_DEFUN([gl_VISIBILITY],
+[
+ AC_REQUIRE([AC_PROG_CC])
+ CFLAG_VISIBILITY=
+ HAVE_VISIBILITY=0
+ if test -n "$GCC"; then
+ dnl First, check whether -Werror can be added to the command line, or
+ dnl whether it leads to an error because of some other option that the
+ dnl user has put into $CC $CFLAGS $CPPFLAGS.
+ AC_MSG_CHECKING([whether the -Werror option is usable])
+ AC_CACHE_VAL([gl_cv_cc_vis_werror], [
+ gl_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -Werror"
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM([[]], [[]])],
+ [gl_cv_cc_vis_werror=yes],
+ [gl_cv_cc_vis_werror=no])
+ CFLAGS="$gl_save_CFLAGS"])
+ AC_MSG_RESULT([$gl_cv_cc_vis_werror])
+ dnl Now check whether visibility declarations are supported.
+ AC_MSG_CHECKING([for simple visibility declarations])
+ AC_CACHE_VAL([gl_cv_cc_visibility], [
+ gl_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -fvisibility=hidden"
+ dnl We use the option -Werror and a function dummyfunc, because on some
+ dnl platforms (Cygwin 1.7) the use of -fvisibility triggers a warning
+ dnl "visibility attribute not supported in this configuration; ignored"
+ dnl at the first function definition in every compilation unit, and we
+ dnl don't want to use the option in this case.
+ if test $gl_cv_cc_vis_werror = yes; then
+ CFLAGS="$CFLAGS -Werror"
+ fi
+ AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[extern __attribute__((__visibility__("hidden"))) int hiddenvar;
+ extern __attribute__((__visibility__("default"))) int exportedvar;
+ extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
+ extern __attribute__((__visibility__("default"))) int exportedfunc (void);
+ void dummyfunc (void) {}
+ ]],
+ [[]])],
+ [gl_cv_cc_visibility=yes],
+ [gl_cv_cc_visibility=no])
+ CFLAGS="$gl_save_CFLAGS"])
+ AC_MSG_RESULT([$gl_cv_cc_visibility])
+ if test $gl_cv_cc_visibility = yes; then
+ CFLAG_VISIBILITY="-fvisibility=hidden"
+ HAVE_VISIBILITY=1
+ AC_DEFINE([FcPublic], [__attribute__((__visibility__("default")))], [Makes symbol visible])
+ fi
+ fi
+ AC_SUBST([CFLAG_VISIBILITY])
+ AC_SUBST([HAVE_VISIBILITY])
+ AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY],
+ [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.])
+])
--- src/Makefile.am.orig
+++ src/Makefile.am
@@ -125,6 +125,7 @@ libfontconfig_la_SOURCES = \
lib_LTLIBRARIES = libfontconfig.la
+libfontconfig_la_CFLAGS = $(CFLAG_VISIBILITY)
libfontconfig_la_LDFLAGS = \
-version-info @LIBT_VERSION_INFO@ -no-undefined $(export_symbols)
--- Makefile.am.orig
+++ Makefile.am
@@ -21,6 +21,7 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
+ACLOCAL_AMFLAGS = -I m4
DOCSRC=@DOCSRC@
SUBDIRS=fontconfig fc-case fc-lang fc-glyphname fc-arch src \
fc-cache fc-cat fc-list fc-match fc-query fc-scan conf.d $(DOCSRC) test
--- src/fcxml.c.orig
+++ src/fcxml.c
@@ -2485,7 +2485,7 @@ FcConfigParseAndLoad (FcConfig *conf
if (FcDebug () & FC_DBG_CONFIG)
printf ("\tLoading config file %s\n", filename);
- fd = open ((char *) filename, O_RDONLY);
+ fd = open ((char *) filename, O_RDONLY|O_CLOEXEC);
if (fd == -1) {
FcStrFree (filename);
goto bail0;

5
fontconfig.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Mar 21 14:59:41 UTC 2012 - pgajdos@suse.com
- updated to 2.9.0
-------------------------------------------------------------------
Sun Jan 1 23:42:27 UTC 2012 - crrodriguez@opensuse.org

58
fontconfig.spec
View File

@ -47,19 +47,12 @@ Url: http://fontconfig.org/
Obsoletes: fontconfig-64bit
%endif
Requires: bash
Version: 2.8.0
Version: 2.9.0
Release: 0
Summary: Library for Font Configuration
License: MIT
Group: System/Libraries
# CVS can be found here: (CVS is gone, fontconfig uses git now).
# $ cvs -d :pserver:anoncvs@pdx.freedesktop.org:/cvs/fontconfig login
# CVS password: <hit return>
# $ cvs -d :pserver:anoncvs@pdx.freedesktop.org:/cvs/fontconfig co fontconfig
#
Source0: http://fontconfig.org/release/%name-%version.tar.bz2
# oldneededforbuild expat freetype2 freetype2-devel pkgconfig
#
# After building with "build_docs" defined to "1" generate the doc tarball with:
# tar jcf fontconfig-doc.tar.bz2 fc-*/*.[0-9] doc/*.[0-9] doc/*.html doc/*/*.html doc/*.txt
Source1: %name-doc-%version.tar.bz2
@ -71,23 +64,12 @@ Source11: suse-pre-user.conf
Source12: suse-post-user.conf
Source13: suse-hinting.conf
Source14: suse-bitmaps.conf
Source15: suse-font-dirs.conf
Source16: local.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
Patch10: conf.patch
Patch16: make-check.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
Patch33: bnc438855-make-FcInitReinitialize-work-again.patch
Patch34: urw-aliases-whitespaces.patch
Patch35: fontconfig-ocloexec.patch
Patch36: fontconfig-visibility.patch
Patch0: conf.patch
Patch1: make-check.patch
Patch2: usr-share-doc-packages.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -126,34 +108,24 @@ accepts font patterns and returns the nearest matching font.
%if %{build_docs} < 1
tar -xvf %{SOURCE1}
%endif
%patch5 -p0 -b .dynafont
%patch10 -p1 -b .fonts.conf
%patch16 -p1
#%patch30 -p1
%patch31 -p1
%patch32 -p1
%patch33 -p1
%patch34 -p1
%patch35
%patch36
%patch0 -p1 -b .fonts.conf
%patch1 -p1
%patch2 -p1
%build
autoreconf -fiv
%configure --with-pic --with-arch=%_host_cpu \
%if %suse_version > 1100
--disable-static \
%endif
--with-freetype-lib=%_libdir \
--with-x \
--enable-libxml2=no \
--with-confdir=/etc/fonts \
--with-docdir=%{_defaultdocdir}/%{name} \
--with-add-fonts=/usr/X11R6/lib/X11/fonts,/opt/kde3/share/fonts,/usr/local/share/fonts \
%if %{build_docs} < 1
%if %{build_docs} == 0
--disable-docs
%else
#
%endif
%endif
#
make %{?_smp_mflags} V=1
%check
@ -167,7 +139,6 @@ mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/fontconfig
mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/fontconfig-devel
install -m 644 AUTHORS COPYING ChangeLog README $RPM_SOURCE_DIR/iso639-? \
$RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}
#install -m 644 fc-lang/iso639-{1,2} $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}
install -m 644 doc/*.html $RPM_BUILD_ROOT/%{_defaultdocdir}/fontconfig
install -m 644 doc/fontconfig-user.txt $RPM_BUILD_ROOT/%{_defaultdocdir}/fontconfig
install -m 644 doc/fontconfig-devel/* $RPM_BUILD_ROOT/%{_defaultdocdir}/fontconfig-devel
@ -187,12 +158,9 @@ install -m 644 $RPM_SOURCE_DIR/suse*.conf $RPM_BUILD_ROOT/etc/fonts/
install -m 644 $RPM_SOURCE_DIR/local.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
@ -202,9 +170,7 @@ pushd $RPM_BUILD_ROOT/etc/fonts/conf.d
popd
# don't package any files in the cache directory, only the directory itself:
rm -f $RPM_BUILD_ROOT/var/cache/fontconfig/*
%if %suse_version > 1100
rm -f %{buildroot}%{_libdir}/*.la
%endif
%post -p /sbin/ldconfig
@ -218,7 +184,6 @@ rm -f %{buildroot}%{_libdir}/*.la
%config /etc/fonts/fonts.dtd
%config /etc/fonts/fonts.conf
%config /etc/fonts/suse-generic-names.conf
%config /etc/fonts/suse-font-dirs.conf
%config /etc/fonts/suse-pre-user.conf
%config /etc/fonts/suse-post-user.conf
%config %verify(not md5 size mtime) /etc/fonts/suse-hinting.conf
@ -240,9 +205,6 @@ rm -f %{buildroot}%{_libdir}/*.la
%doc %{_defaultdocdir}/%{name}-devel
%{_libdir}/pkgconfig/fontconfig.pc
%{_libdir}/libfontconfig.so
%if %suse_version <= 1100
%{_libdir}/libfontconfig.*a
%endif
%{_mandir}/man3/Fc*
%{_includedir}/fontconfig/

23
suse-font-dirs.conf
View File

@ -1,23 +0,0 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
<fontconfig>
<!-- Generated by SuSEconfig.fonts, don't edit, your changes will get lost. -->
<!-- ************************************************************ -->
<!-- list of font directories -->
<!-- -->
<!-- generated by SuSEconfig.fonts from the template -->
<!-- /usr/share/fonts-config/suse-font-dirs.conf.template -->
<!-- All glob patterns in this template-file are expanded and -->
<!-- all subdirectories of these directories are added as well -->
<!-- ************************************************************ -->
<dir>/usr/share/fonts</dir>
<dir>/usr/X11R6/lib/X11/fonts</dir>
<dir>/opt/kde3/share/fonts</dir>
<dir>/usr/lib/ooo-2.0/share/fonts</dir>
<dir>/usr/X11R6/lib/Acrobat7/Resource/Font</dir>
<dir>/usr/local/share/fonts</dir>
</fontconfig>

1
suse-generic-names.conf
View File

@ -27,6 +27,7 @@
<family>IPAMincho</family>
<family>IPAPMincho</family>
<family>Sazanami Mincho</family>
<family>STIXGeneral</family>
<default><family>serif</family></default>
</alias>
<!--

30
suse-hinting.conf
View File

@ -24,9 +24,6 @@
<edit name="hinting">
<bool>true</bool>
</edit>
<edit name="hintstyle">
<const>hintfull</const>
</edit>
<edit name="antialias">
<bool>true</bool>
</edit>
@ -307,5 +304,32 @@ off the autohinter for the "Likhan" font:
</edit>
</match>
<!--
general advice: use hintfull for BCI, hintlight for autohinter
exceptions will follow
-->
<match target="font">
<test name="autohint">
<bool>false</bool>
</test>
<edit name="hintstyle">
<const>hintfull</const>
</edit>
</match>
<match target="font">
<test name="autohint">
<bool>true</bool>
</test>
<edit name="hintstyle">
<const>hintslight</const>
</edit>
</match>
<!--
exceptions:
-->
<!-- none here so far -->
</fontconfig>

1
suse-post-user.conf
View File

@ -52,6 +52,7 @@
<family>SimSun</family>
<family>HanyiSong</family>
<family>ZYSong18030</family>
<family>STIXGeneral</family>
</prefer>
</alias>
<alias>

6
suse-pre-user.conf
View File

@ -328,5 +328,11 @@
<include ignore_missing="yes">/etc/fonts/suse-bitmaps.conf</include>
<!-- ************************************************************ -->
<!-- assigning families to generic names -->
<!-- ************************************************************ -->
<include ignore_missing="yes">/etc/fonts/suse-generic-names.conf</include>
</fontconfig>

44
urw-aliases-whitespaces.patch
View File

@ -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 @@
<family>Avant Garde</family>
<accept><family>URW Gothic L</family></accept>
</alias>
+ <alias binding="same">
+ <family>AvantGarde</family>
+ <accept><family>URW Gothic L</family></accept>
+ </alias>
<alias binding="same">
<family>Bookman</family>
<accept><family>URW Bookman L</family></accept>
@@ -17,6 +21,10 @@
<family>New Century Schoolbook</family>
<accept><family>Century Schoolbook L</family></accept>
</alias>
+ <alias binding="same">
+ <family>NewCenturySchoolbook</family>
+ <accept><family>Century Schoolbook L</family></accept>
+ </alias>
<alias binding="same">
<family>Palatino</family>
<accept><family>URW Palladio L</family></accept>
@@ -26,9 +34,17 @@
<accept><family>URW Chancery L</family></accept>
</alias>
<alias binding="same">
+ <family>ZapfChancery</family>
+ <accept><family>URW Chancery L</family></accept>
+ </alias>
+ <alias binding="same">
<family>Zapf Dingbats</family>
<accept><family>Dingbats</family></accept>
</alias>
+ <alias binding="same">
+ <family>ZapfDingbats</family>
+ <accept><family>Dingbats</family></accept>
+ </alias>
<match target="pattern">
<test name="family">
<string>Symbol</string>