[arch-commits] Commit in lib32-fontconfig/trunk (2 files)

[Felix Yan]

    Date: Saturday, April 9, 2016 @ 13:04:21
  Author: fyan
Revision: 169815

upgpkg: lib32-fontconfig 2.11.95-1

Modified:
  lib32-fontconfig/trunk/PKGBUILD
Deleted:
  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 |   23 ----------
 PKGBUILD                                                            |   15 +-----
 2 files changed, 3 insertions(+), 35 deletions(-)

Deleted: Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff
===================================================================
--- Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff	2016-04-09 10:49:45 UTC (rev 169814)
+++ Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff	2016-04-09 11:04:21 UTC (rev 169815)
@@ -1,23 +0,0 @@
-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
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-04-09 10:49:45 UTC (rev 169814)
+++ PKGBUILD	2016-04-09 11:04:21 UTC (rev 169815)
@@ -3,7 +3,7 @@
 
 _pkgbasename=fontconfig
 pkgname=lib32-$_pkgbasename
-pkgver=2.11.94
+pkgver=2.11.95
 pkgrel=1
 pkgdesc="A library for configuring and customizing font access (32-bit)"
 arch=(x86_64)
@@ -12,21 +12,12 @@
 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')
+source=(http://www.fontconfig.org/release/${_pkgbasename}-${pkgver}.tar.bz2)
+sha256sums=('7b165eee7aa22dcc1557db56f58d905b6a14b32f9701c79427452474375b4c89')
 
   # 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