[arch-commits] Commit in lib32-fontconfig/repos/multilib-x86_64 (8 files)
Jan Steffens
heftig at archlinux.org
Wed May 31 20:12:34 UTC 2017
Date: Wednesday, May 31, 2017 @ 20:12:33
Author: heftig
Revision: 231657
archrelease: copy trunk to multilib-x86_64
Added:
lib32-fontconfig/repos/multilib-x86_64/0001-Fix-testing-PCF_CONFIG_OPTION_LONG_FAMILY_NAMES-CFLA.patch
(from rev 231656, lib32-fontconfig/trunk/0001-Fix-testing-PCF_CONFIG_OPTION_LONG_FAMILY_NAMES-CFLA.patch)
lib32-fontconfig/repos/multilib-x86_64/PKGBUILD
(from rev 231656, lib32-fontconfig/trunk/PKGBUILD)
lib32-fontconfig/repos/multilib-x86_64/lib32-fontconfig.hook
(from rev 231656, lib32-fontconfig/trunk/lib32-fontconfig.hook)
lib32-fontconfig/repos/multilib-x86_64/lib32-fontconfig.install
(from rev 231656, lib32-fontconfig/trunk/lib32-fontconfig.install)
Deleted:
lib32-fontconfig/repos/multilib-x86_64/0001-fix-test-with-freetype2-2.7.1.patch
lib32-fontconfig/repos/multilib-x86_64/PKGBUILD
lib32-fontconfig/repos/multilib-x86_64/lib32-fontconfig.hook
lib32-fontconfig/repos/multilib-x86_64/lib32-fontconfig.install
-----------------------------------------------------------------+
0001-Fix-testing-PCF_CONFIG_OPTION_LONG_FAMILY_NAMES-CFLA.patch | 70 ++++
0001-fix-test-with-freetype2-2.7.1.patch | 42 --
PKGBUILD | 143 +++++-----
lib32-fontconfig.hook | 22 -
lib32-fontconfig.install | 22 -
5 files changed, 166 insertions(+), 133 deletions(-)
Copied: lib32-fontconfig/repos/multilib-x86_64/0001-Fix-testing-PCF_CONFIG_OPTION_LONG_FAMILY_NAMES-CFLA.patch (from rev 231656, lib32-fontconfig/trunk/0001-Fix-testing-PCF_CONFIG_OPTION_LONG_FAMILY_NAMES-CFLA.patch)
===================================================================
--- 0001-Fix-testing-PCF_CONFIG_OPTION_LONG_FAMILY_NAMES-CFLA.patch (rev 0)
+++ 0001-Fix-testing-PCF_CONFIG_OPTION_LONG_FAMILY_NAMES-CFLA.patch 2017-05-31 20:12:33 UTC (rev 231657)
@@ -0,0 +1,70 @@
+From 6d60728439b94847e62e8f2d1c7d4a799073f524 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
+Date: Wed, 31 May 2017 21:38:26 +0200
+Subject: [PATCH] Fix testing PCF_CONFIG_OPTION_LONG_FAMILY_NAMES (CFLAGS need
+ to be right)
+
+---
+ configure.ac | 16 +++++++++-------
+ 1 file changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 15633ec1e74b5747..50ab113cc4d01673 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -301,43 +301,45 @@ AC_DEFINE_UNQUOTED(USE_ICONV,$use_iconv,[Use iconv.])
+ PKG_CHECK_MODULES(FREETYPE, freetype2)
+ PKGCONFIG_REQUIRES="$PKGCONFIG_REQUIRES freetype2"
+
++AC_SUBST(FREETYPE_LIBS)
++AC_SUBST(FREETYPE_CFLAGS)
++
++fontconfig_save_libs="$LIBS"
++fontconfig_save_cflags="$CFLAGS"
++LIBS="$LIBS $FREETYPE_LIBS"
++CFLAGS="$CFLAGS $FREETYPE_CFLAGS"
++
+ dnl See http://git.savannah.gnu.org/cgit/freetype/freetype2.git/tree/docs/VERSIONS.TXT for versioning in freetype
+ dnl
+ dnl The outcome of the family property has been changed in freetype-2.7.1.
+ dnl Our test cases relies on it and need to update the dependency to get it success.
+ dnl However it isn't exactly required to run fontconfig itself.
+ dnl so adding another test here for compatibility. it might be simplified in the future.
+ PKG_CHECK_EXISTS([freetype2 = 19.0.13], [have_freetype_2_7_1=yes], [have_freetype_2_7_1=no])
+ PKG_CHECK_EXISTS([freetype2 >= 20.0.14],
+ [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+ #include <ft2build.h>
+ #include FT_CONFIG_OPTIONS_H
+ #ifndef PCF_CONFIG_OPTION_LONG_FAMILY_NAMES
+ # error "No pcf long family names support"
+ #endif
+ ]])], [have_pcf_long_family_names=yes], [have_pcf_long_family_names=no])],
+ [have_pcf_long_family_names=no])
+ AM_CONDITIONAL(FREETYPE_PCF_LONG_FAMILY_NAMES, test "x$have_freetype_2_7_1" = xyes -o "x$have_pcf_long_family_names" = xyes)
+
+-AC_SUBST(FREETYPE_LIBS)
+-AC_SUBST(FREETYPE_CFLAGS)
+-
+-fontconfig_save_libs="$LIBS"
+-fontconfig_save_cflags="$CFLAGS"
+-LIBS="$LIBS $FREETYPE_LIBS"
+-CFLAGS="$CFLAGS $FREETYPE_CFLAGS"
+ AC_CHECK_FUNCS(FT_Get_Next_Char FT_Get_BDF_Property FT_Get_PS_Font_Info FT_Has_PS_Glyph_Names FT_Get_X11_Font_Format FT_Select_Size)
+ AC_CHECK_MEMBER(FT_Bitmap_Size.y_ppem,
+ HAVE_FT_BITMAP_SIZE_Y_PPEM=1,
+ HAVE_FT_BITMAP_SIZE_Y_PPEM=0,
+ [#include <ft2build.h>
+ #include FT_FREETYPE_H])
+ AC_DEFINE_UNQUOTED(HAVE_FT_BITMAP_SIZE_Y_PPEM,$HAVE_FT_BITMAP_SIZE_Y_PPEM,
+ [FT_Bitmap_Size structure includes y_ppem field])
+ AC_CHECK_MEMBERS([TT_OS2.usLowerOpticalPointSize, TT_OS2.usUpperOpticalPointSize], [], [], [[
+ #include <ft2build.h>
+ #include FT_FREETYPE_H
+ #include FT_TRUETYPE_TABLES_H]])
++
+ CFLAGS="$fontconfig_save_cflags"
+ LIBS="$fontconfig_save_libs"
+
+--
+2.13.0
+
Deleted: 0001-fix-test-with-freetype2-2.7.1.patch
===================================================================
--- 0001-fix-test-with-freetype2-2.7.1.patch 2017-05-31 20:10:41 UTC (rev 231656)
+++ 0001-fix-test-with-freetype2-2.7.1.patch 2017-05-31 20:12:33 UTC (rev 231657)
@@ -1,42 +0,0 @@
-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
-
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2017-05-31 20:10:41 UTC (rev 231656)
+++ PKGBUILD 2017-05-31 20:12:33 UTC (rev 231657)
@@ -1,68 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-_pkgbasename=fontconfig
-pkgname=lib32-$_pkgbasename
-pkgver=2.12.1
-pkgrel=4
-pkgdesc="A library for configuring and customizing font access (32-bit)"
-arch=(x86_64)
-url="https://www.freedesktop.org/wiki/Software/fontconfig/"
-license=('custom')
-depends=('lib32-expat' 'lib32-freetype2' $_pkgbasename)
-makedepends=('python2')
-install=lib32-fontconfig.install
-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
-
- export CC="gcc -m32"
- export CXX="g++ -m32"
- 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 \
- --localstatedir=/var \
- --disable-static \
- --with-default-fonts=/usr/share/fonts \
- --with-add-fonts=/usr/share/fonts
- 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 -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"
-}
Copied: lib32-fontconfig/repos/multilib-x86_64/PKGBUILD (from rev 231656, lib32-fontconfig/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2017-05-31 20:12:33 UTC (rev 231657)
@@ -0,0 +1,75 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+_pkgbasename=fontconfig
+pkgname=lib32-$_pkgbasename
+pkgver=2.12.3
+pkgrel=1
+pkgdesc="A library for configuring and customizing font access (32-bit)"
+arch=(x86_64)
+url="https://www.freedesktop.org/wiki/Software/fontconfig/"
+license=(custom)
+depends=(lib32-expat lib32-freetype2 $_pkgbasename)
+makedepends=(git autoconf-archive gperf python-lxml python-six)
+install=lib32-fontconfig.install
+_commit=690f822a1b26b089d86e9843746cab80f3c07fe3 # tags/2.12.3^0
+source=("git+https://anongit.freedesktop.org/git/fontconfig#commit=$_commit"
+ lib32-fontconfig.hook
+ 0001-Fix-testing-PCF_CONFIG_OPTION_LONG_FAMILY_NAMES-CFLA.patch)
+sha256sums=('SKIP'
+ 'd97c0c5b88023da5a2acf64cf560265390a9365305c43b8e86b4f89348e727b3'
+ '02aa1f39e69aa16fdf9ca91c011a2f0853c896f257e5c14d0c2759a1d93012aa')
+
+# a nice page to test font matching:
+# http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html
+# http://getemoji.com/
+
+pkgver() {
+ cd $_pkgbasename
+ git describe --tags | sed 's/-/+/g'
+}
+
+prepare() {
+ cd $_pkgbasename
+ patch -Np1 -i ../0001-Fix-testing-PCF_CONFIG_OPTION_LONG_FAMILY_NAMES-CFLA.patch
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd $_pkgbasename
+
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ 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 \
+ --localstatedir=/var \
+ --disable-static \
+ --with-default-fonts=/usr/share/fonts \
+ --with-add-fonts=/usr/share/fonts
+ make
+}
+
+check() {
+ cd $_pkgbasename
+ make -k check
+}
+
+package() {
+ cd $_pkgbasename
+ 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 -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"
+}
Deleted: lib32-fontconfig.hook
===================================================================
--- lib32-fontconfig.hook 2017-05-31 20:10:41 UTC (rev 231656)
+++ lib32-fontconfig.hook 2017-05-31 20:12:33 UTC (rev 231657)
@@ -1,11 +0,0 @@
-[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
Copied: lib32-fontconfig/repos/multilib-x86_64/lib32-fontconfig.hook (from rev 231656, lib32-fontconfig/trunk/lib32-fontconfig.hook)
===================================================================
--- lib32-fontconfig.hook (rev 0)
+++ lib32-fontconfig.hook 2017-05-31 20:12:33 UTC (rev 231657)
@@ -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
Deleted: lib32-fontconfig.install
===================================================================
--- lib32-fontconfig.install 2017-05-31 20:10:41 UTC (rev 231656)
+++ lib32-fontconfig.install 2017-05-31 20:12:33 UTC (rev 231657)
@@ -1,12 +0,0 @@
-post_install() {
- echo -n "updating font cache... "
- # a full forced directory scan is required here
- /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 231656, lib32-fontconfig/trunk/lib32-fontconfig.install)
===================================================================
--- lib32-fontconfig.install (rev 0)
+++ lib32-fontconfig.install 2017-05-31 20:12:33 UTC (rev 231657)
@@ -0,0 +1,10 @@
+post_install() {
+ post_upgrade $1
+}
+
+post_upgrade() {
+ echo -n "Rebuilding 32-bit fontconfig cache..."
+ # a full forced directory scan is required here
+ /usr/bin/fc-cache-32 -rs
+ echo " done."
+}
More information about the arch-commits
mailing list