Hello community,
here is the log from the commit of package fontconfig
checked in at Mon Oct 16 19:07:57 CEST 2006.
--------
--- fontconfig/fontconfig.changes 2006-06-22 12:16:22.000000000 +0200
+++ /mounts/work_src_done/STABLE/fontconfig/fontconfig.changes 2006-10-16 17:46:49.000000000 +0200
@@ -1,0 +2,10 @@
+Mon Oct 16 17:22:53 CEST 2006 - mfabian@suse.de
+
+- update to 2.4.1.
+ • cache files for different architectures are in different
+ files now
+ • the user specific cache has been split from a single file
+ in to seperate files for each font directory which are now
+ stored in ~/.fontconfig/.
+
+-------------------------------------------------------------------
Old:
----
do-not-reject-bitmap-fonts.patch
fontconfig-2.3.94.tar.bz2
fontconfig-fonts.conf.patch
New:
----
conf.patch
fontconfig-2.4.1.tar.bz2
iso639-1
iso639-2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fontconfig.spec ++++++
--- /var/tmp/diff_new_pack.DwvD7t/_old 2006-10-16 19:07:49.000000000 +0200
+++ /var/tmp/diff_new_pack.DwvD7t/_new 2006-10-16 19:07:49.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package fontconfig (Version 2.3.94)
+# spec file for package fontconfig (Version 2.4.1)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,17 +11,21 @@
# norootforbuild
Name: fontconfig
+%define build_docs 0
BuildRequires: expat freetype2-devel pkgconfig
-License: distributable, Other License(s), see package
+%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: distributable, X11/MIT
Provides: XFree86:/etc/fonts/fonts.dtd
Group: System/Libraries
URL: http://fontconfig.org/
Autoreqprov: on
Requires: bash
-Version: 2.3.94
-Release: 19
+Version: 2.4.1
+Release: 1
Summary: Library for Font Configuration
-# CVS can be found here:
+# 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
@@ -29,13 +33,11 @@
Source0: http://fontconfig.org/release/%name-%version.tar.bz2
# oldneededforbuild expat freetype2 freetype2-devel pkgconfig
#
-# To build the documentation from the CVS version, the following
-# stuff in neededforbuild would be necessary:
-# "docbook_3 docbook-utils perl-SGMLS sgml-skel libxml2 libxml2-devel docbook_4 openjade opensp iso_ent docbook-dsssl-stylesheets lynx jadetex tetex libpng"
-# After building with the above neededforbuild and without "--disable-docs",
-# generate the doc tarball with:
+# 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.tar.bz2
+Source2: iso639-1
+Source3: iso639-2
Source10: suse-generic-names.conf
Source11: suse-pre-user.conf
Source12: suse-post-user.conf
@@ -49,8 +51,7 @@
# http://www.kde.gr.jp/~akito/patch/fontconfig/fontconfig-2.2.1/fontconfig-2.2...
Patch5: AppleRoman-DynaFont.patch
Patch6: fontconfig-minmaxabs.patch
-Patch10: fontconfig-fonts.conf.patch
-Patch11: do-not-reject-bitmap-fonts.patch
+Patch10: conf.patch
Patch12: bugzilla-128937-turn-off-embedded-bitmaps-by-default.patch
Patch13: bugzilla-160226-multiarch-cache-file-problem.patch
Patch15: fc-cache.patch
@@ -92,29 +93,32 @@
Keith Packard
%prep
-%setup -q -a 1
+%setup -q
+%if %{build_docs} < 1
+ tar xvf $RPM_SOURCE_DIR/%name-doc.tar.bz2
+%endif
%patch1 -p1 -b .improve-monospace-detection
#%patch4 -p0 -b .fc-match
%patch5 -p0 -b .dynafont
%patch6 -p0 -b .minmaxabs
%patch10 -p1 -b .fonts.conf
-%patch11 -p1 -b .do-not-reject-bitmap-fonts
-%patch12 -p1
-%patch13 -p1
-%patch15 -p1
+#%patch12 -p1
+#%patch13 -p1
+#%patch15 -p1
%patch16 -p1
%patch17 -p1
-%patch18 -p0
+#%patch18 -p0
#%patch22 -p1
-%patch27 -p1
-%patch28 -p0
-%patch29 -p1
-%patch30 -p1
+#%patch27 -p1
+%patch28 -p1
+#%patch29 -p1
+#%patch30 -p1
%build
%define myprefix /usr
export CFLAGS="$RPM_OPT_FLAGS"
-./autogen.sh \
+#./autogen.sh \
+./configure \
--prefix=%{myprefix} \
--libdir=%{myprefix}/%{_lib} \
--with-freetype-lib=%_libdir \
@@ -126,7 +130,11 @@
--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
--disable-docs
+%else
+ #
+%endif
make %{?jobs:-j %jobs}
make check
@@ -134,9 +142,9 @@
make DESTDIR=$RPM_BUILD_ROOT pkgconfigdir=%{_libdir}/pkgconfig install
mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/fontconfig
mkdir -p $RPM_BUILD_ROOT/%{_defaultdocdir}/fontconfig-devel
-install -m 644 AUTHORS COPYING ChangeLog README \
+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 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
@@ -154,6 +162,15 @@
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/
+# tune links in conf.d:
+pushd $RPM_BUILD_ROOT/etc/fonts/conf.d
+ rm -f 50-user.conf
+ rm -f 51-local.conf
+ ln -s ../suse-pre-user.conf 50-suse-pre-user.conf
+ ln -s ../conf.avail/51-local.conf 55-local.conf
+ ln -s ../conf.avail/50-user.conf 56-user.conf
+ ln -s ../suse-post-user.conf 58-suse-post-user.conf
+popd
# don't package any files in the cache directory, only the directory itself:
rm -f $RPM_BUILD_ROOT/var/cache/fontconfig/*
@@ -180,6 +197,8 @@
%config /etc/fonts/suse-post-user.conf
%config %verify(not md5 size mtime) /etc/fonts/suse-hinting.conf
%config %verify(not md5 size mtime) /etc/fonts/suse-bitmaps.conf
+%dir /etc/fonts/conf.avail/
+/etc/fonts/conf.avail/*
%dir /etc/fonts/conf.d/
/etc/fonts/conf.d/README
%config(noreplace) /etc/fonts/conf.d/*.conf
@@ -199,6 +218,13 @@
%{myprefix}/include/fontconfig/
%changelog -n fontconfig
+* Mon Oct 16 2006 - mfabian@suse.de
+- update to 2.4.1.
+ • cache files for different architectures are in different
+ files now
+ • the user specific cache has been split from a single file
+ in to seperate files for each font directory which are now
+ stored in ~/.fontconfig/.
* Thu Jun 22 2006 - mfabian@suse.de
- Bugzilla #185864: add "Requires: bash" to make the postun
and preun scripts of the SLES9 fontconfig package work.
++++++ bugzilla-158573-turn-off-hinting-when-embolden.patch ++++++
--- /var/tmp/diff_new_pack.DwvD7t/_old 2006-10-16 19:07:49.000000000 +0200
+++ /var/tmp/diff_new_pack.DwvD7t/_new 2006-10-16 19:07:49.000000000 +0200
@@ -1,6 +1,7 @@
---- fonts.conf.in.old 2006-03-31 17:15:40.000000000 +0800
-+++ fonts.conf.in 2006-03-31 17:24:05.000000000 +0800
-@@ -392,6 +392,17 @@
+diff -ru fontconfig-2.4.1.orig/conf.d/90-synthetic.conf fontconfig-2.4.1/conf.d/90-synthetic.conf
+--- fontconfig-2.4.1.orig/conf.d/90-synthetic.conf 2006-09-11 03:18:28.000000000 +0200
++++ fontconfig-2.4.1/conf.d/90-synthetic.conf 2006-10-16 15:58:20.000000000 +0200
+@@ -60,5 +60,16 @@
<edit name="weight" mode="assign">
<const>bold</const>
</edit>
@@ -16,5 +17,4 @@
+ <const>hintnone</const>
+ </edit>
</match>
-
-
+ </fontconfig>
++++++ change-magic.patch ++++++
--- /var/tmp/diff_new_pack.DwvD7t/_old 2006-10-16 19:07:49.000000000 +0200
+++ /var/tmp/diff_new_pack.DwvD7t/_new 2006-10-16 19:07:49.000000000 +0200
@@ -1,12 +1,14 @@
-diff -ru fontconfig-2.3.93.20060214.orig/src/fcint.h fontconfig-2.3.93.20060214/src/fcint.h
---- fontconfig-2.3.93.20060214.orig/src/fcint.h 2006-02-07 16:04:03.000000000 +0100
-+++ fontconfig-2.3.93.20060214/src/fcint.h 2006-02-14 15:06:46.000000000 +0100
-@@ -324,7 +324,7 @@
- * cache which is then rewritten to the users home directory
- */
+diff -ru fontconfig-2.4.1.orig/src/fcint.h fontconfig-2.4.1/src/fcint.h
+--- fontconfig-2.4.1.orig/src/fcint.h 2006-09-15 09:06:40.000000000 +0200
++++ fontconfig-2.4.1/src/fcint.h 2006-10-16 15:48:51.000000000 +0200
+@@ -406,8 +406,8 @@
--#define FC_CACHE_MAGIC 0xFC02FC03
-+#define FC_CACHE_MAGIC 0xFC02FC03
+ #define fc_alignof(type) offsetof (struct { char c; type member; }, member)
- typedef struct _FcGlobalCacheDir FcGlobalCacheDir;
+-#define FC_CACHE_MAGIC_MMAP 0xFC02FC04
+-#define FC_CACHE_MAGIC_ALLOC 0xFC02FC05
++#define FC_CACHE_MAGIC_MMAP 0xFC02FC04
++#define FC_CACHE_MAGIC_ALLOC 0xFC02FC05
+ #define FC_CACHE_CONTENT_VERSION 1
+ struct _FcAtomic {
++++++ conf.patch ++++++
diff -ru fontconfig-2.4.1.orig/conf.d/40-generic.conf fontconfig-2.4.1/conf.d/40-generic.conf
--- fontconfig-2.4.1.orig/conf.d/40-generic.conf 2006-09-10 05:33:43.000000000 +0200
+++ fontconfig-2.4.1/conf.d/40-generic.conf 2006-10-16 14:59:58.000000000 +0200
@@ -21,6 +21,7 @@
<family>AR PL Mingti2L Big5</family>
<family>MS 明朝</family>
<family>Baekmuk Batang</family>
+ <family>SimSun</family>
<family>FreeSerif</family>
<family>MgOpen Canonica</family>
<default><family>serif</family></default>
@@ -42,7 +43,6 @@
<family>AR PL KaitiM Big5</family>
<family>MS ゴシック</family>
<family>Baekmuk Dotum</family>
- <family>SimSun</family>
<family>FreeSans</family>
<family>MgOpen Modata</family>
<default><family>sans-serif</family></default>
diff -ru fontconfig-2.4.1.orig/conf.d/65-nonlatin.conf fontconfig-2.4.1/conf.d/65-nonlatin.conf
--- fontconfig-2.4.1.orig/conf.d/65-nonlatin.conf 2006-09-10 05:31:22.000000000 +0200
+++ fontconfig-2.4.1/conf.d/65-nonlatin.conf 2006-10-16 15:03:23.000000000 +0200
@@ -7,6 +7,7 @@
<family>Frank Ruehl</family>
<family>MgOpen Canonica</family>
<family>Kochi Mincho</family>
+ <family>SimSun</family>
<family>AR PL SungtiL GB</family>
<family>AR PL Mingti2L Big5</family>
<family>MS 明朝</family>
@@ -23,7 +24,6 @@
<family>AR PL KaitiM Big5</family>
<family>MS ゴシック</family>
<family>Baekmuk Dotum</family>
- <family>SimSun</family>
</prefer>
</alias>
<alias>
@@ -31,7 +31,8 @@
<prefer>
<family>Miriam Mono</family>
<family>Kochi Gothic</family>
- <family>AR PL KaitiM GB</family>
+ <family>AR PL SungtiL GB</family>
+ <family>AR PL Mingti2L Big5</family>
<family>Baekmuk Dotum</family>
</prefer>
</alias>
++++++ fontconfig-2.3.94.tar.bz2 -> fontconfig-2.4.1.tar.bz2 ++++++
++++ 141429 lines of diff (skipped)
++++++ fontconfig-doc.tar.bz2 ++++++
++++ 25681 lines of diff (skipped)
++++++ suse-pre-user.conf ++++++
--- fontconfig/suse-pre-user.conf 2006-04-11 18:50:39.000000000 +0200
+++ /mounts/work_src_done/STABLE/fontconfig/suse-pre-user.conf 2006-10-16 17:09:59.000000000 +0200
@@ -281,17 +281,29 @@
</rejectfont>
</selectfont>
+<!-- Accept bitmap fonts -->
+
+ <selectfont>
+ <acceptfont>
+ <pattern>
+ <patelt name="scalable">
+ <bool>false</bool>
+ </patelt>
+ </pattern>
+ </acceptfont>
+ </selectfont>
+
<!-- ************************************************************ -->
<!-- Hinting and antialiasing -->
<!-- ************************************************************ -->
- <include ignore_missing="yes">suse-hinting.conf</include>
+ <include ignore_missing="yes">/etc/fonts/suse-hinting.conf</include>
<!-- ************************************************************ -->
<!-- Bitmap related stuff -->
<!-- ************************************************************ -->
- <include ignore_missing="yes">suse-bitmaps.conf</include>
+ <include ignore_missing="yes">/etc/fonts/suse-bitmaps.conf</include>
</fontconfig>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org