gentoo auto-resync : 25:11:2022 - 19:13:11

2 files changed, 35 insertions, 20 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index d318d8c96bb6..f360e8914034 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -16,18 +16,16 @@ AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9
 AUX ppc64le/fix-breakpad-compile.patch 1601 BLAKE2B 7c409ab3bab2d63870066512c42a1656f5a1ab4eefcad44e57ac045cb0f11519f5c1f0a589124c2bf217c35dd185d240d46de1c43bda566737fb15cfecb95feb SHA512 bab0b8c5419403ac680010644652bafba6cfc4c9312221628b2ba0301d0c296eddeafa4623dbe2a1c2335d0ea6c5613bff02b5ece1d423ceec4eee119515686c
 AUX ppc64le/fix-swiftshader-compile.patch 1112 BLAKE2B fdef119a93c67ce7864a312ef6b49ee71d9baa5a96a09a17d236dbee7d17dec5b3461fba458af0b7d218057418bc17c0bf27992be8b1835cdcb37da4e35ec9bc SHA512 24e92475282972427a4961279544c2c37b1d6f7fca3490d82f8f5cbd411008e598f4e497f99b4cd091025f053b25d02eb601542da5c10a79af240f655e78efe0
 AUX ppc64le/libpng-pdfium-compile-98.patch 412 BLAKE2B 0a2907e1c01696fb41b039de139ab934af9af3c2a9f8257fe10a84fd0b41d52ca79150ad996d140be0dac30fc9a0dd5f83ec8fa3cd4dc7e0dcf38fab99a20f55 SHA512 c4693f612191f73205630dedd77ecdf345f094468a8ac31ab39ad1155ab0026f782d1fe30a3a63999790c7cfa6d9061e0f9c011f9dc1f9f5fe7562217a2aedfa
-DIST chromium-106-patchset-3.tar.xz 6672 BLAKE2B 4c56702e84c761b5b4e5ea84a3e9bed0c9c81cbf448998c51b149a5f3b745944e8c824384a879798fba284eb96d76ebbc22ce038971daf9a574ea02d52f204b5 SHA512 3e58bf2811a6674bbe04ab12c0404faad5e6b17c7a5de213e661a7cc34dd4c3329b8736e3b1ffd43a442eae4ad132ff05b042ef904d451bbe0c9a76554499b61
-DIST chromium-106.0.5249.119.tar.xz 1611067204 BLAKE2B 39132fbb82cfd46e631ce77ae0334756d23f7b870b8ab2d2adac206cd754e229c8f10ed73a08bd64c8868b85e47f27f03089bbdba028a9d537daf95165814843 SHA512 9f2d01c9a670a36eff3de4423a7cf3b59b10053e17275646cff7438ce02c5b96b6d79640d5e58b499c419e019f09442bec7ecbd9e6b1cbd7632f9eb864d4f138
 DIST chromium-107-patchset-1.tar.xz 5736 BLAKE2B 581ca307d63635ef91aaa907aeebb8c735be6d6bbfcc3fe064fed7531b8848b5d918e017031ee606ed3bd8f0fc23aa6d2f8af4b36d33483dbeee2b5c8eacac82 SHA512 acbfb41c31a510a689cad3b0686e24925b018bd7a2a8f56f74b730dc36d878c266a11b3bb76b131e66f7b859f483ff00e16cbaae1b2b6944010c7396310c03b8
 DIST chromium-107.0.5304.110.tar.xz 1688613008 BLAKE2B b595b34fdf709e89a38cae61d4476dcdb6730502bb631caed452d6efee61b2e052b6ce7f3440233ceb454ecdfeb07b0a01727173cdd94e00282552001e34f81d SHA512 f137e617026b5d4799e8be00c4a7a82e4164a4a505982f1fb731c01abecb378d9f6d7a41b015d7d118a2acb50983456c5dec9a7f3009d6af9e097369a52a9e19
+DIST chromium-107.0.5304.121.tar.xz 1688476176 BLAKE2B f36a74dba65c50accceb13d6bae767960dc8764ac22292c8db860b87197dc00c3ae2b5176d5f391c98e8a332ab1bcda506b4760e95be9aab7926c3a38f8a0410 SHA512 c0d233ed18d95554d5b05102b24d92711b940f3897fd5252422d10bf1e8500c3875033aa4a211a11fd9b01ca5e65bd487aa0b0814da70a337a692d3cefb74081
 DIST chromium-107.0.5304.87.tar.xz 1688896996 BLAKE2B bca3506b55f29be6d40db8d4b1350a1703b1899136a2d66159619c202a37e6bf0d35fa21f79125c21bd079ed8002a6e41721f31578c7c48b12e1c4084a1e0b34 SHA512 9db2f8ea4f4f0c2a9791d1e03552f7fc3843338f1272975593347cdf85db283f55ad84fdda564609d52d95c36f4de8d662d24df7cc2e6dcf69d184765469233a
 DIST chromium-108-patchset-2.tar.xz 6480 BLAKE2B 2a40bb741fdd305b3525b790f82c2b36f6c909680788527a31aa2a11f519ff630aa12ffe7c53553b717f1909978c77e7db07a02a86c8e7d12d63375402802d7a SHA512 3fe182f0f928baaf0f5521efa8763080de765240b5608d5126e84e49335eb5edc788ab406aa71f5fa97c371afe1f6808e93e2e082c7f65169b5f157ff6c3e00b
 DIST chromium-108.0.5343.2.tar.xz 1669214708 BLAKE2B e022bb908b15a5ae645d23cc5ab1e268ab87b77af3ae9ac352f6dc2fc9ba36f9e212cd53f4e3fdb18bb114f89ffada3f0fbee2b2fd46b6824fccaa68e21d930a SHA512 ff74eae98a44ebfc77a729ee65b4d338fcc39f04f2168247eed039d5c19c945d90c2b6aa5a12ca96d493c5116c2dcf9c959c74ffe2dc25ea6717176f699342b2
 DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d SHA512 9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c
-DIST chromium_106.0.5249.103-1raptor1~deb11u2.debian.tar.xz 439832 BLAKE2B cda87c0500c1ea0d6a11767d350d41462070ccc74dc8fd18f7099c56853dfa375d5894657c915a5780b4fa297d3f7119da1ac7b4e83eccc76d94aeb275bc85c4 SHA512 8c84bf52c701b6c5f6ead53087dcc6232841e52c2a03dc31f7a3b2eaa0e694cad30fa8c8f0332ebd23fc79a526c1b2b33558e911a6683a3572ffcbd1b83ee059
 DIST chromium_107.0.5304.68-1raptor1~deb11u1.debian.tar.xz 439056 BLAKE2B fca48164e1395ab5e71a88aac1366e923a6be62337e84e6760352c358625d4172793f970609757218a703daa3a31e6a43e400508c55f2e82b6443ca85c123382 SHA512 21a765a192e39a4e26f92eaee107e8cb280e18b387e834e11f593f3a00f5b8c59d6fb9d0d959a83b8aaba504be286cb7a22e93c1b96e5061fcfca82ad869c6d8
-EBUILD chromium-106.0.5249.119.ebuild 37937 BLAKE2B 3e0c368728030aee7e1291d4426f8d6f5f0c42eb4641159fd07eae4ef726d35ee9f6435e89468f91915f5b693a94bff784888c8d3b50c3e2fcf524a4eb5d8184 SHA512 a1244d3e535dc01dc9ffb207f7f2a81efd217a6dff41ac5a67a9c2ee3ad8ad0582daf69946efd9ca586eb0b4e6c4e3c6c703f219320f624d1ba433a20a8117b4
 EBUILD chromium-107.0.5304.110.ebuild 38205 BLAKE2B bb41a5230e3ac39851194ec87c5bd6308010db4c625ed0c6ac604198410e545d6ebc17004c31f4245d74712f693ca18f60f7bbe55cb0e7a06a0df3f6226bbffe SHA512 bd2a639bc84a9fe779fbbb468ea173793782e7ffa42d80b29e896429f3f6f45c5053598140bc04d4f3eb61ee448ca4d5b2672191d10e9abf7fe565211345e49e
