[arch-commits] Commit in fontconfig/trunk (29-replace-bitmap-fonts.conf PKGBUILD)

[Jan de Groot]

    Date: Monday, April 1, 2013 @ 12:15:29
  Author: jgc
Revision: 181148

Remove bitmap font replacement, upstream handles font quality good now

Modified:
  fontconfig/trunk/PKGBUILD
Deleted:
  fontconfig/trunk/29-replace-bitmap-fonts.conf

------------------------------+
 29-replace-bitmap-fonts.conf |   37 -------------------------------------
 PKGBUILD                     |   11 +----------
 2 files changed, 1 insertion(+), 47 deletions(-)

Deleted: 29-replace-bitmap-fonts.conf
===================================================================
--- 29-replace-bitmap-fonts.conf	2013-04-01 10:09:46 UTC (rev 181147)
+++ 29-replace-bitmap-fonts.conf	2013-04-01 10:15:29 UTC (rev 181148)
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
-<fontconfig>
-    <!-- Replace generic bitmap font names by generic font families.
-         These font-families will get replaced by other rules and
-	 default to scaled ones. -->
-    <match target="pattern" name="family">
-        <test name="family" qual="any">
-            <string>Helvetica</string>
-        </test>
-        <edit mode="assign" name="family">
-            <string>Arial</string>
-            <string>Liberation Sans</string>	    
-            <string>sans-serif</string>
-        </edit>
-    </match>
-    <match target="pattern" name="family">
-        <test name="family" qual="any">
-            <string>Courier</string>
-        </test>
-        <edit mode="assign" name="family">
-            <string>Courier New</string>
-            <string>Liberation Mono</string>
-            <string>monospace</string>
-        </edit>
-    </match>
-    <match target="pattern" name="family">
-        <test name="family" qual="any">
-            <string>Times</string>
-        </test>
-        <edit mode="assign" name="family">
-            <string>Times New Roman</string>
-            <string>Liberation Serif</string>
-            <string>serif</string>
-        </edit>
-    </match>
-</fontconfig>

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-01 10:09:46 UTC (rev 181147)
+++ PKGBUILD	2013-04-01 10:15:29 UTC (rev 181148)
@@ -3,7 +3,7 @@
 
 pkgname=fontconfig
 pkgver=2.10.92
-pkgrel=1
+pkgrel=2
 pkgdesc="A library for configuring and customizing font access"
 arch=(i686 x86_64)
 url="http://www.fontconfig.org/release/"
@@ -12,10 +12,8 @@
 options=('!libtool')
 install=fontconfig.install
 source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2
-        29-replace-bitmap-fonts.conf
         bug62980.patch)
 sha256sums=('1162059927120f2321f12917189b524e6b2f09e11ac643278d0bb82634035b22'
-            '5addef189c5e01679ce3b610f8864c59980029c98f323f40f8c9080429857fdc'
             'd0d17ddbb5a20ef259eb33757904e076291a817312e94deb6d8f7b7cd064a3ce')
 
 build() {
@@ -46,13 +44,6 @@
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 
-  # not upstream, not in FC and not in Gentoo, this should probably go upstream
-  # meanwhile to satisfy pages like http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html we bring it back
-  install -m644 "$srcdir/29-replace-bitmap-fonts.conf" "$pkgdir/etc/fonts/conf.avail"
-  pushd $pkgdir/etc/fonts/conf.d
-  ln -s /etc/fonts/conf.avail/29-replace-bitmap-fonts.conf .
-  popd
-
   #Install license
   install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
   install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname"