x11-libs/gtk+: Version bump

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

3 files changed, 9 insertions, 33 deletions

diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 0fa7a1da..36b23970 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -1,3 +1,3 @@
 DIST gtk+-2.24.33.tar.xz 12661828 BLAKE2B f3488b220aaee54bf36fa77e2112d060152e57938845d240014a7d43a5743b1d4de19cc09c683d9d238fd1967cd67cc3c493f2475e4e481f6709f5cdc652c65c SHA512 71b588797c81f727dfac8dcb1be193f7436f717d30ecf18eae2d3aeb0f445b3be4743400acac16435490db8f564f01032065d3f42d27871317f80c98aef929d5
 DIST gtk+-3.24.35.tar.xz 17913328 BLAKE2B 3beea3cbda7247357238ad133c951e69d5670d68e06efb4de09fae7141b141f4eb17a8c79661cab928a3db427f7b32b518875d0951254941e76b1a7aab60e34f SHA512 3a1ec35756fe12f5be3cfe33ef332d583690458327572e69bffad8b4095059d2a744a4a53b2fd31bab5da2ca7b41a2a38fbbd8ba541a45fa8cc0d00eae005ade
-DIST gtk+-3.24.36.tar.xz 12540184 BLAKE2B 3d9346a3fbc78420eb8edcbad42d9885bed69ce46505bc15819691d884f31aa72386fcd38837e042ba9be3cda6cf5203f921c7f6054a7350c46dee6b77fc4cc4 SHA512 76280e847653576e6fd0586d6044ab315f04c3548c211b37612c4ac77f7bbccfcff17459b9d1d3cbddeb74a62a0bcac05f850b89a20d4abc3893c6c387ecb03a
+DIST gtk+-3.24.37.tar.xz 12401196 BLAKE2B 1cffcf0066f0f9d42fd01d9cf0dbab2465bf749fe70ebe24a843807c77b696047cbb739fead7f7872833ee562439d96857d02b3037b949babaa3797482104fda SHA512 118521686cb40c5b6ddfcc361be8ff8a16aced2108a24d1f6b7f29d32c235a77774d365b0bd283c9a6873003fca144d67793d12094c74d224a08fc1be341a22f
diff --git a/x11-libs/gtk+/files/gtk+-3.24.36-introspection.patch b/x11-libs/gtk+/files/gtk+-3.24.36-introspection.patch
deleted file mode 100644
index 8b80205b..00000000
--- a/x11-libs/gtk+/files/gtk+-3.24.36-introspection.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7e4a2a5724a184c418314f4fdbd7a065ba9e203d Mon Sep 17 00:00:00 2001
-From: Staudey <staudi.kaos@gmail.com>
-Date: Tue, 27 Dec 2022 04:54:52 +0000
-Subject: [PATCH] Fix build_gir logic
-
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index aed48fc3f6..6c711e9e9a 100644
---- a/meson.build
-+++ b/meson.build
-@@ -849,7 +849,7 @@ endif
- 
- # Introspection
- gir = find_program('g-ir-scanner', required : get_option('introspection'))
--build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection'))
-+build_gir = gir.found() and get_option('introspection')
- 
- subdir('gdk')
- subdir('gtk')
--- 
-GitLab
-
diff --git a/x11-libs/gtk+/gtk+-3.24.36.ebuild b/x11-libs/gtk+/gtk+-3.24.37.ebuild
index 4553e556..72cc63da 100644
--- a/x11-libs/gtk+/gtk+-3.24.36.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.37.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit gnome2 meson-multilib multilib
+inherit gnome2 meson-multilib multilib virtualx
 
 DESCRIPTION="Gimp ToolKit +"
 HOMEPAGE="https://www.gtk.org/"
@@ -14,15 +14,13 @@ SLOT="3"
 IUSE="adwaita-icon-theme aqua atk-bridge broadway cloudproviders colord cups examples gtk-doc +introspection sysprof test vim-syntax wayland +X xinerama"
 REQUIRED_USE="
 	|| ( aqua wayland X )
+	test? ( X )
 	xinerama? ( X )
 "
+RESTRICT="!test? ( test )"
 
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~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
-RESTRICT="test"
-
 COMMON_DEPEND="
 	atk-bridge? ( >=app-accessibility/at-spi2-core-2.46.0[introspection?,${MULTILIB_USEDEP}] )
 	>=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}]
@@ -100,7 +98,6 @@ MULTILIB_CHOST_TOOLS=(
 )
 
 PATCHES=(
-	"${FILESDIR}"/${P}-introspection.patch
 	# gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
 	"${FILESDIR}"/${PN}-3.24.36-update-icon-cache.patch
 	"${FILESDIR}"/${PN}-atk-bridge-meson.build.patch
@@ -129,7 +126,7 @@ multilib_src_configure() {
 		# user overridden GTK_IM_MODULE envvar
 		-Dbuiltin_immodules=backend
 		-Dman=true
-		-Dtests=false
+		$(meson_use test tests)
 		-Dtracker3=false
 	)
 	meson_src_configure
@@ -139,6 +136,10 @@ multilib_src_compile() {
 	meson_src_compile
 }
 
+multilib_src_test() {
+	virtx meson_src_test
+}
+
 multilib_src_install() {
 	meson_src_install
 }