Attachment #887674 for bug #926166




SLOT="0/beta"
KEYWORDS="~amd64 ~arm64"
IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"
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? ( glib wayland )
	!system-toolchain? ( libcxx )
"


	sys-libs/zlib:=
	x11-libs/libdrm:=
	!headless? (
		glib? ( dev-libs/glib:2 )
		>=media-libs/alsa-lib-1.0.19:=
		pulseaudio? ( media-libs/libpulse:= )
		sys-apps/pciutils:=

	sys-libs/zlib:=[minizip]
	!headless? (
		X? ( ${COMMON_X_DEPEND} )
		accessibility? ( >=app-accessibility/at-spi2-core-2.46.0:2 )
		media-libs/mesa:=[X?,wayland?]
		cups? ( >=net-print/cups-1.3.11:= )
		virtual/udev
		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

"
RDEPEND="${COMMON_DEPEND}
	!headless? (
		gtk? ( x11-libs/gtk+:3[X?,wayland?] )
		gtk4? ( gui-libs/gtk:4[X?,wayland?] )
			gui-libs/gtk:4[X?,wayland?]
		)
		qt5? ( dev-qt/qtgui:5[X?,wayland?] )
		qt6? ( dev-qt/qtbase:6[gui,X?,wayland?] )
	)

"
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?] )
	)
"


	pre_build_checks

	if use headless; then
		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

		"${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

		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

	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 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"

		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

Return to bug 926166

Lines 78-89 LICENSE="BSD" Link Here

(-)a/www-client/chromium/chromium-123.0.6312.46.ebuild (-15 / +31 lines)
78	SLOT="0/beta"	78	SLOT="0/beta"
79	KEYWORDS="~amd64 ~arm64"	79	KEYWORDS="~amd64 ~arm64"
80	IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"	80	IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"
81	IUSE="+X ${IUSE_SYSTEM_LIBS} cups debug gtk4 +hangouts headless kerberos libcxx lto +official pax-kernel pgo +proprietary-codecs pulseaudio"	81	IUSE="+X ${IUSE_SYSTEM_LIBS} accessibility cups debug glib gtk gtk4 +hangouts headless kerberos"
		82	IUSE+=" libcxx lto +official pax-kernel pgo +proprietary-codecs pulseaudio"
82	IUSE+=" qt5 qt6 screencast selinux +system-toolchain vaapi wayland widevine"	83	IUSE+=" qt5 qt6 screencast selinux +system-toolchain vaapi wayland widevine"
83	REQUIRED_USE="	84	REQUIRED_USE="
		85	accessibility? ( glib )
