gentoo auto-resync : 17:01:2025 - 06:41:55

3 files changed, 21 insertions, 63 deletions

diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index cd861da190af..523cddaf4ddb 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -1,6 +1,5 @@
-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
 DIST gnome-builder-46.3.tar.xz 9102324 BLAKE2B 3c03eab7e60e4e8a4f10e165b5ae8bbc764fb102df3b594160def47720b94787f6b8d25479e0148c5369b7cf3256d5c8455cf54cf0f42c78424a5e1e17028682 SHA512 1d765f9a4da17d6c1cda688c0590d34b9fc8da8c2d427e4fde57e35b4b78b13905792da065d630d1b351d90ca25a276cc7a680c3b02fd9d5ba4c236a150325cc
-EBUILD gnome-builder-44.2-r1.ebuild 9323 BLAKE2B 4c18956b02573832ca9b49d2f9d5cfc7edb8f32c0a8be2dcf9983313e957fbc8eab7960aba5259af5ade1c367076901281413d5ea1a6aa722a31021b55a2c52f SHA512 d50b4dfc948d506ef7388259ef9ed3f52ebf5d063532953940294ed73aaba8eaf73df1efbda400143fc6d0c0f1437a232f0424ed21c0b92afd4f30d8f19727a2
+DIST gnome-builder-47.2.tar.xz 10652952 BLAKE2B 93356472ff321766dec00eb26f7f5e44e66f61661f5d5d67ace2290cf1e176925e05334769665ef381fd1469d8f04c297c01d97877357e349e4f5b5ee9f3f1c1 SHA512 fa26efcede1b44bf0a7e48dffb02fb80d11399386c2be65ac39207816191fe1c59900a1200c987a9077e64caf8a8ece60899b49019452caf66dc2076de75c5ea
 EBUILD gnome-builder-46.3.ebuild 8979 BLAKE2B 7c16a4d275cde59702dbbc46b2c0a8e7a90f586538c59d5d78d857cbfea33cd7e1b3a730f837a1cba44315b6ab7d3f17f21538861e4343c5e0a5c10939c1bcee SHA512 bab3c616f5a47fb1d8f6a659def8bfa1e1ea5119eb8308e0128999190d5e7880ad3c52220e9dc0906489c3663d17647b7df9981063190bacd1a1daa0f3443223
+EBUILD gnome-builder-47.2.ebuild 8947 BLAKE2B 9635fb1d6811d9a35af575850298f42dc61f56fccb09a70069997c8d7d818aace30a965b93cb2d4fce06d48c25e3c20ac68330203ad1da7708892f9c844ec4ed SHA512 bf5412c0eda7fca40db1b2a4bf039e50b319d269cb130a991b259b49a88511c07448f65da2f1a6d37670735043cb25321a84eff723f3ed1d81fac027c2f975a7
 MISC metadata.xml 1096 BLAKE2B 3e0bbc30b7c25d5d9141e3e8ab125c0fc5782de1425a4a35aa4fdee14af084911c72aa3ee12c72e9f5089b47d4f42fc96a76532e49a2286e80f63b9b80e4881e SHA512 3ce02fedc562bae40502c7d9485523166feff517336c3d7494850d5939dc5d93ed54e455a1dbc9c934b898cb7464bd98ee90e7b64664a28bd48017ac2bdab764
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
deleted file mode 100644
index eccf90851fb7..000000000000
--- a/dev-util/gnome-builder/files/44.2-fix-gtk-4.12.5-build.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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-47.2.ebuild
index 6471a24d65e3..339ac0b1696b 100644
--- a/dev-util/gnome-builder/gnome-builder-44.2-r1.ebuild
+++ b/dev-util/gnome-builder/gnome-builder-47.2.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 DISABLE_AUTOFORMATTING=1
 FORCE_PRINT_ELOG=1
 
 inherit gnome.org gnome2-utils llvm meson optfeature python-single-r1 readme.gentoo-r1 virtualx xdg
 
 DESCRIPTION="An IDE for writing GNOME-based software"
