- Removed obsolete --with bytecode & fontconfig-autohint.patch

Changed files:
    fontconfig-autohint.patch -> 1.3
    fontconfig.spec -> 1.77

diff --git a/fontconfig-autohint.patch b/fontconfig-autohint.patch
deleted file mode 100644 (file)
index 138d293..0000000
--- a/fontconfig-autohint.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- fontconfig-2.2.92/fonts.conf.in~   Mon Mar 29 22:49:31 2004
-+++ fontconfig-2.2.92/fonts.conf.in    Mon Mar 29 22:51:44 2004
-@@ -177,18 +177,8 @@
-       <match target="font">
-               <test name="family">
-                       <string>Bitstream Vera Sans</string>
--              </test>
--              <test name="pixelsize" compare="less">
--                      <double>7.5</double>
--              </test>
--              <edit name="hinting">
--                      <bool>false</bool>
--              </edit>
--      </match>
--
--      <match target="font">
--              <test name="family">
-                       <string>Bitstream Vera Serif</string>
-+                      <string>Bitstream Vera Sans Mono</string>
-               </test>
-               <test name="pixelsize" compare="less">
-                       <double>7.5</double>
-@@ -198,15 +188,29 @@
-               </edit>
-       </match>
- 
-+<!-- 
-+      The Free*, Luxi and Quasi*TTF fonts have poor hinting instructions.
-+      Autohinting gives better results for them.
-+ -->
-+
-       <match target="font">
-               <test name="family">
--                      <string>Bitstream Vera Sans Mono</string>
-+                      <string>FreeMono</string>
-+                      <string>FreeSans</string>
-+                      <string>FreeSerif</string>
-+                      <string>Luxi Mono</string>
-+                      <string>Luxi Sans</string>
-+                      <string>Luxi Serif</string>
-+                      <string>QuasiBookmanTTF</string>
-+                      <string>QuasiChanceryTTF</string>
-+                      <string>QuasiCourierTTF</string>
-+                      <string>QuasiPalatinoTTF</string>
-+                      <string>QuasiSwissCondensedTTF</string>
-+                      <string>QuasiSwissTTF</string>
-+                      <string>QuasiTimesTTF</string>
-               </test>
--              <test name="pixelsize" compare="less">
--                      <double>7.5</double>
--              </test>
--              <edit name="hinting">
--                      <bool>false</bool>
-+              <edit name="autohint">
-+                      <bool>true</bool>
-               </edit>
-       </match>
- 

diff --git a/fontconfig.spec b/fontconfig.spec
index 59ab552437fbf9c82db44495d03b7f3ce3540616..9cb261cf15ee11a9c9974c0ec0e67fa696435faa 100644 (file)
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -1,6 +1,5 @@
 #
 # Conditional build
-%bcond_with    bytecode        # use bytecode hinting instead of autohinting by default
 %bcond_without static_libs     # don't build static library
 #
 Summary:       Font configuration and customization tools
@@ -15,8 +14,7 @@ Group:                Libraries
 Source0:       http://fontconfig.org/release/%{name}-%{version}.tar.gz
 # Source0-md5: f035852f521b54677f2b5c9e2f6d54a4
 Patch0:                %{name}-blacklist.patch
-Patch1:                %{name}-autohint.patch
-Patch2:                %{name}-bitstream-cyberbit.patch
+Patch1:                %{name}-bitstream-cyberbit.patch
 URL:           http://fontconfig.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -124,10 +122,7 @@ Este pacote contém a biblioteca estática do fontconfig
 %prep
 %setup -q
 %patch0 -p1
-%if %{with bytecode}
 %patch1 -p1
-%endif
-%patch2 -p1
 
 %build
 %{__libtoolize}