commit: 8b93031be7df265cd24de0a11bdd6e1425d987e3 Author: Niccolò Belli <niccolo.belli <AT> linuxsystems <DOT> it> AuthorDate: Tue Sep 5 10:45:25 2023 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Thu Sep 14 15:58:18 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b93031b
www-client/chromium: fix ppc64 patchset for 116 Closes: https://bugs.gentoo.org/913348 Signed-off-by: Niccolò Belli <niccolo.belli <AT> linuxsystems.it> Closes: https://github.com/gentoo/gentoo/pull/32637 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> www-client/chromium/Manifest | 1 + www-client/chromium/chromium-116.0.5845.140.ebuild | 6 +++++- www-client/chromium/chromium-116.0.5845.187.ebuild | 6 +++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index d4eaef08faa5..4a24e0c8fc5c 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,3 +1,4 @@ +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.187.tar.xz 1599648000 BLAKE2B 9eed35e4d7f8b9c9c8823295b56919dba026481732f3fa954daf4c79870d919adf9766d92dab84ab97d8d568076f1f30e1953b6a0ca5bf11940d7b1d8b897d93 SHA512 155fa09feda9c357b3ad35975a003af3352f5da076f9127df52ecdc4954b8dc9b8a891339c7a1de9948398cba41b953df5e90241d5ab7051b5fb4c5507f2edf3 diff --git a/www-client/chromium/chromium-116.0.5845.140.ebuild b/www-client/chromium/chromium-116.0.5845.140.ebuild index 08fd6781b214..fb3e276e120b 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.187.ebuild b/www-client/chromium/chromium-116.0.5845.187.ebuild index 152c9071becc..457d52495482 100644 --- a/www-client/chromium/chromium-116.0.5845.187.ebuild +++ b/www-client/chromium/chromium-116.0.5845.187.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.140-1raptor0~deb12u1" +# ^ = 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
