X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/7ce5638519cda066cd6adc547a574050c235c551..2207a0f1706a62951c9adb46612fe7a8773d5926:/packages/glib/build.sh

diff --git a/packages/glib/build.sh b/packages/glib/build.sh
index 17fdd186..005b09b4 100755
--- a/packages/glib/build.sh
+++ b/packages/glib/build.sh
@@ -1,16 +1,28 @@
 TERMUX_PKG_HOMEPAGE=https://developer.gnome.org/glib/
 TERMUX_PKG_DESCRIPTION="Library providing core building blocks for libraries and applications written in C"
-_TERMUX_GLIB_MAJOR_VERSION=2.48
-TERMUX_PKG_VERSION=${_TERMUX_GLIB_MAJOR_VERSION}.2
-TERMUX_PKG_SRCURL=http://ftp.gnome.org/pub/gnome/sources/glib/${_TERMUX_GLIB_MAJOR_VERSION}/glib-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_DEPENDS="libffi, pcre"
-TERMUX_PKG_RM_AFTER_INSTALL="share/gtk-doc share/locale share/glib-2.0/gettext share/gdb/auto-load share/glib-2.0/codegen share/glib-2.0/gdb lib/glib-2.0/include bin/gtester-report bin/glib-mkenums bin/glib-gettextize bin/gdbus-codegen"
+TERMUX_PKG_VERSION=2.54.0
+TERMUX_PKG_REVISION=1
+TERMUX_PKG_SHA256=fe22998ff0394ec31e6e5511c379b74011bee61a4421bca7fcab223dfbe0fc6a
+TERMUX_PKG_SRCURL=https://ftp.gnome.org/pub/gnome/sources/glib/${TERMUX_PKG_VERSION:0:4}/glib-${TERMUX_PKG_VERSION}.tar.xz
+# libandroid-support to get langinfo.h in include path.
+TERMUX_PKG_DEPENDS="libffi, pcre, libandroid-support"
+TERMUX_PKG_RM_AFTER_INSTALL="share/gtk-doc share/locale share/glib-2.0/gettext share/gdb/auto-load share/glib-2.0/codegen share/glib-2.0/gdb bin/gtester-report bin/glib-mkenums bin/glib-gettextize bin/gdbus-codegen"
+# Needed by pkg-config for glib-2.0:
+TERMUX_PKG_DEVPACKAGE_DEPENDS="pcre-dev"
+TERMUX_PKG_INCLUDE_IN_DEVPACKAGE="lib/glib-2.0/include"
 
-# --enable-compile-warnings=no to get rid of format strings causing errors
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-compile-warnings --disable-gtk-doc --disable-gtk-doc-html --cache-file=termux_configure.cache --with-pcre=system"
-# --disable-znodelete to avoid DF_1_NODELETE which most Android 5.0 linkers does not support:
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --disable-znodelete"
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --disable-libelf"
+# --enable-compile-warnings=no to get rid of format strings causing errors.
+# --disable-znodelete to avoid DF_1_NODELETE which most Android 5.0 linkers does not support.
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+--cache-file=termux_configure.cache
+--disable-compile-warnings
+--disable-gtk-doc
+--disable-gtk-doc-html
+--disable-libelf
+--disable-libmount
+--disable-znodelete
+--with-pcre=system
+"
 
 termux_step_pre_configure () {
 	# glib checks for __BIONIC__ instead of __ANDROID__: