gentoo auto-resync : 28:02:2025 - 19:27:52next

4 files changed, 337 insertions, 2 deletions

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 35ef8e93ccaa..ef3ea42b4554 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -4,11 +4,14 @@ AUX gimp-2.10_fix_configure_GCC13_implicit_function_declarations.patch 583 BLAKE
 AUX gimp-2.10_fix_musl_backtrace_backend_switch.patch 535 BLAKE2B 374433568330a4b5167e6f32bd9ecbe44e9ceb4004cce9504586b73dc31c7613d2766ae5615d74b2a51a05ff3592add2e7585b7d63eb43b219ebe6b37193edca SHA512 df0b9b357d085463ac3b791b6131dabfdd33d12e7b77f45f496379d08da1b0e8ae787b9b4b260ec221c22e3302d54b17493175db55514ec3e705782fdb80ec18
 AUX gimp-2.10_fix_test-appdata.patch 902 BLAKE2B 2b1a131d874d65422d8bdd44732b9843d89a570a1ea3c058cdb2a424a7791c686aa0e2ae2a0b472f333f2465f6e1a26750a532e9003933c5dffa1af32343c1dc SHA512 2983e8572f5e8113c9e2f564d31c1a5fe7e11ef273c50d2be739089124c6ec1a457da28222020bbd6015b2cbbcbf403b88d8660b9b35241800deb4fb3ad79067
 AUX gimp-2.10_libheif-1.18_unconditional_compat.patch 820 BLAKE2B 4e75ebc639bc6f985776861de119b85dd7bde2be3a2e385cb6c61bd6e44b29d80c9ff84736a7e518b76f092c72295c1bb7e2ed58eccbd52a54b7bc4c769b12e6 SHA512 4233e2d8c50222b4700e9f7c6b2e5a41e1d5b685899f4cb0db61aa96b9eba4a0538fcc74fe9fe77265932062ea4dc94e13036d381a96338a470bf00b5a53b437
+AUX gimp-3.0.0_rc3_debug_self_gdb_optional.patch 2788 BLAKE2B 59acfa58625d898343cee43fb79df7734fa1730e20bfce8f8f399fafe86ad2d340613d24d5b1cc60210202e6bc89c583c259b2a0a3e93388906d31e6083c3b9c SHA512 d5a307773c545ebc19472e366876e7b0c7e5940db7043b241fa5b10e79d0ca6c20f536abeff78115b0c31e1855ef8b5243c7906b98b1b19c22cd393547e4f195
 DIST gimp-2.10.38.tar.bz2 31698453 BLAKE2B 58c29e3e00d873e69a5e5f4e9c3ff4d868ccfb11914570306ef12c54ca7d3ef89a62d8c71fac1f2d1f426ac615dc4caf7a7260351c00301dce2b1aa4193bab6d SHA512 343bf1c3bd14bf8e7c7af79c05920faca213da68549127c1d8af53e2e872e55aeaf39a3cfcf578183a34fdc4f98e1c859be63956b0611067186eefd1fdee2aaa
 DIST gimp-3.0.0-RC1.tar.xz 28863948 BLAKE2B d9e1ae51809d1c8e5084a9e85b660cd0f3a763f8ee220075fe73f512940e9637d50675a06d0dca88c501571a26404cb6b53c9573348002586143c52736dfa196 SHA512 844896976b66b0498ba9149c7176f5442b2305fd3dc51fce7ff92eb05b7b0f86f16d0bd16e50a3c43ab2c6b9be4e610dbbfc50a99c84a62a4de80a6937d43985
 DIST gimp-3.0.0-RC2.tar.xz 26980968 BLAKE2B 56b98a7863df22cf81015a9da5d7535cfef5a154c47418b1b6c6212cc76423e0769a4aa8d76714d2eb22595b1f6e2c623e4444e35675db5fe7e40c8820fe71dd SHA512 c0a6e096d954f3048cb68fe4ff71dd2f49c802f800014ab8a3089a0e097e7d6f595e5716230c06e7edfddba948f0d01da14800935aa6ceb9dc2e12fb7f19d7e6
