diff --git a/x11-packages/dbus-glib/build.sh b/x11-packages/dbus-glib/build.sh index 4b28e8fde..66a3ab799 100644 --- a/x11-packages/dbus-glib/build.sh +++ b/x11-packages/dbus-glib/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://dbus.freedesktop.org TERMUX_PKG_DESCRIPTION="GLib bindings for DBUS" TERMUX_PKG_LICENSE="GPL-2.0" TERMUX_PKG_MAINTAINER="Leonid Pliushch " -TERMUX_PKG_VERSION=0.110 -TERMUX_PKG_REVISION=16 +TERMUX_PKG_VERSION=0.112 TERMUX_PKG_SRCURL="https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-$TERMUX_PKG_VERSION.tar.gz" -TERMUX_PKG_SHA256=7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825 +TERMUX_PKG_SHA256=7d550dccdfcd286e33895501829ed971eeb65c614e73aadb4a08aeef719b143a TERMUX_PKG_DEPENDS="dbus, glib" TERMUX_PKG_BREAKS="dbus-glib-dev" TERMUX_PKG_REPLACES="dbus-glib-dev" @@ -18,6 +17,7 @@ termux_step_host_build() { } termux_step_pre_configure() { + export GLIB_GENMARSHAL=glib-genmarshal autoconf -i TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-dbus-binding-tool=$TERMUX_PKG_HOSTBUILD_DIR/dbus/dbus-binding-tool" } diff --git a/x11-packages/dbus-glib/glib-genmarshal-fix.patch b/x11-packages/dbus-glib/glib-genmarshal-fix.patch deleted file mode 100644 index 7b0c71bf7..000000000 --- a/x11-packages/dbus-glib/glib-genmarshal-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -uNr dbus-glib-0.110/configure dbus-glib-0.110.mod/configure ---- dbus-glib-0.110/configure 2018-01-29 14:42:36.000000000 +0200 -+++ dbus-glib-0.110.mod/configure 2019-07-13 17:05:40.542291530 +0300 -@@ -12922,7 +12922,7 @@ - - fi - --GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` -+GLIB_GENMARSHAL=glib-genmarshal - - - -diff -uNr dbus-glib-0.110/configure.ac dbus-glib-0.110.mod/configure.ac ---- dbus-glib-0.110/configure.ac 2018-01-29 14:42:18.000000000 +0200 -+++ dbus-glib-0.110.mod/configure.ac 2019-07-13 17:04:09.085145079 +0300 -@@ -265,7 +265,7 @@ - [Warn on use of APIs deprecated before GLib 2.32]) - PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.40, gobject-2.0 >= 2.40, gio-2.0 >= 2.40]) - --GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` -+GLIB_GENMARSHAL=glib-genmarshal - AC_SUBST(GLIB_GENMARSHAL) - - dnl GLib flags