[patch] Adjust ebuild an GN files to make gtk, glib/gio and atk optional

chromium-gtk_glib_atk_optional.patch (text/plain), 5.67 KB, created by Steffen Hau on 2024-03-15 08:29:45 UTC

commit 62c5baa9f89cf8c7e2f43f688b1a4991c9b55c08
Author: Steffen Hau <[e-mail]>
Date:   Mon Mar 11 22:31:11 2024 +0100

    make support for glib/gio, gtk and atk/atspi configurable
    - enabling screencast leads to -DWEBRTC_USE_GIO which leads to compile errors if use_gio=false
    - use_atk requires use_glib
    - x11-libs/(cairo,gdk-pixbuf,pango) is not needed for a pure Qt build

diff --git a/www-client/chromium/chromium-123.0.6312.46.ebuild b/www-client/chromium/chromium-123.0.6312.46.ebuild
index 190b384..a2b8fd4 100644
--- a/www-client/chromium/chromium-123.0.6312.46.ebuild
+++ b/www-client/chromium/chromium-123.0.6312.46.ebuild
@@ -78,12 +78,14 @@ LICENSE="BSD"
 SLOT="0/beta"
 KEYWORDS="~amd64 ~arm64"
 IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"
-IUSE="+X ${IUSE_SYSTEM_LIBS} cups debug gtk4 +hangouts headless kerberos libcxx lto +official pax-kernel pgo +proprietary-codecs pulseaudio"
+IUSE="+X ${IUSE_SYSTEM_LIBS} accessibility cups debug glib gtk gtk4 +hangouts headless kerberos"
+IUSE+=" libcxx lto +official pax-kernel pgo +proprietary-codecs pulseaudio"
 IUSE+=" qt5 qt6 screencast selinux +system-toolchain vaapi wayland widevine"
 REQUIRED_USE="
+	accessibility? ( glib )
 	!headless? ( || ( X wayland ) )
 	pgo? ( X !wayland )
-	screencast? ( wayland )
+	screencast? ( glib wayland )
 	!system-toolchain? ( libcxx )
 "
 
