Date: Thursday, May 7, 2020 @ 00:19:43 Author: allan Revision: 382459
upgpkg: libotf 0.9.16-3: Better freetype patch that keeps some variables needed elsewhere Modified: libotf/trunk/PKGBUILD libotf/trunk/replace-freetype-config.patch -------------------------------+ PKGBUILD | 4 +- replace-freetype-config.patch | 61 +++++++++++++++------------------------- 2 files changed, 26 insertions(+), 39 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-05-06 22:34:15 UTC (rev 382458) +++ PKGBUILD 2020-05-07 00:19:43 UTC (rev 382459) @@ -3,7 +3,7 @@ pkgname=libotf pkgver=0.9.16 -pkgrel=2 +pkgrel=3 pkgdesc='OpenType Font library' url='https://www.nongnu.org/m17n/' license=('LGPL') @@ -12,7 +12,7 @@ source=("https://download.savannah.gnu.org/releases/m17n/${pkgname}-${pkgver}.tar.gz"; 'replace-freetype-config.patch') sha256sums=('68db0ca3cda2d46a663a92ec26e6eb5adc392ea5191bcda74268f0aefa78066b' - '619d1af60f5189543c490976e390e405cd320eb7e52aae670521b9238bff2926') + 'edd0f86332f4d809dfb0ab66da547c946e5d79a907a7eaddc4d2166c78205668') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" Modified: replace-freetype-config.patch =================================================================== --- replace-freetype-config.patch 2020-05-06 22:34:15 UTC (rev 382458) +++ replace-freetype-config.patch 2020-05-07 00:19:43 UTC (rev 382459) @@ -1,46 +1,33 @@ -From: Hilko Bengen <[email protected]> -Date: Sat, 27 Oct 2018 00:53:35 +0200 -Subject: Use pkg-config for freetype - ---- - configure.ac | 29 ++++++++--------------------- - 1 file changed, 8 insertions(+), 21 deletions(-) - ---- a/configure.ac -+++ b/configure.ac -@@ -48,27 +48,14 @@ +--- libotf-0.9.16/configure.ac ++++ libotf-0.9.16/configure.ac +@@ -48,23 +48,24 @@ AC_FUNC_ALLOCA AC_FUNC_MALLOC --# Check for Freetype2 usability. ++PKG_PROG_PKG_CONFIG ++ + # Check for Freetype2 usability. -AC_CHECK_PROG(HAVE_FREETYPE_CONFIG, freetype-config, yes) -if test "x$HAVE_FREETYPE_CONFIG" = "xyes"; then - FREETYPE_INC=`freetype-config --cflags` -- CPPFLAGS="$CPPFLAGS $FREETYPE_INC" -- AC_CHECK_HEADER(ft2build.h, HAVE_FREETYPE=yes, -- HAVE_FREETYPE=no CPPFLAGS=$save_CPPFLAGS) -- if test "x$HAVE_FREETYPE" = "xyes" ; then ++PKG_CHECK_MODULES(FREETYPE, freetype2, [ ++ FREETYPE_INC="$FREETYPE_CFLAGS" + CPPFLAGS="$CPPFLAGS $FREETYPE_INC" + AC_CHECK_HEADER(ft2build.h, HAVE_FREETYPE=yes, + HAVE_FREETYPE=no CPPFLAGS=$save_CPPFLAGS) + if test "x$HAVE_FREETYPE" = "xyes" ; then - FREETYPE_LD_FLAGS=`freetype-config --libs`; -- LIBS="$LIBS $FREETYPE_LD_FLAGS" -- AC_CHECK_LIB(freetype, FT_Init_FreeType, HAVE_FREETYPE=yes, -- HAVE_FREETYPE=no) -- fi ++ FREETYPE_LD_FLAGS="$FREETYPE_LIBS" + LIBS="$LIBS $FREETYPE_LD_FLAGS" + AC_CHECK_LIB(freetype, FT_Init_FreeType, HAVE_FREETYPE=yes, + HAVE_FREETYPE=no) + fi -fi -- --if test "x$HAVE_FREETYPE" != "xyes" ; then ++]) + + if test "x$HAVE_FREETYPE" != "xyes" ; then - echo "Freetype library wan't found in your system!" -- exit 1 --fi --AC_SUBST(FREETYPE_INC) --AC_SUBST(FREETYPE_LD_FLAGS) -+PKG_CHECK_MODULES( -+ [FREETYPE], -+ [freetype2], -+ [ -+ CFLAGS="$CFLAGS $FREETYPE_CFLAGS" -+ LIBS="$LIBS $FREETYPE_LIBS" -+ ], -+ [AC_MSG_ERROR([Can't find Freetype library])]) - - if test "x$no_x" != "xyes"; then - X11_XT_XAW_XMU="-lX11 -lXt -lXaw -lXmu" ++ echo "Freetype library not found in your system!" + exit 1 + fi + AC_SUBST(FREETYPE_INC)
