[arch-commits] Commit in cantarell-fonts/trunk (21-cantarell-hinting.conf PKGBUILD)

[Jan Steffens]

    Date: Monday, December 10, 2012 @ 18:23:40
  Author: heftig
Revision: 173098

Fix hinting

Added:
  cantarell-fonts/trunk/21-cantarell-hinting.conf
Modified:
  cantarell-fonts/trunk/PKGBUILD

---------------------------+
 21-cantarell-hinting.conf |   13 +++++++++++++
 PKGBUILD                  |   22 ++++++++++++----------
 2 files changed, 25 insertions(+), 10 deletions(-)

Added: 21-cantarell-hinting.conf
===================================================================
--- 21-cantarell-hinting.conf	                        (rev 0)
+++ 21-cantarell-hinting.conf	2012-12-10 23:23:40 UTC (rev 173098)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE fontconfig SYSTEM "../fonts.dtd">
+<fontconfig>
+  <!-- Force the autohinter for Cantarell, as it does not have TT hinting -->
+  <match target="font">
+    <test name="family" compare="eq" ignore-blanks="true">
+      <string>Cantarell</string>
+    </test>
+    <edit name="autohint">
+      <bool>true</bool>
+    </edit>
+  </match>
+</fontconfig>


Property changes on: cantarell-fonts/trunk/21-cantarell-hinting.conf
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-12-10 22:25:55 UTC (rev 173097)
+++ PKGBUILD	2012-12-10 23:23:40 UTC (rev 173098)
@@ -3,29 +3,31 @@
 
 pkgname=cantarell-fonts
 pkgver=0.0.11
-pkgrel=2
+pkgrel=3
 pkgdesc="Cantarell font family"
 arch=('any')
 url="http://abattis.org/cantarell/"
 license=('GPL2')
 depends=('fontconfig')
 install=cantarell-fonts.install
-source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-${pkgver}.tar.xz)
-sha256sums=('89b68fc3e9557309bbca1a174210dad3525a7908d4c11dff20f7e9a01f940b63')
+source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-${pkgver}.tar.xz
+        21-cantarell-hinting.conf)
+sha256sums=('89b68fc3e9557309bbca1a174210dad3525a7908d4c11dff20f7e9a01f940b63'
+            '7da2d00e68d9eeab071cb861fe7da35098d5164008f638a5a9c289f717924bd0')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=/usr
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --with-configdir=/etc/fonts/conf.avail
   make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make DESTDIR="${pkgdir}" install
-
-  mkdir -p "$pkgdir/etc/fonts/conf.d"
-  mv "$pkgdir/usr/share/fontconfig/conf.avail" "$pkgdir/etc/fonts/conf.avail"
-  rmdir "$pkgdir/usr/share/fontconfig"
+  install -Dm644 ../21-cantarell-hinting.conf \
+    "$pkgdir/etc/fonts/conf.avail/21-cantarell-hinting.conf"
+  install -d "$pkgdir/etc/fonts/conf.d"
+  ln -s ../conf.avail/21-cantarell-hinting.conf "$pkgdir/etc/fonts/conf.d"
   ln -s ../conf.avail/31-cantarell.conf "$pkgdir/etc/fonts/conf.d"
 }