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

Christian Hesse eworm at archlinux.org
Tue Jan 10 09:10:47 UTC 2017


    Date: Tuesday, January 10, 2017 @ 09:10:46
  Author: eworm
Revision: 285626

upgpkg: fontconfig 2.12.1-4

* fix 'make check' with freetype2 2.7.1
* add pacman hook for fontconfig cache update

Added:
  fontconfig/trunk/0001-fix-test-with-freetype2-2.7.1.patch
  fontconfig/trunk/fontconfig.hook
Modified:
  fontconfig/trunk/PKGBUILD

------------------------------------------+
 0001-fix-test-with-freetype2-2.7.1.patch |   42 +++++++++++++++++++++++++++++
 PKGBUILD                                 |   12 ++++++--
 fontconfig.hook                          |   11 +++++++
 3 files changed, 62 insertions(+), 3 deletions(-)

Added: 0001-fix-test-with-freetype2-2.7.1.patch
===================================================================
--- 0001-fix-test-with-freetype2-2.7.1.patch	                        (rev 0)
+++ 0001-fix-test-with-freetype2-2.7.1.patch	2017-01-10 09:10:46 UTC (rev 285626)
@@ -0,0 +1,42 @@
+From 165f0f012f8d4bebb12d188c1c2a369d233d586e Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail at eworm.de>
+Date: Tue, 10 Jan 2017 10:01:54 +0100
+Subject: [PATCH 1/1] fix test with freetype2 2.7.1
+
+Upstream freetype2 applied a patch from openSuSE [0]:
+
+[pcf] Enrich family name with foundry name and glyph width info.
+3576487add2f0e9691e8c43f8b0cd8e61aebf14f
+
+This prepends the foundry name plus a space to the family name. We needs
+change the font name in expexted test output.
+
+[0] http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=3576487add2f0e9691e8c43f8b0cd8e61aebf14f
+
+Signed-off-by: Christian Hesse <mail at eworm.de>
+---
+ test/out.expected | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/test/out.expected b/test/out.expected
+index 39634c5..f3a8856 100644
+--- a/test/out.expected
++++ b/test/out.expected
+@@ -1,8 +1,8 @@
+-Fixed:pixelsize=16
+-Fixed:pixelsize=6
++Misc Fixed:pixelsize=6
++Sony Fixed:pixelsize=16
+ =
+-Fixed:pixelsize=16
+-Fixed:pixelsize=6
++Misc Fixed:pixelsize=6
++Sony Fixed:pixelsize=16
+ =
+-Fixed:pixelsize=16
+-Fixed:pixelsize=6
++Misc Fixed:pixelsize=6
++Sony Fixed:pixelsize=16
+-- 
+2.11.0
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-01-10 08:11:14 UTC (rev 285625)
+++ PKGBUILD	2017-01-10 09:10:46 UTC (rev 285626)
@@ -3,7 +3,7 @@
 
 pkgname=fontconfig
 pkgver=2.12.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A library for configuring and customizing font access"
 arch=(i686 x86_64)
 url="http://www.fontconfig.org/release/"
@@ -11,8 +11,12 @@
 depends=('expat' 'freetype2')
 makedepends=('python2' 'docbook2x')
 install=fontconfig.install
-source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2)
-sha256sums=('b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3')
+source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2
+        fontconfig.hook
+        0001-fix-test-with-freetype2-2.7.1.patch)
+sha256sums=('b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3'
+            '672f6a1c5e164671955ce807e670306194142a1794ce88df653aa717a972e274'
+            'b4992aab4e2b4ddae01f7565486752fa877edb6cd5ed435e15938ed21dfe22c8')
 
 # a nice page to test font matching:
 # http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html
@@ -20,6 +24,7 @@
 
 prepare() {
   cd $pkgname-$pkgver
+  patch -Np1 < "$srcdir/0001-fix-test-with-freetype2-2.7.1.patch"
 }
 
 build() {
@@ -49,4 +54,5 @@
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+  install -Dm644 $srcdir/fontconfig.hook "$pkgdir/usr/share/libalpm/hooks/fontconfig.hook"
 }

Added: fontconfig.hook
===================================================================
--- fontconfig.hook	                        (rev 0)
+++ fontconfig.hook	2017-01-10 09:10:46 UTC (rev 285626)
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Operation = Remove
+Target = usr/share/fonts/*
+
+[Action]
+Description = Updating fontconfig cache...
+When = PostTransaction
+Exec = /usr/bin/fc-cache -s



More information about the arch-commits mailing list