x11-libs/gtk+: Version bump

Signed-off-by: Martin Väth <martin@mvath.de>

3 files changed, 36 insertions, 48 deletions

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 572f951c..180acd8f 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,3 +1,4 @@
 DIST gtk+-2.24.32-patchset-r1.tar.xz 13364 SHA512 1a15dce7578a914585981426d2e5d1cc45866866a70c3f443d1867ab1c0c28fb279bde6c3117b28eec2758a62c1b54bb6fb1b382ad6e9a7cf0114b13f2afd858
 DIST gtk+-2.24.32.tar.xz 12620860 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696
-DIST gtk+-3.24.24.tar.xz 21341240 SHA512 f4e22d7c78d7c641ac7c3beeb3181000b72b025c65074bab6bd51b9a86ec4f6a2e25f06ad7671a908be421c064f4c26e2185febb424f310a2530561aebde8520
+DIST gtk+-3.24.25-patchset.tar.xz 8884 SHA512 11ca6bc40199a11875a31624e29d2d36800ae67ae596d145a146b0fff835f02b7864f46aef3689a7108f53e5db18b4855e34ff1dad1a201937320a51a97716cb
+DIST gtk+-3.24.25.tar.xz 21417428 SHA512 e476e7900d5694ca538a5b0acce088a1485560dd697efb8839be93741e0c1ddda90c9cc73fc64af68d7ffacbf9b5cf9a74ab08454d684f182beda9fd09b6132b
diff --git a/x11-libs/gtk+/files/gtk+-3.24.8-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-3.24.25-update-icon-cache.patch
index 6fcbb5c0..a648ba40 100644
--- a/x11-libs/gtk+/files/gtk+-3.24.8-update-icon-cache.patch
+++ b/x11-libs/gtk+/files/gtk+-3.24.25-update-icon-cache.patch
@@ -1,4 +1,4 @@
-From 87693de873b15194b122e98438b3bc1bf37f6d0b Mon Sep 17 00:00:00 2001
+From ce23725d2b25b61a4eec8db0899d49d5a9dbcc6d Mon Sep 17 00:00:00 2001
 From: Gilles Dartiguelongue <eva@gentoo.org>
 Date: Tue, 1 Nov 2016 15:24:22 +0100
 Subject: [PATCH] Always use external gtk-update-icon-cache
@@ -10,14 +10,14 @@ used when building.
  demos/gtk-demo/Makefile.am       |  2 +-
  demos/widget-factory/Makefile.am |  2 +-
  docs/reference/gtk/Makefile.am   |  1 -
- gtk/Makefile.am                  | 44 --------------------------------
- 5 files changed, 4 insertions(+), 47 deletions(-)
+ gtk/Makefile.am                  | 27 ---------------------------
+ 5 files changed, 4 insertions(+), 30 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index f700616649..e3604fef05 100644
+index 36dda2ebaf..df9d9b0e9b 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1003,6 +1003,8 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
+@@ -974,6 +974,8 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
  
  AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
  
@@ -27,10 +27,10 @@ index f700616649..e3604fef05 100644
  # Windowing system checks
  ########################################
 diff --git a/demos/gtk-demo/Makefile.am b/demos/gtk-demo/Makefile.am
-index c8529e5bf7..b2924fc081 100644
+index 4a2f827469..369ba5d3cc 100644
 --- a/demos/gtk-demo/Makefile.am
 +++ b/demos/gtk-demo/Makefile.am
-@@ -171,7 +171,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-demo.png data/32x32/gtk3-demo-symbolic.sy
+@@ -174,7 +174,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-demo.png data/32x32/gtk3-demo-symbolic.sy
  dist_appsicon48_DATA = data/48x48/gtk3-demo.png data/48x48/gtk3-demo-symbolic.symbolic.png
  dist_appsicon256_DATA = data/256x256/gtk3-demo.png data/256x256/gtk3-demo-symbolic.symbolic.png
  
@@ -40,7 +40,7 @@ index c8529e5bf7..b2924fc081 100644
  install-data-hook: install-update-icon-cache
  uninstall-hook: uninstall-update-icon-cache
 diff --git a/demos/widget-factory/Makefile.am b/demos/widget-factory/Makefile.am
-index 62c156aa09..7aad079dcd 100644
+index c33a6d0a95..291f389f53 100644
 --- a/demos/widget-factory/Makefile.am
 +++ b/demos/widget-factory/Makefile.am
 @@ -47,7 +47,7 @@ dist_appsicon32_DATA = data/32x32/gtk3-widget-factory.png data/32x32/gtk3-widget