84	!headless? ( \|\| ( X wayland ) )	86	!headless? ( \|\| ( X wayland ) )
85	pgo? ( X !wayland )	87	pgo? ( X !wayland )
86	screencast? ( wayland )	88	screencast? ( glib wayland )
87	!system-toolchain? ( libcxx )	89	!system-toolchain? ( libcxx )
88	"	90	"
89		91
Lines 117-123 COMMON_SNAPSHOT_DEPEND=" Link Here
117	sys-libs/zlib:=	119	sys-libs/zlib:=
118	x11-libs/libdrm:=	120	x11-libs/libdrm:=
119	!headless? (	121	!headless? (
120	dev-libs/glib:2	122	glib? ( dev-libs/glib:2 )
121	>=media-libs/alsa-lib-1.0.19:=	123	>=media-libs/alsa-lib-1.0.19:=
122	pulseaudio? ( media-libs/libpulse:= )	124	pulseaudio? ( media-libs/libpulse:= )
123	sys-apps/pciutils:=	125	sys-apps/pciutils:=
Lines 147-159 COMMON_DEPEND=" Link Here
147	sys-libs/zlib:=[minizip]	149	sys-libs/zlib:=[minizip]
148	!headless? (	150	!headless? (
149	X? ( ${COMMON_X_DEPEND} )	151	X? ( ${COMMON_X_DEPEND} )
150	>=app-accessibility/at-spi2-core-2.46.0:2	152	accessibility? ( >=app-accessibility/at-spi2-core-2.46.0:2 )
151	media-libs/mesa:=[X?,wayland?]	153	media-libs/mesa:=[X?,wayland?]
152	cups? ( >=net-print/cups-1.3.11:= )	154	cups? ( >=net-print/cups-1.3.11:= )
153	virtual/udev	155	virtual/udev
154	x11-libs/cairo:=	156	gtk? (
155	x11-libs/gdk-pixbuf:2	157	x11-libs/cairo:=
156	x11-libs/pango:=	158	x11-libs/gdk-pixbuf:2
		159	x11-libs/pango:=
		160	)
		161	gtk4? (
		162	x11-libs/cairo:=
		163	x11-libs/gdk-pixbuf:2
		164	x11-libs/pango:=
		165	)
157	qt5? (	166	qt5? (
158	dev-qt/qtcore:5	167	dev-qt/qtcore:5
159	dev-qt/qtwidgets:5	168	dev-qt/qtwidgets:5
Lines 163-172 COMMON_DEPEND=" Link Here
163	"	172	"
164	RDEPEND="${COMMON_DEPEND}	173	RDEPEND="${COMMON_DEPEND}
165	!headless? (	174	!headless? (
166	\|\| (	175	gtk? ( x11-libs/gtk+:3[X?,wayland?] )
167	x11-libs/gtk+:3[X?,wayland?]	176	gtk4? ( gui-libs/gtk:4[X?,wayland?] )
168	gui-libs/gtk:4[X?,wayland?]
169	)
170	qt5? ( dev-qt/qtgui:5[X?,wayland?] )	177	qt5? ( dev-qt/qtgui:5[X?,wayland?] )
171	qt6? ( dev-qt/qtbase:6[gui,X?,wayland?] )	178	qt6? ( dev-qt/qtbase:6[gui,X?,wayland?] )
172	)	179	)
Lines 175-184 RDEPEND="${COMMON_DEPEND} Link Here
175	"	182	"
176	DEPEND="${COMMON_DEPEND}	183	DEPEND="${COMMON_DEPEND}
177	!headless? (	184	!headless? (
		185	gtk? ( x11-libs/gtk+:3[X?,wayland?] )
178	gtk4? ( gui-libs/gtk:4[X?,wayland?] )	186	gtk4? ( gui-libs/gtk:4[X?,wayland?] )
179	qt5? ( dev-qt/qtgui:5[X?,wayland?] )	187	qt5? ( dev-qt/qtgui:5[X?,wayland?] )
180	qt6? ( dev-qt/qtbase:6[gui,X?,wayland?] )	188	qt6? ( dev-qt/qtbase:6[gui,X?,wayland?] )
181	!gtk4? ( x11-libs/gtk+:3[X?,wayland?] )
182	)	189	)
183	"	190	"
184		191
Lines 342-348 pkg_pretend() { Link Here
342	pre_build_checks	349	pre_build_checks
343		350
344	if use headless; then	351	if use headless; then
345	local headless_unused_flags=("cups" "kerberos" "pulseaudio" "qt5" "qt6" "vaapi" "wayland")	352	local headless_unused_flags=("cups" "kerberos" "pulseaudio" "glib" "gtk" "gtk4" "qt5" "qt6" "vaapi" "wayland")
346	for myiuse in ${headless_unused_flags[@]}; do	353	for myiuse in ${headless_unused_flags[@]}; do
347	use ${myiuse} && ewarn "Ignoring USE=${myiuse} since USE=headless is set."	354	use ${myiuse} && ewarn "Ignoring USE=${myiuse} since USE=headless is set."
348	done	355	done
Lines 399-404 src_prepare() { Link Here
399	"${FILESDIR}/chromium-111-InkDropHost-crash.patch"	406	"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
400	"${FILESDIR}/chromium-117-system-zstd.patch"	407	"${FILESDIR}/chromium-117-system-zstd.patch"
401	"${FILESDIR}/chromium-123-separate-qt56.patch"	408	"${FILESDIR}/chromium-123-separate-qt56.patch"
		409	"${FILESDIR}/chromium-123-optional-glib_gio_gtk_atk.patch"
402	)	410	)
403		411
404	if use system-toolchain; then	412	if use system-toolchain; then
Lines 908-914 chromium_configure() { Link Here
908	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"	916	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
909	myconf_gn+=" use_vaapi=$(usex vaapi true false)"	917	myconf_gn+=" use_vaapi=$(usex vaapi true false)"
910	myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"	918	myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"
911	myconf_gn+=" gtk_version=$(usex gtk4 4 3)"
912	fi	919	fi
913		920
914	# Allows distributions to link pulseaudio directly (DT_NEEDED) instead of	921	# Allows distributions to link pulseaudio directly (DT_NEEDED) instead of
Lines 1044-1050 chromium_configure() { Link Here
1044	if use headless; then	1051	if use headless; then
1045	myconf_gn+=" ozone_platform=\"headless\""	1052	myconf_gn+=" ozone_platform=\"headless\""
1046	myconf_gn+=" use_xkbcommon=false use_gtk=false use_qt=false"	1053	myconf_gn+=" use_xkbcommon=false use_gtk=false use_qt=false"
1047	myconf_gn+=" use_glib=false use_gio=false"	1054	myconf_gn+=" use_glib=false use_gio=false use_atk=false"
1048	myconf_gn+=" use_pangocairo=false use_alsa=false"	1055	myconf_gn+=" use_pangocairo=false use_alsa=false"
1049	myconf_gn+=" use_libpci=false use_udev=false"	1056	myconf_gn+=" use_libpci=false use_udev=false"
1050	myconf_gn+=" enable_print_preview=false"	1057	myconf_gn+=" enable_print_preview=false"
Lines 1053-1058 chromium_configure() { Link Here
1053	myconf_gn+=" use_system_libdrm=true"	1060	myconf_gn+=" use_system_libdrm=true"
1054	myconf_gn+=" use_system_minigbm=true"	1061	myconf_gn+=" use_system_minigbm=true"
1055	myconf_gn+=" use_xkbcommon=true"	1062	myconf_gn+=" use_xkbcommon=true"
		1063	myconf_gn+=" use_glib=$(usex glib true false)"
		1064	myconf_gn+=" use_gio=$(usex glib true false)"
		1065	myconf_gn+=" use_atk=$(usex accessibility true false)"
		1066	if use gtk \|\| use gtk4; then
		1067	myconf_gn+=" use_gtk=true"
		1068	myconf_gn+=" gtk_version=$(usex gtk4 4 3)"
		1069	else
		1070	myconf_gn+=" use_gtk=false"
		1071	fi
1056	if use qt5 \|\| use qt6; then	1072	if use qt5 \|\| use qt6; then
1057	local cbuild_libdir=$(get_libdir)	1073	local cbuild_libdir=$(get_libdir)
1058	if tc-is-cross-compiler; then	1074	if tc-is-cross-compiler; then