-HOMEPAGE="https://wiki.gnome.org/Apps/Builder https://gitlab.gnome.org/GNOME/gnome-builder"
+HOMEPAGE="https://apps.gnome.org/Builder/ https://gitlab.gnome.org/GNOME/gnome-builder"
 
 # FIXME: Review licenses at some point
 LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64"
+KEYWORDS="~amd64"
 IUSE="clang doc +d-spy flatpak +git gtk-doc spell +sysprof test +webkit"
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
@@ -31,26 +31,23 @@ 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.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]
+	>=dev-libs/glib-2.75:2
+	>=gui-libs/gtk-4.15.5:4[introspection]
+	>=gui-libs/libadwaita-1.6_alpha:1
+	>=gui-libs/libpanel-1.7.0:1
+	>=gui-libs/gtksourceview-5.8:5[introspection]
 	>=dev-libs/json-glib-1.2.0
 	>=dev-libs/jsonrpc-glib-3.43.0:=
-	>=dev-libs/libdex-0.1.1:=
-	>=dev-libs/libpeas-1.34.0:0[python,${PYTHON_SINGLE_USEDEP}]
+	>=dev-libs/libdex-0.7:=
+	>=dev-libs/libpeas-1.99.0:2[python,${PYTHON_SINGLE_USEDEP}]
 	dev-libs/libportal:=[gtk,introspection]
 	>=dev-libs/template-glib-3.36.1:=[introspection]
-	>=gui-libs/vte-0.70.0:2.91-gtk4[introspection]
+	>=gui-libs/vte-0.75.0:2.91-gtk4[introspection]
 	>=dev-libs/libxml2-2.9.0
 	webkit? ( >=net-libs/webkit-gtk-2.38.0:6=[introspection] )
 	>=app-text/cmark-0.29.0:0=
-	d-spy? ( >=dev-debug/d-spy-1.4.0:1 )
 	app-text/editorconfig-core-c
 	flatpak? (
 		dev-util/ostree
@@ -62,19 +59,14 @@ RDEPEND="
 		>=dev-libs/libgit2-glib-1.1.0[ssh]
 	)
 
-	>=dev-libs/gobject-introspection-1.54.0:=
-	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
-	')
+	>=dev-libs/gobject-introspection-1.74.0:=
 	${PYTHON_DEPS}
 	clang? ( llvm-core/clang:= )
 	spell? (
-		app-text/enchant:2
-		dev-libs/icu:=
+		>=app-text/libspelling-0.3
 	)
 	sysprof? (
-		>=dev-util/sysprof-capture-3.46.0:4
-		>=dev-util/sysprof-3.46.0:0/4
+		>=dev-util/sysprof-45.0[gtk]
 	)
 "
 DEPEND="${RDEPEND}"
@@ -128,10 +120,6 @@ 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 "llvm-core/clang:${LLVM_SLOT}"
 }
@@ -141,13 +129,6 @@ pkg_setup() {
 	use clang && llvm_pkg_setup
 }
 
-src_prepare() {
-	default
-
-	# Fails with clang due to `environ` variable name shadowing unistd.h one
-	sed -i -e '/-Werror=shadow/d' meson.build || die
-}
-
 src_configure() {
 	local emesonargs=(
 		-Dchannel=other
@@ -184,9 +165,11 @@ src_configure() {
 		$(meson_use d-spy plugin_dspy)
 		-Dplugin_dub=true
 		-Dplugin_editorconfig=true
+		-Dplugin_elixir_ls=true
 		-Dplugin_eslint=true
 		-Dplugin_file_search=true
 		$(meson_use flatpak plugin_flatpak)
+		-Dplugin_flake8=true
 		-Dplugin_gdb=true
 		-Dplugin_gdiagnose=true
 		-Dplugin_gettext=true
@@ -206,10 +189,12 @@ src_configure() {
 		-Dplugin_lua_language_server=true
 		-Dplugin_make=true
 		-Dplugin_make_templates=true
+		-Dplugin_manuals=false
 		$(meson_use webkit plugin_markdown_preview)
 		$(meson_use webkit plugin_markdown_indenter)
 		-Dplugin_maven=true
 		-Dplugin_meson=true
+		-Dplugin_mesonlsp=true
 		-Dplugin_meson_templates=true
 		-Dplugin_modelines=true
 		-Dplugin_mono=true