[arch-commits] Commit in fontconfig/repos (16 files)
Ionut Biru
ibiru at archlinux.org
Thu Feb 23 13:01:06 UTC 2012
Date: Thursday, February 23, 2012 @ 08:01:06
Author: ibiru
Revision: 150857
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
fontconfig/repos/extra-i686/29-replace-bitmap-fonts.conf
(from rev 150856, fontconfig/trunk/29-replace-bitmap-fonts.conf)
fontconfig/repos/extra-i686/30-urw-aliases.patch
(from rev 150856, fontconfig/trunk/30-urw-aliases.patch)
fontconfig/repos/extra-i686/PKGBUILD
(from rev 150856, fontconfig/trunk/PKGBUILD)
fontconfig/repos/extra-i686/fontconfig.install
(from rev 150856, fontconfig/trunk/fontconfig.install)
fontconfig/repos/extra-x86_64/29-replace-bitmap-fonts.conf
(from rev 150856, fontconfig/trunk/29-replace-bitmap-fonts.conf)
fontconfig/repos/extra-x86_64/30-urw-aliases.patch
(from rev 150856, fontconfig/trunk/30-urw-aliases.patch)
fontconfig/repos/extra-x86_64/PKGBUILD
(from rev 150856, fontconfig/trunk/PKGBUILD)
fontconfig/repos/extra-x86_64/fontconfig.install
(from rev 150856, fontconfig/trunk/fontconfig.install)
Deleted:
fontconfig/repos/extra-i686/29-replace-bitmap-fonts.conf
fontconfig/repos/extra-i686/30-urw-aliases.patch
fontconfig/repos/extra-i686/PKGBUILD
fontconfig/repos/extra-i686/fontconfig.install
fontconfig/repos/extra-x86_64/29-replace-bitmap-fonts.conf
fontconfig/repos/extra-x86_64/30-urw-aliases.patch
fontconfig/repos/extra-x86_64/PKGBUILD
fontconfig/repos/extra-x86_64/fontconfig.install
-------------------------------------------+
extra-i686/29-replace-bitmap-fonts.conf | 74 +++++-----
extra-i686/30-urw-aliases.patch | 26 +--
extra-i686/PKGBUILD | 74 +++++-----
extra-i686/fontconfig.install | 200 ++++++++++++++--------------
extra-x86_64/29-replace-bitmap-fonts.conf | 74 +++++-----
extra-x86_64/30-urw-aliases.patch | 26 +--
extra-x86_64/PKGBUILD | 74 +++++-----
extra-x86_64/fontconfig.install | 200 ++++++++++++++--------------
8 files changed, 378 insertions(+), 370 deletions(-)
Deleted: extra-i686/29-replace-bitmap-fonts.conf
===================================================================
--- extra-i686/29-replace-bitmap-fonts.conf 2012-02-23 12:59:49 UTC (rev 150856)
+++ extra-i686/29-replace-bitmap-fonts.conf 2012-02-23 13:01:06 UTC (rev 150857)
@@ -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>
Copied: fontconfig/repos/extra-i686/29-replace-bitmap-fonts.conf (from rev 150856, fontconfig/trunk/29-replace-bitmap-fonts.conf)
===================================================================
--- extra-i686/29-replace-bitmap-fonts.conf (rev 0)
+++ extra-i686/29-replace-bitmap-fonts.conf 2012-02-23 13:01:06 UTC (rev 150857)
@@ -0,0 +1,37 @@
+<?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>
Deleted: extra-i686/30-urw-aliases.patch
===================================================================
--- extra-i686/30-urw-aliases.patch 2012-02-23 12:59:49 UTC (rev 150856)
+++ extra-i686/30-urw-aliases.patch 2012-02-23 13:01:06 UTC (rev 150857)
@@ -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>
Copied: fontconfig/repos/extra-i686/30-urw-aliases.patch (from rev 150856, fontconfig/trunk/30-urw-aliases.patch)
===================================================================
--- extra-i686/30-urw-aliases.patch (rev 0)
+++ extra-i686/30-urw-aliases.patch 2012-02-23 13:01:06 UTC (rev 150857)
@@ -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>
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-02-23 12:59:49 UTC (rev 150856)
+++ extra-i686/PKGBUILD 2012-02-23 13:01:06 UTC (rev 150857)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-pkgname=fontconfig
-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.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
- 30-urw-aliases.patch)
-md5sums=('77e15a92006ddc2adbb06f840d591c0e'
- 'f6b67e8cc79197ed6abd4701911e83da'
- '51bc6cb633b50f3c28793361738aac5b')
-
-build() {
- 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="${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
-}
Copied: fontconfig/repos/extra-i686/PKGBUILD (from rev 150856, fontconfig/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-02-23 13:01:06 UTC (rev 150857)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+pkgname=fontconfig
+pkgver=2.8.0
+pkgrel=2
+pkgdesc="A library for configuring and customizing font access"
+arch=(i686 x86_64)
+url="http://www.fontconfig.org/release/"
+license=('custom')
+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')
+
+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
+}
+
+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
+
+ #Install license
+ install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
+ install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname"
+}
Deleted: extra-i686/fontconfig.install
===================================================================
--- extra-i686/fontconfig.install 2012-02-23 12:59:49 UTC (rev 150856)
+++ extra-i686/fontconfig.install 2012-02-23 13:01:06 UTC (rev 150857)
@@ -1,100 +0,0 @@
-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.
- 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
-
- 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
-
- # 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
- echo "done."
-}
-
-post_remove() {
- pushd /etc/fonts/conf.d > /dev/null
- for config in "${configs[@]}"; do
- rm -f ${config}
- done
- popd > /dev/null
-}
Copied: fontconfig/repos/extra-i686/fontconfig.install (from rev 150856, fontconfig/trunk/fontconfig.install)
===================================================================
--- extra-i686/fontconfig.install (rev 0)
+++ extra-i686/fontconfig.install 2012-02-23 13:01:06 UTC (rev 150857)
@@ -0,0 +1,100 @@
+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.
+ 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
+
+ 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
+
+ # 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
+ echo "done."
+}
+
+post_remove() {
+ pushd /etc/fonts/conf.d > /dev/null
+ for config in "${configs[@]}"; do
+ rm -f ${config}
+ done
+ popd > /dev/null
+}
Deleted: extra-x86_64/29-replace-bitmap-fonts.conf
===================================================================
--- extra-x86_64/29-replace-bitmap-fonts.conf 2012-02-23 12:59:49 UTC (rev 150856)
+++ extra-x86_64/29-replace-bitmap-fonts.conf 2012-02-23 13:01:06 UTC (rev 150857)
@@ -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>
Copied: fontconfig/repos/extra-x86_64/29-replace-bitmap-fonts.conf (from rev 150856, fontconfig/trunk/29-replace-bitmap-fonts.conf)
===================================================================
--- extra-x86_64/29-replace-bitmap-fonts.conf (rev 0)
+++ extra-x86_64/29-replace-bitmap-fonts.conf 2012-02-23 13:01:06 UTC (rev 150857)
@@ -0,0 +1,37 @@
+<?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>
Deleted: extra-x86_64/30-urw-aliases.patch
===================================================================
--- extra-x86_64/30-urw-aliases.patch 2012-02-23 12:59:49 UTC (rev 150856)
+++ extra-x86_64/30-urw-aliases.patch 2012-02-23 13:01:06 UTC (rev 150857)
@@ -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>
Copied: fontconfig/repos/extra-x86_64/30-urw-aliases.patch (from rev 150856, fontconfig/trunk/30-urw-aliases.patch)
===================================================================
--- extra-x86_64/30-urw-aliases.patch (rev 0)
+++ extra-x86_64/30-urw-aliases.patch 2012-02-23 13:01:06 UTC (rev 150857)
@@ -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>
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-02-23 12:59:49 UTC (rev 150856)
+++ extra-x86_64/PKGBUILD 2012-02-23 13:01:06 UTC (rev 150857)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-pkgname=fontconfig
-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.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
- 30-urw-aliases.patch)
-md5sums=('77e15a92006ddc2adbb06f840d591c0e'
- 'f6b67e8cc79197ed6abd4701911e83da'
- '51bc6cb633b50f3c28793361738aac5b')
-
-build() {
- 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="${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
-}
Copied: fontconfig/repos/extra-x86_64/PKGBUILD (from rev 150856, fontconfig/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-02-23 13:01:06 UTC (rev 150857)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+pkgname=fontconfig
+pkgver=2.8.0
+pkgrel=2
+pkgdesc="A library for configuring and customizing font access"
+arch=(i686 x86_64)
+url="http://www.fontconfig.org/release/"
+license=('custom')
+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')
+
+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
+}
+
+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
+
+ #Install license
+ install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
+ install -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname"
+}
Deleted: extra-x86_64/fontconfig.install
===================================================================
--- extra-x86_64/fontconfig.install 2012-02-23 12:59:49 UTC (rev 150856)
+++ extra-x86_64/fontconfig.install 2012-02-23 13:01:06 UTC (rev 150857)
@@ -1,100 +0,0 @@
-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.
- 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
-
- 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
-
- # 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
- echo "done."
-}
-
-post_remove() {
- pushd /etc/fonts/conf.d > /dev/null
- for config in "${configs[@]}"; do
- rm -f ${config}
- done
- popd > /dev/null
-}
Copied: fontconfig/repos/extra-x86_64/fontconfig.install (from rev 150856, fontconfig/trunk/fontconfig.install)
===================================================================
--- extra-x86_64/fontconfig.install (rev 0)
+++ extra-x86_64/fontconfig.install 2012-02-23 13:01:06 UTC (rev 150857)
@@ -0,0 +1,100 @@
+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.
+ 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
+
+ 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
+
+ # 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
+ echo "done."
+}
+
+post_remove() {
+ pushd /etc/fonts/conf.d > /dev/null
+ for config in "${configs[@]}"; do
+ rm -f ${config}
+ done
+ popd > /dev/null
+}
More information about the arch-commits
mailing list