+DIST gimp-3.0.0-RC3.tar.xz 27043600 BLAKE2B 6dd3a64ab8a7ec3481fdc2c4d7aeeb34546fbd493f9f6663f154f8ff47616190df0fa3719ea17debde56ed9f32120b6d03d4acf45b9e98740fd2ebc11c429878 SHA512 f6da664aadc312cdfac248fb1d3d8eb681aff50b8b0dee6f5c23cfa768eb4899386f470d19e797d0b1ee24746c88c7c12b609c3dc091acd2a625baf0b028285f
 EBUILD gimp-2.10.38-r1.ebuild 6369 BLAKE2B e97ae7367bf369773f32fff168814b58bc3f6ffa1828d39f1b0d8a9a36b7a812a18be8db2716039e323054af9a0b853a586ef4ec4d37868615e57f72fbcf6eb9 SHA512 85bbbc80c6908e0618a7eebaeb028820fb14c0e2b41779043f6547ab9767b5af0b8019c895978a473e3ebda550126b257e96fd65494f3e5239d709b3497d1a59
 EBUILD gimp-3.0.0_rc1.ebuild 7151 BLAKE2B 5cad985c4a3d8f1f968b1816617090ab1fe271971d2ccf1b877a748e65854e8e809d7e7d3aa542c98db8a00f77261df3cf2d1379f854bc52477c7ee4a8d8ecf3 SHA512 6f45446d8f4604f246c25c3542aa5c0a73f399ac7942dde94e066b264d18f1f3937a5cd66e52543cf1b82f818a58b5186a8791c554437907a38cbd162291f93f
 EBUILD gimp-3.0.0_rc2-r1.ebuild 7150 BLAKE2B 859807c458ab1ac0164452f5fae92e19541a339db710c2e0c7ad6e9d8a2a353743701473b9c0fd0fae36c05993f9846a45560f58b93b5203f0cb76200c1b9ec5 SHA512 a9400b5818f4de765559b5591d915e8f9eeb498e2b329b2d9e682d5e9b8042eed89709a65ec1edba1c7f8f17847836caa28817e72149fc0951455c4bb9a84ffa
-EBUILD gimp-9999.ebuild 7316 BLAKE2B 6bb5373b43013b80d82bdac5a03521d291c676f3da71a945127d421ea89bbb66f01bc69cb900813a15d7ca7e0fb5bc31767234170881abdd51a5566290f2ee15 SHA512 42bff7f76c272ebcead387ac67d64f2dde0db7c2baec6a219cac0ebebd36b3b4d6e5560ddecacac4c6d5d217ad65cfd11cc4785bb9c6d5b9c937483211399c24
+EBUILD gimp-3.0.0_rc3.ebuild 7206 BLAKE2B e9201499e9f59838a15d9012924a19920ba3aebace6fd6774d3c86328118f261c3fc0f2cff7413ba4514f2f71e7a06460b388f64813b36ca18865cdf00b7b6b0 SHA512 87e0d9ea381d091f8c5df3ed33b10357cfbdb310b0210f776af49d2b7ec119b99b60f295b75bb7faa73c085000ffd7d921be010889f3030b1c1cc5c3ec398b49
+EBUILD gimp-9999.ebuild 7346 BLAKE2B c499ce80bc51f5f6c9e72b7cb429a37538e8ec03be97a6bd21800206ee4cc45650bfb84e4913266fddbc379727e40088ebcdcb1159f4c873cc3985591e9e8e86 SHA512 577d85af4069a04f6e5b222b4b886d6e7db61510d1082049e3336de13d667c9998ac7ff39e43bb0eec84d3a22fdfdd69e332a994c39950231bc3c2533416debf
 MISC metadata.xml 655 BLAKE2B f6628a2c5edb90b16db0f59af05446a3f31316f5558ece238d30c9350632713cf2db3d315c90b31229596659ec20859c17fde6b051f9ab8f8fe34d64902dad57 SHA512 712a259ae41d9052bde0761087928685b9b66a132db3f3b49121241d87728f51bf31a00541aa385bd03b57a2e2a03a0176356045dd4752485a8dca2bd61c5886
