From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
Date: Thu, 23 May 2024 16:04:51 +0000 (UTC) [thread overview]
Message-ID: <1716480112.50a6e3e045ea76761e442d15cc917e0159161f53.asturm@gentoo> (raw)
commit: 50a6e3e045ea76761e442d15cc917e0159161f53
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed May 22 17:08:24 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 23 16:01:52 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50a6e3e0
dev-qt/qtwebengine: drop vulnerable 5.15.13_p20240322
Bug: https://bugs.gentoo.org/931960
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 -
.../qtwebengine-5.15.13_p20240322-ninja1.12.patch | 23 --
.../qtwebengine-5.15.13_p20240322.ebuild | 247 ---------------------
3 files changed, 271 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 4bfa9d6ff21c..8eddd1481bd2 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,5 +1,4 @@
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_p20240510.tar.xz 301422784 BLAKE2B b63acccb4740ddb3dd5c76ef9808d946eb2c93b10b45125622adcb5c5e951644ac54612e7aeb9e009e00c5ca8913d3f8b5dfa530c274fec87c4a8377bf1068fb SHA512 0ccc1be0825f4cf2387879241a21f033b5a0198da4e93f2e0533296ec485b103c1ab35aa71a2a9d9c16364979d45d3dd2e13f7e6d0e2a21f94d85294c5819eb3
DIST qtwebengine-6.7-patchset-6.tar.xz 8140 BLAKE2B 773ee76ecf118ce45eb5dbebf4a574c3cff90f50cd87a469511688ed77db7a96012bec0dd03312bf2d366d709d95a2ac3432e9e0bd5a517b69a5bbd250a94420 SHA512 4db6abbd2a598f8194b9ba7035abad7228f6056fc5e5572329a9a0474f36135428b401edf5fa96e1ac866328d078b015fffd90949ef84f1cea9a1b39e5b9d5ff
DIST qtwebengine-6.7-patchset-8.tar.xz 8320 BLAKE2B 88f31506865aeef02d6ad0c46dacd478f4c77330815648bf5377762b9f053f5a51b6426c1fbeef81fff5c3a9f4e853f8d51013d5df27fcd0ab0449ce369e18e5 SHA512 1d8e1f8e15a13c6f1675208ba1a329dfa335031e06577de39dc89464b40bd5cf7df7bce4f09f6e67a84c1c2f7aa1fbf6d2d94ea8c142ec5ea67bac8cef1b03b1
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.13_p20240322-ninja1.12.patch b/dev-qt/qtwebengine/files/qtwebengine-5.15.13_p20240322-ninja1.12.patch
deleted file mode 100644
index 2da3dc27fab2..000000000000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.13_p20240322-ninja1.12.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Quoting the description from qtwebengine-6.7.0-ninja1.12.patch:
-"""
-Patch status: pending being looked at upstream
-
-Issue[1][2][3] also exist in chromium itself[4], and unclear
-why this started happening only with ninja-1.12.0 at the moment.
-
-Just a quickfix, likely not fully correct and seems there may
-be further unresolved race issues.
-
-[1] https://bugs.gentoo.org/930107
-[2] https://bugreports.qt.io/browse/QTBUG-124375
-[3] https://github.com/ninja-build/ninja/issues/2417
-[4] https://bugs.gentoo.org/930112
-"""
-
-This has a hunk removed but is otherwise the same.
---- a/src/3rdparty/chromium/content/browser/BUILD.gn
-+++ b/src/3rdparty/chromium/content/browser/BUILD.gn
-@@ -198,2 +198,3 @@
- "//components/services/storage/public/mojom",
-+ "//components/spellcheck:buildflags",
- "//components/sqlite_proto",
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240322.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240322.ebuild
deleted file mode 100644
index c8cd5e9574d1..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240322.ebuild
+++ /dev/null
@@ -1,247 +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}"
- "${FILESDIR}"/qtwebengine-5.15.13_p20240322-ninja1.12.patch
-)
-
-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() {
- 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
- -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."
-}
next reply other threads:[~2024-05-23 16:04 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-23 16:04 Andreas Sturmlechner [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-03-31 15:57 [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/ Ionen Wolkens
2025-03-04 15:47 Ionen Wolkens
2024-12-04 12:19 Ionen Wolkens
2024-12-03 8:58 Ionen Wolkens
2024-12-02 7:23 Ionen Wolkens
2024-11-18 9:06 Ionen Wolkens
2024-10-30 2:55 Sam James
2024-09-13 2:45 Ionen Wolkens
2024-08-09 9:27 Ionen Wolkens
2024-07-29 20:20 Sam James
2024-04-29 23:51 Sam James
2024-04-17 0:15 Ionen Wolkens
2023-12-19 20:33 Ionen Wolkens
2023-11-22 12:46 Ionen Wolkens
2023-11-21 22:36 Andreas Sturmlechner
2023-11-06 18:11 Andreas Sturmlechner
2023-08-10 3:53 Sam James
2023-08-04 12:35 Sam James
2023-07-26 13:31 Jimi Huotari
2023-06-10 13:33 Jimi Huotari
2023-06-10 13:33 Jimi Huotari
2023-04-26 3:54 Ionen Wolkens
2023-04-22 18:09 Andreas Sturmlechner
2023-03-27 12:51 Sam James
2023-01-08 21:45 Andreas Sturmlechner
2022-08-02 21:51 Sam James
2022-04-05 16:35 Andreas Sturmlechner
2022-04-05 16:35 Andreas Sturmlechner
2021-12-28 12:19 Andreas Sturmlechner
2021-12-25 0:10 Andreas Sturmlechner
2021-12-14 18:13 Andreas Sturmlechner
2021-11-14 19:53 Andreas Sturmlechner
2021-10-31 3:06 Sam James
2021-10-09 22:24 Sam James
2021-09-19 13:42 Andreas Sturmlechner
2021-09-14 16:27 Andreas Sturmlechner
2021-07-22 9:35 Andreas Sturmlechner
2021-05-17 21:15 Andreas Sturmlechner
2021-04-20 22:23 Andreas Sturmlechner
2021-04-06 21:34 Andreas Sturmlechner
2021-03-24 0:50 Georgy Yakovlev
2021-03-12 20:08 Andreas Sturmlechner
2021-02-26 21:19 Andreas Sturmlechner
2021-02-23 20:27 Andreas Sturmlechner
2021-01-02 1:23 Andreas Sturmlechner
2020-11-05 22:51 Andreas Sturmlechner
2020-08-19 19:39 Andreas Sturmlechner
2020-05-17 8:18 Andreas Sturmlechner
2020-05-14 17:21 Andreas Sturmlechner
2020-04-29 20:44 Lars Wendler
2018-06-27 19:00 Andreas Sturmlechner
2018-02-07 2:04 Andreas Sturmlechner
2017-12-10 1:43 Michael Palimaka
2017-01-31 5:14 Davide Pesavento
2016-12-06 6:54 Michael Palimaka
2016-12-01 14:03 Michael Palimaka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1716480112.50a6e3e045ea76761e442d15cc917e0159161f53.asturm@gentoo \
--to=asturm@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox