chromium: add flag for qt

2 files changed, 35 insertions, 23 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 025574a..15b9042 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -21,4 +21,4 @@ AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9
 DIST chromium-107.0.5300.0.tar.xz 1689388040 BLAKE2B e9862c832bd7b0479cf8a720fc922f15f01b2492c0cee523523cfd7ace28ca6e1246d913bb57e5201a992085ace5697e1b94c97fa5fe3c05d0cb2fed241b0a09 SHA512 50e763f2054acb43172cf8e56c27640a407f1d516a5a48741213da9b838d29b5566c57d2c3f53b0b0c4ed25f203c96befe3fcd009aa564e7af2561439c5e164a
 DIST chromium-109.0.5396.2.tar.xz 1751362288 BLAKE2B 79e35f2273c32b12d00d97c7fb5565f51811f4dfdb135e2724df756d2fac0a3f2b5c03a9cdbeeef7b6273caf4ba61c9597700508ec7206321a9ef4f95a0fa3a8 SHA512 17d69a792fa43f0ea4648ae2d9e9bdf2fd972591c9974e1b884fbb04e455297770cabbc003dfaa8e902e4cbc5fdbd28314881f15beb49005a54b8fa3e7de09d5
 EBUILD chromium-107.0.5300.0.ebuild 32638 BLAKE2B ebd6e58489f093d16a01ddc72fb22c897ecfe5357d251741fe99e4154e979976421e278a3b7c6b72b9555c25d07d3e435518afaf49fb57fe2a933d45ec0299a9 SHA512 512c3a4f5cb1e817d298f704f75f44e04216d7da3fdcc0db3e4a1d91e2614744359d734d303775e0033c16fb96fc8ddc2d5963964cdea3e4ca01afea660e0856
-EBUILD chromium-109.0.5396.2.ebuild 32555 BLAKE2B c383d0d52b2d2f1737ef1f8b3f737f53e78b2cf1ba0c6c00538815e1a442804fbb3a500cd206dc9e85275c19fd290b3392aa419b8c9f2fcec13fd7b0cdf7c2f3 SHA512 855e09245997d56bcd1a3bebff1366adee444935b72f7caad4543ae4892a59b6dd12111cbf1b683ace81e85b275563f72402c345bdf4bfcd7c184e5f219d7253
+EBUILD chromium-109.0.5396.2.ebuild 33004 BLAKE2B cb81a035eea3a8d1124d1b673bc6cd2a3a0bc2fc2d4d923e4871005330854d88ab0273204ae6b2c014d9b62591b83aeea508f67ad177ef92dca9c1493105c00b SHA512 bd6d03e974990d5a456683fa37addbc3166fca679b75ae3feca53adc66e937303b5a3255d08c0cd9732db4b06f56dfe322218b65171c48f36237f4b02b96004e
diff --git a/www-client/chromium/chromium-109.0.5396.2.ebuild b/www-client/chromium/chromium-109.0.5396.2.ebuild
index e04afe4..bff25c5 100644
--- a/www-client/chromium/chromium-109.0.5396.2.ebuild
+++ b/www-client/chromium/chromium-109.0.5396.2.ebuild
@@ -9,7 +9,7 @@ CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu
 	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
 	sv sw ta te th tr uk ur vi zh-CN zh-TW"
 
-inherit check-reqs chromium-2 desktop flag-o-matic ninja-utils pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils
+inherit check-reqs chromium-2 desktop flag-o-matic ninja-utils pax-utils python-any-r1 qmake-utils readme.gentoo-r1 toolchain-funcs xdg-utils
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="https://chromium.org/"
@@ -18,7 +18,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx +official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine"
+IUSE="component-build cups cpu_flags_arm_neon debug gtk4 qt5 +hangouts headless +js-type-check kerberos libcxx +official pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine"
 REQUIRED_USE="
 	component-build? ( !suid !libcxx )
 	screencast? ( wayland )
@@ -98,6 +98,10 @@ COMMON_DEPEND="
 		virtual/udev
 		x11-libs/cairo:=
 		x11-libs/pango:=
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtwidgets:5
+		)
 	)
 "
 RDEPEND="${COMMON_DEPEND}
@@ -106,8 +110,9 @@ RDEPEND="${COMMON_DEPEND}
 			x11-libs/gtk+:3[X,wayland?]
 			gui-libs/gtk:4[X,wayland?]
 		)
+		qt5? ( dev-qt/qtgui:5[X?,wayland?] )
+		x11-misc/xdg-utils
 	)
-	x11-misc/xdg-utils
 	virtual/ttf-fonts
 	selinux? ( sec-policy/selinux-chromium )
 "
@@ -214,7 +219,7 @@ pkg_pretend() {
 	pre_build_checks
 
 	if use headless; then
-		local headless_unused_flags=("cups" "kerberos" "pulseaudio" "vaapi" "wayland")
+		local headless_unused_flags=("cups" "kerberos" "pulseaudio" "qt5" "vaapi" "wayland")
 		for myiuse in ${headless_unused_flags[@]}; do
 			use ${myiuse} && ewarn "Ignoring USE=${myiuse} since USE=headless is set."
 		done
@@ -805,25 +810,32 @@ src_configure() {
 	# Enable ozone wayland and/or headless support
 	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
 	myconf_gn+=" ozone_platform_headless=true"
-	myconf_gn+=" ozone_platform_x11=$(usex headless false true)"
-	if use wayland || use headless; then
-		if use headless; then
-			myconf_gn+=" ozone_platform=\"headless\""
-			myconf_gn+=" use_xkbcommon=false use_gtk=false"
-			myconf_gn+=" use_glib=false use_gio=false"
-			myconf_gn+=" use_pangocairo=false use_alsa=false"
-			myconf_gn+=" use_libpci=false use_udev=false"
-			myconf_gn+=" enable_print_preview=false"
-			myconf_gn+=" enable_remoting=false"
-		else
-			myconf_gn+=" ozone_platform_wayland=true"
-			myconf_gn+=" use_system_libdrm=true"
-			myconf_gn+=" use_system_minigbm=true"
-			myconf_gn+=" use_xkbcommon=true"
-			myconf_gn+=" ozone_platform=\"wayland\""
-		fi
+	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_pangocairo=false use_alsa=false"
+		myconf_gn+=" use_libpci=false use_udev=false"
+		myconf_gn+=" enable_print_preview=false"
+		myconf_gn+=" enable_remoting=false"
 	else
-		myconf_gn+=" ozone_platform=\"x11\""
+		myconf_gn+=" use_system_libdrm=true"
+		myconf_gn+=" use_system_minigbm=true"
+		myconf_gn+=" use_xkbcommon=true"
+		use qt5 && export PATH="${PATH}:$(qt5_get_bindir)"
+		myconf_gn+=" use_qt=$(usex qt5 true false)"
+		myconf_gn+=" ozone_platform_x11=$(usex X true false)"
+		myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"
+		myconf_gn+=" ozone_platform=$(usex wayland \"wayland\" \"x11\")"
+		if use wayland; then
+			myconf_gn+=" use_system_libwayland_server=true"
+			myconf_gn+=" use_system_wayland_scanner=true"
+		fi
+	fi
+
+	# Results in undefined references in chrome linking, may require CFI to work
+	if use arm64; then
+		myconf_gn+=" arm_control_flow_integrity=\"none\""
 	fi
 
 	# Enable official builds