diff --git a/packages/glib/build.sh b/packages/glib/build.sh index e374d99c03..0fd4b8a8d7 100644 --- a/packages/glib/build.sh +++ b/packages/glib/build.sh @@ -2,9 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://developer.gnome.org/glib/ TERMUX_PKG_DESCRIPTION="Library providing core building blocks for libraries and applications written in C" TERMUX_PKG_LICENSE="LGPL-2.1" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="2.82.5" +TERMUX_PKG_VERSION="2.84.0" TERMUX_PKG_SRCURL=https://download.gnome.org/sources/glib/${TERMUX_PKG_VERSION%.*}/glib-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=05c2031f9bdf6b5aba7a06ca84f0b4aced28b19bf1b50c6ab25cc675277cbc3f +TERMUX_PKG_SHA256=f8823600cb85425e2815cfad82ea20fdaa538482ab74e7293d58b3f64a5aff6a TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_DEPENDS="libandroid-support, libffi, libiconv, pcre2, resolv-conf, zlib" TERMUX_PKG_BREAKS="glib-dev" diff --git a/packages/glib/gir/GLib-2.0.xml b/packages/glib/gir/GLib-2.0.xml index 00d048ee0c..9596a9344a 100644 --- a/packages/glib/gir/GLib-2.0.xml +++ b/packages/glib/gir/GLib-2.0.xml @@ -248,6 +248,13 @@ + + + + + + + diff --git a/packages/glib/meson.build.patch b/packages/glib/meson.build.patch index 92d2f5d7a2..cbf2c7b33a 100644 --- a/packages/glib/meson.build.patch +++ b/packages/glib/meson.build.patch @@ -69,16 +69,16 @@ glib_conf.set('HAVE_BIND_TEXTDOMAIN_CODESET', have_bind_textdomain_codeset) -@@ -2601,11 +2592,7 @@ - - # introspection - gir_scanner = find_program('g-ir-scanner', required: get_option('introspection')) --enable_gir = get_option('introspection').allowed() and gir_scanner.found() and meson.can_run_host_binaries() +@@ -2664,11 +2664,7 @@ endif + gobject_introspection_required_version = '>= 1.80.0' + gir_scanner = find_program('g-ir-scanner', required: get_option('introspection'), version: gobject_introspection_required_version) + gobject_introspection = dependency('gobject-introspection-1.0', required: get_option('introspection'), version: gobject_introspection_required_version) +-enable_gir = get_option('introspection').allowed() and gir_scanner.found() and gobject_introspection.found() and meson.can_run_host_binaries() - -if get_option('introspection').enabled() and not meson.can_run_host_binaries() - error('Running binaries on the build host needs to be supported to build with -Dintrospection=enabled') -endif -+enable_gir = get_option('introspection').allowed() and gir_scanner.found() ++enable_gir = get_option('introspection').allowed() and gir_scanner.found() and gobject_introspection.found() gir_args = [ '--quiet',