[arch-commits] Commit in lib32-fontconfig/repos/multilib-x86_64 (5 files)
Felix Yan
fyan at archlinux.org
Wed Mar 30 16:23:14 UTC 2016
Date: Wednesday, March 30, 2016 @ 18:23:14
Author: fyan
Revision: 168896
archrelease: copy trunk to multilib-x86_64
Added:
lib32-fontconfig/repos/multilib-x86_64/Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff
(from rev 168895, lib32-fontconfig/trunk/Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff)
lib32-fontconfig/repos/multilib-x86_64/PKGBUILD
(from rev 168895, lib32-fontconfig/trunk/PKGBUILD)
lib32-fontconfig/repos/multilib-x86_64/lib32-fontconfig.install
(from rev 168895, lib32-fontconfig/trunk/lib32-fontconfig.install)
Deleted:
lib32-fontconfig/repos/multilib-x86_64/PKGBUILD
lib32-fontconfig/repos/multilib-x86_64/lib32-fontconfig.install
---------------------------------------------------------------------+
Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff | 23 +
PKGBUILD | 126 +++++-----
lib32-fontconfig.install | 22 -
3 files changed, 99 insertions(+), 72 deletions(-)
Copied: lib32-fontconfig/repos/multilib-x86_64/Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff (from rev 168895, lib32-fontconfig/trunk/Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff)
===================================================================
--- Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff (rev 0)
+++ Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff 2016-03-30 16:23:14 UTC (rev 168896)
@@ -0,0 +1,23 @@
+From 04763135d47ae24a808fc15c4482e2bb6f847ab9 Mon Sep 17 00:00:00 2001
+From: Akira TAGOH <akira at tagoh.org>
+Date: Wed, 25 Nov 2015 11:58:14 +0900
+Subject: Avoid an error message on testing when no fonts.conf installed
+
+This test case doesn't require any config files so no need to ensure loading them.
+
+diff --git a/test/test-bz89617.c b/test/test-bz89617.c
+index 587214a..35df885 100644
+--- a/test/test-bz89617.c
++++ b/test/test-bz89617.c
+@@ -28,7 +28,7 @@
+ int
+ main (void)
+ {
+- FcConfig *config = FcConfigGetCurrent ();
++ FcConfig *config = FcConfigCreate ();
+
+ if (!FcConfigAppFontAddFile (config, (const FcChar8 *)SRCDIR "/4x6.pcf") ||
+ FcConfigAppFontAddFile (config, (const FcChar8 *)"/dev/null"))
+--
+cgit v0.10.2
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2016-03-30 16:22:44 UTC (rev 168895)
+++ PKGBUILD 2016-03-30 16:23:14 UTC (rev 168896)
@@ -1,61 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-_pkgbasename=fontconfig
-pkgname=lib32-$_pkgbasename
-pkgver=2.11.1
-pkgrel=1
-pkgdesc="A library for configuring and customizing font access (32-bit)"
-arch=(x86_64)
-url="http://www.fontconfig.org/release/"
-license=('custom')
-depends=('lib32-expat' 'lib32-freetype2' $_pkgbasename)
-makedepends=(gcc-multilib)
-options=('!libtool')
-install=lib32-fontconfig.install
-source=(http://www.fontconfig.org/release/${_pkgbasename}-${pkgver}.tar.bz2)
-sha256sums=('dc62447533bca844463a3c3fd4083b57c90f18a70506e7a9f4936b5a1e516a99')
-
- # a nice page to test font matching:
- # http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html
-
-build() {
- cd $_pkgbasename-$pkgver
-
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
- # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo do this as well
- libtoolize -f
- autoreconf -fi
-
- ./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 \
- --libdir=/usr/lib32
- make
-}
-
-check() {
- cd $_pkgbasename-$pkgver
- make -k check
-}
-
-package() {
- cd $_pkgbasename-$pkgver
- make DESTDIR="$pkgdir" install
-
- rm -rf "$pkgdir"/{etc,usr/{include,share}}
- find "$pkgdir/usr/bin" -not -type d -not -name fc-cache -delete
- mv "$pkgdir"/usr/bin/fc-cache{,-32}
-
- # Install license
- mkdir -p "$pkgdir/usr/share/licenses"
- ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
Copied: lib32-fontconfig/repos/multilib-x86_64/PKGBUILD (from rev 168895, lib32-fontconfig/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2016-03-30 16:23:14 UTC (rev 168896)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+_pkgbasename=fontconfig
+pkgname=lib32-$_pkgbasename
+pkgver=2.11.94
+pkgrel=1
+pkgdesc="A library for configuring and customizing font access (32-bit)"
+arch=(x86_64)
+url="http://www.fontconfig.org/release/"
+license=('custom')
+depends=('lib32-expat' 'lib32-freetype2' $_pkgbasename)
+makedepends=('python2')
+install=lib32-fontconfig.install
+source=(http://www.fontconfig.org/release/${_pkgbasename}-${pkgver}.tar.bz2
+ Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff)
+sha256sums=('d763c024df434146f3352448bc1f4554f390c8a48340cef7aa9cc44716a159df'
+ '911ec42fe2c0b57b2115d61aa1bb327b40189374cc115e648c58b57c8a7f3aba')
+
+ # a nice page to test font matching:
+ # http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html
+
+prepare() {
+ cd $_pkgbasename-$pkgver
+ # fix a bug in the testsuite
+ # https://cgit.freedesktop.org/fontconfig/commit/?id=04763135d47ae24a808fc15c4482e2bb6f847ab9
+ patch -Np1 -i $srcdir/Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff
+}
+
+build() {
+ cd $_pkgbasename-$pkgver
+
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+
+ ./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 \
+ --libdir=/usr/lib32
+ make
+}
+
+check() {
+ cd $_pkgbasename-$pkgver
+ make -k check
+}
+
+package() {
+ cd $_pkgbasename-$pkgver
+ make DESTDIR="$pkgdir" install
+
+ rm -rf "$pkgdir"/{etc,usr/{include,share}}
+ find "$pkgdir/usr/bin" -not -type d -not -name fc-cache -delete
+ mv "$pkgdir"/usr/bin/fc-cache{,-32}
+
+ # Install license
+ mkdir -p "$pkgdir/usr/share/licenses"
+ ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
+}
Deleted: lib32-fontconfig.install
===================================================================
--- lib32-fontconfig.install 2016-03-30 16:22:44 UTC (rev 168895)
+++ lib32-fontconfig.install 2016-03-30 16:23:14 UTC (rev 168896)
@@ -1,11 +0,0 @@
-post_install() {
- echo -n "updating font cache... "
- /usr/bin/fc-cache-32 -f
- echo "done."
-}
-
-post_upgrade() {
- echo -n "updating font cache... "
- /usr/bin/fc-cache-32 -f
- echo "done."
-}
Copied: lib32-fontconfig/repos/multilib-x86_64/lib32-fontconfig.install (from rev 168895, lib32-fontconfig/trunk/lib32-fontconfig.install)
===================================================================
--- lib32-fontconfig.install (rev 0)
+++ lib32-fontconfig.install 2016-03-30 16:23:14 UTC (rev 168896)
@@ -0,0 +1,11 @@
+post_install() {
+ echo -n "updating font cache... "
+ /usr/bin/fc-cache-32 -f
+ echo "done."
+}
+
+post_upgrade() {
+ echo -n "updating font cache... "
+ /usr/bin/fc-cache-32 -f
+ echo "done."
+}
More information about the arch-commits
mailing list