[arch-commits] Commit in lib32-fontconfig/trunk (2 files)
Jan Steffens
heftig at archlinux.org
Fri Sep 8 18:48:56 UTC 2017
Date: Friday, September 8, 2017 @ 18:48:55
Author: heftig
Revision: 256426
2.12.4+29+g92da67a-1
Modified:
lib32-fontconfig/trunk/PKGBUILD
Deleted:
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 | 70 ----------
PKGBUILD | 11 -
2 files changed, 4 insertions(+), 77 deletions(-)
Deleted: 0001-Fix-testing-PCF_CONFIG_OPTION_LONG_FAMILY_NAMES-CFLA.patch
===================================================================
--- 0001-Fix-testing-PCF_CONFIG_OPTION_LONG_FAMILY_NAMES-CFLA.patch 2017-09-08 18:42:09 UTC (rev 256425)
+++ 0001-Fix-testing-PCF_CONFIG_OPTION_LONG_FAMILY_NAMES-CFLA.patch 2017-09-08 18:48:55 UTC (rev 256426)
@@ -1,70 +0,0 @@
-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
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-09-08 18:42:09 UTC (rev 256425)
+++ PKGBUILD 2017-09-08 18:48:55 UTC (rev 256426)
@@ -3,7 +3,7 @@
_pkgbasename=fontconfig
pkgname=lib32-$_pkgbasename
-pkgver=2.12.3
+pkgver=2.12.4+29+g92da67a
pkgrel=1
pkgdesc="A library for configuring and customizing font access (32-bit)"
arch=(x86_64)
@@ -12,13 +12,11 @@
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
+_commit=92da67a9fcf9fa48ebb40f2032d47291d5427d41 # master
source=("git+https://anongit.freedesktop.org/git/fontconfig#commit=$_commit"
- lib32-fontconfig.hook
- 0001-Fix-testing-PCF_CONFIG_OPTION_LONG_FAMILY_NAMES-CFLA.patch)
+ lib32-fontconfig.hook)
sha256sums=('SKIP'
- 'd97c0c5b88023da5a2acf64cf560265390a9365305c43b8e86b4f89348e727b3'
- '02aa1f39e69aa16fdf9ca91c011a2f0853c896f257e5c14d0c2759a1d93012aa')
+ 'd97c0c5b88023da5a2acf64cf560265390a9365305c43b8e86b4f89348e727b3')
# a nice page to test font matching:
# http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html
@@ -31,7 +29,6 @@
prepare() {
cd $_pkgbasename
- patch -Np1 -i ../0001-Fix-testing-PCF_CONFIG_OPTION_LONG_FAMILY_NAMES-CFLA.patch
NOCONFIGURE=1 ./autogen.sh
}
More information about the arch-commits
mailing list