diff --git a/x11-packages/gtk3/glib-tools-fix.patch b/x11-packages/gtk3/0006-glib-tools-fix.patch similarity index 84% rename from x11-packages/gtk3/glib-tools-fix.patch rename to x11-packages/gtk3/0006-glib-tools-fix.patch index e8816590d..ba471e32e 100644 --- a/x11-packages/gtk3/glib-tools-fix.patch +++ b/x11-packages/gtk3/0006-glib-tools-fix.patch @@ -1,7 +1,7 @@ -diff -uNr gtk-3.24.4/gdk/Makefile.am gtk-3.24.4.mod/gdk/Makefile.am ---- gtk-3.24.4/gdk/Makefile.am 2019-01-21 16:09:59.000000000 +0200 -+++ gtk-3.24.4.mod/gdk/Makefile.am 2019-04-22 18:16:44.247174211 +0300 -@@ -425,13 +425,13 @@ +diff -uNr gtk-3.24.10/gdk/Makefile.am gtk-3.24.10.mod/gdk/Makefile.am +--- gtk-3.24.10/gdk/Makefile.am 2019-07-03 23:25:10.000000000 +0300 ++++ gtk-3.24.10.mod/gdk/Makefile.am 2019-07-23 00:25:53.122144498 +0300 +@@ -434,13 +434,13 @@ gdkenumtypes.h: stamp-gdkenumtypes.h @true stamp-gdkenumtypes.h: $(gdk_h_sources) gdkenumtypes.h.template @@ -17,27 +17,28 @@ diff -uNr gtk-3.24.4/gdk/Makefile.am gtk-3.24.4.mod/gdk/Makefile.am $(gdk_h_sources) ) > xgen-getc \ && cp xgen-getc gdkenumtypes.c \ && rm -f xgen-getc -@@ -440,14 +440,14 @@ +@@ -449,7 +449,7 @@ # Marshaller generation # gdkmarshalers.h: gdkmarshalers.list - $(AM_V_GEN) $(GLIB_GENMARSHAL) \ + $(AM_V_GEN) glib-genmarshal \ --prefix=_gdk_marshal \ + --valist-marshallers \ --header \ - $(srcdir)/gdkmarshalers.list > gdkmarshalers-h.tmp \ +@@ -457,7 +457,7 @@ && mv gdkmarshalers-h.tmp gdkmarshalers.h \ || ( rm -f gdkmarshalers-h.tmp && exit 1) gdkmarshalers.c: gdkmarshalers.list - $(AM_V_GEN) $(GLIB_GENMARSHAL) \ + $(AM_V_GEN) glib-genmarshal \ --prefix=_gdk_marshal \ + --valist-marshallers \ --body \ - $(srcdir)/gdkmarshalers.list > gdkmarshalers-c.tmp \ -diff -uNr gtk-3.24.4/gtk/Makefile.am gtk-3.24.4.mod/gtk/Makefile.am ---- gtk-3.24.4/gtk/Makefile.am 2019-01-21 16:09:59.000000000 +0200 -+++ gtk-3.24.4.mod/gtk/Makefile.am 2019-04-22 18:17:49.253930523 +0300 -@@ -1254,7 +1254,7 @@ +diff -uNr gtk-3.24.10/gtk/Makefile.am gtk-3.24.10.mod/gtk/Makefile.am +--- gtk-3.24.10/gtk/Makefile.am 2019-07-03 23:25:10.000000000 +0300 ++++ gtk-3.24.10.mod/gtk/Makefile.am 2019-07-23 00:24:47.805264300 +0300 +@@ -1252,7 +1252,7 @@ gtkmarshalers.h: stamp-gtkmarshalers.h @true stamp-gtkmarshalers.h: gtkmarshalers.list @@ -46,7 +47,7 @@ diff -uNr gtk-3.24.4/gtk/Makefile.am gtk-3.24.4.mod/gtk/Makefile.am --prefix=_gtk_marshal \ --header \ --valist-marshallers \ -@@ -1264,7 +1264,7 @@ +@@ -1262,7 +1262,7 @@ && echo timestamp > $(@F) gtkmarshalers.c: gtkmarshalers.list $(AM_V_GEN) (echo "#undef G_ENABLE_DEBUG"; \ @@ -55,7 +56,7 @@ diff -uNr gtk-3.24.4/gtk/Makefile.am gtk-3.24.4.mod/gtk/Makefile.am --prefix=_gtk_marshal \ --body \ --valist-marshallers $(srcdir)/gtkmarshalers.list) >> xgen-gmlc \ -@@ -1274,13 +1274,13 @@ +@@ -1272,13 +1272,13 @@ gtktypebuiltins.h: stamp-gtktypebuiltins.h @true stamp-gtktypebuiltins.h: $(gtk_public_h_sources) $(a11y_h_sources) $(deprecated_h_sources) gtktypebuiltins.h.template @@ -71,7 +72,7 @@ diff -uNr gtk-3.24.4/gtk/Makefile.am gtk-3.24.4.mod/gtk/Makefile.am $(gtk_public_h_sources) $(a11y_h_sources) $(deprecated_h_sources) ) > xgen-gtbc \ && cp xgen-gtbc gtktypebuiltins.c \ && rm -f xgen-gtbc -@@ -1423,13 +1423,13 @@ +@@ -1430,13 +1430,13 @@ gtkprivatetypebuiltins.h: stamp-gtkprivatetypebuiltins.h @true stamp-gtkprivatetypebuiltins.h: $(gtk_private_type_h_sources) gtkprivatetypebuiltins.h.template diff --git a/x11-packages/gtk3/build.sh b/x11-packages/gtk3/build.sh index d800d7828..16806e5ed 100644 --- a/x11-packages/gtk3/build.sh +++ b/x11-packages/gtk3/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://www.gtk.org/ TERMUX_PKG_DESCRIPTION="GObject-based multi-platform GUI toolkit" TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_MAINTAINER="Leonid Plyushch " -TERMUX_PKG_VERSION=3.24.8 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_VERSION=3.24.10 TERMUX_PKG_SRCURL=https://github.com/GNOME/gtk/archive/${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=c85f5dc5dcef00dfbb8df0df37964508a475bfe047628b417e13c07372112752 +TERMUX_PKG_SHA256=1e26af91cec24a83f2efc8954974c6c264a2fe720f576cb9a4aee18d4352a39e TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_DEPENDS="adwaita-icon-theme, atk, coreutils, desktop-file-utils, gdk-pixbuf, glib, glib-bin, gtk-update-icon-cache, libcairo-x, libepoxy, libxcomposite, libxcursor, libxdamage, libxfixes, libxi, libxinerama, libxrandr, pango-x, shared-mime-info"