summaryrefslogtreecommitdiffstats
path: root/abs/core-testing/fontconfig
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2010-09-08 07:33:44 (GMT)
committerJames Meyer <james.meyer@operamail.com>2010-09-08 07:33:44 (GMT)
commit525753e4a1a139e088d8ac120b19fbab6c0aaaa6 (patch)
tree35cef28abb613da4f58e83f6abbe4bd4cfa244bf /abs/core-testing/fontconfig
parent592e3cad43ef12c53f523145d0fd981b54f2a049 (diff)
parentb172f79fadb565ecfbcec9508f9377d8618a4f4c (diff)
downloadlinhes_pkgbuild-525753e4a1a139e088d8ac120b19fbab6c0aaaa6.zip
linhes_pkgbuild-525753e4a1a139e088d8ac120b19fbab6c0aaaa6.tar.gz
linhes_pkgbuild-525753e4a1a139e088d8ac120b19fbab6c0aaaa6.tar.bz2
Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD
Diffstat (limited to 'abs/core-testing/fontconfig')
-rw-r--r--abs/core-testing/fontconfig/30-urw-aliases.patch13
-rw-r--r--abs/core-testing/fontconfig/PKGBUILD31
-rw-r--r--abs/core-testing/fontconfig/fontconfig.install2
3 files changed, 31 insertions, 15 deletions
diff --git a/abs/core-testing/fontconfig/30-urw-aliases.patch b/abs/core-testing/fontconfig/30-urw-aliases.patch
new file mode 100644
index 0000000..8077b86
--- /dev/null
+++ b/abs/core-testing/fontconfig/30-urw-aliases.patch
@@ -0,0 +1,13 @@
+--- 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-testing/fontconfig/PKGBUILD b/abs/core-testing/fontconfig/PKGBUILD
index f5c3465..ff2130a 100644
--- a/abs/core-testing/fontconfig/PKGBUILD
+++ b/abs/core-testing/fontconfig/PKGBUILD
@@ -1,32 +1,35 @@
-# $Id: PKGBUILD 4424 2008-07-06 22:09:03Z jgc $
+# $Id: PKGBUILD 59983 2009-11-29 20:25:27Z jgc $
# Maintainer: Jan de Groot <jgc@archlinux.org>
pkgname=fontconfig
-pkgver=2.6.0
-pkgrel=4
+pkgver=2.8.0
+pkgrel=1
pkgdesc="A library for configuring and customizing font access"
arch=(i686 x86_64)
url="http://www.fontconfig.org/release/"
license=('custom')
-depends=('expat>=2.0' 'freetype2>=2.3.7')
+depends=('expat>=2.0.1' 'freetype2>=2.3.11')
options=('!libtool')
install=fontconfig.install
source=(http://www.fontconfig.org/release/${pkgname}-${pkgver}.tar.gz
- 29-replace-bitmap-fonts.conf)
-md5sums=('ab54ec1d4ddd836313fdbc0cd5299d6d'
- 'f6b67e8cc79197ed6abd4701911e83da')
+ 29-replace-bitmap-fonts.conf
+ 30-urw-aliases.patch)
+md5sums=('77e15a92006ddc2adbb06f840d591c0e'
+ 'f6b67e8cc79197ed6abd4701911e83da'
+ '51bc6cb633b50f3c28793361738aac5b')
build() {
- cd ${startdir}/src/${pkgname}-${pkgver}
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -Np1 -i "${srcdir}/30-urw-aliases.patch" || return 1
# enable Position Independent Code for prelinking
export CFLAGS="${CFLAGS} -fPIC"
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
make || return 1
- make DESTDIR=${startdir}/pkg install || return 1
- install -m644 ${startdir}/src/29-replace-bitmap-fonts.conf \
- ${startdir}/pkg/etc/fonts/conf.avail || return 1
- rm -f ${startdir}/pkg/etc/fonts/conf.d/*.conf
+ make DESTDIR="${pkgdir}" install || return 1
+ install -m644 "${srcdir}/29-replace-bitmap-fonts.conf" \
+ "${pkgdir}/etc/fonts/conf.avail" || return 1
+ rm -f ${pkgdir}/etc/fonts/conf.d/*.conf
#Install license
- install -m755 -d ${pkgdir}/usr/share/licenses/${pkgname}
- install -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/ || return 1
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+ install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
}
diff --git a/abs/core-testing/fontconfig/fontconfig.install b/abs/core-testing/fontconfig/fontconfig.install
index 6608834..20feb6e 100644
--- a/abs/core-testing/fontconfig/fontconfig.install
+++ b/abs/core-testing/fontconfig/fontconfig.install
@@ -35,7 +35,7 @@ post_upgrade() {
The way fontconfig is configured has been changed.
Configuration is done via /etc/fonts/conf.avail and conf.d.
- Read /etc/fonts/conf.avail/README for more information.
+ 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.