gentoo auto-resync : 13:08:2024 - 11:06:03

4 files changed, 138 insertions, 234 deletions

diff --git a/gui-libs/gtk/Manifest b/gui-libs/gtk/Manifest
index 9cb119874f51..b8f5d502694c 100644
--- a/gui-libs/gtk/Manifest
+++ b/gui-libs/gtk/Manifest
@@ -1,9 +1,9 @@
 AUX 0001-gdk-add-a-poison-macro-to-hide-GDK_WINDOWING_.patch 2632 BLAKE2B 407b112917f7925fc0f86e0dfb359ad9810cfcf766219985408b4b86081f776aa3776275fab09d272c0b9843937c3243851ebb260080ee0f2bbbff734f8114c6 SHA512 612a2632b6083ebdbb4500eef3e3781138e6f8dafbbd4356bbe10a37fe496850a371ffa72943197db789005bda5f7982596987a5ef511afd2269540f113785bd
+AUX 6510b876d1cb5428db4822974cdebfed209692b0.patch 4322 BLAKE2B 22c556b97cf4c588ef1a7b4852501b6a183ca5a02d3103e0984071d5be5a8c3288da2ee0da24ee401274679500eb504eca7a66fd5a00478ccf1d5ae01a57ad2a SHA512 7b2f251869ff22814d26385160590f5157038df2dac41089db35f91371db7b504240d954b9472909f548ef38754510c05d8f43eb704327faefd73e9c8e9cb5d0
 DIST gtk-4.12.5.tar.xz 17314760 BLAKE2B ce6a88d2c3ecfa2a9773682645ff00a61fd932b9a6de764794ef8abd10c5c75df386801143c32d10fec110029e997a16c4cdcb0ef050905562c6dd9fdc46039d SHA512 813758f4fe23b99b2ea1cf22156b86b22df30024717ae3b30bbe36111f9b1363bbd4da5fe8e5f69268c43794ea165e12c1c5bc52fd64bcbb1f9ccd3121540ac4
 DIST gtk-4.14.3.tar.xz 18340444 BLAKE2B 20238e061c6500a8b253617010ac017e84ec2cacd9f10a7d2e982e9d72b72d78ee46abb3eb836d853d1d10736c697fc7468b2700b16ce5477a34400e8758e2b8 SHA512 2502fff3e98cb45f2293c94d86c32ff9b7c88d72eb7500a19fc9e589e1eda69af94c4eae78c044dcf5cf345cb99537d264250115d633034d9552cadc67f71e8e
 DIST gtk-4.14.4.tar.xz 18306548 BLAKE2B 352831cb6373488593831e0d3489d425ca19b2b6c5541e269e251bb4f0455b435d73d24befef441fe09537838446eb773f33cbca746a9aeeed2204c413535ac0 SHA512 33a983f4ebac9088eaf9d3794a171d1619632bbcb27d9f46d894305dc15f83615a18443598b3c62a553b9596438b58226560ba17c41e539c76c3ee8a2b62c651
