From 549dfb1c2c901de17efc870c90d11cd49720ffa4 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Wed, 26 Jul 2017 14:21:12 +0200 Subject: [PATCH] fontconfig: Update from 2.12.0 to 2.12.4 --- packages/fontconfig/build.sh | 15 ++++++++++----- scripts/setup-ubuntu.sh | 1 + 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/packages/fontconfig/build.sh b/packages/fontconfig/build.sh index 76a2282d6..4e6c8f2e7 100644 --- a/packages/fontconfig/build.sh +++ b/packages/fontconfig/build.sh @@ -1,9 +1,14 @@ TERMUX_PKG_HOMEPAGE=https://www.freedesktop.org/wiki/Software/fontconfig/ TERMUX_PKG_DESCRIPTION="Library for configuring and customizing font access" -# When updating, try building in the docker image to see if gperf -# will be necessary. -TERMUX_PKG_VERSION=2.12.0 +TERMUX_PKG_VERSION=2.12.4 +TERMUX_PKG_SHA256=668293fcc4b3c59765cdee5cee05941091c0879edcc24dfec5455ef83912e45c TERMUX_PKG_SRCURL=https://www.freedesktop.org/software/fontconfig/release/fontconfig-${TERMUX_PKG_VERSION}.tar.bz2 -TERMUX_PKG_SHA256=b433e4efff1f68fdd8aac221ed1df3ff1e580ffedbada020a703fe64017d8224 TERMUX_PKG_DEPENDS="freetype, libxml2" -TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-libxml2 --enable-iconv=no --disable-docs --with-default-fonts=/system/fonts --with-add-fonts=$TERMUX_PREFIX/share/fonts" +# TERMUX_PKG_BUILD_IN_SRC=yes +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +--enable-libxml2 +--enable-iconv=no +--disable-docs +--with-default-fonts=/system/fonts +--with-add-fonts=$TERMUX_PREFIX/share/fonts +" diff --git a/scripts/setup-ubuntu.sh b/scripts/setup-ubuntu.sh index 0137296a2..ddd1fadea 100755 --- a/scripts/setup-ubuntu.sh +++ b/scripts/setup-ubuntu.sh @@ -12,6 +12,7 @@ PACKAGES+=" ed" # Used by bc PACKAGES+=" flex" PACKAGES+=" gettext" # Provides 'msgfmt' which the apt build uses. PACKAGES+=" git" # Used by the neovim build. +PACKAGES+=" gperf" # Used by the fontconfig build. PACKAGES+=" help2man" PACKAGES+=" intltool" # Used by qalc build. PACKAGES+=" libglib2.0-dev" # Provides 'glib-genmarshal' which the glib build uses.