commit: d6db3cde019176f96a5a575b0cb28b7eb3ae8b1f Author: Niccolò Belli <niccolo.belli <AT> linuxsystems <DOT> it> AuthorDate: Sun Feb 25 18:42:22 2024 +0000 Commit: Matt Jolly <kangie <AT> gentoo <DOT> org> CommitDate: Tue Feb 27 21:04:52 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6db3cde
www-client/chromium: fix ppc64 patchset for 122 Signed-off-by: Niccolò Belli <niccolo.belli <AT> linuxsystems.it> Closes: https://github.com/gentoo/gentoo/pull/35525 Signed-off-by: Matt Jolly <kangie <AT> gentoo.org> www-client/chromium/Manifest | 1 + www-client/chromium/chromium-122.0.6261.57.ebuild | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 9c390bd160a1..362f04e93f94 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -11,3 +11,4 @@ DIST chromium-ppc64le-gentoo-patches-1.tar.xz 5636 BLAKE2B 1d898939df023c59285b2 DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d SHA512 9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c DIST chromium_121.0.6167.160-1raptor0~deb12u1.debian.tar.xz 543004 BLAKE2B 9fd261dde6e1682d1cc68b1d4e0a72162c229c0df83f2bedbcdd152375e20baaaa34a16c8b22e4c436b5d7d5ea9edabb7d35277bc4d6dea52fa42c837e812bce SHA512 f6f806c9f52eaff7bc12882421541257f956d48fc8e802d6e028b181ceed015fa33416806fbb1d0fc71b8b9d0678d5b4295502d674048486f9649bd18936f101 DIST chromium_121.0.6167.85-1raptor0~deb12u1.debian.tar.xz 542644 BLAKE2B 298b383b8f311c55c42b75dbaf7d14e1af52e9934a78c9c1b7d6e7d8a5e415d1ef51fc488f0205e851113ca8bb9982707c78485939438d4ddc7c14d5945b5a2c SHA512 f2a8f460d45d1a2302c7958ac1e163276779e5fb76c2efbbd631a21d84a068926dffe064a37cf605bbb34780efc16e32de24ecc729e421ac851fb142c112185a +DIST chromium_122.0.6261.57-1raptor0~deb12u1.debian.tar.xz 551860 BLAKE2B b3f9bef07a38061553816d6f0faf610cc19cc8565605bb520c163906a02e91795a6c6ae05c92ebbb6ccaf95e130438c8bf3c70d26a04951e8438074edb48b63d SHA512 6037a47e1011304ee33447ac11fa84a3355176b5452ad9f7132eebf2527eb3e4fc42635e148731b77b17db243b42172203feacb0443e6071dc9cc7c52d41f7d6 diff --git a/www-client/chromium/chromium-122.0.6261.57.ebuild b/www-client/chromium/chromium-122.0.6261.57.ebuild index 63466f33a755..7a3cb058bd70 100644 --- a/www-client/chromium/chromium-122.0.6261.57.ebuild +++ b/www-client/chromium/chromium-122.0.6261.57.ebuild @@ -57,7 +57,7 @@ inherit python-any-r1 qmake-utils readme.gentoo-r1 toolchain-funcs virtualx xdg- DESCRIPTION="Open-source version of Google Chrome web browser" HOMEPAGE="https://www.chromium.org/"; -PATCHSET_PPC64="121.0.6167.85-1raptor0~deb12u1" +PATCHSET_PPC64="122.0.6261.57-1raptor0~deb12u1" PATCH_V="${PV%%\.*}-2" SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz system-toolchain? ( @@ -77,7 +77,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} LICENSE="BSD" SLOT="0/stable" -KEYWORDS="~amd64 ~arm64" +KEYWORDS="~amd64 ~arm64 ~ppc64" IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd" IUSE="+X ${IUSE_SYSTEM_LIBS} cups debug gtk4 +hangouts headless kerberos libcxx lto +official pax-kernel pgo +proprietary-codecs pulseaudio" IUSE+=" qt5 qt6 screencast selinux +system-toolchain vaapi wayland widevine" @@ -427,6 +427,7 @@ src_prepare() { fi done PATCHES+=( "${WORKDIR}/ppc64le" ) + PATCHES+=( "${WORKDIR}/debian/patches/fixes/rust-clanglib.patch" ) fi if has_version ">=dev-libs/icu-74.1" && use system-icu ; then @@ -727,7 +728,10 @@ src_prepare() { pushd third_party/libvpx >/dev/null || die mkdir -p source/config/linux/ppc64 || die # requires git and clang, bug #832803 - sed -i -e "s|^update_readme||g; s|clang-format|${EPREFIX}/bin/true|g" \ + # Revert https://chromium.googlesource.com/chromium/src/+/b463d0f40b08b4e896e7f458d89ae58ce2a27165%5E%21/third_party/libvpx/generate_gni.sh + # and https://chromium.googlesource.com/chromium/src/+/71ebcbce867dd31da5f8b405a28fcb0de0657d91%5E%21/third_party/libvpx/generate_gni.sh + # since we're not in a git repo + sed -i -e "s|^update_readme||g; s|clang-format|${EPREFIX}/bin/true|g; /^git -C/d; /git cl/d; /cd \$BASE_DIR\/\$LIBVPX_SRC_DIR/ign format --in-place \$BASE_DIR\/BUILD.gn\ngn format --in-place \$BASE_DIR\/libvpx_srcs.gni" \ generate_gni.sh || die ./generate_gni.sh || die popd >/dev/null || die
