gentoo auto-resync : 15:04:2024 - 12:04:02

3 files changed, 35 insertions, 2 deletions

diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index 7388362ba521..2ac06e9b81df 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -1,3 +1,4 @@
+AUX 44.2-fix-gtk-4.12.5-build.patch 819 BLAKE2B b3288a66448467e409127d639b5374707b6e4094b09db5a396ce85242cf87033a84ac4380559df6a65b230b5ce76682a4a77a230e09df668c1a1c173d59ec6eb SHA512 66f4d72b984f1ec2a853a73d694e0f197940a5cde34665b5e50a3817b8ce8489658603381eb57eb1e36ef39184fc923a12fdb830e155dfad2ef299d91b74d93b
 DIST gnome-builder-44.2.tar.xz 9788192 BLAKE2B 3e31997a840ea288db37d942aa5b5ff92dce6754a9fe5984e9e20334c7e0323835d279bee0744277cbe2f111076a932efa692d3e0e229230da3c0d782faa7442 SHA512 0e0bdf57b1467789b6fe221e484e2cce5e37dae0fe3c190db51ec0f150a0ced1eca574bebceefe4ca33d31b4f09f472a0853fce24b1ef3f5de82256fa01f6090
-EBUILD gnome-builder-44.2-r1.ebuild 9150 BLAKE2B e48235d870f0768036a48db0ab623f472856829f7a48c005eec277cc3b0db3fad6a7e220f213f16ab348f1d22748ca025130e3643ce55597844b9690e0698bdc SHA512 7084d77f6e385e2a5061b7aa1dcedc1ade9d7308e7bb1ece890a72906e1577b4be05763e2b6bfae02bb238bb908f4be07e58d0620a3abe8fd8f4ff6bd79cccab
+EBUILD gnome-builder-44.2-r1.ebuild 9296 BLAKE2B 6542904b6c459d9e14fea6a9d18f313b7ca676753e3d27bb08ea42142ce6f3f4a5e6160f8861707ecf57720388d14bcdf410652a144b269cc1905bc8c0180241 SHA512 cabc1250dc4e2c496ec571cc04fefc5b51d39470540e3ec6af35eeb20547ae48e9c93247ff0c94cb5a6701649a49fbd590a84cbaf9bdb9824fbda087164afbad
 MISC metadata.xml 1096 BLAKE2B 3270e78bb7e33953c796fdb148318ebabc3e1ad731ab80da3b080aa411c14baf94bcd8cf07daad63480755dbaa9663be3640460cf01cfdc2279ba4e2742b382d SHA512 4c4e04156ca74d4881a00680fd8aaa6ebabd78d69f7f7e271c52615fb7c1c9307cf479e3a77c34f1c8ced77f93fd91f67e96708ae58eeb5a2d858f85d3449418
diff --git a/dev-util/gnome-builder/files/44.2-fix-gtk-4.12.5-build.patch b/dev-util/gnome-builder/files/44.2-fix-gtk-4.12.5-build.patch
new file mode 100644
index 000000000000..eccf90851fb7
--- /dev/null
+++ b/dev-util/gnome-builder/files/44.2-fix-gtk-4.12.5-build.patch
@@ -0,0 +1,26 @@
+From 43a7c586b7291b5cf82febdaa80b4fe4efea8f54 Mon Sep 17 00:00:00 2001
+From: Christian Hergert <chergert@redhat.com>
+Date: Mon, 15 Jan 2024 11:54:38 -0800
+Subject: [PATCH] libide/tweaks: remove autoptr cleanup
+
+This is not needed now with recent GTK changes merged this morning.
+---
+ src/libide/tweaks/ide-tweaks-window.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/libide/tweaks/ide-tweaks-window.c b/src/libide/tweaks/ide-tweaks-window.c
+index f2553a396..dcb55bb35 100644
+--- a/src/libide/tweaks/ide-tweaks-window.c
++++ b/src/libide/tweaks/ide-tweaks-window.c
+@@ -32,8 +32,6 @@
+ #include "ide-tweaks-panel-list-private.h"
+ #include "ide-tweaks-window.h"
+ 
+-G_DEFINE_AUTOPTR_CLEANUP_FUNC (GtkStackPage, g_object_unref)
+-
+ struct _IdeTweaksWindow
+ {
+   AdwWindow               parent_instance;
+-- 
+2.43.0
+
diff --git a/dev-util/gnome-builder/gnome-builder-44.2-r1.ebuild b/dev-util/gnome-builder/gnome-builder-44.2-r1.ebuild
index b99f6335b15c..8dd7656ce8b7 100644
--- a/dev-util/gnome-builder/gnome-builder-44.2-r1.ebuild
+++ b/dev-util/gnome-builder/gnome-builder-44.2-r1.ebuild
@@ -31,10 +31,12 @@ REQUIRED_USE="
 # Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2?
 # An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4
 
+# >=gtk-4.12.5 for relying on GtkStackPage autoptr cleanup added in that version
+
 # TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
 RDEPEND="
 	>=dev-libs/glib-2.75.0:2
-	>=gui-libs/gtk-4.8:4[introspection]
+	>=gui-libs/gtk-4.12.5:4[introspection]
 	>=gui-libs/libadwaita-1.3.0:1
 	>=gui-libs/libpanel-1.1.2:1
 	>=gui-libs/gtksourceview-5.7.2:5[introspection]
@@ -126,6 +128,10 @@ that are currently available with packages include:
 # stylelint for stylesheet (CSS and co) linting
 # gvls for vala language-server integration
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-fix-gtk-4.12.5-build.patch
+)
+
 llvm_check_deps() {
 	has_version "sys-devel/clang:${LLVM_SLOT}"
 }