@@ -53,10 +53,10 @@ index 62c156aa09..7aad079dcd 100644
  install-data-hook: install-update-icon-cache
  uninstall-hook: uninstall-update-icon-cache
 diff --git a/docs/reference/gtk/Makefile.am b/docs/reference/gtk/Makefile.am
-index abdea7fb59..0ee826c31e 100644
+index dc9b80c6c5..bcaa4032c9 100644
 --- a/docs/reference/gtk/Makefile.am
 +++ b/docs/reference/gtk/Makefile.am
-@@ -502,7 +502,6 @@ EXTRA_DIST += version.xml.in gtk3.types.in
+@@ -502,7 +502,6 @@ EXTRA_DIST += version.xml.in gtk3.types.in getting_started.xml.in
  
  man_MANS = 				\
  	gtk-query-immodules-3.0.1	\
@@ -65,10 +65,10 @@ index abdea7fb59..0ee826c31e 100644
  	gtk-launch.1			\
  	gtk3-demo.1			\
 diff --git a/gtk/Makefile.am b/gtk/Makefile.am
-index e556e9d3af..4d7973f3b1 100644
+index 9608ab3355..74792a4b40 100644
 --- a/gtk/Makefile.am
 +++ b/gtk/Makefile.am
-@@ -1653,7 +1653,6 @@ endif
+@@ -1658,7 +1658,6 @@ endif
  #
  bin_PROGRAMS = \
  	gtk-query-immodules-3.0	\
@@ -76,7 +76,7 @@ index e556e9d3af..4d7973f3b1 100644
  	gtk-encode-symbolic-svg \
  	gtk-builder-tool \
  	gtk-query-settings \
-@@ -1666,9 +1665,6 @@ gtk_query_immodules_3_0_LDADD = 		\
+@@ -1671,9 +1670,6 @@ gtk_query_immodules_3_0_LDADD = 		\
  	$(GMODULE_LIBS)				\
  	$(GTK_DEP_LIBS)
  
@@ -86,7 +86,7 @@ index e556e9d3af..4d7973f3b1 100644
  gtk_encode_symbolic_svg_SOURCES = encodesymbolic.c
  gtk_encode_symbolic_svg_LDADD =			\
  	$(GDK_PIXBUF_LIBS)			\
-@@ -1693,46 +1689,6 @@ gtk_launch_LDADD =				\
+@@ -1698,29 +1694,6 @@ gtk_launch_LDADD =				\
  	$(top_builddir)/gdk/libgdk-3.la		\
  	$(GTK_DEP_LIBS)
  
@@ -101,27 +101,10 @@ index e556e9d3af..4d7973f3b1 100644
 -GTK_UPDATE_ICON_CACHE_RC = gtk-update-icon-cache.rc
 -GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT = gtk-update-icon-cache_manifest.o
 -
--$(GTK_UPDATE_ICON_CACHE_MANIFEST):
--	(echo '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>' ; \
--	 echo '<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">' ; \
--	 echo '  <assemblyIdentity version="1.0.0.0"' ; \
--	 echo '     processorArchitecture="'$(EXE_MANIFEST_ARCHITECTURE)'"' ; \
--	 echo '     name="gtk-update-icon-cache.exe"' ; \
--	 echo '     type="win32"/>' ; \
--	 echo '  <!-- Identify the application security requirements. -->' ; \
--	 echo '  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">' ; \
--	 echo '    <security>' ; \
--	 echo '      <requestedPrivileges>' ; \
--	 echo '        <requestedExecutionLevel' ; \
--	 echo '          level="asInvoker"' ; \
--	 echo '          uiAccess="false"/>' ; \
--	 echo '        </requestedPrivileges>' ; \
--	 echo '       </security>' ; \
--	 echo '  </trustInfo>' ; \
--	 echo '</assembly>' ) >$@
+-$(GTK_UPDATE_ICON_CACHE_MANIFEST): Makefile generate-uac-manifest.py
+-	$(PYTHON) $(srcdir)/generate-uac-manifest.py -p=gtk3 -n=gtk-update-icon-cache --pkg-version=$(GTK_VERSION) --output-dir=$(builddir)
 -
