commit: 0c7bf51705de25f13a505c9c8b987f0c06d93886
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 3 09:58:55 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 3 11:16:16 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c7bf517
dev-qt/qtwebengine: drop 5.15.11_p20230927
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 -
.../qtwebengine-5.15.11_p20230927.ebuild | 270 ---------------------
2 files changed, 271 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 517f29257d7f..90f9dc0724a7 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,7 +1,6 @@
DIST qtwebengine-5.15.10_p20230623.tar.xz 299264220 BLAKE2B
93afb88f79a6675dc58123831d0555a60d28428b93d32e185c21eb25401dfeeeee727ca20fc0ba3bda4ff2a298950e081a2eadcaeea095261941fe0d56b0d668
SHA512
9027899474d9d9dec5a5ca1e80e49404a0df2e23fe1666a437c07e99cbbbf787afd619eccf3d901545ed0a865c5fb439dce64f8339cbeb09213a0d4404456543
DIST qtwebengine-5.15.10_p20230815-patchset.tar.xz 44880 BLAKE2B
6179ca4ad69f922cfa8ab8528bd571a326b3340f810f05782d808d67b6310de079d84ca6f769bd532f0fe375a702f0d348e02cfbf6b3f2d5c30ac668e1005bef
SHA512
a323bdd8afeb41a97febf587bb0994a937c78ed470e077a2b482dca7e04bc4eb9cf75b2d2707236574d6586189ff3d27e42f437930dedd85b47a77e18ffc8fa3
DIST qtwebengine-5.15.10_p20230815.tar.xz 299275336 BLAKE2B
9c64f09d982086d51af7d4134f174db9c23162bc3317ea4f19e44d91a52ad63aff56bacc7ae64a2bf693d900ef3ef5231c7333eb56237123799066055fc49450
SHA512
4e6abd825d124fddc63bc8ff92e94940b829289277aa17423403c6ce168c12fff1d52b604ae127c1a0fdbca852e3795482acefbe6e506a3059c0d32bec45a709
-DIST qtwebengine-5.15.11_p20230927.tar.xz 299236992 BLAKE2B
51d67570e2bf1c69a7beb3b44c7d9b12398ef4818f8f64b9578edea1e61a1754523ac55bed170d7f71f1368d6f58eb017bc488e2bf3759e28a67d84d6e7a063f
SHA512
7b48a39a84ef2289f73069a48112c11a064b417f72efcd88c6d89372e5e56c269bfd834c5ab95a8514ab9e948bb2173dd4689747f2345b98abdb69ae51dbaf0e
DIST qtwebengine-5.15.11_p20231019.tar.xz 299255660 BLAKE2B
0d584e69e0fcc4f348f62a5a7f4ba5b323df06ebeb95f9c9c8254b77d80e4797dd4dd0a56eef72aac39a279f62d0b1aba90629276def01807f589a7c0ef858b6
SHA512
b23dff30bf1f14a5dfb592e870450485b262942eabe1d22448618da6d3e9e3650491a8f53891a20901da24cf8dda8243f757ff82a70bec2942437bb8ecdccbe4
DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B
aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6
SHA512
3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
DIST qtwebengine-5.15.8_p20230313-patchset.tar.xz 45904 BLAKE2B
9f58b9808fd445a06e6a2cd6d5f7bc9782bd6de13138fdebc9e81bd9f69e7ae673a71bd3ed6b011a47e84cc64b5b703a7cfc8d5f740eaaa663da1db8ef9ef05b
SHA512
21b0b853358260fa1bdc96c97c5b2af7007c744d10abeebf9f0e708a0cd7dece583d86c0554a4e327a0d615bb403b0d328acaa6622b50d7a8059bc0802edbcec
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.11_p20230927.ebuild
b/dev-qt/qtwebengine/qtwebengine-5.15.11_p20230927.ebuild
deleted file mode 100644
index 01bed9ae76a6..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.11_p20230927.ebuild
+++ /dev/null
@@ -1,270 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PATCHSET="${PN}-5.15.10_p20230815-patchset"
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="xml(+)"
-inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build
toolchain-funcs
-
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML
applications"
-HOMEPAGE="https://www.qt.io/";
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
- if [[ ${PV} == ${QT5_PV}_p* ]]; then
- SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz";
- S="${WORKDIR}/${P}"
- QT5_BUILD_DIR="${S}_build"
- fi
-else
- EGIT_BRANCH="5.15"
- EGIT_REPO_URI=(
- "https://code.qt.io/qt/${QT5_MODULE}.git";
- "https://github.com/qt/${QT5_MODULE}.git";
- )
- inherit git-r3
-fi
-
-# ppc64 patchset based on https://github.com/chromium-ppc64le releases
-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
)"
-
-IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio
screencast +system-icu widgets"
-REQUIRED_USE="designer? ( widgets )"
-
-RDEPEND="
- app-arch/snappy:=
- dev-libs/glib:2
- dev-libs/nspr
- dev-libs/nss
- dev-libs/expat
- dev-libs/libevent:=
- dev-libs/libxml2[icu]
- dev-libs/libxslt
- dev-libs/re2:=
- =dev-qt/qtcore-${QT5_PV}*
- =dev-qt/qtdeclarative-${QT5_PV}*
- =dev-qt/qtgui-${QT5_PV}*
- =dev-qt/qtnetwork-${QT5_PV}*
- =dev-qt/qtprintsupport-${QT5_PV}*
- =dev-qt/qtwebchannel-${QT5_PV}*[qml]
- media-libs/fontconfig
- media-libs/freetype
- media-libs/harfbuzz:=
- media-libs/lcms:2
- media-libs/libjpeg-turbo:=
- media-libs/libpng:0=
- >=media-libs/libvpx-1.5:=[svc(+)]
- media-libs/libwebp:=
- media-libs/opus
- sys-apps/dbus
- sys-apps/pciutils
- sys-libs/zlib[minizip]
- virtual/libudev
- x11-libs/libdrm
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libxkbfile
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libXtst
- alsa? ( media-libs/alsa-lib )
- designer? ( =dev-qt/designer-${QT5_PV}* )
- geolocation? ( =dev-qt/qtpositioning-${QT5_PV}* )
- kerberos? ( virtual/krb5 )
- pulseaudio? ( media-libs/libpulse )
- screencast? ( media-video/pipewire:= )
- system-icu? ( >=dev-libs/icu-69.1:= )
- widgets? (
- =dev-qt/qtdeclarative-${QT5_PV}*[widgets]
- =dev-qt/qtwidgets-${QT5_PV}*
- )
-"
-DEPEND="${RDEPEND}
- media-libs/libglvnd
-"
-BDEPEND="${PYTHON_DEPS}
- dev-util/gperf
- dev-util/ninja
- dev-util/re2c
- net-libs/nodejs[ssl]
- sys-devel/bison
- sys-devel/flex
- ppc64? ( >=dev-util/gn-0.1807 )
-"
-
-PATCHES=( "${WORKDIR}/${PATCHSET}" )
-
-qtwebengine_check-reqs() {
- # bug #307861
- eshopts_push -s extglob
- if is-flagq '-g?(gdb)?([1-9])'; then
- ewarn "You have enabled debug info (probably have -g or -ggdb
in your CFLAGS/CXXFLAGS)."
- ewarn "You may experience really long compilation times and/or
increased memory usage."
- ewarn "If compilation fails, please try removing -g/-ggdb
before reporting a bug."
- fi
- eshopts_pop
-
- [[ ${MERGE_TYPE} == binary ]] && return
-
- # (check-reqs added for bug #570534)
- #
- # Estimate the amount of RAM required
- # Multiplier is *10 because Bash doesn't do floating point maths.
- # Let's crudely assume ~2GB per compiler job for GCC.
- local multiplier=20
-
- # And call it ~1.5GB for Clang.
- if tc-is-clang ; then
- multiplier=15
- fi
-
- local CHECKREQS_DISK_BUILD="7G"
- local CHECKREQS_DISK_USR="150M"
- if ! has "distcc" ${FEATURES} ; then
- # bug #830661
- # Not super realistic to come up with good estimates for distcc
right now
- local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G
- fi
-
- check-reqs_${EBUILD_PHASE_FUNC}
-}
-
-pkg_pretend() {
- qtwebengine_check-reqs
-}
-
-pkg_setup() {
- qtwebengine_check-reqs
- python-any-r1_pkg_setup
-}
-
-src_unpack() {
- case ${QT5_BUILD_TYPE} in
- live) git-r3_src_unpack ;&
- release) default ;;
- esac
-}
-
-src_prepare() {
- # upstreamed, but not spinning new patchset just yet
- rm "${WORKDIR}"/${PATCHSET}/018-gcc13-includes.patch || die
-
- if [[ ${PV} == ${QT5_PV}_p* ]]; then
- # This is made from git, and for some reason will fail w/o .git
directories.
- mkdir -p .git src/3rdparty/chromium/.git || die
- fi
- # We need to make sure this integrates well into Qt 5.15.3 installation.
- # Otherwise revdeps fail w/o heavy changes. This is the simplest way to
do it.
- # See also:
https://www.qt.io/blog/building-qt-webengine-against-other-qt-versions
- sed -E "/^MODULE_VERSION/s/5\.15\.[0-9]+/${QT5_PV}/" -i .qmake.conf ||
die
-
- # QTBUG-88657 - jumbo-build could still make trouble
- if ! use jumbo-build; then
- sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
- src/buildtools/config/common.pri || die
- fi
-
- # bug 620444 - ensure local headers are used
- find "${S}" -type f -name "*.pr[fio]" | \
- xargs sed -i -e 's|INCLUDEPATH +=
|&$${QTWEBENGINE_ROOT}_build/include $${QTWEBENGINE_ROOT}/include |' || die
-
- if use system-icu; then
- # Sanity check to ensure that bundled copy of ICU is not used.
- # Whole src/3rdparty/chromium/third_party/icu directory cannot
be deleted because
- # src/3rdparty/chromium/third_party/icu/BUILD.gn is used by
build system.
- # If usage of headers of bundled copy of ICU occurs, then lists
of shim headers in
- # shim_headers("icui18n_shim") and shim_headers("icuuc_shim") in
- # src/3rdparty/chromium/third_party/icu/BUILD.gn should be
updated.
- local file
- while read file; do
- echo "#error This file should not be used!" > "${file}"
|| die
- done < <(find src/3rdparty/chromium/third_party/icu -type f "("
-name "*.c" -o -name "*.cpp" -o -name "*.h" ")" 2>/dev/null)
- fi
-
- # src/3rdparty/gn fails with libc++ due to passing of
`-static-libstdc++`
- if tc-is-clang ; then
- if has_version 'sys-devel/clang[default-libcxx(-)]' ||
has_version 'sys-devel/clang-common[default-libcxx(-)]' ; then
- eapply
"${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch"
- fi
- fi
-
- qt_use_disable_config alsa webengine-alsa
src/buildtools/config/linux.pri
- qt_use_disable_config pulseaudio webengine-pulseaudio
src/buildtools/config/linux.pri
-
- qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
-
- qt_use_disable_mod widgets widgets src/src.pro
-
- qt5-build_src_prepare
-
- # we need to generate ppc64 stuff because upstream does not ship it yet
- 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"
- popd > /dev/null || die
- 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() {
- export NINJA_PATH=/usr/bin/ninja
- export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs "${MAKEOPTS}" 999)
-l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
- local myqmakeargs=(
- --
- -no-build-qtpdf
- -printing-and-pdf
- -system-opus
- -system-webp
- $(qt_use alsa)
- $(qt_use !bindist proprietary-codecs)
- $(qt_use geolocation webengine-geolocation)
- $(qt_use kerberos webengine-kerberos)
- $(qt_use pulseaudio)
- $(usex screencast -webengine-webrtc-pipewire '')
- -qt-ffmpeg # bug 831487
- $(qt_use system-icu webengine-icu)
- )
- qt5-build_src_configure
-}
-
-src_install() {
- qt5-build_src_install
-
- # bug 601472
- if [[ ! -f ${D}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
- die "${CATEGORY}/${PF} failed to build anything. Please report
to https://bugs.gentoo.org/";
- fi
-}
-
-pkg_preinst() {
- elog "This version of Qt WebEngine is based on Chromium version
87.0.4280.144,"
- elog "with additional security fixes from newer versions. Extensive as
it is, the"
- elog "list of backports is impossible to evaluate, but always bound to
be behind"
- elog "Chromium's release schedule."
- elog "In addition, various online services may deny service based on an
outdated"
- elog "user agent version (and/or other checks). Google is already known
to do so."
- elog
- elog "tldr: Your web browsing experience will be compromised."
-}
