[arch-commits] Commit in fontconfig/repos (4 files)
Jan de Groot
jgc at archlinux.org
Sun Nov 29 20:25:27 UTC 2009
Date: Sunday, November 29, 2009 @ 15:25:27
Author: jgc
Revision: 59983
Merged revisions 36755,59981 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/fontconfig/trunk
........
r36755 | andrea | 2009-04-27 18:39:10 +0200 (Mon, 27 Apr 2009) | 1 line
FS#12598
........
r59981 | jgc | 2009-11-29 21:19:18 +0100 (Sun, 29 Nov 2009) | 3 lines
upgpkg: fontconfig 2.8.0-1
Update to 2.8.0
Implement fix for FS#15833
........
Added:
fontconfig/repos/extra-i686/30-urw-aliases.patch
(from rev 59981, fontconfig/trunk/30-urw-aliases.patch)
Modified:
fontconfig/repos/extra-i686/ (properties)
fontconfig/repos/extra-i686/PKGBUILD
fontconfig/repos/extra-i686/fontconfig.install
----------------------+
30-urw-aliases.patch | 13 +++++++++++++
PKGBUILD | 29 ++++++++++++++++-------------
fontconfig.install | 2 +-
3 files changed, 30 insertions(+), 14 deletions(-)
Property changes on: fontconfig/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /fontconfig/trunk:1-4423
+ /fontconfig/trunk:1-59982
Copied: fontconfig/repos/extra-i686/30-urw-aliases.patch (from rev 59981, fontconfig/trunk/30-urw-aliases.patch)
===================================================================
--- extra-i686/30-urw-aliases.patch (rev 0)
+++ extra-i686/30-urw-aliases.patch 2009-11-29 20:25:27 UTC (rev 59983)
@@ -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>
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2009-11-29 20:19:34 UTC (rev 59982)
+++ extra-i686/PKGBUILD 2009-11-29 20:25:27 UTC (rev 59983)
@@ -1,32 +1,35 @@
# $Id$
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=fontconfig
-pkgver=2.6.0
-pkgrel=2
+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
}
Modified: extra-i686/fontconfig.install
===================================================================
--- extra-i686/fontconfig.install 2009-11-29 20:19:34 UTC (rev 59982)
+++ extra-i686/fontconfig.install 2009-11-29 20:25:27 UTC (rev 59983)
@@ -35,7 +35,7 @@
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.
More information about the arch-commits
mailing list