-EBUILD gtk-4.12.5-r1.ebuild 5983 BLAKE2B a544726ecd1c05419ac336a1799849a49b2c621e1478c9cf176efa84d730eba7df268c5f300e56040da69b86b6e92e26d2870c3f13a78b4d698e8c47dda189a4 SHA512 c0a3642fa84613bbf1b5c4a627e29435f0b26f35f9661524b2ead95586318bb8903bbcd7b6cb02efa0d8aaba2c280d6afab2d3eae0dc24160d5345efaafecb2e
-EBUILD gtk-4.12.5-r2.ebuild 6279 BLAKE2B 676ed7da195dca42ce44845fc70f0a341eeb6de60d5e2e8e9fb4046bed6baf643ac0d9c2fe945a382a40c4bb5bc6eacc0dca37135f1921fc06e5cdcd22fbd8a3 SHA512 84d79f6ce83804b577918c18accd279bac570b3a67e6d20d54f25b063d67c59281bc23b484a3eb745df64470ad89da660e525d74f8a80986ab6ccd20dffe4e07
+EBUILD gtk-4.12.5-r2.ebuild 6412 BLAKE2B daecf847b2cafd04bb74422e51dcb61f2dc8ffcfcdeb558f69596f61c4e26c46e93370fede65d5672ddc25235cf3306e719042452c2b6b83dc9e57f67c991fe2 SHA512 586d21fb12527f41737a079c46e6af195ea3640aaaa65868c0a2b5473ef548b484c631d724e8912916b029228c6910db38083556cacda08a7e1590125f9d6b74
 EBUILD gtk-4.14.3-r1.ebuild 6779 BLAKE2B 167dca7c56b9a402a856cafa8b2f01a7a699edc7dfa07d12f06bdbe0ce68adc11b675bcb7dc8abd48476e8098131f27df379ea94ddcbca44b8da02ef15f53625 SHA512 7075b8d36f6446de6c89cdc2367bb4178c21244eb9444c211f72241a06ace7a8c4c1a0734ad557722ae2dbce2e29c0ffec9b7d9b5eca2e23978c4979168df7b6
 EBUILD gtk-4.14.4-r1.ebuild 6779 BLAKE2B 167dca7c56b9a402a856cafa8b2f01a7a699edc7dfa07d12f06bdbe0ce68adc11b675bcb7dc8abd48476e8098131f27df379ea94ddcbca44b8da02ef15f53625 SHA512 7075b8d36f6446de6c89cdc2367bb4178c21244eb9444c211f72241a06ace7a8c4c1a0734ad557722ae2dbce2e29c0ffec9b7d9b5eca2e23978c4979168df7b6
 MISC metadata.xml 775 BLAKE2B a679a63b050be837319131924b4196dc7fdd2a1dcbca4b099eebc8550db3120dc8afe2b743acd68ce386fda7e4bd3af1eb2eb11d333542e1dbcc8b8a68c6c919 SHA512 15d8dc9c2701575b59d596cc10b1ca18691d10c3a418989eece698650e82a34720bea9d53a4ca4aa83745ce5d254cec5438f1ab10093ab2f765e77d0c9c24433