--$(GTK_UPDATE_ICON_CACHE_RC):
--	(echo -e '#include <winuser.h>\nCREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST '$(GTK_UPDATE_ICON_CACHE_MANIFEST)) >$@
+-$(GTK_UPDATE_ICON_CACHE_RC): $(GTK_UPDATE_ICON_CACHE_MANIFEST)
 -
 -$(GTK_UPDATE_ICON_CACHE_MANIFEST_OBJECT): $(GTK_UPDATE_ICON_CACHE_RC) $(GTK_UPDATE_ICON_CACHE_MANIFEST)
 -	$(WINDRES) --input $< --output $@ --output-format=coff
@@ -134,5 +117,5 @@ index e556e9d3af..4d7973f3b1 100644
  
  files:
 -- 
-2.17.0
+2.30.0
 
diff --git a/x11-libs/gtk+/gtk+-3.24.24-r1.ebuild b/x11-libs/gtk+/gtk+-3.24.25.ebuild
index abd49efd..6cfe5eb4 100644
--- a/x11-libs/gtk+/gtk+-3.24.24-r1.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors and Martin V\"ath
+# Copyright 1999-2021 Gentoo Authors and Martin V\"ath
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,6 +9,7 @@ inherit gnome2 multilib multilib-minimal virtualx
 DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="https://www.gtk.org/"
 SRC_URI=${SRC_URI-}
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="3"
@@ -18,7 +19,7 @@ REQUIRED_USE="
 	xinerama? ( X )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Upstream wants us to do their job:
 # https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
@@ -31,16 +32,17 @@ COMMON_DEPEND="
 	>=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
 	>=dev-libs/glib-2.57.2:2[${MULTILIB_USEDEP}]
 	media-libs/fontconfig[${MULTILIB_USEDEP}]
+	>=media-libs/harfbuzz-0.9:=
 	>=media-libs/libepoxy-1.4[X(+)?,${MULTILIB_USEDEP}]
+	virtual/libintl[${MULTILIB_USEDEP}]
 	>=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
 	>=x11-libs/gdk-pixbuf-2.30:2[introspection?,${MULTILIB_USEDEP}]
 	>=x11-libs/pango-1.41.0[introspection?,${MULTILIB_USEDEP}]
-	>=media-libs/harfbuzz-0.9:=
 	x11-misc/shared-mime-info
 
 	cloudprint? (
-		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
 		>=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}]
+		>=net-libs/rest-0.7[${MULTILIB_USEDEP}]
 	)
 	colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
 	cups? ( >=net-print/cups-2.0[${MULTILIB_USEDEP}] )
@@ -56,21 +58,20 @@ COMMON_DEPEND="
 		atk-bridge? ( >=app-accessibility/at-spi2-atk-2.15.1[${MULTILIB_USEDEP}] )
 		media-libs/mesa[X(+),${MULTILIB_USEDEP}]
 		x11-libs/libX11[${MULTILIB_USEDEP}]
-		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
-		x11-libs/libXext[${MULTILIB_USEDEP}]
-		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
-		x11-libs/libXcursor[${MULTILIB_USEDEP}]
-		x11-libs/libXfixes[${MULTILIB_USEDEP}]
 		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+		x11-libs/libXcursor[${MULTILIB_USEDEP}]
 		x11-libs/libXdamage[${MULTILIB_USEDEP}]
+		x11-libs/libXext[${MULTILIB_USEDEP}]
+		x11-libs/libXfixes[${MULTILIB_USEDEP}]
+		>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
+		>=x11-libs/libXrandr-1.5[${MULTILIB_USEDEP}]
 		xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
 	)
 "
 DEPEND="${COMMON_DEPEND}
-	>=sys-devel/gettext-0.19.7[${MULTILIB_USEDEP}]
 	test? (
-		media-fonts/font-misc-misc
 		media-fonts/font-cursor-misc
+		media-fonts/font-misc-misc
 	)
 	X? ( x11-base/xorg-proto )
 "
@@ -109,10 +110,13 @@ MULTILIB_CHOST_TOOLS=(
 
 PATCHES=(
 	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
-	"${FILESDIR}"/${PN}-3.24.8-update-icon-cache.patch
+	"${FILESDIR}"/${PN}-3.24.25-update-icon-cache.patch
 
 	# Fix broken autotools logic
 	"${FILESDIR}"/${PN}-3.22.20-libcloudproviders-automagic.patch
+
+	# origin/gtk-3-24 imcontext regression fixes up to commit 5f13ee0afe0
+	"${WORKDIR}"/patches
 )
 
 strip_builddir() {