commit: 9499943107a60a8201d78a1bbe2bc34f32a2ab21
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 3 16:59:25 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Apr 3 16:59:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94999431
Revert "dev-qt/qtwebengine: add 5.15.13_p20240327"
This reverts commit 8c24f0e96673243f8c1ad4babd3067da873f599e.
Was apparently pushed by mistake, reverting on behalf of asturm.
Sorry to anyone that may have started a build.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 -
.../qtwebengine-5.15.13_p20240327.ebuild | 248 ---------------------
2 files changed, 249 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index b3dd1b059324..0d2fb09def52 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -3,7 +3,6 @@ DIST qtwebengine-5.15.10_p20230815-patchset.tar.xz 44880
BLAKE2B 6179ca4ad69f922
DIST qtwebengine-5.15.12_p20240122.tar.xz 299226288 BLAKE2B
a16a2f428c4a3e7c681e8a8631ddff135fdf1f802cba9e1c827cfec25e0e0dd0bc5c5308b7547b30009709974f7efa950cef1640a24dba4ebbf55def265c90f8
SHA512
31e26d7c76e50eb110d5cf31ea01b47693efca0dd0a6814c881491349b535b9b02c4ef50b45fc6a59e7b8955942a6cc28aa17a6730effdec640be032d14e4f75
DIST qtwebengine-5.15.13_p20240322-patchset.tar.xz 26112 BLAKE2B
21eb036520e052f28d7579022d84d4b7136521d025569b22653229d8099140a99726ce5ddebced0d9aa113d3e215fc023ad042a372f2318dfc7cafe5d9e397c9
SHA512
cbc4373ed6a107a3fd2bf1cb73c96e3c00b4428410933dbb1b1eb5116de22e29ca5e102702e1f6f8a12abff6b60ea072b84e77da64c6d60e360bf0ad2e542166
DIST qtwebengine-5.15.13_p20240322.tar.xz 301394204 BLAKE2B
f9bb5bb79edbe0bc862a718feb3b11a56d8c6d2eee1dd711c9b4460f64308fdfbaa4c3551eebad3af5844564a49703574a7fb9d74e15abd0a6aeb8c707a14059
SHA512
b1f459fbb3d21118043a53ce6e292c6a45f8512830f4dbf6982713970f980ccfb8c1ea1c1d7ce373991632de8c44b5053fa1ccb883e19cd8f35a961e67472f5a
-DIST qtwebengine-5.15.13_p20240327.tar.xz 301397192 BLAKE2B
c1903b18cbfa7818475be3e01138b82ea6863f1856fb712ba6dc4bb2e017da42a23178f5db253350a77ec80bd555d006956ccd413d54bbee8910d2accedc4c1a
SHA512
d5c95f4734b84d8702b299e125430328b2b968cb9a3c569811de3b390dec9297386247820a372c62e4de8eda8396a4f59a1f4b2f00b989bff8661c9de61645e0
DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B
aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6
SHA512
3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
DIST qtwebengine-6.6-patchset-10.tar.xz 8880 BLAKE2B
7583dbfbb60100dc669c780d611aa56034ba2172700168c716e06b37cfb8bb083a29b3ab36968ad0f34443224f7ce03956e6fad2734ac7ff62b2aaeba9e79fc4
SHA512
3cf5e597d7300b89297f15f10ffd7e24517f8762ecdc7b3be19f3c48bc16949ec47ebccf050d4416033e1915453c12b0e69ebb2defa50471cdb72794f8e05708
DIST qtwebengine-6.6-patchset-9.tar.xz 8040 BLAKE2B
11c76fd36227cfcfc3c83618fad25c66963e63697f857b99efc76188529bea42094b279bd9f37e79584cb6e9f1d2dd2f666a96c46ddf2276033cdc97782b72c4
SHA512
33cc1ad0843eeaf1103033c2e9b9a734cd218d92c40985fd6c109acefa2f68b99b1f3cf5e06d6f837fc974c39b220ae93b40d135b5414f822cf28e075805c9c1
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240327.ebuild
b/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240327.ebuild
deleted file mode 100644
index a0c7a9d5db61..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240327.ebuild
+++ /dev/null
@@ -1,248 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PATCHSET="${PN}-5.15.13_p20240322-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 ~arm64 ~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
-
-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 )"
-
-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}
- app-alternatives/ninja
- dev-util/gperf
- dev-util/re2c
- net-libs/nodejs[ssl]
- sys-devel/bison
- sys-devel/flex
-"
-
-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() {
- # obsolete by new python option in commit
2294cc4ed5fdbaec93792f4f6094a68e2e6a9a8c
- rm "${WORKDIR}"/${PATCHSET}/010-build-without-python-2.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
-}
-
-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
- -python-version=3
- -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."
-}
