* sync libotf with main arch

This commit is contained in:
Alexander Baldeck 2020-05-07 11:43:27 +02:00
parent 08f12c41b0
commit 1b9752b571
2 changed files with 45 additions and 7 deletions

View File

@ -4,20 +4,25 @@
pkgname=libotf
pkgver=0.9.16
pkgrel=1
pkgrel=3
pkgdesc='OpenType Font library'
url='http://www.nongnu.org/m17n/'
url='https://www.nongnu.org/m17n/'
license=('LGPL')
arch=(x86_64 powerpc64le)
depends=('libxaw' 'freetype2')
source=("http://download.savannah.gnu.org/releases/m17n/${pkgname}-${pkgver}.tar.gz")
sha256sums=('68db0ca3cda2d46a663a92ec26e6eb5adc392ea5191bcda74268f0aefa78066b')
source=("https://download.savannah.gnu.org/releases/m17n/${pkgname}-${pkgver}.tar.gz"
'replace-freetype-config.patch')
sha256sums=('68db0ca3cda2d46a663a92ec26e6eb5adc392ea5191bcda74268f0aefa78066b'
'edd0f86332f4d809dfb0ab66da547c946e5d79a907a7eaddc4d2166c78205668')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -p1 -i ${srcdir}/replace-freetype-config.patch
}
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
sed 's@freetype-config --@pkg-config freetype2 --@g' -i configure.ac
sed 's@freetype-config@pkg-config@g' -i configure.ac
autoreconf -fiv
autoreconf -i
./configure --prefix=/usr
make
}

View File

@ -0,0 +1,33 @@
--- libotf-0.9.16/configure.ac
+++ libotf-0.9.16/configure.ac
@@ -48,23 +48,24 @@
AC_FUNC_ALLOCA
AC_FUNC_MALLOC
+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`
+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`;
+ 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
- echo "Freetype library wan't found in your system!"
+ echo "Freetype library not found in your system!"
exit 1
fi
AC_SUBST(FREETYPE_INC)