From b142164b75b7f492427d8e7babce1452bc4b1c51 Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Wed, 30 Mar 2022 04:47:29 +0900 Subject: [PATCH] gtk3: Update to 3.24.33 --- x11-packages/gtk3/0006-glib-tools-fix.patch | 8 ++++---- x11-packages/gtk3/build.sh | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/x11-packages/gtk3/0006-glib-tools-fix.patch b/x11-packages/gtk3/0006-glib-tools-fix.patch index ba471e32e..19d58a1c1 100644 --- a/x11-packages/gtk3/0006-glib-tools-fix.patch +++ b/x11-packages/gtk3/0006-glib-tools-fix.patch @@ -59,17 +59,17 @@ diff -uNr gtk-3.24.10/gtk/Makefile.am gtk-3.24.10.mod/gtk/Makefile.am @@ -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 + stamp-gtktypebuiltins.h: $(gtk_public_h_sources) $(a11y_h_sources) $(gtk_deprecated_h_sources) gtktypebuiltins.h.template - $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.h.template \ + $(AM_V_GEN) ( cd $(srcdir) && glib-mkenums --template gtktypebuiltins.h.template \ - $(gtk_public_h_sources) $(a11y_h_sources) $(deprecated_h_sources) ) > xgen-gtbh \ + $(gtk_public_h_sources) $(a11y_h_sources) $(gtk_deprecated_h_sources) ) > xgen-gtbh \ && (cmp -s xgen-gtbh gtktypebuiltins.h || cp xgen-gtbh gtktypebuiltins.h ) \ && rm -f xgen-gtbh \ && echo timestamp > $(@F) - gtktypebuiltins.c: $(gtk_public_h_sources) $(a11y_h_sources) $(deprecated_h_sources) gtktypebuiltins.c.template + gtktypebuiltins.c: $(gtk_public_h_sources) $(a11y_h_sources) $(gtk_deprecated_h_sources) gtktypebuiltins.c.template - $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gtktypebuiltins.c.template \ + $(AM_V_GEN) ( cd $(srcdir) && glib-mkenums --template gtktypebuiltins.c.template \ - $(gtk_public_h_sources) $(a11y_h_sources) $(deprecated_h_sources) ) > xgen-gtbc \ + $(gtk_public_h_sources) $(a11y_h_sources) $(gtk_deprecated_h_sources) ) > xgen-gtbc \ && cp xgen-gtbc gtktypebuiltins.c \ && rm -f xgen-gtbc @@ -1430,13 +1430,13 @@ diff --git a/x11-packages/gtk3/build.sh b/x11-packages/gtk3/build.sh index 4544ec56b..9d37824dd 100644 --- a/x11-packages/gtk3/build.sh +++ b/x11-packages/gtk3/build.sh @@ -2,13 +2,12 @@ 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="@termux" -TERMUX_PKG_VERSION=3.24.24 -TERMUX_PKG_REVISION=7 +TERMUX_PKG_VERSION=3.24.33 TERMUX_PKG_SRCURL=https://gitlab.gnome.org/GNOME/gtk/-/archive/$TERMUX_PKG_VERSION/gtk-$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=55de8ae3233c9bc97d3d00fad9c53d18192624baaffa210679afec209333ab12 +TERMUX_PKG_SHA256=c43a6082093be3e0d771f595df5669d594ae1c9c6dedbfc429fada0da80431d5 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, libepoxy, libxcomposite, libxcursor, libxdamage, libxfixes, libxi, libxinerama, libxrandr, pango, shared-mime-info, ttf-dejavu" +TERMUX_PKG_DEPENDS="adwaita-icon-theme, atk, coreutils, desktop-file-utils, fontconfig, freetype, fribidi, gdk-pixbuf, glib, glib-bin, gtk-update-icon-cache, harfbuzz, libcairo, libepoxy, libxcomposite, libxcursor, libxdamage, libxfixes, libxi, libxinerama, libxrandr, pango, shared-mime-info, ttf-dejavu" TERMUX_PKG_BUILD_DEPENDS="xorgproto" TERMUX_PKG_CONFLICTS="libgtk3" TERMUX_PKG_REPLACES="libgtk3"