www-client/ungoogled-chromium : version bump

4 files changed, 31 insertions, 12 deletions

diff --git a/metadata/md5-cache/www-client/ungoogled-chromium-122.0.6261.111 b/metadata/md5-cache/www-client/ungoogled-chromium-122.0.6261.128
index 2e111b39..7b442eb8 100644
--- a/metadata/md5-cache/www-client/ungoogled-chromium-122.0.6261.111
+++ b/metadata/md5-cache/www-client/ungoogled-chromium-122.0.6261.128
@@ -2,13 +2,13 @@ DEFINED_PHASES=install postinst postrm
 DESCRIPTION=Modifications to Chromium for removing Google integration and enhancing privacy
 EAPI=8
 HOMEPAGE=https://www.chromium.org/Home https://github.com/ungoogled-software/ungoogled-chromium
-INHERIT=desktop readme.gentoo-r1 xdg-utils
-IUSE=+widevine
+INHERIT=desktop pax-utils readme.gentoo-r1 xdg-utils
+IUSE=qt5 qt6 +suid +widevine
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=app-accessibility/at-spi2-core dev-libs/expat dev-libs/glib:2 dev-libs/libxslt dev-libs/nspr >=dev-libs/icu-71.1:= >=dev-libs/libxml2-2.9.4-r3[icu] >=dev-libs/nss-3.26 media-libs/fontconfig media-libs/freetype media-libs/libjpeg-turbo media-libs/libpng media-libs/libpulse media-libs/libva media-libs/lcms media-libs/flac >=media-libs/alsa-lib-1.0.19 >=media-libs/libwebp-0.4.0 >=net-print/cups-1.3.11 sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] x11-libs/cairo x11-libs/pango x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxcb >=x11-libs/libXi-1.6.0 virtual/udev widevine? ( www-plugins/chrome-binary-plugins ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts !www-client/chromium
+RDEPEND=app-accessibility/at-spi2-core dev-libs/expat dev-libs/glib:2 dev-libs/libxslt dev-libs/nspr >=dev-libs/icu-71.1:= >=dev-libs/libxml2-2.9.4-r3[icu] >=dev-libs/nss-3.26 media-libs/fontconfig media-libs/freetype media-libs/libjpeg-turbo media-libs/libpng media-libs/libpulse media-libs/libva media-libs/lcms media-libs/flac >=media-libs/alsa-lib-1.0.19 >=media-libs/libwebp-0.4.0 >=net-print/cups-1.3.11 sys-apps/dbus sys-apps/pciutils sys-libs/zlib[minizip] x11-libs/cairo x11-libs/pango x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/libxcb >=x11-libs/libXi-1.6.0 virtual/udev qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5[X] dev-qt/qtwidgets:5 ) qt6? ( dev-qt/qtbase:6[gui,widgets] ) widevine? ( www-plugins/chrome-binary-plugins ) x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts !www-client/chromium
 RESTRICT=binchecks mirror strip
 SLOT=0
-SRC_URI=http://mirrors.redcorelinux.org/redcorelinux/amd64/distfiles/ungoogled-chromium_122.0.6261.111-1_linux.tar.xz
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	xdg-utils	baea6080dd821f5562d715887954c9d3
-_md5_=79cf0d4b47dd9b5bfa15437964cece70
+SRC_URI=http://mirrors.redcorelinux.org/redcorelinux/amd64/distfiles/ungoogled-chromium_122.0.6261.128-1_linux.tar.xz
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	pax-utils	91d47e5d20627c717aa878b9167c62a8	readme.gentoo-r1	204091a2cde6179cd9d3db26d09412d3	xdg-utils	baea6080dd821f5562d715887954c9d3
+_md5_=c897c50cb9f0c11e5079f48ea4a5e544
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 851a6d84..bf75ae94 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -80,7 +80,7 @@ virtual/logger 1.314.1337: Virtual for system loggers
 virtual/notification-daemon 1.334.1337: Virtual (dummy package) for notification daemon dbus service
 virtual/tmpfiles 1.314.1337-r1: Virtual to select between different tmpfiles.d handlers
 virtual/udev 314.1337-r1: Virtual to select between different udev daemon providers
-www-client/ungoogled-chromium 122.0.6261.111: Modifications to Chromium for removing Google integration and enhancing privacy
+www-client/ungoogled-chromium 122.0.6261.128: Modifications to Chromium for removing Google integration and enhancing privacy
 x11-base/xorg-drivers 21.1-r100: Meta package containing deps on all xorg drivers (dummy package)
 x11-drivers/nvidia-drivers 390.157-r6 470.223.02 535.154.05: NVIDIA Accelerated Graphics Driver
 x11-libs/gtk+ 2.24.33-r5 3.24.40-r1: Gimp ToolKit +
