From d63cc24cc3de0c58a87f0337f23983cfabcf3320 Mon Sep 17 00:00:00 2001 From: PF4Public Date: Sat, 9 Sep 2023 22:32:23 +0300 Subject: [PATCH] www-client/ungoogled-chromium: bump patches --- www-client/ungoogled-chromium/Manifest | 2 +- ...d67b0915c60ab40c2b5c560db3774e0a7bf3.patch | 135 ++++++++++++++++++ ...ungoogled-chromium-117.0.5938.48_p1.ebuild | 2 +- 3 files changed, 137 insertions(+), 2 deletions(-) create mode 100644 www-client/ungoogled-chromium/github.com_gentoo_gentoo_commit_b0e0d67b0915c60ab40c2b5c560db3774e0a7bf3.patch diff --git a/www-client/ungoogled-chromium/Manifest b/www-client/ungoogled-chromium/Manifest index 1c09101b2..394b4da7b 100644 --- a/www-client/ungoogled-chromium/Manifest +++ b/www-client/ungoogled-chromium/Manifest @@ -4,7 +4,7 @@ DIST chromium-117.0.5938.48.tar.xz 3133751448 BLAKE2B f434369a6ce7c7649ebef92b6b DIST chromium-5a8dfcaf84b5af5aeb738702651e98bfc43d6d45.patch 962 BLAKE2B 4e0b628bc70aae1fafb3dc1083ad0c2c91b144061382e603c5db0eac8d13a6eedf8870718b00a76072404b86e852b3a40a3a8278c7ff9f8d5e6d833a88935d9e SHA512 503a750c88c69b5d480d06ac3f32be6b57fa931d1932f4b8e557c68bf2db97f7ac1b5afef804d7de2d49de118fe9b4828115b5e1bb8a016dba6044309c4c812b DIST chromium-ppc64le-gentoo-patches-1.tar.xz 5636 BLAKE2B 1d898939df023c59285b27bee552470483ea06375d1ee8d6947b89c5927c23cc7bfec6b49f3b376ece931d11a56f8e2a45791e0f92ad61974fc8c34c1082d89c SHA512 8a71cb007e47cda8e5fe5d185729389e65c48bd322c8ee8b3986bee8571427b959628f2666bda646a3f89ae64197c0957d3626845ff03461dbd5dee4c964d07c DIST chromium_116.0.5845.110-2raptor0~deb11u1.debian.tar.xz 1672712 BLAKE2B db6ec1a06d2994580e107500dcebeb77eb3b7c3965c29451ae42eb46dc6ed541172b8495a39343ef82536a7a3c8d1e78b8e9d0bb83fa67ea5dee34771d9b4913 SHA512 bc20ba713712f74dd0bb28edb9784fcd986c6cfd8219e69cce1f5660cdf003d1b53f86d67b17eeab7bf39af6d543ad7e8227734e0f5771ab421bfcb3f15e2dd0 +DIST cromite-4b7078789cedc3b282a2c529f67cceecec24c6f9.tar.gz 13650976 BLAKE2B 17281fd3d6a4e4d8e0a9cd77dfa8d7472375b93e15ca7e4741da8a0342c51e2aeccfe275b093014d6da198ab310f2383d476672f0f156dd09cf1465c25d6b635 SHA512 2aac3baf82dc4ac42f1574730fb1d078850a5a836145160b5ccef572f56cbb819c77918900e7de335f42a2df020e294992968d79265f4e3723729dc2116fdfc3 DIST cromite-bf086af7df35bef641790d3f00c4d9ab27392b83.tar.gz 13465518 BLAKE2B 139518f00fb3c49388bc834a757c606dc95238bd09fba7125dc8125c32d281b2ab70e4a2af8bc3424a9a293a4256fc92588803daf4214aa150c17d462e4b0110 SHA512 7756be56ad109013bfa9f27487b2a576d4cd841f7ccc050a4e21456b316562d63164f163b813d4d37fa118bc445a5e282f8c8fabd4a77c8698bae64783d40b84 -DIST cromite-d5133f33d342b2f052592296975b499112e0945f.tar.gz 13650674 BLAKE2B a46c63da8255eaf4f53c6acf8850f40c05e906818fde00b4c03c42757ddb4cf602e8a88a20041b96ca8115b48d83f5e011097e65938d571c894b16640e88323f SHA512 3bc93cdcaadb7e6420c6971d2e3e8fe200f2c4a1abbbec19041168045264c5893d4e4b32ffc224eb46377e15c7bee41159b7a96991b9d1a848bc494e2a410db8 DIST ungoogled-chromium-116.0.5845.179-1.tar.gz 673676 BLAKE2B 4595d760e14fb58e28593654a48e93b6d3d9072ecd2df58838bdfe8c75e17f35fa89c5216dcbc475abf8ce5913b75b6df0a72ab945c4b1ac06ef6bee8f0fd5fc SHA512 fb749926695572d76f87ce7c73a7f132b5322b520a95776a156bb82b44d4059d60818d1aa7920d3a84ff594181ef26afb899aa668c291d1f630d3be70f001b01 DIST ungoogled-chromium-1aa47a55db504aed13bfbb713f9b5ec5b61541c3.tar.gz 651602 BLAKE2B 43c2737b4a808401121f98d51f82ca9942b584075998b85257fdb344ae739fd2bae57cc5d01a6818665eb01f68730583b9d08903a641da701401fabef749dc34 SHA512 eb2e7fdb4747e6e8092b946d0029d10b0007f719d3b3db554442699d2b9f1466e471e7d971a325b18d4e7564dc3bb8a8d9ca475929350bc8e5773d14adbf2464 diff --git a/www-client/ungoogled-chromium/github.com_gentoo_gentoo_commit_b0e0d67b0915c60ab40c2b5c560db3774e0a7bf3.patch b/www-client/ungoogled-chromium/github.com_gentoo_gentoo_commit_b0e0d67b0915c60ab40c2b5c560db3774e0a7bf3.patch new file mode 100644 index 000000000..b6ff7b418 --- /dev/null +++ b/www-client/ungoogled-chromium/github.com_gentoo_gentoo_commit_b0e0d67b0915c60ab40c2b5c560db3774e0a7bf3.patch @@ -0,0 +1,135 @@ +From b0e0d67b0915c60ab40c2b5c560db3774e0a7bf3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Niccol=C3=B2=20Belli?= +Date: Tue, 5 Sep 2023 12:45:25 +0200 +Subject: [PATCH] www-client/chromium: fix ppc64 patchset for 115 and 116 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Closes: https://bugs.gentoo.org/913348 +Signed-off-by: Niccolò Belli +--- + www-client/chromium/Manifest | 2 ++ + www-client/chromium/chromium-115.0.5790.170.ebuild | 6 ++++-- + www-client/chromium/chromium-116.0.5845.140.ebuild | 6 +++++- + www-client/chromium/chromium-116.0.5845.96.ebuild | 8 +++++--- + 4 files changed, 16 insertions(+), 6 deletions(-) + +diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest +index f4a392a41fa02..21358f5c8223a 100644 +--- a/www-client/chromium/Manifest ++++ b/www-client/chromium/Manifest +@@ -1,5 +1,7 @@ ++DIST chromium-115-0001-Add-PPC64-support-for-boringssl.patch.gz 45436 BLAKE2B 3568fcf2f8300b807221776a7a1bc0f56c6fe984ec9fffc5baec0d2d4bc23dd6c149316a7b8db19499fa26e6c8b8056c488296df1917de0d70f8bbd01084a625 SHA512 0dd0f195ada47f6fed90b7643ac259a7a44e19fdb91c2558173d44358eb800beadc917e81ae2368487ac4295b9cd891c6d1371a636ec0b80e6597bcfae9563ef + DIST chromium-115-patchset-2.tar.xz 5648 BLAKE2B 6e30d36b20dea958474134f226edb477cb9fb50cb10e3732a9bd500aef1dd5a1a6c9f2cc5d0063f5e51c4120c7fd7e4a53af4a3a9ae63ba30df58000edf45539 SHA512 9cb29d2db5cadfd9f0d5b46129b25e3c6a3429e7bb2bd4c51f50b76f0c6bd87e396711e6cc2915d08653ad524c5d9292f6e37fab30110cec7641163accc02d5e + DIST chromium-115.0.5790.170.tar.xz 1595419840 BLAKE2B ae08f2b86d69d5bd136e7451de94c673277a381edebd2ef92901608febeac3bbbe22529ebe4d477e2bfd260ed3663d97753bcf636c3026364b278db9130894e5 SHA512 0b05c66741b84d016326735614da2a29175cb1522140a56a1b5927522c626c4c49f0c4e55c6149f4e3a38be8897db560c4d29fcf1d55a02ec7798acb6188a000 ++DIST chromium-116-0001-Add-PPC64-support-for-boringssl.patch.gz 45103 BLAKE2B a0b7591b620680d8474a58c457034297b4077708f6cfa1ad2aeb69a7ab7f30d2ce60c2107b95e73226c07ca96155240acfb5374fe32a8acf234fe25c20034f02 SHA512 3d1809ead094bacb03e409affcea478a93c1ca1f4596ad567906504cbfceb081a84b0d206546dda467e3e0814c68f8a200e2037433ecdb11c7c43854bb12825b + DIST chromium-116-patchset-2.tar.xz 5944 BLAKE2B bc67611ecfa93c75e1df8e05f1cabf432bfb807b7fefeb277ff4465f233a159128fecc5b0dd6e3f4954221ac675ff3e25d225352260a695d63f26b1ca6376003 SHA512 705950b3a679714adc14ae81ec51d637ba3bcbeff6dad30d9bbacec36ec6e1776534b8d1ad85fc7e838adeb588566e195a271a9ec220015d343a3038af705456 + DIST chromium-116.0.5845.140.tar.xz 1599642528 BLAKE2B f25afb7b7aaf6ba5c7969b907fcb0a662cdc7a07aa94d3c38f5ab508c62554f405ac418794b38f9b3b12dec73182c18eafb6d87dee75b248bf1fbe05d970dec4 SHA512 309611f56b64b8b40c27d339fc87de35429905791e24e493f2d2792b56a998d81c66e3cae1c9de728c7131c60bedee76b5b42a7a8694d3fb26c48c986489d433 + DIST chromium-116.0.5845.96.tar.xz 1599788748 BLAKE2B 5489e670e82af801b81af1a74bc86fc6862b9771b424ad0d051861b37ce49625b53555b3f12fff92ff1318460760a13b9b1629cfe0acce929f1db3532e5f7207 SHA512 a47182e79784ac77bbc9902f01edb10d90c12c6b7809016fbe056a570d254d7add2d4a6bab4dde1572b7784834b7dd52d3af4c00c8502af41316710633fa4987 +diff --git a/www-client/chromium/chromium-115.0.5790.170.ebuild b/www-client/chromium/chromium-115.0.5790.170.ebuild +index 21debf4a6338f..5f12d59f16a72 100644 +--- a/www-client/chromium/chromium-115.0.5790.170.ebuild ++++ b/www-client/chromium/chromium-115.0.5790.170.ebuild +@@ -27,12 +27,13 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} + ppc64? ( + https://quickbuild.io/~raptor-engineering-public/+archive/ubuntu/chromium/+files/chromium_${PATCHSET_PPC64}.debian.tar.xz + https://dev.gentoo.org/~sultan/distfiles/www-client/chromium/chromium-ppc64le-gentoo-patches-1.tar.xz ++ https://raw.githubusercontent.com/darkbasic/gentoo-files/master/chromium-115-0001-Add-PPC64-support-for-boringssl.patch.gz + ) + pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )" + + LICENSE="BSD" + SLOT="0/stable" +-KEYWORDS="amd64 ~arm64" ++KEYWORDS="amd64 ~arm64 ~ppc64" + IUSE="+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless kerberos libcxx lto +official pax-kernel pgo pic +proprietary-codecs pulseaudio qt5 qt6 screencast selinux +suid +system-av1 +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine" + REQUIRED_USE=" + component-build? ( !suid !libcxx ) +@@ -347,11 +348,12 @@ src_prepare() { + if use ppc64 ; then + local p + for p in $(grep -v "^#" "${WORKDIR}"/debian/patches/series | grep "^ppc64le" || die); do +- if [[ ! $p =~ "fix-breakpad-compile.patch" ]]; then ++ if [[ ! ($p =~ "fix-breakpad-compile.patch" || $p =~ "Add-PPC64-support-for-boringssl.patch") ]]; then + eapply "${WORKDIR}/debian/patches/${p}" + fi + done + PATCHES+=( "${WORKDIR}/ppc64le" ) ++ PATCHES+=( "${WORKDIR}/chromium-115-0001-Add-PPC64-support-for-boringssl.patch" ) + fi + + default +diff --git a/www-client/chromium/chromium-116.0.5845.140.ebuild b/www-client/chromium/chromium-116.0.5845.140.ebuild +index 08fd6781b2144..fb3e276e120bb 100644 +--- a/www-client/chromium/chromium-116.0.5845.140.ebuild ++++ b/www-client/chromium/chromium-116.0.5845.140.ebuild +@@ -21,11 +21,13 @@ HOMEPAGE="https://www.chromium.org/" + PATCHSET="2" + PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}" + PATCHSET_PPC64="116.0.5845.110-2raptor0~deb11u1" ++# ^ = https://quickbuild.io/~raptor-engineering-public/+archive/ubuntu/chromium + 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/chromium_${PATCHSET_PPC64}.debian.tar.xz + https://dev.gentoo.org/~sultan/distfiles/www-client/chromium/chromium-ppc64le-gentoo-patches-1.tar.xz ++ https://raw.githubusercontent.com/darkbasic/gentoo-files/master/chromium-116-0001-Add-PPC64-support-for-boringssl.patch.gz + ) + pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )" + +@@ -344,11 +346,13 @@ src_prepare() { + if use ppc64 ; then + local p + for p in $(grep -v "^#" "${WORKDIR}"/debian/patches/series | grep "^ppc64le" || die); do +- if [[ ! $p =~ "fix-breakpad-compile.patch" ]]; then ++ # Revert to Raptor's bundled 0001-Add-PPC64-support-for-boringssl.patch starting from 117 ++ if [[ ! ($p =~ "fix-breakpad-compile.patch" || $p =~ "Add-PPC64-support-for-boringssl.patch") ]]; then + eapply "${WORKDIR}/debian/patches/${p}" + fi + done + PATCHES+=( "${WORKDIR}/ppc64le" ) ++ PATCHES+=( "${WORKDIR}/chromium-116-0001-Add-PPC64-support-for-boringssl.patch" ) + fi + + default +diff --git a/www-client/chromium/chromium-116.0.5845.96.ebuild b/www-client/chromium/chromium-116.0.5845.96.ebuild +index 8ffaed6a84e14..15b5a95544352 100644 +--- a/www-client/chromium/chromium-116.0.5845.96.ebuild ++++ b/www-client/chromium/chromium-116.0.5845.96.ebuild +@@ -20,18 +20,19 @@ DESCRIPTION="Open-source version of Google Chrome web browser" + HOMEPAGE="https://www.chromium.org/" + PATCHSET="2" + PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}" +-PATCHSET_PPC64="115.0.5790.102-1raptor0~deb11u2" ++PATCHSET_PPC64="116.0.5845.110-2raptor0~deb11u1" + 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/chromium_${PATCHSET_PPC64}.debian.tar.xz + https://dev.gentoo.org/~sultan/distfiles/www-client/chromium/chromium-ppc64le-gentoo-patches-1.tar.xz ++ https://raw.githubusercontent.com/darkbasic/gentoo-files/master/chromium-116-0001-Add-PPC64-support-for-boringssl.patch.gz + ) + pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )" + + LICENSE="BSD" + SLOT="0/stable" +-KEYWORDS="amd64 ~arm64" ++KEYWORDS="amd64 ~arm64 ~ppc64" + IUSE="+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless kerberos libcxx lto +official pax-kernel pgo pic +proprietary-codecs pulseaudio qt5 qt6 screencast selinux +suid +system-av1 +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine" + REQUIRED_USE=" + component-build? ( !suid !libcxx ) +@@ -344,11 +345,12 @@ src_prepare() { + if use ppc64 ; then + local p + for p in $(grep -v "^#" "${WORKDIR}"/debian/patches/series | grep "^ppc64le" || die); do +- if [[ ! $p =~ "fix-breakpad-compile.patch" ]]; then ++ if [[ ! ($p =~ "fix-breakpad-compile.patch" || $p =~ "Add-PPC64-support-for-boringssl.patch") ]]; then + eapply "${WORKDIR}/debian/patches/${p}" + fi + done + PATCHES+=( "${WORKDIR}/ppc64le" ) ++ PATCHES+=( "${WORKDIR}/chromium-116-0001-Add-PPC64-support-for-boringssl.patch" ) + fi + + default diff --git a/www-client/ungoogled-chromium/ungoogled-chromium-117.0.5938.48_p1.ebuild b/www-client/ungoogled-chromium/ungoogled-chromium-117.0.5938.48_p1.ebuild index ab6daac4e..aa363a281 100644 --- a/www-client/ungoogled-chromium/ungoogled-chromium-117.0.5938.48_p1.ebuild +++ b/www-client/ungoogled-chromium/ungoogled-chromium-117.0.5938.48_p1.ebuild @@ -62,7 +62,7 @@ UGC_COMMIT_ID="1aa47a55db504aed13bfbb713f9b5ec5b61541c3" # 5794e9d12bf82620d5f24505798fecb45ca5a22d # ) -UAZO_BROMITE_COMMIT_ID="d5133f33d342b2f052592296975b499112e0945f" +UAZO_BROMITE_COMMIT_ID="4b7078789cedc3b282a2c529f67cceecec24c6f9" CHROMIUM_COMMITS=( 5a8dfcaf84b5af5aeb738702651e98bfc43d6d45