[arch-commits] Commit in fontconfig/repos (8 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Wed Sep 5 11:21:50 UTC 2012
Date: Wednesday, September 5, 2012 @ 07:21:50
Author: andyrtr
Revision: 166188
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
fontconfig/repos/testing-i686/
fontconfig/repos/testing-i686/29-replace-bitmap-fonts.conf
(from rev 166187, fontconfig/trunk/29-replace-bitmap-fonts.conf)
fontconfig/repos/testing-i686/PKGBUILD
(from rev 166187, fontconfig/trunk/PKGBUILD)
fontconfig/repos/testing-i686/fontconfig.install
(from rev 166187, fontconfig/trunk/fontconfig.install)
fontconfig/repos/testing-x86_64/
fontconfig/repos/testing-x86_64/29-replace-bitmap-fonts.conf
(from rev 166187, fontconfig/trunk/29-replace-bitmap-fonts.conf)
fontconfig/repos/testing-x86_64/PKGBUILD
(from rev 166187, fontconfig/trunk/PKGBUILD)
fontconfig/repos/testing-x86_64/fontconfig.install
(from rev 166187, fontconfig/trunk/fontconfig.install)
---------------------------------------------+
testing-i686/29-replace-bitmap-fonts.conf | 37 +++++++++++++++++
testing-i686/PKGBUILD | 55 ++++++++++++++++++++++++++
testing-i686/fontconfig.install | 39 ++++++++++++++++++
testing-x86_64/29-replace-bitmap-fonts.conf | 37 +++++++++++++++++
testing-x86_64/PKGBUILD | 55 ++++++++++++++++++++++++++
testing-x86_64/fontconfig.install | 39 ++++++++++++++++++
6 files changed, 262 insertions(+)
Copied: fontconfig/repos/testing-i686/29-replace-bitmap-fonts.conf (from rev 166187, fontconfig/trunk/29-replace-bitmap-fonts.conf)
===================================================================
--- testing-i686/29-replace-bitmap-fonts.conf (rev 0)
+++ testing-i686/29-replace-bitmap-fonts.conf 2012-09-05 11:21:50 UTC (rev 166188)
@@ -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>
Copied: fontconfig/repos/testing-i686/PKGBUILD (from rev 166187, fontconfig/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-09-05 11:21:50 UTC (rev 166188)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=fontconfig
+pkgver=2.10.1
+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' 'freetype2')
+options=('!libtool')
+install=fontconfig.install
+source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.gz
+ 29-replace-bitmap-fonts.conf)
+md5sums=('c94e380eea42f2f23ca9537035ef1899'
+ 'f6b67e8cc79197ed6abd4701911e83da')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # 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
+
+ # not upstream, not in FC and not in Gentoo, let's drop it for testing - should be covered in 30-metric-aliases.conf
+ #install -m644 "$srcdir/29-replace-bitmap-fonts.conf" "$pkgdir/etc/fonts/conf.avail"
+
+ # we should keep upstream presettings and not leave them all up to the users decision - so FC and Gentoo do
+ #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"
+}
Copied: fontconfig/repos/testing-i686/fontconfig.install (from rev 166187, fontconfig/trunk/fontconfig.install)
===================================================================
--- testing-i686/fontconfig.install (rev 0)
+++ testing-i686/fontconfig.install 2012-09-05 11:21:50 UTC (rev 166188)
@@ -0,0 +1,39 @@
+post_install() {
+ cat << _EOF
+
+ 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.
+
+ 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.
+
+_EOF
+
+ echo -n "updating font cache... "
+ /usr/bin/fc-cache -f
+ echo "done."
+}
+
+post_upgrade() {
+ echo -n "updating font cache... "
+ /usr/bin/fc-cache -f
+ echo "done."
+}
+
+post_remove() {
+ cat << _EOF
+
+ Check for dead symlinks and leftover files
+ in /etc/fonts/conf.d/
+
+_EOF
+}
Copied: fontconfig/repos/testing-x86_64/29-replace-bitmap-fonts.conf (from rev 166187, fontconfig/trunk/29-replace-bitmap-fonts.conf)
===================================================================
--- testing-x86_64/29-replace-bitmap-fonts.conf (rev 0)
+++ testing-x86_64/29-replace-bitmap-fonts.conf 2012-09-05 11:21:50 UTC (rev 166188)
@@ -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>
Copied: fontconfig/repos/testing-x86_64/PKGBUILD (from rev 166187, fontconfig/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-09-05 11:21:50 UTC (rev 166188)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=fontconfig
+pkgver=2.10.1
+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' 'freetype2')
+options=('!libtool')
+install=fontconfig.install
+source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.gz
+ 29-replace-bitmap-fonts.conf)
+md5sums=('c94e380eea42f2f23ca9537035ef1899'
+ 'f6b67e8cc79197ed6abd4701911e83da')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ # 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
+
+ # not upstream, not in FC and not in Gentoo, let's drop it for testing - should be covered in 30-metric-aliases.conf
+ #install -m644 "$srcdir/29-replace-bitmap-fonts.conf" "$pkgdir/etc/fonts/conf.avail"
+
+ # we should keep upstream presettings and not leave them all up to the users decision - so FC and Gentoo do
+ #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"
+}
Copied: fontconfig/repos/testing-x86_64/fontconfig.install (from rev 166187, fontconfig/trunk/fontconfig.install)
===================================================================
--- testing-x86_64/fontconfig.install (rev 0)
+++ testing-x86_64/fontconfig.install 2012-09-05 11:21:50 UTC (rev 166188)
@@ -0,0 +1,39 @@
+post_install() {
+ cat << _EOF
+
+ 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.
+
+ 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.
+
+_EOF
+
+ echo -n "updating font cache... "
+ /usr/bin/fc-cache -f
+ echo "done."
+}
+
+post_upgrade() {
+ echo -n "updating font cache... "
+ /usr/bin/fc-cache -f
+ echo "done."
+}
+
+post_remove() {
+ cat << _EOF
+
+ Check for dead symlinks and leftover files
+ in /etc/fonts/conf.d/
+
+_EOF
+}
More information about the arch-commits
mailing list