diff --git a/gui-libs/gtk/files/6510b876d1cb5428db4822974cdebfed209692b0.patch b/gui-libs/gtk/files/6510b876d1cb5428db4822974cdebfed209692b0.patch
new file mode 100644
index 000000000000..0ff0398ab0c8
--- /dev/null
+++ b/gui-libs/gtk/files/6510b876d1cb5428db4822974cdebfed209692b0.patch
@@ -0,0 +1,134 @@
+From 6510b876d1cb5428db4822974cdebfed209692b0 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Tue, 9 Apr 2024 21:01:26 -0400
+Subject: [PATCH] build: Add a missing dependency
+
+Add the generated gdk headers to the sources for all the backends,
+to guarantee that they are generated before the library is used.
+
+Fixes: #6618
+---
+ gdk/broadway/meson.build |  3 +--
+ gdk/macos/meson.build    |  2 +-
+ gdk/meson.build          | 12 +++++++++---
+ gdk/wayland/meson.build  |  7 +------
+ gdk/win32/meson.build    |  2 +-
+ gdk/x11/meson.build      |  7 +------
+ 6 files changed, 14 insertions(+), 19 deletions(-)
+
+diff --git a/gdk/broadway/meson.build b/gdk/broadway/meson.build
+index ef7fa0ef589..f0a77b37c2d 100644
+--- a/gdk/broadway/meson.build
++++ b/gdk/broadway/meson.build
+@@ -52,8 +52,7 @@ broadwayjs_h = custom_target('broadwayjs.h',
+ )
+ 
+ libgdk_broadway = static_library('gdk-broadway',
+-  clienthtml_h, broadwayjs_h,
+-  gdk_broadway_sources, gdkconfig, gdkenum_h,
++  sources: [ clienthtml_h, broadwayjs_h, gdk_broadway_sources, gdk_gen_headers ],
+   include_directories: [confinc, gdkinc],
+   c_args: [
+     '-DGTK_COMPILATION',
+diff --git a/gdk/macos/meson.build b/gdk/macos/meson.build
+index b3baefb898e..d80334b8946 100644
+--- a/gdk/macos/meson.build
++++ b/gdk/macos/meson.build
+@@ -61,7 +61,7 @@ gdk_macos_deps = [
+ libgdk_c_args += ['-xobjective-c']
+ 
+ libgdk_macos = static_library('gdk-macos',
+-  gdk_macos_sources, gdkconfig, gdkenum_h,
++  sources: [ gdk_macos_sources, gdk_gen_headers ],
+   include_directories: [ confinc, gdkinc, ],
+   c_args: [ libgdk_c_args, common_cflags, ],
+   link_with: [],
+diff --git a/gdk/meson.build b/gdk/meson.build
+index 9c0a36e19ec..62e80ea6c44 100644
+--- a/gdk/meson.build
++++ b/gdk/meson.build
+@@ -202,7 +202,13 @@ gdkwayland_inc = include_directories('wayland')
+ wlinc = include_directories('.')
+ win32rcinc = include_directories('win32/rc')
+ 
+-gdk_gen_headers = [gdkenum_h, gdkmarshal_h, gdkconfig, gdkversionmacros_h, gdk_visibility_h]
++gdk_gen_headers = [
++  gdkenum_h,
++  gdkmarshal_h,
++  gdkconfig,
++  gdkversionmacros_h,
++  gdk_visibility_h,
++]
+ 
+ gdk_deps = [
+   libm,
+@@ -278,7 +284,7 @@ if gdk_backends.length() == 0
+ endif
+ 
+ libgdk = static_library('gdk',
+-  sources: [gdk_sources, gdk_backends_gen_headers, gdkconfig],
++  sources: [gdk_sources, gdk_backends_gen_headers, gdk_gen_headers],
+   dependencies: gdk_deps + [libgtk_css_dep],
+   link_with: [libgtk_css],
+   include_directories: [confinc, gdkx11_inc, wlinc],
+@@ -290,7 +296,7 @@ libgdk = static_library('gdk',
+ # list the dependencies and generated headers and such, for use in the
+ # "public" libgtk_dep used by internal executables.
+ libgdk_dep = declare_dependency(
+-  sources: ['gdk.h', gdkconfig, gdkenum_h],
++  sources: ['gdk.h', gdk_gen_headers],
+   include_directories: [confinc, gdkx11_inc, wlinc],
+   dependencies: gdk_deps + [libgtk_css_dep],
+ )
+diff --git a/gdk/wayland/meson.build b/gdk/wayland/meson.build
+index 00e584a1053..e7c1ac34103 100644
+--- a/gdk/wayland/meson.build
++++ b/gdk/wayland/meson.build
+@@ -117,12 +117,7 @@ foreach p: proto_sources
+ endforeach
+ 
+ libgdk_wayland = static_library('gdk-wayland',
+-  sources: [
+-    gdk_wayland_sources,
+-    gdk_wayland_gen_headers,
+-    gdkconfig,
+-    gdkenum_h,
+-  ],
++  sources: [ gdk_wayland_sources, gdk_wayland_gen_headers, gdk_gen_headers ],
+   include_directories: [ confinc, gdkinc, ],
+   c_args: [
+     '-DGTK_COMPILATION',
+diff --git a/gdk/win32/meson.build b/gdk/win32/meson.build
+index 3dc16aabb6c..cc56a15d95a 100644
+--- a/gdk/win32/meson.build
++++ b/gdk/win32/meson.build
+@@ -64,7 +64,7 @@ gdk_win32_deps = [
+ ]
+ 
+ libgdk_win32 = static_library('gdk-win32',
+-  gdk_win32_sources, gdkconfig, gdkenum_h,
++  sources: [ gdk_win32_sources, gdk_gen_headers ],
+   include_directories: [ confinc, gdkinc ],
+   c_args: [
+     '-DGTK_COMPILATION',
+diff --git a/gdk/x11/meson.build b/gdk/x11/meson.build
+index 013d8b1d00c..c9aa5383ab1 100644
+--- a/gdk/x11/meson.build
++++ b/gdk/x11/meson.build
+@@ -73,12 +73,7 @@ gdk_x11_deps = [
+ ]
+ 
+ libgdk_x11 = static_library('gdk-x11',
+-  sources: [
+-    gdkmarshal_h,
+-    gdkenum_h,
+-    gdkconfig,
+-    gdk_x11_sources,
+-  ],
++  sources: [ gdk_gen_headers, gdk_x11_sources ],
+   include_directories: [ confinc, gdkinc, ],
+   c_args: [
+     '-DGTK_COMPILATION',
+-- 
+GitLab
+
diff --git a/gui-libs/gtk/gtk-4.12.5-r1.ebuild b/gui-libs/gtk/gtk-4.12.5-r1.ebuild
deleted file mode 100644
index cd5ffd7bad88..000000000000
--- a/gui-libs/gtk/gtk-4.12.5-r1.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
-inherit gnome.org gnome2-utils meson optfeature python-any-r1 toolchain-funcs virtualx xdg
-
-DESCRIPTION="GTK is a multi-platform toolkit for creating graphical user interfaces"
-HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/GNOME/gtk/"
-
-LICENSE="LGPL-2+"
-SLOT="4"
-IUSE="aqua broadway cloudproviders colord cups examples ffmpeg gstreamer +introspection sysprof test vulkan wayland +X cpu_flags_x86_f16c"
-REQUIRED_USE="
-	|| ( aqua wayland X )
-	test? ( introspection )
-"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.76.0:2
-	>=x11-libs/cairo-1.17.6[aqua?,glib,svg(+),X?]
-	>=x11-libs/pango-1.50.0[introspection?]
-	>=dev-libs/fribidi-1.0.6
-	>=media-libs/harfbuzz-2.6.0:=
-	>=x11-libs/gdk-pixbuf-2.30:2[introspection?]
-	media-libs/libpng:=
-	media-libs/tiff:=
-	media-libs/libjpeg-turbo:=
-	>=media-libs/libepoxy-1.4[egl(+),X(+)?]
-	>=media-libs/graphene-1.10.0[introspection?]
-	app-text/iso-codes
-	x11-misc/shared-mime-info
-
-	cloudproviders? ( net-libs/libcloudproviders )
-	colord? ( >=x11-misc/colord-0.1.9:0= )
-	cups? ( >=net-print/cups-2.0 )
-	ffmpeg? ( media-video/ffmpeg:= )
-	gstreamer? (
-		>=media-libs/gst-plugins-bad-1.12.3:1.0
-		>=media-libs/gst-plugins-base-1.12.3:1.0[opengl]
-	)
-	introspection? ( >=dev-libs/gobject-introspection-1.76:= )
-	vulkan? ( media-libs/vulkan-loader:= )
-	wayland? (
-		>=dev-libs/wayland-1.21.0
-		>=dev-libs/wayland-protocols-1.31
-		media-libs/mesa[wayland]
-		>=x11-libs/libxkbcommon-0.2
-	)
-	X? (
-		>=app-accessibility/at-spi2-core-2.46.0
-		media-libs/fontconfig
-		media-libs/mesa[X(+)]
-		x11-libs/libX11
-		>=x11-libs/libXi-1.8
-		x11-libs/libXext
-		>=x11-libs/libXrandr-1.5
-		x11-libs/libXcursor
-		x11-libs/libXfixes
-		x11-libs/libXdamage
-		x11-libs/libXinerama
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	sysprof? ( >=dev-util/sysprof-capture-3.40.1:4 )
-	X? ( x11-base/xorg-proto )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-util/gtk-update-icon-cache-3
-"
-# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
-PDEPEND="
-	gnome-base/librsvg
-	>=x11-themes/adwaita-icon-theme-3.14
-"
-BDEPEND="
-	dev-libs/gobject-introspection-common
-	introspection? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep '
-			dev-python/pygobject:3[${PYTHON_USEDEP}]
-		')
-	)
-	dev-python/docutils
-	dev-libs/glib
-	>=dev-util/gdbus-codegen-2.48
-	dev-util/glib-utils
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-	vulkan? ( media-libs/shaderc )
-	wayland? (
-		dev-util/wayland-scanner
-	)
-	test? (
-		dev-libs/glib:2
-		media-fonts/cantarell
-		wayland? ( dev-libs/weston[headless] )
-	)
-"
-
-python_check_deps() {
-	python_has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
-}
-
-pkg_setup() {
-	use introspection && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	xdg_environment_reset
-
-	# Nothing should use gtk4-update-icon-cache and an unversioned one is shipped by dev-util/gtk-update-icon-cache
-	sed -i \
-		-e '/gtk4-update-icon-cache/d' \
-		docs/reference/gtk/meson.build \
-		tools/meson.build \
-		|| die
-
-	# The border-image-excess-size.ui test is known to fail on big-endian platforms
-	# See https://gitlab.gnome.org/GNOME/gtk/-/issues/5904
-	if [[ $(tc-endian) == big ]]; then
-		sed -i \
-			-e "/border-image-excess-size.ui/d" \
-			-e "/^xfails =/a 'border-image-excess-size.ui'," \
-			testsuite/reftests/meson.build || die
-	fi
-}
-
-src_configure() {
-	local emesonargs=(
-		# GDK backends
-		$(meson_use X x11-backend)
-		$(meson_use wayland wayland-backend)
-		$(meson_use broadway broadway-backend)
-		-Dwin32-backend=false
-		$(meson_use aqua macos-backend)
-
-		# Media backends
-		$(meson_feature ffmpeg media-ffmpeg)
-		$(meson_feature gstreamer media-gstreamer)
-
-		# Print backends
-		-Dprint-cpdb=disabled
-		$(meson_feature cups print-cups)
-
-		# Optional dependencies
-		$(meson_feature vulkan)
-		$(meson_feature cloudproviders)
-		$(meson_feature sysprof)
-		-Dtracker=disabled  # tracker3 is not packaged in Gentoo yet
-		$(meson_feature colord)
-		# Expected to fail with GCC < 11
-		# See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71993
-		$(meson_feature cpu_flags_x86_f16c f16c)
-
-		# Introspection
-		$(meson_feature introspection)
-
-		# Documentation
-		-Ddocumentation=false # we ship pregenerated API docs from tarball
-		-Dscreenshots=false
-		-Dman-pages=true
-
-		# Demos, examples, and tests
-		-Ddemo-profile=default
-		$(meson_use examples build-demos)
-		$(meson_use test build-testsuite)
-		$(meson_use examples build-examples)
-		-Dbuild-tests=false
-	)
-	meson_src_configure
-}
-
-src_test() {
-	"${BROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
-
-	if use X; then
-		einfo "Running tests under X"
-		GSETTINGS_SCHEMA_DIR="${S}/gtk" virtx meson_src_test --setup=x11 --timeout-multiplier=130
-	fi
-
-	if use wayland; then
-		einfo "Running tests under Weston"
-
-		export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
-
-		weston --backend=headless-backend.so --socket=wayland-5 --idle-time=0 &
-		compositor=$!
-		export WAYLAND_DISPLAY=wayland-5
-
-		GSETTINGS_SCHEMA_DIR="${S}/gtk" meson_src_test --setup=wayland --timeout-multiplier=130
-
-		exit_code=$?
-		kill ${compositor}
-	fi
-}
-
-src_install() {
-	meson_src_install
-
-	insinto /usr/share/gtk-doc/html
-	# This will install API docs specific to X11 and wayland regardless of USE flags, but this is intentional
-	doins -r "${S}"/docs/reference/{gtk/gtk4,gsk/gsk4,gdk/gdk4{,-wayland,-x11}}
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-
-	if ! has_version "app-text/evince"; then
-		elog "Please install app-text/evince for print preview functionality."
-		elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
-		elog "add it to your settings.ini file."
-	fi
-
-	if use examples ; then
-		optfeature "syntax highlighting in gtk4-demo" app-text/highlight
-	fi
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/gui-libs/gtk/gtk-4.12.5-r2.ebuild b/gui-libs/gtk/gtk-4.12.5-r2.ebuild
index ded47b8e3d93..976e4ff77b5f 100644
--- a/gui-libs/gtk/gtk-4.12.5-r2.ebuild
+++ b/gui-libs/gtk/gtk-4.12.5-r2.ebuild
@@ -106,6 +106,8 @@ PATCHES=(
 	# such support.
 	# https://bugs.gentoo.org/624960
 	"${FILESDIR}"/0001-gdk-add-a-poison-macro-to-hide-GDK_WINDOWING_.patch
+	# backport patch to fix race conditions in building generated headers
+	"${FILESDIR}"/6510b876d1cb5428db4822974cdebfed209692b0.patch
 )
 
 python_check_deps() {