+EBUILD chromium-107.0.5304.121.ebuild 38204 BLAKE2B dcc993ead87aa23b8025343f7965bdaaf5bf14f4a06cbc9d3c8a7a92fa01c6e60e4c896d4b0efa2ff9ae83f4c324a57ed69b15977f5b0a0dacdaf366c98485ea SHA512 bde246435c88c858c567422526f73d598266dc6ed6b3cd8310ef7031efc4cb1c8da484d9468a795f6b5e0479b92c83ec7503bd844b82e0eed65253e79d2308f6
 EBUILD chromium-107.0.5304.87.ebuild 38203 BLAKE2B d0629dfc4fe4fab06976a03a3b395bd1f285e398292c2e6396a5faa3a6fbcccde114ff3471a2d567e1bce5d671987f8aaf6f6eb32113aee883eaa411a36708ea SHA512 099a5dc5a9976f35d4fb19880d11096a06a2ac7814cb46c1056d22654586896d1e2170e7e2b93b78af2d4ba19afea01c88cb135fb05570614517d4f9df8dea6d
 EBUILD chromium-108.0.5343.2.ebuild 38153 BLAKE2B 8be26b04c4ccaf6c4ff4f8126204f23bdf1268b6806d8d8c02286b793ebc63ebb9f22184c8e109e656fd34d07755751265a9da64e0fe329213f11df42e39a777 SHA512 2f1820afac46936441ea2ad8575d0590135e2f85bb3bf86ba167307450efbca6929031f5e3f355d4acfc5bccac76f7d5a793ed49156095a11de5d61f2e5a6e67
 MISC metadata.xml 2128 BLAKE2B f78ae4671e2a0c0df19c9c43b8500b2de2226ee6b3979dd060d6430872c33072c380ea2438063a68b5aa413bce265d3c5b04097e09b11dfd92fe0067e66dfeea SHA512 4693a4782ea679520e4a09a5d4905dc202fc8d422757864069c455692b56101acb68aca588f3c8e07597ef3c6dd37dab7c7b1184c6d1c0f907d838f99097a4fe
diff --git a/www-client/chromium/chromium-106.0.5249.119.ebuild b/www-client/chromium/chromium-107.0.5304.121.ebuild
index f64f9386e979..63f4a11a5133 100644
--- a/www-client/chromium/chromium-106.0.5249.119.ebuild
+++ b/www-client/chromium/chromium-107.0.5304.121.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 PYTHON_COMPAT=( python3_{8..11} )
 PYTHON_REQ_USE="xml(+)"
-LLVM_MAX_SLOT=14
+LLVM_MAX_SLOT=15
 
 CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
 	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
@@ -16,9 +16,9 @@ inherit check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils py
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="https://chromium.org/"
-PATCHSET="3"
+PATCHSET="1"
 PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
