commit: cd3cd64d1cd2ca1fd2ac71015ea88ecc205fa6ef Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Mar 23 11:05:28 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Mar 23 11:44:48 2024 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=cd3cd64d
dev-qt/qtwebengine: drop ~ppc64 keyword and modifications Bug: https://bugs.gentoo.org/924936 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-qt/qtwebengine/Manifest | 2 -- .../files/qtwebengine-5.15.2-enable-ppc64.patch | 37 --------------------- dev-qt/qtwebengine/metadata.xml | 5 --- dev-qt/qtwebengine/qtwebengine-5.15.13.9999.ebuild | 38 ++-------------------- 4 files changed, 3 insertions(+), 79 deletions(-) diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index 88b8c511..901ba754 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -1,3 +1 @@ -DIST qtwebengine-5.15-ffmpeg-ppc64le.tar.xz 12080 BLAKE2B cfab4f02b8fac8ae7585eda0539f8adf988413aa52503caca3a347a62f75584efb42bcfa4832aadfc51fb98073f4ed3ddfc9701caf570e7186e0e1357af9569f SHA512 e0275ac4eb8d113581fc4fdf42be831903496b6ed95dca5b3d88113107e5453ee8c40df0e2956dd4e343b08e09c57607b1b82a78bf77a780225ff0030a249cef DIST qtwebengine-5.15.10_p20230815-patchset.tar.xz 44880 BLAKE2B 6179ca4ad69f922cfa8ab8528bd571a326b3340f810f05782d808d67b6310de079d84ca6f769bd532f0fe375a702f0d348e02cfbf6b3f2d5c30ac668e1005bef SHA512 a323bdd8afeb41a97febf587bb0994a937c78ed470e077a2b482dca7e04bc4eb9cf75b2d2707236574d6586189ff3d27e42f437930dedd85b47a77e18ffc8fa3 -DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-enable-ppc64.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-enable-ppc64.patch deleted file mode 100644 index 4fb19ccd..00000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-enable-ppc64.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 463f1234c57a36e78ff666bd55094a9d4e68f296 Mon Sep 17 00:00:00 2001 -From: q66 <[email protected]> -Date: Sat, 18 Jan 2020 23:52:55 +0100 -Subject: [PATCH 1/3] Enable ppc64 builds - ---- - configure.pri | 1 + - mkspecs/features/functions.prf | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/configure.pri b/configure.pri -index 3a144e3f8..cabe8b24a 100644 ---- a/configure.pri 2021-02-24 10:45:58.000000000 +0100 -+++ - 2021-03-07 21:18:43.124754796 +0100 -@@ -144,6 +144,7 @@ - contains(QT_ARCH, "arm")|contains(QT_ARCH, "arm64"): return(true) - contains(QT_ARCH, "mips"): return(true) - contains(QT_ARCH, "mips64"): return(true) -+ contains(QT_ARCH, "power64"): return(true) - qtLog("Architecture not supported.") - return(false) - } -diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf -index 512e2523b..e31123654 100644 ---- a/mkspecs/features/functions.prf 2021-02-24 10:45:58.000000000 +0100 -+++ - 2021-03-07 21:19:21.345036293 +0100 -@@ -107,6 +107,7 @@ - contains(qtArch, "mips"): return(mipsel) - contains(qtArch, "mips64"): return(mips64el) - contains(qtArch, "mips64el"): return(mips64el) -+ contains(qtArch, "power64"): return(ppc64) - return(unknown) - } - --- -2.26.0 - diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml index f447332f..0d16fef3 100644 --- a/dev-qt/qtwebengine/metadata.xml +++ b/dev-qt/qtwebengine/metadata.xml @@ -5,11 +5,6 @@ <email>[email protected]</email> <name>Gentoo Qt Project</name> </maintainer> - <maintainer type="person"> - <description>ppc64 patchset maintainer</description> - <email>[email protected]</email> - <name>Georgy Yakovlev</name> - </maintainer> <use> <flag name="designer">Install the QWebEngineView plugin used to add widgets in <pkg>dev-qt/designer</pkg> forms that display web pages.</flag> <flag name="geolocation">Enable physical position determination via <pkg>dev-qt/qtpositioning</pkg></flag> diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.13.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.13.9999.ebuild index 489e6121..23e3fab7 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.15.13.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.15.13.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applic HOMEPAGE="https://www.qt.io/"; if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" if [[ ${PV} == ${QT5_PV}_p* ]]; then SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"; S="${WORKDIR}/${P}" @@ -27,13 +27,7 @@ else inherit git-r3 fi -# ppc64 patchset based on https://github.com/chromium-ppc64le releases -# ppc64 ffmpeg patchset backported from chromium 98 on https://ppa.quickbuild.io/raptor-engineering-public/chromium/ubuntu/pool/main/c/chromium/ -SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz - ppc64? ( - https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-r1-chromium87-ppc64le.tar.xz - https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15-ffmpeg-ppc64le.tar.xz - )" +SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz"; IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-icu widgets" REQUIRED_USE="designer? ( widgets )" @@ -102,7 +96,6 @@ BDEPEND="${PYTHON_DEPS} net-libs/nodejs[ssl] sys-devel/bison sys-devel/flex - ppc64? ( >=dev-build/gn-0.1807 ) " PATCHES=( "${WORKDIR}/${PATCHSET}" ) @@ -208,32 +201,7 @@ src_prepare() { qt_use_disable_mod widgets widgets src/src.pro - if use ppc64; then - einfo "Patching for ppc64le and generating build files" - eapply "${FILESDIR}/qtwebengine-5.15.2-enable-ppc64.patch" - pushd src/3rdparty/chromium > /dev/null || die - eapply -p0 "${WORKDIR}/${PN}-ppc64le" - eapply -p1 "${WORKDIR}/${PN}-ffmpeg-ppc64le" - popd > /dev/null || die - fi - qt5-build_src_prepare - - # we need to generate ppc64 stuff because upstream does not ship it yet - if use ppc64; then - einfo "Generating ppc64le build files" - pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die - mkdir -vp source/config/linux/ppc64 || die - mkdir -p source/libvpx/test || die - touch source/libvpx/test/test.mk || die - # clang-format is used to re-format sources - # but we'd rather make it a no-op than introduce a clang dependency - # https://bugs.gentoo.org/849458 - clang-format() { : ; } - export -f clang-format || die - ./generate_gni.sh || die - popd >/dev/null || die - fi } src_configure() {
