From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Fri, 21 Sep 2012 06:17:26 +0000 (+0200)
Subject: - rel 4; drop non upstream default config from here; drop blacklist (dropped by fc)
X-Git-Tag: auto/th/fontconfig-2.10.1-4
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=4d5ef8cc62e093cccac4318ef083ad52525b9650;p=packages%2Ffontconfig.git

- rel 4; drop non upstream default config from here; drop blacklist (dropped by fc)
---

diff --git a/fontconfig-blacklist.patch b/fontconfig-blacklist.patch
deleted file mode 100644
index 1ae4893..0000000
--- a/fontconfig-blacklist.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- fontconfig-2.2.98/src/fcdir.c.orig	2004-12-06 20:25:19.000000000 +0100
-+++ fontconfig-2.2.98/src/fcdir.c	2005-01-22 21:26:06.141980024 +0100
-@@ -166,6 +166,40 @@
-     return FcFileScanConfig (set, dirs, cache, blanks, file, force, 0);
- }
- 
-+static FcBool
-+FcBlackListed (const char *name)
-+{
-+    static const char * const black_listed_names[] = {
-+	"hrger.pfa",
-+	"hrgrr.pfa",
-+	"hritr.pfa",
-+	"hrpld.pfa",
-+	"hrpldi.pfa",
-+	"hrplt.pfa",
-+	"hrplti.pfa",
-+	"hrscc.pfa",
-+	"hrscs.pfa",
-+	"u003043t.gsf",
-+	"u004006t.gsf"
-+    };
-+
-+    int low = 0;
-+    int high = sizeof(black_listed_names) / sizeof(black_listed_names[0]) - 1;
-+
-+    while (low <= high) {
-+	int mid = (low + high) / 2;
-+	int res = strcmp (name, black_listed_names[mid]);
-+	if (res == 0)
-+	    return FcTrue;
-+	else if (res < 0)
-+	    high = mid - 1;
-+	else
-+	    low = mid + 1;
-+    }
-+
-+    return FcFalse;
-+}
-+
- /*
-  * Scan 'dir', adding font files to 'set' and
-  * subdirectories to 'dirs'
-@@ -232,7 +266,8 @@
-     }
-     while (ret && (e = readdir (d)))
-     {
--	if (e->d_name[0] != '.' && strlen (e->d_name) < FC_MAX_FILE_LEN)
-+	if (e->d_name[0] != '.' && strlen (e->d_name) < FC_MAX_FILE_LEN &&
-+	    !FcBlackListed (e->d_name))
- 	{
- 	    strcpy ((char *) base, (char *) e->d_name);
- 	    ret = FcFileScanConfig (set, dirs, cache, blanks, file, force, config);
diff --git a/fontconfig-lcd-filter.conf b/fontconfig-lcd-filter.conf
deleted file mode 100644
index 6d3c74f..0000000
--- a/fontconfig-lcd-filter.conf
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-  <match target="font">
-    <test name="fontformat" compare="eq">
-      <string>TrueType</string>
-    </test>
-    <edit mode="assign" name="hinting">
-      <bool>true</bool>
-    </edit>
-    <edit mode="assign" name="hintstyle">
-      <const>hintfull</const>
-    </edit>
-    <edit mode="assign" name="lcdfilter">
-      <const>lcddefault</const>
-    </edit>
-  </match>
-
-  <match target="font">
-    <test name="fontformat" compare="eq">
-      <string>CFF</string>
-    </test>
-    <edit mode="assign" name="hinting">
-      <bool>true</bool>
-    </edit>
-    <edit mode="assign" name="hintstyle">
-      <const>hintslight</const>
-    </edit>
-    <edit mode="assign" name="lcdfilter">
-      <const>lcdlight</const>
-    </edit>
-  </match>
-
-  <match target="font">
-    <test name="fontformat" compare="eq">
-      <string>Type 1</string>
-    </test>
-    <edit mode="assign" name="hinting">
-      <bool>true</bool>
-    </edit>
-    <edit mode="assign" name="hintstyle">
-      <const>hintslight</const>
-    </edit>
-    <edit mode="assign" name="lcdfilter">
-      <const>lcdlight</const>
-    </edit>
-  </match>
-</fontconfig>
diff --git a/fontconfig.spec b/fontconfig.spec
index 88609fa..44977b8 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -7,15 +7,13 @@ Summary(pl.UTF-8):	Narzędzia do konfigurowania fontów
 Summary(pt_BR.UTF-8):	Ferramentas para configuração e customização do acesso a fontes
 Name:		fontconfig
 Version:	2.10.1
-Release:	3
+Release:	4
 Epoch:		1
 License:	MIT
 Group:		Libraries
 Source0:	http://fontconfig.org/release/%{name}-%{version}.tar.gz
 # Source0-md5:	c94e380eea42f2f23ca9537035ef1899
-Source1:	%{name}-lcd-filter.conf
-Patch0:		%{name}-blacklist.patch
-Patch1:		%{name}-bitstream-cyberbit.patch
+Patch0:		%{name}-bitstream-cyberbit.patch
 URL:		http://fontconfig.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -126,7 +124,6 @@ Este pacote contém a biblioteca estática do fontconfig
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -153,9 +150,6 @@ install -d $RPM_BUILD_ROOT{%{_mandir}/man{1,3,5},/var/cache/fontconfig} \
 	htmldoc_DATA= \
 	doc_DATA=
 
-install %{SOURCE1} \
-	$RPM_BUILD_ROOT%{_datadir}/%{name}/conf.avail/10-lcd-filter.conf
-
 ln -s %{_datadir}/%{name}/conf.avail $RPM_BUILD_ROOT%{_sysconfdir}/fonts/conf.avail
 
 cp -pf conf.d/README README.confd