-PATCHSET_NAME_PPC64="chromium_106.0.5249.103-1raptor1~deb11u2.debian"
+PATCHSET_NAME_PPC64="chromium_107.0.5304.68-1raptor1~deb11u1.debian"
 SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
 	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz
 	ppc64? ( https://quickbuild.io/~raptor-engineering-public/+archive/ubuntu/chromium/+files/${PATCHSET_NAME_PPC64}.tar.xz )
@@ -26,8 +26,8 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 
 LICENSE="BSD"
 SLOT="0/stable"
-KEYWORDS="amd64 arm64 ~ppc64"
-IUSE="+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pgo pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine"
+KEYWORDS="~amd64 arm64 ~ppc64"
+IUSE="+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pgo pic +proprietary-codecs pulseaudio qt5 screencast selinux +suid +system-av1 +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine"
 REQUIRED_USE="
 	component-build? ( !suid !libcxx )
 	screencast? ( wayland )
@@ -62,6 +62,10 @@ COMMON_SNAPSHOT_DEPEND="
 	>=media-libs/libwebp-0.4.0:=
 	media-libs/mesa:=[gbm(+)]
 	>=media-libs/openh264-1.6.0:=
+	system-av1? (
+		>=media-libs/dav1d-1.0.0:=
+		>=media-libs/libaom-3.4.0:=
+	)
 	sys-libs/zlib:=
 	x11-libs/libdrm:=
 	!headless? (
@@ -112,6 +116,10 @@ COMMON_DEPEND="
 		x11-libs/cairo:=
 		x11-libs/gdk-pixbuf:2
 		x11-libs/pango:=
+		qt5? (
+			dev-qt/qtcore:5
+			dev-qt/qtwidgets:5
+		)
 	)
 "
 RDEPEND="${COMMON_DEPEND}
@@ -318,8 +326,8 @@ src_prepare() {
 		"${FILESDIR}/chromium-98-EnumTable-crash.patch"
 		"${FILESDIR}/chromium-98-gtk4-build.patch"
 		"${FILESDIR}/chromium-105-swiftshader-no-wayland.patch"
-		"${FILESDIR}/chromium-106-python3_11.patch"
 		"${FILESDIR}/chromium-106-revert-GlobalMediaControlsCastStartStop.patch"
+		"${FILESDIR}/chromium-107-system-zlib.patch"
 		"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch"
 		"${FILESDIR}/chromium-shim_headers.patch"
 		"${FILESDIR}/chromium-cross-compile.patch"
@@ -406,7 +414,6 @@ src_prepare() {
 		third_party/crashpad/crashpad/third_party/zlib
 		third_party/crc32c
 		third_party/cros_system_api
-		third_party/dav1d
 		third_party/dawn
 		third_party/dawn/third_party/gn/webgpu-cts
 		third_party/dawn/third_party/khronos
@@ -460,10 +467,6 @@ src_prepare() {
 		third_party/khronos
 		third_party/leveldatabase
 		third_party/libaddressinput
-		third_party/libaom
-		third_party/libaom/source/libaom/third_party/fastfeat
-		third_party/libaom/source/libaom/third_party/vector
-		third_party/libaom/source/libaom/third_party/x86inc
 		third_party/libavif
 		third_party/libevent
 		third_party/libgav1
@@ -499,7 +502,7 @@ src_prepare() {
 		third_party/nearby
 		third_party/neon_2_sse
 		third_party/node
-		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
+		third_party/omnibox_proto
 		third_party/one_euro_filter
 		third_party/openscreen
 		third_party/openscreen/src/third_party/mozilla
@@ -533,9 +536,7 @@ src_prepare() {
 		third_party/shell-encryption
 		third_party/simplejson
 		third_party/skia
-		third_party/skia/include/third_party/skcms
 		third_party/skia/include/third_party/vulkan
-		third_party/skia/third_party/skcms
 		third_party/skia/third_party/vulkan
 		third_party/smhasher
 		third_party/snappy
@@ -597,6 +598,15 @@ src_prepare() {
 	if ! use system-png; then
 		keeplibs+=( third_party/libpng )
 	fi
+	if ! use system-av1; then
+		keeplibs+=(
+			third_party/dav1d
+			third_party/libaom
+			third_party/libaom/source/libaom/third_party/fastfeat
+			third_party/libaom/source/libaom/third_party/vector
+			third_party/libaom/source/libaom/third_party/x86inc
+		)
+	fi
 	if use libcxx; then
 		keeplibs+=( third_party/re2 )
 	fi
@@ -755,6 +765,9 @@ chromium_configure() {
 	if use system-png; then
 		gn_system_libraries+=( libpng )
 	fi
+	if use system-av1; then
+		gn_system_libraries+=( dav1d libaom )
+	fi
 	# re2 library interface relies on std::string and std::vector
 	if ! use libcxx; then
 		gn_system_libraries+=( re2 )
@@ -919,7 +932,7 @@ chromium_configure() {
 	myconf_gn+=" ozone_platform_headless=true"
 	if use headless; then
 		myconf_gn+=" ozone_platform=\"headless\""
-		myconf_gn+=" use_xkbcommon=false use_gtk=false"
+		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"
@@ -929,10 +942,14 @@ chromium_configure() {
 		myconf_gn+=" use_system_libdrm=true"
 		myconf_gn+=" use_system_minigbm=true"
 		myconf_gn+=" use_xkbcommon=true"
+		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\")"
-		use wayland && myconf_gn+=" use_system_wayland_scanner=true"
+		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