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

Jan Steffens heftig at archlinux.org
Tue Jan 10 19:41:43 UTC 2017


    Date: Tuesday, January 10, 2017 @ 19:41:43
  Author: heftig
Revision: 206653

2.12.1-4

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

------------------------------------------+
 0001-fix-test-with-freetype2-2.7.1.patch |   42 +++++++++++++++++++++++++++++
 PKGBUILD                                 |   27 ++++++++++++++----
 lib32-fontconfig.hook                    |   11 +++++++
 lib32-fontconfig.install                 |    1 
 4 files changed, 75 insertions(+), 6 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 19:41:43 UTC (rev 206653)
@@ -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 19:40:24 UTC (rev 206652)
+++ PKGBUILD	2017-01-10 19:41:43 UTC (rev 206653)
@@ -4,17 +4,30 @@
 _pkgbasename=fontconfig
 pkgname=lib32-$_pkgbasename
 pkgver=2.12.1
-pkgrel=1
+pkgrel=4
 pkgdesc="A library for configuring and customizing font access (32-bit)"
 arch=(x86_64)
-url="http://www.fontconfig.org/release/"
+url="https://www.freedesktop.org/wiki/Software/fontconfig/"
 license=('custom')
 depends=('lib32-expat' 'lib32-freetype2' $_pkgbasename)
 makedepends=('python2')
 install=lib32-fontconfig.install
-source=(http://www.fontconfig.org/release/${_pkgbasename}-${pkgver}.tar.bz2)
-sha256sums=('b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3')
+source=(https://www.freedesktop.org/software/$_pkgbasename/release/$_pkgbasename-$pkgver.tar.bz2
+        lib32-fontconfig.hook
+        0001-fix-test-with-freetype2-2.7.1.patch)
+sha256sums=('b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3'
+            'd97c0c5b88023da5a2acf64cf560265390a9365305c43b8e86b4f89348e727b3'
+            'b4992aab4e2b4ddae01f7565486752fa877edb6cd5ed435e15938ed21dfe22c8')
 
+# a nice page to test font matching:
+# http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html
+# http://getemoji.com/
+
+prepare() {
+  cd $_pkgbasename-$pkgver
+  patch -Np1 -i ../0001-fix-test-with-freetype2-2.7.1.patch
+}
+
 build() {
   cd $_pkgbasename-$pkgver
 
@@ -23,6 +36,7 @@
   export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
 
   ./configure --prefix=/usr \
+    --libdir=/usr/lib32 \
     --sysconfdir=/etc \
     --with-templatedir=/etc/fonts/conf.avail \
     --with-xmldir=/etc/fonts \
@@ -29,8 +43,7 @@
     --localstatedir=/var \
     --disable-static \
     --with-default-fonts=/usr/share/fonts \
-    --with-add-fonts=/usr/share/fonts \
-    --libdir=/usr/lib32
+    --with-add-fonts=/usr/share/fonts
   make
 }
 
@@ -47,6 +60,8 @@
   find "$pkgdir/usr/bin" -not -type d -not -name fc-cache -delete
   mv "$pkgdir"/usr/bin/fc-cache{,-32}
 
+  install -Dm644 ../lib32-fontconfig.hook "$pkgdir/usr/share/libalpm/hooks/lib32-fontconfig.hook"
+
   # Install license
   mkdir -p "$pkgdir/usr/share/licenses"
   ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"

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

Modified: lib32-fontconfig.install
===================================================================
--- lib32-fontconfig.install	2017-01-10 19:40:24 UTC (rev 206652)
+++ lib32-fontconfig.install	2017-01-10 19:41:43 UTC (rev 206653)
@@ -1,5 +1,6 @@
 post_install() {
   echo -n "updating font cache... "
+  # a full forced directory scan is required here
   /usr/bin/fc-cache-32 -f
   echo "done."
 }



More information about the arch-commits mailing list