diff --git a/www-client/ungoogled-chromium/Manifest b/www-client/ungoogled-chromium/Manifest
index 45569501..2a6da07b 100644
--- a/www-client/ungoogled-chromium/Manifest
+++ b/www-client/ungoogled-chromium/Manifest
@@ -1 +1 @@
-DIST ungoogled-chromium_122.0.6261.111-1_linux.tar.xz 125795832 BLAKE2B 787c307c0f6442347c08b1f6137b114661711248b0e879610028d3d70b27a5031fc1485fb1befd7e20748b3ec2fad40196a2e2e3844042fd7c3cee8ac729f661 SHA512 7221b219e05664006507acc160fd13ea4c254fd7f91535120829ef9099c9c981f12b036cda5a298620abbe379a5ffa8a4812c6356dcc9639ad2cb3f7a27a86e8
+DIST ungoogled-chromium_122.0.6261.128-1_linux.tar.xz 125788468 BLAKE2B 61a79d6d27c14ce1898b66050beb673d36faef7e60a6ec51adad852f542981a48df8c04f9d79bd62b8d7897354ee9e4cc02d975ef95897e50d2223d636539462 SHA512 fb657e8a9bd75a8849255035a4ff34cc7a4f7b7dfde94d0584331289c40100135273e12e5d83a6f9d594247c87b23762ff246426a9f09fc31f5f293155c5f811
diff --git a/www-client/ungoogled-chromium/ungoogled-chromium-122.0.6261.111.ebuild b/www-client/ungoogled-chromium/ungoogled-chromium-122.0.6261.128.ebuild
index 17d2b2e7..940d6a90 100644
--- a/www-client/ungoogled-chromium/ungoogled-chromium-122.0.6261.111.ebuild
+++ b/www-client/ungoogled-chromium/ungoogled-chromium-122.0.6261.128.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit desktop readme.gentoo-r1 xdg-utils
+inherit desktop pax-utils readme.gentoo-r1 xdg-utils
 
 DESCRIPTION="Modifications to Chromium for removing Google integration and enhancing privacy"
 HOMEPAGE="https://www.chromium.org/Home https://github.com/ungoogled-software/ungoogled-chromium"
@@ -13,7 +13,7 @@ RESTRICT="binchecks mirror strip"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+widevine"
+IUSE="qt5 qt6 +suid +widevine"
 
 CDEPEND="
 	app-accessibility/at-spi2-core
@@ -53,6 +53,12 @@ CDEPEND="
 	x11-libs/libxcb
 	>=x11-libs/libXi-1.6.0
 	virtual/udev
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5[X]
+		dev-qt/qtwidgets:5
+	)
+	qt6? ( dev-qt/qtbase:6[gui,widgets] )
 	widevine? ( www-plugins/chrome-binary-plugins )
 "
 
@@ -94,9 +100,7 @@ src_install() {
 	for i in chrome chrome_crashpad_handler chromedriver chrome_sandbox chrome-wrapper xdg-mime xdg-settings; do
 		doexe $i || die
 	done
-
 	doexe "${FILESDIR}"/chromium-launcher.sh
-	fperms 4711 "${CHROMIUM_HOME}"/chrome_sandbox
 
 	insinto "${CHROMIUM_HOME}"
 	for i in *.bin *.pak *.so *.so.1 icudtl.dat; do
@@ -113,10 +117,25 @@ src_install() {
 	insinto /etc/chromium
 	newins "${FILESDIR}"/chromium.default default
 
+	if ! use qt5; then
+		rm "${ED}"/"${CHROMIUM_HOME}"/libqt5_shim.so || die
+	else
+		fperms 0755 "${CHROMIUM_HOME}"/libqt5_shim.so || die
+	fi
+
+	if ! use qt6; then
+		rm "${ED}"/"${CHROMIUM_HOME}"/libqt6_shim.so || die
+	else
+		fperms 0755 "${CHROMIUM_HOME}"/libqt6_shim.so || die
+	fi
+
 	if use widevine; then
 		dosym ../../usr/$(get_libdir)/chromium-browser/WidevineCdm "${CHROMIUM_HOME}"/WidevineCdm
 	fi
 
+	pax-mark m "${CHROMIUM_HOME}"/chrome
+	use suid && fperms 4711 "${CHROMIUM_HOME}"/chrome_sandbox
+
 	newicon -s 48 product_logo_48.png chromium-browser.png
 
 	local mime_types="text/html;text/xml;application/xhtml+xml;"