fontconfig: 2.10.1

3 files changed, 51 insertions, 108 deletions

diff --git a/abs/core/fontconfig/30-urw-aliases.patch b/abs/core/fontconfig/30-urw-aliases.patch
deleted file mode 100644
index 8077b86..0000000
--- a/abs/core/fontconfig/30-urw-aliases.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/conf.d/30-urw-aliases.conf	2009-08-06 16:23:57.000000000 +0100
-+++ b/conf.d/30-urw-aliases.conf	2009-08-06 16:25:07.000000000 +0100
-@@ -29,6 +29,10 @@
- 	  <family>Zapf Dingbats</family>
- 	  <accept><family>Dingbats</family></accept>
- 	</alias>
-+	<alias binding="same">
-+	  <family>ZapfDingbats</family>
-+	  <accept><family>Dingbats</family></accept>
-+	</alias>
- 	<match target="pattern">
- 	  <test name="family">
- 	    <string>Symbol</string>
diff --git a/abs/core/fontconfig/PKGBUILD b/abs/core/fontconfig/PKGBUILD
index 7f6a2ca..f698618 100644
--- a/abs/core/fontconfig/PKGBUILD
+++ b/abs/core/fontconfig/PKGBUILD
@@ -1,7 +1,8 @@
-# $Id: PKGBUILD 150857 2012-02-23 13:01:06Z ibiru $
+# $Id: PKGBUILD 166327 2012-09-06 13:53:52Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
+
 pkgname=fontconfig
-pkgver=2.8.0
+pkgver=2.10.1
 pkgrel=2
 pkgdesc="A library for configuring and customizing font access"
 arch=(i686 x86_64)
@@ -11,27 +12,43 @@ depends=('expat' 'freetype2')
 options=('!libtool')
 install=fontconfig.install
 source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.gz
-        29-replace-bitmap-fonts.conf
-        30-urw-aliases.patch)
-md5sums=('77e15a92006ddc2adbb06f840d591c0e'
-         'f6b67e8cc79197ed6abd4701911e83da'
-         '51bc6cb633b50f3c28793361738aac5b')
+        29-replace-bitmap-fonts.conf)
+md5sums=('c94e380eea42f2f23ca9537035ef1899'
+         'f6b67e8cc79197ed6abd4701911e83da')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i "$srcdir/30-urw-aliases.patch"
-  # enable Position Independent Code for prelinking
-  export CFLAGS="$CFLAGS -fPIC"
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+
+  # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo do this as well
+  libtoolize -f
+  autoreconf -f
+
+  ./configure --prefix=/usr \
+    --sysconfdir=/etc \
+    --with-templatedir=/etc/fonts/conf.avail \
+    --with-xmldir=/etc/fonts \
+    --localstatedir=/var \
+    --disable-static \
+    --with-default-fonts=/usr/share/fonts \
+    --with-add-fonts=/usr/share/fonts
   make
 }
 
+check() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make -k check
+}
+
 package() {
   cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
-  install -m644 "$srcdir/29-replace-bitmap-fonts.conf" \
-      "$pkgdir/etc/fonts/conf.avail"
-  rm -f "$pkgdir"/etc/fonts/conf.d/*.conf
+
+  # 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"
diff --git a/abs/core/fontconfig/fontconfig.install b/abs/core/fontconfig/fontconfig.install
index 20feb6e..3a0ca57 100644
--- a/abs/core/fontconfig/fontconfig.install
+++ b/abs/core/fontconfig/fontconfig.install
@@ -1,100 +1,39 @@
-configs=('20-fix-globaladvance.conf'
-         '20-unhint-small-vera.conf'
-         '29-replace-bitmap-fonts.conf'
-         '30-metric-aliases.conf'
-         '30-urw-aliases.conf'
-         '40-nonlatin.conf'
-         '45-latin.conf'
-         '49-sansserif.conf'
-         '50-user.conf'
-         '51-local.conf'
-         '60-latin.conf'
-         '65-fonts-persian.conf'
-         '65-nonlatin.conf'
-         '69-unifont.conf'
-         '80-delicious.conf'
-         '90-synthetic.conf')
-
 post_install() {
-  echo -n "updating font cache... "
-  /sbin/ldconfig -r .
-  pushd /etc/fonts/conf.d > /dev/null
-  for config in "${configs[@]}"; do
-    ln -sf ../conf.avail/${config} .
-  done
-  popd > /dev/null
-  /usr/bin/fc-cache -f
-  echo "done."
-}
-
-post_upgrade() {
-  rm -f /etc/fonts/conf.d/10-bitmaps.conf
   cat << _EOF
-
-===> Important Fontconfig configuration change <===
-
-  The way fontconfig is configured has been changed. 
-  Configuration is done via /etc/fonts/conf.avail and conf.d.
+  
+  Fontconfig configuration is done via /etc/fonts/conf.avail and conf.d.
   Read /etc/fonts/conf.d/README for more information.
 
   Configuration via /etc/fonts/local.conf is still possible,
   but is no longer recommended for options available in conf.avail.
 
-_EOF
-
-  if [ `vercmp 2.4.1-1 $2` -gt 0 ]; then 
-  # Upgrade from old version, place all symlinks. pre-symlink package version
-    echo -n "Linking configuration files... "
-    pushd /etc/fonts/conf.d > /dev/null
-    for config in "${configs[@]}"; do
-      ln -sf ../conf.avail/${config} .
-    done
-    popd > /dev/null
-    echo "done."
-  fi
+  Main systemwide configuration should be done by symlinks
+  (especially for autohinting, sub-pixel and lcdfilter):
+  
+  cd /etc/fonts/conf.d
+  ln -s ../conf.avail/XX-foo.conf
+  
+  Check also https://wiki.archlinux.org/index.php/Font_Configuration
+  and https://wiki.archlinux.org/index.php/Fonts.
 
-  if [ `vercmp 2.6.0-1 $2` -gt 0 ]; then
-  # pre-2.6.0 versions have missing config
-    echo -n "Adding missing configuration files... "
-    pushd /etc/fonts/conf.d > /dev/null
-    ln -sf ../conf.avail/30-metric-aliases.conf .
-    ln -sf ../conf.avail/40-nonlatin.conf .
-    ln -sf ../conf.avail/45-latin.conf .
-    popd > /dev/null
-    echo "done."
-  fi
+_EOF
 
-  # Remove dead links
-  echo -n "Removing outdated configuration files... "
-  for config in /etc/fonts/conf.d/*; do
-    if [ ! -f ${config} ]; then
-      rm -f ${config}
-    fi
-  done
-  echo "done."
-  
   echo -n "updating font cache... "
   /usr/bin/fc-cache -f
   echo "done."
 }
 
-pre_upgrade() {
-  # Link new config files not present on system yet
-  echo -n "Symlinking new configuration files... "
-  pushd /etc/fonts/conf.d > /dev/null
-  for config in "${configs[@]}"; do
-    if [ ! -f ../conf.avail/${config} ]; then
-      ln -sf ../conf.avail/${config} .
-    fi
-  done
-  popd > /dev/null
+post_upgrade() {
+  echo -n "updating font cache... "
+  /usr/bin/fc-cache -f
   echo "done."
 }
 
 post_remove() {
-  pushd /etc/fonts/conf.d > /dev/null
-  for config in "${configs[@]}"; do
-    rm -f ${config}
-  done
-  popd > /dev/null
+  cat << _EOF
+
+  Check for dead symlinks and leftover files 
+  in /etc/fonts/conf.d/
+  
+_EOF
 }