@@ -117,7 +119,7 @@ COMMON_SNAPSHOT_DEPEND="
 	sys-libs/zlib:=
 	x11-libs/libdrm:=
 	!headless? (
-		dev-libs/glib:2
+		glib? ( dev-libs/glib:2 )
 		>=media-libs/alsa-lib-1.0.19:=
 		pulseaudio? ( media-libs/libpulse:= )
 		sys-apps/pciutils:=
@@ -147,13 +149,20 @@ COMMON_DEPEND="
 	sys-libs/zlib:=[minizip]
 	!headless? (
 		X? ( ${COMMON_X_DEPEND} )
-		>=app-accessibility/at-spi2-core-2.46.0:2
+		accessibility? ( >=app-accessibility/at-spi2-core-2.46.0:2 )
 		media-libs/mesa:=[X?,wayland?]
 		cups? ( >=net-print/cups-1.3.11:= )
 		virtual/udev
-		x11-libs/cairo:=
-		x11-libs/gdk-pixbuf:2
-		x11-libs/pango:=
+		gtk? (
+			x11-libs/cairo:=
+			x11-libs/gdk-pixbuf:2
+			x11-libs/pango:=
+		)
+		gtk4? (
+			x11-libs/cairo:=
+			x11-libs/gdk-pixbuf:2
+			x11-libs/pango:=
+		)
 		qt5? (
 			dev-qt/qtcore:5
 			dev-qt/qtwidgets:5
@@ -163,10 +172,8 @@ COMMON_DEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
 	!headless? (
-		|| (
-			x11-libs/gtk+:3[X?,wayland?]
-			gui-libs/gtk:4[X?,wayland?]
-		)
+		gtk? ( x11-libs/gtk+:3[X?,wayland?] )
+		gtk4? ( gui-libs/gtk:4[X?,wayland?] )
 		qt5? ( dev-qt/qtgui:5[X?,wayland?] )
 		qt6? ( dev-qt/qtbase:6[gui,X?,wayland?] )
 	)
@@ -175,10 +182,10 @@ RDEPEND="${COMMON_DEPEND}
 "
 DEPEND="${COMMON_DEPEND}
 	!headless? (
+		gtk? ( x11-libs/gtk+:3[X?,wayland?] )
 		gtk4? ( gui-libs/gtk:4[X?,wayland?] )
 		qt5? ( dev-qt/qtgui:5[X?,wayland?] )
 		qt6? ( dev-qt/qtbase:6[gui,X?,wayland?] )
-		!gtk4? ( x11-libs/gtk+:3[X?,wayland?] )
 	)
 "
 
@@ -342,7 +349,7 @@ pkg_pretend() {
 	pre_build_checks
 
 	if use headless; then
-		local headless_unused_flags=("cups" "kerberos" "pulseaudio" "qt5" "qt6" "vaapi" "wayland")
+		local headless_unused_flags=("cups" "kerberos" "pulseaudio" "glib" "gtk" "gtk4" "qt5" "qt6" "vaapi" "wayland")
 		for myiuse in ${headless_unused_flags[@]}; do
 			use ${myiuse} && ewarn "Ignoring USE=${myiuse} since USE=headless is set."
 		done
@@ -399,6 +406,7 @@ src_prepare() {
 		"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
 		"${FILESDIR}/chromium-117-system-zstd.patch"
 		"${FILESDIR}/chromium-123-separate-qt56.patch"
+		"${FILESDIR}/chromium-123-optional-glib_gio_gtk_atk.patch"
 	)
 
 	if use system-toolchain; then
@@ -908,7 +916,6 @@ chromium_configure() {
 		myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
 		myconf_gn+=" use_vaapi=$(usex vaapi true false)"
 		myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"
-		myconf_gn+=" gtk_version=$(usex gtk4 4 3)"
 	fi
 
 	# Allows distributions to link pulseaudio directly (DT_NEEDED) instead of
@@ -1044,7 +1051,7 @@ chromium_configure() {
 	if use headless; then
 		myconf_gn+=" ozone_platform=\"headless\""
 		myconf_gn+=" use_xkbcommon=false use_gtk=false use_qt=false"
-		myconf_gn+=" use_glib=false use_gio=false"
+		myconf_gn+=" use_glib=false use_gio=false use_atk=false"
 		myconf_gn+=" use_pangocairo=false use_alsa=false"
 		myconf_gn+=" use_libpci=false use_udev=false"
 		myconf_gn+=" enable_print_preview=false"
@@ -1053,6 +1060,15 @@ chromium_configure() {
 		myconf_gn+=" use_system_libdrm=true"
 		myconf_gn+=" use_system_minigbm=true"
 		myconf_gn+=" use_xkbcommon=true"
+		myconf_gn+=" use_glib=$(usex glib true false)"
+		myconf_gn+=" use_gio=$(usex glib true false)"
+		myconf_gn+=" use_atk=$(usex accessibility true false)"
+		if use gtk || use gtk4; then
+			myconf_gn+=" use_gtk=true"
+			myconf_gn+=" gtk_version=$(usex gtk4 4 3)"
+		else
+			myconf_gn+=" use_gtk=false"
+		fi
 		if use qt5 || use qt6; then
 			local cbuild_libdir=$(get_libdir)
 			if tc-is-cross-compiler; then
diff --git a/www-client/chromium/files/chromium-123-optional-glib_gio_gtk_atk.patch b/www-client/chromium/files/chromium-123-optional-glib_gio_gtk_atk.patch
new file mode 100644
index 0000000..428ec24
--- /dev/null
+++ b/www-client/chromium/files/chromium-123-optional-glib_gio_gtk_atk.patch
@@ -0,0 +1,15 @@
+diff -Naur a/build/config/ui.gni b/build/config/ui.gni
+--- a/build/config/ui.gni	2024-03-06 22:40:09.078377700 +0100
++++ b/build/config/ui.gni	2024-03-11 22:19:38.723101211 +0100
+@@ -41,7 +41,10 @@
+ 
+ assert(!use_glib || (is_linux && !is_castos))
+ 
+-use_atk = use_glib && current_toolchain == default_toolchain
++declare_args() {
++  # True means accessibility via atk/atspi is enabled
++  use_atk = use_glib && current_toolchain == default_toolchain
++}
+ 
+ # Whether using Xvfb to provide a display server for a test might be
+ # necessary.