diff --git a/media-gfx/gimp/files/gimp-3.0.0_rc3_debug_self_gdb_optional.patch b/media-gfx/gimp/files/gimp-3.0.0_rc3_debug_self_gdb_optional.patch
new file mode 100644
index 000000000000..76c92ba95515
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-3.0.0_rc3_debug_self_gdb_optional.patch
@@ -0,0 +1,65 @@
+Gentoo issue: https://bugs.gentoo.org/949910
+Upstream issue: https://gitlab.gnome.org/GNOME/gimp/-/issues/12904
+
+From c3bc4e53363bdad44f01826f665d88c48fcedd99 Mon Sep 17 00:00:00 2001
+From: Jehan <jehan@girinstud.io>
+Date: Mon, 24 Feb 2025 18:13:09 +0100
+Subject: [PATCH] Issue #12904: make debugging self with gdb optional with
+ -Ddebug-self-in-build.
+
+Some people reported cases where gdb doesn't even seem to understand
+Python scripts (the error in #12904 implies it is looking for standard
+gdb commands, because apparently -x option allows both styles).
+Others had issues in sandbox building (#12956).
+
+I don't really want to spend too much time understanding each case,
+especially as it's a self-debugging tool, not absolutely necessary for a
+successful compilation.
+
+So let's just make this optional, and default to "false".
+---
+ meson.build            | 3 +++
+ meson_options.txt      | 2 ++
+ tools/in-build-gimp.sh | 2 +-
+ 3 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 5fb07c6f13..2cfd7acb89 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1959,6 +1959,9 @@ subdir('app-tools')
+ gimp_run_env=environment()
+ gimp_run_env.set('GIMP_GLOBAL_BUILD_ROOT',  meson.global_build_root())
+ gimp_run_env.set('GIMP_GLOBAL_SOURCE_ROOT', meson.global_source_root())
++if get_option('debug-self-in-build')
++ gimp_run_env.set('GIMP_DEBUG_SELF', '1')
++endif
+ 
+ if meson.can_run_host_binaries() and have_gobject_introspection
+   if enable_console_bin
+diff --git a/meson_options.txt b/meson_options.txt
+index b9da5211dd..f6adb1313d 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -66,3 +66,5 @@ option('vector-icons',      type: 'boolean', value: true,   description: 'Use ve
+ option('vala',              type: 'feature', value: 'auto', description: 'Build VAPI and Vala plugins')
+ option('javascript',        type: 'feature', value: 'auto', description: 'Install Javascript plug-ins')
+ option('lua',               type: 'boolean', value: false,  description: 'Install Lua plug-ins (experimental)')
++
++option('debug-self-in-build', type: 'boolean', value: false, description: 'Run in-build GIMP within gdb for debugging purpose')
+diff --git a/tools/in-build-gimp.sh b/tools/in-build-gimp.sh
+index 913fd19c80..878e351ccc 100755
+--- a/tools/in-build-gimp.sh
++++ b/tools/in-build-gimp.sh
+@@ -24,7 +24,7 @@ if [ -n "$GIMP_TEMP_UPDATE_RPATH" ]; then
+   unset IFS
+ fi
+ 
+-if command -v gdb; then
++if [ -n "$GIMP_DEBUG_SELF" ] && command -v gdb; then
+   echo RUNNING: cat /dev/stdin "|" gdb --batch -x "$GIMP_GLOBAL_SOURCE_ROOT/tools/debug-in-build-gimp.py" --args $GIMP_SELF_IN_BUILD "$@"
+   cat /dev/stdin | gdb --return-child-result --batch -x "$GIMP_GLOBAL_SOURCE_ROOT/tools/debug-in-build-gimp.py" --args $GIMP_SELF_IN_BUILD "$@"
+ else
+-- 
+GitLab
+
diff --git a/media-gfx/gimp/gimp-3.0.0_rc3.ebuild b/media-gfx/gimp/gimp-3.0.0_rc3.ebuild
new file mode 100644
index 000000000000..49d494624f2b
--- /dev/null
+++ b/media-gfx/gimp/gimp-3.0.0_rc3.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( luajit )
+PYTHON_COMPAT=( python3_{10..13} )
+VALA_USE_DEPEND=vapigen
+
+inherit flag-o-matic lua-single meson python-single-r1 toolchain-funcs vala xdg
+
+DESCRIPTION="GNU Image Manipulation Program"
+HOMEPAGE="https://www.gimp.org/"
+SRC_URI="mirror://gimp/v$(ver_cut 1-2)/${PN}-$(ver_cut 1-3)-RC3.tar.xz"
+
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)-RC3"
+LICENSE="GPL-3+ LGPL-3+"
+SLOT="0/3"
+
+IUSE="X aalib alsa doc fits gnome heif javascript jpeg2k jpegxl lua mng openexr openmp postscript test udev unwind vala vector-icons webp wmf xpm"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	lua? ( ${LUA_REQUIRED_USE} )
+	test? ( X )
+	xpm? ( X )
+"
+
+RESTRICT="!test? ( test )"
+
+# media-libs/{babl,gegl} are required to be built with USE="introspection"
+# to fix the compilation checking of /usr/share/gir-1.0/{Babl-0.1gir,Gegl-0.4.gir}
+COMMON_DEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.0:3[${PYTHON_USEDEP}]
+	')
+	>=app-accessibility/at-spi2-core-2.46.0
+	>=app-text/poppler-0.90.1[cairo]
+	>=app-text/poppler-data-0.4.9
+	>=dev-libs/appstream-glib-0.7.16
+	>=dev-libs/glib-2.70.0:2
+	>=dev-libs/json-glib-1.4.4
+	dev-libs/libxml2:2
+	dev-libs/libxslt
+	>=gnome-base/librsvg-2.57.3:2
+	>=media-gfx/mypaint-brushes-2.0.2:=
+	>=media-libs/babl-0.1.110[introspection,lcms,vala?]
+	>=media-libs/fontconfig-2.12.6
+	>=media-libs/freetype-2.10.2
+	>=media-libs/gegl-0.4.54:0.4[cairo,introspection,lcms,vala?]
+	>=media-libs/gexiv2-0.14.0
+	>=media-libs/harfbuzz-2.6.5:=
+	>=media-libs/lcms-2.13.1:2
+	media-libs/libjpeg-turbo:=
+	>=media-libs/libmypaint-1.6.1:=
+	>=media-libs/libpng-1.6.37:0=
+	>=media-libs/tiff-4.1.0:=
+	net-libs/glib-networking[ssl]
+	sys-libs/zlib
+	>=x11-libs/cairo-1.16.0[X=]
+	>=x11-libs/gdk-pixbuf-2.40.0:2[introspection]
+	>=x11-libs/gtk+-3.24.48:3[introspection,X=]
+	>=x11-libs/pango-1.50.0[X=]
+	aalib? ( media-libs/aalib )
+	alsa? ( >=media-libs/alsa-lib-1.0.0 )
+	fits? ( sci-libs/cfitsio )
+	heif? ( >=media-libs/libheif-1.13.0:= )
+	javascript? ( dev-libs/gjs )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.1:2= )
+	jpegxl? ( >=media-libs/libjxl-0.6.1:= )
+	lua? (
+		${LUA_DEPS}
+		$(lua_gen_cond_dep '
+			dev-lua/lgi[${LUA_USEDEP}]
+		')
+	)
+	mng? ( media-libs/libmng:= )
+	openexr? ( >=media-libs/openexr-2.3.0:= )
+	postscript? ( app-text/ghostscript-gpl:= )
+	udev? ( >=dev-libs/libgudev-167:= )
+	unwind? ( >=sys-libs/libunwind-1.1.0:= )
+	webp? ( >=media-libs/libwebp-0.6.0:= )
+	wmf? ( >=media-libs/libwmf-0.2.8[X=] )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		>=x11-libs/libXmu-1.1.4
+	)
+	xpm? ( x11-libs/libXpm )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	x11-themes/hicolor-icon-theme
+	gnome? ( gnome-base/gvfs )
+"
+
+DEPEND="
+	${COMMON_DEPEND}
+	test? ( x11-misc/xvfb-run )
+	vala? ( $(vala_depend) )
+"
+
+# TODO: there are probably more atoms in DEPEND which should be in BDEPEND now
+BDEPEND="
+	>=dev-lang/perl-5.30.3
+	dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.21
+	doc? (
+		dev-libs/gobject-introspection[doctool]
+		dev-util/gi-docgen
+	)
+	virtual/pkgconfig
+"
+
+DOCS=( "AUTHORS" "NEWS" "README" "README.i18n" )
+
+PATCHES=(
+	"${FILESDIR}/${P}_debug_self_gdb_optional.patch" # Bug 949910
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+	python-single-r1_pkg_setup
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	sed -i -e 's/mypaint-brushes-1.0/mypaint-brushes-2.0/' meson.build || die #737794
+
+	# Fix Gimp  and GimpUI devel doc installation paths
+	sed -i -e "s/'doc'/'gtk-doc'/" devel-docs/reference/gimp/meson.build || die
+	sed -i -e "s/'doc'/'gtk-doc'/" devel-docs/reference/gimp-ui/meson.build || die
+
+	# Fix pygimp.interp python implementation path.
+	# Meson @PYTHON_PATH@ use sandbox path e.g.:
+	# '/var/tmp/portage/media-gfx/gimp-2.99.12/temp/python3.10/bin/python3'
+	sed -i -e 's/@PYTHON_EXE@/'${EPYTHON}'/' plug-ins/python/pygimp.interp.in || die
+
+	# Set proper intallation path of documentation logo
+	sed -i -e "s/'gimp-@0@'.format(gimp_app_version)/'gimp-${PVR}'/" gimp-data/images/logo/meson.build || die
+}
+
+_adjust_sandbox() {
+	# Bugs #569738 and #591214
+	local nv
+	for nv in /dev/nvidia-uvm /dev/nvidiactl /dev/nvidia{0..9} ; do
+		# We do not check for existence as they may show up later
+		# https://bugs.gentoo.org/show_bug.cgi?id=569738#c21
+		addwrite "${nv}"
+	done
+
+	addwrite /dev/dri/  # bugs #574038 and #684886
+	addwrite /dev/ati/  # bug #589198
+	addwrite /proc/mtrr  # bug #589198
+}
+
+src_configure() {
+	_adjust_sandbox
+
+	# bug #944284 (https://gitlab.gnome.org/GNOME/gimp/-/issues/12843)
+	append-cflags -std=gnu17
+
+	use vala && vala_setup
+
+	local emesonargs=(
+		-Denable-default-bin=enabled
+
+		-Dcheck-update=no
+		-Ddebug-self-in-build=false
+		-Denable-multiproc=true
+		-Dappdata-test=disabled
+		-Dbug-report-url=https://bugs.gentoo.org/
+		-Dilbm=disabled
+		-Dlibbacktrace=false
+		-Dwebkit-unmaintained=false
+		$(meson_feature aalib aa)
+		$(meson_feature alsa)
+		$(meson_feature doc gi-docgen)
+		$(meson_feature fits)
+		$(meson_feature heif)
+		$(meson_feature javascript)
+		$(meson_feature jpeg2k jpeg2000)
+		$(meson_feature jpegxl jpeg-xl)
+		$(meson_feature mng)
+		$(meson_feature openexr)
+		$(meson_feature openmp)
+		$(meson_feature postscript ghostscript)
+		$(meson_feature test headless-tests)
+		$(meson_feature udev gudev)
+		$(meson_feature vala)
+		$(meson_feature webp)
+		$(meson_feature wmf)
+		$(meson_feature X xcursor)
+		$(meson_feature xpm)
+		$(meson_use lua)
+		$(meson_use unwind libunwind)
+		$(meson_use vector-icons)
+	)
+
+	meson_src_configure
+}
+
+src_compile() {
+	export XDG_DATA_DIRS="${EPREFIX}"/usr/share  # bug 587004
+	meson_src_compile
+}
+
+# for https://bugs.gentoo.org/664938
+_rename_plugins() {
+	einfo 'Renaming plug-ins to not collide with pre-2.10.6 file layout (bug #664938)...'
+	local prename=gimp-org-
+	(
+		cd "${ED}"/usr/$(get_libdir)/gimp/3.0/plug-ins || exit 1
+		for plugin_slash in $(ls -d1 */); do
+			plugin=${plugin_slash%/}
+			if [[ -f ${plugin}/${plugin} ]]; then
+				# NOTE: Folder and file name need to match for Gimp to load that plug-in
+				#       so "file-svg/file-svg" becomes "${prename}file-svg/${prename}file-svg"
+				mv ${plugin}/{,${prename}}${plugin} || exit 1
+				mv {,${prename}}${plugin} || exit 1
+			fi
+		done
+	)
+}
+
+src_test() {
+	local -x LD_LIBRARY_PATH="${BUILD_DIR}/libgimp:${LD_LIBRARY_PATH}"
+	meson_src_test
+}
+
+src_install() {
+	meson_src_install
+
+	python_optimize
+
+	# Workaround for bug #321111 to give GIMP the least
+	# precedence on PDF documents by default
+	mv "${ED}"/usr/share/applications/{,zzz-}gimp.desktop || die
+
+	find "${D}" -name '*.la' -type f -delete || die
+
+	# Create symlinks for Gimp exec in /usr/bin
+	dosym "${ESYSROOT}"/usr/bin/gimp-3.0 /usr/bin/gimp
+	dosym "${ESYSROOT}"/usr/bin/gimp-console-3.0 /usr/bin/gimp-console
+	dosym "${ESYSROOT}"/usr/bin/gimp-script-fu-interpreter-3.0 /usr/bin/gimp-script-fu-interpreter
+	dosym "${ESYSROOT}"/usr/bin/gimp-test-clipboard-3.0 /usr/bin/gimp-test-clipboard
+	dosym "${ESYSROOT}"/usr/bin/gimptool-3.0 /usr/bin/gimptool
+
+	_rename_plugins || die
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+}
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index dc9f4d6c6012..d3f55c7cdc88 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -57,7 +57,7 @@ COMMON_DEPEND="
 	sys-libs/zlib
 	>=x11-libs/cairo-1.16.0[X=]
 	>=x11-libs/gdk-pixbuf-2.40.0:2[introspection]
-	>=x11-libs/gtk+-3.24.16:3[introspection,X=]
+	>=x11-libs/gtk+-3.24.48:3[introspection,X=]
 	>=x11-libs/pango-1.50.0[X=]
 	aalib? ( media-libs/aalib )
 	alsa? ( >=media-libs/alsa-lib-1.0.0 )
@@ -173,6 +173,7 @@ src_configure() {
 		-Denable-default-bin=enabled
 
 		-Dcheck-update=no
+		-Ddebug-self-in-build=false
 		-Denable-multiproc=true
 		-Dappdata-test=disabled
 		-Dbug-report-url=https://bugs.gentoo.org/