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

[Andreas Radke]

    Date: Wednesday, April 6, 2016 @ 18:09:06
  Author: andyrtr
Revision: 263951

upgpkg: fontconfig 2.11.95-1

upstream update 2.11.95

Modified:
  fontconfig/trunk/PKGBUILD
Deleted:
  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                                                            |    9 ---
 2 files changed, 2 insertions(+), 30 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-06 09:39:50 UTC (rev 263950)
+++ Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff	2016-04-06 16:09:06 UTC (rev 263951)
@@ -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-06 09:39:50 UTC (rev 263950)
+++ PKGBUILD	2016-04-06 16:09:06 UTC (rev 263951)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=fontconfig
-pkgver=2.11.94
+pkgver=2.11.95
 pkgrel=1
 pkgdesc="A library for configuring and customizing font access"
 arch=(i686 x86_64)
@@ -13,11 +13,9 @@
 #makedepends=('python2' 'python2-lxml' 'gperf' 'git') # for git build
 install=fontconfig.install
 source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2
-        Avoid_an_error_message_on_testing_when_no_fonts.conf_installed.diff
         #git://anongit.freedesktop.org/fontconfig#commit=d05d083e9f87eb378b92e477d34a88061a572d86 # 2016-03-09 01:20:41 (GMT)
         0002-Update-aliases-for-new-URW-fonts.patch)
-sha256sums=('d763c024df434146f3352448bc1f4554f390c8a48340cef7aa9cc44716a159df'
-            '911ec42fe2c0b57b2115d61aa1bb327b40189374cc115e648c58b57c8a7f3aba'
+sha256sums=('7b165eee7aa22dcc1557db56f58d905b6a14b32f9701c79427452474375b4c89'
             '08b5b1ccdfc1fb91787b9211758b01d9d7a988ad939c4cd0c4b5ae0e8143e59d')
 
   # a nice page to test font matching:
@@ -25,9 +23,6 @@
 
 prepare() {
   cd $pkgname-$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
   
   #cd $pkgname