OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/fontconfig?expand=0&rev=15

change-magic.patch

@@ -9,6 +9,6 @@ diff -ru fontconfig-2.4.1.orig/src/fcint.h fontconfig-2.4.1/src/fcint.h
 -#define FC_CACHE_MAGIC_ALLOC	    0xFC02FC05
 +#define FC_CACHE_MAGIC_MMAP	    0xFC02FC04 
 +#define FC_CACHE_MAGIC_ALLOC	    0xFC02FC05 
- #define FC_CACHE_CONTENT_VERSION    1
+ #define FC_CACHE_CONTENT_VERSION    2
  
  struct _FcAtomic {

conf.patch

@@ -1,48 +1,19 @@
-diff -ru fontconfig-2.4.1.orig/conf.d/40-generic.conf fontconfig-2.4.1/conf.d/40-generic.conf
+diff -ru fontconfig-2.6.0.orig//conf.d/40-nonlatin.conf fontconfig-2.6.0/conf.d/40-nonlatin.conf
---- fontconfig-2.4.1.orig/conf.d/40-generic.conf	2006-09-10 05:33:43.000000000 +0200
+--- fontconfig-2.6.0.orig//conf.d/40-nonlatin.conf	2008-05-25 00:45:51.000000000 +0200
-+++ fontconfig-2.4.1/conf.d/40-generic.conf	2006-10-16 14:59:58.000000000 +0200
++++ fontconfig-2.6.0/conf.d/40-nonlatin.conf	2008-09-10 17:20:32.000000000 +0200
-@@ -21,6 +21,7 @@
+@@ -24,6 +24,7 @@
- 		<family>AR PL Mingti2L Big5</family>
  		<family>ＭＳ 明朝</family>
+ 		<family>UnBatang</family>
  		<family>Baekmuk Batang</family>
 +		<family>SimSun</family>
- 		<family>FreeSerif</family>
  		<family>MgOpen Canonica</family>
- 		<default><family>serif</family></default>
+ 		<family>Sazanami Mincho</family>
-@@ -42,7 +43,6 @@
+ 		<family>AR PL ZenKai Uni</family>
- 		<family>AR PL KaitiM Big5</family>
+@@ -49,7 +50,6 @@
  		<family>ＭＳ ゴシック</family>
+ 		<family>UnDotum</family>
  		<family>Baekmuk Dotum</family>
 -		<family>SimSun</family>
- 		<family>FreeSans</family>
  		<family>MgOpen Modata</family>
- 		<default><family>sans-serif</family></default>
+ 		<family>Sazanami Gothic</family>
-diff -ru fontconfig-2.4.1.orig/conf.d/65-nonlatin.conf fontconfig-2.4.1/conf.d/65-nonlatin.conf
+ 		<family>AR PL ShanHeiSun Uni</family>
---- 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>ＭＳ 明朝</family>
-@@ -23,7 +24,6 @@
- 			<family>AR PL KaitiM Big5</family>
- 			<family>ＭＳ ゴシック</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>

fix-pattern-duplicate.diff

@@ -1,21 +0,0 @@
-diff -ru fontconfig-2.4.2/src/fcpat.c fontconfig-2.4.2.new/src/fcpat.c
---- fontconfig-2.4.2/src/fcpat.c	2006-12-02 21:54:53.000000000 +0100
-+++ fontconfig-2.4.2.new/src/fcpat.c	2007-03-12 16:08:30.000000000 +0100
-@@ -925,10 +925,14 @@
-     for (i = 0; i < orig->num; i++)
-     {
- 	for (l = FcPatternEltValues(e + i); l; l = FcValueListNext(l))
--	    if (!FcPatternObjectAdd (new, e[i].object,
--				     FcValueCanonicalize(&l->value),
--				     FcTrue))
-+	{
-+	    if (!FcPatternObjectAddWithBinding (new, e[i].object,
-+						FcValueCanonicalize(&l->value),
-+						l->binding,
-+						FcTrue))
- 		goto bail1;
-+	    
-+	}
-     }
- 
-     return new;

fontconfig-2.4.2.tar.bz2

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

fontconfig-2.6.0.tar.bz2

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

fontconfig.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Wed Sep 10 16:55:07 CEST 2008 - mfabian@suse.de
+
+- update to 2.6.0. Some changes from the ChangeLog:
+  • new configurables for sub-pixel filter configuration.
+  • Don't check cache file time stamps when cleaning cache dir.
+    Cache file mtime is meaningless now that the directory time is
+    encoded in
+    the cache.
+  • Also check configDirs mtimes in FcConfigUptoDate
+    Checking only config files and font directories can miss
+    changes which affect only a configuration directory. Check
+    those to catch any changes.
+  • Update CaseFolding.txt to Unicode 5.1.0
+- remove fix-pattern-duplicate.diff (included upstream).
+
 -------------------------------------------------------------------
 Tue Aug 26 12:14:12 CEST 2008 - crrodriguez@suse.de
 

fontconfig.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package fontconfig (Version 2.4.2)
+# spec file for package fontconfig (Version 2.6.0)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -30,8 +30,8 @@ Group:          System/Libraries
 Url:            http://fontconfig.org/
 AutoReqProv:    on
 Requires:       bash
-Version:        2.4.2
+Version:        2.6.0
-Release:        109
+Release:        1
 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
@@ -72,7 +72,6 @@ Patch28:        bugzilla-158573-turn-off-hinting-when-embolden.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:        fix-pattern-duplicate.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -135,7 +134,6 @@ Authors:
 #%patch29 -p1
 #%patch30 -p1
 %patch31 -p1
-%patch32 -p1
 
 %build
 %configure --disable-static --with-pic  \
@@ -240,6 +238,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/fontconfig/
 
 %changelog
+* Wed Sep 10 2008 mfabian@suse.de
+- update to 2.6.0. Some changes from the ChangeLog:
+  • new configurables for sub-pixel filter configuration.
+  • Don't check cache file time stamps when cleaning cache dir.
+  Cache file mtime is meaningless now that the directory time is
+  encoded in
+  the cache.
+  • Also check configDirs mtimes in FcConfigUptoDate
+  Checking only config files and font directories can miss
+  changes which affect only a configuration directory. Check
+  those to catch any changes.
+  • Update CaseFolding.txt to Unicode 5.1.0
+- remove fix-pattern-duplicate.diff (included upstream).
 * Tue Aug 26 2008 crrodriguez@suse.de
 - kill "la" files and static libraries
 * Mon May 26 2008 mfabian@suse.de