* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-05-06 11:39 Jimi Huotari
0 siblings, 0 replies; 301+ messages in thread
From: Jimi Huotari @ 2023-05-06 11:39 UTC (permalink / raw
To: gentoo-commits
commit: 348ee45c0bc0a1858872ef0179a0246ab2f68a47
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sat May 6 11:39:04 2023 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sat May 6 11:39:04 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=348ee45c
dev-qt/qtwebengine: remove USE="system-ffmpeg" from metadata
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/metadata.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index 415d74652d63..f447332f270a 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -14,7 +14,6 @@
<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>
<flag name="jumbo-build">Combine source files to speed up build process.</flag>
- <flag name="system-ffmpeg">Use the system-wide <pkg>media-video/ffmpeg</pkg> instead of bundled.</flag>
<flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg> instead of bundled.</flag>
<flag name="widgets">Enable QtWidgets support</flag>
</use>
^ permalink raw reply related [flat|nested] 301+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-11-23 11:36 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2024-11-23 11:36 UTC (permalink / raw
To: gentoo-commits
commit: c98480f2ddc13f6d5d26ed1a2380c25ee772329d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 22 19:50:13 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 11:36:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c98480f2
dev-qt/qtwebengine: unkeyword ~x86, no more revdeps
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.15.16_p20241115.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild
index 1f2a9c188291..e2cc3c8e0ee9 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild
@@ -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 arm64 ~x86"
+ KEYWORDS="amd64 arm64"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.13_p20240510.tar.xz"
S="${WORKDIR}/${PN}-5.15.13_p20240510"
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.16_p20241115.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.16_p20241115.ebuild
index ca6718646a2d..41918caa7224 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.16_p20241115.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.16_p20241115.ebuild
@@ -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 ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm64"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-11-21 21:39 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2024-11-21 21:39 UTC (permalink / raw
To: gentoo-commits
commit: e3c513bbe9ba104f0dc7996246c61c5427f21cb1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 21 21:22:09 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Nov 21 21:38:39 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3c513bb
dev-qt/qtwebengine: add 5.15.16_p20241115
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
.../qtwebengine-5.15.16_p20241115.ebuild | 258 +++++++++++++++++++++
2 files changed, 259 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 8e6775499808..55227acc7cbe 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,5 +1,6 @@
DIST qtwebengine-5.15.13_p20240510.tar.xz 301422784 BLAKE2B b63acccb4740ddb3dd5c76ef9808d946eb2c93b10b45125622adcb5c5e951644ac54612e7aeb9e009e00c5ca8913d3f8b5dfa530c274fec87c4a8377bf1068fb SHA512 0ccc1be0825f4cf2387879241a21f033b5a0198da4e93f2e0533296ec485b103c1ab35aa71a2a9d9c16364979d45d3dd2e13f7e6d0e2a21f94d85294c5819eb3
DIST qtwebengine-5.15.14_p20240510-patchset.tar.xz 20780 BLAKE2B 516d4c628c4b027ab3a7159da006a57173be91de3eb4b7f308029953d4fd19fb3e790ca38e79d17fef75d8d9b392676650acb9285d5913f9ebecaa4136575c47 SHA512 492979d118d6bd9165ee194724e38b627d19c89dbe1daa6b2f55e4a8fc7676748a1eacb9623ee05e09140c2c4a2ac82ddafaef5c45630a117ce0ed14b240a474
+DIST qtwebengine-5.15.16_p20241115.tar.xz 301382752 BLAKE2B 08adfae6228a91f1f4b2a603a28881d9cf97f339d951217f3837d614ebb58aff9b0963220be04cc9a17869b6021a6d7687848bd8ccd1c8c49115a5e6944be84b SHA512 50e0bc7b4236859b4419f2f8eaf37e47c1994c30ca3bf584dd2f4996b5f8ba7cd31c8aae48c28f0fcd39c144490f5e451c7ecf5d340e7b10fa2e37666ef21100
DIST qtwebengine-6.7-patchset-11.tar.xz 10004 BLAKE2B 10d96134cd02ca4665f72369817f55e2bf0eb209b5d7c4f6131cd3a1be193940c62f656a65081c77ac0dd7aa7bdda76d6ff3f994f8f6c815b249a33b797a10c2 SHA512 198f19d9e20f146878a6050cde435f4662c0d42a6ed21650bfadaab217b2e369284a1a11e5a01d096d3af3f0b34fe24f9bdc0195d37f7f74076b862503bb6c9f
DIST qtwebengine-6.7-patchset-13.tar.xz 8312 BLAKE2B 8483dff26fdc1479d72bf77d176bf747415be989889946bca96f9ddd1612ab2307afbea40fa908f5644893401bf62e4e334b48a3afe86c2028b13246905eae36 SHA512 546883aa8903bf34bc97d5a8d4d8fe39b55d059acab91fd2979b028c268ef30872a8e078ee5d9bca85f393d689010e937a3cdad421098629a8278e113f84fadd
DIST qtwebengine-6.8-patchset-4.tar.xz 7612 BLAKE2B 400bc156b54bf00956ce4ab9b2ef070fcb31636184ecaee6b763f5dec4355274bde049bd6d3bb67923c8fdc202eeb26eee1664f7cca7c9cdcf7f24123a1cc760 SHA512 6f99a24ff4c7b61e9f855ab9eb8d31b73030291a5609b03fa92d3c44a200d5db9c7a75c7c70393fca1f542bc548ff588b3ab0c62a80feeacd4b42096ec3b889f
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.16_p20241115.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.16_p20241115.ebuild
new file mode 100644
index 000000000000..eb2dc1c56445
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.16_p20241115.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PATCHSET="${PN}-5.15.14_p20240510-patchset"
+PYTHON_COMPAT=( python3_{10..12} )
+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-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
+ $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
+ dev-util/gperf
+ dev-util/re2c
+ net-libs/nodejs[ssl]
+ sys-devel/bison
+ sys-devel/flex
+"
+
+PATCHES=(
+ "${WORKDIR}/${PATCHSET}"
+ "${FILESDIR}/${PN}-5.15.14_p20240510-re2.patch" # bug 913923
+ "${FILESDIR}/${PN}-5.15.14_p20240510-gcc15-cstdint.patch"
+ "${FILESDIR}/${PN}-5.15.14_p20240510-gcc15-template-id-cdtor.patch"
+)
+
+python_check_deps() {
+ python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+}
+
+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
+ if has_version ">=dev-libs/icu-75.1"; then
+ eapply "${FILESDIR}/${PN}-5.15.14_p20240510-icu-75.patch" # too invasive to apply unconditionally
+ fi
+ # 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
+ --webengine-python-version=python3
+ -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)
+ -no-webengine-re2 # bug 913923
+ )
+ 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."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-10-09 14:14 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-10-09 14:14 UTC (permalink / raw
To: gentoo-commits
commit: 4230b66e82599532633725926ef233d48756dc45
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 9 14:06:35 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Oct 9 14:14:00 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4230b66e
dev-qt/qtwebengine: update live patchset
6.8-4 -> 6.8-5 changes:
Updated:
* gn-bootstrap.patch (partially upstreamed)
Not really tested yet, just so patches apply again.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 7d02aa8e63fb..8e6775499808 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -3,6 +3,7 @@ DIST qtwebengine-5.15.14_p20240510-patchset.tar.xz 20780 BLAKE2B 516d4c628c4b027
DIST qtwebengine-6.7-patchset-11.tar.xz 10004 BLAKE2B 10d96134cd02ca4665f72369817f55e2bf0eb209b5d7c4f6131cd3a1be193940c62f656a65081c77ac0dd7aa7bdda76d6ff3f994f8f6c815b249a33b797a10c2 SHA512 198f19d9e20f146878a6050cde435f4662c0d42a6ed21650bfadaab217b2e369284a1a11e5a01d096d3af3f0b34fe24f9bdc0195d37f7f74076b862503bb6c9f
DIST qtwebengine-6.7-patchset-13.tar.xz 8312 BLAKE2B 8483dff26fdc1479d72bf77d176bf747415be989889946bca96f9ddd1612ab2307afbea40fa908f5644893401bf62e4e334b48a3afe86c2028b13246905eae36 SHA512 546883aa8903bf34bc97d5a8d4d8fe39b55d059acab91fd2979b028c268ef30872a8e078ee5d9bca85f393d689010e937a3cdad421098629a8278e113f84fadd
DIST qtwebengine-6.8-patchset-4.tar.xz 7612 BLAKE2B 400bc156b54bf00956ce4ab9b2ef070fcb31636184ecaee6b763f5dec4355274bde049bd6d3bb67923c8fdc202eeb26eee1664f7cca7c9cdcf7f24123a1cc760 SHA512 6f99a24ff4c7b61e9f855ab9eb8d31b73030291a5609b03fa92d3c44a200d5db9c7a75c7c70393fca1f542bc548ff588b3ab0c62a80feeacd4b42096ec3b889f
+DIST qtwebengine-6.8-patchset-5.tar.xz 7540 BLAKE2B afb0bdeffeb5c83237e1bf72c092e786b3d6e1e5cba3b3b12eb3a5575c32761e3a8def04f18b9103a89be3c29b8dd0bc8a4e302cf357f43fd1393f5962e7ad33 SHA512 e9880cca3d1c43f290083ed237be2f77f062aa87acce4e4521ec44e6ab60a32426facc0a64581984652a723ad7ce66eca16dd6ff6aa19a09fe1cd6d2aed5aab7
DIST qtwebengine-everywhere-src-6.7.2.tar.xz 550888844 BLAKE2B 2de049c9284583940bd1a9611a00c88a4f330a3b0bab8291d11296b8532d9f4e41be0d019045aca3d5983c3cfd6254d9e50c1133a497d03ef615fb74973e10f0 SHA512 5e1f65b5c0cecd62623ac386bbc89b1222f41b8c17cec1dd43851692d21f56e8b2dba45dab9405c33e88e1d1b24998d93dbcbf371a6504a1c8cdb1a6b5a94bf7
DIST qtwebengine-everywhere-src-6.7.3.tar.xz 550988288 BLAKE2B e506e8bd950be478a9d0ecf69c66f7c56dab3c7a1503c5534f0ed5a770ed4d009935ca6905a1255701750cc8d5b790b895eb4f1d6f994ea8231d57c461c22da9 SHA512 f20769ac9b3f4a9fda9865c86d9dd2c779e404823d85aaf12cbbc425880352c19352ed39eb804a80a06a99e13582d22d45dbf2a8d7bbefea3592ff965b863cbe
DIST qtwebengine-everywhere-src-6.8.0.tar.xz 566569136 BLAKE2B af2ccc4900ff96d36900bfd4bcb370017231776e211af512e73944dc47b62e6517e85658c436e91f904efae013c4a9035122f78694b4a3fc696f0790725862e0 SHA512 80137c6e1d9aaddddb5d81716acb2ddee620a1416e6318104ace377f0259906d3f79b0fbf9d57e13f581554bc14d7f13abc13396022406d3530f5d9014a7eed4
diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
index 6b40caa515b0..baac705a7f5d 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
@@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs
DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
SRC_URI+="
- https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-4.tar.xz
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-5.tar.xz
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 6b40caa515b0..baac705a7f5d 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs
DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
SRC_URI+="
- https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-4.tar.xz
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-5.tar.xz
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-10-09 6:22 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-10-09 6:22 UTC (permalink / raw
To: gentoo-commits
commit: aed14891c060b9f91e75bb24c33701440ba665b6
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 9 06:04:17 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Oct 9 06:21:16 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aed14891
dev-qt/qtwebengine: drop 6.7.9999
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 326 -------------------------
1 file changed, 326 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
deleted file mode 100644
index 07490b941cb3..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ /dev/null
@@ -1,326 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE="xml(+)"
-inherit check-reqs flag-o-matic multiprocessing optfeature
-inherit prefix python-any-r1 qt6-build toolchain-funcs
-
-DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
-SRC_URI+="
- https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-13.tar.xz
-"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm64"
-fi
-
-IUSE="
- accessibility +alsa bindist custom-cflags designer geolocation
- +jumbo-build kerberos opengl pdfium pulseaudio qml screencast
- +system-icu vaapi vulkan webdriver +widgets
-"
-REQUIRED_USE="
- designer? ( qml widgets )
-"
-
-# dlopen: krb5, libva, pciutils, udev
-# gcc: for -latomic
-RDEPEND="
- app-arch/snappy:=
- dev-libs/expat
- dev-libs/libevent:=
- dev-libs/libxml2[icu]
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- ~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl=,vulkan?,widgets?]
- ~dev-qt/qtdeclarative-${PV}:6[widgets?]
- ~dev-qt/qtwebchannel-${PV}:6[qml?]
- media-libs/fontconfig
- media-libs/freetype
- media-libs/harfbuzz:=
- media-libs/lcms:2
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- media-libs/libwebp:=
- media-libs/mesa[gbm(+)]
- media-libs/openjpeg:2=
- media-libs/opus
- media-libs/tiff:=
- sys-apps/dbus
- sys-apps/pciutils
- sys-devel/gcc:*
- sys-libs/zlib:=[minizip]
- virtual/libudev
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libXtst
- x11-libs/libdrm
- x11-libs/libxcb:=
- x11-libs/libxkbcommon
- x11-libs/libxkbfile
- alsa? ( media-libs/alsa-lib )
- designer? ( ~dev-qt/qttools-${PV}:6[designer] )
- geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
- kerberos? ( virtual/krb5 )
- pulseaudio? ( media-libs/libpulse[glib] )
- screencast? (
- dev-libs/glib:2
- media-video/pipewire:=
- )
- system-icu? ( dev-libs/icu:= )
- vaapi? ( media-libs/libva:=[X] )
- !vaapi? ( media-libs/libvpx:= )
-"
-DEPEND="
- ${RDEPEND}
- media-libs/libglvnd
- x11-base/xorg-proto
- x11-libs/libXcursor
- x11-libs/libXi
- x11-libs/libxshmfence
- opengl? ( media-libs/libglvnd[X] )
- screencast? ( media-libs/libepoxy[egl(+)] )
- pdfium? ( net-print/cups )
- test? (
- widgets? ( app-text/poppler[cxx(+)] )
- )
- vaapi? (
- vulkan? ( dev-util/vulkan-headers )
- )
-"
-BDEPEND="
- $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
- dev-util/gperf
- net-libs/nodejs[ssl]
- sys-devel/bison
- sys-devel/flex
-"
-
-PATCHES=( "${WORKDIR}"/patches/${PN} )
-[[ ${PV} == 6.9999 ]] || # too fragile for 6.9999, but keep for 6.x.9999
- PATCHES+=( "${WORKDIR}"/patches/chromium )
-
-PATCHES+=(
- # add extras as needed here, may merge in set if carries across versions
-)
-
-python_check_deps() {
- python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
-}
-
-qtwebengine_check-reqs() {
- [[ ${MERGE_TYPE} == binary ]] && return
-
- if is-flagq '-g?(gdb)?([1-9])'; then #307861
- ewarn
- ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which"
- ewarn "is non-trivial with ${PN}. May experience extended compilation"
- ewarn "times, increased disk/memory usage, and potentially link failure."
- ewarn
- ewarn "If run into issues, please try disabling before reporting a bug."
- fi
-
- local CHECKREQS_DISK_BUILD=8G
- local CHECKREQS_DISK_USR=360M
-
- if ! has distcc ${FEATURES}; then #830661
- # assume ~2GB per job or 1.5GB if clang, possible with less
- # depending on free memory and *FLAGS, but prefer being safe as
- # users having OOM issues with qtwebengine been rather common
- tc-is-clang && : 15 || : 20
- local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G
- fi
-
- check-reqs_${EBUILD_PHASE_FUNC} #570534
-}
-
-pkg_pretend() {
- qtwebengine_check-reqs
-}
-
-pkg_setup() {
- qtwebengine_check-reqs
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- qt6-build_src_prepare
-
- # for www-plugins/chrome-binary-plugins (widevine) search paths on prefix
- hprefixify -w /Gentoo/ src/core/content_client_qt.cpp
-
- # store chromium versions, only used in postinst for a warning
- local chromium
- mapfile -t chromium < CHROMIUM_VERSION || die
- [[ ${chromium[1]} =~ ^Based.*:[^0-9]+([0-9.]+$) ]] &&
- QT6_CHROMIUM_VER=${BASH_REMATCH[1]} || die
- [[ ${chromium[2]} =~ ^Patched.+:[^0-9]+([0-9.]+$) ]] &&
- QT6_CHROMIUM_PATCHES_VER=${BASH_REMATCH[1]} || die
-}
-
-src_configure() {
- local mycmakeargs=(
- $(qt_feature pdfium qtpdf_build)
- $(qt_feature qml qtpdf_quick_build)
- $(qt_feature webdriver webenginedriver)
- $(qt_feature widgets qtpdf_widgets_build)
- $(usev pdfium -DQT_FEATURE_pdf_v8=ON)
-
- -DQT_FEATURE_qtwebengine_build=ON
- $(qt_feature qml qtwebengine_quick_build)
- $(qt_feature widgets qtwebengine_widgets_build)
-
- $(cmake_use_find_package designer Qt6Designer)
-
- $(qt_feature alsa webengine_system_alsa)
- $(qt_feature !bindist webengine_proprietary_codecs)
- $(qt_feature geolocation webengine_geolocation)
- $(qt_feature jumbo-build webengine_jumbo_build)
- $(qt_feature kerberos webengine_kerberos)
- $(qt_feature pulseaudio webengine_system_pulseaudio)
- $(qt_feature screencast webengine_webrtc_pipewire)
- $(qt_feature system-icu webengine_system_icu)
- $(qt_feature vaapi webengine_vaapi)
- $(qt_feature vulkan webengine_vulkan)
- -DQT_FEATURE_webengine_embedded_build=OFF
- -DQT_FEATURE_webengine_extensions=ON
- -DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet
- -DQT_FEATURE_webengine_pepper_plugins=ON
- -DQT_FEATURE_webengine_printing_and_pdf=ON
- -DQT_FEATURE_webengine_spellchecker=ON
- -DQT_FEATURE_webengine_webchannel=ON
- -DQT_FEATURE_webengine_webrtc=ON
-
- # needs a modified ffmpeg to be usable, and even then it may not
- # cooperate with new major ffmpeg versions (bug #831487)
- -DQT_FEATURE_webengine_system_ffmpeg=OFF
-
- # use bundled re2 to avoid complications, Qt has also disabled
- # this by default in 6.7.3+ (bug #913923)
- -DQT_FEATURE_webengine_system_re2=OFF
-
- # bundled is currently required when using vaapi (forced regardless)
- $(qt_feature !vaapi webengine_system_libvpx)
-
- # not necessary to pass these (default), but in case detection fails
- $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
- freetype gbm glib harfbuzz lcms2 libevent libjpeg \
- libopenjpeg2 libpci libpng libtiff libwebp libxml \
- minizip opus poppler snappy zlib)
-
- # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
- -DINSTALL_GN=OFF
- )
-
- local mygnargs=(
- # prefer no dlopen where possible
- $(usev pulseaudio link_pulseaudio=true)
- $(usev screencast rtc_link_pipewire=true)
- # reduce default disk space usage
- symbol_level=0
- )
-
- if use !custom-cflags; then
- strip-flags # fragile
-
- if is-flagq '-g?(gdb)?([2-9])'; then #914475
- replace-flags '-g?(gdb)?([2-9])' -g1
- ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"
- fi
-
- # Built helpers segfault when using (at least) -march=armv8-a+pauth
- # (bug #920555, #920568 -- suspected gcc bug). For now, filter all
- # for simplicity. Override with USE=custom-cflags if wanted, please
- # report if above -march works again so can cleanup.
- use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
- fi
-
- export NINJAFLAGS=$(get_NINJAOPTS)
- [[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
-
- local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
- einfo "Extra Gn args: ${EXTRA_GN}"
-
- qt6-build_src_configure
-}
-
-src_compile() {
- # tentatively work around a possible (rare) race condition (bug #921680)
- cmake_build WebEngineCore_sync_all_public_headers
-
- cmake_src_compile
-}
-
-src_test() {
- if [[ ${EUID} == 0 ]]; then
- # almost every tests fail, so skip entirely
- ewarn "Skipping tests due to running as root (chromium refuses this configuration)."
- return
- fi
-
- local CMAKE_SKIP_TESTS=(
- # fails with network sandbox
- tst_loadsignals
- tst_qquickwebengineview
- tst_qwebengineglobalsettings
- tst_qwebengineview
- # fails with offscreen rendering, may be worth retrying if the issue
- # persist given these are rather major tests (or consider virtx)
- tst_qmltests
- tst_qwebenginepage
- # certs verfication seems flaky and gives expiration warnings
- tst_qwebengineclientcertificatestore
- # test is misperformed when qtbase is built USE=-test?
- tst_touchinput
- # currently requires webenginedriver to be already installed
- tst_webenginedriver
- )
-
- # prevent using the system's qtwebengine
- # (use glob to avoid unnecessary complications with arch dir)
- local resources=( "${BUILD_DIR}/src/core/${CMAKE_BUILD_TYPE}/"* )
- [[ -d ${resources[0]} ]] || die "invalid resources path: ${resources[0]}"
- local -x QTWEBENGINEPROCESS_PATH=${BUILD_DIR}${QT6_LIBEXECDIR#"${QT6_PREFIX}"}/QtWebEngineProcess
- local -x QTWEBENGINE_LOCALES_PATH=${resources[0]}/qtwebengine_locales
- local -x QTWEBENGINE_RESOURCES_PATH=${resources[0]}
-
- # random failures in several tests without -j1
- qt6-build_src_test -j1
-}
-
-src_install() {
- qt6-build_src_install
-
- [[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472
- die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
-
- if use test && use webdriver; then
- rm -- "${D}${QT6_BINDIR}"/testbrowser || die
- fi
-}
-
-pkg_postinst() {
- # plugin may also be found in $HOME if provided by chrome or firefox
- use amd64 &&
- optfeature "Widevine DRM support (protected media playback)" \
- www-plugins/chrome-binary-plugins
-
- elog
- elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with"
- elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. 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
- 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 "tl;dr your web browsing experience will be compromised."
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-10-08 5:03 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-10-08 5:03 UTC (permalink / raw
To: gentoo-commits
commit: d755e64e4bc98fe2522f340e56dd2dd968e741be
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 8 04:52:31 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Oct 8 05:01:21 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d755e64e
dev-qt/qtwebengine: add 6.8.0
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-6.8.0.ebuild | 329 ++++++++++++++++++++++++++++
2 files changed, 330 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 2545ebb4d0e7..7d02aa8e63fb 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -5,3 +5,4 @@ DIST qtwebengine-6.7-patchset-13.tar.xz 8312 BLAKE2B 8483dff26fdc1479d72bf77d176
DIST qtwebengine-6.8-patchset-4.tar.xz 7612 BLAKE2B 400bc156b54bf00956ce4ab9b2ef070fcb31636184ecaee6b763f5dec4355274bde049bd6d3bb67923c8fdc202eeb26eee1664f7cca7c9cdcf7f24123a1cc760 SHA512 6f99a24ff4c7b61e9f855ab9eb8d31b73030291a5609b03fa92d3c44a200d5db9c7a75c7c70393fca1f542bc548ff588b3ab0c62a80feeacd4b42096ec3b889f
DIST qtwebengine-everywhere-src-6.7.2.tar.xz 550888844 BLAKE2B 2de049c9284583940bd1a9611a00c88a4f330a3b0bab8291d11296b8532d9f4e41be0d019045aca3d5983c3cfd6254d9e50c1133a497d03ef615fb74973e10f0 SHA512 5e1f65b5c0cecd62623ac386bbc89b1222f41b8c17cec1dd43851692d21f56e8b2dba45dab9405c33e88e1d1b24998d93dbcbf371a6504a1c8cdb1a6b5a94bf7
DIST qtwebengine-everywhere-src-6.7.3.tar.xz 550988288 BLAKE2B e506e8bd950be478a9d0ecf69c66f7c56dab3c7a1503c5534f0ed5a770ed4d009935ca6905a1255701750cc8d5b790b895eb4f1d6f994ea8231d57c461c22da9 SHA512 f20769ac9b3f4a9fda9865c86d9dd2c779e404823d85aaf12cbbc425880352c19352ed39eb804a80a06a99e13582d22d45dbf2a8d7bbefea3592ff965b863cbe
+DIST qtwebengine-everywhere-src-6.8.0.tar.xz 566569136 BLAKE2B af2ccc4900ff96d36900bfd4bcb370017231776e211af512e73944dc47b62e6517e85658c436e91f904efae013c4a9035122f78694b4a3fc696f0790725862e0 SHA512 80137c6e1d9aaddddb5d81716acb2ddee620a1416e6318104ace377f0259906d3f79b0fbf9d57e13f581554bc14d7f13abc13396022406d3530f5d9014a7eed4
diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.0.ebuild
new file mode 100644
index 000000000000..6b40caa515b0
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-6.8.0.ebuild
@@ -0,0 +1,329 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="xml(+)"
+inherit check-reqs flag-o-matic multiprocessing optfeature
+inherit prefix python-any-r1 qt6-build toolchain-funcs
+
+DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
+SRC_URI+="
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-4.tar.xz
+"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm64"
+fi
+
+IUSE="
+ accessibility +alsa bindist custom-cflags designer geolocation
+ +jumbo-build kerberos opengl pdfium pulseaudio qml screencast
+ +system-icu vaapi vulkan webdriver +widgets
+"
+REQUIRED_USE="
+ designer? ( qml widgets )
+"
+
+# dlopen: krb5, libva, pciutils, udev
+# gcc: for -latomic
+RDEPEND="
+ app-arch/snappy:=
+ dev-libs/expat
+ dev-libs/libevent:=
+ dev-libs/libxml2[icu]
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ ~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl=,vulkan?,widgets?]
+ ~dev-qt/qtdeclarative-${PV}:6[widgets?]
+ ~dev-qt/qtwebchannel-${PV}:6[qml?]
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/harfbuzz:=
+ media-libs/lcms:2
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ media-libs/libwebp:=
+ media-libs/mesa[gbm(+)]
+ media-libs/openjpeg:2=
+ media-libs/opus
+ media-libs/tiff:=
+ sys-apps/dbus
+ sys-apps/pciutils
+ sys-devel/gcc:*
+ sys-libs/zlib:=[minizip]
+ virtual/libudev
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXrandr
+ x11-libs/libXtst
+ x11-libs/libdrm
+ x11-libs/libxcb:=
+ x11-libs/libxkbcommon
+ x11-libs/libxkbfile
+ alsa? ( media-libs/alsa-lib )
+ designer? ( ~dev-qt/qttools-${PV}:6[designer] )
+ geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
+ kerberos? ( virtual/krb5 )
+ pulseaudio? ( media-libs/libpulse[glib] )
+ screencast? (
+ dev-libs/glib:2
+ media-video/pipewire:=
+ )
+ system-icu? ( dev-libs/icu:= )
+ vaapi? ( media-libs/libva:=[X] )
+"
+DEPEND="
+ ${RDEPEND}
+ media-libs/libglvnd
+ x11-base/xorg-proto
+ x11-libs/libXcursor
+ x11-libs/libXi
+ x11-libs/libxshmfence
+ opengl? ( media-libs/libglvnd[X] )
+ screencast? ( media-libs/libepoxy[egl(+)] )
+ test? (
+ widgets? ( app-text/poppler[cxx(+)] )
+ )
+ vaapi? (
+ vulkan? ( dev-util/vulkan-headers )
+ )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
+ dev-util/gperf
+ net-libs/nodejs[ssl]
+ sys-devel/bison
+ sys-devel/flex
+"
+
+PATCHES=( "${WORKDIR}"/patches/${PN} )
+[[ ${PV} == 6.9999 ]] || # too fragile for 6.9999, but keep for 6.x.9999
+ PATCHES+=( "${WORKDIR}"/patches/chromium )
+
+PATCHES+=(
+ # add extras as needed here, may merge in set if carries across versions
+)
+
+python_check_deps() {
+ python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+}
+
+qtwebengine_check-reqs() {
+ [[ ${MERGE_TYPE} == binary ]] && return
+
+ if is-flagq '-g?(gdb)?([1-9])'; then #307861
+ ewarn
+ ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which"
+ ewarn "is non-trivial with ${PN}. May experience extended compilation"
+ ewarn "times, increased disk/memory usage, and potentially link failure."
+ ewarn
+ ewarn "If run into issues, please try disabling before reporting a bug."
+ fi
+
+ local CHECKREQS_DISK_BUILD=9G
+ local CHECKREQS_DISK_USR=360M
+
+ if ! has distcc ${FEATURES}; then #830661
+ # assume ~2GB per job or 1.5GB if clang, possible with less
+ # depending on free memory and *FLAGS, but prefer being safe as
+ # users having OOM issues with qtwebengine been rather common
+ tc-is-clang && : 15 || : 20
+ local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G
+ fi
+
+ check-reqs_${EBUILD_PHASE_FUNC} #570534
+}
+
+pkg_pretend() {
+ qtwebengine_check-reqs
+}
+
+pkg_setup() {
+ qtwebengine_check-reqs
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ qt6-build_src_prepare
+
+ # for www-plugins/chrome-binary-plugins (widevine) search paths on prefix
+ hprefixify -w /Gentoo/ src/core/content_client_qt.cpp
+
+ # store chromium versions, only used in postinst for a warning
+ local chromium
+ mapfile -t chromium < CHROMIUM_VERSION || die
+ [[ ${chromium[1]} =~ ^Based.*:[^0-9]+([0-9.]+$) ]] &&
+ QT6_CHROMIUM_VER=${BASH_REMATCH[1]} || die
+ [[ ${chromium[2]} =~ ^Patched.+:[^0-9]+([0-9.]+$) ]] &&
+ QT6_CHROMIUM_PATCHES_VER=${BASH_REMATCH[1]} || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(qt_feature pdfium qtpdf_build)
+ $(qt_feature qml qtpdf_quick_build)
+ $(qt_feature webdriver webenginedriver)
+ $(qt_feature widgets qtpdf_widgets_build)
+ $(usev pdfium -DQT_FEATURE_pdf_v8=ON)
+
+ -DQT_FEATURE_qtwebengine_build=ON
+ $(qt_feature qml qtwebengine_quick_build)
+ $(qt_feature widgets qtwebengine_widgets_build)
+
+ $(cmake_use_find_package designer Qt6Designer)
+
+ $(qt_feature alsa webengine_system_alsa)
+ $(qt_feature !bindist webengine_proprietary_codecs)
+ $(qt_feature geolocation webengine_geolocation)
+ $(qt_feature jumbo-build webengine_jumbo_build)
+ $(qt_feature kerberos webengine_kerberos)
+ $(qt_feature pulseaudio webengine_system_pulseaudio)
+ $(qt_feature screencast webengine_webrtc_pipewire)
+ $(qt_feature system-icu webengine_system_icu)
+ $(qt_feature vaapi webengine_vaapi)
+ $(qt_feature vulkan webengine_vulkan)
+ -DQT_FEATURE_webengine_embedded_build=OFF
+ -DQT_FEATURE_webengine_extensions=ON
+ # TODO: it may be possible to make x11 optional since 6.8+
+ -DQT_FEATURE_webengine_ozone_x11=ON
+ -DQT_FEATURE_webengine_pepper_plugins=ON
+ -DQT_FEATURE_webengine_printing_and_pdf=ON
+ -DQT_FEATURE_webengine_spellchecker=ON
+ -DQT_FEATURE_webengine_webchannel=ON
+ -DQT_FEATURE_webengine_webrtc=ON
+
+ # needs a modified ffmpeg to be usable, and even then it may not
+ # cooperate with new major ffmpeg versions (bug #831487)
+ -DQT_FEATURE_webengine_system_ffmpeg=OFF
+
+ # use bundled re2 to avoid complications, Qt has also disabled
+ # this by default in 6.7.3+ (bug #913923)
+ -DQT_FEATURE_webengine_system_re2=OFF
+
+ # system_libvpx=ON is intentionally ignored with USE=vaapi which leads
+ # to using system's being less tested, prefer disabling for now until
+ # vaapi can use it as well
+ -DQT_FEATURE_webengine_system_libvpx=OFF
+
+ # not necessary to pass these (default), but in case detection fails
+ $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
+ freetype gbm glib harfbuzz lcms2 libevent libjpeg \
+ libopenjpeg2 libpci libpng libtiff libwebp libxml \
+ minizip opus poppler snappy zlib)
+
+ # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
+ # (see also BUILD_ONLY_GN option added in 6.8+ for the latter)
+ -DINSTALL_GN=OFF
+ )
+
+ local mygnargs=(
+ # prefer no dlopen where possible
+ $(usev pulseaudio link_pulseaudio=true)
+ $(usev screencast rtc_link_pipewire=true)
+ # reduce default disk space usage
+ symbol_level=0
+ )
+
+ if use !custom-cflags; then
+ strip-flags # fragile
+
+ if is-flagq '-g?(gdb)?([2-9])'; then #914475
+ replace-flags '-g?(gdb)?([2-9])' -g1
+ ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"
+ fi
+
+ # Built helpers segfault when using (at least) -march=armv8-a+pauth
+ # (bug #920555, #920568 -- suspected gcc bug). For now, filter all
+ # for simplicity. Override with USE=custom-cflags if wanted, please
+ # report if above -march works again so can cleanup.
+ use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
+ fi
+
+ export NINJAFLAGS=$(get_NINJAOPTS)
+ [[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
+
+ local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
+ einfo "Extra Gn args: ${EXTRA_GN}"
+
+ qt6-build_src_configure
+}
+
+src_compile() {
+ # tentatively work around a possible (rare) race condition (bug #921680)
+ cmake_build WebEngineCore_sync_all_public_headers
+
+ cmake_src_compile
+}
+
+src_test() {
+ if [[ ${EUID} == 0 ]]; then
+ # almost every tests fail, so skip entirely
+ ewarn "Skipping tests due to running as root (chromium refuses this configuration)."
+ return
+ fi
+
+ local CMAKE_SKIP_TESTS=(
+ # fails with network sandbox
+ tst_certificateerror
+ tst_loadsignals
+ tst_qquickwebengineview
+ tst_qwebengineglobalsettings
+ tst_qwebengineview
+ # fails with offscreen rendering, may be worth retrying if the issue
+ # persist given these are rather major tests (or consider virtx)
+ tst_qmltests
+ tst_qwebenginepage
+ # certs verfication seems flaky and gives expiration warnings
+ tst_qwebengineclientcertificatestore
+ # test is misperformed when qtbase is built USE=-test?
+ tst_touchinput
+ # currently requires webenginedriver to be already installed
+ tst_webenginedriver
+ )
+
+ # prevent using the system's qtwebengine
+ # (use glob to avoid unnecessary complications with arch dir)
+ local resources=( "${BUILD_DIR}/src/core/${CMAKE_BUILD_TYPE}/"* )
+ [[ -d ${resources[0]} ]] || die "invalid resources path: ${resources[0]}"
+ local -x QTWEBENGINEPROCESS_PATH=${BUILD_DIR}${QT6_LIBEXECDIR#"${QT6_PREFIX}"}/QtWebEngineProcess
+ local -x QTWEBENGINE_LOCALES_PATH=${resources[0]}/qtwebengine_locales
+ local -x QTWEBENGINE_RESOURCES_PATH=${resources[0]}
+
+ # random failures in several tests without -j1
+ qt6-build_src_test -j1
+}
+
+src_install() {
+ qt6-build_src_install
+
+ [[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472
+ die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
+
+ if use test && use webdriver; then
+ rm -- "${D}${QT6_BINDIR}"/testbrowser || die
+ fi
+}
+
+pkg_postinst() {
+ # plugin may also be found in $HOME if provided by chrome or firefox
+ use amd64 &&
+ optfeature "Widevine DRM support (protected media playback)" \
+ www-plugins/chrome-binary-plugins
+
+ elog
+ elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with"
+ elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. 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
+ 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 "tl;dr your web browsing experience will be compromised."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-09-27 7:26 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-09-27 7:26 UTC (permalink / raw
To: gentoo-commits
commit: 204f0360889da6faa37f8de258f8cd28170fd1c4
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 27 07:15:51 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Sep 27 07:25:53 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=204f0360
dev-qt/qtwebengine: add 6.7.3
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-6.7.3.ebuild | 326 ++++++++++++++++++++++++++++
2 files changed, 327 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 7a007f417dd2..6213478463cd 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -4,4 +4,5 @@ DIST qtwebengine-6.7-patchset-11.tar.xz 10004 BLAKE2B 10d96134cd02ca4665f7236981
DIST qtwebengine-6.7-patchset-13.tar.xz 8312 BLAKE2B 8483dff26fdc1479d72bf77d176bf747415be989889946bca96f9ddd1612ab2307afbea40fa908f5644893401bf62e4e334b48a3afe86c2028b13246905eae36 SHA512 546883aa8903bf34bc97d5a8d4d8fe39b55d059acab91fd2979b028c268ef30872a8e078ee5d9bca85f393d689010e937a3cdad421098629a8278e113f84fadd
DIST qtwebengine-6.8-patchset-4.tar.xz 7612 BLAKE2B 400bc156b54bf00956ce4ab9b2ef070fcb31636184ecaee6b763f5dec4355274bde049bd6d3bb67923c8fdc202eeb26eee1664f7cca7c9cdcf7f24123a1cc760 SHA512 6f99a24ff4c7b61e9f855ab9eb8d31b73030291a5609b03fa92d3c44a200d5db9c7a75c7c70393fca1f542bc548ff588b3ab0c62a80feeacd4b42096ec3b889f
DIST qtwebengine-everywhere-src-6.7.2.tar.xz 550888844 BLAKE2B 2de049c9284583940bd1a9611a00c88a4f330a3b0bab8291d11296b8532d9f4e41be0d019045aca3d5983c3cfd6254d9e50c1133a497d03ef615fb74973e10f0 SHA512 5e1f65b5c0cecd62623ac386bbc89b1222f41b8c17cec1dd43851692d21f56e8b2dba45dab9405c33e88e1d1b24998d93dbcbf371a6504a1c8cdb1a6b5a94bf7
+DIST qtwebengine-everywhere-src-6.7.3.tar.xz 550988288 BLAKE2B e506e8bd950be478a9d0ecf69c66f7c56dab3c7a1503c5534f0ed5a770ed4d009935ca6905a1255701750cc8d5b790b895eb4f1d6f994ea8231d57c461c22da9 SHA512 f20769ac9b3f4a9fda9865c86d9dd2c779e404823d85aaf12cbbc425880352c19352ed39eb804a80a06a99e13582d22d45dbf2a8d7bbefea3592ff965b863cbe
DIST qtwebengine-everywhere-src-6.8.0-rc.tar.xz 566568800 BLAKE2B f0dbd495b8431dd8b8aa2a1119759a1ae2dada7fbdb65cab807b8722aa7435dcb732ca10870019ee41d0e3b8752b8a37eb32fb268a9258d746a4179f4d5d0b4a SHA512 3b3070bbc1c4c459a3620dd1167f5efc407d4c76e1ecf45637de5a1cfa9c7e8f9c3d7447a669852fab7198b383308e17e4857443f149bec121915f79d60bdf7f
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.3.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.3.ebuild
new file mode 100644
index 000000000000..07490b941cb3
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.3.ebuild
@@ -0,0 +1,326 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="xml(+)"
+inherit check-reqs flag-o-matic multiprocessing optfeature
+inherit prefix python-any-r1 qt6-build toolchain-funcs
+
+DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
+SRC_URI+="
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-13.tar.xz
+"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm64"
+fi
+
+IUSE="
+ accessibility +alsa bindist custom-cflags designer geolocation
+ +jumbo-build kerberos opengl pdfium pulseaudio qml screencast
+ +system-icu vaapi vulkan webdriver +widgets
+"
+REQUIRED_USE="
+ designer? ( qml widgets )
+"
+
+# dlopen: krb5, libva, pciutils, udev
+# gcc: for -latomic
+RDEPEND="
+ app-arch/snappy:=
+ dev-libs/expat
+ dev-libs/libevent:=
+ dev-libs/libxml2[icu]
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ ~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl=,vulkan?,widgets?]
+ ~dev-qt/qtdeclarative-${PV}:6[widgets?]
+ ~dev-qt/qtwebchannel-${PV}:6[qml?]
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/harfbuzz:=
+ media-libs/lcms:2
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ media-libs/libwebp:=
+ media-libs/mesa[gbm(+)]
+ media-libs/openjpeg:2=
+ media-libs/opus
+ media-libs/tiff:=
+ sys-apps/dbus
+ sys-apps/pciutils
+ sys-devel/gcc:*
+ sys-libs/zlib:=[minizip]
+ virtual/libudev
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXrandr
+ x11-libs/libXtst
+ x11-libs/libdrm
+ x11-libs/libxcb:=
+ x11-libs/libxkbcommon
+ x11-libs/libxkbfile
+ alsa? ( media-libs/alsa-lib )
+ designer? ( ~dev-qt/qttools-${PV}:6[designer] )
+ geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
+ kerberos? ( virtual/krb5 )
+ pulseaudio? ( media-libs/libpulse[glib] )
+ screencast? (
+ dev-libs/glib:2
+ media-video/pipewire:=
+ )
+ system-icu? ( dev-libs/icu:= )
+ vaapi? ( media-libs/libva:=[X] )
+ !vaapi? ( media-libs/libvpx:= )
+"
+DEPEND="
+ ${RDEPEND}
+ media-libs/libglvnd
+ x11-base/xorg-proto
+ x11-libs/libXcursor
+ x11-libs/libXi
+ x11-libs/libxshmfence
+ opengl? ( media-libs/libglvnd[X] )
+ screencast? ( media-libs/libepoxy[egl(+)] )
+ pdfium? ( net-print/cups )
+ test? (
+ widgets? ( app-text/poppler[cxx(+)] )
+ )
+ vaapi? (
+ vulkan? ( dev-util/vulkan-headers )
+ )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
+ dev-util/gperf
+ net-libs/nodejs[ssl]
+ sys-devel/bison
+ sys-devel/flex
+"
+
+PATCHES=( "${WORKDIR}"/patches/${PN} )
+[[ ${PV} == 6.9999 ]] || # too fragile for 6.9999, but keep for 6.x.9999
+ PATCHES+=( "${WORKDIR}"/patches/chromium )
+
+PATCHES+=(
+ # add extras as needed here, may merge in set if carries across versions
+)
+
+python_check_deps() {
+ python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+}
+
+qtwebengine_check-reqs() {
+ [[ ${MERGE_TYPE} == binary ]] && return
+
+ if is-flagq '-g?(gdb)?([1-9])'; then #307861
+ ewarn
+ ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which"
+ ewarn "is non-trivial with ${PN}. May experience extended compilation"
+ ewarn "times, increased disk/memory usage, and potentially link failure."
+ ewarn
+ ewarn "If run into issues, please try disabling before reporting a bug."
+ fi
+
+ local CHECKREQS_DISK_BUILD=8G
+ local CHECKREQS_DISK_USR=360M
+
+ if ! has distcc ${FEATURES}; then #830661
+ # assume ~2GB per job or 1.5GB if clang, possible with less
+ # depending on free memory and *FLAGS, but prefer being safe as
+ # users having OOM issues with qtwebengine been rather common
+ tc-is-clang && : 15 || : 20
+ local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G
+ fi
+
+ check-reqs_${EBUILD_PHASE_FUNC} #570534
+}
+
+pkg_pretend() {
+ qtwebengine_check-reqs
+}
+
+pkg_setup() {
+ qtwebengine_check-reqs
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ qt6-build_src_prepare
+
+ # for www-plugins/chrome-binary-plugins (widevine) search paths on prefix
+ hprefixify -w /Gentoo/ src/core/content_client_qt.cpp
+
+ # store chromium versions, only used in postinst for a warning
+ local chromium
+ mapfile -t chromium < CHROMIUM_VERSION || die
+ [[ ${chromium[1]} =~ ^Based.*:[^0-9]+([0-9.]+$) ]] &&
+ QT6_CHROMIUM_VER=${BASH_REMATCH[1]} || die
+ [[ ${chromium[2]} =~ ^Patched.+:[^0-9]+([0-9.]+$) ]] &&
+ QT6_CHROMIUM_PATCHES_VER=${BASH_REMATCH[1]} || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(qt_feature pdfium qtpdf_build)
+ $(qt_feature qml qtpdf_quick_build)
+ $(qt_feature webdriver webenginedriver)
+ $(qt_feature widgets qtpdf_widgets_build)
+ $(usev pdfium -DQT_FEATURE_pdf_v8=ON)
+
+ -DQT_FEATURE_qtwebengine_build=ON
+ $(qt_feature qml qtwebengine_quick_build)
+ $(qt_feature widgets qtwebengine_widgets_build)
+
+ $(cmake_use_find_package designer Qt6Designer)
+
+ $(qt_feature alsa webengine_system_alsa)
+ $(qt_feature !bindist webengine_proprietary_codecs)
+ $(qt_feature geolocation webengine_geolocation)
+ $(qt_feature jumbo-build webengine_jumbo_build)
+ $(qt_feature kerberos webengine_kerberos)
+ $(qt_feature pulseaudio webengine_system_pulseaudio)
+ $(qt_feature screencast webengine_webrtc_pipewire)
+ $(qt_feature system-icu webengine_system_icu)
+ $(qt_feature vaapi webengine_vaapi)
+ $(qt_feature vulkan webengine_vulkan)
+ -DQT_FEATURE_webengine_embedded_build=OFF
+ -DQT_FEATURE_webengine_extensions=ON
+ -DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet
+ -DQT_FEATURE_webengine_pepper_plugins=ON
+ -DQT_FEATURE_webengine_printing_and_pdf=ON
+ -DQT_FEATURE_webengine_spellchecker=ON
+ -DQT_FEATURE_webengine_webchannel=ON
+ -DQT_FEATURE_webengine_webrtc=ON
+
+ # needs a modified ffmpeg to be usable, and even then it may not
+ # cooperate with new major ffmpeg versions (bug #831487)
+ -DQT_FEATURE_webengine_system_ffmpeg=OFF
+
+ # use bundled re2 to avoid complications, Qt has also disabled
+ # this by default in 6.7.3+ (bug #913923)
+ -DQT_FEATURE_webengine_system_re2=OFF
+
+ # bundled is currently required when using vaapi (forced regardless)
+ $(qt_feature !vaapi webengine_system_libvpx)
+
+ # not necessary to pass these (default), but in case detection fails
+ $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
+ freetype gbm glib harfbuzz lcms2 libevent libjpeg \
+ libopenjpeg2 libpci libpng libtiff libwebp libxml \
+ minizip opus poppler snappy zlib)
+
+ # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
+ -DINSTALL_GN=OFF
+ )
+
+ local mygnargs=(
+ # prefer no dlopen where possible
+ $(usev pulseaudio link_pulseaudio=true)
+ $(usev screencast rtc_link_pipewire=true)
+ # reduce default disk space usage
+ symbol_level=0
+ )
+
+ if use !custom-cflags; then
+ strip-flags # fragile
+
+ if is-flagq '-g?(gdb)?([2-9])'; then #914475
+ replace-flags '-g?(gdb)?([2-9])' -g1
+ ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"
+ fi
+
+ # Built helpers segfault when using (at least) -march=armv8-a+pauth
+ # (bug #920555, #920568 -- suspected gcc bug). For now, filter all
+ # for simplicity. Override with USE=custom-cflags if wanted, please
+ # report if above -march works again so can cleanup.
+ use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
+ fi
+
+ export NINJAFLAGS=$(get_NINJAOPTS)
+ [[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
+
+ local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
+ einfo "Extra Gn args: ${EXTRA_GN}"
+
+ qt6-build_src_configure
+}
+
+src_compile() {
+ # tentatively work around a possible (rare) race condition (bug #921680)
+ cmake_build WebEngineCore_sync_all_public_headers
+
+ cmake_src_compile
+}
+
+src_test() {
+ if [[ ${EUID} == 0 ]]; then
+ # almost every tests fail, so skip entirely
+ ewarn "Skipping tests due to running as root (chromium refuses this configuration)."
+ return
+ fi
+
+ local CMAKE_SKIP_TESTS=(
+ # fails with network sandbox
+ tst_loadsignals
+ tst_qquickwebengineview
+ tst_qwebengineglobalsettings
+ tst_qwebengineview
+ # fails with offscreen rendering, may be worth retrying if the issue
+ # persist given these are rather major tests (or consider virtx)
+ tst_qmltests
+ tst_qwebenginepage
+ # certs verfication seems flaky and gives expiration warnings
+ tst_qwebengineclientcertificatestore
+ # test is misperformed when qtbase is built USE=-test?
+ tst_touchinput
+ # currently requires webenginedriver to be already installed
+ tst_webenginedriver
+ )
+
+ # prevent using the system's qtwebengine
+ # (use glob to avoid unnecessary complications with arch dir)
+ local resources=( "${BUILD_DIR}/src/core/${CMAKE_BUILD_TYPE}/"* )
+ [[ -d ${resources[0]} ]] || die "invalid resources path: ${resources[0]}"
+ local -x QTWEBENGINEPROCESS_PATH=${BUILD_DIR}${QT6_LIBEXECDIR#"${QT6_PREFIX}"}/QtWebEngineProcess
+ local -x QTWEBENGINE_LOCALES_PATH=${resources[0]}/qtwebengine_locales
+ local -x QTWEBENGINE_RESOURCES_PATH=${resources[0]}
+
+ # random failures in several tests without -j1
+ qt6-build_src_test -j1
+}
+
+src_install() {
+ qt6-build_src_install
+
+ [[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472
+ die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
+
+ if use test && use webdriver; then
+ rm -- "${D}${QT6_BINDIR}"/testbrowser || die
+ fi
+}
+
+pkg_postinst() {
+ # plugin may also be found in $HOME if provided by chrome or firefox
+ use amd64 &&
+ optfeature "Widevine DRM support (protected media playback)" \
+ www-plugins/chrome-binary-plugins
+
+ elog
+ elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with"
+ elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. 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
+ 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 "tl;dr your web browsing experience will be compromised."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-09-25 2:20 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-09-25 2:20 UTC (permalink / raw
To: gentoo-commits
commit: bbe03f19766167b539b90af2034340e61ed90e81
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 25 01:28:23 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Sep 25 01:49:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbe03f19
dev-qt/qtwebengine: fix build with USE=-vaapi in 6.8+
Per the comment, already couldn't use system's libvpv when USE=vaapi
is enabled (this is intentionally enforced by the build system rather
than "broken"), and now USE=-vaapi fails to build in 6.8 with system's.
Seems like an easy fix but (even if fixed) feel it would be simpler
keep the same setup regardless of USE=vaapi until vaapi allows using
system's. I hardly test USE=-vaapi and missed that it broke, and I
assume this holds for upstream too.
qtwebengine does keep bundled libvpx either up to date or backports
security fixes, albeit bumps are less frequent and fixes could lag a
bit (not that we had a choice with USE=vaapi either way, unless drop
vaapi support).
As a small perk, it'll spare users from rebuilding qtwebengine on
libvpx subslot bumps which happen now and then.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.8.0_rc.ebuild | 7 ++++---
dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild | 7 ++++---
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 7 ++++---
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.0_rc.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.0_rc.ebuild
index 040cde6137b6..6b40caa515b0 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.8.0_rc.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.8.0_rc.ebuild
@@ -77,7 +77,6 @@ RDEPEND="
)
system-icu? ( dev-libs/icu:= )
vaapi? ( media-libs/libva:=[X] )
- !vaapi? ( media-libs/libvpx:= )
"
DEPEND="
${RDEPEND}
@@ -207,8 +206,10 @@ src_configure() {
# this by default in 6.7.3+ (bug #913923)
-DQT_FEATURE_webengine_system_re2=OFF
- # bundled is currently required when using vaapi (forced regardless)
- $(qt_feature !vaapi webengine_system_libvpx)
+ # system_libvpx=ON is intentionally ignored with USE=vaapi which leads
+ # to using system's being less tested, prefer disabling for now until
+ # vaapi can use it as well
+ -DQT_FEATURE_webengine_system_libvpx=OFF
# not necessary to pass these (default), but in case detection fails
$(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
index 040cde6137b6..6b40caa515b0 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
@@ -77,7 +77,6 @@ RDEPEND="
)
system-icu? ( dev-libs/icu:= )
vaapi? ( media-libs/libva:=[X] )
- !vaapi? ( media-libs/libvpx:= )
"
DEPEND="
${RDEPEND}
@@ -207,8 +206,10 @@ src_configure() {
# this by default in 6.7.3+ (bug #913923)
-DQT_FEATURE_webengine_system_re2=OFF
- # bundled is currently required when using vaapi (forced regardless)
- $(qt_feature !vaapi webengine_system_libvpx)
+ # system_libvpx=ON is intentionally ignored with USE=vaapi which leads
+ # to using system's being less tested, prefer disabling for now until
+ # vaapi can use it as well
+ -DQT_FEATURE_webengine_system_libvpx=OFF
# not necessary to pass these (default), but in case detection fails
$(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 040cde6137b6..6b40caa515b0 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -77,7 +77,6 @@ RDEPEND="
)
system-icu? ( dev-libs/icu:= )
vaapi? ( media-libs/libva:=[X] )
- !vaapi? ( media-libs/libvpx:= )
"
DEPEND="
${RDEPEND}
@@ -207,8 +206,10 @@ src_configure() {
# this by default in 6.7.3+ (bug #913923)
-DQT_FEATURE_webengine_system_re2=OFF
- # bundled is currently required when using vaapi (forced regardless)
- $(qt_feature !vaapi webengine_system_libvpx)
+ # system_libvpx=ON is intentionally ignored with USE=vaapi which leads
+ # to using system's being less tested, prefer disabling for now until
+ # vaapi can use it as well
+ -DQT_FEATURE_webengine_system_libvpx=OFF
# not necessary to pass these (default), but in case detection fails
$(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-09-24 9:57 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-09-24 9:57 UTC (permalink / raw
To: gentoo-commits
commit: 8432c805c72f1fe88346d09f6331b99cb47bce82
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 24 09:52:09 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 24 09:56:42 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8432c805
dev-qt/qtwebengine: add 6.8.0_rc
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-6.8.0_rc.ebuild | 328 +++++++++++++++++++++++++
2 files changed, 329 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index dc7b9dad559e..7a007f417dd2 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -4,3 +4,4 @@ DIST qtwebengine-6.7-patchset-11.tar.xz 10004 BLAKE2B 10d96134cd02ca4665f7236981
DIST qtwebengine-6.7-patchset-13.tar.xz 8312 BLAKE2B 8483dff26fdc1479d72bf77d176bf747415be989889946bca96f9ddd1612ab2307afbea40fa908f5644893401bf62e4e334b48a3afe86c2028b13246905eae36 SHA512 546883aa8903bf34bc97d5a8d4d8fe39b55d059acab91fd2979b028c268ef30872a8e078ee5d9bca85f393d689010e937a3cdad421098629a8278e113f84fadd
DIST qtwebengine-6.8-patchset-4.tar.xz 7612 BLAKE2B 400bc156b54bf00956ce4ab9b2ef070fcb31636184ecaee6b763f5dec4355274bde049bd6d3bb67923c8fdc202eeb26eee1664f7cca7c9cdcf7f24123a1cc760 SHA512 6f99a24ff4c7b61e9f855ab9eb8d31b73030291a5609b03fa92d3c44a200d5db9c7a75c7c70393fca1f542bc548ff588b3ab0c62a80feeacd4b42096ec3b889f
DIST qtwebengine-everywhere-src-6.7.2.tar.xz 550888844 BLAKE2B 2de049c9284583940bd1a9611a00c88a4f330a3b0bab8291d11296b8532d9f4e41be0d019045aca3d5983c3cfd6254d9e50c1133a497d03ef615fb74973e10f0 SHA512 5e1f65b5c0cecd62623ac386bbc89b1222f41b8c17cec1dd43851692d21f56e8b2dba45dab9405c33e88e1d1b24998d93dbcbf371a6504a1c8cdb1a6b5a94bf7
+DIST qtwebengine-everywhere-src-6.8.0-rc.tar.xz 566568800 BLAKE2B f0dbd495b8431dd8b8aa2a1119759a1ae2dada7fbdb65cab807b8722aa7435dcb732ca10870019ee41d0e3b8752b8a37eb32fb268a9258d746a4179f4d5d0b4a SHA512 3b3070bbc1c4c459a3620dd1167f5efc407d4c76e1ecf45637de5a1cfa9c7e8f9c3d7447a669852fab7198b383308e17e4857443f149bec121915f79d60bdf7f
diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.0_rc.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.0_rc.ebuild
new file mode 100644
index 000000000000..040cde6137b6
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-6.8.0_rc.ebuild
@@ -0,0 +1,328 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="xml(+)"
+inherit check-reqs flag-o-matic multiprocessing optfeature
+inherit prefix python-any-r1 qt6-build toolchain-funcs
+
+DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
+SRC_URI+="
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-4.tar.xz
+"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm64"
+fi
+
+IUSE="
+ accessibility +alsa bindist custom-cflags designer geolocation
+ +jumbo-build kerberos opengl pdfium pulseaudio qml screencast
+ +system-icu vaapi vulkan webdriver +widgets
+"
+REQUIRED_USE="
+ designer? ( qml widgets )
+"
+
+# dlopen: krb5, libva, pciutils, udev
+# gcc: for -latomic
+RDEPEND="
+ app-arch/snappy:=
+ dev-libs/expat
+ dev-libs/libevent:=
+ dev-libs/libxml2[icu]
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ ~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl=,vulkan?,widgets?]
+ ~dev-qt/qtdeclarative-${PV}:6[widgets?]
+ ~dev-qt/qtwebchannel-${PV}:6[qml?]
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/harfbuzz:=
+ media-libs/lcms:2
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ media-libs/libwebp:=
+ media-libs/mesa[gbm(+)]
+ media-libs/openjpeg:2=
+ media-libs/opus
+ media-libs/tiff:=
+ sys-apps/dbus
+ sys-apps/pciutils
+ sys-devel/gcc:*
+ sys-libs/zlib:=[minizip]
+ virtual/libudev
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXrandr
+ x11-libs/libXtst
+ x11-libs/libdrm
+ x11-libs/libxcb:=
+ x11-libs/libxkbcommon
+ x11-libs/libxkbfile
+ alsa? ( media-libs/alsa-lib )
+ designer? ( ~dev-qt/qttools-${PV}:6[designer] )
+ geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
+ kerberos? ( virtual/krb5 )
+ pulseaudio? ( media-libs/libpulse[glib] )
+ screencast? (
+ dev-libs/glib:2
+ media-video/pipewire:=
+ )
+ system-icu? ( dev-libs/icu:= )
+ vaapi? ( media-libs/libva:=[X] )
+ !vaapi? ( media-libs/libvpx:= )
+"
+DEPEND="
+ ${RDEPEND}
+ media-libs/libglvnd
+ x11-base/xorg-proto
+ x11-libs/libXcursor
+ x11-libs/libXi
+ x11-libs/libxshmfence
+ opengl? ( media-libs/libglvnd[X] )
+ screencast? ( media-libs/libepoxy[egl(+)] )
+ test? (
+ widgets? ( app-text/poppler[cxx(+)] )
+ )
+ vaapi? (
+ vulkan? ( dev-util/vulkan-headers )
+ )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
+ dev-util/gperf
+ net-libs/nodejs[ssl]
+ sys-devel/bison
+ sys-devel/flex
+"
+
+PATCHES=( "${WORKDIR}"/patches/${PN} )
+[[ ${PV} == 6.9999 ]] || # too fragile for 6.9999, but keep for 6.x.9999
+ PATCHES+=( "${WORKDIR}"/patches/chromium )
+
+PATCHES+=(
+ # add extras as needed here, may merge in set if carries across versions
+)
+
+python_check_deps() {
+ python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+}
+
+qtwebengine_check-reqs() {
+ [[ ${MERGE_TYPE} == binary ]] && return
+
+ if is-flagq '-g?(gdb)?([1-9])'; then #307861
+ ewarn
+ ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which"
+ ewarn "is non-trivial with ${PN}. May experience extended compilation"
+ ewarn "times, increased disk/memory usage, and potentially link failure."
+ ewarn
+ ewarn "If run into issues, please try disabling before reporting a bug."
+ fi
+
+ local CHECKREQS_DISK_BUILD=9G
+ local CHECKREQS_DISK_USR=360M
+
+ if ! has distcc ${FEATURES}; then #830661
+ # assume ~2GB per job or 1.5GB if clang, possible with less
+ # depending on free memory and *FLAGS, but prefer being safe as
+ # users having OOM issues with qtwebengine been rather common
+ tc-is-clang && : 15 || : 20
+ local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G
+ fi
+
+ check-reqs_${EBUILD_PHASE_FUNC} #570534
+}
+
+pkg_pretend() {
+ qtwebengine_check-reqs
+}
+
+pkg_setup() {
+ qtwebengine_check-reqs
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ qt6-build_src_prepare
+
+ # for www-plugins/chrome-binary-plugins (widevine) search paths on prefix
+ hprefixify -w /Gentoo/ src/core/content_client_qt.cpp
+
+ # store chromium versions, only used in postinst for a warning
+ local chromium
+ mapfile -t chromium < CHROMIUM_VERSION || die
+ [[ ${chromium[1]} =~ ^Based.*:[^0-9]+([0-9.]+$) ]] &&
+ QT6_CHROMIUM_VER=${BASH_REMATCH[1]} || die
+ [[ ${chromium[2]} =~ ^Patched.+:[^0-9]+([0-9.]+$) ]] &&
+ QT6_CHROMIUM_PATCHES_VER=${BASH_REMATCH[1]} || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(qt_feature pdfium qtpdf_build)
+ $(qt_feature qml qtpdf_quick_build)
+ $(qt_feature webdriver webenginedriver)
+ $(qt_feature widgets qtpdf_widgets_build)
+ $(usev pdfium -DQT_FEATURE_pdf_v8=ON)
+
+ -DQT_FEATURE_qtwebengine_build=ON
+ $(qt_feature qml qtwebengine_quick_build)
+ $(qt_feature widgets qtwebengine_widgets_build)
+
+ $(cmake_use_find_package designer Qt6Designer)
+
+ $(qt_feature alsa webengine_system_alsa)
+ $(qt_feature !bindist webengine_proprietary_codecs)
+ $(qt_feature geolocation webengine_geolocation)
+ $(qt_feature jumbo-build webengine_jumbo_build)
+ $(qt_feature kerberos webengine_kerberos)
+ $(qt_feature pulseaudio webengine_system_pulseaudio)
+ $(qt_feature screencast webengine_webrtc_pipewire)
+ $(qt_feature system-icu webengine_system_icu)
+ $(qt_feature vaapi webengine_vaapi)
+ $(qt_feature vulkan webengine_vulkan)
+ -DQT_FEATURE_webengine_embedded_build=OFF
+ -DQT_FEATURE_webengine_extensions=ON
+ # TODO: it may be possible to make x11 optional since 6.8+
+ -DQT_FEATURE_webengine_ozone_x11=ON
+ -DQT_FEATURE_webengine_pepper_plugins=ON
+ -DQT_FEATURE_webengine_printing_and_pdf=ON
+ -DQT_FEATURE_webengine_spellchecker=ON
+ -DQT_FEATURE_webengine_webchannel=ON
+ -DQT_FEATURE_webengine_webrtc=ON
+
+ # needs a modified ffmpeg to be usable, and even then it may not
+ # cooperate with new major ffmpeg versions (bug #831487)
+ -DQT_FEATURE_webengine_system_ffmpeg=OFF
+
+ # use bundled re2 to avoid complications, Qt has also disabled
+ # this by default in 6.7.3+ (bug #913923)
+ -DQT_FEATURE_webengine_system_re2=OFF
+
+ # bundled is currently required when using vaapi (forced regardless)
+ $(qt_feature !vaapi webengine_system_libvpx)
+
+ # not necessary to pass these (default), but in case detection fails
+ $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
+ freetype gbm glib harfbuzz lcms2 libevent libjpeg \
+ libopenjpeg2 libpci libpng libtiff libwebp libxml \
+ minizip opus poppler snappy zlib)
+
+ # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
+ # (see also BUILD_ONLY_GN option added in 6.8+ for the latter)
+ -DINSTALL_GN=OFF
+ )
+
+ local mygnargs=(
+ # prefer no dlopen where possible
+ $(usev pulseaudio link_pulseaudio=true)
+ $(usev screencast rtc_link_pipewire=true)
+ # reduce default disk space usage
+ symbol_level=0
+ )
+
+ if use !custom-cflags; then
+ strip-flags # fragile
+
+ if is-flagq '-g?(gdb)?([2-9])'; then #914475
+ replace-flags '-g?(gdb)?([2-9])' -g1
+ ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"
+ fi
+
+ # Built helpers segfault when using (at least) -march=armv8-a+pauth
+ # (bug #920555, #920568 -- suspected gcc bug). For now, filter all
+ # for simplicity. Override with USE=custom-cflags if wanted, please
+ # report if above -march works again so can cleanup.
+ use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
+ fi
+
+ export NINJAFLAGS=$(get_NINJAOPTS)
+ [[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
+
+ local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
+ einfo "Extra Gn args: ${EXTRA_GN}"
+
+ qt6-build_src_configure
+}
+
+src_compile() {
+ # tentatively work around a possible (rare) race condition (bug #921680)
+ cmake_build WebEngineCore_sync_all_public_headers
+
+ cmake_src_compile
+}
+
+src_test() {
+ if [[ ${EUID} == 0 ]]; then
+ # almost every tests fail, so skip entirely
+ ewarn "Skipping tests due to running as root (chromium refuses this configuration)."
+ return
+ fi
+
+ local CMAKE_SKIP_TESTS=(
+ # fails with network sandbox
+ tst_certificateerror
+ tst_loadsignals
+ tst_qquickwebengineview
+ tst_qwebengineglobalsettings
+ tst_qwebengineview
+ # fails with offscreen rendering, may be worth retrying if the issue
+ # persist given these are rather major tests (or consider virtx)
+ tst_qmltests
+ tst_qwebenginepage
+ # certs verfication seems flaky and gives expiration warnings
+ tst_qwebengineclientcertificatestore
+ # test is misperformed when qtbase is built USE=-test?
+ tst_touchinput
+ # currently requires webenginedriver to be already installed
+ tst_webenginedriver
+ )
+
+ # prevent using the system's qtwebengine
+ # (use glob to avoid unnecessary complications with arch dir)
+ local resources=( "${BUILD_DIR}/src/core/${CMAKE_BUILD_TYPE}/"* )
+ [[ -d ${resources[0]} ]] || die "invalid resources path: ${resources[0]}"
+ local -x QTWEBENGINEPROCESS_PATH=${BUILD_DIR}${QT6_LIBEXECDIR#"${QT6_PREFIX}"}/QtWebEngineProcess
+ local -x QTWEBENGINE_LOCALES_PATH=${resources[0]}/qtwebengine_locales
+ local -x QTWEBENGINE_RESOURCES_PATH=${resources[0]}
+
+ # random failures in several tests without -j1
+ qt6-build_src_test -j1
+}
+
+src_install() {
+ qt6-build_src_install
+
+ [[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472
+ die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
+
+ if use test && use webdriver; then
+ rm -- "${D}${QT6_BINDIR}"/testbrowser || die
+ fi
+}
+
+pkg_postinst() {
+ # plugin may also be found in $HOME if provided by chrome or firefox
+ use amd64 &&
+ optfeature "Widevine DRM support (protected media playback)" \
+ www-plugins/chrome-binary-plugins
+
+ elog
+ elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with"
+ elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. 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
+ 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 "tl;dr your web browsing experience will be compromised."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-09-22 8:16 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-09-22 8:16 UTC (permalink / raw
To: gentoo-commits
commit: 3d30150e6f44f8b689d9e6e9cc4bc854dc9c1aab
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 17 19:21:03 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Sep 22 08:11:15 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d30150e
dev-qt/qtwebengine: update patchsets in live (qt6)
6.7-12 -> 6.7-13, and 6.8-3 -> 6.8-4 changes:
Updated:
* cstdint.patch (merged extra chunk from files/)
Dropped:
* clang19.patch (upstreamed)
* gcc15.patch (upstreamed)
Note:
6.8 patches are known to not apply right now, but that is because
they are made for the 6.8.0 branch (in preparation for release) while
the ebuild uses dev 6.8 which moved on to 6.8.1 and broke a patch.
Will update again sometime only after release is out of the way given
do not care to test 6.8.1 right now. Or earlier if the change is
backported to 6.8.0 in the interim.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 4 ++--
dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 3 +--
dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild | 3 +--
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 3 +--
4 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index b150eeb57f17..dc7b9dad559e 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,6 +1,6 @@
DIST qtwebengine-5.15.13_p20240510.tar.xz 301422784 BLAKE2B b63acccb4740ddb3dd5c76ef9808d946eb2c93b10b45125622adcb5c5e951644ac54612e7aeb9e009e00c5ca8913d3f8b5dfa530c274fec87c4a8377bf1068fb SHA512 0ccc1be0825f4cf2387879241a21f033b5a0198da4e93f2e0533296ec485b103c1ab35aa71a2a9d9c16364979d45d3dd2e13f7e6d0e2a21f94d85294c5819eb3
DIST qtwebengine-5.15.14_p20240510-patchset.tar.xz 20780 BLAKE2B 516d4c628c4b027ab3a7159da006a57173be91de3eb4b7f308029953d4fd19fb3e790ca38e79d17fef75d8d9b392676650acb9285d5913f9ebecaa4136575c47 SHA512 492979d118d6bd9165ee194724e38b627d19c89dbe1daa6b2f55e4a8fc7676748a1eacb9623ee05e09140c2c4a2ac82ddafaef5c45630a117ce0ed14b240a474
DIST qtwebengine-6.7-patchset-11.tar.xz 10004 BLAKE2B 10d96134cd02ca4665f72369817f55e2bf0eb209b5d7c4f6131cd3a1be193940c62f656a65081c77ac0dd7aa7bdda76d6ff3f994f8f6c815b249a33b797a10c2 SHA512 198f19d9e20f146878a6050cde435f4662c0d42a6ed21650bfadaab217b2e369284a1a11e5a01d096d3af3f0b34fe24f9bdc0195d37f7f74076b862503bb6c9f
-DIST qtwebengine-6.7-patchset-12.tar.xz 9788 BLAKE2B 2465c43fe859ea6edbb1c14d82f9bd41e5bda5a32a9412e25a5eac385d2125d81e72a9f80f83b4c41da82b3fb96c31ad4603ad061077a927882d165ba5f3d7e4 SHA512 a50823e486106da69de7c6010cfdfd92d3312c574d00616ae83fe54de187ea3bd6d41310a9a3951c876432542ddea23a8391580beddf1b096fdf7c7dbab37e72
-DIST qtwebengine-6.8-patchset-3.tar.xz 9260 BLAKE2B 6d4e0bcc24ecc16ce92f6d4483268e81f0d9a9cb2a351a46cd93b9103a6cedd478f3004a67380f364523db9c7c152eb4b5cb39046edaf52b223490e32d9022a2 SHA512 10982a896e61b18153fd8b38431cfba6956dacda2efd3d08d89e9617a2c1fb2d1286d32213b50ccc25046bf539862b3ba4379824526e021a5e793df986888881
+DIST qtwebengine-6.7-patchset-13.tar.xz 8312 BLAKE2B 8483dff26fdc1479d72bf77d176bf747415be989889946bca96f9ddd1612ab2307afbea40fa908f5644893401bf62e4e334b48a3afe86c2028b13246905eae36 SHA512 546883aa8903bf34bc97d5a8d4d8fe39b55d059acab91fd2979b028c268ef30872a8e078ee5d9bca85f393d689010e937a3cdad421098629a8278e113f84fadd
+DIST qtwebengine-6.8-patchset-4.tar.xz 7612 BLAKE2B 400bc156b54bf00956ce4ab9b2ef070fcb31636184ecaee6b763f5dec4355274bde049bd6d3bb67923c8fdc202eeb26eee1664f7cca7c9cdcf7f24123a1cc760 SHA512 6f99a24ff4c7b61e9f855ab9eb8d31b73030291a5609b03fa92d3c44a200d5db9c7a75c7c70393fca1f542bc548ff588b3ab0c62a80feeacd4b42096ec3b889f
DIST qtwebengine-everywhere-src-6.7.2.tar.xz 550888844 BLAKE2B 2de049c9284583940bd1a9611a00c88a4f330a3b0bab8291d11296b8532d9f4e41be0d019045aca3d5983c3cfd6254d9e50c1133a497d03ef615fb74973e10f0 SHA512 5e1f65b5c0cecd62623ac386bbc89b1222f41b8c17cec1dd43851692d21f56e8b2dba45dab9405c33e88e1d1b24998d93dbcbf371a6504a1c8cdb1a6b5a94bf7
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index a6e9836f4ad9..07490b941cb3 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs
DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
SRC_URI+="
- https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-12.tar.xz
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-13.tar.xz
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
@@ -110,7 +110,6 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
PATCHES+=(
# add extras as needed here, may merge in set if carries across versions
- "${FILESDIR}"/${PN}-6.7.2-musl-cstdint.patch
)
python_check_deps() {
diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
index 2fc66a0cfb03..040cde6137b6 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
@@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs
DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
SRC_URI+="
- https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-3.tar.xz
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-4.tar.xz
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
@@ -109,7 +109,6 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
PATCHES+=(
# add extras as needed here, may merge in set if carries across versions
- "${FILESDIR}"/${PN}-6.7.2-musl-cstdint.patch
)
python_check_deps() {
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 2fc66a0cfb03..040cde6137b6 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs
DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
SRC_URI+="
- https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-3.tar.xz
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-4.tar.xz
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
@@ -109,7 +109,6 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
PATCHES+=(
# add extras as needed here, may merge in set if carries across versions
- "${FILESDIR}"/${PN}-6.7.2-musl-cstdint.patch
)
python_check_deps() {
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-09-03 7:44 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-09-03 7:44 UTC (permalink / raw
To: gentoo-commits
commit: a5ab0becca55c5723ce4903c3e1193f4553a7d86
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 3 07:29:10 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 3 07:43:26 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5ab0bec
dev-qt/qtwebengine: cleanup exporting NINJA
Not used anymore given patch was removed in favor of relying
on app-alternatives/ninja to select. NINJAFLAGS is still
recognized by a patch (not by ninja!).
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index 068abfec79cb..49de5422603a 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -243,7 +243,7 @@ src_configure() {
use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
fi
- export NINJA NINJAFLAGS=$(get_NINJAOPTS)
+ export NINJAFLAGS=$(get_NINJAOPTS)
[[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
index f5dd4f0bc835..fec93a911d24 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
@@ -244,7 +244,7 @@ src_configure() {
use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
fi
- export NINJA NINJAFLAGS=$(get_NINJAOPTS)
+ export NINJAFLAGS=$(get_NINJAOPTS)
[[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index f5dd4f0bc835..fec93a911d24 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -244,7 +244,7 @@ src_configure() {
use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
fi
- export NINJA NINJAFLAGS=$(get_NINJAOPTS)
+ export NINJAFLAGS=$(get_NINJAOPTS)
[[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-09-03 7:44 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-09-03 7:44 UTC (permalink / raw
To: gentoo-commits
commit: 0ecb8ab7ee3e58c2f57a301af75a1e581a451fcc
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 3 06:18:25 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 3 07:43:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ecb8ab7
dev-qt/qtwebengine: update build space requirement for 6.8+
Last build test for 6.8.9999 used exactly 8.0GiB, ebuild checks
for 8G but that's too borderline and should do +1
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
index 9b53b2db546f..f5dd4f0bc835 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
@@ -127,7 +127,7 @@ qtwebengine_check-reqs() {
ewarn "If run into issues, please try disabling before reporting a bug."
fi
- local CHECKREQS_DISK_BUILD=8G
+ local CHECKREQS_DISK_BUILD=9G
local CHECKREQS_DISK_USR=360M
if ! has distcc ${FEATURES}; then #830661
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 9b53b2db546f..f5dd4f0bc835 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -127,7 +127,7 @@ qtwebengine_check-reqs() {
ewarn "If run into issues, please try disabling before reporting a bug."
fi
- local CHECKREQS_DISK_BUILD=8G
+ local CHECKREQS_DISK_BUILD=9G
local CHECKREQS_DISK_USR=360M
if ! has distcc ${FEATURES}; then #830661
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-09-03 0:31 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-09-03 0:31 UTC (permalink / raw
To: gentoo-commits
commit: e8994817167cfaae099776f280f1737b7a740a42
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 2 23:00:00 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 3 00:29:36 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8994817
dev-qt/qtwebengine: skip tst_certificateerror in 6.8+
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild | 1 +
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
index fa19dc8fba43..9b53b2db546f 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
@@ -269,6 +269,7 @@ src_test() {
local CMAKE_SKIP_TESTS=(
# fails with network sandbox
+ tst_certificateerror
tst_loadsignals
tst_qquickwebengineview
tst_qwebengineglobalsettings
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index fa19dc8fba43..9b53b2db546f 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -269,6 +269,7 @@ src_test() {
local CMAKE_SKIP_TESTS=(
# fails with network sandbox
+ tst_certificateerror
tst_loadsignals
tst_qquickwebengineview
tst_qwebengineglobalsettings
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-09-02 17:52 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-09-02 17:52 UTC (permalink / raw
To: gentoo-commits
commit: bb6ad6b24b9f801287def9321f83cb450ecfa9c6
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 2 16:26:03 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Sep 2 17:51:30 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb6ad6b2
dev-qt/qtwebengine: update live
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 13 ++-----------
dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild | 18 +++++-------------
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 18 +++++-------------
3 files changed, 12 insertions(+), 37 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index 4315b3198309..068abfec79cb 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -203,8 +203,8 @@ src_configure() {
# cooperate with new major ffmpeg versions (bug #831487)
-DQT_FEATURE_webengine_system_ffmpeg=OFF
- # use bundled re2 to avoid complications, may revisit
- # (see discussions in https://github.com/gentoo/gentoo/pull/32281)
+ # use bundled re2 to avoid complications, Qt has also disabled
+ # this by default in 6.7.3+ (bug #913923)
-DQT_FEATURE_webengine_system_re2=OFF
# bundled is currently required when using vaapi (forced regardless)
@@ -243,15 +243,6 @@ src_configure() {
use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
fi
- # Workaround for build failure with clang-18 and -march=native without
- # avx512. Does not affect e.g. -march=skylake, only native (bug #931623).
- # TODO: drop this when <=llvm-18.1.5-r1 >=18 been gone for some time
- use amd64 && tc-is-clang && is-flagq -march=native &&
- [[ $(clang-major-version) -ge 18 ]] &&
- has_version '<sys-devel/llvm-18.1.5-r1' &&
- tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
- append-flags -mevex512
-
export NINJA NINJAFLAGS=$(get_NINJAOPTS)
[[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
index 937f5ca9c883..fa19dc8fba43 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
@@ -88,7 +88,6 @@ DEPEND="
x11-libs/libxshmfence
opengl? ( media-libs/libglvnd[X] )
screencast? ( media-libs/libepoxy[egl(+)] )
- pdfium? ( net-print/cups )
test? (
widgets? ( app-text/poppler[cxx(+)] )
)
@@ -192,7 +191,8 @@ src_configure() {
$(qt_feature vulkan webengine_vulkan)
-DQT_FEATURE_webengine_embedded_build=OFF
-DQT_FEATURE_webengine_extensions=ON
- -DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet
+ # TODO: it may be possible to make x11 optional since 6.8+
+ -DQT_FEATURE_webengine_ozone_x11=ON
-DQT_FEATURE_webengine_pepper_plugins=ON
-DQT_FEATURE_webengine_printing_and_pdf=ON
-DQT_FEATURE_webengine_spellchecker=ON
@@ -203,8 +203,8 @@ src_configure() {
# cooperate with new major ffmpeg versions (bug #831487)
-DQT_FEATURE_webengine_system_ffmpeg=OFF
- # use bundled re2 to avoid complications, may revisit
- # (see discussions in https://github.com/gentoo/gentoo/pull/32281)
+ # use bundled re2 to avoid complications, Qt has also disabled
+ # this by default in 6.7.3+ (bug #913923)
-DQT_FEATURE_webengine_system_re2=OFF
# bundled is currently required when using vaapi (forced regardless)
@@ -217,6 +217,7 @@ src_configure() {
minizip opus poppler snappy zlib)
# TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
+ # (see also BUILD_ONLY_GN option added in 6.8+ for the latter)
-DINSTALL_GN=OFF
)
@@ -243,15 +244,6 @@ src_configure() {
use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
fi
- # Workaround for build failure with clang-18 and -march=native without
- # avx512. Does not affect e.g. -march=skylake, only native (bug #931623).
- # TODO: drop this when <=llvm-18.1.5-r1 >=18 been gone for some time
- use amd64 && tc-is-clang && is-flagq -march=native &&
- [[ $(clang-major-version) -ge 18 ]] &&
- has_version '<sys-devel/llvm-18.1.5-r1' &&
- tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
- append-flags -mevex512
-
export NINJA NINJAFLAGS=$(get_NINJAOPTS)
[[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 937f5ca9c883..fa19dc8fba43 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -88,7 +88,6 @@ DEPEND="
x11-libs/libxshmfence
opengl? ( media-libs/libglvnd[X] )
screencast? ( media-libs/libepoxy[egl(+)] )
- pdfium? ( net-print/cups )
test? (
widgets? ( app-text/poppler[cxx(+)] )
)
@@ -192,7 +191,8 @@ src_configure() {
$(qt_feature vulkan webengine_vulkan)
-DQT_FEATURE_webengine_embedded_build=OFF
-DQT_FEATURE_webengine_extensions=ON
- -DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet
+ # TODO: it may be possible to make x11 optional since 6.8+
+ -DQT_FEATURE_webengine_ozone_x11=ON
-DQT_FEATURE_webengine_pepper_plugins=ON
-DQT_FEATURE_webengine_printing_and_pdf=ON
-DQT_FEATURE_webengine_spellchecker=ON
@@ -203,8 +203,8 @@ src_configure() {
# cooperate with new major ffmpeg versions (bug #831487)
-DQT_FEATURE_webengine_system_ffmpeg=OFF
- # use bundled re2 to avoid complications, may revisit
- # (see discussions in https://github.com/gentoo/gentoo/pull/32281)
+ # use bundled re2 to avoid complications, Qt has also disabled
+ # this by default in 6.7.3+ (bug #913923)
-DQT_FEATURE_webengine_system_re2=OFF
# bundled is currently required when using vaapi (forced regardless)
@@ -217,6 +217,7 @@ src_configure() {
minizip opus poppler snappy zlib)
# TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
+ # (see also BUILD_ONLY_GN option added in 6.8+ for the latter)
-DINSTALL_GN=OFF
)
@@ -243,15 +244,6 @@ src_configure() {
use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
fi
- # Workaround for build failure with clang-18 and -march=native without
- # avx512. Does not affect e.g. -march=skylake, only native (bug #931623).
- # TODO: drop this when <=llvm-18.1.5-r1 >=18 been gone for some time
- use amd64 && tc-is-clang && is-flagq -march=native &&
- [[ $(clang-major-version) -ge 18 ]] &&
- has_version '<sys-devel/llvm-18.1.5-r1' &&
- tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
- append-flags -mevex512
-
export NINJA NINJAFLAGS=$(get_NINJAOPTS)
[[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-07-23 7:50 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-07-23 7:50 UTC (permalink / raw
To: gentoo-commits
commit: 74214006c987b8886d7916138b44fcc7635d0ca3
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 23 06:30:39 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jul 23 07:49:09 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74214006
dev-qt/qtwebengine: update 6.7 and 6.8 patchsets
6.7-9 -> 6.7-10 changes:
Added:
* gcc15.patch (with two fixes wrt bug #936415, built fine
with all USE enabled using gcc-15.0.0_pre20240721)
6.8-1 -> 6.8-2 changes:
Added:
* gcc15.patch (including an additional fix for 6.8+, untested)
Removed:
* ninja1.12.patch (upstreamed)
+ minor rebasing where needed
Closes: https://bugs.gentoo.org/936415
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 4 ++--
dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index f122e64de1cd..b3f79b883766 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,5 +1,5 @@
DIST qtwebengine-5.15.13_p20240510.tar.xz 301422784 BLAKE2B b63acccb4740ddb3dd5c76ef9808d946eb2c93b10b45125622adcb5c5e951644ac54612e7aeb9e009e00c5ca8913d3f8b5dfa530c274fec87c4a8377bf1068fb SHA512 0ccc1be0825f4cf2387879241a21f033b5a0198da4e93f2e0533296ec485b103c1ab35aa71a2a9d9c16364979d45d3dd2e13f7e6d0e2a21f94d85294c5819eb3
DIST qtwebengine-5.15.14_p20240510-patchset.tar.xz 20780 BLAKE2B 516d4c628c4b027ab3a7159da006a57173be91de3eb4b7f308029953d4fd19fb3e790ca38e79d17fef75d8d9b392676650acb9285d5913f9ebecaa4136575c47 SHA512 492979d118d6bd9165ee194724e38b627d19c89dbe1daa6b2f55e4a8fc7676748a1eacb9623ee05e09140c2c4a2ac82ddafaef5c45630a117ce0ed14b240a474
-DIST qtwebengine-6.7-patchset-9.tar.xz 7440 BLAKE2B 061f39250450af3c8d4458649c80c18d0bf8448061e0bb91f8a0d7c630ff1cd2ee19a9528998c5a4a3ebab1e96ea0ba579cc0db5d879fe56a1239901942ba933 SHA512 4dabb56d6c74600f8d5a4ebb4356ffaaff1814eefe1cb268e33749fee034e9488e34043d0ce0893138ee01b023c09298c737bca3875a30be1bf862a145e244c7
-DIST qtwebengine-6.8-patchset-1.tar.xz 7512 BLAKE2B 04eee1a1008f8a193dbb719e08c61e26a78cb68f3a0b9f7cc43b442bd2d851301682009ad7cd96df13da1c0aa7e9459b1b7024193379509abd4784e2547276e7 SHA512 591e5340435a8a40b6805d3db07b440bf185c694461382051c668e41f2ea5d04d5d7ab72602f557ee91a687d6187e919d662751e32dadaea8dc19de568e2c54e
+DIST qtwebengine-6.7-patchset-10.tar.xz 7940 BLAKE2B f3ed0e75731f29f37714ef7c0536f92a758bb1f204cf3b6aa3b9b32ab9baae27a7649d030bee5962964619692dd5888d089bf4437505d1c1c330cc4c05aca17e SHA512 db3a566a073daa34d678a06b51cf57e8818f2d42847dc9e606522040bbd3b75ae56fd41ce466880855cfdf558d680204dc5ccea8046749b18784e75aa12efe47
+DIST qtwebengine-6.8-patchset-2.tar.xz 7932 BLAKE2B 3642f619c66075e26703200818e833786a8686bf39258eee9bba95e234f79878f0b98680e8228a5b2cc39b02b0ecc36074ac96eb09f3bca145bb7aa9fd023310 SHA512 4a248d6e7bd052b5681a531fe503954aa519a8ed46cce2b3fafe8de603818f20e80a365e304f919817a6a0c12fdc517a0471f5c6dc499e648fd5405456c9fba3
DIST qtwebengine-everywhere-src-6.7.2.tar.xz 550888844 BLAKE2B 2de049c9284583940bd1a9611a00c88a4f330a3b0bab8291d11296b8532d9f4e41be0d019045aca3d5983c3cfd6254d9e50c1133a497d03ef615fb74973e10f0 SHA512 5e1f65b5c0cecd62623ac386bbc89b1222f41b8c17cec1dd43851692d21f56e8b2dba45dab9405c33e88e1d1b24998d93dbcbf371a6504a1c8cdb1a6b5a94bf7
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild
index bd95d3e001b0..558e4e9ca86c 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild
@@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs
DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
SRC_URI+="
- https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-9.tar.xz
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-10.tar.xz
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index 1ad6561ecc65..73f482a28fcd 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs
DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
SRC_URI+="
- https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-9.tar.xz
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-10.tar.xz
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
index 16c70f30d158..66f2a52045b6 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
@@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs
DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
SRC_URI+="
- https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-1.tar.xz
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-2.tar.xz
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 16c70f30d158..66f2a52045b6 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs
DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
SRC_URI+="
- https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-1.tar.xz
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-2.tar.xz
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-07-16 1:29 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-07-16 1:29 UTC (permalink / raw
To: gentoo-commits
commit: 5bb3fc3bf0ac3fb42ed004fc120613fa8c2546a1
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 00:56:04 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 01:01:10 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bb3fc3b
dev-qt/qtwebengine: drop 6.7.1
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 2 -
dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild | 335 ----------------------------
2 files changed, 337 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 3653279b471a..f122e64de1cd 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,7 +1,5 @@
DIST qtwebengine-5.15.13_p20240510.tar.xz 301422784 BLAKE2B b63acccb4740ddb3dd5c76ef9808d946eb2c93b10b45125622adcb5c5e951644ac54612e7aeb9e009e00c5ca8913d3f8b5dfa530c274fec87c4a8377bf1068fb SHA512 0ccc1be0825f4cf2387879241a21f033b5a0198da4e93f2e0533296ec485b103c1ab35aa71a2a9d9c16364979d45d3dd2e13f7e6d0e2a21f94d85294c5819eb3
DIST qtwebengine-5.15.14_p20240510-patchset.tar.xz 20780 BLAKE2B 516d4c628c4b027ab3a7159da006a57173be91de3eb4b7f308029953d4fd19fb3e790ca38e79d17fef75d8d9b392676650acb9285d5913f9ebecaa4136575c47 SHA512 492979d118d6bd9165ee194724e38b627d19c89dbe1daa6b2f55e4a8fc7676748a1eacb9623ee05e09140c2c4a2ac82ddafaef5c45630a117ce0ed14b240a474
-DIST qtwebengine-6.7-patchset-8.tar.xz 8320 BLAKE2B 88f31506865aeef02d6ad0c46dacd478f4c77330815648bf5377762b9f053f5a51b6426c1fbeef81fff5c3a9f4e853f8d51013d5df27fcd0ab0449ce369e18e5 SHA512 1d8e1f8e15a13c6f1675208ba1a329dfa335031e06577de39dc89464b40bd5cf7df7bce4f09f6e67a84c1c2f7aa1fbf6d2d94ea8c142ec5ea67bac8cef1b03b1
DIST qtwebengine-6.7-patchset-9.tar.xz 7440 BLAKE2B 061f39250450af3c8d4458649c80c18d0bf8448061e0bb91f8a0d7c630ff1cd2ee19a9528998c5a4a3ebab1e96ea0ba579cc0db5d879fe56a1239901942ba933 SHA512 4dabb56d6c74600f8d5a4ebb4356ffaaff1814eefe1cb268e33749fee034e9488e34043d0ce0893138ee01b023c09298c737bca3875a30be1bf862a145e244c7
DIST qtwebengine-6.8-patchset-1.tar.xz 7512 BLAKE2B 04eee1a1008f8a193dbb719e08c61e26a78cb68f3a0b9f7cc43b442bd2d851301682009ad7cd96df13da1c0aa7e9459b1b7024193379509abd4784e2547276e7 SHA512 591e5340435a8a40b6805d3db07b440bf185c694461382051c668e41f2ea5d04d5d7ab72602f557ee91a687d6187e919d662751e32dadaea8dc19de568e2c54e
-DIST qtwebengine-everywhere-src-6.7.1.tar.xz 550975920 BLAKE2B b0bbe1d62132bc75f830df7e40d885e976629e759de442702043c71b50a11e874d06c9450378c522894d5e29cc07e05111554758b5bb6aaeca59de1720d6550f SHA512 dc70048bf65ef610dd9cec7e233f1e5a387bde620e84ee5a8e517fc9c326220d58c80939454d55481ceff5ac5b82baaa9823255ea43eb4bb43e86beae68c7b8c
DIST qtwebengine-everywhere-src-6.7.2.tar.xz 550888844 BLAKE2B 2de049c9284583940bd1a9611a00c88a4f330a3b0bab8291d11296b8532d9f4e41be0d019045aca3d5983c3cfd6254d9e50c1133a497d03ef615fb74973e10f0 SHA512 5e1f65b5c0cecd62623ac386bbc89b1222f41b8c17cec1dd43851692d21f56e8b2dba45dab9405c33e88e1d1b24998d93dbcbf371a6504a1c8cdb1a6b5a94bf7
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild
deleted file mode 100644
index 5a2f200aba85..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild
+++ /dev/null
@@ -1,335 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..13} )
-PYTHON_REQ_USE="xml(+)"
-inherit check-reqs flag-o-matic multiprocessing optfeature
-inherit prefix python-any-r1 qt6-build toolchain-funcs
-
-DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
-SRC_URI+="
- https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-8.tar.xz
-"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm64"
-fi
-
-IUSE="
- accessibility +alsa bindist custom-cflags designer geolocation
- +jumbo-build kerberos opengl pdfium pulseaudio qml screencast
- +system-icu vaapi vulkan webdriver +widgets
-"
-REQUIRED_USE="
- designer? ( qml widgets )
-"
-
-# dlopen: krb5, libva, pciutils, udev
-# gcc: for -latomic
-RDEPEND="
- app-arch/snappy:=
- dev-libs/expat
- dev-libs/libevent:=
- dev-libs/libxml2[icu]
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- ~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl=,vulkan?,widgets?]
- ~dev-qt/qtdeclarative-${PV}:6[widgets?]
- ~dev-qt/qtwebchannel-${PV}:6[qml?]
- media-libs/fontconfig
- media-libs/freetype
- media-libs/harfbuzz:=
- media-libs/lcms:2
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- media-libs/libwebp:=
- media-libs/mesa[gbm(+)]
- media-libs/openjpeg:2=
- media-libs/opus
- media-libs/tiff:=
- sys-apps/dbus
- sys-apps/pciutils
- sys-devel/gcc:*
- sys-libs/zlib:=[minizip]
- virtual/libudev
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libXtst
- x11-libs/libdrm
- x11-libs/libxcb:=
- x11-libs/libxkbcommon
- x11-libs/libxkbfile
- alsa? ( media-libs/alsa-lib )
- designer? ( ~dev-qt/qttools-${PV}:6[designer] )
- geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
- kerberos? ( virtual/krb5 )
- pulseaudio? ( media-libs/libpulse[glib] )
- screencast? (
- dev-libs/glib:2
- media-video/pipewire:=
- )
- system-icu? ( dev-libs/icu:= )
- vaapi? ( media-libs/libva:=[X] )
- !vaapi? ( media-libs/libvpx:= )
-"
-DEPEND="
- ${RDEPEND}
- media-libs/libglvnd
- x11-base/xorg-proto
- x11-libs/libXcursor
- x11-libs/libXi
- x11-libs/libxshmfence
- opengl? ( media-libs/libglvnd[X] )
- screencast? ( media-libs/libepoxy[egl(+)] )
- pdfium? ( net-print/cups )
- test? (
- widgets? ( app-text/poppler[cxx(+)] )
- )
- vaapi? (
- vulkan? ( dev-util/vulkan-headers )
- )
-"
-BDEPEND="
- $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
- dev-util/gperf
- net-libs/nodejs[ssl]
- sys-devel/bison
- sys-devel/flex
-"
-
-PATCHES=( "${WORKDIR}"/patches/${PN} )
-[[ ${PV} == 6.9999 ]] || # too fragile for 6.9999, but keep for 6.x.9999
- PATCHES+=( "${WORKDIR}"/patches/chromium )
-
-PATCHES+=(
- # add extras as needed here, may merge in set if carries across versions
-)
-
-python_check_deps() {
- python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
-}
-
-qtwebengine_check-reqs() {
- [[ ${MERGE_TYPE} == binary ]] && return
-
- if is-flagq '-g?(gdb)?([1-9])'; then #307861
- ewarn
- ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which"
- ewarn "is non-trivial with ${PN}. May experience extended compilation"
- ewarn "times, increased disk/memory usage, and potentially link failure."
- ewarn
- ewarn "If run into issues, please try disabling before reporting a bug."
- fi
-
- local CHECKREQS_DISK_BUILD=8G
- local CHECKREQS_DISK_USR=360M
-
- if ! has distcc ${FEATURES}; then #830661
- # assume ~2GB per job or 1.5GB if clang, possible with less
- # depending on free memory and *FLAGS, but prefer being safe as
- # users having OOM issues with qtwebengine been rather common
- tc-is-clang && : 15 || : 20
- local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G
- fi
-
- check-reqs_${EBUILD_PHASE_FUNC} #570534
-}
-
-pkg_pretend() {
- qtwebengine_check-reqs
-}
-
-pkg_setup() {
- qtwebengine_check-reqs
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- qt6-build_src_prepare
-
- # for www-plugins/chrome-binary-plugins (widevine) search paths on prefix
- hprefixify -w /Gentoo/ src/core/content_client_qt.cpp
-
- # store chromium versions, only used in postinst for a warning
- local chromium
- mapfile -t chromium < CHROMIUM_VERSION || die
- [[ ${chromium[1]} =~ ^Based.*:[^0-9]+([0-9.]+$) ]] &&
- QT6_CHROMIUM_VER=${BASH_REMATCH[1]} || die
- [[ ${chromium[2]} =~ ^Patched.+:[^0-9]+([0-9.]+$) ]] &&
- QT6_CHROMIUM_PATCHES_VER=${BASH_REMATCH[1]} || die
-}
-
-src_configure() {
- local mycmakeargs=(
- $(qt_feature pdfium qtpdf_build)
- $(qt_feature qml qtpdf_quick_build)
- $(qt_feature webdriver webenginedriver)
- $(qt_feature widgets qtpdf_widgets_build)
- $(usev pdfium -DQT_FEATURE_pdf_v8=ON)
-
- -DQT_FEATURE_qtwebengine_build=ON
- $(qt_feature qml qtwebengine_quick_build)
- $(qt_feature widgets qtwebengine_widgets_build)
-
- $(cmake_use_find_package designer Qt6Designer)
-
- $(qt_feature alsa webengine_system_alsa)
- $(qt_feature !bindist webengine_proprietary_codecs)
- $(qt_feature geolocation webengine_geolocation)
- $(qt_feature jumbo-build webengine_jumbo_build)
- $(qt_feature kerberos webengine_kerberos)
- $(qt_feature pulseaudio webengine_system_pulseaudio)
- $(qt_feature screencast webengine_webrtc_pipewire)
- $(qt_feature system-icu webengine_system_icu)
- $(qt_feature vaapi webengine_vaapi)
- $(qt_feature vulkan webengine_vulkan)
- -DQT_FEATURE_webengine_embedded_build=OFF
- -DQT_FEATURE_webengine_extensions=ON
- -DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet
- -DQT_FEATURE_webengine_pepper_plugins=ON
- -DQT_FEATURE_webengine_printing_and_pdf=ON
- -DQT_FEATURE_webengine_spellchecker=ON
- -DQT_FEATURE_webengine_webchannel=ON
- -DQT_FEATURE_webengine_webrtc=ON
-
- # needs a modified ffmpeg to be usable, and even then it may not
- # cooperate with new major ffmpeg versions (bug #831487)
- -DQT_FEATURE_webengine_system_ffmpeg=OFF
-
- # use bundled re2 to avoid complications, may revisit
- # (see discussions in https://github.com/gentoo/gentoo/pull/32281)
- -DQT_FEATURE_webengine_system_re2=OFF
-
- # bundled is currently required when using vaapi (forced regardless)
- $(qt_feature !vaapi webengine_system_libvpx)
-
- # not necessary to pass these (default), but in case detection fails
- $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
- freetype gbm glib harfbuzz lcms2 libevent libjpeg \
- libopenjpeg2 libpci libpng libtiff libwebp libxml \
- minizip opus poppler snappy zlib)
-
- # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
- -DINSTALL_GN=OFF
- )
-
- local mygnargs=(
- # prefer no dlopen where possible
- $(usev pulseaudio link_pulseaudio=true)
- $(usev screencast rtc_link_pipewire=true)
- # reduce default disk space usage
- symbol_level=0
- )
-
- if use !custom-cflags; then
- strip-flags # fragile
-
- if is-flagq '-g?(gdb)?([2-9])'; then #914475
- replace-flags '-g?(gdb)?([2-9])' -g1
- ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"
- fi
-
- # Built helpers segfault when using (at least) -march=armv8-a+pauth
- # (bug #920555, #920568 -- suspected gcc bug). For now, filter all
- # for simplicity. Override with USE=custom-cflags if wanted, please
- # report if above -march works again so can cleanup.
- use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
- fi
-
- # Workaround for build failure with clang-18 and -march=native without
- # avx512. Does not affect e.g. -march=skylake, only native (bug #931623).
- # TODO: drop this when <=llvm-18.1.5-r1 >=18 been gone for some time
- use amd64 && tc-is-clang && is-flagq -march=native &&
- [[ $(clang-major-version) -ge 18 ]] &&
- has_version '<sys-devel/llvm-18.1.5-r1' &&
- tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
- append-flags -mevex512
-
- export NINJA NINJAFLAGS=$(get_NINJAOPTS)
- [[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
-
- local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
- einfo "Extra Gn args: ${EXTRA_GN}"
-
- qt6-build_src_configure
-}
-
-src_compile() {
- # tentatively work around a possible (rare) race condition (bug #921680)
- cmake_build WebEngineCore_sync_all_public_headers
-
- cmake_src_compile
-}
-
-src_test() {
- if [[ ${EUID} == 0 ]]; then
- # almost every tests fail, so skip entirely
- ewarn "Skipping tests due to running as root (chromium refuses this configuration)."
- return
- fi
-
- local CMAKE_SKIP_TESTS=(
- # fails with network sandbox
- tst_loadsignals
- tst_qquickwebengineview
- tst_qwebengineglobalsettings
- tst_qwebengineview
- # fails with offscreen rendering, may be worth retrying if the issue
- # persist given these are rather major tests (or consider virtx)
- tst_qmltests
- tst_qwebenginepage
- # certs verfication seems flaky and gives expiration warnings
- tst_qwebengineclientcertificatestore
- # test is misperformed when qtbase is built USE=-test?
- tst_touchinput
- # currently requires webenginedriver to be already installed
- tst_webenginedriver
- )
-
- # prevent using the system's qtwebengine
- # (use glob to avoid unnecessary complications with arch dir)
- local resources=( "${BUILD_DIR}/src/core/${CMAKE_BUILD_TYPE}/"* )
- [[ -d ${resources[0]} ]] || die "invalid resources path: ${resources[0]}"
- local -x QTWEBENGINEPROCESS_PATH=${BUILD_DIR}${QT6_LIBEXECDIR#"${QT6_PREFIX}"}/QtWebEngineProcess
- local -x QTWEBENGINE_LOCALES_PATH=${resources[0]}/qtwebengine_locales
- local -x QTWEBENGINE_RESOURCES_PATH=${resources[0]}
-
- # random failures in several tests without -j1
- qt6-build_src_test -j1
-}
-
-src_install() {
- qt6-build_src_install
-
- [[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472
- die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
-
- if use test && use webdriver; then
- rm -- "${D}${QT6_BINDIR}"/testbrowser || die
- fi
-}
-
-pkg_postinst() {
- # plugin may also be found in $HOME if provided by chrome or firefox
- use amd64 &&
- optfeature "Widevine DRM support (protected media playback)" \
- www-plugins/chrome-binary-plugins
-
- elog
- elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with"
- elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. 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
- 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 "tl;dr your web browsing experience will be compromised."
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-07-08 11:16 Arthur Zamarin
0 siblings, 0 replies; 301+ messages in thread
From: Arthur Zamarin @ 2024-07-08 11:16 UTC (permalink / raw
To: gentoo-commits
commit: d674fcbeb546c0b2579c948274c4f7c476e8893e
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 8 11:15:13 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 8 11:15:13 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d674fcbe
dev-qt/qtwebengine: Stabilize 6.7.2 arm64, #935728
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild
index 1ad6561ecc65..998402dc347e 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI+="
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm64"
+ KEYWORDS="~amd64 arm64"
fi
IUSE="
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-06-21 1:10 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-06-21 1:10 UTC (permalink / raw
To: gentoo-commits
commit: a2dfd665eeb527282c2bc51756b2881c134ce8b4
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 21 01:00:40 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Jun 21 01:03:45 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2dfd665
dev-qt/qtwebengine: alternate fix for USE="pdfium -pulseaudio" (qt6)
Just realized the issue is self-inflicted. The pkg-config check
is done only if "use_pulseaudio && link_pulseaudio" and the latter
is passed by us rather than Qt.
It seemed harmless to be unconditional given the main switch
disabled it (which technically sounds better), but given it
doesn't for pdfium let's change that and do it for pipewire
as well while at it.
Bug: https://bugs.gentoo.org/934635
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild | 6 ++----
dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild | 6 ++----
dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 6 ++----
dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild | 6 ++----
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 6 ++----
5 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild
index 9a079c75fbdb..5a2f200aba85 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild
@@ -221,11 +221,9 @@ src_configure() {
)
local mygnargs=(
- # prevent pdfium from looking for it if disabled (bug #934635)
- use_pulseaudio=$(usex pulseaudio true false)
# prefer no dlopen where possible
- link_pulseaudio=true
- rtc_link_pipewire=true
+ $(usev pulseaudio link_pulseaudio=true)
+ $(usev screencast rtc_link_pipewire=true)
# reduce default disk space usage
symbol_level=0
)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild
index 196438e3994d..3726d7743a00 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild
@@ -221,11 +221,9 @@ src_configure() {
)
local mygnargs=(
- # prevent pdfium from looking for it if disabled (bug #934635)
- use_pulseaudio=$(usex pulseaudio true false)
# prefer no dlopen where possible
- link_pulseaudio=true
- rtc_link_pipewire=true
+ $(usev pulseaudio link_pulseaudio=true)
+ $(usev screencast rtc_link_pipewire=true)
# reduce default disk space usage
symbol_level=0
)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index 196438e3994d..3726d7743a00 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -221,11 +221,9 @@ src_configure() {
)
local mygnargs=(
- # prevent pdfium from looking for it if disabled (bug #934635)
- use_pulseaudio=$(usex pulseaudio true false)
# prefer no dlopen where possible
- link_pulseaudio=true
- rtc_link_pipewire=true
+ $(usev pulseaudio link_pulseaudio=true)
+ $(usev screencast rtc_link_pipewire=true)
# reduce default disk space usage
symbol_level=0
)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
index 700b65e1e2c1..16c70f30d158 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
@@ -221,11 +221,9 @@ src_configure() {
)
local mygnargs=(
- # prevent pdfium from looking for it if disabled (bug #934635)
- use_pulseaudio=$(usex pulseaudio true false)
# prefer no dlopen where possible
- link_pulseaudio=true
- rtc_link_pipewire=true
+ $(usev pulseaudio link_pulseaudio=true)
+ $(usev screencast rtc_link_pipewire=true)
# reduce default disk space usage
symbol_level=0
)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 700b65e1e2c1..16c70f30d158 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -221,11 +221,9 @@ src_configure() {
)
local mygnargs=(
- # prevent pdfium from looking for it if disabled (bug #934635)
- use_pulseaudio=$(usex pulseaudio true false)
# prefer no dlopen where possible
- link_pulseaudio=true
- rtc_link_pipewire=true
+ $(usev pulseaudio link_pulseaudio=true)
+ $(usev screencast rtc_link_pipewire=true)
# reduce default disk space usage
symbol_level=0
)
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-06-21 0:56 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-06-21 0:56 UTC (permalink / raw
To: gentoo-commits
commit: a3342167040e3534ea627b7ee3d7f123727cf064
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 21 00:42:59 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Jun 21 00:53:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3342167
dev-qt/qtwebengine: fix build with USE="pdfium -pulseaudio" (qt6)
Or hopefully anyway, have not tested the full build without libpulse,
but it at least no longer looks for it.
Unclear whether pdfium was automagically linking with it, or just
looking for it for nothing while unused. The former technically
needs a revbump, but not worth it given the long build times and
how pdfium is scarcely used.
Closes: https://bugs.gentoo.org/934635
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild | 2 ++
dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild | 2 ++
dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 2 ++
dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild | 2 ++
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 2 ++
5 files changed, 10 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild
index eea6683a8948..9a079c75fbdb 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild
@@ -221,6 +221,8 @@ src_configure() {
)
local mygnargs=(
+ # prevent pdfium from looking for it if disabled (bug #934635)
+ use_pulseaudio=$(usex pulseaudio true false)
# prefer no dlopen where possible
link_pulseaudio=true
rtc_link_pipewire=true
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild
index 842cb8d0e9d9..196438e3994d 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild
@@ -221,6 +221,8 @@ src_configure() {
)
local mygnargs=(
+ # prevent pdfium from looking for it if disabled (bug #934635)
+ use_pulseaudio=$(usex pulseaudio true false)
# prefer no dlopen where possible
link_pulseaudio=true
rtc_link_pipewire=true
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index 842cb8d0e9d9..196438e3994d 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -221,6 +221,8 @@ src_configure() {
)
local mygnargs=(
+ # prevent pdfium from looking for it if disabled (bug #934635)
+ use_pulseaudio=$(usex pulseaudio true false)
# prefer no dlopen where possible
link_pulseaudio=true
rtc_link_pipewire=true
diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
index 03b2d57d8bcb..700b65e1e2c1 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
@@ -221,6 +221,8 @@ src_configure() {
)
local mygnargs=(
+ # prevent pdfium from looking for it if disabled (bug #934635)
+ use_pulseaudio=$(usex pulseaudio true false)
# prefer no dlopen where possible
link_pulseaudio=true
rtc_link_pipewire=true
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 03b2d57d8bcb..700b65e1e2c1 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -221,6 +221,8 @@ src_configure() {
)
local mygnargs=(
+ # prevent pdfium from looking for it if disabled (bug #934635)
+ use_pulseaudio=$(usex pulseaudio true false)
# prefer no dlopen where possible
link_pulseaudio=true
rtc_link_pipewire=true
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-06-18 18:14 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-06-18 18:14 UTC (permalink / raw
To: gentoo-commits
commit: d1f89602b5723ca1d100a97ed4739fade0eacd9c
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 18 09:27:42 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jun 18 18:13:51 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1f89602
dev-qt/qtwebengine: add 6.7.2
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild | 335 ++++++++++++++++++++++++++++
2 files changed, 336 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index f1a827dabed7..3653279b471a 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -4,3 +4,4 @@ DIST qtwebengine-6.7-patchset-8.tar.xz 8320 BLAKE2B 88f31506865aeef02d6ad0c46dac
DIST qtwebengine-6.7-patchset-9.tar.xz 7440 BLAKE2B 061f39250450af3c8d4458649c80c18d0bf8448061e0bb91f8a0d7c630ff1cd2ee19a9528998c5a4a3ebab1e96ea0ba579cc0db5d879fe56a1239901942ba933 SHA512 4dabb56d6c74600f8d5a4ebb4356ffaaff1814eefe1cb268e33749fee034e9488e34043d0ce0893138ee01b023c09298c737bca3875a30be1bf862a145e244c7
DIST qtwebengine-6.8-patchset-1.tar.xz 7512 BLAKE2B 04eee1a1008f8a193dbb719e08c61e26a78cb68f3a0b9f7cc43b442bd2d851301682009ad7cd96df13da1c0aa7e9459b1b7024193379509abd4784e2547276e7 SHA512 591e5340435a8a40b6805d3db07b440bf185c694461382051c668e41f2ea5d04d5d7ab72602f557ee91a687d6187e919d662751e32dadaea8dc19de568e2c54e
DIST qtwebengine-everywhere-src-6.7.1.tar.xz 550975920 BLAKE2B b0bbe1d62132bc75f830df7e40d885e976629e759de442702043c71b50a11e874d06c9450378c522894d5e29cc07e05111554758b5bb6aaeca59de1720d6550f SHA512 dc70048bf65ef610dd9cec7e233f1e5a387bde620e84ee5a8e517fc9c326220d58c80939454d55481ceff5ac5b82baaa9823255ea43eb4bb43e86beae68c7b8c
+DIST qtwebengine-everywhere-src-6.7.2.tar.xz 550888844 BLAKE2B 2de049c9284583940bd1a9611a00c88a4f330a3b0bab8291d11296b8532d9f4e41be0d019045aca3d5983c3cfd6254d9e50c1133a497d03ef615fb74973e10f0 SHA512 5e1f65b5c0cecd62623ac386bbc89b1222f41b8c17cec1dd43851692d21f56e8b2dba45dab9405c33e88e1d1b24998d93dbcbf371a6504a1c8cdb1a6b5a94bf7
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild
new file mode 100644
index 000000000000..842cb8d0e9d9
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild
@@ -0,0 +1,335 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="xml(+)"
+inherit check-reqs flag-o-matic multiprocessing optfeature
+inherit prefix python-any-r1 qt6-build toolchain-funcs
+
+DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
+SRC_URI+="
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-9.tar.xz
+"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm64"
+fi
+
+IUSE="
+ accessibility +alsa bindist custom-cflags designer geolocation
+ +jumbo-build kerberos opengl pdfium pulseaudio qml screencast
+ +system-icu vaapi vulkan webdriver +widgets
+"
+REQUIRED_USE="
+ designer? ( qml widgets )
+"
+
+# dlopen: krb5, libva, pciutils, udev
+# gcc: for -latomic
+RDEPEND="
+ app-arch/snappy:=
+ dev-libs/expat
+ dev-libs/libevent:=
+ dev-libs/libxml2[icu]
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ ~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl=,vulkan?,widgets?]
+ ~dev-qt/qtdeclarative-${PV}:6[widgets?]
+ ~dev-qt/qtwebchannel-${PV}:6[qml?]
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/harfbuzz:=
+ media-libs/lcms:2
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ media-libs/libwebp:=
+ media-libs/mesa[gbm(+)]
+ media-libs/openjpeg:2=
+ media-libs/opus
+ media-libs/tiff:=
+ sys-apps/dbus
+ sys-apps/pciutils
+ sys-devel/gcc:*
+ sys-libs/zlib:=[minizip]
+ virtual/libudev
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXrandr
+ x11-libs/libXtst
+ x11-libs/libdrm
+ x11-libs/libxcb:=
+ x11-libs/libxkbcommon
+ x11-libs/libxkbfile
+ alsa? ( media-libs/alsa-lib )
+ designer? ( ~dev-qt/qttools-${PV}:6[designer] )
+ geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
+ kerberos? ( virtual/krb5 )
+ pulseaudio? ( media-libs/libpulse[glib] )
+ screencast? (
+ dev-libs/glib:2
+ media-video/pipewire:=
+ )
+ system-icu? ( dev-libs/icu:= )
+ vaapi? ( media-libs/libva:=[X] )
+ !vaapi? ( media-libs/libvpx:= )
+"
+DEPEND="
+ ${RDEPEND}
+ media-libs/libglvnd
+ x11-base/xorg-proto
+ x11-libs/libXcursor
+ x11-libs/libXi
+ x11-libs/libxshmfence
+ opengl? ( media-libs/libglvnd[X] )
+ screencast? ( media-libs/libepoxy[egl(+)] )
+ pdfium? ( net-print/cups )
+ test? (
+ widgets? ( app-text/poppler[cxx(+)] )
+ )
+ vaapi? (
+ vulkan? ( dev-util/vulkan-headers )
+ )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
+ dev-util/gperf
+ net-libs/nodejs[ssl]
+ sys-devel/bison
+ sys-devel/flex
+"
+
+PATCHES=( "${WORKDIR}"/patches/${PN} )
+[[ ${PV} == 6.9999 ]] || # too fragile for 6.9999, but keep for 6.x.9999
+ PATCHES+=( "${WORKDIR}"/patches/chromium )
+
+PATCHES+=(
+ # add extras as needed here, may merge in set if carries across versions
+)
+
+python_check_deps() {
+ python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+}
+
+qtwebengine_check-reqs() {
+ [[ ${MERGE_TYPE} == binary ]] && return
+
+ if is-flagq '-g?(gdb)?([1-9])'; then #307861
+ ewarn
+ ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which"
+ ewarn "is non-trivial with ${PN}. May experience extended compilation"
+ ewarn "times, increased disk/memory usage, and potentially link failure."
+ ewarn
+ ewarn "If run into issues, please try disabling before reporting a bug."
+ fi
+
+ local CHECKREQS_DISK_BUILD=8G
+ local CHECKREQS_DISK_USR=360M
+
+ if ! has distcc ${FEATURES}; then #830661
+ # assume ~2GB per job or 1.5GB if clang, possible with less
+ # depending on free memory and *FLAGS, but prefer being safe as
+ # users having OOM issues with qtwebengine been rather common
+ tc-is-clang && : 15 || : 20
+ local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G
+ fi
+
+ check-reqs_${EBUILD_PHASE_FUNC} #570534
+}
+
+pkg_pretend() {
+ qtwebengine_check-reqs
+}
+
+pkg_setup() {
+ qtwebengine_check-reqs
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ qt6-build_src_prepare
+
+ # for www-plugins/chrome-binary-plugins (widevine) search paths on prefix
+ hprefixify -w /Gentoo/ src/core/content_client_qt.cpp
+
+ # store chromium versions, only used in postinst for a warning
+ local chromium
+ mapfile -t chromium < CHROMIUM_VERSION || die
+ [[ ${chromium[1]} =~ ^Based.*:[^0-9]+([0-9.]+$) ]] &&
+ QT6_CHROMIUM_VER=${BASH_REMATCH[1]} || die
+ [[ ${chromium[2]} =~ ^Patched.+:[^0-9]+([0-9.]+$) ]] &&
+ QT6_CHROMIUM_PATCHES_VER=${BASH_REMATCH[1]} || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(qt_feature pdfium qtpdf_build)
+ $(qt_feature qml qtpdf_quick_build)
+ $(qt_feature webdriver webenginedriver)
+ $(qt_feature widgets qtpdf_widgets_build)
+ $(usev pdfium -DQT_FEATURE_pdf_v8=ON)
+
+ -DQT_FEATURE_qtwebengine_build=ON
+ $(qt_feature qml qtwebengine_quick_build)
+ $(qt_feature widgets qtwebengine_widgets_build)
+
+ $(cmake_use_find_package designer Qt6Designer)
+
+ $(qt_feature alsa webengine_system_alsa)
+ $(qt_feature !bindist webengine_proprietary_codecs)
+ $(qt_feature geolocation webengine_geolocation)
+ $(qt_feature jumbo-build webengine_jumbo_build)
+ $(qt_feature kerberos webengine_kerberos)
+ $(qt_feature pulseaudio webengine_system_pulseaudio)
+ $(qt_feature screencast webengine_webrtc_pipewire)
+ $(qt_feature system-icu webengine_system_icu)
+ $(qt_feature vaapi webengine_vaapi)
+ $(qt_feature vulkan webengine_vulkan)
+ -DQT_FEATURE_webengine_embedded_build=OFF
+ -DQT_FEATURE_webengine_extensions=ON
+ -DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet
+ -DQT_FEATURE_webengine_pepper_plugins=ON
+ -DQT_FEATURE_webengine_printing_and_pdf=ON
+ -DQT_FEATURE_webengine_spellchecker=ON
+ -DQT_FEATURE_webengine_webchannel=ON
+ -DQT_FEATURE_webengine_webrtc=ON
+
+ # needs a modified ffmpeg to be usable, and even then it may not
+ # cooperate with new major ffmpeg versions (bug #831487)
+ -DQT_FEATURE_webengine_system_ffmpeg=OFF
+
+ # use bundled re2 to avoid complications, may revisit
+ # (see discussions in https://github.com/gentoo/gentoo/pull/32281)
+ -DQT_FEATURE_webengine_system_re2=OFF
+
+ # bundled is currently required when using vaapi (forced regardless)
+ $(qt_feature !vaapi webengine_system_libvpx)
+
+ # not necessary to pass these (default), but in case detection fails
+ $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
+ freetype gbm glib harfbuzz lcms2 libevent libjpeg \
+ libopenjpeg2 libpci libpng libtiff libwebp libxml \
+ minizip opus poppler snappy zlib)
+
+ # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
+ -DINSTALL_GN=OFF
+ )
+
+ local mygnargs=(
+ # prefer no dlopen where possible
+ link_pulseaudio=true
+ rtc_link_pipewire=true
+ # reduce default disk space usage
+ symbol_level=0
+ )
+
+ if use !custom-cflags; then
+ strip-flags # fragile
+
+ if is-flagq '-g?(gdb)?([2-9])'; then #914475
+ replace-flags '-g?(gdb)?([2-9])' -g1
+ ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"
+ fi
+
+ # Built helpers segfault when using (at least) -march=armv8-a+pauth
+ # (bug #920555, #920568 -- suspected gcc bug). For now, filter all
+ # for simplicity. Override with USE=custom-cflags if wanted, please
+ # report if above -march works again so can cleanup.
+ use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
+ fi
+
+ # Workaround for build failure with clang-18 and -march=native without
+ # avx512. Does not affect e.g. -march=skylake, only native (bug #931623).
+ # TODO: drop this when <=llvm-18.1.5-r1 >=18 been gone for some time
+ use amd64 && tc-is-clang && is-flagq -march=native &&
+ [[ $(clang-major-version) -ge 18 ]] &&
+ has_version '<sys-devel/llvm-18.1.5-r1' &&
+ tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
+ append-flags -mevex512
+
+ export NINJA NINJAFLAGS=$(get_NINJAOPTS)
+ [[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
+
+ local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
+ einfo "Extra Gn args: ${EXTRA_GN}"
+
+ qt6-build_src_configure
+}
+
+src_compile() {
+ # tentatively work around a possible (rare) race condition (bug #921680)
+ cmake_build WebEngineCore_sync_all_public_headers
+
+ cmake_src_compile
+}
+
+src_test() {
+ if [[ ${EUID} == 0 ]]; then
+ # almost every tests fail, so skip entirely
+ ewarn "Skipping tests due to running as root (chromium refuses this configuration)."
+ return
+ fi
+
+ local CMAKE_SKIP_TESTS=(
+ # fails with network sandbox
+ tst_loadsignals
+ tst_qquickwebengineview
+ tst_qwebengineglobalsettings
+ tst_qwebengineview
+ # fails with offscreen rendering, may be worth retrying if the issue
+ # persist given these are rather major tests (or consider virtx)
+ tst_qmltests
+ tst_qwebenginepage
+ # certs verfication seems flaky and gives expiration warnings
+ tst_qwebengineclientcertificatestore
+ # test is misperformed when qtbase is built USE=-test?
+ tst_touchinput
+ # currently requires webenginedriver to be already installed
+ tst_webenginedriver
+ )
+
+ # prevent using the system's qtwebengine
+ # (use glob to avoid unnecessary complications with arch dir)
+ local resources=( "${BUILD_DIR}/src/core/${CMAKE_BUILD_TYPE}/"* )
+ [[ -d ${resources[0]} ]] || die "invalid resources path: ${resources[0]}"
+ local -x QTWEBENGINEPROCESS_PATH=${BUILD_DIR}${QT6_LIBEXECDIR#"${QT6_PREFIX}"}/QtWebEngineProcess
+ local -x QTWEBENGINE_LOCALES_PATH=${resources[0]}/qtwebengine_locales
+ local -x QTWEBENGINE_RESOURCES_PATH=${resources[0]}
+
+ # random failures in several tests without -j1
+ qt6-build_src_test -j1
+}
+
+src_install() {
+ qt6-build_src_install
+
+ [[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472
+ die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
+
+ if use test && use webdriver; then
+ rm -- "${D}${QT6_BINDIR}"/testbrowser || die
+ fi
+}
+
+pkg_postinst() {
+ # plugin may also be found in $HOME if provided by chrome or firefox
+ use amd64 &&
+ optfeature "Widevine DRM support (protected media playback)" \
+ www-plugins/chrome-binary-plugins
+
+ elog
+ elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with"
+ elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. 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
+ 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 "tl;dr your web browsing experience will be compromised."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-06-11 22:02 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-06-11 22:02 UTC (permalink / raw
To: gentoo-commits
commit: ab9bf839b7bd0227c73a4ba39867c3ab9327bcaa
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 11 21:59:45 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jun 11 22:01:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab9bf839
dev-qt/qtwebengine: move libglvnd[X] to depend
While it is indeed included, odds are GL/glx.h is not truly
needed (included for nothing, does not link with libGLX nor
seem to dlopen it), may need review if manage to make X optional
in 6.8+ but is not important for now.
Untested whether it includes it even with USE=-opengl like
it does for some other GL headers, but leave it like that
for now (USE=opengl is mostly to control qt's dependency).
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild
index 0448d629617d..eea6683a8948 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild
@@ -70,7 +70,6 @@ RDEPEND="
designer? ( ~dev-qt/qttools-${PV}:6[designer] )
geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
kerberos? ( virtual/krb5 )
- opengl? ( media-libs/libglvnd[X] )
pulseaudio? ( media-libs/libpulse[glib] )
screencast? (
dev-libs/glib:2
@@ -87,6 +86,7 @@ DEPEND="
x11-libs/libXcursor
x11-libs/libXi
x11-libs/libxshmfence
+ opengl? ( media-libs/libglvnd[X] )
screencast? ( media-libs/libepoxy[egl(+)] )
pdfium? ( net-print/cups )
test? (
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index 19867e211c6f..842cb8d0e9d9 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -70,7 +70,6 @@ RDEPEND="
designer? ( ~dev-qt/qttools-${PV}:6[designer] )
geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
kerberos? ( virtual/krb5 )
- opengl? ( media-libs/libglvnd[X] )
pulseaudio? ( media-libs/libpulse[glib] )
screencast? (
dev-libs/glib:2
@@ -87,6 +86,7 @@ DEPEND="
x11-libs/libXcursor
x11-libs/libXi
x11-libs/libxshmfence
+ opengl? ( media-libs/libglvnd[X] )
screencast? ( media-libs/libepoxy[egl(+)] )
pdfium? ( net-print/cups )
test? (
diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
index 6ee08b8eae93..03b2d57d8bcb 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
@@ -70,7 +70,6 @@ RDEPEND="
designer? ( ~dev-qt/qttools-${PV}:6[designer] )
geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
kerberos? ( virtual/krb5 )
- opengl? ( media-libs/libglvnd[X] )
pulseaudio? ( media-libs/libpulse[glib] )
screencast? (
dev-libs/glib:2
@@ -87,6 +86,7 @@ DEPEND="
x11-libs/libXcursor
x11-libs/libXi
x11-libs/libxshmfence
+ opengl? ( media-libs/libglvnd[X] )
screencast? ( media-libs/libepoxy[egl(+)] )
pdfium? ( net-print/cups )
test? (
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 6ee08b8eae93..03b2d57d8bcb 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -70,7 +70,6 @@ RDEPEND="
designer? ( ~dev-qt/qttools-${PV}:6[designer] )
geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
kerberos? ( virtual/krb5 )
- opengl? ( media-libs/libglvnd[X] )
pulseaudio? ( media-libs/libpulse[glib] )
screencast? (
dev-libs/glib:2
@@ -87,6 +86,7 @@ DEPEND="
x11-libs/libXcursor
x11-libs/libXi
x11-libs/libxshmfence
+ opengl? ( media-libs/libglvnd[X] )
screencast? ( media-libs/libepoxy[egl(+)] )
pdfium? ( net-print/cups )
test? (
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-06-11 22:02 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-06-11 22:02 UTC (permalink / raw
To: gentoo-commits
commit: 2ce673a5a9f98048aeb9160e6a7dc99554b80aad
Author: Christopher Bayliss <cjbdev <AT> icloud <DOT> com>
AuthorDate: Thu Jun 6 22:27:09 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jun 11 21:58:12 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ce673a5
dev-qt/qtwebengine: add libglvnd[X] as depend
* when built on non-desktop profile systems, the qtwebengine[opengl]
build fails because it needs GL/glx.h
Signed-off-by: Christopher Bayliss <cjbdev <AT> icloud.com>
Closes: https://github.com/gentoo/gentoo/pull/37062
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild | 1 +
dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 1 +
dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild | 1 +
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 1 +
4 files changed, 4 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild
index 9191f4cdc4da..0448d629617d 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild
@@ -70,6 +70,7 @@ RDEPEND="
designer? ( ~dev-qt/qttools-${PV}:6[designer] )
geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
kerberos? ( virtual/krb5 )
+ opengl? ( media-libs/libglvnd[X] )
pulseaudio? ( media-libs/libpulse[glib] )
screencast? (
dev-libs/glib:2
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index 537ecdc04552..19867e211c6f 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -70,6 +70,7 @@ RDEPEND="
designer? ( ~dev-qt/qttools-${PV}:6[designer] )
geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
kerberos? ( virtual/krb5 )
+ opengl? ( media-libs/libglvnd[X] )
pulseaudio? ( media-libs/libpulse[glib] )
screencast? (
dev-libs/glib:2
diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
index 503abab72225..6ee08b8eae93 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
@@ -70,6 +70,7 @@ RDEPEND="
designer? ( ~dev-qt/qttools-${PV}:6[designer] )
geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
kerberos? ( virtual/krb5 )
+ opengl? ( media-libs/libglvnd[X] )
pulseaudio? ( media-libs/libpulse[glib] )
screencast? (
dev-libs/glib:2
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 503abab72225..6ee08b8eae93 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -70,6 +70,7 @@ RDEPEND="
designer? ( ~dev-qt/qttools-${PV}:6[designer] )
geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
kerberos? ( virtual/krb5 )
+ opengl? ( media-libs/libglvnd[X] )
pulseaudio? ( media-libs/libpulse[glib] )
screencast? (
dev-libs/glib:2
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-06-08 5:27 Arthur Zamarin
0 siblings, 0 replies; 301+ messages in thread
From: Arthur Zamarin @ 2024-06-08 5:27 UTC (permalink / raw
To: gentoo-commits
commit: 040b437fbe9194901332ec26eb42a2fd92fd8e33
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 8 05:25:51 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 8 05:25:51 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=040b437f
dev-qt/qtwebengine: Stabilize 6.7.1 arm64, #932347
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild
index 75985162ac1c..9191f4cdc4da 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI+="
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm64"
+ KEYWORDS="amd64 arm64"
fi
IUSE="
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-06-06 16:43 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2024-06-06 16:43 UTC (permalink / raw
To: gentoo-commits
commit: 5fdbc5e26e6df381ff996050ec1a96f10460d0f1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 6 16:41:17 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 6 16:43:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fdbc5e2
dev-qt/qtwebengine: drop 5.15.13_p20240510
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 -
.../qtwebengine-5.15.13_p20240510.ebuild | 247 ---------------------
2 files changed, 248 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index c452839952e7..44d89ade0b0e 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,4 +1,3 @@
-DIST qtwebengine-5.15.13_p20240322-patchset.tar.xz 26112 BLAKE2B 21eb036520e052f28d7579022d84d4b7136521d025569b22653229d8099140a99726ce5ddebced0d9aa113d3e215fc023ad042a372f2318dfc7cafe5d9e397c9 SHA512 cbc4373ed6a107a3fd2bf1cb73c96e3c00b4428410933dbb1b1eb5116de22e29ca5e102702e1f6f8a12abff6b60ea072b84e77da64c6d60e360bf0ad2e542166
DIST qtwebengine-5.15.13_p20240510.tar.xz 301422784 BLAKE2B b63acccb4740ddb3dd5c76ef9808d946eb2c93b10b45125622adcb5c5e951644ac54612e7aeb9e009e00c5ca8913d3f8b5dfa530c274fec87c4a8377bf1068fb SHA512 0ccc1be0825f4cf2387879241a21f033b5a0198da4e93f2e0533296ec485b103c1ab35aa71a2a9d9c16364979d45d3dd2e13f7e6d0e2a21f94d85294c5819eb3
DIST qtwebengine-5.15.14_p20240510-patchset.tar.xz 20780 BLAKE2B 516d4c628c4b027ab3a7159da006a57173be91de3eb4b7f308029953d4fd19fb3e790ca38e79d17fef75d8d9b392676650acb9285d5913f9ebecaa4136575c47 SHA512 492979d118d6bd9165ee194724e38b627d19c89dbe1daa6b2f55e4a8fc7676748a1eacb9623ee05e09140c2c4a2ac82ddafaef5c45630a117ce0ed14b240a474
DIST qtwebengine-6.7-patchset-6.tar.xz 8140 BLAKE2B 773ee76ecf118ce45eb5dbebf4a574c3cff90f50cd87a469511688ed77db7a96012bec0dd03312bf2d366d709d95a2ac3432e9e0bd5a517b69a5bbd250a94420 SHA512 4db6abbd2a598f8194b9ba7035abad7228f6056fc5e5572329a9a0474f36135428b401edf5fa96e1ac866328d078b015fffd90949ef84f1cea9a1b39e5b9d5ff
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240510.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240510.ebuild
deleted file mode 100644
index 513b8354228a..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240510.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}" )
-
-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() {
- 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
- --webengine-python-version=python3
- -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."
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-06-04 19:36 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-06-04 19:36 UTC (permalink / raw
To: gentoo-commits
commit: b6c46bfbe2c42dad63ffff5fff9e636516730aa2
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 4 08:16:59 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jun 4 19:30:48 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6c46bfb
dev-qt/qtwebengine: add 6.8.9999
Not really tested yet beside checking that the patches apply.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild | 334 +++++++++++++++++++++++++
1 file changed, 334 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
new file mode 100644
index 000000000000..503abab72225
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-6.8.9999.ebuild
@@ -0,0 +1,334 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="xml(+)"
+inherit check-reqs flag-o-matic multiprocessing optfeature
+inherit prefix python-any-r1 qt6-build toolchain-funcs
+
+DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
+SRC_URI+="
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.8-patchset-1.tar.xz
+"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm64"
+fi
+
+IUSE="
+ accessibility +alsa bindist custom-cflags designer geolocation
+ +jumbo-build kerberos opengl pdfium pulseaudio qml screencast
+ +system-icu vaapi vulkan webdriver +widgets
+"
+REQUIRED_USE="
+ designer? ( qml widgets )
+"
+
+# dlopen: krb5, libva, pciutils, udev
+# gcc: for -latomic
+RDEPEND="
+ app-arch/snappy:=
+ dev-libs/expat
+ dev-libs/libevent:=
+ dev-libs/libxml2[icu]
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ ~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl=,vulkan?,widgets?]
+ ~dev-qt/qtdeclarative-${PV}:6[widgets?]
+ ~dev-qt/qtwebchannel-${PV}:6[qml?]
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/harfbuzz:=
+ media-libs/lcms:2
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ media-libs/libwebp:=
+ media-libs/mesa[gbm(+)]
+ media-libs/openjpeg:2=
+ media-libs/opus
+ media-libs/tiff:=
+ sys-apps/dbus
+ sys-apps/pciutils
+ sys-devel/gcc:*
+ sys-libs/zlib:=[minizip]
+ virtual/libudev
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXrandr
+ x11-libs/libXtst
+ x11-libs/libdrm
+ x11-libs/libxcb:=
+ x11-libs/libxkbcommon
+ x11-libs/libxkbfile
+ alsa? ( media-libs/alsa-lib )
+ designer? ( ~dev-qt/qttools-${PV}:6[designer] )
+ geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
+ kerberos? ( virtual/krb5 )
+ pulseaudio? ( media-libs/libpulse[glib] )
+ screencast? (
+ dev-libs/glib:2
+ media-video/pipewire:=
+ )
+ system-icu? ( dev-libs/icu:= )
+ vaapi? ( media-libs/libva:=[X] )
+ !vaapi? ( media-libs/libvpx:= )
+"
+DEPEND="
+ ${RDEPEND}
+ media-libs/libglvnd
+ x11-base/xorg-proto
+ x11-libs/libXcursor
+ x11-libs/libXi
+ x11-libs/libxshmfence
+ screencast? ( media-libs/libepoxy[egl(+)] )
+ pdfium? ( net-print/cups )
+ test? (
+ widgets? ( app-text/poppler[cxx(+)] )
+ )
+ vaapi? (
+ vulkan? ( dev-util/vulkan-headers )
+ )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
+ dev-util/gperf
+ net-libs/nodejs[ssl]
+ sys-devel/bison
+ sys-devel/flex
+"
+
+PATCHES=( "${WORKDIR}"/patches/${PN} )
+[[ ${PV} == 6.9999 ]] || # too fragile for 6.9999, but keep for 6.x.9999
+ PATCHES+=( "${WORKDIR}"/patches/chromium )
+
+PATCHES+=(
+ # add extras as needed here, may merge in set if carries across versions
+)
+
+python_check_deps() {
+ python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+}
+
+qtwebengine_check-reqs() {
+ [[ ${MERGE_TYPE} == binary ]] && return
+
+ if is-flagq '-g?(gdb)?([1-9])'; then #307861
+ ewarn
+ ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which"
+ ewarn "is non-trivial with ${PN}. May experience extended compilation"
+ ewarn "times, increased disk/memory usage, and potentially link failure."
+ ewarn
+ ewarn "If run into issues, please try disabling before reporting a bug."
+ fi
+
+ local CHECKREQS_DISK_BUILD=8G
+ local CHECKREQS_DISK_USR=360M
+
+ if ! has distcc ${FEATURES}; then #830661
+ # assume ~2GB per job or 1.5GB if clang, possible with less
+ # depending on free memory and *FLAGS, but prefer being safe as
+ # users having OOM issues with qtwebengine been rather common
+ tc-is-clang && : 15 || : 20
+ local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G
+ fi
+
+ check-reqs_${EBUILD_PHASE_FUNC} #570534
+}
+
+pkg_pretend() {
+ qtwebengine_check-reqs
+}
+
+pkg_setup() {
+ qtwebengine_check-reqs
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ qt6-build_src_prepare
+
+ # for www-plugins/chrome-binary-plugins (widevine) search paths on prefix
+ hprefixify -w /Gentoo/ src/core/content_client_qt.cpp
+
+ # store chromium versions, only used in postinst for a warning
+ local chromium
+ mapfile -t chromium < CHROMIUM_VERSION || die
+ [[ ${chromium[1]} =~ ^Based.*:[^0-9]+([0-9.]+$) ]] &&
+ QT6_CHROMIUM_VER=${BASH_REMATCH[1]} || die
+ [[ ${chromium[2]} =~ ^Patched.+:[^0-9]+([0-9.]+$) ]] &&
+ QT6_CHROMIUM_PATCHES_VER=${BASH_REMATCH[1]} || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(qt_feature pdfium qtpdf_build)
+ $(qt_feature qml qtpdf_quick_build)
+ $(qt_feature webdriver webenginedriver)
+ $(qt_feature widgets qtpdf_widgets_build)
+ $(usev pdfium -DQT_FEATURE_pdf_v8=ON)
+
+ -DQT_FEATURE_qtwebengine_build=ON
+ $(qt_feature qml qtwebengine_quick_build)
+ $(qt_feature widgets qtwebengine_widgets_build)
+
+ $(cmake_use_find_package designer Qt6Designer)
+
+ $(qt_feature alsa webengine_system_alsa)
+ $(qt_feature !bindist webengine_proprietary_codecs)
+ $(qt_feature geolocation webengine_geolocation)
+ $(qt_feature jumbo-build webengine_jumbo_build)
+ $(qt_feature kerberos webengine_kerberos)
+ $(qt_feature pulseaudio webengine_system_pulseaudio)
+ $(qt_feature screencast webengine_webrtc_pipewire)
+ $(qt_feature system-icu webengine_system_icu)
+ $(qt_feature vaapi webengine_vaapi)
+ $(qt_feature vulkan webengine_vulkan)
+ -DQT_FEATURE_webengine_embedded_build=OFF
+ -DQT_FEATURE_webengine_extensions=ON
+ -DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet
+ -DQT_FEATURE_webengine_pepper_plugins=ON
+ -DQT_FEATURE_webengine_printing_and_pdf=ON
+ -DQT_FEATURE_webengine_spellchecker=ON
+ -DQT_FEATURE_webengine_webchannel=ON
+ -DQT_FEATURE_webengine_webrtc=ON
+
+ # needs a modified ffmpeg to be usable, and even then it may not
+ # cooperate with new major ffmpeg versions (bug #831487)
+ -DQT_FEATURE_webengine_system_ffmpeg=OFF
+
+ # use bundled re2 to avoid complications, may revisit
+ # (see discussions in https://github.com/gentoo/gentoo/pull/32281)
+ -DQT_FEATURE_webengine_system_re2=OFF
+
+ # bundled is currently required when using vaapi (forced regardless)
+ $(qt_feature !vaapi webengine_system_libvpx)
+
+ # not necessary to pass these (default), but in case detection fails
+ $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
+ freetype gbm glib harfbuzz lcms2 libevent libjpeg \
+ libopenjpeg2 libpci libpng libtiff libwebp libxml \
+ minizip opus poppler snappy zlib)
+
+ # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
+ -DINSTALL_GN=OFF
+ )
+
+ local mygnargs=(
+ # prefer no dlopen where possible
+ link_pulseaudio=true
+ rtc_link_pipewire=true
+ # reduce default disk space usage
+ symbol_level=0
+ )
+
+ if use !custom-cflags; then
+ strip-flags # fragile
+
+ if is-flagq '-g?(gdb)?([2-9])'; then #914475
+ replace-flags '-g?(gdb)?([2-9])' -g1
+ ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"
+ fi
+
+ # Built helpers segfault when using (at least) -march=armv8-a+pauth
+ # (bug #920555, #920568 -- suspected gcc bug). For now, filter all
+ # for simplicity. Override with USE=custom-cflags if wanted, please
+ # report if above -march works again so can cleanup.
+ use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
+ fi
+
+ # Workaround for build failure with clang-18 and -march=native without
+ # avx512. Does not affect e.g. -march=skylake, only native (bug #931623).
+ # TODO: drop this when <=llvm-18.1.5-r1 >=18 been gone for some time
+ use amd64 && tc-is-clang && is-flagq -march=native &&
+ [[ $(clang-major-version) -ge 18 ]] &&
+ has_version '<sys-devel/llvm-18.1.5-r1' &&
+ tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
+ append-flags -mevex512
+
+ export NINJA NINJAFLAGS=$(get_NINJAOPTS)
+ [[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
+
+ local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
+ einfo "Extra Gn args: ${EXTRA_GN}"
+
+ qt6-build_src_configure
+}
+
+src_compile() {
+ # tentatively work around a possible (rare) race condition (bug #921680)
+ cmake_build WebEngineCore_sync_all_public_headers
+
+ cmake_src_compile
+}
+
+src_test() {
+ if [[ ${EUID} == 0 ]]; then
+ # almost every tests fail, so skip entirely
+ ewarn "Skipping tests due to running as root (chromium refuses this configuration)."
+ return
+ fi
+
+ local CMAKE_SKIP_TESTS=(
+ # fails with network sandbox
+ tst_loadsignals
+ tst_qquickwebengineview
+ tst_qwebengineglobalsettings
+ tst_qwebengineview
+ # fails with offscreen rendering, may be worth retrying if the issue
+ # persist given these are rather major tests (or consider virtx)
+ tst_qmltests
+ tst_qwebenginepage
+ # certs verfication seems flaky and gives expiration warnings
+ tst_qwebengineclientcertificatestore
+ # test is misperformed when qtbase is built USE=-test?
+ tst_touchinput
+ # currently requires webenginedriver to be already installed
+ tst_webenginedriver
+ )
+
+ # prevent using the system's qtwebengine
+ # (use glob to avoid unnecessary complications with arch dir)
+ local resources=( "${BUILD_DIR}/src/core/${CMAKE_BUILD_TYPE}/"* )
+ [[ -d ${resources[0]} ]] || die "invalid resources path: ${resources[0]}"
+ local -x QTWEBENGINEPROCESS_PATH=${BUILD_DIR}${QT6_LIBEXECDIR#"${QT6_PREFIX}"}/QtWebEngineProcess
+ local -x QTWEBENGINE_LOCALES_PATH=${resources[0]}/qtwebengine_locales
+ local -x QTWEBENGINE_RESOURCES_PATH=${resources[0]}
+
+ # random failures in several tests without -j1
+ qt6-build_src_test -j1
+}
+
+src_install() {
+ qt6-build_src_install
+
+ [[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472
+ die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
+
+ if use test && use webdriver; then
+ rm -- "${D}${QT6_BINDIR}"/testbrowser || die
+ fi
+}
+
+pkg_postinst() {
+ # plugin may also be found in $HOME if provided by chrome or firefox
+ use amd64 &&
+ optfeature "Widevine DRM support (protected media playback)" \
+ www-plugins/chrome-binary-plugins
+
+ elog
+ elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with"
+ elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. 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
+ 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 "tl;dr your web browsing experience will be compromised."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-06-02 4:04 Sam James
0 siblings, 0 replies; 301+ messages in thread
From: Sam James @ 2024-06-02 4:04 UTC (permalink / raw
To: gentoo-commits
commit: 2b9f8a680eecca8f9749be6bad62d6b55b54297f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 2 04:03:18 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 2 04:03:18 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b9f8a68
dev-qt/qtwebengine: Stabilize 6.7.1 amd64, #932347
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild
index a5407eb45c18..17f6fb1f6c4b 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI+="
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm64"
+ KEYWORDS="amd64 ~arm64"
fi
IUSE="
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-06-01 10:25 Arthur Zamarin
0 siblings, 0 replies; 301+ messages in thread
From: Arthur Zamarin @ 2024-06-01 10:25 UTC (permalink / raw
To: gentoo-commits
commit: 8891ce78eb8356fa483d957f863b1bc0b9322ff8
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 1 09:36:10 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 1 10:25:32 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8891ce78
dev-qt/qtwebengine: Stabilize 5.15.14_p20240510 arm64, #933196
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild
index 3884da728b43..9eea881bc404 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild
@@ -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 ~arm64 ~x86"
+ KEYWORDS="amd64 arm64 ~x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.13_p20240510.tar.xz"
S="${WORKDIR}/${PN}-5.15.13_p20240510"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-05-31 6:12 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2024-05-31 6:12 UTC (permalink / raw
To: gentoo-commits
commit: 5f7f0fb0b879df3ba83421f5132f3e320a3bd960
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri May 31 06:11:16 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri May 31 06:12:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f7f0fb0
dev-qt/qtwebengine: Add missing python_check_deps()
Bug: https://bugs.gentoo.org/931970
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild
index a539a220cd4f..b0b63fe726c9 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild
@@ -101,6 +101,10 @@ BDEPEND="${PYTHON_DEPS}
PATCHES=( "${WORKDIR}/${PATCHSET}" )
+python_check_deps() {
+ python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+}
+
qtwebengine_check-reqs() {
# bug #307861
eshopts_push -s extglob
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-05-30 12:52 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2024-05-30 12:52 UTC (permalink / raw
To: gentoo-commits
commit: 97d175b281a41ab520956d2d4f9cac7c5df533de
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 30 12:01:01 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 30 12:34:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97d175b2
dev-qt/qtwebengine: Add python3.12, add missing BDEPEND for catapult
Bug: https://bugs.gentoo.org/925718
Bug: https://bugs.gentoo.org/931970
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild | 7 +++----
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 8eddd1481bd2..51cdf11b54f0 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,5 +1,6 @@
DIST qtwebengine-5.15.13_p20240322-patchset.tar.xz 26112 BLAKE2B 21eb036520e052f28d7579022d84d4b7136521d025569b22653229d8099140a99726ce5ddebced0d9aa113d3e215fc023ad042a372f2318dfc7cafe5d9e397c9 SHA512 cbc4373ed6a107a3fd2bf1cb73c96e3c00b4428410933dbb1b1eb5116de22e29ca5e102702e1f6f8a12abff6b60ea072b84e77da64c6d60e360bf0ad2e542166
DIST qtwebengine-5.15.13_p20240510.tar.xz 301422784 BLAKE2B b63acccb4740ddb3dd5c76ef9808d946eb2c93b10b45125622adcb5c5e951644ac54612e7aeb9e009e00c5ca8913d3f8b5dfa530c274fec87c4a8377bf1068fb SHA512 0ccc1be0825f4cf2387879241a21f033b5a0198da4e93f2e0533296ec485b103c1ab35aa71a2a9d9c16364979d45d3dd2e13f7e6d0e2a21f94d85294c5819eb3
+DIST qtwebengine-5.15.14_p20240510-patchset.tar.xz 20780 BLAKE2B 516d4c628c4b027ab3a7159da006a57173be91de3eb4b7f308029953d4fd19fb3e790ca38e79d17fef75d8d9b392676650acb9285d5913f9ebecaa4136575c47 SHA512 492979d118d6bd9165ee194724e38b627d19c89dbe1daa6b2f55e4a8fc7676748a1eacb9623ee05e09140c2c4a2ac82ddafaef5c45630a117ce0ed14b240a474
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
DIST qtwebengine-everywhere-src-6.7.0.tar.xz 550907592 BLAKE2B e7787ab0a8b68657ca318de1c855f23b50d9aa3bda1bfcaa4ecd274ff0afb283c092256c28b566a9882cc5dccdaf2e3312836f4da6d4a85850f3202176d77933 SHA512 92bc8ffc69c6e00d55b647b332878e9b632257e78c38e9b3d0a5f4506d5df3c507e8ffa5916db2547b89c4c2641447fd9031a80e780e143c7ed58a7285e06e64
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild
index e422133f361c..f8144c81c61d 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild
@@ -3,8 +3,8 @@
EAPI=8
-PATCHSET="${PN}-5.15.13_p20240322-patchset"
-PYTHON_COMPAT=( python3_{10..11} )
+PATCHSET="${PN}-5.15.14_p20240510-patchset"
+PYTHON_COMPAT=( python3_{10..12} )
PYTHON_REQ_USE="xml(+)"
inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build toolchain-funcs
@@ -91,6 +91,7 @@ DEPEND="${RDEPEND}
"
BDEPEND="${PYTHON_DEPS}
app-alternatives/ninja
+ $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
dev-util/gperf
dev-util/re2c
net-libs/nodejs[ssl]
@@ -152,8 +153,6 @@ src_unpack() {
}
src_prepare() {
- 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
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-05-30 12:52 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2024-05-30 12:52 UTC (permalink / raw
To: gentoo-commits
commit: 957412b2d9b7b92b2f77cb3358345ee8086b7a12
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 30 10:22:10 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 30 12:34:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=957412b2
dev-qt/qtwebengine: add 5.15.14_p20240510
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../qtwebengine-5.15.14_p20240510.ebuild | 247 +++++++++++++++++++++
1 file changed, 247 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild
new file mode 100644
index 000000000000..e422133f361c
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.14_p20240510.ebuild
@@ -0,0 +1,247 @@
+# 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/${PN}-5.15.13_p20240510.tar.xz"
+ S="${WORKDIR}/${PN}-5.15.13_p20240510"
+ 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() {
+ 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
+ --webengine-python-version=python3
+ -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."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-05-23 3:36 Arthur Zamarin
0 siblings, 0 replies; 301+ messages in thread
From: Arthur Zamarin @ 2024-05-23 3:36 UTC (permalink / raw
To: gentoo-commits
commit: 97f6191c9ddd554b508449278fa2d7c083904c3d
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu May 23 03:35:56 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu May 23 03:35:56 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97f6191c
dev-qt/qtwebengine: Stabilize 5.15.13_p20240510 amd64, #931961
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.13_p20240510.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240510.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240510.ebuild
index 3e3c2e1e5af4..513b8354228a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240510.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240510.ebuild
@@ -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 arm64 ~x86"
+ KEYWORDS="amd64 arm64 ~x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-05-22 17:03 Sam James
0 siblings, 0 replies; 301+ messages in thread
From: Sam James @ 2024-05-22 17:03 UTC (permalink / raw
To: gentoo-commits
commit: 134a587cb1e2067712125b90ac36c99c731ffab5
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 22 17:03:01 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 22 17:03:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=134a587c
dev-qt/qtwebengine: Stabilize 5.15.13_p20240510 arm64, #931961
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.13_p20240510.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240510.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240510.ebuild
index 009eada0b8ec..3e3c2e1e5af4 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240510.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240510.ebuild
@@ -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 ~arm64 ~x86"
+ KEYWORDS="~amd64 arm64 ~x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-05-21 6:53 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-05-21 6:53 UTC (permalink / raw
To: gentoo-commits
commit: e66c77828f3a44486b6e6ba1fdff4b46bbe0ac52
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue May 21 06:50:19 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue May 21 06:53:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e66c7782
dev-qt/qtwebengine: restore chromium-drop-catapult patch (qt5)
Hardly tested (I don't use qt5) but it should be better than
leaving as-is.
Closes: https://bugs.gentoo.org/931970
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.13_p20240510.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240510.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240510.ebuild
index e5b9b8f1660b..009eada0b8ec 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240510.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240510.ebuild
@@ -152,8 +152,7 @@ src_unpack() {
}
src_prepare() {
- rm "${WORKDIR}/${PATCHSET}"/010-build-without-python-2.patch \
- "${WORKDIR}/${PATCHSET}"/011-chromium-drop-catapult.patch || die
+ 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.
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-05-20 8:49 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-05-20 8:49 UTC (permalink / raw
To: gentoo-commits
commit: 8703befb84a1d6f2d60141d341a0555c7cd286d6
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon May 20 08:25:13 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon May 20 08:45:31 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8703befb
dev-qt/qtwebengine: add 6.7.1
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild | 330 ++++++++++++++++++++++++++++
2 files changed, 331 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 1a11c149ae16..4bfa9d6ff21c 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -4,3 +4,4 @@ DIST qtwebengine-5.15.13_p20240510.tar.xz 301422784 BLAKE2B b63acccb4740ddb3dd5c
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
DIST qtwebengine-everywhere-src-6.7.0.tar.xz 550907592 BLAKE2B e7787ab0a8b68657ca318de1c855f23b50d9aa3bda1bfcaa4ecd274ff0afb283c092256c28b566a9882cc5dccdaf2e3312836f4da6d4a85850f3202176d77933 SHA512 92bc8ffc69c6e00d55b647b332878e9b632257e78c38e9b3d0a5f4506d5df3c507e8ffa5916db2547b89c4c2641447fd9031a80e780e143c7ed58a7285e06e64
+DIST qtwebengine-everywhere-src-6.7.1.tar.xz 550975920 BLAKE2B b0bbe1d62132bc75f830df7e40d885e976629e759de442702043c71b50a11e874d06c9450378c522894d5e29cc07e05111554758b5bb6aaeca59de1720d6550f SHA512 dc70048bf65ef610dd9cec7e233f1e5a387bde620e84ee5a8e517fc9c326220d58c80939454d55481ceff5ac5b82baaa9823255ea43eb4bb43e86beae68c7b8c
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild
new file mode 100644
index 000000000000..a5407eb45c18
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild
@@ -0,0 +1,330 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+PYTHON_REQ_USE="xml(+)"
+inherit check-reqs flag-o-matic multiprocessing optfeature
+inherit prefix python-any-r1 qt6-build toolchain-funcs
+
+DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
+SRC_URI+="
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-8.tar.xz
+"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm64"
+fi
+
+IUSE="
+ accessibility +alsa bindist custom-cflags designer geolocation
+ +jumbo-build kerberos opengl pdfium pulseaudio qml screencast
+ +system-icu vaapi vulkan webdriver +widgets
+"
+REQUIRED_USE="
+ designer? ( qml widgets )
+"
+
+# dlopen: krb5, libva, pciutils, udev
+# gcc: for -latomic
+RDEPEND="
+ app-arch/snappy:=
+ dev-libs/expat
+ dev-libs/libevent:=
+ dev-libs/libxml2[icu]
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ ~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl=,vulkan?,widgets?]
+ ~dev-qt/qtdeclarative-${PV}:6[widgets?]
+ ~dev-qt/qtwebchannel-${PV}:6[qml?]
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/harfbuzz:=
+ media-libs/lcms:2
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ media-libs/libwebp:=
+ media-libs/mesa[gbm(+)]
+ media-libs/openjpeg:2=
+ media-libs/opus
+ media-libs/tiff:=
+ sys-apps/dbus
+ sys-apps/pciutils
+ sys-devel/gcc:*
+ sys-libs/zlib:=[minizip]
+ virtual/libudev
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXrandr
+ x11-libs/libXtst
+ x11-libs/libdrm
+ x11-libs/libxcb:=
+ x11-libs/libxkbcommon
+ x11-libs/libxkbfile
+ alsa? ( media-libs/alsa-lib )
+ designer? ( ~dev-qt/qttools-${PV}:6[designer] )
+ geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
+ kerberos? ( virtual/krb5 )
+ pulseaudio? ( media-libs/libpulse[glib] )
+ screencast? (
+ dev-libs/glib:2
+ media-video/pipewire:=
+ )
+ system-icu? ( dev-libs/icu:= )
+ vaapi? ( media-libs/libva:=[X] )
+ !vaapi? ( media-libs/libvpx:= )
+"
+DEPEND="
+ ${RDEPEND}
+ media-libs/libglvnd
+ x11-base/xorg-proto
+ x11-libs/libxshmfence
+ screencast? ( media-libs/libepoxy[egl(+)] )
+ pdfium? ( net-print/cups )
+ test? (
+ widgets? ( app-text/poppler[cxx(+)] )
+ )
+ vaapi? (
+ vulkan? ( dev-util/vulkan-headers )
+ )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
+ dev-util/gperf
+ net-libs/nodejs[ssl]
+ sys-devel/bison
+ sys-devel/flex
+"
+
+PATCHES=( "${WORKDIR}"/patches/${PN} )
+[[ ${PV} == 6.9999 ]] || # too fragile for 6.9999, but keep for 6.x.9999
+ PATCHES+=( "${WORKDIR}"/patches/chromium )
+
+PATCHES+=(
+ # add extras as needed here, may merge in set if carries across versions
+)
+
+python_check_deps() {
+ python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+}
+
+qtwebengine_check-reqs() {
+ [[ ${MERGE_TYPE} == binary ]] && return
+
+ if is-flagq '-g?(gdb)?([1-9])'; then #307861
+ ewarn
+ ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which"
+ ewarn "is non-trivial with ${PN}. May experience extended compilation"
+ ewarn "times, increased disk/memory usage, and potentially link failure."
+ ewarn
+ ewarn "If run into issues, please try disabling before reporting a bug."
+ fi
+
+ local CHECKREQS_DISK_BUILD=8G
+ local CHECKREQS_DISK_USR=360M
+
+ if ! has distcc ${FEATURES}; then #830661
+ # assume ~2GB per job or 1.5GB if clang, possible with less
+ # depending on free memory and *FLAGS, but prefer being safe as
+ # users having OOM issues with qtwebengine been rather common
+ tc-is-clang && : 15 || : 20
+ local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G
+ fi
+
+ check-reqs_${EBUILD_PHASE_FUNC} #570534
+}
+
+pkg_pretend() {
+ qtwebengine_check-reqs
+}
+
+pkg_setup() {
+ qtwebengine_check-reqs
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ qt6-build_src_prepare
+
+ # for www-plugins/chrome-binary-plugins (widevine) search paths on prefix
+ hprefixify -w /Gentoo/ src/core/content_client_qt.cpp
+
+ # store chromium versions, only used in postinst for a warning
+ local chromium
+ mapfile -t chromium < CHROMIUM_VERSION || die
+ [[ ${chromium[1]} =~ ^Based.*:[^0-9]+([0-9.]+$) ]] &&
+ QT6_CHROMIUM_VER=${BASH_REMATCH[1]} || die
+ [[ ${chromium[2]} =~ ^Patched.+:[^0-9]+([0-9.]+$) ]] &&
+ QT6_CHROMIUM_PATCHES_VER=${BASH_REMATCH[1]} || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(qt_feature pdfium qtpdf_build)
+ $(qt_feature qml qtpdf_quick_build)
+ $(qt_feature webdriver webenginedriver)
+ $(qt_feature widgets qtpdf_widgets_build)
+ $(usev pdfium -DQT_FEATURE_pdf_v8=ON)
+
+ -DQT_FEATURE_qtwebengine_build=ON
+ $(qt_feature qml qtwebengine_quick_build)
+ $(qt_feature widgets qtwebengine_widgets_build)
+
+ $(cmake_use_find_package designer Qt6Designer)
+
+ $(qt_feature alsa webengine_system_alsa)
+ $(qt_feature !bindist webengine_proprietary_codecs)
+ $(qt_feature geolocation webengine_geolocation)
+ $(qt_feature jumbo-build webengine_jumbo_build)
+ $(qt_feature kerberos webengine_kerberos)
+ $(qt_feature pulseaudio webengine_system_pulseaudio)
+ $(qt_feature screencast webengine_webrtc_pipewire)
+ $(qt_feature system-icu webengine_system_icu)
+ $(qt_feature vaapi webengine_vaapi)
+ $(qt_feature vulkan webengine_vulkan)
+ -DQT_FEATURE_webengine_embedded_build=OFF
+ -DQT_FEATURE_webengine_extensions=ON
+ -DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet
+ -DQT_FEATURE_webengine_pepper_plugins=ON
+ -DQT_FEATURE_webengine_printing_and_pdf=ON
+ -DQT_FEATURE_webengine_spellchecker=ON
+ -DQT_FEATURE_webengine_webchannel=ON
+ -DQT_FEATURE_webengine_webrtc=ON
+
+ # needs a modified ffmpeg to be usable, and even then it may not
+ # cooperate with new major ffmpeg versions (bug #831487)
+ -DQT_FEATURE_webengine_system_ffmpeg=OFF
+
+ # use bundled re2 to avoid complications, may revisit
+ # (see discussions in https://github.com/gentoo/gentoo/pull/32281)
+ -DQT_FEATURE_webengine_system_re2=OFF
+
+ # bundled is currently required when using vaapi (forced regardless)
+ $(qt_feature !vaapi webengine_system_libvpx)
+
+ # not necessary to pass these (default), but in case detection fails
+ $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
+ freetype gbm glib harfbuzz lcms2 libevent libjpeg \
+ libopenjpeg2 libpci libpng libtiff libwebp libxml \
+ minizip opus poppler snappy zlib)
+
+ # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
+ -DINSTALL_GN=OFF
+ )
+
+ local mygnargs=(
+ # prefer no dlopen where possible
+ link_pulseaudio=true
+ rtc_link_pipewire=true
+ )
+
+ if use !custom-cflags; then
+ strip-flags # fragile
+
+ if is-flagq '-g?(gdb)?([2-9])'; then #914475
+ replace-flags '-g?(gdb)?([2-9])' -g1
+ ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"
+ fi
+
+ # Built helpers segfault when using (at least) -march=armv8-a+pauth
+ # (bug #920555, #920568 -- suspected gcc bug). For now, filter all
+ # for simplicity. Override with USE=custom-cflags if wanted, please
+ # report if above -march works again so can cleanup.
+ use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
+ fi
+
+ # Workaround for build failure with clang-18 and -march=native without
+ # avx512. Does not affect e.g. -march=skylake, only native (bug #931623).
+ # TODO: drop this when <=llvm-18.1.5-r1 >=18 been gone for some time
+ use amd64 && tc-is-clang && is-flagq -march=native &&
+ [[ $(clang-major-version) -ge 18 ]] &&
+ has_version '<sys-devel/llvm-18.1.5-r1' &&
+ tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
+ append-flags -mevex512
+
+ export NINJA NINJAFLAGS=$(get_NINJAOPTS)
+ [[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
+
+ local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
+ einfo "Extra Gn args: ${EXTRA_GN}"
+
+ qt6-build_src_configure
+}
+
+src_compile() {
+ # tentatively work around a possible (rare) race condition (bug #921680)
+ cmake_build WebEngineCore_sync_all_public_headers
+
+ cmake_src_compile
+}
+
+src_test() {
+ if [[ ${EUID} == 0 ]]; then
+ # almost every tests fail, so skip entirely
+ ewarn "Skipping tests due to running as root (chromium refuses this configuration)."
+ return
+ fi
+
+ local CMAKE_SKIP_TESTS=(
+ # fails with network sandbox
+ tst_loadsignals
+ tst_qquickwebengineview
+ tst_qwebengineglobalsettings
+ tst_qwebengineview
+ # fails with offscreen rendering, may be worth retrying if the issue
+ # persist given these are rather major tests (or consider virtx)
+ tst_qmltests
+ tst_qwebenginepage
+ # certs verfication seems flaky and gives expiration warnings
+ tst_qwebengineclientcertificatestore
+ # test is misperformed when qtbase is built USE=-test?
+ tst_touchinput
+ # currently requires webenginedriver to be already installed
+ tst_webenginedriver
+ )
+
+ # prevent using the system's qtwebengine
+ # (use glob to avoid unnecessary complications with arch dir)
+ local resources=( "${BUILD_DIR}/src/core/${CMAKE_BUILD_TYPE}/"* )
+ [[ -d ${resources[0]} ]] || die "invalid resources path: ${resources[0]}"
+ local -x QTWEBENGINEPROCESS_PATH=${BUILD_DIR}${QT6_LIBEXECDIR#"${QT6_PREFIX}"}/QtWebEngineProcess
+ local -x QTWEBENGINE_LOCALES_PATH=${resources[0]}/qtwebengine_locales
+ local -x QTWEBENGINE_RESOURCES_PATH=${resources[0]}
+
+ # random failures in several tests without -j1
+ qt6-build_src_test -j1
+}
+
+src_install() {
+ qt6-build_src_install
+
+ [[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472
+ die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
+
+ if use test && use webdriver; then
+ rm -- "${D}${QT6_BINDIR}"/testbrowser || die
+ fi
+}
+
+pkg_postinst() {
+ # plugin may also be found in $HOME if provided by chrome or firefox
+ use amd64 &&
+ optfeature "Widevine DRM support (protected media playback)" \
+ www-plugins/chrome-binary-plugins
+
+ elog
+ elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with"
+ elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. 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
+ 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 "tl;dr your web browsing experience will be compromised."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-05-17 10:08 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-05-17 10:08 UTC (permalink / raw
To: gentoo-commits
commit: bcec86406f541175ae8e3c273bf8f4cc18c0372a
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri May 17 06:06:17 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri May 17 10:08:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcec8640
dev-qt/qtwebengine: update 6.7 patchset in live
6.7-7 -> 6.7-8 changes:
Removed:
* clang18.patch (upstreamed)
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 2 +-
dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 7be52262b7bb..1a11c149ae16 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -2,5 +2,5 @@ DIST qtwebengine-5.15.13_p20240322-patchset.tar.xz 26112 BLAKE2B 21eb036520e052f
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-7.tar.xz 9288 BLAKE2B 28eeee2481e78f3fbc7351dba0e70025e33c9ba78dcd67200a9762ee7c884d279253b1a4cb50652fcd41bbf64e11e6486b17759c0335636531a81022e5cf8aab SHA512 0d8583d50679d4609833540293eeab84507aa448c62c0fda62d99c03c7f60afa655f621938fc798a1443ad0a355442f5114714d692bb83aecac99021919a1baa
+DIST qtwebengine-6.7-patchset-8.tar.xz 8320 BLAKE2B 88f31506865aeef02d6ad0c46dacd478f4c77330815648bf5377762b9f053f5a51b6426c1fbeef81fff5c3a9f4e853f8d51013d5df27fcd0ab0449ce369e18e5 SHA512 1d8e1f8e15a13c6f1675208ba1a329dfa335031e06577de39dc89464b40bd5cf7df7bce4f09f6e67a84c1c2f7aa1fbf6d2d94ea8c142ec5ea67bac8cef1b03b1
DIST qtwebengine-everywhere-src-6.7.0.tar.xz 550907592 BLAKE2B e7787ab0a8b68657ca318de1c855f23b50d9aa3bda1bfcaa4ecd274ff0afb283c092256c28b566a9882cc5dccdaf2e3312836f4da6d4a85850f3202176d77933 SHA512 92bc8ffc69c6e00d55b647b332878e9b632257e78c38e9b3d0a5f4506d5df3c507e8ffa5916db2547b89c4c2641447fd9031a80e780e143c7ed58a7285e06e64
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index 20e7cb3baaa6..a5407eb45c18 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs
DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
SRC_URI+="
- https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-7.tar.xz
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-8.tar.xz
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 20e7cb3baaa6..a5407eb45c18 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs
DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
SRC_URI+="
- https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-7.tar.xz
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-8.tar.xz
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-05-17 4:32 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-05-17 4:32 UTC (permalink / raw
To: gentoo-commits
commit: 43fecd92f7197cbeb286843f239a09fb994cecef
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri May 17 01:23:40 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri May 17 04:16:36 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43fecd92
dev-qt/qtwebengine: update evex512 workaround for fixed llvm version
The has_version is not *necessary* but will make it easier to
know it's safe to drop when it becomes essentially a no-op.
Bug: https://bugs.gentoo.org/931623
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild | 3 ++-
dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 3 ++-
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
index 3646dfddfabf..f4f6d55fdf8c 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
@@ -243,9 +243,10 @@ src_configure() {
# Workaround for build failure with clang-18 and -march=native without
# avx512. Does not affect e.g. -march=skylake, only native (bug #931623).
- # TODO: try to drop this when <=clang-18.1.5 >=18 been gone for some time
+ # TODO: drop this when <=llvm-18.1.5-r1 >=18 been gone for some time
use amd64 && tc-is-clang && is-flagq -march=native &&
[[ $(clang-major-version) -ge 18 ]] &&
+ has_version '<sys-devel/llvm-18.1.5-r1' &&
tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
append-flags -mevex512
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index df7ff429e088..20e7cb3baaa6 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -240,9 +240,10 @@ src_configure() {
# Workaround for build failure with clang-18 and -march=native without
# avx512. Does not affect e.g. -march=skylake, only native (bug #931623).
- # TODO: try to drop this when <=clang-18.1.5 >=18 been gone for some time
+ # TODO: drop this when <=llvm-18.1.5-r1 >=18 been gone for some time
use amd64 && tc-is-clang && is-flagq -march=native &&
[[ $(clang-major-version) -ge 18 ]] &&
+ has_version '<sys-devel/llvm-18.1.5-r1' &&
tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
append-flags -mevex512
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index df7ff429e088..20e7cb3baaa6 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -240,9 +240,10 @@ src_configure() {
# Workaround for build failure with clang-18 and -march=native without
# avx512. Does not affect e.g. -march=skylake, only native (bug #931623).
- # TODO: try to drop this when <=clang-18.1.5 >=18 been gone for some time
+ # TODO: drop this when <=llvm-18.1.5-r1 >=18 been gone for some time
use amd64 && tc-is-clang && is-flagq -march=native &&
[[ $(clang-major-version) -ge 18 ]] &&
+ has_version '<sys-devel/llvm-18.1.5-r1' &&
tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
append-flags -mevex512
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-05-15 18:08 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2024-05-15 18:08 UTC (permalink / raw
To: gentoo-commits
commit: a6496c97480d7817363d7d0c230c8332969745b3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue May 14 18:34:40 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 15 18:08:27 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6496c97
dev-qt/qtwebengine: add 5.15.13_p20240510
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
.../qtwebengine-5.15.13_p20240510.ebuild | 248 +++++++++++++++++++++
2 files changed, 249 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index e4df2266f64c..7be52262b7bb 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,5 +1,6 @@
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-7.tar.xz 9288 BLAKE2B 28eeee2481e78f3fbc7351dba0e70025e33c9ba78dcd67200a9762ee7c884d279253b1a4cb50652fcd41bbf64e11e6486b17759c0335636531a81022e5cf8aab SHA512 0d8583d50679d4609833540293eeab84507aa448c62c0fda62d99c03c7f60afa655f621938fc798a1443ad0a355442f5114714d692bb83aecac99021919a1baa
DIST qtwebengine-everywhere-src-6.7.0.tar.xz 550907592 BLAKE2B e7787ab0a8b68657ca318de1c855f23b50d9aa3bda1bfcaa4ecd274ff0afb283c092256c28b566a9882cc5dccdaf2e3312836f4da6d4a85850f3202176d77933 SHA512 92bc8ffc69c6e00d55b647b332878e9b632257e78c38e9b3d0a5f4506d5df3c507e8ffa5916db2547b89c4c2641447fd9031a80e780e143c7ed58a7285e06e64
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240510.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240510.ebuild
new file mode 100644
index 000000000000..e5b9b8f1660b
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240510.ebuild
@@ -0,0 +1,248 @@
+# 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() {
+ rm "${WORKDIR}/${PATCHSET}"/010-build-without-python-2.patch \
+ "${WORKDIR}/${PATCHSET}"/011-chromium-drop-catapult.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
+ --webengine-python-version=python3
+ -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."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-05-13 5:49 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-05-13 5:49 UTC (permalink / raw
To: gentoo-commits
commit: 544cb92a031bc2c68a705945f8e0b43a5d01ce59
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon May 13 01:36:46 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon May 13 05:48:21 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=544cb92a
dev-qt/qtwebengine: enable py3.13 (qt6)
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
index cb5e62e07fc3..3646dfddfabf 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
PYTHON_REQ_USE="xml(+)"
inherit check-reqs flag-o-matic multiprocessing optfeature
inherit prefix python-any-r1 qt6-build toolchain-funcs
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index 75871dab769b..df7ff429e088 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
PYTHON_REQ_USE="xml(+)"
inherit check-reqs flag-o-matic multiprocessing optfeature
inherit prefix python-any-r1 qt6-build toolchain-funcs
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 75871dab769b..df7ff429e088 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -3,7 +3,7 @@
EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
PYTHON_REQ_USE="xml(+)"
inherit check-reqs flag-o-matic multiprocessing optfeature
inherit prefix python-any-r1 qt6-build toolchain-funcs
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-05-10 10:26 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-05-10 10:26 UTC (permalink / raw
To: gentoo-commits
commit: a167b24a4097bb2d462875285b170818a7336eb0
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri May 10 10:25:16 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri May 10 10:25:16 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a167b24a
dev-qt/qtwebengine: note reminder of when to drop workaround
Bug: https://bugs.gentoo.org/931623
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild | 1 +
dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 1 +
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 1 +
3 files changed, 3 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
index cccffedf5380..cb5e62e07fc3 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
@@ -243,6 +243,7 @@ src_configure() {
# Workaround for build failure with clang-18 and -march=native without
# avx512. Does not affect e.g. -march=skylake, only native (bug #931623).
+ # TODO: try to drop this when <=clang-18.1.5 >=18 been gone for some time
use amd64 && tc-is-clang && is-flagq -march=native &&
[[ $(clang-major-version) -ge 18 ]] &&
tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index bba17446d874..75871dab769b 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -240,6 +240,7 @@ src_configure() {
# Workaround for build failure with clang-18 and -march=native without
# avx512. Does not affect e.g. -march=skylake, only native (bug #931623).
+ # TODO: try to drop this when <=clang-18.1.5 >=18 been gone for some time
use amd64 && tc-is-clang && is-flagq -march=native &&
[[ $(clang-major-version) -ge 18 ]] &&
tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index bba17446d874..75871dab769b 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -240,6 +240,7 @@ src_configure() {
# Workaround for build failure with clang-18 and -march=native without
# avx512. Does not affect e.g. -march=skylake, only native (bug #931623).
+ # TODO: try to drop this when <=clang-18.1.5 >=18 been gone for some time
use amd64 && tc-is-clang && is-flagq -march=native &&
[[ $(clang-major-version) -ge 18 ]] &&
tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-05-09 12:13 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-05-09 12:13 UTC (permalink / raw
To: gentoo-commits
commit: 754d6f5226a532ed086afa276b48e89ffafe0484
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu May 9 08:19:17 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu May 9 12:12:58 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=754d6f52
dev-qt/qtwebengine: improve clang-18 workaround w/ -mevex512 (qt6)
Hoping it will be a short-lived and that this will be improved/fixed
in clang itself.
(have not tried nor looked at qtwebengine:5)
For some rough explanation from the little I get from this:
clang-18 added -mevex512 (missing from 17), and then -march=native
is a bit quirky in that unlike -march=exact it goes out of its way
to disable it resulting in e.g.
-march=skylake -mavx512f = -mevex512 is auto-enabled
-march=skylake -mevex512 = not "enabled" but can be used
-march=native(skylake) -mavx512f = forced off(!)
And then units that use avx512 / pass -mavx512f (for use with runtime
cpu detection) end in build failure without evex512.
Always passing -mevex512 on a machine without avx512 "seems" safe,
it does not even set __EVEX512__ and believe won't use any avx512
instructions on a whim (__EVEX512__ does get set if add -mavx512f).
Or at least my skylake (not skylake-x) passes test + can use the
qtwebengine built that way.
Considered passing only for files that need it at first with a patch
(sounded safer), but chromium's Gn files don't have a variable to test
clang version that I could see (or at least not in old qtwebengine) and
didn't want this to become more involved nor use conditional patching.
The !avx512 check may not be super necessary, but have not dug into
the implications of forcing it when avx512 is actually enabled (sounds
there are cases where it needs to be off, leaving it to compiler).
Bug: https://bugs.gentoo.org/931623
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild | 18 +++++++-----------
dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 18 +++++++-----------
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 18 +++++++-----------
3 files changed, 21 insertions(+), 33 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
index 0829dcfa3b22..cccffedf5380 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
@@ -239,19 +239,15 @@ src_configure() {
# for simplicity. Override with USE=custom-cflags if wanted, please
# report if above -march works again so can cleanup.
use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
-
- # skia and xnnpack fail with clang-18 + some(?) -march=native while
- # can't reproduce with seemingly equivalent =skylake), needs more
- # looking into as there may be something odd going on (clang bug?).
- # Note that upstream Qt disallows custom *FLAGS on qtwebengine meaning
- # we are not supposed to pass -march=native in the first place.
- # TODO: try dropping this on major Qt and clang bumps
- # See also: https://groups.google.com/g/skia-discuss/c/DNW4oq3W2fI
- # (Transform_inl.h:769:21: error: AVX vector <snip> without 'evex512')
- use amd64 && tc-is-clang && [[ $(clang-major-version) -ge 18 ]] &&
- filter-flags -march=native
fi
+ # Workaround for build failure with clang-18 and -march=native without
+ # avx512. Does not affect e.g. -march=skylake, only native (bug #931623).
+ use amd64 && tc-is-clang && is-flagq -march=native &&
+ [[ $(clang-major-version) -ge 18 ]] &&
+ tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
+ append-flags -mevex512
+
export NINJA NINJAFLAGS=$(get_NINJAOPTS)
[[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index 750f700160b2..bba17446d874 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -236,19 +236,15 @@ src_configure() {
# for simplicity. Override with USE=custom-cflags if wanted, please
# report if above -march works again so can cleanup.
use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
-
- # skia and xnnpack fail with clang-18 + some(?) -march=native while
- # can't reproduce with seemingly equivalent =skylake), needs more
- # looking into as there may be something odd going on (clang bug?).
- # Note that upstream Qt disallows custom *FLAGS on qtwebengine meaning
- # we are not supposed to pass -march=native in the first place.
- # TODO: try dropping this on major Qt and clang bumps
- # See also: https://groups.google.com/g/skia-discuss/c/DNW4oq3W2fI
- # (Transform_inl.h:769:21: error: AVX vector <snip> without 'evex512')
- use amd64 && tc-is-clang && [[ $(clang-major-version) -ge 18 ]] &&
- filter-flags -march=native
fi
+ # Workaround for build failure with clang-18 and -march=native without
+ # avx512. Does not affect e.g. -march=skylake, only native (bug #931623).
+ use amd64 && tc-is-clang && is-flagq -march=native &&
+ [[ $(clang-major-version) -ge 18 ]] &&
+ tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
+ append-flags -mevex512
+
export NINJA NINJAFLAGS=$(get_NINJAOPTS)
[[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 750f700160b2..bba17446d874 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -236,19 +236,15 @@ src_configure() {
# for simplicity. Override with USE=custom-cflags if wanted, please
# report if above -march works again so can cleanup.
use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
-
- # skia and xnnpack fail with clang-18 + some(?) -march=native while
- # can't reproduce with seemingly equivalent =skylake), needs more
- # looking into as there may be something odd going on (clang bug?).
- # Note that upstream Qt disallows custom *FLAGS on qtwebengine meaning
- # we are not supposed to pass -march=native in the first place.
- # TODO: try dropping this on major Qt and clang bumps
- # See also: https://groups.google.com/g/skia-discuss/c/DNW4oq3W2fI
- # (Transform_inl.h:769:21: error: AVX vector <snip> without 'evex512')
- use amd64 && tc-is-clang && [[ $(clang-major-version) -ge 18 ]] &&
- filter-flags -march=native
fi
+ # Workaround for build failure with clang-18 and -march=native without
+ # avx512. Does not affect e.g. -march=skylake, only native (bug #931623).
+ use amd64 && tc-is-clang && is-flagq -march=native &&
+ [[ $(clang-major-version) -ge 18 ]] &&
+ tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} &&
+ append-flags -mevex512
+
export NINJA NINJAFLAGS=$(get_NINJAOPTS)
[[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-05-08 16:18 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-05-08 16:18 UTC (permalink / raw
To: gentoo-commits
commit: 7f3dcfe18e8f64b9f69ff8b16a2e5bfe440473a9
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed May 8 08:54:14 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed May 8 16:17:44 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f3dcfe1
dev-qt/qtwebengine: "fix" build with clang-18 + -march=native (qt6)
Needs more looking into but want a quick workaround before 6.7.1
releases with clang users having started to use 18.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild | 11 +++++++++++
dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 11 +++++++++++
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 11 +++++++++++
3 files changed, 33 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
index 997dbaf4ec5f..0829dcfa3b22 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
@@ -239,6 +239,17 @@ src_configure() {
# for simplicity. Override with USE=custom-cflags if wanted, please
# report if above -march works again so can cleanup.
use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
+
+ # skia and xnnpack fail with clang-18 + some(?) -march=native while
+ # can't reproduce with seemingly equivalent =skylake), needs more
+ # looking into as there may be something odd going on (clang bug?).
+ # Note that upstream Qt disallows custom *FLAGS on qtwebengine meaning
+ # we are not supposed to pass -march=native in the first place.
+ # TODO: try dropping this on major Qt and clang bumps
+ # See also: https://groups.google.com/g/skia-discuss/c/DNW4oq3W2fI
+ # (Transform_inl.h:769:21: error: AVX vector <snip> without 'evex512')
+ use amd64 && tc-is-clang && [[ $(clang-major-version) -ge 18 ]] &&
+ filter-flags -march=native
fi
export NINJA NINJAFLAGS=$(get_NINJAOPTS)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index 6dc080fed1e4..750f700160b2 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -236,6 +236,17 @@ src_configure() {
# for simplicity. Override with USE=custom-cflags if wanted, please
# report if above -march works again so can cleanup.
use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
+
+ # skia and xnnpack fail with clang-18 + some(?) -march=native while
+ # can't reproduce with seemingly equivalent =skylake), needs more
+ # looking into as there may be something odd going on (clang bug?).
+ # Note that upstream Qt disallows custom *FLAGS on qtwebengine meaning
+ # we are not supposed to pass -march=native in the first place.
+ # TODO: try dropping this on major Qt and clang bumps
+ # See also: https://groups.google.com/g/skia-discuss/c/DNW4oq3W2fI
+ # (Transform_inl.h:769:21: error: AVX vector <snip> without 'evex512')
+ use amd64 && tc-is-clang && [[ $(clang-major-version) -ge 18 ]] &&
+ filter-flags -march=native
fi
export NINJA NINJAFLAGS=$(get_NINJAOPTS)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 6dc080fed1e4..750f700160b2 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -236,6 +236,17 @@ src_configure() {
# for simplicity. Override with USE=custom-cflags if wanted, please
# report if above -march works again so can cleanup.
use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
+
+ # skia and xnnpack fail with clang-18 + some(?) -march=native while
+ # can't reproduce with seemingly equivalent =skylake), needs more
+ # looking into as there may be something odd going on (clang bug?).
+ # Note that upstream Qt disallows custom *FLAGS on qtwebengine meaning
+ # we are not supposed to pass -march=native in the first place.
+ # TODO: try dropping this on major Qt and clang bumps
+ # See also: https://groups.google.com/g/skia-discuss/c/DNW4oq3W2fI
+ # (Transform_inl.h:769:21: error: AVX vector <snip> without 'evex512')
+ use amd64 && tc-is-clang && [[ $(clang-major-version) -ge 18 ]] &&
+ filter-flags -march=native
fi
export NINJA NINJAFLAGS=$(get_NINJAOPTS)
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-04-23 15:08 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-04-23 15:08 UTC (permalink / raw
To: gentoo-commits
commit: 16c6810ab658ec0606551f0835ec8687c580fe48
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 23 12:27:25 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Apr 23 15:07:40 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16c6810a
dev-qt/qtwebengine: update 6.7 patchset in live
6.7-6 -> 6.7-7 changes:
Added:
* clang18.patch (seems upstreaming will take some time still)
* ninja1.12.patch (partially imported from files/, half-upstreamed)
Updated:
* glx-headers.patch (drop upstreamed bit, merge files/'s displaykey)
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 5 +----
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 55c0e432a96a..e4df2266f64c 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,4 +1,5 @@
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-6.7-patchset-6.tar.xz 8140 BLAKE2B 773ee76ecf118ce45eb5dbebf4a574c3cff90f50cd87a469511688ed77db7a96012bec0dd03312bf2d366d709d95a2ac3432e9e0bd5a517b69a5bbd250a94420 SHA512 4db6abbd2a598f8194b9ba7035abad7228f6056fc5e5572329a9a0474f36135428b401edf5fa96e1ac866328d078b015fffd90949ef84f1cea9a1b39e5b9d5ff
+DIST qtwebengine-6.7-patchset-7.tar.xz 9288 BLAKE2B 28eeee2481e78f3fbc7351dba0e70025e33c9ba78dcd67200a9762ee7c884d279253b1a4cb50652fcd41bbf64e11e6486b17759c0335636531a81022e5cf8aab SHA512 0d8583d50679d4609833540293eeab84507aa448c62c0fda62d99c03c7f60afa655f621938fc798a1443ad0a355442f5114714d692bb83aecac99021919a1baa
DIST qtwebengine-everywhere-src-6.7.0.tar.xz 550907592 BLAKE2B e7787ab0a8b68657ca318de1c855f23b50d9aa3bda1bfcaa4ecd274ff0afb283c092256c28b566a9882cc5dccdaf2e3312836f4da6d4a85850f3202176d77933 SHA512 92bc8ffc69c6e00d55b647b332878e9b632257e78c38e9b3d0a5f4506d5df3c507e8ffa5916db2547b89c4c2641447fd9031a80e780e143c7ed58a7285e06e64
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index f9dd54161654..6dc080fed1e4 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs
DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
SRC_URI+="
- https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-6.tar.xz
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-7.tar.xz
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
@@ -107,9 +107,6 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
PATCHES+=(
# add extras as needed here, may merge in set if carries across versions
- "${FILESDIR}"/${PN}-6.7.0-clang18.patch
- "${FILESDIR}"/${PN}-6.7.0-ninja1.12.patch
- "${FILESDIR}"/${PN}-6.7.0-displaykey-header.patch
)
python_check_deps() {
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 501485c774f4..6dc080fed1e4 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs
DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
SRC_URI+="
- https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-6.tar.xz
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-7.tar.xz
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-04-14 15:06 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-04-14 15:06 UTC (permalink / raw
To: gentoo-commits
commit: 12566530e51223f01472b89ab6fdbd898d93111f
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 14 07:40:03 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 15:05:53 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12566530
dev-qt/qtwebengine: always depend on mesa+libdrm in 6.7+
Missed that this is now always used in 6.7, *could* be skipped
by enabling minigbm but that is a intel-only alternative.
Not worth a revbump+rebuild given qtbase[gui] pulls libdrm either
way and unlikely for mesa to be missing.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild | 10 +++-------
dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 10 +++-------
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 10 +++-------
3 files changed, 9 insertions(+), 21 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
index 8f64365294d5..ce4b07c90f2c 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
@@ -46,6 +46,7 @@ RDEPEND="
media-libs/libjpeg-turbo:=
media-libs/libpng:=
media-libs/libwebp:=
+ media-libs/mesa[gbm(+)]
media-libs/openjpeg:2=
media-libs/opus
media-libs/tiff:=
@@ -61,6 +62,7 @@ RDEPEND="
x11-libs/libXfixes
x11-libs/libXrandr
x11-libs/libXtst
+ x11-libs/libdrm
x11-libs/libxcb:=
x11-libs/libxkbcommon
x11-libs/libxkbfile
@@ -71,16 +73,10 @@ RDEPEND="
pulseaudio? ( media-libs/libpulse[glib] )
screencast? (
dev-libs/glib:2
- media-libs/mesa[gbm(+)]
media-video/pipewire:=
- x11-libs/libdrm
)
system-icu? ( dev-libs/icu:= )
- vaapi? (
- media-libs/libva:=[X]
- media-libs/mesa[gbm(+)]
- x11-libs/libdrm
- )
+ vaapi? ( media-libs/libva:=[X] )
!vaapi? ( media-libs/libvpx:= )
"
DEPEND="
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index 69e355090337..bab0b63fc807 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -46,6 +46,7 @@ RDEPEND="
media-libs/libjpeg-turbo:=
media-libs/libpng:=
media-libs/libwebp:=
+ media-libs/mesa[gbm(+)]
media-libs/openjpeg:2=
media-libs/opus
media-libs/tiff:=
@@ -61,6 +62,7 @@ RDEPEND="
x11-libs/libXfixes
x11-libs/libXrandr
x11-libs/libXtst
+ x11-libs/libdrm
x11-libs/libxcb:=
x11-libs/libxkbcommon
x11-libs/libxkbfile
@@ -71,16 +73,10 @@ RDEPEND="
pulseaudio? ( media-libs/libpulse[glib] )
screencast? (
dev-libs/glib:2
- media-libs/mesa[gbm(+)]
media-video/pipewire:=
- x11-libs/libdrm
)
system-icu? ( dev-libs/icu:= )
- vaapi? (
- media-libs/libva:=[X]
- media-libs/mesa[gbm(+)]
- x11-libs/libdrm
- )
+ vaapi? ( media-libs/libva:=[X] )
!vaapi? ( media-libs/libvpx:= )
"
DEPEND="
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 311a9544dc48..501485c774f4 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -46,6 +46,7 @@ RDEPEND="
media-libs/libjpeg-turbo:=
media-libs/libpng:=
media-libs/libwebp:=
+ media-libs/mesa[gbm(+)]
media-libs/openjpeg:2=
media-libs/opus
media-libs/tiff:=
@@ -61,6 +62,7 @@ RDEPEND="
x11-libs/libXfixes
x11-libs/libXrandr
x11-libs/libXtst
+ x11-libs/libdrm
x11-libs/libxcb:=
x11-libs/libxkbcommon
x11-libs/libxkbfile
@@ -71,16 +73,10 @@ RDEPEND="
pulseaudio? ( media-libs/libpulse[glib] )
screencast? (
dev-libs/glib:2
- media-libs/mesa[gbm(+)]
media-video/pipewire:=
- x11-libs/libdrm
)
system-icu? ( dev-libs/icu:= )
- vaapi? (
- media-libs/libva:=[X]
- media-libs/mesa[gbm(+)]
- x11-libs/libdrm
- )
+ vaapi? ( media-libs/libva:=[X] )
!vaapi? ( media-libs/libvpx:= )
"
DEPEND="
^ permalink raw reply related [flat|nested] 301+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-04-13 18:06 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-04-13 18:06 UTC (permalink / raw
To: gentoo-commits
commit: c3c8c1ae09b1837167a653c5075be851adf04630
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 13 17:43:15 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Apr 13 18:03:21 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3c8c1ae
dev-qt/qtwebengine: hard require qtdeclarative (Qt6)
"May" be possible to do without, but configure.cmake has an
assert that prevents progressing if Quick+Qml is not found
(even if disabled qml components, not to say something else
may not genuinely need it), but for now hard depend on it.
In that context it may not be super worth keeping USE=qml,
albeit if unneeded it's still a bit less to build/install.
May revisit, but keeping is convenient for webchannel[qml?].
Skip revbump, not worth rebuilds and USE=widgets (default
and rarely disabled) is already pulling qtdeclarative.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild | 3 +--
dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 3 +--
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 3 +--
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
index 8e84a585dca0..8f64365294d5 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
@@ -37,6 +37,7 @@ RDEPEND="
dev-libs/nspr
dev-libs/nss
~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl=,vulkan?,widgets?]
+ ~dev-qt/qtdeclarative-${PV}:6[widgets?]
~dev-qt/qtwebchannel-${PV}:6[qml?]
media-libs/fontconfig
media-libs/freetype
@@ -68,7 +69,6 @@ RDEPEND="
geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
kerberos? ( virtual/krb5 )
pulseaudio? ( media-libs/libpulse[glib] )
- qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
screencast? (
dev-libs/glib:2
media-libs/mesa[gbm(+)]
@@ -82,7 +82,6 @@ RDEPEND="
x11-libs/libdrm
)
!vaapi? ( media-libs/libvpx:= )
- widgets? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] )
"
DEPEND="
${RDEPEND}
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index 259833ebd793..69e355090337 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -37,6 +37,7 @@ RDEPEND="
dev-libs/nspr
dev-libs/nss
~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl=,vulkan?,widgets?]
+ ~dev-qt/qtdeclarative-${PV}:6[widgets?]
~dev-qt/qtwebchannel-${PV}:6[qml?]
media-libs/fontconfig
media-libs/freetype
@@ -68,7 +69,6 @@ RDEPEND="
geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
kerberos? ( virtual/krb5 )
pulseaudio? ( media-libs/libpulse[glib] )
- qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
screencast? (
dev-libs/glib:2
media-libs/mesa[gbm(+)]
@@ -82,7 +82,6 @@ RDEPEND="
x11-libs/libdrm
)
!vaapi? ( media-libs/libvpx:= )
- widgets? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] )
"
DEPEND="
${RDEPEND}
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index faf29365b925..311a9544dc48 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -37,6 +37,7 @@ RDEPEND="
dev-libs/nspr
dev-libs/nss
~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl=,vulkan?,widgets?]
+ ~dev-qt/qtdeclarative-${PV}:6[widgets?]
~dev-qt/qtwebchannel-${PV}:6[qml?]
media-libs/fontconfig
media-libs/freetype
@@ -68,7 +69,6 @@ RDEPEND="
geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
kerberos? ( virtual/krb5 )
pulseaudio? ( media-libs/libpulse[glib] )
- qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
screencast? (
dev-libs/glib:2
media-libs/mesa[gbm(+)]
@@ -82,7 +82,6 @@ RDEPEND="
x11-libs/libdrm
)
!vaapi? ( media-libs/libvpx:= )
- widgets? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] )
"
DEPEND="
${RDEPEND}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-04-13 17:50 Arthur Zamarin
0 siblings, 0 replies; 301+ messages in thread
From: Arthur Zamarin @ 2024-04-13 17:50 UTC (permalink / raw
To: gentoo-commits
commit: a86092815807ec5e0722b7a710a4474241be786e
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 13 17:49:09 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 13 17:50:54 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8609281
dev-qt/qtwebengine: Stabilize 6.7.0 amd64, #929242
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
index 92f3292b8b65..8e84a585dca0 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI+="
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 arm64"
+ KEYWORDS="amd64 arm64"
fi
IUSE="
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-04-05 15:01 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2024-04-05 15:01 UTC (permalink / raw
To: gentoo-commits
commit: 01b2aa626e4e6ba9171d4194c47e2ad74a53f41d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 4 18:34:51 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 5 15:00:59 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01b2aa62
dev-qt/qtwebengine: drop 5.15.12_p20240122
Closes: https://bugs.gentoo.org/636242
Bug: https://bugs.gentoo.org/927746
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 4 -
.../qtwebengine-5.15.12_p20240122.ebuild | 279 ---------------------
2 files changed, 283 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 8404183561f4..a6606fb6f91b 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,9 +1,5 @@
-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.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.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
DIST qtwebengine-6.7-patchset-6.tar.xz 8140 BLAKE2B 773ee76ecf118ce45eb5dbebf4a574c3cff90f50cd87a469511688ed77db7a96012bec0dd03312bf2d366d709d95a2ac3432e9e0bd5a517b69a5bbd250a94420 SHA512 4db6abbd2a598f8194b9ba7035abad7228f6056fc5e5572329a9a0474f36135428b401edf5fa96e1ac866328d078b015fffd90949ef84f1cea9a1b39e5b9d5ff
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.12_p20240122.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.12_p20240122.ebuild
deleted file mode 100644
index 50fb9a051ea4..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.12_p20240122.ebuild
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 1999-2024 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
-# 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
- )"
-
-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
- app-alternatives/ninja
- dev-util/re2c
- net-libs/nodejs[ssl]
- sys-devel/bison
- sys-devel/flex
- ppc64? ( >=dev-build/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
-
- 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() {
- 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."
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-04-04 4:23 Arthur Zamarin
0 siblings, 0 replies; 301+ messages in thread
From: Arthur Zamarin @ 2024-04-04 4:23 UTC (permalink / raw
To: gentoo-commits
commit: ab7993fa3d5ac7e8028e884f1f9cda398df33a9b
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 4 04:21:48 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 4 04:21:48 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab7993fa
dev-qt/qtwebengine: Stabilize 5.15.13_p20240322 arm64, #927748
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.13_p20240322.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240322.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240322.ebuild
index 11eb731ec1b1..22bb5cdc0734 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240322.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240322.ebuild
@@ -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 ~arm64 ~x86"
+ KEYWORDS="amd64 arm64 ~x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-04-03 17:30 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-04-03 17:30 UTC (permalink / raw
To: gentoo-commits
commit: bb7df8565d5c09d2be079b1f8433944d0fc2d090
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 3 17:23:36 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Apr 3 17:23:39 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb7df856
dev-qt/qtwebengine: update 6.7 patchset to fix USE=-jumbo-build
6.7-5 -> 6.7-6 changes:
Updated:
* x11-header.patch -> glx-headers.patch (updated for bug #928508)
Closes: https://bugs.gentoo.org/928508
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 2 +-
dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 0d2fb09def52..8404183561f4 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -6,7 +6,7 @@ DIST qtwebengine-5.15.13_p20240322.tar.xz 301394204 BLAKE2B f9bb5bb79edbe0bc862a
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
-DIST qtwebengine-6.7-patchset-5.tar.xz 8108 BLAKE2B 60c77597992dcdbc758406fe6638f41cc0a542601812cf882c1e0a49ece15f1635c326dbc071966fc70ad3cf94c7fe91e34812a5e905205b41e8350c9fae2926 SHA512 a858f76e523a70bbf790b5438d3f0cdc4105e95305086ec11473f22582ea2eaddd20b3787599a3ced65cc3c8df01b5574937bf394a0f702584fff02bf35c2d1e
+DIST qtwebengine-6.7-patchset-6.tar.xz 8140 BLAKE2B 773ee76ecf118ce45eb5dbebf4a574c3cff90f50cd87a469511688ed77db7a96012bec0dd03312bf2d366d709d95a2ac3432e9e0bd5a517b69a5bbd250a94420 SHA512 4db6abbd2a598f8194b9ba7035abad7228f6056fc5e5572329a9a0474f36135428b401edf5fa96e1ac866328d078b015fffd90949ef84f1cea9a1b39e5b9d5ff
DIST qtwebengine-everywhere-src-6.6.2.tar.xz 421147952 BLAKE2B a0317faf9ff2d81cd2418652c297821bd8451e0564b8b9af8cb005b0c96a4ec74305ff814c3ab355d84bbacaaccd9ebf6bf591e01b485e243cc485aedf3e6e5b SHA512 8024890c1a7f6d5b9866d768f5ee5cb24b2eb9bb2162886fe02cf8f6fbb23e99eadb142c2636fd3d856b0b1975e69859989553f70c6d8610a69d991d4c2f190d
DIST qtwebengine-everywhere-src-6.6.3.tar.xz 421076320 BLAKE2B b718b968549a6aad0945cc23ccd2f297475a71db26c6ca6cbeab9d0fee3b709180d5b765a67ef90741eadd48b1fe72c95f302f44c856e4056e0d49589d655879 SHA512 cb026f2dd389d83fbeff3eedc3fa77fc22ff5cf6d444ec163b0dc4649abdf2d16683e9d31f46324f7b3546bb1ec80e40d35854537aa3c09959457fa3c79fa96d
DIST qtwebengine-everywhere-src-6.7.0.tar.xz 550907592 BLAKE2B e7787ab0a8b68657ca318de1c855f23b50d9aa3bda1bfcaa4ecd274ff0afb283c092256c28b566a9882cc5dccdaf2e3312836f4da6d4a85850f3202176d77933 SHA512 92bc8ffc69c6e00d55b647b332878e9b632257e78c38e9b3d0a5f4506d5df3c507e8ffa5916db2547b89c4c2641447fd9031a80e780e143c7ed58a7285e06e64
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
index 0d3fe2a590fb..259833ebd793 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
@@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs
DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
SRC_URI+="
- https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-5.tar.xz
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-6.tar.xz
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index 0d3fe2a590fb..259833ebd793 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs
DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
SRC_URI+="
- https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-5.tar.xz
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-6.tar.xz
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 9090db697cdc..faf29365b925 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -10,7 +10,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs
DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
SRC_URI+="
- https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-5.tar.xz
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-6.tar.xz
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-04-03 17:01 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-04-03 17:01 UTC (permalink / raw
To: gentoo-commits
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."
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-04-03 15:25 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2024-04-03 15:25 UTC (permalink / raw
To: gentoo-commits
commit: 8c24f0e96673243f8c1ad4babd3067da873f599e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 3 15:20:47 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr 3 15:25:26 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c24f0e9
dev-qt/qtwebengine: add 5.15.13_p20240327
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
.../qtwebengine-5.15.13_p20240327.ebuild | 248 +++++++++++++++++++++
2 files changed, 249 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 0d2fb09def52..b3dd1b059324 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -3,6 +3,7 @@ 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
new file mode 100644
index 000000000000..a0c7a9d5db61
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240327.ebuild
@@ -0,0 +1,248 @@
+# 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."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-04-02 13:06 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-04-02 13:06 UTC (permalink / raw
To: gentoo-commits
commit: c1abc1d9a042475f51ecabe34fafa77c763ea124
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 2 12:07:52 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Apr 2 13:05:06 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1abc1d9
dev-qt/qtwebengine: add 6.7.0
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild | 328 ++++++++++++++++++++++++++++
2 files changed, 329 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 885392ba06f8..1013b1f6ab01 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -8,3 +8,4 @@ DIST qtwebengine-6.6-patchset-9.tar.xz 8040 BLAKE2B 11c76fd36227cfcfc3c83618fad2
DIST qtwebengine-6.7-patchset-4.tar.xz 7792 BLAKE2B 99250f9c807870aeff0eafccd4a27c224785e34b21ba8dc9e663741cf123ebda6501b8f3d7b1e274cb4e543fe1f9d3fbb1ea54de85fcde4d11d2388f97674a60 SHA512 28dfb2c6c74a971f407e793f43b1224af5b2dac1c1b053badfee23e54d8fe6c390498a88d4da9d8f0de66f579234b1ccca527fc44997dd185ab1f570fbf63203
DIST qtwebengine-everywhere-src-6.6.2.tar.xz 421147952 BLAKE2B a0317faf9ff2d81cd2418652c297821bd8451e0564b8b9af8cb005b0c96a4ec74305ff814c3ab355d84bbacaaccd9ebf6bf591e01b485e243cc485aedf3e6e5b SHA512 8024890c1a7f6d5b9866d768f5ee5cb24b2eb9bb2162886fe02cf8f6fbb23e99eadb142c2636fd3d856b0b1975e69859989553f70c6d8610a69d991d4c2f190d
DIST qtwebengine-everywhere-src-6.6.3.tar.xz 421076320 BLAKE2B b718b968549a6aad0945cc23ccd2f297475a71db26c6ca6cbeab9d0fee3b709180d5b765a67ef90741eadd48b1fe72c95f302f44c856e4056e0d49589d655879 SHA512 cb026f2dd389d83fbeff3eedc3fa77fc22ff5cf6d444ec163b0dc4649abdf2d16683e9d31f46324f7b3546bb1ec80e40d35854537aa3c09959457fa3c79fa96d
+DIST qtwebengine-everywhere-src-6.7.0.tar.xz 550907592 BLAKE2B e7787ab0a8b68657ca318de1c855f23b50d9aa3bda1bfcaa4ecd274ff0afb283c092256c28b566a9882cc5dccdaf2e3312836f4da6d4a85850f3202176d77933 SHA512 92bc8ffc69c6e00d55b647b332878e9b632257e78c38e9b3d0a5f4506d5df3c507e8ffa5916db2547b89c4c2641447fd9031a80e780e143c7ed58a7285e06e64
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
new file mode 100644
index 000000000000..e8636461bcc4
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
@@ -0,0 +1,328 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="xml(+)"
+inherit check-reqs flag-o-matic multiprocessing optfeature
+inherit prefix python-any-r1 qt6-build toolchain-funcs
+
+DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
+SRC_URI+="
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-4.tar.xz
+"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm64"
+fi
+
+IUSE="
+ accessibility +alsa bindist custom-cflags designer geolocation
+ +jumbo-build kerberos opengl pdfium pulseaudio qml screencast
+ +system-icu vaapi vulkan webdriver +widgets
+"
+REQUIRED_USE="
+ designer? ( qml widgets )
+"
+
+# dlopen: krb5, libva, pciutils, udev
+# gcc: for -latomic
+RDEPEND="
+ app-arch/snappy:=
+ dev-libs/expat
+ dev-libs/libevent:=
+ dev-libs/libxml2[icu]
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ ~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl=,vulkan?,widgets?]
+ ~dev-qt/qtwebchannel-${PV}:6[qml?]
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/harfbuzz:=
+ media-libs/lcms:2
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ media-libs/libwebp:=
+ media-libs/openjpeg:2=
+ media-libs/opus
+ media-libs/tiff:=
+ sys-apps/dbus
+ sys-apps/pciutils
+ sys-devel/gcc:*
+ sys-libs/zlib:=[minizip]
+ virtual/libudev
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXrandr
+ x11-libs/libXtst
+ x11-libs/libxcb:=
+ x11-libs/libxkbcommon
+ x11-libs/libxkbfile
+ alsa? ( media-libs/alsa-lib )
+ designer? ( ~dev-qt/qttools-${PV}:6[designer] )
+ geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
+ kerberos? ( virtual/krb5 )
+ pulseaudio? ( media-libs/libpulse[glib] )
+ qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
+ screencast? (
+ dev-libs/glib:2
+ media-libs/mesa[gbm(+)]
+ media-video/pipewire:=
+ x11-libs/libdrm
+ )
+ system-icu? ( dev-libs/icu:= )
+ vaapi? (
+ media-libs/libva:=[X]
+ media-libs/mesa[gbm(+)]
+ x11-libs/libdrm
+ )
+ !vaapi? ( media-libs/libvpx:= )
+ widgets? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] )
+"
+DEPEND="
+ ${RDEPEND}
+ media-libs/libglvnd
+ x11-base/xorg-proto
+ x11-libs/libxshmfence
+ screencast? ( media-libs/libepoxy[egl(+)] )
+ pdfium? ( net-print/cups )
+ test? (
+ widgets? ( app-text/poppler[cxx(+)] )
+ )
+ vaapi? (
+ vulkan? ( dev-util/vulkan-headers )
+ )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
+ dev-util/gperf
+ net-libs/nodejs[ssl]
+ sys-devel/bison
+ sys-devel/flex
+"
+
+PATCHES=( "${WORKDIR}"/patches/${PN} )
+[[ ${PV} == 6.9999 ]] || # too fragile for 6.9999, but keep for 6.x.9999
+ PATCHES+=( "${WORKDIR}"/patches/chromium )
+
+PATCHES+=(
+ # add extras as needed here, may merge in set if carries across versions
+ "${FILESDIR}"/${PN}-6.7.0-clang18.patch
+ "${FILESDIR}"/${PN}-6.7.0-x11-header.patch
+)
+
+python_check_deps() {
+ python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+}
+
+qtwebengine_check-reqs() {
+ [[ ${MERGE_TYPE} == binary ]] && return
+
+ if is-flagq '-g?(gdb)?([1-9])'; then #307861
+ ewarn
+ ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which"
+ ewarn "is non-trivial with ${PN}. May experience extended compilation"
+ ewarn "times, increased disk/memory usage, and potentially link failure."
+ ewarn
+ ewarn "If run into issues, please try disabling before reporting a bug."
+ fi
+
+ local CHECKREQS_DISK_BUILD=8G
+ local CHECKREQS_DISK_USR=360M
+
+ if ! has distcc ${FEATURES}; then #830661
+ # assume ~2GB per job or 1.5GB if clang, possible with less
+ # depending on free memory and *FLAGS, but prefer being safe as
+ # users having OOM issues with qtwebengine been rather common
+ tc-is-clang && : 15 || : 20
+ local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G
+ fi
+
+ check-reqs_${EBUILD_PHASE_FUNC} #570534
+}
+
+pkg_pretend() {
+ qtwebengine_check-reqs
+}
+
+pkg_setup() {
+ qtwebengine_check-reqs
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ qt6-build_src_prepare
+
+ # for www-plugins/chrome-binary-plugins (widevine) search paths on prefix
+ hprefixify -w /Gentoo/ src/core/content_client_qt.cpp
+
+ # store chromium versions, only used in postinst for a warning
+ local chromium
+ mapfile -t chromium < CHROMIUM_VERSION || die
+ [[ ${chromium[1]} =~ ^Based.*:[^0-9]+([0-9.]+$) ]] &&
+ QT6_CHROMIUM_VER=${BASH_REMATCH[1]} || die
+ [[ ${chromium[2]} =~ ^Patched.+:[^0-9]+([0-9.]+$) ]] &&
+ QT6_CHROMIUM_PATCHES_VER=${BASH_REMATCH[1]} || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(qt_feature pdfium qtpdf_build)
+ $(qt_feature qml qtpdf_quick_build)
+ $(qt_feature webdriver webenginedriver)
+ $(qt_feature widgets qtpdf_widgets_build)
+ $(usev pdfium -DQT_FEATURE_pdf_v8=ON)
+
+ -DQT_FEATURE_qtwebengine_build=ON
+ $(qt_feature qml qtwebengine_quick_build)
+ $(qt_feature widgets qtwebengine_widgets_build)
+
+ $(cmake_use_find_package designer Qt6Designer)
+
+ $(qt_feature alsa webengine_system_alsa)
+ $(qt_feature !bindist webengine_proprietary_codecs)
+ $(qt_feature geolocation webengine_geolocation)
+ $(qt_feature jumbo-build webengine_jumbo_build)
+ $(qt_feature kerberos webengine_kerberos)
+ $(qt_feature pulseaudio webengine_system_pulseaudio)
+ $(qt_feature screencast webengine_webrtc_pipewire)
+ $(qt_feature system-icu webengine_system_icu)
+ $(qt_feature vaapi webengine_vaapi)
+ $(qt_feature vulkan webengine_vulkan)
+ -DQT_FEATURE_webengine_embedded_build=OFF
+ -DQT_FEATURE_webengine_extensions=ON
+ -DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet
+ -DQT_FEATURE_webengine_pepper_plugins=ON
+ -DQT_FEATURE_webengine_printing_and_pdf=ON
+ -DQT_FEATURE_webengine_spellchecker=ON
+ -DQT_FEATURE_webengine_webchannel=ON
+ -DQT_FEATURE_webengine_webrtc=ON
+
+ # needs a modified ffmpeg to be usable, and even then it may not
+ # cooperate with new major ffmpeg versions (bug #831487)
+ -DQT_FEATURE_webengine_system_ffmpeg=OFF
+
+ # use bundled re2 to avoid complications, may revisit
+ # (see discussions in https://github.com/gentoo/gentoo/pull/32281)
+ -DQT_FEATURE_webengine_system_re2=OFF
+
+ # bundled is currently required when using vaapi (forced regardless)
+ $(qt_feature !vaapi webengine_system_libvpx)
+
+ # not necessary to pass these (default), but in case detection fails
+ $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
+ freetype gbm glib harfbuzz lcms2 libevent libjpeg \
+ libopenjpeg2 libpci libpng libtiff libwebp libxml \
+ minizip opus poppler snappy zlib)
+
+ # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
+ -DINSTALL_GN=OFF
+ )
+
+ local mygnargs=(
+ # prefer no dlopen where possible
+ link_pulseaudio=true
+ rtc_link_pipewire=true
+ )
+
+ if use !custom-cflags; then
+ strip-flags # fragile
+
+ if is-flagq '-g?(gdb)?([2-9])'; then #914475
+ replace-flags '-g?(gdb)?([2-9])' -g1
+ ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"
+ fi
+
+ # Built helpers segfault when using (at least) -march=armv8-a+pauth
+ # (bug #920555, #920568 -- suspected gcc bug). For now, filter all
+ # for simplicity. Override with USE=custom-cflags if wanted, please
+ # report if above -march works again so can cleanup.
+ use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
+ fi
+
+ export NINJA NINJAFLAGS=$(get_NINJAOPTS)
+ [[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
+
+ local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
+ einfo "Extra Gn args: ${EXTRA_GN}"
+
+ qt6-build_src_configure
+}
+
+src_compile() {
+ # tentatively work around a possible (rare) race condition (bug #921680)
+ cmake_build WebEngineCore_sync_all_public_headers
+
+ cmake_src_compile
+}
+
+src_test() {
+ if [[ ${EUID} == 0 ]]; then
+ # almost every tests fail, so skip entirely
+ ewarn "Skipping tests due to running as root (chromium refuses this configuration)."
+ return
+ fi
+
+ local CMAKE_SKIP_TESTS=(
+ # fails with network sandbox
+ tst_loadsignals
+ tst_qquickwebengineview
+ tst_qwebengineglobalsettings
+ tst_qwebengineview
+ # fails with offscreen rendering, may be worth retrying if the issue
+ # persist given these are rather major tests (or consider virtx)
+ tst_qmltests
+ tst_qwebenginepage
+ # certs verfication seems flaky and gives expiration warnings
+ tst_qwebengineclientcertificatestore
+ # test is misperformed when qtbase is built USE=-test?
+ tst_touchinput
+ # currently requires webenginedriver to be already installed
+ tst_webenginedriver
+ )
+
+ # prevent using the system's qtwebengine
+ # (use glob to avoid unnecessary complications with arch dir)
+ local resources=( "${BUILD_DIR}/src/core/${CMAKE_BUILD_TYPE}/"* )
+ [[ -d ${resources[0]} ]] || die "invalid resources path: ${resources[0]}"
+ local -x QTWEBENGINEPROCESS_PATH=${BUILD_DIR}${QT6_LIBEXECDIR#"${QT6_PREFIX}"}/QtWebEngineProcess
+ local -x QTWEBENGINE_LOCALES_PATH=${resources[0]}/qtwebengine_locales
+ local -x QTWEBENGINE_RESOURCES_PATH=${resources[0]}
+
+ # random failures in several tests without -j1
+ qt6-build_src_test -j1
+}
+
+src_install() {
+ qt6-build_src_install
+
+ [[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472
+ die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
+
+ if use test && use webdriver; then
+ rm -- "${D}${QT6_BINDIR}"/testbrowser || die
+ fi
+}
+
+pkg_postinst() {
+ # plugin may also be found in $HOME if provided by chrome or firefox
+ use amd64 &&
+ optfeature "Widevine DRM support (protected media playback)" \
+ www-plugins/chrome-binary-plugins
+
+ elog
+ elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with"
+ elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. 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
+ 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 "tl;dr your web browsing experience will be compromised."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-04-02 6:09 Arthur Zamarin
0 siblings, 0 replies; 301+ messages in thread
From: Arthur Zamarin @ 2024-04-02 6:09 UTC (permalink / raw
To: gentoo-commits
commit: 101862818421effdbabfff71cfca8c17914426e6
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 2 05:55:46 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 2 05:55:46 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10186281
dev-qt/qtwebengine: Stabilize 6.6.3 arm64, #928382
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.6.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.3.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.3.ebuild
index cbdea9c7fcc9..ccef89994519 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI+="
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm64"
+ KEYWORDS="amd64 arm64"
fi
IUSE="
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-04-01 18:29 Arthur Zamarin
0 siblings, 0 replies; 301+ messages in thread
From: Arthur Zamarin @ 2024-04-01 18:29 UTC (permalink / raw
To: gentoo-commits
commit: 1c00dcb9d2bd73f3c9991a8aae2a1a12888e2c30
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 1 18:28:06 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 1 18:28:06 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c00dcb9
dev-qt/qtwebengine: Stabilize 6.6.3 amd64, #928382
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.6.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.3.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.3.ebuild
index 378b562a6fb0..cbdea9c7fcc9 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI+="
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm64"
+ KEYWORDS="amd64 ~arm64"
fi
IUSE="
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-03-30 0:29 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-03-30 0:29 UTC (permalink / raw
To: gentoo-commits
commit: 91c54543e3a9b8fb56d786c98e6718d7d92d6ae0
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 29 22:16:52 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 00:27:54 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91c54543
dev-qt/qtwebengine: drop 6.6.9999
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 314 -------------------------
1 file changed, 314 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
deleted file mode 100644
index 378b562a6fb0..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="xml(+)"
-inherit check-reqs flag-o-matic multiprocessing optfeature
-inherit prefix python-any-r1 qt6-build toolchain-funcs
-
-DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
-SRC_URI+="
- https://dev.gentoo.org/~ionen/distfiles/${PN}-6.6-patchset-9.tar.xz
-"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm64"
-fi
-
-IUSE="
- accessibility +alsa bindist custom-cflags designer geolocation
- +jumbo-build kerberos opengl pdfium pulseaudio qml screencast
- +system-icu vaapi vulkan +widgets
-"
-REQUIRED_USE="
- designer? ( qml widgets )
-"
-
-# dlopen: krb5, libva, pciutils, udev
-RDEPEND="
- app-arch/snappy:=
- dev-libs/expat
- dev-libs/libevent:=
- dev-libs/libxml2[icu]
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- ~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl=,vulkan?,widgets?]
- ~dev-qt/qtwebchannel-${PV}:6[qml?]
- media-libs/fontconfig
- media-libs/freetype
- media-libs/harfbuzz:=
- media-libs/lcms:2
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- media-libs/libwebp:=
- media-libs/openjpeg:2=
- media-libs/opus
- media-libs/tiff:=
- sys-apps/dbus
- sys-apps/pciutils
- sys-libs/zlib:=[minizip]
- virtual/libudev
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libXtst
- x11-libs/libxcb:=
- x11-libs/libxkbcommon
- x11-libs/libxkbfile
- alsa? ( media-libs/alsa-lib )
- designer? ( ~dev-qt/qttools-${PV}:6[designer] )
- geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
- kerberos? ( virtual/krb5 )
- pulseaudio? ( media-libs/libpulse[glib] )
- qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
- screencast? (
- dev-libs/glib:2
- media-libs/mesa[gbm(+)]
- media-video/pipewire:=
- x11-libs/libdrm
- )
- system-icu? ( dev-libs/icu:= )
- vaapi? (
- media-libs/libva:=[X]
- media-libs/mesa[gbm(+)]
- x11-libs/libdrm
- )
- !vaapi? ( media-libs/libvpx:= )
- widgets? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] )
-"
-DEPEND="
- ${RDEPEND}
- media-libs/libglvnd
- x11-base/xorg-proto
- x11-libs/libxshmfence
- screencast? ( media-libs/libepoxy[egl(+)] )
- pdfium? ( net-print/cups )
- test? (
- widgets? ( app-text/poppler[cxx(+)] )
- )
- vaapi? (
- vulkan? ( dev-util/vulkan-headers )
- )
-"
-BDEPEND="
- $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
- dev-util/gperf
- net-libs/nodejs[ssl]
- sys-devel/bison
- sys-devel/flex
-"
-
-PATCHES=( "${WORKDIR}"/patches/${PN} )
-[[ ${PV} == 6.9999 ]] || # too fragile for 6.9999, but keep for 6.x.9999
- PATCHES+=( "${WORKDIR}"/patches/chromium )
-
-PATCHES+=(
- # add extras as needed here, may merge in set if carries across versions
- "${FILESDIR}"/${PN}-6.6.2-clang18.patch
-)
-
-python_check_deps() {
- python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
-}
-
-qtwebengine_check-reqs() {
- [[ ${MERGE_TYPE} == binary ]] && return
-
- if is-flagq '-g?(gdb)?([1-9])'; then #307861
- ewarn
- ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which"
- ewarn "is non-trivial with ${PN}. May experience extended compilation"
- ewarn "times, increased disk/memory usage, and potentially link failure."
- ewarn
- ewarn "If run into issues, please try disabling before reporting a bug."
- fi
-
- local CHECKREQS_DISK_BUILD=7G
- local CHECKREQS_DISK_USR=220M
-
- if ! has distcc ${FEATURES}; then #830661
- # assume ~2GB per job or 1.5GB if clang, possible with less
- # depending on free memory and *FLAGS, but prefer being safe as
- # users having OOM issues with qtwebengine been rather common
- tc-is-clang && : 15 || : 20
- local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G
- fi
-
- check-reqs_${EBUILD_PHASE_FUNC} #570534
-}
-
-pkg_pretend() {
- qtwebengine_check-reqs
-}
-
-pkg_setup() {
- qtwebengine_check-reqs
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- qt6-build_src_prepare
-
- # for www-plugins/chrome-binary-plugins (widevine) search paths on prefix
- hprefixify -w /Gentoo/ src/core/content_client_qt.cpp
-
- # store chromium versions, only used in postinst for a warning
- local chromium
- mapfile -t chromium < CHROMIUM_VERSION || die
- [[ ${chromium[1]} =~ ^Based.*:[^0-9]+([0-9.]+$) ]] &&
- QT6_CHROMIUM_VER=${BASH_REMATCH[1]} || die
- [[ ${chromium[2]} =~ ^Patched.+:[^0-9]+([0-9.]+$) ]] &&
- QT6_CHROMIUM_PATCHES_VER=${BASH_REMATCH[1]} || die
-}
-
-src_configure() {
- local mycmakeargs=(
- $(qt_feature pdfium qtpdf_build)
- $(qt_feature qml qtpdf_quick_build)
- $(qt_feature widgets qtpdf_widgets_build)
- $(usev pdfium -DQT_FEATURE_pdf_v8=ON)
-
- -DQT_FEATURE_qtwebengine_build=ON
- $(qt_feature qml qtwebengine_quick_build)
- $(qt_feature widgets qtwebengine_widgets_build)
-
- $(cmake_use_find_package designer Qt6Designer)
-
- $(qt_feature alsa webengine_system_alsa)
- $(qt_feature !bindist webengine_proprietary_codecs)
- $(qt_feature geolocation webengine_geolocation)
- $(qt_feature jumbo-build webengine_jumbo_build)
- $(qt_feature kerberos webengine_kerberos)
- $(qt_feature pulseaudio webengine_system_pulseaudio)
- $(qt_feature screencast webengine_webrtc_pipewire)
- $(qt_feature system-icu webengine_system_icu)
- $(qt_feature vaapi webengine_vaapi)
- $(qt_feature vulkan webengine_vulkan)
- -DQT_FEATURE_webengine_embedded_build=OFF
- -DQT_FEATURE_webengine_extensions=ON
- -DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet
- -DQT_FEATURE_webengine_pepper_plugins=ON
- -DQT_FEATURE_webengine_printing_and_pdf=ON
- -DQT_FEATURE_webengine_spellchecker=ON
- -DQT_FEATURE_webengine_webchannel=ON
- -DQT_FEATURE_webengine_webrtc=ON
-
- # needs a modified ffmpeg to be usable, and even then it may not
- # cooperate with new major ffmpeg versions (bug #831487)
- -DQT_FEATURE_webengine_system_ffmpeg=OFF
-
- # use bundled re2 to avoid complications, may revisit
- # (see discussions in https://github.com/gentoo/gentoo/pull/32281)
- -DQT_FEATURE_webengine_system_re2=OFF
-
- # bundled is currently required when using vaapi (forced regardless)
- $(qt_feature !vaapi webengine_system_libvpx)
-
- # not necessary to pass these (default), but in case detection fails
- $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
- freetype glib harfbuzz lcms2 libevent libjpeg \
- libopenjpeg2 libpci libpng libtiff libwebp \
- libxml minizip opus poppler snappy zlib)
-
- # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
- -DINSTALL_GN=OFF
- )
-
- local mygnargs=(
- # prefer no dlopen where possible
- link_pulseaudio=true
- rtc_link_pipewire=true
- )
-
- if use !custom-cflags; then
- strip-flags # fragile
-
- if is-flagq '-g?(gdb)?([2-9])'; then #914475
- replace-flags '-g?(gdb)?([2-9])' -g1
- ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"
- fi
-
- # Built helpers segfault when using (at least) -march=armv8-a+pauth
- # (bug #920555, #920568 -- suspected gcc bug). For now, filter all
- # for simplicity. Override with USE=custom-cflags if wanted, please
- # report if above -march works again so can cleanup.
- use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
- fi
-
- export NINJA NINJAFLAGS=$(get_NINJAOPTS)
- [[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
-
- local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
- einfo "Extra Gn args: ${EXTRA_GN}"
-
- qt6-build_src_configure
-}
-
-src_compile() {
- # tentatively work around a possible (rare) race condition (bug #921680)
- cmake_build WebEngineCore_sync_all_public_headers
-
- cmake_src_compile
-}
-
-src_test() {
- if [[ ${EUID} == 0 ]]; then
- # almost every tests fail, so skip entirely
- ewarn "Skipping tests due to running as root (chromium refuses this configuration)."
- return
- fi
-
- local CMAKE_SKIP_TESTS=(
- # fails with network sandbox
- tst_loadsignals
- tst_qquickwebengineview
- tst_qwebengineglobalsettings
- tst_qwebengineview
- # certs verfication seems flaky and gives expiration warnings
- tst_qwebengineclientcertificatestore
- # test is misperformed when qtbase is built USE=-test?
- tst_touchinput
- )
-
- # prevent using the system's qtwebengine
- # (use glob to avoid unnecessary complications with arch dir)
- local resources=( "${BUILD_DIR}/src/core/${CMAKE_BUILD_TYPE}/"* )
- [[ -d ${resources[0]} ]] || die "invalid resources path: ${resources[0]}"
- local -x QTWEBENGINEPROCESS_PATH=${BUILD_DIR}${QT6_LIBEXECDIR#"${QT6_PREFIX}"}/QtWebEngineProcess
- local -x QTWEBENGINE_LOCALES_PATH=${resources[0]}/qtwebengine_locales
- local -x QTWEBENGINE_RESOURCES_PATH=${resources[0]}
-
- # random failures in several tests without -j1
- qt6-build_src_test -j1
-}
-
-src_install() {
- qt6-build_src_install
-
- [[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472
- die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
-}
-
-pkg_postinst() {
- # plugin may also be found in $HOME if provided by chrome or firefox
- use amd64 &&
- optfeature "Widevine DRM support (protected media playback)" \
- www-plugins/chrome-binary-plugins
-
- elog
- elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with"
- elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. 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
- 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 "tl;dr your web browsing experience will be compromised."
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-03-30 0:29 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-03-30 0:29 UTC (permalink / raw
To: gentoo-commits
commit: 9db87425dc16058028137425166af6cc858885fa
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 29 22:22:49 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 00:27:55 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9db87425
dev-qt/qtwebengine: avoid installing extra USE=test junk in 6.7+
New with USE=webdriver. Originally thought it was just something
normal given the nature of webdriver (meant for testing) but now
noticed this is only created by tests/auto files.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 4 ++++
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index a3998d60bc35..e8636461bcc4 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -303,6 +303,10 @@ src_install() {
[[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472
die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
+
+ if use test && use webdriver; then
+ rm -- "${D}${QT6_BINDIR}"/testbrowser || die
+ fi
}
pkg_postinst() {
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 1e77e0077e41..a7523d65072f 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -301,6 +301,10 @@ src_install() {
[[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472
die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
+
+ if use test && use webdriver; then
+ rm -- "${D}${QT6_BINDIR}"/testbrowser || die
+ fi
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-03-30 0:29 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-03-30 0:29 UTC (permalink / raw
To: gentoo-commits
commit: ed980f570a62b31575e0adcd93dda95ecd09fdba
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 29 18:34:01 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Mar 30 00:27:55 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed980f57
dev-qt/qtwebengine: apply x11-header.patch to 6.7.9999 as well
May need this for longer than I thought.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index dcc7ec6d9b87..a3998d60bc35 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -113,6 +113,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
PATCHES+=(
# add extras as needed here, may merge in set if carries across versions
"${FILESDIR}"/${PN}-6.7.0-clang18.patch
+ "${FILESDIR}"/${PN}-6.7.0-x11-header.patch
)
python_check_deps() {
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-03-26 7:10 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-03-26 7:10 UTC (permalink / raw
To: gentoo-commits
commit: 7b7714c0909169449919fb3c3645691741158255
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 26 06:57:56 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Mar 26 07:08:31 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b7714c0
dev-qt/qtwebengine: add 6.6.3
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-6.6.3.ebuild | 314 ++++++++++++++++++++++++++++
2 files changed, 315 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index da02e023c7f9..e2571d4c2f77 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -7,4 +7,5 @@ DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3
DIST qtwebengine-6.6-patchset-9.tar.xz 8040 BLAKE2B 11c76fd36227cfcfc3c83618fad25c66963e63697f857b99efc76188529bea42094b279bd9f37e79584cb6e9f1d2dd2f666a96c46ddf2276033cdc97782b72c4 SHA512 33cc1ad0843eeaf1103033c2e9b9a734cd218d92c40985fd6c109acefa2f68b99b1f3cf5e06d6f837fc974c39b220ae93b40d135b5414f822cf28e075805c9c1
DIST qtwebengine-6.7-patchset-4.tar.xz 7792 BLAKE2B 99250f9c807870aeff0eafccd4a27c224785e34b21ba8dc9e663741cf123ebda6501b8f3d7b1e274cb4e543fe1f9d3fbb1ea54de85fcde4d11d2388f97674a60 SHA512 28dfb2c6c74a971f407e793f43b1224af5b2dac1c1b053badfee23e54d8fe6c390498a88d4da9d8f0de66f579234b1ccca527fc44997dd185ab1f570fbf63203
DIST qtwebengine-everywhere-src-6.6.2.tar.xz 421147952 BLAKE2B a0317faf9ff2d81cd2418652c297821bd8451e0564b8b9af8cb005b0c96a4ec74305ff814c3ab355d84bbacaaccd9ebf6bf591e01b485e243cc485aedf3e6e5b SHA512 8024890c1a7f6d5b9866d768f5ee5cb24b2eb9bb2162886fe02cf8f6fbb23e99eadb142c2636fd3d856b0b1975e69859989553f70c6d8610a69d991d4c2f190d
+DIST qtwebengine-everywhere-src-6.6.3.tar.xz 421076320 BLAKE2B b718b968549a6aad0945cc23ccd2f297475a71db26c6ca6cbeab9d0fee3b709180d5b765a67ef90741eadd48b1fe72c95f302f44c856e4056e0d49589d655879 SHA512 cb026f2dd389d83fbeff3eedc3fa77fc22ff5cf6d444ec163b0dc4649abdf2d16683e9d31f46324f7b3546bb1ec80e40d35854537aa3c09959457fa3c79fa96d
DIST qtwebengine-everywhere-src-6.7.0-rc2.tar.xz 550989672 BLAKE2B 9bd6914a77afb7bce7f1de5063313aab1276211141db3ef53777b164ba68d72762c60d46ecabac9138aa5beff653c799a6785522be77389071d3afeebb100938 SHA512 7fb6cab6c52e692174a1dc41195c59b787457f3cf9d9c11921da62b3fed60a1c879d5ca38442430694bf642e66b768842af9208e9f70fc4180356d4b0df49c57
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.3.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.3.ebuild
new file mode 100644
index 000000000000..378b562a6fb0
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.3.ebuild
@@ -0,0 +1,314 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="xml(+)"
+inherit check-reqs flag-o-matic multiprocessing optfeature
+inherit prefix python-any-r1 qt6-build toolchain-funcs
+
+DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
+SRC_URI+="
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.6-patchset-9.tar.xz
+"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm64"
+fi
+
+IUSE="
+ accessibility +alsa bindist custom-cflags designer geolocation
+ +jumbo-build kerberos opengl pdfium pulseaudio qml screencast
+ +system-icu vaapi vulkan +widgets
+"
+REQUIRED_USE="
+ designer? ( qml widgets )
+"
+
+# dlopen: krb5, libva, pciutils, udev
+RDEPEND="
+ app-arch/snappy:=
+ dev-libs/expat
+ dev-libs/libevent:=
+ dev-libs/libxml2[icu]
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ ~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl=,vulkan?,widgets?]
+ ~dev-qt/qtwebchannel-${PV}:6[qml?]
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/harfbuzz:=
+ media-libs/lcms:2
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ media-libs/libwebp:=
+ media-libs/openjpeg:2=
+ media-libs/opus
+ media-libs/tiff:=
+ sys-apps/dbus
+ sys-apps/pciutils
+ sys-libs/zlib:=[minizip]
+ virtual/libudev
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXrandr
+ x11-libs/libXtst
+ x11-libs/libxcb:=
+ x11-libs/libxkbcommon
+ x11-libs/libxkbfile
+ alsa? ( media-libs/alsa-lib )
+ designer? ( ~dev-qt/qttools-${PV}:6[designer] )
+ geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
+ kerberos? ( virtual/krb5 )
+ pulseaudio? ( media-libs/libpulse[glib] )
+ qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
+ screencast? (
+ dev-libs/glib:2
+ media-libs/mesa[gbm(+)]
+ media-video/pipewire:=
+ x11-libs/libdrm
+ )
+ system-icu? ( dev-libs/icu:= )
+ vaapi? (
+ media-libs/libva:=[X]
+ media-libs/mesa[gbm(+)]
+ x11-libs/libdrm
+ )
+ !vaapi? ( media-libs/libvpx:= )
+ widgets? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] )
+"
+DEPEND="
+ ${RDEPEND}
+ media-libs/libglvnd
+ x11-base/xorg-proto
+ x11-libs/libxshmfence
+ screencast? ( media-libs/libepoxy[egl(+)] )
+ pdfium? ( net-print/cups )
+ test? (
+ widgets? ( app-text/poppler[cxx(+)] )
+ )
+ vaapi? (
+ vulkan? ( dev-util/vulkan-headers )
+ )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
+ dev-util/gperf
+ net-libs/nodejs[ssl]
+ sys-devel/bison
+ sys-devel/flex
+"
+
+PATCHES=( "${WORKDIR}"/patches/${PN} )
+[[ ${PV} == 6.9999 ]] || # too fragile for 6.9999, but keep for 6.x.9999
+ PATCHES+=( "${WORKDIR}"/patches/chromium )
+
+PATCHES+=(
+ # add extras as needed here, may merge in set if carries across versions
+ "${FILESDIR}"/${PN}-6.6.2-clang18.patch
+)
+
+python_check_deps() {
+ python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+}
+
+qtwebengine_check-reqs() {
+ [[ ${MERGE_TYPE} == binary ]] && return
+
+ if is-flagq '-g?(gdb)?([1-9])'; then #307861
+ ewarn
+ ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which"
+ ewarn "is non-trivial with ${PN}. May experience extended compilation"
+ ewarn "times, increased disk/memory usage, and potentially link failure."
+ ewarn
+ ewarn "If run into issues, please try disabling before reporting a bug."
+ fi
+
+ local CHECKREQS_DISK_BUILD=7G
+ local CHECKREQS_DISK_USR=220M
+
+ if ! has distcc ${FEATURES}; then #830661
+ # assume ~2GB per job or 1.5GB if clang, possible with less
+ # depending on free memory and *FLAGS, but prefer being safe as
+ # users having OOM issues with qtwebengine been rather common
+ tc-is-clang && : 15 || : 20
+ local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G
+ fi
+
+ check-reqs_${EBUILD_PHASE_FUNC} #570534
+}
+
+pkg_pretend() {
+ qtwebengine_check-reqs
+}
+
+pkg_setup() {
+ qtwebengine_check-reqs
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ qt6-build_src_prepare
+
+ # for www-plugins/chrome-binary-plugins (widevine) search paths on prefix
+ hprefixify -w /Gentoo/ src/core/content_client_qt.cpp
+
+ # store chromium versions, only used in postinst for a warning
+ local chromium
+ mapfile -t chromium < CHROMIUM_VERSION || die
+ [[ ${chromium[1]} =~ ^Based.*:[^0-9]+([0-9.]+$) ]] &&
+ QT6_CHROMIUM_VER=${BASH_REMATCH[1]} || die
+ [[ ${chromium[2]} =~ ^Patched.+:[^0-9]+([0-9.]+$) ]] &&
+ QT6_CHROMIUM_PATCHES_VER=${BASH_REMATCH[1]} || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(qt_feature pdfium qtpdf_build)
+ $(qt_feature qml qtpdf_quick_build)
+ $(qt_feature widgets qtpdf_widgets_build)
+ $(usev pdfium -DQT_FEATURE_pdf_v8=ON)
+
+ -DQT_FEATURE_qtwebengine_build=ON
+ $(qt_feature qml qtwebengine_quick_build)
+ $(qt_feature widgets qtwebengine_widgets_build)
+
+ $(cmake_use_find_package designer Qt6Designer)
+
+ $(qt_feature alsa webengine_system_alsa)
+ $(qt_feature !bindist webengine_proprietary_codecs)
+ $(qt_feature geolocation webengine_geolocation)
+ $(qt_feature jumbo-build webengine_jumbo_build)
+ $(qt_feature kerberos webengine_kerberos)
+ $(qt_feature pulseaudio webengine_system_pulseaudio)
+ $(qt_feature screencast webengine_webrtc_pipewire)
+ $(qt_feature system-icu webengine_system_icu)
+ $(qt_feature vaapi webengine_vaapi)
+ $(qt_feature vulkan webengine_vulkan)
+ -DQT_FEATURE_webengine_embedded_build=OFF
+ -DQT_FEATURE_webengine_extensions=ON
+ -DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet
+ -DQT_FEATURE_webengine_pepper_plugins=ON
+ -DQT_FEATURE_webengine_printing_and_pdf=ON
+ -DQT_FEATURE_webengine_spellchecker=ON
+ -DQT_FEATURE_webengine_webchannel=ON
+ -DQT_FEATURE_webengine_webrtc=ON
+
+ # needs a modified ffmpeg to be usable, and even then it may not
+ # cooperate with new major ffmpeg versions (bug #831487)
+ -DQT_FEATURE_webengine_system_ffmpeg=OFF
+
+ # use bundled re2 to avoid complications, may revisit
+ # (see discussions in https://github.com/gentoo/gentoo/pull/32281)
+ -DQT_FEATURE_webengine_system_re2=OFF
+
+ # bundled is currently required when using vaapi (forced regardless)
+ $(qt_feature !vaapi webengine_system_libvpx)
+
+ # not necessary to pass these (default), but in case detection fails
+ $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
+ freetype glib harfbuzz lcms2 libevent libjpeg \
+ libopenjpeg2 libpci libpng libtiff libwebp \
+ libxml minizip opus poppler snappy zlib)
+
+ # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
+ -DINSTALL_GN=OFF
+ )
+
+ local mygnargs=(
+ # prefer no dlopen where possible
+ link_pulseaudio=true
+ rtc_link_pipewire=true
+ )
+
+ if use !custom-cflags; then
+ strip-flags # fragile
+
+ if is-flagq '-g?(gdb)?([2-9])'; then #914475
+ replace-flags '-g?(gdb)?([2-9])' -g1
+ ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"
+ fi
+
+ # Built helpers segfault when using (at least) -march=armv8-a+pauth
+ # (bug #920555, #920568 -- suspected gcc bug). For now, filter all
+ # for simplicity. Override with USE=custom-cflags if wanted, please
+ # report if above -march works again so can cleanup.
+ use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
+ fi
+
+ export NINJA NINJAFLAGS=$(get_NINJAOPTS)
+ [[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
+
+ local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
+ einfo "Extra Gn args: ${EXTRA_GN}"
+
+ qt6-build_src_configure
+}
+
+src_compile() {
+ # tentatively work around a possible (rare) race condition (bug #921680)
+ cmake_build WebEngineCore_sync_all_public_headers
+
+ cmake_src_compile
+}
+
+src_test() {
+ if [[ ${EUID} == 0 ]]; then
+ # almost every tests fail, so skip entirely
+ ewarn "Skipping tests due to running as root (chromium refuses this configuration)."
+ return
+ fi
+
+ local CMAKE_SKIP_TESTS=(
+ # fails with network sandbox
+ tst_loadsignals
+ tst_qquickwebengineview
+ tst_qwebengineglobalsettings
+ tst_qwebengineview
+ # certs verfication seems flaky and gives expiration warnings
+ tst_qwebengineclientcertificatestore
+ # test is misperformed when qtbase is built USE=-test?
+ tst_touchinput
+ )
+
+ # prevent using the system's qtwebengine
+ # (use glob to avoid unnecessary complications with arch dir)
+ local resources=( "${BUILD_DIR}/src/core/${CMAKE_BUILD_TYPE}/"* )
+ [[ -d ${resources[0]} ]] || die "invalid resources path: ${resources[0]}"
+ local -x QTWEBENGINEPROCESS_PATH=${BUILD_DIR}${QT6_LIBEXECDIR#"${QT6_PREFIX}"}/QtWebEngineProcess
+ local -x QTWEBENGINE_LOCALES_PATH=${resources[0]}/qtwebengine_locales
+ local -x QTWEBENGINE_RESOURCES_PATH=${resources[0]}
+
+ # random failures in several tests without -j1
+ qt6-build_src_test -j1
+}
+
+src_install() {
+ qt6-build_src_install
+
+ [[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472
+ die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
+}
+
+pkg_postinst() {
+ # plugin may also be found in $HOME if provided by chrome or firefox
+ use amd64 &&
+ optfeature "Widevine DRM support (protected media playback)" \
+ www-plugins/chrome-binary-plugins
+
+ elog
+ elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with"
+ elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. 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
+ 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 "tl;dr your web browsing experience will be compromised."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-03-24 18:39 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-03-24 18:39 UTC (permalink / raw
To: gentoo-commits
commit: 50d091a2d1990adfd73aa8bdcdaa23571b20981b
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 24 12:15:28 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Mar 24 18:37:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50d091a2
dev-qt/qtwebengine: drop 6.7.0_rc
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 -
dev-qt/qtwebengine/qtwebengine-6.7.0_rc.ebuild | 323 -------------------------
2 files changed, 324 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 13fb28285dda..da02e023c7f9 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -7,5 +7,4 @@ DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3
DIST qtwebengine-6.6-patchset-9.tar.xz 8040 BLAKE2B 11c76fd36227cfcfc3c83618fad25c66963e63697f857b99efc76188529bea42094b279bd9f37e79584cb6e9f1d2dd2f666a96c46ddf2276033cdc97782b72c4 SHA512 33cc1ad0843eeaf1103033c2e9b9a734cd218d92c40985fd6c109acefa2f68b99b1f3cf5e06d6f837fc974c39b220ae93b40d135b5414f822cf28e075805c9c1
DIST qtwebengine-6.7-patchset-4.tar.xz 7792 BLAKE2B 99250f9c807870aeff0eafccd4a27c224785e34b21ba8dc9e663741cf123ebda6501b8f3d7b1e274cb4e543fe1f9d3fbb1ea54de85fcde4d11d2388f97674a60 SHA512 28dfb2c6c74a971f407e793f43b1224af5b2dac1c1b053badfee23e54d8fe6c390498a88d4da9d8f0de66f579234b1ccca527fc44997dd185ab1f570fbf63203
DIST qtwebengine-everywhere-src-6.6.2.tar.xz 421147952 BLAKE2B a0317faf9ff2d81cd2418652c297821bd8451e0564b8b9af8cb005b0c96a4ec74305ff814c3ab355d84bbacaaccd9ebf6bf591e01b485e243cc485aedf3e6e5b SHA512 8024890c1a7f6d5b9866d768f5ee5cb24b2eb9bb2162886fe02cf8f6fbb23e99eadb142c2636fd3d856b0b1975e69859989553f70c6d8610a69d991d4c2f190d
-DIST qtwebengine-everywhere-src-6.7.0-rc.tar.xz 550899372 BLAKE2B 293e1f34d783809ca7ce943344f313de7ead0cbe037f074528428664686c714a64afb33256f1bb8bc16c1db54ae073a8be29864b2aeb7e5602fbbf51a9c8f9fc SHA512 4a0b1b312a8af16eb51435a02babd5e63a451db164827c2b67ed7dcd83303d407e6f8f1f1d75f25d298fee567eeda98df470a4967a6f6941040e3257deccd1fe
DIST qtwebengine-everywhere-src-6.7.0-rc2.tar.xz 550989672 BLAKE2B 9bd6914a77afb7bce7f1de5063313aab1276211141db3ef53777b164ba68d72762c60d46ecabac9138aa5beff653c799a6785522be77389071d3afeebb100938 SHA512 7fb6cab6c52e692174a1dc41195c59b787457f3cf9d9c11921da62b3fed60a1c879d5ca38442430694bf642e66b768842af9208e9f70fc4180356d4b0df49c57
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.0_rc.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.0_rc.ebuild
deleted file mode 100644
index b9e05d3a0b1a..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-6.7.0_rc.ebuild
+++ /dev/null
@@ -1,323 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-PYTHON_REQ_USE="xml(+)"
-inherit check-reqs flag-o-matic multiprocessing optfeature
-inherit prefix python-any-r1 qt6-build toolchain-funcs
-
-DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
-SRC_URI+="
- https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-4.tar.xz
-"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm64"
-fi
-
-IUSE="
- +alsa bindist custom-cflags designer geolocation +jumbo-build
- kerberos opengl pdfium pulseaudio qml screencast +system-icu
- vaapi vulkan webdriver +widgets
-"
-REQUIRED_USE="
- designer? ( qml widgets )
-"
-
-# dlopen: krb5, libva, pciutils, udev
-# gcc: for -latomic
-RDEPEND="
- app-arch/snappy:=
- dev-libs/expat
- dev-libs/libevent:=
- dev-libs/libxml2[icu]
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- ~dev-qt/qtbase-${PV}:6[gui,opengl=,vulkan?,widgets?]
- ~dev-qt/qtwebchannel-${PV}:6[qml?]
- media-libs/fontconfig
- media-libs/freetype
- media-libs/harfbuzz:=
- media-libs/lcms:2
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- media-libs/libwebp:=
- media-libs/openjpeg:2=
- media-libs/opus
- media-libs/tiff:=
- sys-apps/dbus
- sys-apps/pciutils
- sys-devel/gcc:*
- sys-libs/zlib:=[minizip]
- virtual/libudev
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libXtst
- x11-libs/libxcb:=
- x11-libs/libxkbcommon
- x11-libs/libxkbfile
- alsa? ( media-libs/alsa-lib )
- designer? ( ~dev-qt/qttools-${PV}:6[designer] )
- geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
- kerberos? ( virtual/krb5 )
- pulseaudio? ( media-libs/libpulse[glib] )
- qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
- screencast? (
- dev-libs/glib:2
- media-libs/mesa[gbm(+)]
- media-video/pipewire:=
- x11-libs/libdrm
- )
- system-icu? ( dev-libs/icu:= )
- vaapi? (
- media-libs/libva:=[X]
- media-libs/mesa[gbm(+)]
- x11-libs/libdrm
- )
- !vaapi? ( media-libs/libvpx:= )
- widgets? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] )
-"
-DEPEND="
- ${RDEPEND}
- media-libs/libglvnd
- x11-base/xorg-proto
- x11-libs/libxshmfence
- screencast? ( media-libs/libepoxy[egl(+)] )
- pdfium? ( net-print/cups )
- test? (
- widgets? ( app-text/poppler[cxx(+)] )
- )
- vaapi? (
- vulkan? ( dev-util/vulkan-headers )
- )
-"
-BDEPEND="
- $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
- dev-util/gperf
- net-libs/nodejs[ssl]
- sys-devel/bison
- sys-devel/flex
-"
-
-PATCHES=( "${WORKDIR}"/patches/${PN} )
-[[ ${PV} == 6.9999 ]] || # too fragile for 6.9999, but keep for 6.x.9999
- PATCHES+=( "${WORKDIR}"/patches/chromium )
-
-PATCHES+=(
- # add extras as needed here, may merge in set if carries across versions
- "${FILESDIR}"/${PN}-6.7.0-clang18.patch
-)
-
-python_check_deps() {
- python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
-}
-
-qtwebengine_check-reqs() {
- [[ ${MERGE_TYPE} == binary ]] && return
-
- if is-flagq '-g?(gdb)?([1-9])'; then #307861
- ewarn
- ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which"
- ewarn "is non-trivial with ${PN}. May experience extended compilation"
- ewarn "times, increased disk/memory usage, and potentially link failure."
- ewarn
- ewarn "If run into issues, please try disabling before reporting a bug."
- fi
-
- local CHECKREQS_DISK_BUILD=8G
- local CHECKREQS_DISK_USR=360M
-
- if ! has distcc ${FEATURES}; then #830661
- # assume ~2GB per job or 1.5GB if clang, possible with less
- # depending on free memory and *FLAGS, but prefer being safe as
- # users having OOM issues with qtwebengine been rather common
- tc-is-clang && : 15 || : 20
- local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G
- fi
-
- check-reqs_${EBUILD_PHASE_FUNC} #570534
-}
-
-pkg_pretend() {
- qtwebengine_check-reqs
-}
-
-pkg_setup() {
- qtwebengine_check-reqs
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- qt6-build_src_prepare
-
- # for www-plugins/chrome-binary-plugins (widevine) search paths on prefix
- hprefixify -w /Gentoo/ src/core/content_client_qt.cpp
-
- # store chromium versions, only used in postinst for a warning
- local chromium
- mapfile -t chromium < CHROMIUM_VERSION || die
- [[ ${chromium[1]} =~ ^Based.*:[^0-9]+([0-9.]+$) ]] &&
- QT6_CHROMIUM_VER=${BASH_REMATCH[1]} || die
- [[ ${chromium[2]} =~ ^Patched.+:[^0-9]+([0-9.]+$) ]] &&
- QT6_CHROMIUM_PATCHES_VER=${BASH_REMATCH[1]} || die
-}
-
-src_configure() {
- local mycmakeargs=(
- $(qt_feature pdfium qtpdf_build)
- $(qt_feature qml qtpdf_quick_build)
- $(qt_feature webdriver webenginedriver)
- $(qt_feature widgets qtpdf_widgets_build)
- $(usev pdfium -DQT_FEATURE_pdf_v8=ON)
-
- -DQT_FEATURE_qtwebengine_build=ON
- $(qt_feature qml qtwebengine_quick_build)
- $(qt_feature widgets qtwebengine_widgets_build)
-
- $(cmake_use_find_package designer Qt6Designer)
-
- $(qt_feature alsa webengine_system_alsa)
- $(qt_feature !bindist webengine_proprietary_codecs)
- $(qt_feature geolocation webengine_geolocation)
- $(qt_feature jumbo-build webengine_jumbo_build)
- $(qt_feature kerberos webengine_kerberos)
- $(qt_feature pulseaudio webengine_system_pulseaudio)
- $(qt_feature screencast webengine_webrtc_pipewire)
- $(qt_feature system-icu webengine_system_icu)
- $(qt_feature vaapi webengine_vaapi)
- $(qt_feature vulkan webengine_vulkan)
- -DQT_FEATURE_webengine_embedded_build=OFF
- -DQT_FEATURE_webengine_extensions=ON
- -DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet
- -DQT_FEATURE_webengine_pepper_plugins=ON
- -DQT_FEATURE_webengine_printing_and_pdf=ON
- -DQT_FEATURE_webengine_spellchecker=ON
- -DQT_FEATURE_webengine_webchannel=ON
- -DQT_FEATURE_webengine_webrtc=ON
-
- # needs a modified ffmpeg to be usable, and even then it may not
- # cooperate with new major ffmpeg versions (bug #831487)
- -DQT_FEATURE_webengine_system_ffmpeg=OFF
-
- # use bundled re2 to avoid complications, may revisit
- # (see discussions in https://github.com/gentoo/gentoo/pull/32281)
- -DQT_FEATURE_webengine_system_re2=OFF
-
- # bundled is currently required when using vaapi (forced regardless)
- $(qt_feature !vaapi webengine_system_libvpx)
-
- # not necessary to pass these (default), but in case detection fails
- $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
- freetype gbm glib harfbuzz lcms2 libevent libjpeg \
- libopenjpeg2 libpci libpng libtiff libwebp libxml \
- minizip opus poppler snappy zlib)
-
- # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
- -DINSTALL_GN=OFF
- )
-
- local mygnargs=(
- # prefer no dlopen where possible
- link_pulseaudio=true
- rtc_link_pipewire=true
- )
-
- if use !custom-cflags; then
- strip-flags # fragile
-
- if is-flagq '-g?(gdb)?([2-9])'; then #914475
- replace-flags '-g?(gdb)?([2-9])' -g1
- ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"
- fi
-
- # Built helpers segfault when using (at least) -march=armv8-a+pauth
- # (bug #920555, #920568 -- suspected gcc bug). For now, filter all
- # for simplicity. Override with USE=custom-cflags if wanted, please
- # report if above -march works again so can cleanup.
- use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
- fi
-
- export NINJA NINJAFLAGS=$(get_NINJAOPTS)
- [[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
-
- local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
- einfo "Extra Gn args: ${EXTRA_GN}"
-
- qt6-build_src_configure
-}
-
-src_compile() {
- # tentatively work around a possible (rare) race condition (bug #921680)
- cmake_build WebEngineCore_sync_all_public_headers
-
- cmake_src_compile
-}
-
-src_test() {
- if [[ ${EUID} == 0 ]]; then
- # almost every tests fail, so skip entirely
- ewarn "Skipping tests due to running as root (chromium refuses this configuration)."
- return
- fi
-
- local CMAKE_SKIP_TESTS=(
- # fails with network sandbox
- tst_loadsignals
- tst_qquickwebengineview
- tst_qwebengineglobalsettings
- tst_qwebengineview
- # fails with offscreen rendering, may be worth retrying if the issue
- # persist given these are rather major tests (or consider virtx)
- tst_qmltests
- tst_qwebenginepage
- # certs verfication seems flaky and gives expiration warnings
- tst_qwebengineclientcertificatestore
- # test is misperformed when qtbase is built USE=-test?
- tst_touchinput
- # currently requires webenginedriver to be already installed
- tst_webenginedriver
- )
-
- # prevent using the system's qtwebengine
- # (use glob to avoid unnecessary complications with arch dir)
- local resources=( "${BUILD_DIR}/src/core/${CMAKE_BUILD_TYPE}/"* )
- [[ -d ${resources[0]} ]] || die "invalid resources path: ${resources[0]}"
- local -x QTWEBENGINEPROCESS_PATH=${BUILD_DIR}${QT6_LIBEXECDIR#"${QT6_PREFIX}"}/QtWebEngineProcess
- local -x QTWEBENGINE_LOCALES_PATH=${resources[0]}/qtwebengine_locales
- local -x QTWEBENGINE_RESOURCES_PATH=${resources[0]}
-
- # random failures in several tests without -j1
- qt6-build_src_test -j1
-}
-
-src_install() {
- qt6-build_src_install
-
- [[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472
- die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
-}
-
-pkg_postinst() {
- # plugin may also be found in $HOME if provided by chrome or firefox
- use amd64 &&
- optfeature "Widevine DRM support (protected media playback)" \
- www-plugins/chrome-binary-plugins
-
- elog
- elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with"
- elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. 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
- 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 "tl;dr your web browsing experience will be compromised."
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-03-23 17:01 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2024-03-23 17:01 UTC (permalink / raw
To: gentoo-commits
commit: e50e0290feb058519b96767bc8cf903b6715a60e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 12:34:45 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 16:59:44 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e50e0290
dev-qt/qtwebengine: 5.15.13 version bump, unkeywording ~arm/~ppc64
Bug: https://bugs.gentoo.org/893234
Bug: https://bugs.gentoo.org/924936
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 2 +
.../qtwebengine-5.15.13_p20240322.ebuild | 244 +++++++++++++++++++++
2 files changed, 246 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 5156f41feac0..13fb28285dda 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,6 +1,8 @@
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.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.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
DIST qtwebengine-6.6-patchset-9.tar.xz 8040 BLAKE2B 11c76fd36227cfcfc3c83618fad25c66963e63697f857b99efc76188529bea42094b279bd9f37e79584cb6e9f1d2dd2f666a96c46ddf2276033cdc97782b72c4 SHA512 33cc1ad0843eeaf1103033c2e9b9a734cd218d92c40985fd6c109acefa2f68b99b1f3cf5e06d6f837fc974c39b220ae93b40d135b5414f822cf28e075805c9c1
DIST qtwebengine-6.7-patchset-4.tar.xz 7792 BLAKE2B 99250f9c807870aeff0eafccd4a27c224785e34b21ba8dc9e663741cf123ebda6501b8f3d7b1e274cb4e543fe1f9d3fbb1ea54de85fcde4d11d2388f97674a60 SHA512 28dfb2c6c74a971f407e793f43b1224af5b2dac1c1b053badfee23e54d8fe6c390498a88d4da9d8f0de66f579234b1ccca527fc44997dd185ab1f570fbf63203
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240322.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240322.ebuild
new file mode 100644
index 000000000000..16aa46bb8e75
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240322.ebuild
@@ -0,0 +1,244 @@
+# 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() {
+ 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."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-03-22 6:16 Arthur Zamarin
0 siblings, 0 replies; 301+ messages in thread
From: Arthur Zamarin @ 2024-03-22 6:16 UTC (permalink / raw
To: gentoo-commits
commit: 747da6434461c5efb0c9fc2edd8226846d5402c3
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 06:15:14 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 06:15:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=747da643
dev-qt/qtwebengine: Stabilize 6.6.2 arm64, #927197
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.6.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.2.ebuild
index 90b8a1371f8b..20cef7cd916e 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI+="
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm64"
+ KEYWORDS="amd64 arm64"
fi
IUSE="
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-03-12 20:32 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-03-12 20:32 UTC (permalink / raw
To: gentoo-commits
commit: e35e384cbc147de7be5fb8014daeb56c1e4a261f
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 12 20:29:03 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Mar 12 20:31:18 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e35e384c
dev-qt/qtwebengine: match accessibility IUSE with qtbase:6
Makes use of QT_CONFIG(accessibility) which can result in
undefined symbols if was enabled on qtbase then flipped off.
Like opengl/vulkan, this flag is typically enabled either
globally or not at all and should hopefully not cause conflicts
for most users.
Technically needed in non-live but given the low impact will
wait rather than let this trigger rebuilds which is not worth
it for qtwebengine.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 8 ++++----
dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 8 ++++----
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 8 ++++----
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
index d21e533a2dbe..378b562a6fb0 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
@@ -18,9 +18,9 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
fi
IUSE="
- +alsa bindist custom-cflags designer geolocation +jumbo-build
- kerberos opengl pdfium pulseaudio qml screencast +system-icu
- vaapi vulkan +widgets
+ accessibility +alsa bindist custom-cflags designer geolocation
+ +jumbo-build kerberos opengl pdfium pulseaudio qml screencast
+ +system-icu vaapi vulkan +widgets
"
REQUIRED_USE="
designer? ( qml widgets )
@@ -35,7 +35,7 @@ RDEPEND="
dev-libs/libxslt
dev-libs/nspr
dev-libs/nss
- ~dev-qt/qtbase-${PV}:6[gui,opengl=,vulkan?,widgets?]
+ ~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl=,vulkan?,widgets?]
~dev-qt/qtwebchannel-${PV}:6[qml?]
media-libs/fontconfig
media-libs/freetype
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index b9e05d3a0b1a..dcc7ec6d9b87 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -18,9 +18,9 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
fi
IUSE="
- +alsa bindist custom-cflags designer geolocation +jumbo-build
- kerberos opengl pdfium pulseaudio qml screencast +system-icu
- vaapi vulkan webdriver +widgets
+ accessibility +alsa bindist custom-cflags designer geolocation
+ +jumbo-build kerberos opengl pdfium pulseaudio qml screencast
+ +system-icu vaapi vulkan webdriver +widgets
"
REQUIRED_USE="
designer? ( qml widgets )
@@ -36,7 +36,7 @@ RDEPEND="
dev-libs/libxslt
dev-libs/nspr
dev-libs/nss
- ~dev-qt/qtbase-${PV}:6[gui,opengl=,vulkan?,widgets?]
+ ~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl=,vulkan?,widgets?]
~dev-qt/qtwebchannel-${PV}:6[qml?]
media-libs/fontconfig
media-libs/freetype
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 0e04faa237c4..1e77e0077e41 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -18,9 +18,9 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
fi
IUSE="
- +alsa bindist custom-cflags designer geolocation +jumbo-build
- kerberos opengl pdfium pulseaudio qml screencast +system-icu
- vaapi vulkan webdriver +widgets
+ accessibility +alsa bindist custom-cflags designer geolocation
+ +jumbo-build kerberos opengl pdfium pulseaudio qml screencast
+ +system-icu vaapi vulkan webdriver +widgets
"
REQUIRED_USE="
designer? ( qml widgets )
@@ -36,7 +36,7 @@ RDEPEND="
dev-libs/libxslt
dev-libs/nspr
dev-libs/nss
- ~dev-qt/qtbase-${PV}:6[gui,opengl=,vulkan?,widgets?]
+ ~dev-qt/qtbase-${PV}:6[accessibility=,gui,opengl=,vulkan?,widgets?]
~dev-qt/qtwebchannel-${PV}:6[qml?]
media-libs/fontconfig
media-libs/freetype
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-03-12 20:32 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-03-12 20:32 UTC (permalink / raw
To: gentoo-commits
commit: 5cb09adf7780486bbd2934d86b296e3ea8be4cfd
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 12 16:30:03 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Mar 12 20:31:04 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cb09adf
dev-qt/qtwebengine: depend on gcc for libatomic in 6.7+
My llvm-musl test chroot did not keep gcc notably for finding
problems like this, and when I tried 6.7:
ld.lld: error: unable to find library -latomic
Have not dug further whether it's possible to be optional.
Thought it'd be with USE=-vulkan at first but no.
Not worth a revbump for 6.7.0_rc.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.7.0_rc.ebuild | 2 ++
dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 2 ++
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 2 ++
3 files changed, 6 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.0_rc.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.0_rc.ebuild
index 225c6192d1bb..b9e05d3a0b1a 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.0_rc.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.0_rc.ebuild
@@ -27,6 +27,7 @@ REQUIRED_USE="
"
# dlopen: krb5, libva, pciutils, udev
+# gcc: for -latomic
RDEPEND="
app-arch/snappy:=
dev-libs/expat
@@ -49,6 +50,7 @@ RDEPEND="
media-libs/tiff:=
sys-apps/dbus
sys-apps/pciutils
+ sys-devel/gcc:*
sys-libs/zlib:=[minizip]
virtual/libudev
x11-libs/libX11
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index 225c6192d1bb..b9e05d3a0b1a 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -27,6 +27,7 @@ REQUIRED_USE="
"
# dlopen: krb5, libva, pciutils, udev
+# gcc: for -latomic
RDEPEND="
app-arch/snappy:=
dev-libs/expat
@@ -49,6 +50,7 @@ RDEPEND="
media-libs/tiff:=
sys-apps/dbus
sys-apps/pciutils
+ sys-devel/gcc:*
sys-libs/zlib:=[minizip]
virtual/libudev
x11-libs/libX11
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 0bbfc95e92ec..0e04faa237c4 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -27,6 +27,7 @@ REQUIRED_USE="
"
# dlopen: krb5, libva, pciutils, udev
+# gcc: for -latomic
RDEPEND="
app-arch/snappy:=
dev-libs/expat
@@ -49,6 +50,7 @@ RDEPEND="
media-libs/tiff:=
sys-apps/dbus
sys-apps/pciutils
+ sys-devel/gcc:*
sys-libs/zlib:=[minizip]
virtual/libudev
x11-libs/libX11
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-03-12 12:01 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-03-12 12:01 UTC (permalink / raw
To: gentoo-commits
commit: f24c083a9fcd6d75143a1f6736d5330f29321492
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 12 11:02:53 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Mar 12 11:59:36 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f24c083a
dev-qt/qtwebengine: add 6.7.0_rc
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-6.7.0_rc.ebuild | 321 +++++++++++++++++++++++++
2 files changed, 322 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 59c73123ec26..236860df927f 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -5,3 +5,4 @@ DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3
DIST qtwebengine-6.6-patchset-9.tar.xz 8040 BLAKE2B 11c76fd36227cfcfc3c83618fad25c66963e63697f857b99efc76188529bea42094b279bd9f37e79584cb6e9f1d2dd2f666a96c46ddf2276033cdc97782b72c4 SHA512 33cc1ad0843eeaf1103033c2e9b9a734cd218d92c40985fd6c109acefa2f68b99b1f3cf5e06d6f837fc974c39b220ae93b40d135b5414f822cf28e075805c9c1
DIST qtwebengine-6.7-patchset-4.tar.xz 7792 BLAKE2B 99250f9c807870aeff0eafccd4a27c224785e34b21ba8dc9e663741cf123ebda6501b8f3d7b1e274cb4e543fe1f9d3fbb1ea54de85fcde4d11d2388f97674a60 SHA512 28dfb2c6c74a971f407e793f43b1224af5b2dac1c1b053badfee23e54d8fe6c390498a88d4da9d8f0de66f579234b1ccca527fc44997dd185ab1f570fbf63203
DIST qtwebengine-everywhere-src-6.6.2.tar.xz 421147952 BLAKE2B a0317faf9ff2d81cd2418652c297821bd8451e0564b8b9af8cb005b0c96a4ec74305ff814c3ab355d84bbacaaccd9ebf6bf591e01b485e243cc485aedf3e6e5b SHA512 8024890c1a7f6d5b9866d768f5ee5cb24b2eb9bb2162886fe02cf8f6fbb23e99eadb142c2636fd3d856b0b1975e69859989553f70c6d8610a69d991d4c2f190d
+DIST qtwebengine-everywhere-src-6.7.0-rc.tar.xz 550899372 BLAKE2B 293e1f34d783809ca7ce943344f313de7ead0cbe037f074528428664686c714a64afb33256f1bb8bc16c1db54ae073a8be29864b2aeb7e5602fbbf51a9c8f9fc SHA512 4a0b1b312a8af16eb51435a02babd5e63a451db164827c2b67ed7dcd83303d407e6f8f1f1d75f25d298fee567eeda98df470a4967a6f6941040e3257deccd1fe
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.0_rc.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.0_rc.ebuild
new file mode 100644
index 000000000000..225c6192d1bb
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.0_rc.ebuild
@@ -0,0 +1,321 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_REQ_USE="xml(+)"
+inherit check-reqs flag-o-matic multiprocessing optfeature
+inherit prefix python-any-r1 qt6-build toolchain-funcs
+
+DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
+SRC_URI+="
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-4.tar.xz
+"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm64"
+fi
+
+IUSE="
+ +alsa bindist custom-cflags designer geolocation +jumbo-build
+ kerberos opengl pdfium pulseaudio qml screencast +system-icu
+ vaapi vulkan webdriver +widgets
+"
+REQUIRED_USE="
+ designer? ( qml widgets )
+"
+
+# dlopen: krb5, libva, pciutils, udev
+RDEPEND="
+ app-arch/snappy:=
+ dev-libs/expat
+ dev-libs/libevent:=
+ dev-libs/libxml2[icu]
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ ~dev-qt/qtbase-${PV}:6[gui,opengl=,vulkan?,widgets?]
+ ~dev-qt/qtwebchannel-${PV}:6[qml?]
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/harfbuzz:=
+ media-libs/lcms:2
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ media-libs/libwebp:=
+ media-libs/openjpeg:2=
+ media-libs/opus
+ media-libs/tiff:=
+ sys-apps/dbus
+ sys-apps/pciutils
+ sys-libs/zlib:=[minizip]
+ virtual/libudev
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXrandr
+ x11-libs/libXtst
+ x11-libs/libxcb:=
+ x11-libs/libxkbcommon
+ x11-libs/libxkbfile
+ alsa? ( media-libs/alsa-lib )
+ designer? ( ~dev-qt/qttools-${PV}:6[designer] )
+ geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
+ kerberos? ( virtual/krb5 )
+ pulseaudio? ( media-libs/libpulse[glib] )
+ qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
+ screencast? (
+ dev-libs/glib:2
+ media-libs/mesa[gbm(+)]
+ media-video/pipewire:=
+ x11-libs/libdrm
+ )
+ system-icu? ( dev-libs/icu:= )
+ vaapi? (
+ media-libs/libva:=[X]
+ media-libs/mesa[gbm(+)]
+ x11-libs/libdrm
+ )
+ !vaapi? ( media-libs/libvpx:= )
+ widgets? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] )
+"
+DEPEND="
+ ${RDEPEND}
+ media-libs/libglvnd
+ x11-base/xorg-proto
+ x11-libs/libxshmfence
+ screencast? ( media-libs/libepoxy[egl(+)] )
+ pdfium? ( net-print/cups )
+ test? (
+ widgets? ( app-text/poppler[cxx(+)] )
+ )
+ vaapi? (
+ vulkan? ( dev-util/vulkan-headers )
+ )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
+ dev-util/gperf
+ net-libs/nodejs[ssl]
+ sys-devel/bison
+ sys-devel/flex
+"
+
+PATCHES=( "${WORKDIR}"/patches/${PN} )
+[[ ${PV} == 6.9999 ]] || # too fragile for 6.9999, but keep for 6.x.9999
+ PATCHES+=( "${WORKDIR}"/patches/chromium )
+
+PATCHES+=(
+ # add extras as needed here, may merge in set if carries across versions
+ "${FILESDIR}"/${PN}-6.7.0-clang18.patch
+)
+
+python_check_deps() {
+ python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+}
+
+qtwebengine_check-reqs() {
+ [[ ${MERGE_TYPE} == binary ]] && return
+
+ if is-flagq '-g?(gdb)?([1-9])'; then #307861
+ ewarn
+ ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which"
+ ewarn "is non-trivial with ${PN}. May experience extended compilation"
+ ewarn "times, increased disk/memory usage, and potentially link failure."
+ ewarn
+ ewarn "If run into issues, please try disabling before reporting a bug."
+ fi
+
+ local CHECKREQS_DISK_BUILD=8G
+ local CHECKREQS_DISK_USR=360M
+
+ if ! has distcc ${FEATURES}; then #830661
+ # assume ~2GB per job or 1.5GB if clang, possible with less
+ # depending on free memory and *FLAGS, but prefer being safe as
+ # users having OOM issues with qtwebengine been rather common
+ tc-is-clang && : 15 || : 20
+ local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G
+ fi
+
+ check-reqs_${EBUILD_PHASE_FUNC} #570534
+}
+
+pkg_pretend() {
+ qtwebengine_check-reqs
+}
+
+pkg_setup() {
+ qtwebengine_check-reqs
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ qt6-build_src_prepare
+
+ # for www-plugins/chrome-binary-plugins (widevine) search paths on prefix
+ hprefixify -w /Gentoo/ src/core/content_client_qt.cpp
+
+ # store chromium versions, only used in postinst for a warning
+ local chromium
+ mapfile -t chromium < CHROMIUM_VERSION || die
+ [[ ${chromium[1]} =~ ^Based.*:[^0-9]+([0-9.]+$) ]] &&
+ QT6_CHROMIUM_VER=${BASH_REMATCH[1]} || die
+ [[ ${chromium[2]} =~ ^Patched.+:[^0-9]+([0-9.]+$) ]] &&
+ QT6_CHROMIUM_PATCHES_VER=${BASH_REMATCH[1]} || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(qt_feature pdfium qtpdf_build)
+ $(qt_feature qml qtpdf_quick_build)
+ $(qt_feature webdriver webenginedriver)
+ $(qt_feature widgets qtpdf_widgets_build)
+ $(usev pdfium -DQT_FEATURE_pdf_v8=ON)
+
+ -DQT_FEATURE_qtwebengine_build=ON
+ $(qt_feature qml qtwebengine_quick_build)
+ $(qt_feature widgets qtwebengine_widgets_build)
+
+ $(cmake_use_find_package designer Qt6Designer)
+
+ $(qt_feature alsa webengine_system_alsa)
+ $(qt_feature !bindist webengine_proprietary_codecs)
+ $(qt_feature geolocation webengine_geolocation)
+ $(qt_feature jumbo-build webengine_jumbo_build)
+ $(qt_feature kerberos webengine_kerberos)
+ $(qt_feature pulseaudio webengine_system_pulseaudio)
+ $(qt_feature screencast webengine_webrtc_pipewire)
+ $(qt_feature system-icu webengine_system_icu)
+ $(qt_feature vaapi webengine_vaapi)
+ $(qt_feature vulkan webengine_vulkan)
+ -DQT_FEATURE_webengine_embedded_build=OFF
+ -DQT_FEATURE_webengine_extensions=ON
+ -DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet
+ -DQT_FEATURE_webengine_pepper_plugins=ON
+ -DQT_FEATURE_webengine_printing_and_pdf=ON
+ -DQT_FEATURE_webengine_spellchecker=ON
+ -DQT_FEATURE_webengine_webchannel=ON
+ -DQT_FEATURE_webengine_webrtc=ON
+
+ # needs a modified ffmpeg to be usable, and even then it may not
+ # cooperate with new major ffmpeg versions (bug #831487)
+ -DQT_FEATURE_webengine_system_ffmpeg=OFF
+
+ # use bundled re2 to avoid complications, may revisit
+ # (see discussions in https://github.com/gentoo/gentoo/pull/32281)
+ -DQT_FEATURE_webengine_system_re2=OFF
+
+ # bundled is currently required when using vaapi (forced regardless)
+ $(qt_feature !vaapi webengine_system_libvpx)
+
+ # not necessary to pass these (default), but in case detection fails
+ $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
+ freetype gbm glib harfbuzz lcms2 libevent libjpeg \
+ libopenjpeg2 libpci libpng libtiff libwebp libxml \
+ minizip opus poppler snappy zlib)
+
+ # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
+ -DINSTALL_GN=OFF
+ )
+
+ local mygnargs=(
+ # prefer no dlopen where possible
+ link_pulseaudio=true
+ rtc_link_pipewire=true
+ )
+
+ if use !custom-cflags; then
+ strip-flags # fragile
+
+ if is-flagq '-g?(gdb)?([2-9])'; then #914475
+ replace-flags '-g?(gdb)?([2-9])' -g1
+ ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"
+ fi
+
+ # Built helpers segfault when using (at least) -march=armv8-a+pauth
+ # (bug #920555, #920568 -- suspected gcc bug). For now, filter all
+ # for simplicity. Override with USE=custom-cflags if wanted, please
+ # report if above -march works again so can cleanup.
+ use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
+ fi
+
+ export NINJA NINJAFLAGS=$(get_NINJAOPTS)
+ [[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
+
+ local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
+ einfo "Extra Gn args: ${EXTRA_GN}"
+
+ qt6-build_src_configure
+}
+
+src_compile() {
+ # tentatively work around a possible (rare) race condition (bug #921680)
+ cmake_build WebEngineCore_sync_all_public_headers
+
+ cmake_src_compile
+}
+
+src_test() {
+ if [[ ${EUID} == 0 ]]; then
+ # almost every tests fail, so skip entirely
+ ewarn "Skipping tests due to running as root (chromium refuses this configuration)."
+ return
+ fi
+
+ local CMAKE_SKIP_TESTS=(
+ # fails with network sandbox
+ tst_loadsignals
+ tst_qquickwebengineview
+ tst_qwebengineglobalsettings
+ tst_qwebengineview
+ # fails with offscreen rendering, may be worth retrying if the issue
+ # persist given these are rather major tests (or consider virtx)
+ tst_qmltests
+ tst_qwebenginepage
+ # certs verfication seems flaky and gives expiration warnings
+ tst_qwebengineclientcertificatestore
+ # test is misperformed when qtbase is built USE=-test?
+ tst_touchinput
+ # currently requires webenginedriver to be already installed
+ tst_webenginedriver
+ )
+
+ # prevent using the system's qtwebengine
+ # (use glob to avoid unnecessary complications with arch dir)
+ local resources=( "${BUILD_DIR}/src/core/${CMAKE_BUILD_TYPE}/"* )
+ [[ -d ${resources[0]} ]] || die "invalid resources path: ${resources[0]}"
+ local -x QTWEBENGINEPROCESS_PATH=${BUILD_DIR}${QT6_LIBEXECDIR#"${QT6_PREFIX}"}/QtWebEngineProcess
+ local -x QTWEBENGINE_LOCALES_PATH=${resources[0]}/qtwebengine_locales
+ local -x QTWEBENGINE_RESOURCES_PATH=${resources[0]}
+
+ # random failures in several tests without -j1
+ qt6-build_src_test -j1
+}
+
+src_install() {
+ qt6-build_src_install
+
+ [[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472
+ die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
+}
+
+pkg_postinst() {
+ # plugin may also be found in $HOME if provided by chrome or firefox
+ use amd64 &&
+ optfeature "Widevine DRM support (protected media playback)" \
+ www-plugins/chrome-binary-plugins
+
+ elog
+ elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with"
+ elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. 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
+ 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 "tl;dr your web browsing experience will be compromised."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-03-04 14:53 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-03-04 14:53 UTC (permalink / raw
To: gentoo-commits
commit: f3796a1139d1b7a5d7611803bbfc093251fdc491
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 4 13:35:04 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Mar 4 14:53:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3796a11
dev-qt/qtwebengine: add IUSE=webdriver to 6.7+
No deps but make it optional given most people do not need this
and it adds a bit of build time plus ~35MB to the install.
For the IUSE name, debated IUSE=webenginedriver as well but "webdriver"
is the name of the specification, and it felt redundant to have
webengine in the IUSE name for the webengine package.
wrt tests, unfortunately like most tools-related tests (see qttools),
it tries to use the system's tool and makes it difficult to specify
a path -- so skipping tst_webenginedriver for simplicity, it's not
a component that need to be overly worried about either way (haven't
tried but imagine may be further messy with sandbox too).
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/metadata.xml | 1 +
dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 5 ++++-
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 5 ++++-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index b7754632ca20..026c10e856ad 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -11,6 +11,7 @@
<flag name="pdfium">Build the QtPdf module based on chromium's PDFium library</flag>
<flag name="qml">Build QML/QtQuick bindings and imports</flag>
<flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg> instead of bundled.</flag>
+ <flag name="webdriver">Build tool for automated testing (ChromeDriver equivalent)</flag>
<flag name="widgets">Enable QtWidgets support</flag>
</use>
<upstream>
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index 08af1005ed95..f5f10a5f3ebd 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -20,7 +20,7 @@ fi
IUSE="
+alsa bindist custom-cflags designer geolocation +jumbo-build
kerberos opengl pdfium pulseaudio qml screencast +system-icu
- vaapi vulkan +widgets
+ vaapi vulkan webdriver +widgets
"
REQUIRED_USE="
designer? ( qml widgets )
@@ -171,6 +171,7 @@ src_configure() {
local mycmakeargs=(
$(qt_feature pdfium qtpdf_build)
$(qt_feature qml qtpdf_quick_build)
+ $(qt_feature webdriver webenginedriver)
$(qt_feature widgets qtpdf_widgets_build)
$(usev pdfium -DQT_FEATURE_pdf_v8=ON)
@@ -274,6 +275,8 @@ src_test() {
tst_qwebengineclientcertificatestore
# test is misperformed when qtbase is built USE=-test?
tst_touchinput
+ # currently requires webenginedriver to be already installed
+ tst_webenginedriver
)
# prevent using the system's qtwebengine
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index db61cb1b8cff..a8e50ac17067 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -20,7 +20,7 @@ fi
IUSE="
+alsa bindist custom-cflags designer geolocation +jumbo-build
kerberos opengl pdfium pulseaudio qml screencast +system-icu
- vaapi vulkan +widgets
+ vaapi vulkan webdriver +widgets
"
REQUIRED_USE="
designer? ( qml widgets )
@@ -170,6 +170,7 @@ src_configure() {
local mycmakeargs=(
$(qt_feature pdfium qtpdf_build)
$(qt_feature qml qtpdf_quick_build)
+ $(qt_feature webdriver webenginedriver)
$(qt_feature widgets qtpdf_widgets_build)
$(usev pdfium -DQT_FEATURE_pdf_v8=ON)
@@ -273,6 +274,8 @@ src_test() {
tst_qwebengineclientcertificatestore
# test is misperformed when qtbase is built USE=-test?
tst_touchinput
+ # currently requires webenginedriver to be already installed
+ tst_webenginedriver
)
# prevent using the system's qtwebengine
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-02-22 6:16 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-02-22 6:16 UTC (permalink / raw
To: gentoo-commits
commit: 31de37fac1eac95b86c76fe456400e8915453c00
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 22 02:26:44 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 06:14:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31de37fa
dev-qt/qtwebengine: enable py3.12 in 6.6.2+
Fixes were merged bit at last minute and the bug for it (QTBUG-117979)
was updated late, and missed that 6.6.2 fixed py3.12 support.
Note that while it still has several references to distutils and an
upstream bug (QTBUG-115512), seems none are necessary as it built
fine with setuptools[-python_target_python3_12] after double-checking
that it did use 3.12.
(if reading this wondering why portage asks to rebuild qtwebengine,
it's time to start using -U/--changed-use rather than -N/--newuse --
alternatively could've held it back until 6.6.3 but well)
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.6.2.ebuild | 3 +--
dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 3 +--
dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 3 +--
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 3 +--
4 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.2.ebuild
index 47ca2cf367a9..bc443553d97b 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.2.ebuild
@@ -3,8 +3,7 @@
EAPI=8
-# 3.12 needs QTBUG-117979 (see also QTBUG-115512)
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
PYTHON_REQ_USE="xml(+)"
inherit check-reqs flag-o-matic multiprocessing optfeature
inherit prefix python-any-r1 qt6-build toolchain-funcs
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
index d38931f4877c..3b1f69bd687c 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
@@ -3,8 +3,7 @@
EAPI=8
-# 3.12 needs QTBUG-117979 (see also QTBUG-115512)
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
PYTHON_REQ_USE="xml(+)"
inherit check-reqs flag-o-matic multiprocessing optfeature
inherit prefix python-any-r1 qt6-build toolchain-funcs
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index 273eeb91351c..db61cb1b8cff 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -3,8 +3,7 @@
EAPI=8
-# 3.12 needs QTBUG-117979 (see also QTBUG-115512)
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
PYTHON_REQ_USE="xml(+)"
inherit check-reqs flag-o-matic multiprocessing optfeature
inherit prefix python-any-r1 qt6-build toolchain-funcs
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 273eeb91351c..db61cb1b8cff 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -3,8 +3,7 @@
EAPI=8
-# 3.12 needs QTBUG-117979 (see also QTBUG-115512)
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
PYTHON_REQ_USE="xml(+)"
inherit check-reqs flag-o-matic multiprocessing optfeature
inherit prefix python-any-r1 qt6-build toolchain-funcs
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-02-22 6:16 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-02-22 6:16 UTC (permalink / raw
To: gentoo-commits
commit: 11b3ca40d21abf372cd071a1905ed9457534f199
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 22 04:55:49 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 06:14:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11b3ca40
dev-qt/qtwebengine: drop 6.6.1
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 2 -
dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild | 314 ----------------------------
2 files changed, 316 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 1e64b9085dd1..59c73123ec26 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -2,8 +2,6 @@ DIST qtwebengine-5.15-ffmpeg-ppc64le.tar.xz 12080 BLAKE2B cfab4f02b8fac8ae7585ed
DIST qtwebengine-5.15.10_p20230815-patchset.tar.xz 44880 BLAKE2B 6179ca4ad69f922cfa8ab8528bd571a326b3340f810f05782d808d67b6310de079d84ca6f769bd532f0fe375a702f0d348e02cfbf6b3f2d5c30ac668e1005bef SHA512 a323bdd8afeb41a97febf587bb0994a937c78ed470e077a2b482dca7e04bc4eb9cf75b2d2707236574d6586189ff3d27e42f437930dedd85b47a77e18ffc8fa3
DIST qtwebengine-5.15.12_p20240122.tar.xz 299226288 BLAKE2B a16a2f428c4a3e7c681e8a8631ddff135fdf1f802cba9e1c827cfec25e0e0dd0bc5c5308b7547b30009709974f7efa950cef1640a24dba4ebbf55def265c90f8 SHA512 31e26d7c76e50eb110d5cf31ea01b47693efca0dd0a6814c881491349b535b9b02c4ef50b45fc6a59e7b8955942a6cc28aa17a6730effdec640be032d14e4f75
DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
-DIST qtwebengine-6.6-patchset-6.tar.xz 9828 BLAKE2B ae595c2f3a71abc183e256118b1c3d1e91284199a8f4aaa8bd9d2a67467353b6c145c3bd9d64c20d64321294c63d97a0a4dc3eeca570a1e25eb94dd8fb9aa501 SHA512 8def71c43125073ef6fc1867c36118f43b0af843cce4b47248359712b1f1bfb4d4eabc6b13ecbbb33e4ef10e1617abc488bb336dfbab043b4ef911d71ad386e2
DIST qtwebengine-6.6-patchset-9.tar.xz 8040 BLAKE2B 11c76fd36227cfcfc3c83618fad25c66963e63697f857b99efc76188529bea42094b279bd9f37e79584cb6e9f1d2dd2f666a96c46ddf2276033cdc97782b72c4 SHA512 33cc1ad0843eeaf1103033c2e9b9a734cd218d92c40985fd6c109acefa2f68b99b1f3cf5e06d6f837fc974c39b220ae93b40d135b5414f822cf28e075805c9c1
DIST qtwebengine-6.7-patchset-4.tar.xz 7792 BLAKE2B 99250f9c807870aeff0eafccd4a27c224785e34b21ba8dc9e663741cf123ebda6501b8f3d7b1e274cb4e543fe1f9d3fbb1ea54de85fcde4d11d2388f97674a60 SHA512 28dfb2c6c74a971f407e793f43b1224af5b2dac1c1b053badfee23e54d8fe6c390498a88d4da9d8f0de66f579234b1ccca527fc44997dd185ab1f570fbf63203
-DIST qtwebengine-everywhere-src-6.6.1.tar.xz 421042656 BLAKE2B 6982a1884d66162cc3c8518125c655d60ced9ec9e81670fb2e5b193aab655c4516bbc50d3c774764385fbe372863fdbf3e03a3c35f07dd9c3119880266b3131e SHA512 d1e4f5b664f8aca5e0a5927968be87e29e29172f1256f21dc6a29006258fb2be2be99b5b36c94a08c704580db9fac7defbb37193534129a21ca14a511fcdeea0
DIST qtwebengine-everywhere-src-6.6.2.tar.xz 421147952 BLAKE2B a0317faf9ff2d81cd2418652c297821bd8451e0564b8b9af8cb005b0c96a4ec74305ff814c3ab355d84bbacaaccd9ebf6bf591e01b485e243cc485aedf3e6e5b SHA512 8024890c1a7f6d5b9866d768f5ee5cb24b2eb9bb2162886fe02cf8f6fbb23e99eadb142c2636fd3d856b0b1975e69859989553f70c6d8610a69d991d4c2f190d
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
deleted file mode 100644
index 5e9631cd0c14..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
+++ /dev/null
@@ -1,314 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# 3.12 needs QTBUG-117979 (see also QTBUG-115512)
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="xml(+)"
-inherit check-reqs flag-o-matic multiprocessing optfeature
-inherit prefix python-any-r1 qt6-build toolchain-funcs
-
-DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
-SRC_URI+="
- https://dev.gentoo.org/~ionen/distfiles/${PN}-6.6-patchset-6.tar.xz
-"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm64"
-fi
-
-IUSE="
- +alsa bindist custom-cflags designer geolocation +jumbo-build
- kerberos opengl pdfium pulseaudio qml screencast +system-icu
- vaapi vulkan +widgets
-"
-REQUIRED_USE="
- designer? ( qml widgets )
-"
-
-# dlopen: krb5, libva, pciutils, udev
-RDEPEND="
- app-arch/snappy:=
- dev-libs/expat
- dev-libs/libevent:=
- dev-libs/libxml2[icu]
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- ~dev-qt/qtbase-${PV}:6[gui,opengl=,vulkan?,widgets?]
- ~dev-qt/qtwebchannel-${PV}:6[qml?]
- media-libs/fontconfig
- media-libs/freetype
- media-libs/harfbuzz:=
- media-libs/lcms:2
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- media-libs/libwebp:=
- media-libs/openjpeg:2=
- media-libs/opus
- media-libs/tiff:=
- sys-apps/dbus
- sys-apps/pciutils
- sys-libs/zlib:=[minizip]
- virtual/libudev
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libXtst
- x11-libs/libxcb:=
- x11-libs/libxkbcommon
- x11-libs/libxkbfile
- alsa? ( media-libs/alsa-lib )
- designer? ( ~dev-qt/qttools-${PV}:6[designer] )
- geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
- kerberos? ( virtual/krb5 )
- pulseaudio? ( media-libs/libpulse[glib] )
- qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
- screencast? (
- dev-libs/glib:2
- media-libs/mesa[gbm(+)]
- media-video/pipewire:=
- x11-libs/libdrm
- )
- system-icu? ( dev-libs/icu:= )
- vaapi? (
- media-libs/libva:=[X]
- media-libs/mesa[gbm(+)]
- x11-libs/libdrm
- )
- !vaapi? ( media-libs/libvpx:= )
- widgets? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] )
-"
-DEPEND="
- ${RDEPEND}
- media-libs/libglvnd
- x11-base/xorg-proto
- x11-libs/libxshmfence
- screencast? ( media-libs/libepoxy[egl(+)] )
- pdfium? ( net-print/cups )
- test? (
- widgets? ( app-text/poppler[cxx(+)] )
- )
- vaapi? (
- vulkan? ( dev-util/vulkan-headers )
- )
-"
-BDEPEND="
- $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
- dev-util/gperf
- net-libs/nodejs[ssl]
- sys-devel/bison
- sys-devel/flex
-"
-
-PATCHES=( "${WORKDIR}"/patches/${PN} )
-[[ ${PV} == 6.9999 ]] || # keep for 6.x.9999
- PATCHES+=( "${WORKDIR}"/patches/chromium )
-
-PATCHES+=(
- # add extras as needed here, may merge in set if carries across versions
-)
-
-python_check_deps() {
- python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
-}
-
-qtwebengine_check-reqs() {
- [[ ${MERGE_TYPE} == binary ]] && return
-
- if is-flagq '-g?(gdb)?([1-9])'; then #307861
- ewarn
- ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which"
- ewarn "is non-trivial with ${PN}. May experience extended compilation"
- ewarn "times, increased disk/memory usage, and potentially link failure."
- ewarn
- ewarn "If run into issues, please try disabling before reporting a bug."
- fi
-
- local CHECKREQS_DISK_BUILD=7G
- local CHECKREQS_DISK_USR=220M
-
- if ! has distcc ${FEATURES}; then #830661
- # assume ~2GB per job or 1.5GB if clang, possible with less
- # depending on free memory and *FLAGS, but prefer being safe as
- # users having OOM issues with qtwebengine been rather common
- tc-is-clang && : 15 || : 20
- local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G
- fi
-
- check-reqs_${EBUILD_PHASE_FUNC} #570534
-}
-
-pkg_pretend() {
- qtwebengine_check-reqs
-}
-
-pkg_setup() {
- qtwebengine_check-reqs
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- qt6-build_src_prepare
-
- # for www-plugins/chrome-binary-plugins (widevine) search paths on prefix
- hprefixify -w /Gentoo/ src/core/content_client_qt.cpp
-
- # store chromium versions, only used in postinst for a warning
- local chromium
- mapfile -t chromium < CHROMIUM_VERSION || die
- [[ ${chromium[1]} =~ ^Based.*:[^0-9]+([0-9.]+$) ]] &&
- QT6_CHROMIUM_VER=${BASH_REMATCH[1]} || die
- [[ ${chromium[2]} =~ ^Patched.+:[^0-9]+([0-9.]+$) ]] &&
- QT6_CHROMIUM_PATCHES_VER=${BASH_REMATCH[1]} || die
-}
-
-src_configure() {
- local mycmakeargs=(
- $(qt_feature pdfium qtpdf_build)
- $(qt_feature qml qtpdf_quick_build)
- $(qt_feature widgets qtpdf_widgets_build)
- $(usev pdfium -DQT_FEATURE_pdf_v8=ON)
-
- -DQT_FEATURE_qtwebengine_build=ON
- $(qt_feature qml qtwebengine_quick_build)
- $(qt_feature widgets qtwebengine_widgets_build)
-
- $(cmake_use_find_package designer Qt6Designer)
-
- $(qt_feature alsa webengine_system_alsa)
- $(qt_feature !bindist webengine_proprietary_codecs)
- $(qt_feature geolocation webengine_geolocation)
- $(qt_feature jumbo-build webengine_jumbo_build)
- $(qt_feature kerberos webengine_kerberos)
- $(qt_feature pulseaudio webengine_system_pulseaudio)
- $(qt_feature screencast webengine_webrtc_pipewire)
- $(qt_feature system-icu webengine_system_icu)
- $(qt_feature vaapi webengine_vaapi)
- $(qt_feature vulkan webengine_vulkan)
- -DQT_FEATURE_webengine_embedded_build=OFF
- -DQT_FEATURE_webengine_extensions=ON
- -DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet
- -DQT_FEATURE_webengine_pepper_plugins=ON
- -DQT_FEATURE_webengine_printing_and_pdf=ON
- -DQT_FEATURE_webengine_spellchecker=ON
- -DQT_FEATURE_webengine_webchannel=ON
- -DQT_FEATURE_webengine_webrtc=ON
-
- # needs a modified ffmpeg to be usable, and even then it may not
- # cooperate with new major ffmpeg versions (bug #831487)
- -DQT_FEATURE_webengine_system_ffmpeg=OFF
-
- # use bundled re2 to avoid complications, may revisit
- # (see discussions in https://github.com/gentoo/gentoo/pull/32281)
- -DQT_FEATURE_webengine_system_re2=OFF
-
- # bundled is currently required when using vaapi (forced regardless)
- $(qt_feature !vaapi webengine_system_libvpx)
-
- # not necessary to pass these (default), but in case detection fails
- $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
- freetype glib harfbuzz lcms2 libevent libjpeg \
- libopenjpeg2 libpci libpng libtiff libwebp \
- libxml minizip opus poppler snappy zlib)
-
- # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
- -DINSTALL_GN=OFF
- )
-
- local mygnargs=(
- # prefer no dlopen where possible
- link_pulseaudio=true
- rtc_link_pipewire=true
- )
-
- if use !custom-cflags; then
- strip-flags # fragile
-
- if is-flagq '-g?(gdb)?([2-9])'; then #914475
- replace-flags '-g?(gdb)?([2-9])' -g1
- ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"
- fi
-
- # Built helpers segfault when using (at least) -march=armv8-a+pauth
- # (bug #920555, #920568 -- suspected gcc bug). For now, filter all
- # for simplicity. Override with USE=custom-cflags if wanted, please
- # report if above -march works again so can cleanup.
- use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
- fi
-
- export NINJA NINJAFLAGS=$(get_NINJAOPTS)
- [[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
-
- local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
- einfo "Extra Gn args: ${EXTRA_GN}"
-
- qt6-build_src_configure
-}
-
-src_compile() {
- # tentatively work around a possible (rare) race condition (bug #921680)
- cmake_build WebEngineCore_sync_all_public_headers
-
- cmake_src_compile
-}
-
-src_test() {
- if [[ ${EUID} == 0 ]]; then
- # almost every tests fail, so skip entirely
- ewarn "Skipping tests due to running as root (chromium refuses this configuration)."
- return
- fi
-
- local CMAKE_SKIP_TESTS=(
- # fails with network sandbox
- tst_loadsignals
- tst_qquickwebengineview
- tst_qwebengineglobalsettings
- tst_qwebengineview
- # certs verfication seems flaky and gives expiration warnings
- tst_qwebengineclientcertificatestore
- # test is misperformed when qtbase is built USE=-test?
- tst_touchinput
- )
-
- # prevent using the system's qtwebengine
- # (use glob to avoid unnecessary complications with arch dir)
- local resources=( "${BUILD_DIR}/src/core/${CMAKE_BUILD_TYPE}/"* )
- [[ -d ${resources[0]} ]] || die "invalid resources path: ${resources[0]}"
- local -x QTWEBENGINEPROCESS_PATH=${BUILD_DIR}${QT6_LIBEXECDIR#"${QT6_PREFIX}"}/QtWebEngineProcess
- local -x QTWEBENGINE_LOCALES_PATH=${resources[0]}/qtwebengine_locales
- local -x QTWEBENGINE_RESOURCES_PATH=${resources[0]}
-
- # random failures in several tests without -j1
- qt6-build_src_test -j1
-}
-
-src_install() {
- qt6-build_src_install
-
- [[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472
- die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
-}
-
-pkg_postinst() {
- # plugin may also be found in $HOME if provided by chrome or firefox
- use amd64 &&
- optfeature "Widevine DRM support (protected media playback)" \
- www-plugins/chrome-binary-plugins
-
- elog
- elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with"
- elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. 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
- 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 "tl;dr your web browsing experience will be compromised."
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-02-20 14:30 Arthur Zamarin
0 siblings, 0 replies; 301+ messages in thread
From: Arthur Zamarin @ 2024-02-20 14:30 UTC (permalink / raw
To: gentoo-commits
commit: 321aa55772301c7ff86c1cf5fca762e5dfcfb9d8
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 20 06:44:45 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 20 14:30:13 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=321aa557
dev-qt/qtwebengine: Stabilize 6.6.2 amd64, #924651
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.6.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.2.ebuild
index d38931f4877c..47ca2cf367a9 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI+="
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm64"
+ KEYWORDS="amd64 ~arm64"
fi
IUSE="
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-02-14 12:24 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-02-14 12:24 UTC (permalink / raw
To: gentoo-commits
commit: 20add58950c85c206d98e59943bd81b333e40968
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 14 11:09:33 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Feb 14 12:22:13 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20add589
dev-qt/qtwebengine: add 6.6.2
Closes: https://bugs.gentoo.org/920758
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-6.6.2.ebuild | 314 ++++++++++++++++++++++++++++
2 files changed, 315 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index e45296c7913c..1e64b9085dd1 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -6,3 +6,4 @@ DIST qtwebengine-6.6-patchset-6.tar.xz 9828 BLAKE2B ae595c2f3a71abc183e256118b1c
DIST qtwebengine-6.6-patchset-9.tar.xz 8040 BLAKE2B 11c76fd36227cfcfc3c83618fad25c66963e63697f857b99efc76188529bea42094b279bd9f37e79584cb6e9f1d2dd2f666a96c46ddf2276033cdc97782b72c4 SHA512 33cc1ad0843eeaf1103033c2e9b9a734cd218d92c40985fd6c109acefa2f68b99b1f3cf5e06d6f837fc974c39b220ae93b40d135b5414f822cf28e075805c9c1
DIST qtwebengine-6.7-patchset-4.tar.xz 7792 BLAKE2B 99250f9c807870aeff0eafccd4a27c224785e34b21ba8dc9e663741cf123ebda6501b8f3d7b1e274cb4e543fe1f9d3fbb1ea54de85fcde4d11d2388f97674a60 SHA512 28dfb2c6c74a971f407e793f43b1224af5b2dac1c1b053badfee23e54d8fe6c390498a88d4da9d8f0de66f579234b1ccca527fc44997dd185ab1f570fbf63203
DIST qtwebengine-everywhere-src-6.6.1.tar.xz 421042656 BLAKE2B 6982a1884d66162cc3c8518125c655d60ced9ec9e81670fb2e5b193aab655c4516bbc50d3c774764385fbe372863fdbf3e03a3c35f07dd9c3119880266b3131e SHA512 d1e4f5b664f8aca5e0a5927968be87e29e29172f1256f21dc6a29006258fb2be2be99b5b36c94a08c704580db9fac7defbb37193534129a21ca14a511fcdeea0
+DIST qtwebengine-everywhere-src-6.6.2.tar.xz 421147952 BLAKE2B a0317faf9ff2d81cd2418652c297821bd8451e0564b8b9af8cb005b0c96a4ec74305ff814c3ab355d84bbacaaccd9ebf6bf591e01b485e243cc485aedf3e6e5b SHA512 8024890c1a7f6d5b9866d768f5ee5cb24b2eb9bb2162886fe02cf8f6fbb23e99eadb142c2636fd3d856b0b1975e69859989553f70c6d8610a69d991d4c2f190d
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.2.ebuild
new file mode 100644
index 000000000000..d38931f4877c
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.2.ebuild
@@ -0,0 +1,314 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 3.12 needs QTBUG-117979 (see also QTBUG-115512)
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="xml(+)"
+inherit check-reqs flag-o-matic multiprocessing optfeature
+inherit prefix python-any-r1 qt6-build toolchain-funcs
+
+DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
+SRC_URI+="
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.6-patchset-9.tar.xz
+"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm64"
+fi
+
+IUSE="
+ +alsa bindist custom-cflags designer geolocation +jumbo-build
+ kerberos opengl pdfium pulseaudio qml screencast +system-icu
+ vaapi vulkan +widgets
+"
+REQUIRED_USE="
+ designer? ( qml widgets )
+"
+
+# dlopen: krb5, libva, pciutils, udev
+RDEPEND="
+ app-arch/snappy:=
+ dev-libs/expat
+ dev-libs/libevent:=
+ dev-libs/libxml2[icu]
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ ~dev-qt/qtbase-${PV}:6[gui,opengl=,vulkan?,widgets?]
+ ~dev-qt/qtwebchannel-${PV}:6[qml?]
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/harfbuzz:=
+ media-libs/lcms:2
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ media-libs/libwebp:=
+ media-libs/openjpeg:2=
+ media-libs/opus
+ media-libs/tiff:=
+ sys-apps/dbus
+ sys-apps/pciutils
+ sys-libs/zlib:=[minizip]
+ virtual/libudev
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXrandr
+ x11-libs/libXtst
+ x11-libs/libxcb:=
+ x11-libs/libxkbcommon
+ x11-libs/libxkbfile
+ alsa? ( media-libs/alsa-lib )
+ designer? ( ~dev-qt/qttools-${PV}:6[designer] )
+ geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
+ kerberos? ( virtual/krb5 )
+ pulseaudio? ( media-libs/libpulse[glib] )
+ qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
+ screencast? (
+ dev-libs/glib:2
+ media-libs/mesa[gbm(+)]
+ media-video/pipewire:=
+ x11-libs/libdrm
+ )
+ system-icu? ( dev-libs/icu:= )
+ vaapi? (
+ media-libs/libva:=[X]
+ media-libs/mesa[gbm(+)]
+ x11-libs/libdrm
+ )
+ !vaapi? ( media-libs/libvpx:= )
+ widgets? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] )
+"
+DEPEND="
+ ${RDEPEND}
+ media-libs/libglvnd
+ x11-base/xorg-proto
+ x11-libs/libxshmfence
+ screencast? ( media-libs/libepoxy[egl(+)] )
+ pdfium? ( net-print/cups )
+ test? (
+ widgets? ( app-text/poppler[cxx(+)] )
+ )
+ vaapi? (
+ vulkan? ( dev-util/vulkan-headers )
+ )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
+ dev-util/gperf
+ net-libs/nodejs[ssl]
+ sys-devel/bison
+ sys-devel/flex
+"
+
+PATCHES=( "${WORKDIR}"/patches/${PN} )
+[[ ${PV} == 6.9999 ]] || # too fragile for 6.9999, but keep for 6.x.9999
+ PATCHES+=( "${WORKDIR}"/patches/chromium )
+
+PATCHES+=(
+ # add extras as needed here, may merge in set if carries across versions
+)
+
+python_check_deps() {
+ python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+}
+
+qtwebengine_check-reqs() {
+ [[ ${MERGE_TYPE} == binary ]] && return
+
+ if is-flagq '-g?(gdb)?([1-9])'; then #307861
+ ewarn
+ ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which"
+ ewarn "is non-trivial with ${PN}. May experience extended compilation"
+ ewarn "times, increased disk/memory usage, and potentially link failure."
+ ewarn
+ ewarn "If run into issues, please try disabling before reporting a bug."
+ fi
+
+ local CHECKREQS_DISK_BUILD=7G
+ local CHECKREQS_DISK_USR=220M
+
+ if ! has distcc ${FEATURES}; then #830661
+ # assume ~2GB per job or 1.5GB if clang, possible with less
+ # depending on free memory and *FLAGS, but prefer being safe as
+ # users having OOM issues with qtwebengine been rather common
+ tc-is-clang && : 15 || : 20
+ local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G
+ fi
+
+ check-reqs_${EBUILD_PHASE_FUNC} #570534
+}
+
+pkg_pretend() {
+ qtwebengine_check-reqs
+}
+
+pkg_setup() {
+ qtwebengine_check-reqs
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ qt6-build_src_prepare
+
+ # for www-plugins/chrome-binary-plugins (widevine) search paths on prefix
+ hprefixify -w /Gentoo/ src/core/content_client_qt.cpp
+
+ # store chromium versions, only used in postinst for a warning
+ local chromium
+ mapfile -t chromium < CHROMIUM_VERSION || die
+ [[ ${chromium[1]} =~ ^Based.*:[^0-9]+([0-9.]+$) ]] &&
+ QT6_CHROMIUM_VER=${BASH_REMATCH[1]} || die
+ [[ ${chromium[2]} =~ ^Patched.+:[^0-9]+([0-9.]+$) ]] &&
+ QT6_CHROMIUM_PATCHES_VER=${BASH_REMATCH[1]} || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(qt_feature pdfium qtpdf_build)
+ $(qt_feature qml qtpdf_quick_build)
+ $(qt_feature widgets qtpdf_widgets_build)
+ $(usev pdfium -DQT_FEATURE_pdf_v8=ON)
+
+ -DQT_FEATURE_qtwebengine_build=ON
+ $(qt_feature qml qtwebengine_quick_build)
+ $(qt_feature widgets qtwebengine_widgets_build)
+
+ $(cmake_use_find_package designer Qt6Designer)
+
+ $(qt_feature alsa webengine_system_alsa)
+ $(qt_feature !bindist webengine_proprietary_codecs)
+ $(qt_feature geolocation webengine_geolocation)
+ $(qt_feature jumbo-build webengine_jumbo_build)
+ $(qt_feature kerberos webengine_kerberos)
+ $(qt_feature pulseaudio webengine_system_pulseaudio)
+ $(qt_feature screencast webengine_webrtc_pipewire)
+ $(qt_feature system-icu webengine_system_icu)
+ $(qt_feature vaapi webengine_vaapi)
+ $(qt_feature vulkan webengine_vulkan)
+ -DQT_FEATURE_webengine_embedded_build=OFF
+ -DQT_FEATURE_webengine_extensions=ON
+ -DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet
+ -DQT_FEATURE_webengine_pepper_plugins=ON
+ -DQT_FEATURE_webengine_printing_and_pdf=ON
+ -DQT_FEATURE_webengine_spellchecker=ON
+ -DQT_FEATURE_webengine_webchannel=ON
+ -DQT_FEATURE_webengine_webrtc=ON
+
+ # needs a modified ffmpeg to be usable, and even then it may not
+ # cooperate with new major ffmpeg versions (bug #831487)
+ -DQT_FEATURE_webengine_system_ffmpeg=OFF
+
+ # use bundled re2 to avoid complications, may revisit
+ # (see discussions in https://github.com/gentoo/gentoo/pull/32281)
+ -DQT_FEATURE_webengine_system_re2=OFF
+
+ # bundled is currently required when using vaapi (forced regardless)
+ $(qt_feature !vaapi webengine_system_libvpx)
+
+ # not necessary to pass these (default), but in case detection fails
+ $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
+ freetype glib harfbuzz lcms2 libevent libjpeg \
+ libopenjpeg2 libpci libpng libtiff libwebp \
+ libxml minizip opus poppler snappy zlib)
+
+ # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
+ -DINSTALL_GN=OFF
+ )
+
+ local mygnargs=(
+ # prefer no dlopen where possible
+ link_pulseaudio=true
+ rtc_link_pipewire=true
+ )
+
+ if use !custom-cflags; then
+ strip-flags # fragile
+
+ if is-flagq '-g?(gdb)?([2-9])'; then #914475
+ replace-flags '-g?(gdb)?([2-9])' -g1
+ ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"
+ fi
+
+ # Built helpers segfault when using (at least) -march=armv8-a+pauth
+ # (bug #920555, #920568 -- suspected gcc bug). For now, filter all
+ # for simplicity. Override with USE=custom-cflags if wanted, please
+ # report if above -march works again so can cleanup.
+ use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
+ fi
+
+ export NINJA NINJAFLAGS=$(get_NINJAOPTS)
+ [[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
+
+ local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
+ einfo "Extra Gn args: ${EXTRA_GN}"
+
+ qt6-build_src_configure
+}
+
+src_compile() {
+ # tentatively work around a possible (rare) race condition (bug #921680)
+ cmake_build WebEngineCore_sync_all_public_headers
+
+ cmake_src_compile
+}
+
+src_test() {
+ if [[ ${EUID} == 0 ]]; then
+ # almost every tests fail, so skip entirely
+ ewarn "Skipping tests due to running as root (chromium refuses this configuration)."
+ return
+ fi
+
+ local CMAKE_SKIP_TESTS=(
+ # fails with network sandbox
+ tst_loadsignals
+ tst_qquickwebengineview
+ tst_qwebengineglobalsettings
+ tst_qwebengineview
+ # certs verfication seems flaky and gives expiration warnings
+ tst_qwebengineclientcertificatestore
+ # test is misperformed when qtbase is built USE=-test?
+ tst_touchinput
+ )
+
+ # prevent using the system's qtwebengine
+ # (use glob to avoid unnecessary complications with arch dir)
+ local resources=( "${BUILD_DIR}/src/core/${CMAKE_BUILD_TYPE}/"* )
+ [[ -d ${resources[0]} ]] || die "invalid resources path: ${resources[0]}"
+ local -x QTWEBENGINEPROCESS_PATH=${BUILD_DIR}${QT6_LIBEXECDIR#"${QT6_PREFIX}"}/QtWebEngineProcess
+ local -x QTWEBENGINE_LOCALES_PATH=${resources[0]}/qtwebengine_locales
+ local -x QTWEBENGINE_RESOURCES_PATH=${resources[0]}
+
+ # random failures in several tests without -j1
+ qt6-build_src_test -j1
+}
+
+src_install() {
+ qt6-build_src_install
+
+ [[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472
+ die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
+}
+
+pkg_postinst() {
+ # plugin may also be found in $HOME if provided by chrome or firefox
+ use amd64 &&
+ optfeature "Widevine DRM support (protected media playback)" \
+ www-plugins/chrome-binary-plugins
+
+ elog
+ elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with"
+ elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. 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
+ 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 "tl;dr your web browsing experience will be compromised."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-01-31 7:18 Joonas Niilola
0 siblings, 0 replies; 301+ messages in thread
From: Joonas Niilola @ 2024-01-31 7:18 UTC (permalink / raw
To: gentoo-commits
commit: 167063bc8239d8b0747d5a0307ca7bb832fedc65
Author: Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Tue Jan 30 23:03:22 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Jan 31 07:17:54 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=167063bc
dev-qt/qtwebengine: Stabilize 5.15.12_p20240122 arm64, #921565
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.12_p20240122.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.12_p20240122.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.12_p20240122.ebuild
index 7df64bffa845..50fb9a051ea4 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.12_p20240122.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.12_p20240122.ebuild
@@ -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 ~ppc64 ~x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-01-29 14:38 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-01-29 14:38 UTC (permalink / raw
To: gentoo-commits
commit: f87339dac0c5039f8cb15743327bd296e62799a9
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 29 02:25:58 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jan 29 14:37:15 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f87339da
dev-qt/qtwebengine: update patchset for 6.6 and 6.7 branches
6.6-8 -> 6.6-9 and
6.7-3 -> 6.7-4 changes:
Updated:
* gn-bootstrap.patch (updated to not pass -Werror wrt bug #920758)
Removed:
* samurai.patch (unnecessary with the new app-alternatives/ninja)
Meant to do these last time updated patchsets, but forgot to read
my notes when worked on that. Doing it now so that it will be in
the 6.6.2 release in ~2 days.
Bug: https://bugs.gentoo.org/920758
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 4 ++--
dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 0658a436b2da..44b4faa28f73 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -5,6 +5,6 @@ DIST qtwebengine-5.15.12_p20240112.tar.xz 299267300 BLAKE2B 7ccdeee6a64638a2a486
DIST qtwebengine-5.15.12_p20240122.tar.xz 299226288 BLAKE2B a16a2f428c4a3e7c681e8a8631ddff135fdf1f802cba9e1c827cfec25e0e0dd0bc5c5308b7547b30009709974f7efa950cef1640a24dba4ebbf55def265c90f8 SHA512 31e26d7c76e50eb110d5cf31ea01b47693efca0dd0a6814c881491349b535b9b02c4ef50b45fc6a59e7b8955942a6cc28aa17a6730effdec640be032d14e4f75
DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
DIST qtwebengine-6.6-patchset-6.tar.xz 9828 BLAKE2B ae595c2f3a71abc183e256118b1c3d1e91284199a8f4aaa8bd9d2a67467353b6c145c3bd9d64c20d64321294c63d97a0a4dc3eeca570a1e25eb94dd8fb9aa501 SHA512 8def71c43125073ef6fc1867c36118f43b0af843cce4b47248359712b1f1bfb4d4eabc6b13ecbbb33e4ef10e1617abc488bb336dfbab043b4ef911d71ad386e2
-DIST qtwebengine-6.6-patchset-8.tar.xz 8220 BLAKE2B 5d017d6d905102e3844987f1dbaf1f84d75fb3cdb301380c02c8abd3093b3b1f258529e57cdcaaf857d4eb1663d3c389e6a5bb790e2fc97833b008b590c7fba0 SHA512 33f76fdd6dfa672c376f755e1f965538e231aad985cc73c207000c69a5530f6d72d72f08ef5b069943d8121c2ad88181501a82cee5a8714aa1e1494e9d7ecd4b
-DIST qtwebengine-6.7-patchset-3.tar.xz 7984 BLAKE2B ce3a94c7567a4057686f4d66a97989d214bf1b9c48592c88435ccf7bd6053484febc8a0437f1d17dd5b97c61bda7fafb6af67d84fc677db6aab1cdd479d5e7ca SHA512 3c1daf3ae60ba745a05dac97e9e086347742020a31c65c2d7a4bb2555a72a6e36ea1562c24886e51b8f24fdccd004893c1f49ecba7d92ef3be946d07d211fb61
+DIST qtwebengine-6.6-patchset-9.tar.xz 8040 BLAKE2B 11c76fd36227cfcfc3c83618fad25c66963e63697f857b99efc76188529bea42094b279bd9f37e79584cb6e9f1d2dd2f666a96c46ddf2276033cdc97782b72c4 SHA512 33cc1ad0843eeaf1103033c2e9b9a734cd218d92c40985fd6c109acefa2f68b99b1f3cf5e06d6f837fc974c39b220ae93b40d135b5414f822cf28e075805c9c1
+DIST qtwebengine-6.7-patchset-4.tar.xz 7792 BLAKE2B 99250f9c807870aeff0eafccd4a27c224785e34b21ba8dc9e663741cf123ebda6501b8f3d7b1e274cb4e543fe1f9d3fbb1ea54de85fcde4d11d2388f97674a60 SHA512 28dfb2c6c74a971f407e793f43b1224af5b2dac1c1b053badfee23e54d8fe6c390498a88d4da9d8f0de66f579234b1ccca527fc44997dd185ab1f570fbf63203
DIST qtwebengine-everywhere-src-6.6.1.tar.xz 421042656 BLAKE2B 6982a1884d66162cc3c8518125c655d60ced9ec9e81670fb2e5b193aab655c4516bbc50d3c774764385fbe372863fdbf3e03a3c35f07dd9c3119880266b3131e SHA512 d1e4f5b664f8aca5e0a5927968be87e29e29172f1256f21dc6a29006258fb2be2be99b5b36c94a08c704580db9fac7defbb37193534129a21ca14a511fcdeea0
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
index 66342c02291b..a3a0ae885509 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
@@ -11,7 +11,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs
DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
SRC_URI+="
- https://dev.gentoo.org/~ionen/distfiles/${PN}-6.6-patchset-8.tar.xz
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.6-patchset-9.tar.xz
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index 24484454086e..bc07ef9ed464 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -11,7 +11,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs
DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
SRC_URI+="
- https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-3.tar.xz
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-4.tar.xz
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 24484454086e..bc07ef9ed464 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -11,7 +11,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs
DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
SRC_URI+="
- https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-3.tar.xz
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-4.tar.xz
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-01-29 4:22 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-01-29 4:22 UTC (permalink / raw
To: gentoo-commits
commit: f7edd612e636e7da8d20be6170730b710b814c7a
Author: Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Mon Jan 29 03:21:15 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jan 29 04:09:36 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7edd612
dev-qt/qtwebengine: Stabilize 5.15.12_p20240122 amd64, #921565
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.12_p20240122.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.12_p20240122.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.12_p20240122.ebuild
index 91ce97ccf48d..7df64bffa845 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.12_p20240122.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.12_p20240122.ebuild
@@ -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 ~ppc64 ~x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-01-24 14:49 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-01-24 14:49 UTC (permalink / raw
To: gentoo-commits
commit: 505c33c87b9adfc992ecc09424cbd646aec88558
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 24 08:01:51 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Jan 24 14:49:13 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=505c33c8
dev-qt/qtwebengine: update patchset for 6.6 and 6.7 branches
6.6-7 -> 6.6-8 and
6.7-2 -> 6.7-3 changes:
Removed:
* icu74.patch (upstreamed)
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 4 ++--
dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 4ba0f3830b74..0658a436b2da 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -5,6 +5,6 @@ DIST qtwebengine-5.15.12_p20240112.tar.xz 299267300 BLAKE2B 7ccdeee6a64638a2a486
DIST qtwebengine-5.15.12_p20240122.tar.xz 299226288 BLAKE2B a16a2f428c4a3e7c681e8a8631ddff135fdf1f802cba9e1c827cfec25e0e0dd0bc5c5308b7547b30009709974f7efa950cef1640a24dba4ebbf55def265c90f8 SHA512 31e26d7c76e50eb110d5cf31ea01b47693efca0dd0a6814c881491349b535b9b02c4ef50b45fc6a59e7b8955942a6cc28aa17a6730effdec640be032d14e4f75
DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
DIST qtwebengine-6.6-patchset-6.tar.xz 9828 BLAKE2B ae595c2f3a71abc183e256118b1c3d1e91284199a8f4aaa8bd9d2a67467353b6c145c3bd9d64c20d64321294c63d97a0a4dc3eeca570a1e25eb94dd8fb9aa501 SHA512 8def71c43125073ef6fc1867c36118f43b0af843cce4b47248359712b1f1bfb4d4eabc6b13ecbbb33e4ef10e1617abc488bb336dfbab043b4ef911d71ad386e2
-DIST qtwebengine-6.6-patchset-7.tar.xz 8480 BLAKE2B c4078d323c02a81e030c4b9b55a8e05f3f49722f937c2fa73fecbc75e8cfa843481857fd193fa92474329e60eb8deee4b287e637bbfff72bdf7d28f3525256f3 SHA512 e601b7a61863ea9f56c3bc12928eab99e87f9616e8d6d7db24a32045854f77976a27fee58bb1c7f57ca2ca12612dff3910294864e73ab8c9eb9c5347e7100590
-DIST qtwebengine-6.7-patchset-2.tar.xz 8252 BLAKE2B 00e0c6b6ea596dc314c5897012e8447f8f18db4992a2266568e75cb6bab57d76f0899ca2ad60a707477bab0b645a0142e02e7b7c5dab4b0ae27cc2243c245d6b SHA512 477639031d2254dd8427c6de8cf0b301942b34d6e3dd79b70ef1c46e0f12684c872a1d581bd46483949a79ba54cca45f795ac9b4a14d50137cd850cef747db1a
+DIST qtwebengine-6.6-patchset-8.tar.xz 8220 BLAKE2B 5d017d6d905102e3844987f1dbaf1f84d75fb3cdb301380c02c8abd3093b3b1f258529e57cdcaaf857d4eb1663d3c389e6a5bb790e2fc97833b008b590c7fba0 SHA512 33f76fdd6dfa672c376f755e1f965538e231aad985cc73c207000c69a5530f6d72d72f08ef5b069943d8121c2ad88181501a82cee5a8714aa1e1494e9d7ecd4b
+DIST qtwebengine-6.7-patchset-3.tar.xz 7984 BLAKE2B ce3a94c7567a4057686f4d66a97989d214bf1b9c48592c88435ccf7bd6053484febc8a0437f1d17dd5b97c61bda7fafb6af67d84fc677db6aab1cdd479d5e7ca SHA512 3c1daf3ae60ba745a05dac97e9e086347742020a31c65c2d7a4bb2555a72a6e36ea1562c24886e51b8f24fdccd004893c1f49ecba7d92ef3be946d07d211fb61
DIST qtwebengine-everywhere-src-6.6.1.tar.xz 421042656 BLAKE2B 6982a1884d66162cc3c8518125c655d60ced9ec9e81670fb2e5b193aab655c4516bbc50d3c774764385fbe372863fdbf3e03a3c35f07dd9c3119880266b3131e SHA512 d1e4f5b664f8aca5e0a5927968be87e29e29172f1256f21dc6a29006258fb2be2be99b5b36c94a08c704580db9fac7defbb37193534129a21ca14a511fcdeea0
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
index 92a315e96855..66342c02291b 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
@@ -11,7 +11,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs
DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
SRC_URI+="
- https://dev.gentoo.org/~ionen/distfiles/${PN}-6.6-patchset-7.tar.xz
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.6-patchset-8.tar.xz
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index b08109bae395..24484454086e 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -11,7 +11,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs
DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
SRC_URI+="
- https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-2.tar.xz
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-3.tar.xz
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index b08109bae395..24484454086e 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -11,7 +11,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs
DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
SRC_URI+="
- https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-2.tar.xz
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-3.tar.xz
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-01-22 19:38 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2024-01-22 19:38 UTC (permalink / raw
To: gentoo-commits
commit: 7beb9333b115f33305c81e2bbecd04a36a94d0a2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 22 19:20:57 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 22 19:27:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7beb9333
dev-qt/qtwebengine: add 5.15.12_p20240122
Bug: https://bugs.gentoo.org/921565
Bug: https://bugs.gentoo.org/922189
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
.../qtwebengine-5.15.12_p20240122.ebuild | 279 +++++++++++++++++++++
2 files changed, 280 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 6ea091fd48ce..4ba0f3830b74 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -2,6 +2,7 @@ DIST qtwebengine-5.15-ffmpeg-ppc64le.tar.xz 12080 BLAKE2B cfab4f02b8fac8ae7585ed
DIST qtwebengine-5.15.10_p20230815-patchset.tar.xz 44880 BLAKE2B 6179ca4ad69f922cfa8ab8528bd571a326b3340f810f05782d808d67b6310de079d84ca6f769bd532f0fe375a702f0d348e02cfbf6b3f2d5c30ac668e1005bef SHA512 a323bdd8afeb41a97febf587bb0994a937c78ed470e077a2b482dca7e04bc4eb9cf75b2d2707236574d6586189ff3d27e42f437930dedd85b47a77e18ffc8fa3
DIST qtwebengine-5.15.11_p20231120.tar.xz 299212012 BLAKE2B 4f9fc9e3f380377f1eeaa8b04c6622c9e25d8b11151cccf7a04ef7dea88e4870db704dda3b303196e40bc8c1c6e76f495f911de5a74769b633952e35718a85de SHA512 2d64edf0ec5322e25a6decfd92a1b1170135c852a8d154d30a336b894bfc4c24f08cb5c88028c68a4f74e6bd6767aaf827a5fa08a82a70fd49e1fa064ee56f27
DIST qtwebengine-5.15.12_p20240112.tar.xz 299267300 BLAKE2B 7ccdeee6a64638a2a486fdb69c7090e310c8e5711e5387ab4df44d432adac61fd62dbb923de4d8c299076512aa8a98434e47382fc53783f323c3fa6ce3447cc2 SHA512 2cb4d3386ef7cde547ccdc402ea03ca55141b902e878c75520579b7daa81d25dfda20b1ef824a8e19acbaa64bd11a51fa5caeaf82eb8dbdda2ecfd4836fd8bef
+DIST qtwebengine-5.15.12_p20240122.tar.xz 299226288 BLAKE2B a16a2f428c4a3e7c681e8a8631ddff135fdf1f802cba9e1c827cfec25e0e0dd0bc5c5308b7547b30009709974f7efa950cef1640a24dba4ebbf55def265c90f8 SHA512 31e26d7c76e50eb110d5cf31ea01b47693efca0dd0a6814c881491349b535b9b02c4ef50b45fc6a59e7b8955942a6cc28aa17a6730effdec640be032d14e4f75
DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
DIST qtwebengine-6.6-patchset-6.tar.xz 9828 BLAKE2B ae595c2f3a71abc183e256118b1c3d1e91284199a8f4aaa8bd9d2a67467353b6c145c3bd9d64c20d64321294c63d97a0a4dc3eeca570a1e25eb94dd8fb9aa501 SHA512 8def71c43125073ef6fc1867c36118f43b0af843cce4b47248359712b1f1bfb4d4eabc6b13ecbbb33e4ef10e1617abc488bb336dfbab043b4ef911d71ad386e2
DIST qtwebengine-6.6-patchset-7.tar.xz 8480 BLAKE2B c4078d323c02a81e030c4b9b55a8e05f3f49722f937c2fa73fecbc75e8cfa843481857fd193fa92474329e60eb8deee4b287e637bbfff72bdf7d28f3525256f3 SHA512 e601b7a61863ea9f56c3bc12928eab99e87f9616e8d6d7db24a32045854f77976a27fee58bb1c7f57ca2ca12612dff3910294864e73ab8c9eb9c5347e7100590
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.12_p20240122.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.12_p20240122.ebuild
new file mode 100644
index 000000000000..91ce97ccf48d
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.12_p20240122.ebuild
@@ -0,0 +1,279 @@
+# Copyright 1999-2024 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
+# 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
+ )"
+
+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
+ app-alternatives/ninja
+ dev-util/re2c
+ net-libs/nodejs[ssl]
+ sys-devel/bison
+ sys-devel/flex
+ ppc64? ( >=dev-build/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
+
+ 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() {
+ 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."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-01-15 21:59 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2024-01-15 21:59 UTC (permalink / raw
To: gentoo-commits
commit: 1ae2043b2fe1790ad208ee2e788878348ff4772c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 15 20:32:42 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 15 21:58:49 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ae2043b
dev-qt/qtwebengine: add 5.15.12_p20240112
Bug: https://bugs.gentoo.org/921565
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
.../qtwebengine-5.15.12_p20240112.ebuild | 279 +++++++++++++++++++++
2 files changed, 280 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index ce844f8c9264..ec8686a19d22 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -2,6 +2,7 @@ DIST qtwebengine-5.15-ffmpeg-ppc64le.tar.xz 12080 BLAKE2B cfab4f02b8fac8ae7585ed
DIST qtwebengine-5.15.10_p20230815-patchset.tar.xz 44880 BLAKE2B 6179ca4ad69f922cfa8ab8528bd571a326b3340f810f05782d808d67b6310de079d84ca6f769bd532f0fe375a702f0d348e02cfbf6b3f2d5c30ac668e1005bef SHA512 a323bdd8afeb41a97febf587bb0994a937c78ed470e077a2b482dca7e04bc4eb9cf75b2d2707236574d6586189ff3d27e42f437930dedd85b47a77e18ffc8fa3
DIST qtwebengine-5.15.11_p20231120.tar.xz 299212012 BLAKE2B 4f9fc9e3f380377f1eeaa8b04c6622c9e25d8b11151cccf7a04ef7dea88e4870db704dda3b303196e40bc8c1c6e76f495f911de5a74769b633952e35718a85de SHA512 2d64edf0ec5322e25a6decfd92a1b1170135c852a8d154d30a336b894bfc4c24f08cb5c88028c68a4f74e6bd6767aaf827a5fa08a82a70fd49e1fa064ee56f27
DIST qtwebengine-5.15.12_p20231219.tar.xz 299224728 BLAKE2B 2446840556e08af57b5f90a4be06a301f2359f516a2c0e088efd8769d15046fbd961863952608ad88072f3b6211fe7226dd70cb2bc66133a4289da1a2ecba06e SHA512 cf6e2f6bc5bc8421185249b6bdde6ae1a97b54f4e84a9b12e82d6d4f59d5cf122762780634d337bc9a943fef61c9a4b64e754b26c7dd8df4bb36b49fd0f62f07
+DIST qtwebengine-5.15.12_p20240112.tar.xz 299267300 BLAKE2B 7ccdeee6a64638a2a486fdb69c7090e310c8e5711e5387ab4df44d432adac61fd62dbb923de4d8c299076512aa8a98434e47382fc53783f323c3fa6ce3447cc2 SHA512 2cb4d3386ef7cde547ccdc402ea03ca55141b902e878c75520579b7daa81d25dfda20b1ef824a8e19acbaa64bd11a51fa5caeaf82eb8dbdda2ecfd4836fd8bef
DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
DIST qtwebengine-6.6-patchset-6.tar.xz 9828 BLAKE2B ae595c2f3a71abc183e256118b1c3d1e91284199a8f4aaa8bd9d2a67467353b6c145c3bd9d64c20d64321294c63d97a0a4dc3eeca570a1e25eb94dd8fb9aa501 SHA512 8def71c43125073ef6fc1867c36118f43b0af843cce4b47248359712b1f1bfb4d4eabc6b13ecbbb33e4ef10e1617abc488bb336dfbab043b4ef911d71ad386e2
DIST qtwebengine-6.6-patchset-7.tar.xz 8480 BLAKE2B c4078d323c02a81e030c4b9b55a8e05f3f49722f937c2fa73fecbc75e8cfa843481857fd193fa92474329e60eb8deee4b287e637bbfff72bdf7d28f3525256f3 SHA512 e601b7a61863ea9f56c3bc12928eab99e87f9616e8d6d7db24a32045854f77976a27fee58bb1c7f57ca2ca12612dff3910294864e73ab8c9eb9c5347e7100590
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.12_p20240112.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.12_p20240112.ebuild
new file mode 100644
index 000000000000..3dd47c6a1bb8
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.12_p20240112.ebuild
@@ -0,0 +1,279 @@
+# Copyright 1999-2024 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
+# 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
+ )"
+
+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
+ app-alternatives/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
+
+ 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() {
+ 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."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-01-10 9:15 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-01-10 9:15 UTC (permalink / raw
To: gentoo-commits
commit: 2e0505f87184b97e3eeb1621171beda057b5ba9c
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 10 08:35:38 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Jan 10 09:08:21 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e0505f8
dev-qt/qtwebengine: tentatively work around race condition (qt6)
Unknown if this really helps, depend on if the file was missing
or if it was just failing to find where it is with bad include
search -- but given it is generated good odds it is the former.
Have not actually reproduced myself and it is possible another
target also needs to be run, could potentially fail differently
if that does not resolve it (forcing -j1 is of course out of the
question for this package).
Needs a proper investigation/fix, but given this tend to fail
very late in the build it is not obvious and ccache likely makes
it harder to fail. Does not help that these rules are created
through several Qt cmake wrapper functions (the sync headers
bits come from qtbase cmake files, not from here).
May tentatively try to remove in a somewhat-distant future to see
if it is still an issue, and/or when related-sounding fixes occurred
in qtbase or qtwebengine.
Closes: https://bugs.gentoo.org/915953
Closes: https://bugs.gentoo.org/921680
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild | 7 +++++++
dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 7 +++++++
dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 7 +++++++
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 7 +++++++
4 files changed, 28 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
index 880963955ebc..5e9631cd0c14 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
@@ -250,6 +250,13 @@ src_configure() {
qt6-build_src_configure
}
+src_compile() {
+ # tentatively work around a possible (rare) race condition (bug #921680)
+ cmake_build WebEngineCore_sync_all_public_headers
+
+ cmake_src_compile
+}
+
src_test() {
if [[ ${EUID} == 0 ]]; then
# almost every tests fail, so skip entirely
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
index 65de6a9759b5..92a315e96855 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
@@ -250,6 +250,13 @@ src_configure() {
qt6-build_src_configure
}
+src_compile() {
+ # tentatively work around a possible (rare) race condition (bug #921680)
+ cmake_build WebEngineCore_sync_all_public_headers
+
+ cmake_src_compile
+}
+
src_test() {
if [[ ${EUID} == 0 ]]; then
# almost every tests fail, so skip entirely
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index eb94f0e7e253..b08109bae395 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -250,6 +250,13 @@ src_configure() {
qt6-build_src_configure
}
+src_compile() {
+ # tentatively work around a possible (rare) race condition (bug #921680)
+ cmake_build WebEngineCore_sync_all_public_headers
+
+ cmake_src_compile
+}
+
src_test() {
if [[ ${EUID} == 0 ]]; then
# almost every tests fail, so skip entirely
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index eb94f0e7e253..b08109bae395 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -250,6 +250,13 @@ src_configure() {
qt6-build_src_configure
}
+src_compile() {
+ # tentatively work around a possible (rare) race condition (bug #921680)
+ cmake_build WebEngineCore_sync_all_public_headers
+
+ cmake_src_compile
+}
+
src_test() {
if [[ ${EUID} == 0 ]]; then
# almost every tests fail, so skip entirely
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-01-09 14:08 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-01-09 14:08 UTC (permalink / raw
To: gentoo-commits
commit: cf6f3184a3dc040d0de50f6df909984a14ed179d
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 9 14:05:44 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jan 9 14:06:41 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf6f3184
Revert "dev-qt/qtwebengine: sys-devel/flex -> app-alternatives/lex"
This reverts commit b179a17a6695decb63e3bb7c824a9766b69cf7aa.
Hadn't noticed this had been done for lex as well. Like bison, this
looks for flex directly like bison and does not respect LEX.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.11_p20231120.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.15.12_p20231219.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231120.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231120.ebuild
index 39e0dd8e4c1b..efcd6f6da205 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231120.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231120.ebuild
@@ -101,7 +101,7 @@ BDEPEND="${PYTHON_DEPS}
dev-util/re2c
net-libs/nodejs[ssl]
sys-devel/bison
- app-alternatives/lex
+ sys-devel/flex
ppc64? ( >=dev-util/gn-0.1807 )
"
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.12_p20231219.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.12_p20231219.ebuild
index 0840e017fa80..c325c99a4f20 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.12_p20231219.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.12_p20231219.ebuild
@@ -101,7 +101,7 @@ BDEPEND="${PYTHON_DEPS}
dev-util/re2c
net-libs/nodejs[ssl]
sys-devel/bison
- app-alternatives/lex
+ sys-devel/flex
ppc64? ( >=dev-util/gn-0.1807 )
"
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
index 52405bc44e44..880963955ebc 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
@@ -102,7 +102,7 @@ BDEPEND="
dev-util/gperf
net-libs/nodejs[ssl]
sys-devel/bison
- app-alternatives/lex
+ sys-devel/flex
"
PATCHES=( "${WORKDIR}"/patches/${PN} )
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
index a2fb38c98575..65de6a9759b5 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
@@ -102,7 +102,7 @@ BDEPEND="
dev-util/gperf
net-libs/nodejs[ssl]
sys-devel/bison
- app-alternatives/lex
+ sys-devel/flex
"
PATCHES=( "${WORKDIR}"/patches/${PN} )
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index e7cca530e966..eb94f0e7e253 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -102,7 +102,7 @@ BDEPEND="
dev-util/gperf
net-libs/nodejs[ssl]
sys-devel/bison
- app-alternatives/lex
+ sys-devel/flex
"
PATCHES=( "${WORKDIR}"/patches/${PN} )
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index e7cca530e966..eb94f0e7e253 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -102,7 +102,7 @@ BDEPEND="
dev-util/gperf
net-libs/nodejs[ssl]
sys-devel/bison
- app-alternatives/lex
+ sys-devel/flex
"
PATCHES=( "${WORKDIR}"/patches/${PN} )
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-01-08 16:43 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-01-08 16:43 UTC (permalink / raw
To: gentoo-commits
commit: f6c788b3553a3ad73bf999f19ce0ffb34a32e760
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 8 13:08:46 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jan 8 16:41:51 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6c788b3
dev-qt/qtwebengine: do the install sanity-check from qt5 in qt6 too
The check was removed before I touched these and didn't know it
existed. Was fair to think it wouldn't be needed anymore with cmake
but it is, e.g. it installs nothing if bison is not found without
hard failure.
File path is hopefully correct for Qt6, did give it two test builds
(one "bad" that's empty, and one full build) just in case. Albeit
haven't retried prefix (it's included in QT6_LIBDIR though).
The qt6-build eclass does force fatal errors for a few "build nothing"
cases, but not qtwebengine's custom ones. Kind of wonder if a similar
end result file check should be done for all of dev-qt/* (aka fail if
does not install anything but cmake files and docs). May revisit if Qt
has more original ways to build nothing not limited to qtwebengine.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild | 7 +++++++
dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 7 +++++++
dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 7 +++++++
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 7 +++++++
4 files changed, 28 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
index 7557170168d7..52405bc44e44 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
@@ -281,6 +281,13 @@ src_test() {
qt6-build_src_test -j1
}
+src_install() {
+ qt6-build_src_install
+
+ [[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472
+ die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
+}
+
pkg_postinst() {
# plugin may also be found in $HOME if provided by chrome or firefox
use amd64 &&
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
index 46450368b95d..a2fb38c98575 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
@@ -281,6 +281,13 @@ src_test() {
qt6-build_src_test -j1
}
+src_install() {
+ qt6-build_src_install
+
+ [[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472
+ die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
+}
+
pkg_postinst() {
# plugin may also be found in $HOME if provided by chrome or firefox
use amd64 &&
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index c5e7a9912cc0..e7cca530e966 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -281,6 +281,13 @@ src_test() {
qt6-build_src_test -j1
}
+src_install() {
+ qt6-build_src_install
+
+ [[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472
+ die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
+}
+
pkg_postinst() {
# plugin may also be found in $HOME if provided by chrome or firefox
use amd64 &&
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index c5e7a9912cc0..e7cca530e966 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -281,6 +281,13 @@ src_test() {
qt6-build_src_test -j1
}
+src_install() {
+ qt6-build_src_install
+
+ [[ -e ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]] || #601472
+ die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
+}
+
pkg_postinst() {
# plugin may also be found in $HOME if provided by chrome or firefox
use amd64 &&
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-01-08 12:59 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2024-01-08 12:59 UTC (permalink / raw
To: gentoo-commits
commit: 683c9b37059185648599d989b3407b0f7667b178
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 8 12:53:31 2024 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jan 8 12:57:52 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=683c9b37
Revert "dev-qt/qtwebengine: sys-devel/bison -> app-alternatives/yacc"
This reverts commit 2e783c9f85e7259aaabc02dbc7175ffb2313f3db.
This may not set YACC, but that's because qtwebengine does not respect
this variable in the first place and looks for bison directly.
This furthermore fails in a horrible way, it installs an empty
qtwebengine when bison is not found (should probably improve this
to hard fail).
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.11_p20231120.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.15.12_p20231219.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231120.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231120.ebuild
index a483bd58da41..39e0dd8e4c1b 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231120.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231120.ebuild
@@ -100,7 +100,7 @@ BDEPEND="${PYTHON_DEPS}
app-alternatives/ninja
dev-util/re2c
net-libs/nodejs[ssl]
- app-alternatives/yacc
+ sys-devel/bison
app-alternatives/lex
ppc64? ( >=dev-util/gn-0.1807 )
"
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.12_p20231219.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.12_p20231219.ebuild
index 09fd62ec4abd..0840e017fa80 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.12_p20231219.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.12_p20231219.ebuild
@@ -100,7 +100,7 @@ BDEPEND="${PYTHON_DEPS}
app-alternatives/ninja
dev-util/re2c
net-libs/nodejs[ssl]
- app-alternatives/yacc
+ sys-devel/bison
app-alternatives/lex
ppc64? ( >=dev-util/gn-0.1807 )
"
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
index ae7ed26fcf89..7557170168d7 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
@@ -101,7 +101,7 @@ BDEPEND="
$(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
dev-util/gperf
net-libs/nodejs[ssl]
- app-alternatives/yacc
+ sys-devel/bison
app-alternatives/lex
"
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
index a7774dc3a138..46450368b95d 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
@@ -101,7 +101,7 @@ BDEPEND="
$(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
dev-util/gperf
net-libs/nodejs[ssl]
- app-alternatives/yacc
+ sys-devel/bison
app-alternatives/lex
"
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index 6db9fdd774d7..c5e7a9912cc0 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -101,7 +101,7 @@ BDEPEND="
$(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
dev-util/gperf
net-libs/nodejs[ssl]
- app-alternatives/yacc
+ sys-devel/bison
app-alternatives/lex
"
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 6db9fdd774d7..c5e7a9912cc0 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -101,7 +101,7 @@ BDEPEND="
$(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
dev-util/gperf
net-libs/nodejs[ssl]
- app-alternatives/yacc
+ sys-devel/bison
app-alternatives/lex
"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2024-01-01 21:14 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2024-01-01 21:14 UTC (permalink / raw
To: gentoo-commits
commit: dd646c50ab71aa55081b4dddf68f0c090c0400e4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 1 20:54:50 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jan 1 21:01:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd646c50
dev-qt/qtwebengine: add 5.15.12_p20231219
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
.../qtwebengine-5.15.12_p20231219.ebuild | 283 +++++++++++++++++++++
2 files changed, 284 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index e111f7507c64..ae07cf94dfaf 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,6 +1,7 @@
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.11_p20231120.tar.xz 299212012 BLAKE2B 4f9fc9e3f380377f1eeaa8b04c6622c9e25d8b11151cccf7a04ef7dea88e4870db704dda3b303196e40bc8c1c6e76f495f911de5a74769b633952e35718a85de SHA512 2d64edf0ec5322e25a6decfd92a1b1170135c852a8d154d30a336b894bfc4c24f08cb5c88028c68a4f74e6bd6767aaf827a5fa08a82a70fd49e1fa064ee56f27
+DIST qtwebengine-5.15.12_p20231219.tar.xz 299224728 BLAKE2B 2446840556e08af57b5f90a4be06a301f2359f516a2c0e088efd8769d15046fbd961863952608ad88072f3b6211fe7226dd70cb2bc66133a4289da1a2ecba06e SHA512 cf6e2f6bc5bc8421185249b6bdde6ae1a97b54f4e84a9b12e82d6d4f59d5cf122762780634d337bc9a943fef61c9a4b64e754b26c7dd8df4bb36b49fd0f62f07
DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
DIST qtwebengine-6.6-patchset-5.tar.xz 9520 BLAKE2B 28d620841613b2cc677f7742c35c6b8ffc533e26cb3fd85edd455a5450344594a75f790402ac5bc8d19e8e8aa788d0a3244a3a81d127dbebd53e8224798382c1 SHA512 c0bc470fd25c5a835000618618aad7db17994863304140e73e8e261c620aad512453bdf6fbecf99dfb2e267590003a9730fa2c102db9dfdbd5e931ec850f9f05
DIST qtwebengine-6.7-patchset-1.tar.xz 8704 BLAKE2B cc2aff71bedf6f1a5328dc9eb5e54308de806373348c38674e879a8f61a1c6a3eb7948e6fe03ef77160afa7c226f820be1d49d0e0e4c5ef40b118ff788595961 SHA512 5e65a445c8e443257a2a74d4804273a6dca0a951f152cd935f041f51a7fb18c8608511e643deb193194ce4c2d3ec3489fe39c9da5e2eeaa0a047bf246e3da09c
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.12_p20231219.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.12_p20231219.ebuild
new file mode 100644
index 000000000000..474bb469218f
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.12_p20231219.ebuild
@@ -0,0 +1,283 @@
+# Copyright 1999-2024 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
+# 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
+ )"
+
+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}"
+ # add extras as needed here, may merge in set if carries across versions
+ "${FILESDIR}/${PN}-6.5.3-icu74.patch" # bug 917635
+)
+
+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
+
+ 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() {
+ 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."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-12-24 8:28 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2023-12-24 8:28 UTC (permalink / raw
To: gentoo-commits
commit: 64afdb690871b92f6916abc03210662c43eb2d8f
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 22 20:52:48 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Dec 24 08:27:32 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64afdb69
dev-qt/qtwebengine: filter -march on arm64 with gcc for now (qt6)
Bit like Qt5's webengine which did not respect it either. Not ideal
but given the complexity tend to be lucky if it builds at all.
As noted in the comment, please report if this works again so can
cleanup (can test with USE=custom-cflags), may get fixed either
by >=qtwebengine-6.7 (chromium-118) or a new gcc version depending
on where the real issue is, but not planning to pursue this further
myself.
Closes: https://bugs.gentoo.org/920555
Closes: https://bugs.gentoo.org/920568
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild | 6 ++++++
dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 6 ++++++
dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 6 ++++++
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 6 ++++++
4 files changed, 24 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
index 9299373bfe2e..7a8458a6951a 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
@@ -234,6 +234,12 @@ src_configure() {
replace-flags '-g?(gdb)?([2-9])' -g1
ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"
fi
+
+ # Built helpers segfault when using (at least) -march=armv8-a+pauth
+ # (bug #920555, #920568 -- suspected gcc bug). For now, filter all
+ # for simplicity. Override with USE=custom-cflags if wanted, please
+ # report if above -march works again so can cleanup.
+ use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
fi
export NINJA NINJAFLAGS=$(get_NINJAOPTS)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
index dfbb26ef419e..f6ae0e6143f9 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
@@ -234,6 +234,12 @@ src_configure() {
replace-flags '-g?(gdb)?([2-9])' -g1
ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"
fi
+
+ # Built helpers segfault when using (at least) -march=armv8-a+pauth
+ # (bug #920555, #920568 -- suspected gcc bug). For now, filter all
+ # for simplicity. Override with USE=custom-cflags if wanted, please
+ # report if above -march works again so can cleanup.
+ use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
fi
export NINJA NINJAFLAGS=$(get_NINJAOPTS)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index 7337d24a2a37..5e4b82001f05 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -233,6 +233,12 @@ src_configure() {
replace-flags '-g?(gdb)?([2-9])' -g1
ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"
fi
+
+ # Built helpers segfault when using (at least) -march=armv8-a+pauth
+ # (bug #920555, #920568 -- suspected gcc bug). For now, filter all
+ # for simplicity. Override with USE=custom-cflags if wanted, please
+ # report if above -march works again so can cleanup.
+ use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
fi
export NINJA NINJAFLAGS=$(get_NINJAOPTS)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 7337d24a2a37..5e4b82001f05 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -233,6 +233,12 @@ src_configure() {
replace-flags '-g?(gdb)?([2-9])' -g1
ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"
fi
+
+ # Built helpers segfault when using (at least) -march=armv8-a+pauth
+ # (bug #920555, #920568 -- suspected gcc bug). For now, filter all
+ # for simplicity. Override with USE=custom-cflags if wanted, please
+ # report if above -march works again so can cleanup.
+ use arm64 && tc-is-gcc && filter-flags '-march=*' '-mcpu=*'
fi
export NINJA NINJAFLAGS=$(get_NINJAOPTS)
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-12-22 22:40 Mart Raudsepp
0 siblings, 0 replies; 301+ messages in thread
From: Mart Raudsepp @ 2023-12-22 22:40 UTC (permalink / raw
To: gentoo-commits
commit: f0ab893b3a47909cae814c9c7f3c9ccf92d5a2d7
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 22 21:47:31 2023 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Fri Dec 22 22:29:20 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0ab893b
dev-qt/qtwebengine: keyword 6.6.1 for ~arm64
Bug: https://bugs.gentoo.org/907080
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
index 3d763cf8f931..9299373bfe2e 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI+="
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64"
+ KEYWORDS="amd64 ~arm64"
fi
IUSE="
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-12-17 18:29 Arthur Zamarin
0 siblings, 0 replies; 301+ messages in thread
From: Arthur Zamarin @ 2023-12-17 18:29 UTC (permalink / raw
To: gentoo-commits
commit: 30a24715d3ea44375bcb34eecae897cc47fc60cb
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 17 18:26:55 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 17 18:28:22 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30a24715
dev-qt/qtwebengine: Stabilize 6.6.1 amd64, #920154
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
index 891fd475a802..e6288297bd1a 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI+="
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64"
+ KEYWORDS="amd64"
fi
IUSE="
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-12-13 3:12 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2023-12-13 3:12 UTC (permalink / raw
To: gentoo-commits
commit: 1d6e40437171fb8669fd9dddce4dcd3feec6f100
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 13 03:08:39 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Dec 13 03:11:08 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d6e4043
dev-qt/qtwebengine: roughly update size requirements for 6.7
This is chromium 112->118 and is unsurprisingly going up.
May be a bit less with USE=-pdfium but margin won't hurt.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 4 ++--
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
index a97d134205c5..7337d24a2a37 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -129,8 +129,8 @@ qtwebengine_check-reqs() {
ewarn "If run into issues, please try disabling before reporting a bug."
fi
- local CHECKREQS_DISK_BUILD=7G
- local CHECKREQS_DISK_USR=220M
+ local CHECKREQS_DISK_BUILD=8G
+ local CHECKREQS_DISK_USR=360M
if ! has distcc ${FEATURES}; then #830661
# assume ~2GB per job or 1.5GB if clang, possible with less
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index a97d134205c5..7337d24a2a37 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -129,8 +129,8 @@ qtwebengine_check-reqs() {
ewarn "If run into issues, please try disabling before reporting a bug."
fi
- local CHECKREQS_DISK_BUILD=7G
- local CHECKREQS_DISK_USR=220M
+ local CHECKREQS_DISK_BUILD=8G
+ local CHECKREQS_DISK_USR=360M
if ! has distcc ${FEATURES}; then #830661
# assume ~2GB per job or 1.5GB if clang, possible with less
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-12-12 21:25 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2023-12-12 21:25 UTC (permalink / raw
To: gentoo-commits
commit: 228ab5056fe1e5982144c8ef1e12a78891f08a55
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 12 14:29:30 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Dec 12 21:23:49 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=228ab505
dev-qt/qtwebengine: add 6.7.9999
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild | 294 +++++++++++++++++++++++++
1 file changed, 294 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
new file mode 100644
index 000000000000..a97d134205c5
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.9999.ebuild
@@ -0,0 +1,294 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 3.12 needs QTBUG-117979 (see also QTBUG-115512)
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="xml(+)"
+inherit check-reqs flag-o-matic multiprocessing optfeature
+inherit prefix python-any-r1 qt6-build toolchain-funcs
+
+DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
+SRC_URI+="
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.7-patchset-1.tar.xz
+"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64"
+fi
+
+IUSE="
+ +alsa bindist custom-cflags designer geolocation +jumbo-build
+ kerberos opengl pdfium pulseaudio qml screencast +system-icu
+ vaapi vulkan +widgets
+"
+REQUIRED_USE="
+ designer? ( qml widgets )
+"
+
+# dlopen: krb5, libva, pciutils, udev
+RDEPEND="
+ app-arch/snappy:=
+ dev-libs/expat
+ dev-libs/libevent:=
+ dev-libs/libxml2[icu]
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ ~dev-qt/qtbase-${PV}:6[gui,opengl=,vulkan?,widgets?]
+ ~dev-qt/qtwebchannel-${PV}:6[qml?]
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/harfbuzz:=
+ media-libs/lcms:2
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ media-libs/libwebp:=
+ media-libs/openjpeg:2=
+ media-libs/opus
+ media-libs/tiff:=
+ sys-apps/dbus
+ sys-apps/pciutils
+ sys-libs/zlib:=[minizip]
+ virtual/libudev
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXrandr
+ x11-libs/libXtst
+ x11-libs/libxcb:=
+ x11-libs/libxkbcommon
+ x11-libs/libxkbfile
+ alsa? ( media-libs/alsa-lib )
+ designer? ( ~dev-qt/qttools-${PV}:6[designer] )
+ geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
+ kerberos? ( virtual/krb5 )
+ pulseaudio? ( media-libs/libpulse[glib] )
+ qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
+ screencast? (
+ dev-libs/glib:2
+ media-libs/mesa[gbm(+)]
+ media-video/pipewire:=
+ x11-libs/libdrm
+ )
+ system-icu? ( dev-libs/icu:= )
+ vaapi? (
+ media-libs/libva:=[X]
+ media-libs/mesa[gbm(+)]
+ x11-libs/libdrm
+ )
+ !vaapi? ( media-libs/libvpx:= )
+ widgets? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] )
+"
+DEPEND="
+ ${RDEPEND}
+ media-libs/libglvnd
+ x11-base/xorg-proto
+ x11-libs/libxshmfence
+ screencast? ( media-libs/libepoxy[egl(+)] )
+ pdfium? ( net-print/cups )
+ test? (
+ widgets? ( app-text/poppler[cxx(+)] )
+ )
+ vaapi? (
+ vulkan? ( dev-util/vulkan-headers )
+ )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
+ dev-util/gperf
+ net-libs/nodejs[ssl]
+ sys-devel/bison
+ sys-devel/flex
+"
+
+PATCHES=( "${WORKDIR}"/patches/${PN} )
+[[ ${PV} == 6.9999 ]] || # keep for 6.x.9999
+ PATCHES+=( "${WORKDIR}"/patches/chromium )
+
+PATCHES+=(
+ # add extras as needed here, may merge in set if carries across versions
+)
+
+python_check_deps() {
+ python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+}
+
+qtwebengine_check-reqs() {
+ [[ ${MERGE_TYPE} == binary ]] && return
+
+ if is-flagq '-g?(gdb)?([1-9])'; then #307861
+ ewarn
+ ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which"
+ ewarn "is non-trivial with ${PN}. May experience extended compilation"
+ ewarn "times, increased disk/memory usage, and potentially link failure."
+ ewarn
+ ewarn "If run into issues, please try disabling before reporting a bug."
+ fi
+
+ local CHECKREQS_DISK_BUILD=7G
+ local CHECKREQS_DISK_USR=220M
+
+ if ! has distcc ${FEATURES}; then #830661
+ # assume ~2GB per job or 1.5GB if clang, possible with less
+ # depending on free memory and *FLAGS, but prefer being safe as
+ # users having OOM issues with qtwebengine been rather common
+ tc-is-clang && : 15 || : 20
+ local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G
+ fi
+
+ check-reqs_${EBUILD_PHASE_FUNC} #570534
+}
+
+pkg_pretend() {
+ qtwebengine_check-reqs
+}
+
+pkg_setup() {
+ qtwebengine_check-reqs
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ qt6-build_src_prepare
+
+ # for www-plugins/chrome-binary-plugins (widevine) search paths on prefix
+ hprefixify -w /Gentoo/ src/core/content_client_qt.cpp
+
+ # store chromium versions, only used in postinst for a warning
+ local chromium
+ mapfile -t chromium < CHROMIUM_VERSION || die
+ [[ ${chromium[1]} =~ ^Based.*:[^0-9]+([0-9.]+$) ]] &&
+ QT6_CHROMIUM_VER=${BASH_REMATCH[1]} || die
+ [[ ${chromium[2]} =~ ^Patched.+:[^0-9]+([0-9.]+$) ]] &&
+ QT6_CHROMIUM_PATCHES_VER=${BASH_REMATCH[1]} || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(qt_feature pdfium qtpdf_build)
+ $(qt_feature qml qtpdf_quick_build)
+ $(qt_feature widgets qtpdf_widgets_build)
+ $(usev pdfium -DQT_FEATURE_pdf_v8=ON)
+
+ -DQT_FEATURE_qtwebengine_build=ON
+ $(qt_feature qml qtwebengine_quick_build)
+ $(qt_feature widgets qtwebengine_widgets_build)
+
+ $(cmake_use_find_package designer Qt6Designer)
+
+ $(qt_feature alsa webengine_system_alsa)
+ $(qt_feature !bindist webengine_proprietary_codecs)
+ $(qt_feature geolocation webengine_geolocation)
+ $(qt_feature jumbo-build webengine_jumbo_build)
+ $(qt_feature kerberos webengine_kerberos)
+ $(qt_feature pulseaudio webengine_system_pulseaudio)
+ $(qt_feature screencast webengine_webrtc_pipewire)
+ $(qt_feature system-icu webengine_system_icu)
+ $(qt_feature vaapi webengine_vaapi)
+ $(qt_feature vulkan webengine_vulkan)
+ -DQT_FEATURE_webengine_embedded_build=OFF
+ -DQT_FEATURE_webengine_extensions=ON
+ -DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet
+ -DQT_FEATURE_webengine_pepper_plugins=ON
+ -DQT_FEATURE_webengine_printing_and_pdf=ON
+ -DQT_FEATURE_webengine_spellchecker=ON
+ -DQT_FEATURE_webengine_webchannel=ON
+ -DQT_FEATURE_webengine_webrtc=ON
+
+ # needs a modified ffmpeg to be usable, and even then it may not
+ # cooperate with new major ffmpeg versions (bug #831487)
+ -DQT_FEATURE_webengine_system_ffmpeg=OFF
+
+ # use bundled re2 to avoid complications, may revisit
+ # (see discussions in https://github.com/gentoo/gentoo/pull/32281)
+ -DQT_FEATURE_webengine_system_re2=OFF
+
+ # bundled is currently required when using vaapi (forced regardless)
+ $(qt_feature !vaapi webengine_system_libvpx)
+
+ # not necessary to pass these (default), but in case detection fails
+ $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
+ freetype gbm glib harfbuzz lcms2 libevent libjpeg \
+ libopenjpeg2 libpci libpng libtiff libwebp libxml \
+ minizip opus poppler snappy zlib)
+
+ # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
+ -DINSTALL_GN=OFF
+ )
+
+ local mygnargs=(
+ # prefer no dlopen where possible
+ link_pulseaudio=true
+ rtc_link_pipewire=true
+ )
+
+ if use !custom-cflags; then
+ strip-flags # fragile
+
+ if is-flagq '-g?(gdb)?([2-9])'; then #914475
+ replace-flags '-g?(gdb)?([2-9])' -g1
+ ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"
+ fi
+ fi
+
+ export NINJA NINJAFLAGS=$(get_NINJAOPTS)
+ [[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
+
+ local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
+ einfo "Extra Gn args: ${EXTRA_GN}"
+
+ qt6-build_src_configure
+}
+
+src_test() {
+ if [[ ${EUID} == 0 ]]; then
+ # almost every tests fail, so skip entirely
+ ewarn "Skipping tests due to running as root (chromium refuses this configuration)."
+ return
+ fi
+
+ local CMAKE_SKIP_TESTS=(
+ # fails with network sandbox
+ tst_loadsignals
+ tst_qquickwebengineview
+ tst_qwebengineglobalsettings
+ tst_qwebengineview
+ # certs verfication seems flaky and gives expiration warnings
+ tst_qwebengineclientcertificatestore
+ # test is misperformed when qtbase is built USE=-test?
+ tst_touchinput
+ )
+
+ # prevent using the system's qtwebengine
+ # (use glob to avoid unnecessary complications with arch dir)
+ local resources=( "${BUILD_DIR}/src/core/${CMAKE_BUILD_TYPE}/"* )
+ [[ -d ${resources[0]} ]] || die "invalid resources path: ${resources[0]}"
+ local -x QTWEBENGINEPROCESS_PATH=${BUILD_DIR}${QT6_LIBEXECDIR#"${QT6_PREFIX}"}/QtWebEngineProcess
+ local -x QTWEBENGINE_LOCALES_PATH=${resources[0]}/qtwebengine_locales
+ local -x QTWEBENGINE_RESOURCES_PATH=${resources[0]}
+
+ # random failures in several tests without -j1
+ qt6-build_src_test -j1
+}
+
+pkg_postinst() {
+ # plugin may also be found in $HOME if provided by chrome or firefox
+ use amd64 &&
+ optfeature "Widevine DRM support (protected media playback)" \
+ www-plugins/chrome-binary-plugins
+
+ elog
+ elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with"
+ elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. 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
+ 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 "tl;dr your web browsing experience will be compromised."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-11-27 8:47 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2023-11-27 8:47 UTC (permalink / raw
To: gentoo-commits
commit: 840803e11e8265af6e12c375aa9cc05be372e4d8
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 27 06:34:05 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Nov 27 08:45:45 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=840803e1
dev-qt/qtwebengine: add 6.6.1
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild | 294 ++++++++++++++++++++++++++++
2 files changed, 295 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 73f88b4f97ea..c4859e30f9c3 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -7,3 +7,4 @@ DIST qtwebengine-6.6-patchset-3.tar.xz 9920 BLAKE2B 12b287392dabf1f1e3e99381ab1a
DIST qtwebengine-6.6-patchset-5.tar.xz 9520 BLAKE2B 28d620841613b2cc677f7742c35c6b8ffc533e26cb3fd85edd455a5450344594a75f790402ac5bc8d19e8e8aa788d0a3244a3a81d127dbebd53e8224798382c1 SHA512 c0bc470fd25c5a835000618618aad7db17994863304140e73e8e261c620aad512453bdf6fbecf99dfb2e267590003a9730fa2c102db9dfdbd5e931ec850f9f05
DIST qtwebengine-everywhere-src-6.5.3.tar.xz 412372456 BLAKE2B 131b4baf0267e77e1356568867db26fe86af165ddbd9abb5f2c6121e757011f5e18dfc41b30342eebf5d53f54492a20c1c77309782355b369b73c088d2102814 SHA512 8634eac4931fb27a0ded417de901955774d001dc74dc5779b216519b6b79f0a30f0774224abb14dffef779ca9df1cf384f822f9d5190e4d80b9f6ab0d012bc49
DIST qtwebengine-everywhere-src-6.6.0.tar.xz 421117212 BLAKE2B b168913644e07d3d649082a78a03ccfb135960ea61907046f3e16c28471a9684aca4685ea907ed47a27719647ae0d9c753d4faa9e24c9897e88dad24b08bd774 SHA512 30469cf50d84e4547f0cf76b78b921fab550958d812cfcb894cf03ffcd0b1cbd3c1dc9314835ca6b5a182cbabdd236cb315bcc288d999f23c10d7ab0763a6366
+DIST qtwebengine-everywhere-src-6.6.1.tar.xz 421042656 BLAKE2B 6982a1884d66162cc3c8518125c655d60ced9ec9e81670fb2e5b193aab655c4516bbc50d3c774764385fbe372863fdbf3e03a3c35f07dd9c3119880266b3131e SHA512 d1e4f5b664f8aca5e0a5927968be87e29e29172f1256f21dc6a29006258fb2be2be99b5b36c94a08c704580db9fac7defbb37193534129a21ca14a511fcdeea0
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
new file mode 100644
index 000000000000..891fd475a802
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
@@ -0,0 +1,294 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# 3.12 needs QTBUG-117979 (see also QTBUG-115512)
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="xml(+)"
+inherit check-reqs flag-o-matic multiprocessing optfeature
+inherit prefix python-any-r1 qt6-build toolchain-funcs
+
+DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
+SRC_URI+="
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.6-patchset-5.tar.xz
+"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64"
+fi
+
+IUSE="
+ +alsa bindist custom-cflags designer geolocation +jumbo-build
+ kerberos opengl pdfium pulseaudio qml screencast +system-icu
+ vaapi vulkan +widgets
+"
+REQUIRED_USE="
+ designer? ( qml widgets )
+"
+
+# dlopen: krb5, libva, pciutils, udev
+RDEPEND="
+ app-arch/snappy:=
+ dev-libs/expat
+ dev-libs/libevent:=
+ dev-libs/libxml2[icu]
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ ~dev-qt/qtbase-${PV}:6[gui,opengl=,vulkan?,widgets?]
+ ~dev-qt/qtwebchannel-${PV}:6[qml?]
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/harfbuzz:=
+ media-libs/lcms:2
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ media-libs/libwebp:=
+ media-libs/openjpeg:2=
+ media-libs/opus
+ media-libs/tiff:=
+ sys-apps/dbus
+ sys-apps/pciutils
+ sys-libs/zlib:=[minizip]
+ virtual/libudev
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXrandr
+ x11-libs/libXtst
+ x11-libs/libxcb:=
+ x11-libs/libxkbcommon
+ x11-libs/libxkbfile
+ alsa? ( media-libs/alsa-lib )
+ designer? ( ~dev-qt/qttools-${PV}:6[designer] )
+ geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
+ kerberos? ( virtual/krb5 )
+ pulseaudio? ( media-libs/libpulse[glib] )
+ qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
+ screencast? (
+ dev-libs/glib:2
+ media-libs/mesa[gbm(+)]
+ media-video/pipewire:=
+ x11-libs/libdrm
+ )
+ system-icu? ( dev-libs/icu:= )
+ vaapi? (
+ media-libs/libva:=[X]
+ media-libs/mesa[gbm(+)]
+ x11-libs/libdrm
+ )
+ !vaapi? ( media-libs/libvpx:= )
+ widgets? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] )
+"
+DEPEND="
+ ${RDEPEND}
+ media-libs/libglvnd
+ x11-base/xorg-proto
+ x11-libs/libxshmfence
+ screencast? ( media-libs/libepoxy[egl(+)] )
+ pdfium? ( net-print/cups )
+ test? (
+ widgets? ( app-text/poppler[cxx(+)] )
+ )
+ vaapi? (
+ vulkan? ( dev-util/vulkan-headers )
+ )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
+ dev-util/gperf
+ net-libs/nodejs[ssl]
+ sys-devel/bison
+ sys-devel/flex
+"
+
+PATCHES=( "${WORKDIR}"/patches/${PN} )
+[[ ${PV} == 6.9999 ]] || # keep for 6.x.9999
+ PATCHES+=( "${WORKDIR}"/patches/chromium )
+
+PATCHES+=(
+ # add extras as needed here, may merge in set if carries across versions
+)
+
+python_check_deps() {
+ python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+}
+
+qtwebengine_check-reqs() {
+ [[ ${MERGE_TYPE} == binary ]] && return
+
+ if is-flagq '-g?(gdb)?([1-9])'; then #307861
+ ewarn
+ ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which"
+ ewarn "is non-trivial with ${PN}. May experience extended compilation"
+ ewarn "times, increased disk/memory usage, and potentially link failure."
+ ewarn
+ ewarn "If run into issues, please try disabling before reporting a bug."
+ fi
+
+ local CHECKREQS_DISK_BUILD=7G
+ local CHECKREQS_DISK_USR=220M
+
+ if ! has distcc ${FEATURES}; then #830661
+ # assume ~2GB per job or 1.5GB if clang, possible with less
+ # depending on free memory and *FLAGS, but prefer being safe as
+ # users having OOM issues with qtwebengine been rather common
+ tc-is-clang && : 15 || : 20
+ local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G
+ fi
+
+ check-reqs_${EBUILD_PHASE_FUNC} #570534
+}
+
+pkg_pretend() {
+ qtwebengine_check-reqs
+}
+
+pkg_setup() {
+ qtwebengine_check-reqs
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ qt6-build_src_prepare
+
+ # for www-plugins/chrome-binary-plugins (widevine) search paths on prefix
+ hprefixify -w /Gentoo/ src/core/content_client_qt.cpp
+
+ # store chromium versions, only used in postinst for a warning
+ local chromium
+ mapfile -t chromium < CHROMIUM_VERSION || die
+ [[ ${chromium[1]} =~ ^Based.*:[^0-9]+([0-9.]+$) ]] &&
+ QT6_CHROMIUM_VER=${BASH_REMATCH[1]} || die
+ [[ ${chromium[2]} =~ ^Patched.+:[^0-9]+([0-9.]+$) ]] &&
+ QT6_CHROMIUM_PATCHES_VER=${BASH_REMATCH[1]} || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(qt_feature pdfium qtpdf_build)
+ $(qt_feature qml qtpdf_quick_build)
+ $(qt_feature widgets qtpdf_widgets_build)
+ $(usev pdfium -DQT_FEATURE_pdf_v8=ON)
+
+ -DQT_FEATURE_qtwebengine_build=ON
+ $(qt_feature qml qtwebengine_quick_build)
+ $(qt_feature widgets qtwebengine_widgets_build)
+
+ $(cmake_use_find_package designer Qt6Designer)
+
+ $(qt_feature alsa webengine_system_alsa)
+ $(qt_feature !bindist webengine_proprietary_codecs)
+ $(qt_feature geolocation webengine_geolocation)
+ $(qt_feature jumbo-build webengine_jumbo_build)
+ $(qt_feature kerberos webengine_kerberos)
+ $(qt_feature pulseaudio webengine_system_pulseaudio)
+ $(qt_feature screencast webengine_webrtc_pipewire)
+ $(qt_feature system-icu webengine_system_icu)
+ $(qt_feature vaapi webengine_vaapi)
+ $(qt_feature vulkan webengine_vulkan)
+ -DQT_FEATURE_webengine_embedded_build=OFF
+ -DQT_FEATURE_webengine_extensions=ON
+ -DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet
+ -DQT_FEATURE_webengine_pepper_plugins=ON
+ -DQT_FEATURE_webengine_printing_and_pdf=ON
+ -DQT_FEATURE_webengine_spellchecker=ON
+ -DQT_FEATURE_webengine_webchannel=ON
+ -DQT_FEATURE_webengine_webrtc=ON
+
+ # needs a modified ffmpeg to be usable, and even then it may not
+ # cooperate with new major ffmpeg versions (bug #831487)
+ -DQT_FEATURE_webengine_system_ffmpeg=OFF
+
+ # use bundled re2 to avoid complications, may revisit
+ # (see discussions in https://github.com/gentoo/gentoo/pull/32281)
+ -DQT_FEATURE_webengine_system_re2=OFF
+
+ # bundled is currently required when using vaapi (forced regardless)
+ $(qt_feature !vaapi webengine_system_libvpx)
+
+ # not necessary to pass these (default), but in case detection fails
+ $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
+ freetype glib harfbuzz lcms2 libevent libjpeg \
+ libopenjpeg2 libpci libpng libtiff libwebp \
+ libxml minizip opus poppler snappy zlib)
+
+ # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
+ -DINSTALL_GN=OFF
+ )
+
+ local mygnargs=(
+ # prefer no dlopen where possible
+ link_pulseaudio=true
+ rtc_link_pipewire=true
+ )
+
+ if use !custom-cflags; then
+ strip-flags # fragile
+
+ if is-flagq '-g?(gdb)?([2-9])'; then #914475
+ replace-flags '-g?(gdb)?([2-9])' -g1
+ ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"
+ fi
+ fi
+
+ export NINJA NINJAFLAGS=$(get_NINJAOPTS)
+ [[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
+
+ local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
+ einfo "Extra Gn args: ${EXTRA_GN}"
+
+ qt6-build_src_configure
+}
+
+src_test() {
+ if [[ ${EUID} == 0 ]]; then
+ # almost every tests fail, so skip entirely
+ ewarn "Skipping tests due to running as root (chromium refuses this configuration)."
+ return
+ fi
+
+ local CMAKE_SKIP_TESTS=(
+ # fails with network sandbox
+ tst_loadsignals
+ tst_qquickwebengineview
+ tst_qwebengineglobalsettings
+ tst_qwebengineview
+ # certs verfication seems flaky and gives expiration warnings
+ tst_qwebengineclientcertificatestore
+ # test is misperformed when qtbase is built USE=-test?
+ tst_touchinput
+ )
+
+ # prevent using the system's qtwebengine
+ # (use glob to avoid unnecessary complications with arch dir)
+ local resources=( "${BUILD_DIR}/src/core/${CMAKE_BUILD_TYPE}/"* )
+ [[ -d ${resources[0]} ]] || die "invalid resources path: ${resources[0]}"
+ local -x QTWEBENGINEPROCESS_PATH=${BUILD_DIR}${QT6_LIBEXECDIR#"${QT6_PREFIX}"}/QtWebEngineProcess
+ local -x QTWEBENGINE_LOCALES_PATH=${resources[0]}/qtwebengine_locales
+ local -x QTWEBENGINE_RESOURCES_PATH=${resources[0]}
+
+ # random failures in several tests without -j1
+ qt6-build_src_test -j1
+}
+
+pkg_postinst() {
+ # plugin may also be found in $HOME if provided by chrome or firefox
+ use amd64 &&
+ optfeature "Widevine DRM support (protected media playback)" \
+ www-plugins/chrome-binary-plugins
+
+ elog
+ elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with"
+ elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. 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
+ 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 "tl;dr your web browsing experience will be compromised."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-11-27 8:47 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2023-11-27 8:47 UTC (permalink / raw
To: gentoo-commits
commit: 36c5af4d1347a501980f8eee91ae6c90a887f9d2
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 27 06:31:07 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Nov 27 08:45:45 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36c5af4d
dev-qt/qtwebengine: update patchset for 6.6 live branch
6.6-4 -> 6.6-5 changes:
Added:
* icu74.patch (imported from filesdir)
* libxml2-2.12.patch (imported from filesdir)
Imagine may be fixed in 6.6.2, but add just to allow cleaning
these up later given 6.6.1 is a stable candidate while others
are due to be dropped.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 2 +-
dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 4 +---
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 9505a11686f3..73f88b4f97ea 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -4,6 +4,6 @@ DIST qtwebengine-5.15.11_p20231120.tar.xz 299212012 BLAKE2B 4f9fc9e3f380377f1eea
DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
DIST qtwebengine-6.5-patchset-1.tar.xz 12936 BLAKE2B f44af36689596da0177f0607cf242d9cce3c376f4a5c28d7902a6b44651ce9272d745a824580268e999c2d58b72424d72eb6027d7461184bf7f04e0223e5195f SHA512 f639eb09d18c19c7b0d422d6acdce62404be0fcce905374c5d47266340191f7ca66875680bb09d80e72db718e34b7dc6e7db5f2f16407a0edb892930513ea407
DIST qtwebengine-6.6-patchset-3.tar.xz 9920 BLAKE2B 12b287392dabf1f1e3e99381ab1abf7e8fe44d85fb1b7148bc2d3427ff82d91e0d545955ee7c326f4d5e5af739759df2246173151673dabce3aa8aec28c4ecd8 SHA512 371549b2a2577872700842cc7f93cca900499b99de62f297a012fb16ccbb9d7c1f87a0123996ab14a49adf5604018000615736a8cc728122d37012ec6838211f
-DIST qtwebengine-6.6-patchset-4.tar.xz 8744 BLAKE2B 5afd81336718c3c2d72ee5e8045157cbfded8295ef914cdab3ffd84c8d53e03a2134d17b9ed4ecacc4ae00d734b1c4e81b0e24676cf5d73fa9d13b4147a2083b SHA512 6317d5586509c93056216a5d8afec68d3edd4456c7c1973e2572c968de7ad71383799b5ab75432b2156b82699f43c205a61f017c9a053b9625beaf3ff4018690
+DIST qtwebengine-6.6-patchset-5.tar.xz 9520 BLAKE2B 28d620841613b2cc677f7742c35c6b8ffc533e26cb3fd85edd455a5450344594a75f790402ac5bc8d19e8e8aa788d0a3244a3a81d127dbebd53e8224798382c1 SHA512 c0bc470fd25c5a835000618618aad7db17994863304140e73e8e261c620aad512453bdf6fbecf99dfb2e267590003a9730fa2c102db9dfdbd5e931ec850f9f05
DIST qtwebengine-everywhere-src-6.5.3.tar.xz 412372456 BLAKE2B 131b4baf0267e77e1356568867db26fe86af165ddbd9abb5f2c6121e757011f5e18dfc41b30342eebf5d53f54492a20c1c77309782355b369b73c088d2102814 SHA512 8634eac4931fb27a0ded417de901955774d001dc74dc5779b216519b6b79f0a30f0774224abb14dffef779ca9df1cf384f822f9d5190e4d80b9f6ab0d012bc49
DIST qtwebengine-everywhere-src-6.6.0.tar.xz 421117212 BLAKE2B b168913644e07d3d649082a78a03ccfb135960ea61907046f3e16c28471a9684aca4685ea907ed47a27719647ae0d9c753d4faa9e24c9897e88dad24b08bd774 SHA512 30469cf50d84e4547f0cf76b78b921fab550958d812cfcb894cf03ffcd0b1cbd3c1dc9314835ca6b5a182cbabdd236cb315bcc288d999f23c10d7ab0763a6366
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
index 1e5d91078bc4..891fd475a802 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
@@ -11,7 +11,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs
DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
SRC_URI+="
- https://dev.gentoo.org/~ionen/distfiles/${PN}-6.6-patchset-4.tar.xz
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.6-patchset-5.tar.xz
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
@@ -111,8 +111,6 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
PATCHES+=(
# add extras as needed here, may merge in set if carries across versions
- "${FILESDIR}"/${PN}-6.5.3-icu74.patch
- "${FILESDIR}"/${PN}-6.5.3-libxml2-2.12.patch
)
python_check_deps() {
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 00c8ec9e619c..891fd475a802 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -11,7 +11,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs
DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
SRC_URI+="
- https://dev.gentoo.org/~ionen/distfiles/${PN}-6.6-patchset-4.tar.xz
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.6-patchset-5.tar.xz
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-11-25 16:12 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2023-11-25 16:12 UTC (permalink / raw
To: gentoo-commits
commit: 6616f0c736292450b52fe503cc1a904e55947ded
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 25 16:11:02 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 25 16:11:29 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6616f0c7
dev-qt/qtwebengine: Cleanup vulnerable 5.15.11_p20231102
Bug: https://bugs.gentoo.org/915465
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 -
.../qtwebengine-5.15.11_p20231102.ebuild | 283 ---------------------
2 files changed, 284 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index ed57417f7e02..9505a11686f3 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,6 +1,5 @@
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.11_p20231102.tar.xz 299223768 BLAKE2B f0c3e00e2b266d54bf4239ca15c1dff1142f5d49c70780e7774ad3503dedd257430f17966d61ca78e9f9b7c53f0775a3f4ce3a5cb58b0b2d1bd839e84d097d8c SHA512 124e3291a444416a1e92edd35b90d769428ab027d2c5b1e0a38ddc3f3d95c1d1817173eef9fe2dfc415775185d66dc1a9248b89b4a3d47843a5e40f2e70579eb
DIST qtwebengine-5.15.11_p20231120.tar.xz 299212012 BLAKE2B 4f9fc9e3f380377f1eeaa8b04c6622c9e25d8b11151cccf7a04ef7dea88e4870db704dda3b303196e40bc8c1c6e76f495f911de5a74769b633952e35718a85de SHA512 2d64edf0ec5322e25a6decfd92a1b1170135c852a8d154d30a336b894bfc4c24f08cb5c88028c68a4f74e6bd6767aaf827a5fa08a82a70fd49e1fa064ee56f27
DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
DIST qtwebengine-6.5-patchset-1.tar.xz 12936 BLAKE2B f44af36689596da0177f0607cf242d9cce3c376f4a5c28d7902a6b44651ce9272d745a824580268e999c2d58b72424d72eb6027d7461184bf7f04e0223e5195f SHA512 f639eb09d18c19c7b0d422d6acdce62404be0fcce905374c5d47266340191f7ca66875680bb09d80e72db718e34b7dc6e7db5f2f16407a0edb892930513ea407
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231102.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231102.ebuild
deleted file mode 100644
index 8f6ad0f016b1..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231102.ebuild
+++ /dev/null
@@ -1,283 +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
-# 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
- )"
-
-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}"
- # add extras as needed here, may merge in set if carries across versions
- "${FILESDIR}"/${PN}-6.5.3-icu74.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() {
- # 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
-
- 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() {
- 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."
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-11-23 8:16 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2023-11-23 8:16 UTC (permalink / raw
To: gentoo-commits
commit: acecd249d7afa6abc8982334c918d409b2785bdb
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 22 18:54:53 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Nov 23 08:04:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acecd249
dev-qt/qtwebengine: skip tst_touchinput (qt6)
Thought hit a 6.6.1 regression while using 6.6.9999 after had rebuilt
the qt stack without tests, but turns out qtbase[test] vs [-test] seems
to affect this test.
Given most people running tests with qtwebengine likely enable for the
rest of the qt stack, seems went overlooked.
Failure itself is trivial, it is likely the test being performed badly
(fake touch and hold text selection event) rather than an actual
runtime problem. Let's just skip for now to avoid issues when attempt
to keyword this by itself.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild | 2 ++
dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild | 2 ++
dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 2 ++
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 2 ++
4 files changed, 8 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild
index bdf9b8771048..5d33443cde3c 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild
@@ -247,6 +247,8 @@ src_test() {
tst_qwebengineview
# certs verfication seems flaky and gives expiration warnings
tst_qwebengineclientcertificatestore
+ # test is misperformed when qtbase is built USE=-test?
+ tst_touchinput
)
# prevent using the system's qtwebengine
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild
index 0ec96bb955e3..c7b571e9fa5e 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild
@@ -260,6 +260,8 @@ src_test() {
tst_qwebengineview
# certs verfication seems flaky and gives expiration warnings
tst_qwebengineclientcertificatestore
+ # test is misperformed when qtbase is built USE=-test?
+ tst_touchinput
)
# prevent using the system's qtwebengine
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
index a9ffd7a62755..1e5d91078bc4 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
@@ -261,6 +261,8 @@ src_test() {
tst_qwebengineview
# certs verfication seems flaky and gives expiration warnings
tst_qwebengineclientcertificatestore
+ # test is misperformed when qtbase is built USE=-test?
+ tst_touchinput
)
# prevent using the system's qtwebengine
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 09fe7ac6df06..00c8ec9e619c 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -259,6 +259,8 @@ src_test() {
tst_qwebengineview
# certs verfication seems flaky and gives expiration warnings
tst_qwebengineclientcertificatestore
+ # test is misperformed when qtbase is built USE=-test?
+ tst_touchinput
)
# prevent using the system's qtwebengine
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-11-22 15:21 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2023-11-22 15:21 UTC (permalink / raw
To: gentoo-commits
commit: 703e80d54161df80220ec80aa42fc2847dba04bb
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 22 14:03:18 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 15:20:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=703e80d5
dev-qt/qtwebengine: adjust re2 comment (qt6)
Just so use of the word does not get outdated.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild
index 0ad7cbecdb1b..bdf9b8771048 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild
@@ -195,7 +195,7 @@ src_configure() {
# cooperate with new major ffmpeg versions (bug #831487)
-DQT_FEATURE_webengine_system_ffmpeg=OFF
- # preemptively using bundled to avoid complications, may revisit
+ # use bundled re2 to avoid complications, may revisit
# (see discussions in https://github.com/gentoo/gentoo/pull/32281)
-DQT_FEATURE_webengine_system_re2=OFF
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild
index c1271196f83f..0ec96bb955e3 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild
@@ -204,7 +204,7 @@ src_configure() {
# cooperate with new major ffmpeg versions (bug #831487)
-DQT_FEATURE_webengine_system_ffmpeg=OFF
- # preemptively using bundled to avoid complications, may revisit
+ # use bundled re2 to avoid complications, may revisit
# (see discussions in https://github.com/gentoo/gentoo/pull/32281)
-DQT_FEATURE_webengine_system_re2=OFF
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
index 8154731705b2..70360020f177 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
@@ -204,7 +204,7 @@ src_configure() {
# cooperate with new major ffmpeg versions (bug #831487)
-DQT_FEATURE_webengine_system_ffmpeg=OFF
- # preemptively using bundled to avoid complications, may revisit
+ # use bundled re2 to avoid complications, may revisit
# (see discussions in https://github.com/gentoo/gentoo/pull/32281)
-DQT_FEATURE_webengine_system_re2=OFF
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index b44e003cb94e..9538c788489b 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -202,7 +202,7 @@ src_configure() {
# cooperate with new major ffmpeg versions (bug #831487)
-DQT_FEATURE_webengine_system_ffmpeg=OFF
- # preemptively using bundled to avoid complications, may revisit
+ # use bundled re2 to avoid complications, may revisit
# (see discussions in https://github.com/gentoo/gentoo/pull/32281)
-DQT_FEATURE_webengine_system_re2=OFF
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-11-22 15:21 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2023-11-22 15:21 UTC (permalink / raw
To: gentoo-commits
commit: 2df8e509b4de043ed8492d3fbb8a442d0e64932e
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 22 13:59:43 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 15:20:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2df8e509
dev-qt/qtwebengine: enable v8 for pdfium in live (qt6)
Seeing little reason to lack support or make it optional given
need using v8 for webengine either way.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 1 +
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
index 70360020f177..a9ffd7a62755 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
@@ -174,6 +174,7 @@ src_configure() {
$(qt_feature pdfium qtpdf_build)
$(qt_feature qml qtpdf_quick_build)
$(qt_feature widgets qtpdf_widgets_build)
+ $(usev pdfium -DQT_FEATURE_pdf_v8=ON)
-DQT_FEATURE_qtwebengine_build=ON
$(qt_feature qml qtwebengine_quick_build)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 9538c788489b..09fe7ac6df06 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -172,6 +172,7 @@ src_configure() {
$(qt_feature pdfium qtpdf_build)
$(qt_feature qml qtpdf_quick_build)
$(qt_feature widgets qtpdf_widgets_build)
+ $(usev pdfium -DQT_FEATURE_pdf_v8=ON)
-DQT_FEATURE_qtwebengine_build=ON
$(qt_feature qml qtwebengine_quick_build)
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-11-21 21:25 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2023-11-21 21:25 UTC (permalink / raw
To: gentoo-commits
commit: 5f618bfe529fb29c23ff3913c6251cbf82a621c1
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 21 16:47:15 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Nov 21 21:24:50 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f618bfe
dev-qt/qtwebengine: update patchset for 6.6 live branch
In preparation for approaching 6.6.1 release.
6.6-3 -> 6.6-4 changes:
Removed:
* ffmpeg-binutils-2.41.patch (upstreamed)
* libvpx-CVE-2023-5217.patch (upstreamed)
Not adding icu74 patch, still waiting to see how it goes
upstream (should be hopefully short lived either way).
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 2 +-
dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 1abbb7b65351..72510429d777 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -3,7 +3,7 @@ DIST qtwebengine-5.15.10_p20230815-patchset.tar.xz 44880 BLAKE2B 6179ca4ad69f922
DIST qtwebengine-5.15.11_p20231102.tar.xz 299223768 BLAKE2B f0c3e00e2b266d54bf4239ca15c1dff1142f5d49c70780e7774ad3503dedd257430f17966d61ca78e9f9b7c53f0775a3f4ce3a5cb58b0b2d1bd839e84d097d8c SHA512 124e3291a444416a1e92edd35b90d769428ab027d2c5b1e0a38ddc3f3d95c1d1817173eef9fe2dfc415775185d66dc1a9248b89b4a3d47843a5e40f2e70579eb
DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
DIST qtwebengine-6.5-patchset-1.tar.xz 12936 BLAKE2B f44af36689596da0177f0607cf242d9cce3c376f4a5c28d7902a6b44651ce9272d745a824580268e999c2d58b72424d72eb6027d7461184bf7f04e0223e5195f SHA512 f639eb09d18c19c7b0d422d6acdce62404be0fcce905374c5d47266340191f7ca66875680bb09d80e72db718e34b7dc6e7db5f2f16407a0edb892930513ea407
-DIST qtwebengine-6.6-patchset-1.tar.xz 9648 BLAKE2B c1bb02662ed5952e22ac3c3ee68f5787503bcc6d12d05c22090cf9ba22511c76308aa1bb751df0a822585de63694f8ce0f254558416e392abe437995e30b7e99 SHA512 a634a2976bc19ada61671bc017a4456111214cc47a40c88812465f0ba25d025b3aa4da32467c59f7053d21650f3ac72010118b3b6962d34bb347d42b9109f95f
DIST qtwebengine-6.6-patchset-3.tar.xz 9920 BLAKE2B 12b287392dabf1f1e3e99381ab1abf7e8fe44d85fb1b7148bc2d3427ff82d91e0d545955ee7c326f4d5e5af739759df2246173151673dabce3aa8aec28c4ecd8 SHA512 371549b2a2577872700842cc7f93cca900499b99de62f297a012fb16ccbb9d7c1f87a0123996ab14a49adf5604018000615736a8cc728122d37012ec6838211f
+DIST qtwebengine-6.6-patchset-4.tar.xz 8744 BLAKE2B 5afd81336718c3c2d72ee5e8045157cbfded8295ef914cdab3ffd84c8d53e03a2134d17b9ed4ecacc4ae00d734b1c4e81b0e24676cf5d73fa9d13b4147a2083b SHA512 6317d5586509c93056216a5d8afec68d3edd4456c7c1973e2572c968de7ad71383799b5ab75432b2156b82699f43c205a61f017c9a053b9625beaf3ff4018690
DIST qtwebengine-everywhere-src-6.5.3.tar.xz 412372456 BLAKE2B 131b4baf0267e77e1356568867db26fe86af165ddbd9abb5f2c6121e757011f5e18dfc41b30342eebf5d53f54492a20c1c77309782355b369b73c088d2102814 SHA512 8634eac4931fb27a0ded417de901955774d001dc74dc5779b216519b6b79f0a30f0774224abb14dffef779ca9df1cf384f822f9d5190e4d80b9f6ab0d012bc49
DIST qtwebengine-everywhere-src-6.6.0.tar.xz 421117212 BLAKE2B b168913644e07d3d649082a78a03ccfb135960ea61907046f3e16c28471a9684aca4685ea907ed47a27719647ae0d9c753d4faa9e24c9897e88dad24b08bd774 SHA512 30469cf50d84e4547f0cf76b78b921fab550958d812cfcb894cf03ffcd0b1cbd3c1dc9314835ca6b5a182cbabdd236cb315bcc288d999f23c10d7ab0763a6366
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
index d7f460872c21..b5b6023bdcaf 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
@@ -11,7 +11,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs
DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
SRC_URI+="
- https://dev.gentoo.org/~ionen/distfiles/${PN}-6.6-patchset-3.tar.xz
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.6-patchset-4.tar.xz
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 3d5179796e93..b44e003cb94e 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -11,7 +11,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs
DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
SRC_URI+="
- https://dev.gentoo.org/~ionen/distfiles/${PN}-6.6-patchset-1.tar.xz
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.6-patchset-4.tar.xz
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-11-21 19:53 Sam James
0 siblings, 0 replies; 301+ messages in thread
From: Sam James @ 2023-11-21 19:53 UTC (permalink / raw
To: gentoo-commits
commit: 659cf630a77405d45f76d4aa75fbb05d049bc630
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Tue Nov 21 12:02:52 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 21 19:52:11 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=659cf630
dev-qt/qtwebengine: fix build with icu74 (qt5)
Apply quick-fix from b7982facbd6d596888e100c11b07fff5599e2203 to qt5 as
well.
Closes: https://bugs.gentoo.org/917635
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33926
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.11_p20231102.ebuild | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231102.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231102.ebuild
index 6839c81f4377..8f6ad0f016b1 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231102.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231102.ebuild
@@ -105,7 +105,11 @@ BDEPEND="${PYTHON_DEPS}
ppc64? ( >=dev-util/gn-0.1807 )
"
-PATCHES=( "${WORKDIR}/${PATCHSET}" )
+PATCHES=(
+ "${WORKDIR}/${PATCHSET}"
+ # add extras as needed here, may merge in set if carries across versions
+ "${FILESDIR}"/${PN}-6.5.3-icu74.patch
+)
qtwebengine_check-reqs() {
# bug #307861
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-11-15 19:28 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2023-11-15 19:28 UTC (permalink / raw
To: gentoo-commits
commit: 97ad64692e57cd0c056188385a98c38fe9b76b20
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 15 18:01:01 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Nov 15 19:27:58 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97ad6469
dev-qt/qtwebengine: drop 6.5.2-r1
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 -
dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild | 277 -------------------------
2 files changed, 278 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 4ca85b8bbb71..1abbb7b65351 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -5,6 +5,5 @@ DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3
DIST qtwebengine-6.5-patchset-1.tar.xz 12936 BLAKE2B f44af36689596da0177f0607cf242d9cce3c376f4a5c28d7902a6b44651ce9272d745a824580268e999c2d58b72424d72eb6027d7461184bf7f04e0223e5195f SHA512 f639eb09d18c19c7b0d422d6acdce62404be0fcce905374c5d47266340191f7ca66875680bb09d80e72db718e34b7dc6e7db5f2f16407a0edb892930513ea407
DIST qtwebengine-6.6-patchset-1.tar.xz 9648 BLAKE2B c1bb02662ed5952e22ac3c3ee68f5787503bcc6d12d05c22090cf9ba22511c76308aa1bb751df0a822585de63694f8ce0f254558416e392abe437995e30b7e99 SHA512 a634a2976bc19ada61671bc017a4456111214cc47a40c88812465f0ba25d025b3aa4da32467c59f7053d21650f3ac72010118b3b6962d34bb347d42b9109f95f
DIST qtwebengine-6.6-patchset-3.tar.xz 9920 BLAKE2B 12b287392dabf1f1e3e99381ab1abf7e8fe44d85fb1b7148bc2d3427ff82d91e0d545955ee7c326f4d5e5af739759df2246173151673dabce3aa8aec28c4ecd8 SHA512 371549b2a2577872700842cc7f93cca900499b99de62f297a012fb16ccbb9d7c1f87a0123996ab14a49adf5604018000615736a8cc728122d37012ec6838211f
-DIST qtwebengine-everywhere-src-6.5.2.tar.xz 412356700 BLAKE2B a48a513cffbf140aab08d748bc7826e841b7e1a87d113abbd0d8e7df5b9eb1ff2a44b89ae341c161eae26fd004699a1392f811252eb25aa13e0ce8e08f6be0a1 SHA512 f5791002495ebfa9912477f39a96d28bd4f4329f636f6b2055f1b811503b3c394c3ddd7baed5643f78f1905b1e8f860b4202b5d8e4afe5791e5450b9f46eac12
DIST qtwebengine-everywhere-src-6.5.3.tar.xz 412372456 BLAKE2B 131b4baf0267e77e1356568867db26fe86af165ddbd9abb5f2c6121e757011f5e18dfc41b30342eebf5d53f54492a20c1c77309782355b369b73c088d2102814 SHA512 8634eac4931fb27a0ded417de901955774d001dc74dc5779b216519b6b79f0a30f0774224abb14dffef779ca9df1cf384f822f9d5190e4d80b9f6ab0d012bc49
DIST qtwebengine-everywhere-src-6.6.0.tar.xz 421117212 BLAKE2B b168913644e07d3d649082a78a03ccfb135960ea61907046f3e16c28471a9684aca4685ea907ed47a27719647ae0d9c753d4faa9e24c9897e88dad24b08bd774 SHA512 30469cf50d84e4547f0cf76b78b921fab550958d812cfcb894cf03ffcd0b1cbd3c1dc9314835ca6b5a182cbabdd236cb315bcc288d999f23c10d7ab0763a6366
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
deleted file mode 100644
index 4e6a0bddbc50..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# 3.12 needs QTBUG-117979 (see also QTBUG-115512)
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="xml(+)"
-inherit check-reqs flag-o-matic multiprocessing optfeature
-inherit prefix python-any-r1 qt6-build toolchain-funcs
-
-DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
-SRC_URI+="
- https://dev.gentoo.org/~ionen/distfiles/${PN}-6.5-patchset-1.tar.xz
-"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64"
-fi
-
-IUSE="
- +alsa bindist custom-cflags designer geolocation +jumbo-build kerberos
- opengl pulseaudio qml screencast +system-icu vulkan +widgets
-"
-REQUIRED_USE="
- designer? ( qml widgets )
-"
-
-# dlopen: krb5, pciutils, udev
-RDEPEND="
- app-arch/snappy:=
- dev-libs/expat
- dev-libs/libevent:=
- dev-libs/libxml2[icu]
- dev-libs/libxslt
- dev-libs/nspr
- dev-libs/nss
- ~dev-qt/qtbase-${PV}:6[gui,opengl=,vulkan?,widgets?]
- ~dev-qt/qtwebchannel-${PV}:6[qml?]
- media-libs/fontconfig
- media-libs/freetype
- media-libs/harfbuzz:=
- media-libs/lcms:2
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- media-libs/libvpx:=
- media-libs/libwebp:=
- media-libs/openjpeg:2=
- media-libs/opus
- sys-apps/dbus
- sys-apps/pciutils
- sys-libs/zlib:=[minizip]
- virtual/libudev
- x11-libs/libX11
- x11-libs/libXcomposite
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXrandr
- x11-libs/libXtst
- x11-libs/libxcb:=
- x11-libs/libxkbcommon
- x11-libs/libxkbfile
- alsa? ( media-libs/alsa-lib )
- designer? ( ~dev-qt/qttools-${PV}:6[designer] )
- geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
- kerberos? ( virtual/krb5 )
- pulseaudio? ( media-libs/libpulse[glib] )
- qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
- screencast? (
- dev-libs/glib:2
- media-libs/mesa[gbm(+)]
- media-video/pipewire:=
- x11-libs/libdrm
- )
- system-icu? ( dev-libs/icu:= )
- widgets? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] )
-"
-DEPEND="
- ${RDEPEND}
- media-libs/libglvnd
- x11-base/xorg-proto
- x11-libs/libxshmfence
- screencast? ( media-libs/libepoxy[egl(+)] )
- test? (
- widgets? ( app-text/poppler[cxx(+)] )
- )
-"
-BDEPEND="
- $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
- dev-util/gperf
- net-libs/nodejs[ssl]
- sys-devel/bison
- sys-devel/flex
-"
-
-PATCHES=( "${WORKDIR}"/patches/${PN} )
-[[ ${PV} == 6.9999 ]] || # keep for 6.x.9999
- PATCHES+=( "${WORKDIR}"/patches/chromium )
-
-PATCHES+=(
- # add extras as needed here, may merge in set if carries across versions
- "${FILESDIR}"/${PN}-6.5.2-libcxx17.patch
- "${FILESDIR}"/${PN}-6.5.2-cstdint.patch
-)
-
-python_check_deps() {
- python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
-}
-
-qtwebengine_check-reqs() {
- [[ ${MERGE_TYPE} == binary ]] && return
-
- if is-flagq '-g?(gdb)?([1-9])'; then #307861
- ewarn
- ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which"
- ewarn "is non-trivial with ${PN}. May experience extended compilation"
- ewarn "times, increased disk/memory usage, and potentially link failure."
- ewarn
- ewarn "If run into issues, please try disabling before reporting a bug."
- fi
-
- local CHECKREQS_DISK_BUILD=7G
- local CHECKREQS_DISK_USR=220M
-
- if ! has distcc ${FEATURES}; then #830661
- # assume ~2GB per job or 1.5GB if clang, possible with less
- # depending on free memory and *FLAGS, but prefer being safe as
- # users having OOM issues with qtwebengine been rather common
- tc-is-clang && : 15 || : 20
- local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G
- fi
-
- check-reqs_${EBUILD_PHASE_FUNC} #570534
-}
-
-pkg_pretend() {
- qtwebengine_check-reqs
-}
-
-pkg_setup() {
- qtwebengine_check-reqs
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- qt6-build_src_prepare
-
- # for www-plugins/chrome-binary-plugins (widevine) search paths on prefix
- hprefixify -w /Gentoo/ src/core/content_client_qt.cpp
-
- # store chromium versions, only used in postinst for a warning
- local chromium
- mapfile -t chromium < CHROMIUM_VERSION || die
- [[ ${chromium[1]} =~ ^Based.*:[^0-9]+([0-9.]+$) ]] &&
- QT6_CHROMIUM_VER=${BASH_REMATCH[1]} || die
- [[ ${chromium[2]} =~ ^Patched.+:[^0-9]+([0-9.]+$) ]] &&
- QT6_CHROMIUM_PATCHES_VER=${BASH_REMATCH[1]} || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DQT_FEATURE_qtpdf_build=OFF # TODO?
- -DQT_FEATURE_qtpdf_quick_build=OFF
- -DQT_FEATURE_qtpdf_widgets_build=OFF
-
- -DQT_FEATURE_qtwebengine_build=ON
- $(qt_feature qml qtwebengine_quick_build)
- $(qt_feature widgets qtwebengine_widgets_build)
-
- $(cmake_use_find_package designer Qt6Designer)
-
- $(qt_feature alsa webengine_system_alsa)
- $(qt_feature !bindist webengine_proprietary_codecs)
- $(qt_feature geolocation webengine_geolocation)
- $(qt_feature jumbo-build webengine_jumbo_build)
- $(qt_feature kerberos webengine_kerberos)
- $(qt_feature pulseaudio webengine_system_pulseaudio)
- $(qt_feature screencast webengine_webrtc_pipewire)
- $(qt_feature system-icu webengine_system_icu)
- $(qt_feature vulkan webengine_vulkan)
- -DQT_FEATURE_webengine_embedded_build=OFF
- -DQT_FEATURE_webengine_extensions=ON
- -DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet
- -DQT_FEATURE_webengine_pepper_plugins=ON
- -DQT_FEATURE_webengine_printing_and_pdf=ON
- -DQT_FEATURE_webengine_spellchecker=ON
- -DQT_FEATURE_webengine_webchannel=ON
- -DQT_FEATURE_webengine_webrtc=ON
-
- # needs a modified ffmpeg to be usable, and even then it may not
- # cooperate with new major ffmpeg versions (bug #831487)
- -DQT_FEATURE_webengine_system_ffmpeg=OFF
-
- # preemptively using bundled to avoid complications, may revisit
- # (see discussions in https://github.com/gentoo/gentoo/pull/32281)
- -DQT_FEATURE_webengine_system_re2=OFF
-
- # not necessary to pass these (default), but in case detection fails
- $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
- freetype glib harfbuzz lcms2 libevent libjpeg \
- libopenjpeg2 libpci libpng libvpx libwebp libxml \
- minizip opus poppler snappy zlib)
-
- # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
- -DINSTALL_GN=OFF
- )
-
- local mygnargs=(
- # prefer no dlopen where possible
- link_pulseaudio=true
- rtc_link_pipewire=true
- )
-
- if use !custom-cflags; then
- strip-flags # fragile
-
- if is-flagq '-g?(gdb)?([2-9])'; then #914475
- replace-flags '-g?(gdb)?([2-9])' -g1
- ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"
- fi
- fi
-
- export NINJA NINJAFLAGS=$(get_NINJAOPTS)
- [[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
-
- local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
- einfo "Extra Gn args: ${EXTRA_GN}"
-
- qt6-build_src_configure
-}
-
-src_test() {
- if [[ ${EUID} == 0 ]]; then
- # almost every tests fail, so skip entirely
- ewarn "Skipping tests due to running as root (chromium refuses this configuration)."
- return
- fi
-
- local CMAKE_SKIP_TESTS=(
- # fails with network sandbox
- tst_loadsignals
- tst_qquickwebengineview
- tst_qwebengineview
- # certs verfication seems flaky and gives expiration warnings
- tst_qwebengineclientcertificatestore
- )
-
- # prevent using the system's qtwebengine
- # (use glob to avoid unnecessary complications with arch dir)
- local resources=( "${BUILD_DIR}/src/core/${CMAKE_BUILD_TYPE}/"* )
- [[ -d ${resources[0]} ]] || die "invalid resources path: ${resources[0]}"
- local -x QTWEBENGINEPROCESS_PATH=${BUILD_DIR}${QT6_LIBEXECDIR#"${QT6_PREFIX}"}/QtWebEngineProcess
- local -x QTWEBENGINE_LOCALES_PATH=${resources[0]}/qtwebengine_locales
- local -x QTWEBENGINE_RESOURCES_PATH=${resources[0]}
-
- # random failures in several tests without -j1
- qt6-build_src_test -j1
-}
-
-pkg_postinst() {
- # plugin may also be found in $HOME if provided by chrome or firefox
- use amd64 &&
- optfeature "Widevine DRM support (protected media playback)" \
- www-plugins/chrome-binary-plugins
-
- elog
- elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with"
- elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. 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
- 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 "tl;dr your web browsing experience will be compromised."
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-11-15 17:20 Arthur Zamarin
0 siblings, 0 replies; 301+ messages in thread
From: Arthur Zamarin @ 2023-11-15 17:20 UTC (permalink / raw
To: gentoo-commits
commit: 91c21ec1f783c138fc05bf1d28b767d9858872a0
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 15 17:19:06 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Nov 15 17:19:06 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91c21ec1
dev-qt/qtwebengine: Stabilize 6.5.3 amd64, #915549
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild
index d8260cb08d44..286f497b5721 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI+="
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64"
+ KEYWORDS="amd64"
fi
IUSE="
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-11-08 19:48 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2023-11-08 19:48 UTC (permalink / raw
To: gentoo-commits
commit: e1f72e004038ee9f0a33abb895611b5eb09d5663
Author: Niccolò Belli <niccolo.belli <AT> linuxsystems <DOT> it>
AuthorDate: Tue Sep 19 09:32:09 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 8 19:46:56 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1f72e00
dev-qt/qtwebengine: fix ppc64 bundled ffmpeg for 5.15
Closes: https://bugs.gentoo.org/904372
Signed-off-by: Niccolò Belli <niccolo.belli <AT> linuxsystems.it>
Closes: https://github.com/gentoo/gentoo/pull/32922
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-5.15.11_p20231102.ebuild | 7 ++++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index bb6934e2cf44..4ca85b8bbb71 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,3 +1,4 @@
+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.11_p20231102.tar.xz 299223768 BLAKE2B f0c3e00e2b266d54bf4239ca15c1dff1142f5d49c70780e7774ad3503dedd257430f17966d61ca78e9f9b7c53f0775a3f4ce3a5cb58b0b2d1bd839e84d097d8c SHA512 124e3291a444416a1e92edd35b90d769428ab027d2c5b1e0a38ddc3f3d95c1d1817173eef9fe2dfc415775185d66dc1a9248b89b4a3d47843a5e40f2e70579eb
DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231102.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231102.ebuild
index df9d095c85b5..3d0bb168f1bc 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231102.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231102.ebuild
@@ -28,8 +28,12 @@ else
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 )"
+ 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
+ )"
IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
@@ -212,6 +216,7 @@ src_prepare() {
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
pushd src/3rdparty/chromium/third_party/libvpx > /dev/null || die
mkdir -vp source/config/linux/ppc64 || die
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-11-08 19:48 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2023-11-08 19:48 UTC (permalink / raw
To: gentoo-commits
commit: a7e55d393b2d0d450d3ec950770f32f9fb3e8b13
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 8 19:44:30 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Nov 8 19:47:17 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7e55d39
dev-qt/qtwebengine: Apply ppc64 patches after eapply_user
Thanks-to: Marcus Comstedt <marcus <AT> mc.pp.se>
Closes: https://bugs.gentoo.org/910218
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.11_p20231102.ebuild | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231102.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231102.ebuild
index 3d0bb168f1bc..6839c81f4377 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231102.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231102.ebuild
@@ -208,9 +208,6 @@ src_prepare() {
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"
@@ -218,6 +215,13 @@ src_prepare() {
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
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-11-06 18:11 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2023-11-06 18:11 UTC (permalink / raw
To: gentoo-commits
commit: 9ece4c319deb63cf49047133934814290422e0ad
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 6 10:46:26 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 6 18:10:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ece4c31
dev-qt/qtwebengine: drop 5.15.11_p20231019
Bug: https://bugs.gentoo.org/915465
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 -
.../qtwebengine-5.15.11_p20231019.ebuild | 270 ---------------------
2 files changed, 271 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index ac049196a4f4..bb6934e2cf44 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,5 +1,4 @@
DIST qtwebengine-5.15.10_p20230815-patchset.tar.xz 44880 BLAKE2B 6179ca4ad69f922cfa8ab8528bd571a326b3340f810f05782d808d67b6310de079d84ca6f769bd532f0fe375a702f0d348e02cfbf6b3f2d5c30ac668e1005bef SHA512 a323bdd8afeb41a97febf587bb0994a937c78ed470e077a2b482dca7e04bc4eb9cf75b2d2707236574d6586189ff3d27e42f437930dedd85b47a77e18ffc8fa3
-DIST qtwebengine-5.15.11_p20231019.tar.xz 299255660 BLAKE2B 0d584e69e0fcc4f348f62a5a7f4ba5b323df06ebeb95f9c9c8254b77d80e4797dd4dd0a56eef72aac39a279f62d0b1aba90629276def01807f589a7c0ef858b6 SHA512 b23dff30bf1f14a5dfb592e870450485b262942eabe1d22448618da6d3e9e3650491a8f53891a20901da24cf8dda8243f757ff82a70bec2942437bb8ecdccbe4
DIST qtwebengine-5.15.11_p20231102.tar.xz 299223768 BLAKE2B f0c3e00e2b266d54bf4239ca15c1dff1142f5d49c70780e7774ad3503dedd257430f17966d61ca78e9f9b7c53f0775a3f4ce3a5cb58b0b2d1bd839e84d097d8c SHA512 124e3291a444416a1e92edd35b90d769428ab027d2c5b1e0a38ddc3f3d95c1d1817173eef9fe2dfc415775185d66dc1a9248b89b4a3d47843a5e40f2e70579eb
DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
DIST qtwebengine-6.5-patchset-1.tar.xz 12936 BLAKE2B f44af36689596da0177f0607cf242d9cce3c376f4a5c28d7902a6b44651ce9272d745a824580268e999c2d58b72424d72eb6027d7461184bf7f04e0223e5195f SHA512 f639eb09d18c19c7b0d422d6acdce62404be0fcce905374c5d47266340191f7ca66875680bb09d80e72db718e34b7dc6e7db5f2f16407a0edb892930513ea407
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231019.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231019.ebuild
deleted file mode 100644
index 01bed9ae76a6..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231019.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."
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-11-03 11:16 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2023-11-03 11:16 UTC (permalink / raw
To: gentoo-commits
commit: 5f50c8b7b4a4c120a3bda1a479e45f59d1c399d1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 3 10:15:42 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Nov 3 11:16:17 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f50c8b7
dev-qt/qtwebengine: add 5.15.11_p20231102
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
.../qtwebengine-5.15.11_p20231102.ebuild | 270 +++++++++++++++++++++
2 files changed, 271 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 90f9dc0724a7..79592fe55c96 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -2,6 +2,7 @@ DIST qtwebengine-5.15.10_p20230623.tar.xz 299264220 BLAKE2B 93afb88f79a6675dc581
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_p20231019.tar.xz 299255660 BLAKE2B 0d584e69e0fcc4f348f62a5a7f4ba5b323df06ebeb95f9c9c8254b77d80e4797dd4dd0a56eef72aac39a279f62d0b1aba90629276def01807f589a7c0ef858b6 SHA512 b23dff30bf1f14a5dfb592e870450485b262942eabe1d22448618da6d3e9e3650491a8f53891a20901da24cf8dda8243f757ff82a70bec2942437bb8ecdccbe4
+DIST qtwebengine-5.15.11_p20231102.tar.xz 299223768 BLAKE2B f0c3e00e2b266d54bf4239ca15c1dff1142f5d49c70780e7774ad3503dedd257430f17966d61ca78e9f9b7c53f0775a3f4ce3a5cb58b0b2d1bd839e84d097d8c SHA512 124e3291a444416a1e92edd35b90d769428ab027d2c5b1e0a38ddc3f3d95c1d1817173eef9fe2dfc415775185d66dc1a9248b89b4a3d47843a5e40f2e70579eb
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
DIST qtwebengine-6.5-patchset-1.tar.xz 12936 BLAKE2B f44af36689596da0177f0607cf242d9cce3c376f4a5c28d7902a6b44651ce9272d745a824580268e999c2d58b72424d72eb6027d7461184bf7f04e0223e5195f SHA512 f639eb09d18c19c7b0d422d6acdce62404be0fcce905374c5d47266340191f7ca66875680bb09d80e72db718e34b7dc6e7db5f2f16407a0edb892930513ea407
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231102.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231102.ebuild
new file mode 100644
index 000000000000..01bed9ae76a6
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231102.ebuild
@@ -0,0 +1,270 @@
+# 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."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-11-03 11:16 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2023-11-03 11:16 UTC (permalink / raw
To: gentoo-commits
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."
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-10-22 8:36 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2023-10-22 8:36 UTC (permalink / raw
To: gentoo-commits
commit: a27c7f25378bbe844ed314104d2fba638f028105
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 21 21:19:21 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 22 08:36:16 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a27c7f25
dev-qt/qtwebengine: add 5.15.11_p20231019
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
.../qtwebengine-5.15.11_p20231019.ebuild | 270 +++++++++++++++++++++
2 files changed, 271 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 962653d5f6d0..517f29257d7f 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -2,6 +2,7 @@ DIST qtwebengine-5.15.10_p20230623.tar.xz 299264220 BLAKE2B 93afb88f79a6675dc581
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
DIST qtwebengine-6.5-patchset-1.tar.xz 12936 BLAKE2B f44af36689596da0177f0607cf242d9cce3c376f4a5c28d7902a6b44651ce9272d745a824580268e999c2d58b72424d72eb6027d7461184bf7f04e0223e5195f SHA512 f639eb09d18c19c7b0d422d6acdce62404be0fcce905374c5d47266340191f7ca66875680bb09d80e72db718e34b7dc6e7db5f2f16407a0edb892930513ea407
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231019.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231019.ebuild
new file mode 100644
index 000000000000..01bed9ae76a6
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.11_p20231019.ebuild
@@ -0,0 +1,270 @@
+# 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."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-10-17 13:25 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2023-10-17 13:25 UTC (permalink / raw
To: gentoo-commits
commit: 25a3cc0e8c4cd13b56583562cdb5cfa14364c423
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 17 13:23:26 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Oct 17 13:24:02 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25a3cc0e
dev-qt/qtwebengine: update py3.12 comment with bugrefs
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild | 3 +--
dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild | 3 +--
dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild | 3 +--
dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 3 +--
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 3 +--
5 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
index 0d9285e3a57c..4e6a0bddbc50 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
@@ -3,8 +3,7 @@
EAPI=8
-# py3.12: uses imp and distutils among potentially more issues, refer to
-# www-client/chromium for when adding/backporting support may be viable
+# 3.12 needs QTBUG-117979 (see also QTBUG-115512)
PYTHON_COMPAT=( python3_{10..11} )
PYTHON_REQ_USE="xml(+)"
inherit check-reqs flag-o-matic multiprocessing optfeature
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild
index cf093a70d1af..d8260cb08d44 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild
@@ -3,8 +3,7 @@
EAPI=8
-# py3.12: uses imp and distutils among potentially more issues, refer to
-# www-client/chromium for when adding/backporting support may be viable
+# 3.12 needs QTBUG-117979 (see also QTBUG-115512)
PYTHON_COMPAT=( python3_{10..11} )
PYTHON_REQ_USE="xml(+)"
inherit check-reqs flag-o-matic multiprocessing optfeature
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild
index dd30236ec236..e276911c1b95 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild
@@ -3,8 +3,7 @@
EAPI=8
-# py3.12: uses imp and distutils among potentially more issues, refer to
-# www-client/chromium for when adding/backporting support may be viable
+# 3.12 waiting after QTBUG-117979 (see also QTBUG-115512)
PYTHON_COMPAT=( python3_{10..11} )
PYTHON_REQ_USE="xml(+)"
inherit check-reqs flag-o-matic multiprocessing optfeature
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
index dd30236ec236..e96a31845a16 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
@@ -3,8 +3,7 @@
EAPI=8
-# py3.12: uses imp and distutils among potentially more issues, refer to
-# www-client/chromium for when adding/backporting support may be viable
+# 3.12 needs QTBUG-117979 (see also QTBUG-115512)
PYTHON_COMPAT=( python3_{10..11} )
PYTHON_REQ_USE="xml(+)"
inherit check-reqs flag-o-matic multiprocessing optfeature
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 201c7f879e6e..3d5179796e93 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -3,8 +3,7 @@
EAPI=8
-# py3.12: uses imp and distutils among potentially more issues, refer to
-# www-client/chromium for when adding/backporting support may be viable
+# 3.12 needs QTBUG-117979 (see also QTBUG-115512)
PYTHON_COMPAT=( python3_{10..11} )
PYTHON_REQ_USE="xml(+)"
inherit check-reqs flag-o-matic multiprocessing optfeature
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-10-10 14:51 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2023-10-10 14:51 UTC (permalink / raw
To: gentoo-commits
commit: f92555b611919f32ac32b186071a41011cbb4398
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 10 09:10:23 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Oct 10 14:49:25 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f92555b6
dev-qt/qtwebengine: add 6.6.0
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild | 292 ++++++++++++++++++++++++++++
2 files changed, 293 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 73bd3f31cad6..962653d5f6d0 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -9,3 +9,4 @@ DIST qtwebengine-6.6-patchset-1.tar.xz 9648 BLAKE2B c1bb02662ed5952e22ac3c3ee68f
DIST qtwebengine-6.6-patchset-3.tar.xz 9920 BLAKE2B 12b287392dabf1f1e3e99381ab1abf7e8fe44d85fb1b7148bc2d3427ff82d91e0d545955ee7c326f4d5e5af739759df2246173151673dabce3aa8aec28c4ecd8 SHA512 371549b2a2577872700842cc7f93cca900499b99de62f297a012fb16ccbb9d7c1f87a0123996ab14a49adf5604018000615736a8cc728122d37012ec6838211f
DIST qtwebengine-everywhere-src-6.5.2.tar.xz 412356700 BLAKE2B a48a513cffbf140aab08d748bc7826e841b7e1a87d113abbd0d8e7df5b9eb1ff2a44b89ae341c161eae26fd004699a1392f811252eb25aa13e0ce8e08f6be0a1 SHA512 f5791002495ebfa9912477f39a96d28bd4f4329f636f6b2055f1b811503b3c394c3ddd7baed5643f78f1905b1e8f860b4202b5d8e4afe5791e5450b9f46eac12
DIST qtwebengine-everywhere-src-6.5.3.tar.xz 412372456 BLAKE2B 131b4baf0267e77e1356568867db26fe86af165ddbd9abb5f2c6121e757011f5e18dfc41b30342eebf5d53f54492a20c1c77309782355b369b73c088d2102814 SHA512 8634eac4931fb27a0ded417de901955774d001dc74dc5779b216519b6b79f0a30f0774224abb14dffef779ca9df1cf384f822f9d5190e4d80b9f6ab0d012bc49
+DIST qtwebengine-everywhere-src-6.6.0.tar.xz 421117212 BLAKE2B b168913644e07d3d649082a78a03ccfb135960ea61907046f3e16c28471a9684aca4685ea907ed47a27719647ae0d9c753d4faa9e24c9897e88dad24b08bd774 SHA512 30469cf50d84e4547f0cf76b78b921fab550958d812cfcb894cf03ffcd0b1cbd3c1dc9314835ca6b5a182cbabdd236cb315bcc288d999f23c10d7ab0763a6366
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild
new file mode 100644
index 000000000000..dd30236ec236
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild
@@ -0,0 +1,292 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# py3.12: uses imp and distutils among potentially more issues, refer to
+# www-client/chromium for when adding/backporting support may be viable
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="xml(+)"
+inherit check-reqs flag-o-matic multiprocessing optfeature
+inherit prefix python-any-r1 qt6-build toolchain-funcs
+
+DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
+SRC_URI+="
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.6-patchset-3.tar.xz
+"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64"
+fi
+
+IUSE="
+ +alsa bindist custom-cflags designer geolocation +jumbo-build
+ kerberos opengl pdfium pulseaudio qml screencast +system-icu
+ vaapi vulkan +widgets
+"
+REQUIRED_USE="
+ designer? ( qml widgets )
+"
+
+# dlopen: krb5, libva, pciutils, udev
+RDEPEND="
+ app-arch/snappy:=
+ dev-libs/expat
+ dev-libs/libevent:=
+ dev-libs/libxml2[icu]
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ ~dev-qt/qtbase-${PV}:6[gui,opengl=,vulkan?,widgets?]
+ ~dev-qt/qtwebchannel-${PV}:6[qml?]
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/harfbuzz:=
+ media-libs/lcms:2
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ media-libs/libwebp:=
+ media-libs/openjpeg:2=
+ media-libs/opus
+ media-libs/tiff:=
+ sys-apps/dbus
+ sys-apps/pciutils
+ sys-libs/zlib:=[minizip]
+ virtual/libudev
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXrandr
+ x11-libs/libXtst
+ x11-libs/libxcb:=
+ x11-libs/libxkbcommon
+ x11-libs/libxkbfile
+ alsa? ( media-libs/alsa-lib )
+ designer? ( ~dev-qt/qttools-${PV}:6[designer] )
+ geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
+ kerberos? ( virtual/krb5 )
+ pulseaudio? ( media-libs/libpulse[glib] )
+ qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
+ screencast? (
+ dev-libs/glib:2
+ media-libs/mesa[gbm(+)]
+ media-video/pipewire:=
+ x11-libs/libdrm
+ )
+ system-icu? ( dev-libs/icu:= )
+ vaapi? (
+ media-libs/libva:=[X]
+ media-libs/mesa[gbm(+)]
+ x11-libs/libdrm
+ )
+ !vaapi? ( media-libs/libvpx:= )
+ widgets? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] )
+"
+DEPEND="
+ ${RDEPEND}
+ media-libs/libglvnd
+ x11-base/xorg-proto
+ x11-libs/libxshmfence
+ screencast? ( media-libs/libepoxy[egl(+)] )
+ pdfium? ( net-print/cups )
+ test? (
+ widgets? ( app-text/poppler[cxx(+)] )
+ )
+ vaapi? (
+ vulkan? ( dev-util/vulkan-headers )
+ )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
+ dev-util/gperf
+ net-libs/nodejs[ssl]
+ sys-devel/bison
+ sys-devel/flex
+"
+
+PATCHES=( "${WORKDIR}"/patches/${PN} )
+[[ ${PV} == 6.9999 ]] || # keep for 6.x.9999
+ PATCHES+=( "${WORKDIR}"/patches/chromium )
+
+PATCHES+=(
+ # add extras as needed here, may merge in set if carries across versions
+)
+
+python_check_deps() {
+ python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+}
+
+qtwebengine_check-reqs() {
+ [[ ${MERGE_TYPE} == binary ]] && return
+
+ if is-flagq '-g?(gdb)?([1-9])'; then #307861
+ ewarn
+ ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which"
+ ewarn "is non-trivial with ${PN}. May experience extended compilation"
+ ewarn "times, increased disk/memory usage, and potentially link failure."
+ ewarn
+ ewarn "If run into issues, please try disabling before reporting a bug."
+ fi
+
+ local CHECKREQS_DISK_BUILD=7G
+ local CHECKREQS_DISK_USR=220M
+
+ if ! has distcc ${FEATURES}; then #830661
+ # assume ~2GB per job or 1.5GB if clang, possible with less
+ # depending on free memory and *FLAGS, but prefer being safe as
+ # users having OOM issues with qtwebengine been rather common
+ tc-is-clang && : 15 || : 20
+ local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G
+ fi
+
+ check-reqs_${EBUILD_PHASE_FUNC} #570534
+}
+
+pkg_pretend() {
+ qtwebengine_check-reqs
+}
+
+pkg_setup() {
+ qtwebengine_check-reqs
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ qt6-build_src_prepare
+
+ # for www-plugins/chrome-binary-plugins (widevine) search paths on prefix
+ hprefixify -w /Gentoo/ src/core/content_client_qt.cpp
+
+ # store chromium versions, only used in postinst for a warning
+ local chromium
+ mapfile -t chromium < CHROMIUM_VERSION || die
+ [[ ${chromium[1]} =~ ^Based.*:[^0-9]+([0-9.]+$) ]] &&
+ QT6_CHROMIUM_VER=${BASH_REMATCH[1]} || die
+ [[ ${chromium[2]} =~ ^Patched.+:[^0-9]+([0-9.]+$) ]] &&
+ QT6_CHROMIUM_PATCHES_VER=${BASH_REMATCH[1]} || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(qt_feature pdfium qtpdf_build)
+ $(qt_feature qml qtpdf_quick_build)
+ $(qt_feature widgets qtpdf_widgets_build)
+
+ -DQT_FEATURE_qtwebengine_build=ON
+ $(qt_feature qml qtwebengine_quick_build)
+ $(qt_feature widgets qtwebengine_widgets_build)
+
+ $(cmake_use_find_package designer Qt6Designer)
+
+ $(qt_feature alsa webengine_system_alsa)
+ $(qt_feature !bindist webengine_proprietary_codecs)
+ $(qt_feature geolocation webengine_geolocation)
+ $(qt_feature jumbo-build webengine_jumbo_build)
+ $(qt_feature kerberos webengine_kerberos)
+ $(qt_feature pulseaudio webengine_system_pulseaudio)
+ $(qt_feature screencast webengine_webrtc_pipewire)
+ $(qt_feature system-icu webengine_system_icu)
+ $(qt_feature vaapi webengine_vaapi)
+ $(qt_feature vulkan webengine_vulkan)
+ -DQT_FEATURE_webengine_embedded_build=OFF
+ -DQT_FEATURE_webengine_extensions=ON
+ -DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet
+ -DQT_FEATURE_webengine_pepper_plugins=ON
+ -DQT_FEATURE_webengine_printing_and_pdf=ON
+ -DQT_FEATURE_webengine_spellchecker=ON
+ -DQT_FEATURE_webengine_webchannel=ON
+ -DQT_FEATURE_webengine_webrtc=ON
+
+ # needs a modified ffmpeg to be usable, and even then it may not
+ # cooperate with new major ffmpeg versions (bug #831487)
+ -DQT_FEATURE_webengine_system_ffmpeg=OFF
+
+ # preemptively using bundled to avoid complications, may revisit
+ # (see discussions in https://github.com/gentoo/gentoo/pull/32281)
+ -DQT_FEATURE_webengine_system_re2=OFF
+
+ # bundled is currently required when using vaapi (forced regardless)
+ $(qt_feature !vaapi webengine_system_libvpx)
+
+ # not necessary to pass these (default), but in case detection fails
+ $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
+ freetype glib harfbuzz lcms2 libevent libjpeg \
+ libopenjpeg2 libpci libpng libtiff libwebp \
+ libxml minizip opus poppler snappy zlib)
+
+ # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
+ -DINSTALL_GN=OFF
+ )
+
+ local mygnargs=(
+ # prefer no dlopen where possible
+ link_pulseaudio=true
+ rtc_link_pipewire=true
+ )
+
+ if use !custom-cflags; then
+ strip-flags # fragile
+
+ if is-flagq '-g?(gdb)?([2-9])'; then #914475
+ replace-flags '-g?(gdb)?([2-9])' -g1
+ ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"
+ fi
+ fi
+
+ export NINJA NINJAFLAGS=$(get_NINJAOPTS)
+ [[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
+
+ local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
+ einfo "Extra Gn args: ${EXTRA_GN}"
+
+ qt6-build_src_configure
+}
+
+src_test() {
+ if [[ ${EUID} == 0 ]]; then
+ # almost every tests fail, so skip entirely
+ ewarn "Skipping tests due to running as root (chromium refuses this configuration)."
+ return
+ fi
+
+ local CMAKE_SKIP_TESTS=(
+ # fails with network sandbox
+ tst_loadsignals
+ tst_qquickwebengineview
+ tst_qwebengineglobalsettings
+ tst_qwebengineview
+ # certs verfication seems flaky and gives expiration warnings
+ tst_qwebengineclientcertificatestore
+ )
+
+ # prevent using the system's qtwebengine
+ # (use glob to avoid unnecessary complications with arch dir)
+ local resources=( "${BUILD_DIR}/src/core/${CMAKE_BUILD_TYPE}/"* )
+ [[ -d ${resources[0]} ]] || die "invalid resources path: ${resources[0]}"
+ local -x QTWEBENGINEPROCESS_PATH=${BUILD_DIR}${QT6_LIBEXECDIR#"${QT6_PREFIX}"}/QtWebEngineProcess
+ local -x QTWEBENGINE_LOCALES_PATH=${resources[0]}/qtwebengine_locales
+ local -x QTWEBENGINE_RESOURCES_PATH=${resources[0]}
+
+ # random failures in several tests without -j1
+ qt6-build_src_test -j1
+}
+
+pkg_postinst() {
+ # plugin may also be found in $HOME if provided by chrome or firefox
+ use amd64 &&
+ optfeature "Widevine DRM support (protected media playback)" \
+ www-plugins/chrome-binary-plugins
+
+ elog
+ elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with"
+ elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. 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
+ 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 "tl;dr your web browsing experience will be compromised."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-10-08 15:58 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2023-10-08 15:58 UTC (permalink / raw
To: gentoo-commits
commit: 8d6e7ad61c2eb2e11c87f1257518478c458f02ef
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 8 15:08:59 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 8 15:47:46 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d6e7ad6
dev-qt/qtwebengine: add 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 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 56806e04df28..75216243da63 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,6 +1,7 @@
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.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
DIST qtwebengine-6.5-patchset-1.tar.xz 12936 BLAKE2B f44af36689596da0177f0607cf242d9cce3c376f4a5c28d7902a6b44651ce9272d745a824580268e999c2d58b72424d72eb6027d7461184bf7f04e0223e5195f SHA512 f639eb09d18c19c7b0d422d6acdce62404be0fcce905374c5d47266340191f7ca66875680bb09d80e72db718e34b7dc6e7db5f2f16407a0edb892930513ea407
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.11_p20230927.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.11_p20230927.ebuild
new file mode 100644
index 000000000000..01bed9ae76a6
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.11_p20230927.ebuild
@@ -0,0 +1,270 @@
+# 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."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-09-28 13:07 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2023-09-28 13:07 UTC (permalink / raw
To: gentoo-commits
commit: 796a527484be683e699232a1a6b6e26d989e87b5
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 28 07:03:51 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Sep 28 12:31:26 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=796a5274
dev-qt/qtwebengine: add 6.5.3
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild | 278 ++++++++++++++++++++++++++++
2 files changed, 279 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index d752fdb48551..56806e04df28 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -7,4 +7,5 @@ DIST qtwebengine-6.5-patchset-1.tar.xz 12936 BLAKE2B f44af36689596da0177f0607cf2
DIST qtwebengine-6.6-patchset-1.tar.xz 9648 BLAKE2B c1bb02662ed5952e22ac3c3ee68f5787503bcc6d12d05c22090cf9ba22511c76308aa1bb751df0a822585de63694f8ce0f254558416e392abe437995e30b7e99 SHA512 a634a2976bc19ada61671bc017a4456111214cc47a40c88812465f0ba25d025b3aa4da32467c59f7053d21650f3ac72010118b3b6962d34bb347d42b9109f95f
DIST qtwebengine-6.6-patchset-2.tar.xz 9248 BLAKE2B 87934910aff613044771c12e696323808e553e808835255c92676fa50ff54ef67ad5a0ffb5cc22b027e3865d8d3d3011755c1db7f3b709816449cf59ea5cbebf SHA512 564b9fd57e902f4b30f2fbdfa2823e677091c2910e0bf1c8559a6dc4c99500c6b1251d509276870278f78f45f201e0388329c04d7518548f85cefbe1419dffcc
DIST qtwebengine-everywhere-src-6.5.2.tar.xz 412356700 BLAKE2B a48a513cffbf140aab08d748bc7826e841b7e1a87d113abbd0d8e7df5b9eb1ff2a44b89ae341c161eae26fd004699a1392f811252eb25aa13e0ce8e08f6be0a1 SHA512 f5791002495ebfa9912477f39a96d28bd4f4329f636f6b2055f1b811503b3c394c3ddd7baed5643f78f1905b1e8f860b4202b5d8e4afe5791e5450b9f46eac12
+DIST qtwebengine-everywhere-src-6.5.3.tar.xz 412372456 BLAKE2B 131b4baf0267e77e1356568867db26fe86af165ddbd9abb5f2c6121e757011f5e18dfc41b30342eebf5d53f54492a20c1c77309782355b369b73c088d2102814 SHA512 8634eac4931fb27a0ded417de901955774d001dc74dc5779b216519b6b79f0a30f0774224abb14dffef779ca9df1cf384f822f9d5190e4d80b9f6ab0d012bc49
DIST qtwebengine-everywhere-src-6.6.0-rc.tar.xz 421029904 BLAKE2B 414980115fc97697f54f9becb6dc5e76fe18300067c0d52b8f2b8694864d376a5fb3301fa0f4f421c9c771006d415fa96290f3ad3666ef0b873a9db0d00d4776 SHA512 281aa5539940d8a43bbd24bad9420401cc8667e96a5be37d5cbfbad29cb6076c3e0ab4ea1e28b30846c255df2c6dea857d8b14330f1c68eb03e23f1a81c6c185
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild
new file mode 100644
index 000000000000..26cc25ef040a
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild
@@ -0,0 +1,278 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# py3.12: uses imp and distutils among potentially more issues, refer to
+# www-client/chromium for when adding/backporting support may be viable
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="xml(+)"
+inherit check-reqs flag-o-matic multiprocessing optfeature
+inherit prefix python-any-r1 qt6-build toolchain-funcs
+
+DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
+SRC_URI+="
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.5-patchset-1.tar.xz
+"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64"
+fi
+
+IUSE="
+ +alsa bindist custom-cflags designer geolocation +jumbo-build kerberos
+ opengl pdfium pulseaudio qml screencast +system-icu vulkan +widgets
+"
+REQUIRED_USE="
+ designer? ( qml widgets )
+"
+
+# dlopen: krb5, pciutils, udev
+RDEPEND="
+ app-arch/snappy:=
+ dev-libs/expat
+ dev-libs/libevent:=
+ dev-libs/libxml2[icu]
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ ~dev-qt/qtbase-${PV}:6[gui,opengl=,vulkan?,widgets?]
+ ~dev-qt/qtwebchannel-${PV}:6[qml?]
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/harfbuzz:=
+ media-libs/lcms:2
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ media-libs/libvpx:=
+ media-libs/libwebp:=
+ media-libs/openjpeg:2=
+ media-libs/opus
+ sys-apps/dbus
+ sys-apps/pciutils
+ sys-libs/zlib:=[minizip]
+ virtual/libudev
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXrandr
+ x11-libs/libXtst
+ x11-libs/libxcb:=
+ x11-libs/libxkbcommon
+ x11-libs/libxkbfile
+ alsa? ( media-libs/alsa-lib )
+ designer? ( ~dev-qt/qttools-${PV}:6[designer] )
+ geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
+ kerberos? ( virtual/krb5 )
+ pulseaudio? ( media-libs/libpulse[glib] )
+ qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
+ screencast? (
+ dev-libs/glib:2
+ media-libs/mesa[gbm(+)]
+ media-video/pipewire:=
+ x11-libs/libdrm
+ )
+ system-icu? ( dev-libs/icu:= )
+ widgets? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] )
+"
+DEPEND="
+ ${RDEPEND}
+ media-libs/libglvnd
+ x11-base/xorg-proto
+ x11-libs/libxshmfence
+ screencast? ( media-libs/libepoxy[egl(+)] )
+ pdfium? ( net-print/cups )
+ test? (
+ widgets? ( app-text/poppler[cxx(+)] )
+ )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
+ dev-util/gperf
+ net-libs/nodejs[ssl]
+ sys-devel/bison
+ sys-devel/flex
+"
+
+PATCHES=( "${WORKDIR}"/patches/${PN} )
+[[ ${PV} == 6.9999 ]] || # keep for 6.x.9999
+ PATCHES+=( "${WORKDIR}"/patches/chromium )
+
+PATCHES+=(
+ # add extras as needed here, may merge in set if carries across versions
+ "${FILESDIR}"/${PN}-6.5.2-libcxx17.patch
+)
+
+python_check_deps() {
+ python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+}
+
+qtwebengine_check-reqs() {
+ [[ ${MERGE_TYPE} == binary ]] && return
+
+ if is-flagq '-g?(gdb)?([1-9])'; then #307861
+ ewarn
+ ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which"
+ ewarn "is non-trivial with ${PN}. May experience extended compilation"
+ ewarn "times, increased disk/memory usage, and potentially link failure."
+ ewarn
+ ewarn "If run into issues, please try disabling before reporting a bug."
+ fi
+
+ local CHECKREQS_DISK_BUILD=7G
+ local CHECKREQS_DISK_USR=220M
+
+ if ! has distcc ${FEATURES}; then #830661
+ # assume ~2GB per job or 1.5GB if clang, possible with less
+ # depending on free memory and *FLAGS, but prefer being safe as
+ # users having OOM issues with qtwebengine been rather common
+ tc-is-clang && : 15 || : 20
+ local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G
+ fi
+
+ check-reqs_${EBUILD_PHASE_FUNC} #570534
+}
+
+pkg_pretend() {
+ qtwebengine_check-reqs
+}
+
+pkg_setup() {
+ qtwebengine_check-reqs
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ qt6-build_src_prepare
+
+ # for www-plugins/chrome-binary-plugins (widevine) search paths on prefix
+ hprefixify -w /Gentoo/ src/core/content_client_qt.cpp
+
+ # store chromium versions, only used in postinst for a warning
+ local chromium
+ mapfile -t chromium < CHROMIUM_VERSION || die
+ [[ ${chromium[1]} =~ ^Based.*:[^0-9]+([0-9.]+$) ]] &&
+ QT6_CHROMIUM_VER=${BASH_REMATCH[1]} || die
+ [[ ${chromium[2]} =~ ^Patched.+:[^0-9]+([0-9.]+$) ]] &&
+ QT6_CHROMIUM_PATCHES_VER=${BASH_REMATCH[1]} || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(qt_feature pdfium qtpdf_build)
+ $(qt_feature qml qtpdf_quick_build)
+ $(qt_feature widgets qtpdf_widgets_build)
+
+ -DQT_FEATURE_qtwebengine_build=ON
+ $(qt_feature qml qtwebengine_quick_build)
+ $(qt_feature widgets qtwebengine_widgets_build)
+
+ $(cmake_use_find_package designer Qt6Designer)
+
+ $(qt_feature alsa webengine_system_alsa)
+ $(qt_feature !bindist webengine_proprietary_codecs)
+ $(qt_feature geolocation webengine_geolocation)
+ $(qt_feature jumbo-build webengine_jumbo_build)
+ $(qt_feature kerberos webengine_kerberos)
+ $(qt_feature pulseaudio webengine_system_pulseaudio)
+ $(qt_feature screencast webengine_webrtc_pipewire)
+ $(qt_feature system-icu webengine_system_icu)
+ $(qt_feature vulkan webengine_vulkan)
+ -DQT_FEATURE_webengine_embedded_build=OFF
+ -DQT_FEATURE_webengine_extensions=ON
+ -DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet
+ -DQT_FEATURE_webengine_pepper_plugins=ON
+ -DQT_FEATURE_webengine_printing_and_pdf=ON
+ -DQT_FEATURE_webengine_spellchecker=ON
+ -DQT_FEATURE_webengine_webchannel=ON
+ -DQT_FEATURE_webengine_webrtc=ON
+
+ # needs a modified ffmpeg to be usable, and even then it may not
+ # cooperate with new major ffmpeg versions (bug #831487)
+ -DQT_FEATURE_webengine_system_ffmpeg=OFF
+
+ # preemptively using bundled to avoid complications, may revisit
+ # (see discussions in https://github.com/gentoo/gentoo/pull/32281)
+ -DQT_FEATURE_webengine_system_re2=OFF
+
+ # not necessary to pass these (default), but in case detection fails
+ $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
+ freetype glib harfbuzz lcms2 libevent libjpeg \
+ libopenjpeg2 libpci libpng libvpx libwebp libxml \
+ minizip opus poppler snappy zlib)
+
+ # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
+ -DINSTALL_GN=OFF
+ )
+
+ local mygnargs=(
+ # prefer no dlopen where possible
+ link_pulseaudio=true
+ rtc_link_pipewire=true
+ )
+
+ if use !custom-cflags; then
+ strip-flags # fragile
+
+ if is-flagq '-g?(gdb)?([2-9])'; then #914475
+ replace-flags '-g?(gdb)?([2-9])' -g1
+ ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"
+ fi
+ fi
+
+ export NINJA NINJAFLAGS=$(get_NINJAOPTS)
+ [[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
+
+ local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
+ einfo "Extra Gn args: ${EXTRA_GN}"
+
+ qt6-build_src_configure
+}
+
+src_test() {
+ if [[ ${EUID} == 0 ]]; then
+ # almost every tests fail, so skip entirely
+ ewarn "Skipping tests due to running as root (chromium refuses this configuration)."
+ return
+ fi
+
+ local CMAKE_SKIP_TESTS=(
+ # fails with network sandbox
+ tst_loadsignals
+ tst_qquickwebengineview
+ tst_qwebengineview
+ # certs verfication seems flaky and gives expiration warnings
+ tst_qwebengineclientcertificatestore
+ )
+
+ # prevent using the system's qtwebengine
+ # (use glob to avoid unnecessary complications with arch dir)
+ local resources=( "${BUILD_DIR}/src/core/${CMAKE_BUILD_TYPE}/"* )
+ [[ -d ${resources[0]} ]] || die "invalid resources path: ${resources[0]}"
+ local -x QTWEBENGINEPROCESS_PATH=${BUILD_DIR}${QT6_LIBEXECDIR#"${QT6_PREFIX}"}/QtWebEngineProcess
+ local -x QTWEBENGINE_LOCALES_PATH=${resources[0]}/qtwebengine_locales
+ local -x QTWEBENGINE_RESOURCES_PATH=${resources[0]}
+
+ # random failures in several tests without -j1
+ qt6-build_src_test -j1
+}
+
+pkg_postinst() {
+ # plugin may also be found in $HOME if provided by chrome or firefox
+ use amd64 &&
+ optfeature "Widevine DRM support (protected media playback)" \
+ www-plugins/chrome-binary-plugins
+
+ elog
+ elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with"
+ elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. 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
+ 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 "tl;dr your web browsing experience will be compromised."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-09-26 19:48 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2023-09-26 19:48 UTC (permalink / raw
To: gentoo-commits
commit: 35ec334eeec99beb2899d68f69a27b1de9998d64
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 26 13:38:36 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 26 19:47:27 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35ec334e
dev-qt/qtwebengine: add 6.6.0_rc
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-6.6.0_rc.ebuild | 292 +++++++++++++++++++++++++
2 files changed, 293 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 9727983d2fab..d752fdb48551 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -7,3 +7,4 @@ DIST qtwebengine-6.5-patchset-1.tar.xz 12936 BLAKE2B f44af36689596da0177f0607cf2
DIST qtwebengine-6.6-patchset-1.tar.xz 9648 BLAKE2B c1bb02662ed5952e22ac3c3ee68f5787503bcc6d12d05c22090cf9ba22511c76308aa1bb751df0a822585de63694f8ce0f254558416e392abe437995e30b7e99 SHA512 a634a2976bc19ada61671bc017a4456111214cc47a40c88812465f0ba25d025b3aa4da32467c59f7053d21650f3ac72010118b3b6962d34bb347d42b9109f95f
DIST qtwebengine-6.6-patchset-2.tar.xz 9248 BLAKE2B 87934910aff613044771c12e696323808e553e808835255c92676fa50ff54ef67ad5a0ffb5cc22b027e3865d8d3d3011755c1db7f3b709816449cf59ea5cbebf SHA512 564b9fd57e902f4b30f2fbdfa2823e677091c2910e0bf1c8559a6dc4c99500c6b1251d509276870278f78f45f201e0388329c04d7518548f85cefbe1419dffcc
DIST qtwebengine-everywhere-src-6.5.2.tar.xz 412356700 BLAKE2B a48a513cffbf140aab08d748bc7826e841b7e1a87d113abbd0d8e7df5b9eb1ff2a44b89ae341c161eae26fd004699a1392f811252eb25aa13e0ce8e08f6be0a1 SHA512 f5791002495ebfa9912477f39a96d28bd4f4329f636f6b2055f1b811503b3c394c3ddd7baed5643f78f1905b1e8f860b4202b5d8e4afe5791e5450b9f46eac12
+DIST qtwebengine-everywhere-src-6.6.0-rc.tar.xz 421029904 BLAKE2B 414980115fc97697f54f9becb6dc5e76fe18300067c0d52b8f2b8694864d376a5fb3301fa0f4f421c9c771006d415fa96290f3ad3666ef0b873a9db0d00d4776 SHA512 281aa5539940d8a43bbd24bad9420401cc8667e96a5be37d5cbfbad29cb6076c3e0ab4ea1e28b30846c255df2c6dea857d8b14330f1c68eb03e23f1a81c6c185
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.0_rc.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.0_rc.ebuild
new file mode 100644
index 000000000000..876a6ad25d54
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.0_rc.ebuild
@@ -0,0 +1,292 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# py3.12: uses imp and distutils among potentially more issues, refer to
+# www-client/chromium for when adding/backporting support may be viable
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="xml(+)"
+inherit check-reqs flag-o-matic multiprocessing optfeature
+inherit prefix python-any-r1 qt6-build toolchain-funcs
+
+DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
+SRC_URI+="
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.6-patchset-2.tar.xz
+"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64"
+fi
+
+IUSE="
+ +alsa bindist custom-cflags designer geolocation +jumbo-build
+ kerberos opengl pdfium pulseaudio qml screencast +system-icu
+ vaapi vulkan +widgets
+"
+REQUIRED_USE="
+ designer? ( qml widgets )
+"
+
+# dlopen: krb5, libva, pciutils, udev
+RDEPEND="
+ app-arch/snappy:=
+ dev-libs/expat
+ dev-libs/libevent:=
+ dev-libs/libxml2[icu]
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ ~dev-qt/qtbase-${PV}:6[gui,opengl=,vulkan?,widgets?]
+ ~dev-qt/qtwebchannel-${PV}:6[qml?]
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/harfbuzz:=
+ media-libs/lcms:2
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ media-libs/libwebp:=
+ media-libs/openjpeg:2=
+ media-libs/opus
+ media-libs/tiff:=
+ sys-apps/dbus
+ sys-apps/pciutils
+ sys-libs/zlib:=[minizip]
+ virtual/libudev
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXrandr
+ x11-libs/libXtst
+ x11-libs/libxcb:=
+ x11-libs/libxkbcommon
+ x11-libs/libxkbfile
+ alsa? ( media-libs/alsa-lib )
+ designer? ( ~dev-qt/qttools-${PV}:6[designer] )
+ geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
+ kerberos? ( virtual/krb5 )
+ pulseaudio? ( media-libs/libpulse[glib] )
+ qml? ( ~dev-qt/qtdeclarative-${PV}:6 )
+ screencast? (
+ dev-libs/glib:2
+ media-libs/mesa[gbm(+)]
+ media-video/pipewire:=
+ x11-libs/libdrm
+ )
+ system-icu? ( dev-libs/icu:= )
+ vaapi? (
+ media-libs/libva:=[X]
+ media-libs/mesa[gbm(+)]
+ x11-libs/libdrm
+ )
+ !vaapi? ( media-libs/libvpx:= )
+ widgets? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] )
+"
+DEPEND="
+ ${RDEPEND}
+ media-libs/libglvnd
+ x11-base/xorg-proto
+ x11-libs/libxshmfence
+ screencast? ( media-libs/libepoxy[egl(+)] )
+ pdfium? ( net-print/cups )
+ test? (
+ widgets? ( app-text/poppler[cxx(+)] )
+ )
+ vaapi? (
+ vulkan? ( dev-util/vulkan-headers )
+ )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
+ dev-util/gperf
+ net-libs/nodejs[ssl]
+ sys-devel/bison
+ sys-devel/flex
+"
+
+PATCHES=( "${WORKDIR}"/patches/${PN} )
+[[ ${PV} == 6.9999 ]] || # keep for 6.x.9999
+ PATCHES+=( "${WORKDIR}"/patches/chromium )
+
+PATCHES+=(
+ # add extras as needed here, may merge in set if carries across versions
+)
+
+python_check_deps() {
+ python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+}
+
+qtwebengine_check-reqs() {
+ [[ ${MERGE_TYPE} == binary ]] && return
+
+ if is-flagq '-g?(gdb)?([1-9])'; then #307861
+ ewarn
+ ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which"
+ ewarn "is non-trivial with ${PN}. May experience extended compilation"
+ ewarn "times, increased disk/memory usage, and potentially link failure."
+ ewarn
+ ewarn "If run into issues, please try disabling before reporting a bug."
+ fi
+
+ local CHECKREQS_DISK_BUILD=7G
+ local CHECKREQS_DISK_USR=220M
+
+ if ! has distcc ${FEATURES}; then #830661
+ # assume ~2GB per job or 1.5GB if clang, possible with less
+ # depending on free memory and *FLAGS, but prefer being safe as
+ # users having OOM issues with qtwebengine been rather common
+ tc-is-clang && : 15 || : 20
+ local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G
+ fi
+
+ check-reqs_${EBUILD_PHASE_FUNC} #570534
+}
+
+pkg_pretend() {
+ qtwebengine_check-reqs
+}
+
+pkg_setup() {
+ qtwebengine_check-reqs
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ qt6-build_src_prepare
+
+ # for www-plugins/chrome-binary-plugins (widevine) search paths on prefix
+ hprefixify -w /Gentoo/ src/core/content_client_qt.cpp
+
+ # store chromium versions, only used in postinst for a warning
+ local chromium
+ mapfile -t chromium < CHROMIUM_VERSION || die
+ [[ ${chromium[1]} =~ ^Based.*:[^0-9]+([0-9.]+$) ]] &&
+ QT6_CHROMIUM_VER=${BASH_REMATCH[1]} || die
+ [[ ${chromium[2]} =~ ^Patched.+:[^0-9]+([0-9.]+$) ]] &&
+ QT6_CHROMIUM_PATCHES_VER=${BASH_REMATCH[1]} || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ $(qt_feature pdfium qtpdf_build)
+ $(qt_feature qml qtpdf_quick_build)
+ $(qt_feature widgets qtpdf_widgets_build)
+
+ -DQT_FEATURE_qtwebengine_build=ON
+ $(qt_feature qml qtwebengine_quick_build)
+ $(qt_feature widgets qtwebengine_widgets_build)
+
+ $(cmake_use_find_package designer Qt6Designer)
+
+ $(qt_feature alsa webengine_system_alsa)
+ $(qt_feature !bindist webengine_proprietary_codecs)
+ $(qt_feature geolocation webengine_geolocation)
+ $(qt_feature jumbo-build webengine_jumbo_build)
+ $(qt_feature kerberos webengine_kerberos)
+ $(qt_feature pulseaudio webengine_system_pulseaudio)
+ $(qt_feature screencast webengine_webrtc_pipewire)
+ $(qt_feature system-icu webengine_system_icu)
+ $(qt_feature vaapi webengine_vaapi)
+ $(qt_feature vulkan webengine_vulkan)
+ -DQT_FEATURE_webengine_embedded_build=OFF
+ -DQT_FEATURE_webengine_extensions=ON
+ -DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet
+ -DQT_FEATURE_webengine_pepper_plugins=ON
+ -DQT_FEATURE_webengine_printing_and_pdf=ON
+ -DQT_FEATURE_webengine_spellchecker=ON
+ -DQT_FEATURE_webengine_webchannel=ON
+ -DQT_FEATURE_webengine_webrtc=ON
+
+ # needs a modified ffmpeg to be usable, and even then it may not
+ # cooperate with new major ffmpeg versions (bug #831487)
+ -DQT_FEATURE_webengine_system_ffmpeg=OFF
+
+ # preemptively using bundled to avoid complications, may revisit
+ # (see discussions in https://github.com/gentoo/gentoo/pull/32281)
+ -DQT_FEATURE_webengine_system_re2=OFF
+
+ # bundled is currently required when using vaapi (forced regardless)
+ $(qt_feature !vaapi webengine_system_libvpx)
+
+ # not necessary to pass these (default), but in case detection fails
+ $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
+ freetype glib harfbuzz lcms2 libevent libjpeg \
+ libopenjpeg2 libpci libpng libtiff libwebp \
+ libxml minizip opus poppler snappy zlib)
+
+ # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
+ -DINSTALL_GN=OFF
+ )
+
+ local mygnargs=(
+ # prefer no dlopen where possible
+ link_pulseaudio=true
+ rtc_link_pipewire=true
+ )
+
+ if use !custom-cflags; then
+ strip-flags # fragile
+
+ if is-flagq '-g?(gdb)?([2-9])'; then #914475
+ replace-flags '-g?(gdb)?([2-9])' -g1
+ ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"
+ fi
+ fi
+
+ export NINJA NINJAFLAGS=$(get_NINJAOPTS)
+ [[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
+
+ local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
+ einfo "Extra Gn args: ${EXTRA_GN}"
+
+ qt6-build_src_configure
+}
+
+src_test() {
+ if [[ ${EUID} == 0 ]]; then
+ # almost every tests fail, so skip entirely
+ ewarn "Skipping tests due to running as root (chromium refuses this configuration)."
+ return
+ fi
+
+ local CMAKE_SKIP_TESTS=(
+ # fails with network sandbox
+ tst_loadsignals
+ tst_qquickwebengineview
+ tst_qwebengineglobalsettings
+ tst_qwebengineview
+ # certs verfication seems flaky and gives expiration warnings
+ tst_qwebengineclientcertificatestore
+ )
+
+ # prevent using the system's qtwebengine
+ # (use glob to avoid unnecessary complications with arch dir)
+ local resources=( "${BUILD_DIR}/src/core/${CMAKE_BUILD_TYPE}/"* )
+ [[ -d ${resources[0]} ]] || die "invalid resources path: ${resources[0]}"
+ local -x QTWEBENGINEPROCESS_PATH=${BUILD_DIR}${QT6_LIBEXECDIR#"${QT6_PREFIX}"}/QtWebEngineProcess
+ local -x QTWEBENGINE_LOCALES_PATH=${resources[0]}/qtwebengine_locales
+ local -x QTWEBENGINE_RESOURCES_PATH=${resources[0]}
+
+ # random failures in several tests without -j1
+ qt6-build_src_test -j1
+}
+
+pkg_postinst() {
+ # plugin may also be found in $HOME if provided by chrome or firefox
+ use amd64 &&
+ optfeature "Widevine DRM support (protected media playback)" \
+ www-plugins/chrome-binary-plugins
+
+ elog
+ elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with"
+ elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. 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
+ 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 "tl;dr your web browsing experience will be compromised."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-09-26 15:16 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2023-09-26 15:16 UTC (permalink / raw
To: gentoo-commits
commit: cf434f2ea1ecdd6ea63d24600547f2f4f4beb94e
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 26 14:16:29 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 26 14:25:29 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf434f2e
dev-qt/qtwebengine: depend on vulkan-headers for vaapi in 6.6+
In QTBUG-115722, Qt opted to disable vaapi autodetection if
QT_FEATURE_vulkan is disabled due to missing headers, but can ignore
that and just pull the headers (not used without webengine_vulkan).
Ideally would just depend on vulkan-headers regardless of vaapi,
but it is not used in other parts of qtwebengine (it bundles like
3-4 different copies of vulkan-headers and for some reason wants
the system's here).
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 3 +++
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 3 +++
2 files changed, 6 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
index eb5c41d58d17..2217491331b0 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
@@ -94,6 +94,9 @@ DEPEND="
test? (
widgets? ( app-text/poppler[cxx(+)] )
)
+ vaapi? (
+ vulkan? ( dev-util/vulkan-headers )
+ )
"
BDEPEND="
$(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index f5fef16f226d..b1dcb801575b 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -94,6 +94,9 @@ DEPEND="
test? (
widgets? ( app-text/poppler[cxx(+)] )
)
+ vaapi? (
+ vulkan? ( dev-util/vulkan-headers )
+ )
"
BDEPEND="
$(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-09-22 20:18 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2023-09-22 20:18 UTC (permalink / raw
To: gentoo-commits
commit: 1937629476214f1492dca620d5290c34a0c0b118
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 22 20:12:42 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Sep 22 20:17:37 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19376294
dev-qt/qtwebengine: use -g1 rather than -g (qt6)
Turns out -g is still too much, or at least with gcc+bfd.
Closes: https://bugs.gentoo.org/914475
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild | 9 ++++-----
dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild | 9 ++++-----
dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 9 ++++-----
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 9 ++++-----
4 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
index fd862d5b141f..01b5cf6327c3 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
@@ -115,8 +115,7 @@ qtwebengine_check-reqs() {
ewarn
ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which"
ewarn "is non-trivial with ${PN}. May experience extended compilation"
- ewarn "times, increased disk/memory usage, and potentially linking issues"
- ewarn "when using more expensive debug symbols (e.g. -ggdb3 rather than -g)."
+ ewarn "times, increased disk/memory usage, and potentially link failure."
ewarn
ewarn "If run into issues, please try disabling before reporting a bug."
fi
@@ -216,9 +215,9 @@ src_configure() {
if use !custom-cflags; then
strip-flags # fragile
- if is-flagq '-g?(gdb)?([3-9])'; then #914475
- replace-flags '-g?(gdb)?([3-9])' -g
- ewarn "-g3+/-ggdb* *FLAGS replaced by -g, enable USE=custom-cflags to keep."
+ if is-flagq '-g?(gdb)?([2-9])'; then #914475
+ replace-flags '-g?(gdb)?([2-9])' -g1
+ ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"
fi
fi
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
index 8435e3c7491d..26cc25ef040a 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
@@ -116,8 +116,7 @@ qtwebengine_check-reqs() {
ewarn
ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which"
ewarn "is non-trivial with ${PN}. May experience extended compilation"
- ewarn "times, increased disk/memory usage, and potentially linking issues"
- ewarn "when using more expensive debug symbols (e.g. -ggdb3 rather than -g)."
+ ewarn "times, increased disk/memory usage, and potentially link failure."
ewarn
ewarn "If run into issues, please try disabling before reporting a bug."
fi
@@ -217,9 +216,9 @@ src_configure() {
if use !custom-cflags; then
strip-flags # fragile
- if is-flagq '-g?(gdb)?([3-9])'; then #914475
- replace-flags '-g?(gdb)?([3-9])' -g
- ewarn "-g3+/-ggdb* *FLAGS replaced by -g, enable USE=custom-cflags to keep."
+ if is-flagq '-g?(gdb)?([2-9])'; then #914475
+ replace-flags '-g?(gdb)?([2-9])' -g1
+ ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"
fi
fi
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
index 7a3630279acb..eb5c41d58d17 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
@@ -122,8 +122,7 @@ qtwebengine_check-reqs() {
ewarn
ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which"
ewarn "is non-trivial with ${PN}. May experience extended compilation"
- ewarn "times, increased disk/memory usage, and potentially linking issues"
- ewarn "when using more expensive debug symbols (e.g. -ggdb3 rather than -g)."
+ ewarn "times, increased disk/memory usage, and potentially link failure."
ewarn
ewarn "If run into issues, please try disabling before reporting a bug."
fi
@@ -227,9 +226,9 @@ src_configure() {
if use !custom-cflags; then
strip-flags # fragile
- if is-flagq '-g?(gdb)?([3-9])'; then #914475
- replace-flags '-g?(gdb)?([3-9])' -g
- ewarn "-g3+/-ggdb* *FLAGS replaced by -g, enable USE=custom-cflags to keep."
+ if is-flagq '-g?(gdb)?([2-9])'; then #914475
+ replace-flags '-g?(gdb)?([2-9])' -g1
+ ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"
fi
fi
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index b09d7c0d0f18..f5fef16f226d 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -122,8 +122,7 @@ qtwebengine_check-reqs() {
ewarn
ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which"
ewarn "is non-trivial with ${PN}. May experience extended compilation"
- ewarn "times, increased disk/memory usage, and potentially linking issues"
- ewarn "when using more expensive debug symbols (e.g. -ggdb3 rather than -g)."
+ ewarn "times, increased disk/memory usage, and potentially link failure."
ewarn
ewarn "If run into issues, please try disabling before reporting a bug."
fi
@@ -227,9 +226,9 @@ src_configure() {
if use !custom-cflags; then
strip-flags # fragile
- if is-flagq '-g?(gdb)?([3-9])'; then #914475
- replace-flags '-g?(gdb)?([3-9])' -g
- ewarn "-g3+/-ggdb* *FLAGS replaced by -g, enable USE=custom-cflags to keep."
+ if is-flagq '-g?(gdb)?([2-9])'; then #914475
+ replace-flags '-g?(gdb)?([2-9])' -g1
+ ewarn "-g2+/-ggdb* *FLAGS replaced with -g1 (enable USE=custom-cflags to keep)"
fi
fi
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-09-22 4:46 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2023-09-22 4:46 UTC (permalink / raw
To: gentoo-commits
commit: 97a0c80e59f2a6770d73518d44d0a481e845e822
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 22 04:13:06 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Sep 22 04:44:36 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97a0c80e
dev-qt/qtwebengine: replace -g3+ for -g unless custom-cflags (qt6)
On second thought let's do this, but keep a warning that mentions
USE=custom-cflags given users may not be used to -g* getting
replaced and then lacking the symbols they were expecting.
Not going to keep disk space / memory usage updated for -g as
estimates would likely be all over the place and consider that
the warning is sufficient there.
Not using a full replace-flags '-g*' -g to allow e.g. a package.env
that adds -g0/-g1 at the end to still work while disregaring the
warning without implementing extra logic.
Note that have not retried -g to be sure it is fine, albeit pretty
sure it was fine last time tried. Worst case could replace by -g1,
or drop flags-respecting-patches and request debugging symbols to
gn instead (selectively forces -g1 even if asked for more).
Closes: https://bugs.gentoo.org/914475
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild | 10 ++++++++--
dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild | 10 ++++++++--
dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 10 ++++++++--
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 10 ++++++++--
4 files changed, 32 insertions(+), 8 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
index 90835addd93b..fd862d5b141f 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
@@ -119,7 +119,6 @@ qtwebengine_check-reqs() {
ewarn "when using more expensive debug symbols (e.g. -ggdb3 rather than -g)."
ewarn
ewarn "If run into issues, please try disabling before reporting a bug."
- ewarn
fi
local CHECKREQS_DISK_BUILD=7G
@@ -214,7 +213,14 @@ src_configure() {
rtc_link_pipewire=true
)
- use custom-cflags || strip-flags # fragile
+ if use !custom-cflags; then
+ strip-flags # fragile
+
+ if is-flagq '-g?(gdb)?([3-9])'; then #914475
+ replace-flags '-g?(gdb)?([3-9])' -g
+ ewarn "-g3+/-ggdb* *FLAGS replaced by -g, enable USE=custom-cflags to keep."
+ fi
+ fi
export NINJA NINJAFLAGS=$(get_NINJAOPTS)
[[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
index e844d475fc12..8435e3c7491d 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
@@ -120,7 +120,6 @@ qtwebengine_check-reqs() {
ewarn "when using more expensive debug symbols (e.g. -ggdb3 rather than -g)."
ewarn
ewarn "If run into issues, please try disabling before reporting a bug."
- ewarn
fi
local CHECKREQS_DISK_BUILD=7G
@@ -215,7 +214,14 @@ src_configure() {
rtc_link_pipewire=true
)
- use custom-cflags || strip-flags # fragile
+ if use !custom-cflags; then
+ strip-flags # fragile
+
+ if is-flagq '-g?(gdb)?([3-9])'; then #914475
+ replace-flags '-g?(gdb)?([3-9])' -g
+ ewarn "-g3+/-ggdb* *FLAGS replaced by -g, enable USE=custom-cflags to keep."
+ fi
+ fi
export NINJA NINJAFLAGS=$(get_NINJAOPTS)
[[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
index d21b26363aa2..7a3630279acb 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
@@ -126,7 +126,6 @@ qtwebengine_check-reqs() {
ewarn "when using more expensive debug symbols (e.g. -ggdb3 rather than -g)."
ewarn
ewarn "If run into issues, please try disabling before reporting a bug."
- ewarn
fi
local CHECKREQS_DISK_BUILD=7G
@@ -225,7 +224,14 @@ src_configure() {
rtc_link_pipewire=true
)
- use custom-cflags || strip-flags # fragile
+ if use !custom-cflags; then
+ strip-flags # fragile
+
+ if is-flagq '-g?(gdb)?([3-9])'; then #914475
+ replace-flags '-g?(gdb)?([3-9])' -g
+ ewarn "-g3+/-ggdb* *FLAGS replaced by -g, enable USE=custom-cflags to keep."
+ fi
+ fi
export NINJA NINJAFLAGS=$(get_NINJAOPTS)
[[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 89e31598639c..b09d7c0d0f18 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -126,7 +126,6 @@ qtwebengine_check-reqs() {
ewarn "when using more expensive debug symbols (e.g. -ggdb3 rather than -g)."
ewarn
ewarn "If run into issues, please try disabling before reporting a bug."
- ewarn
fi
local CHECKREQS_DISK_BUILD=7G
@@ -225,7 +224,14 @@ src_configure() {
rtc_link_pipewire=true
)
- use custom-cflags || strip-flags # fragile
+ if use !custom-cflags; then
+ strip-flags # fragile
+
+ if is-flagq '-g?(gdb)?([3-9])'; then #914475
+ replace-flags '-g?(gdb)?([3-9])' -g
+ ewarn "-g3+/-ggdb* *FLAGS replaced by -g, enable USE=custom-cflags to keep."
+ fi
+ fi
export NINJA NINJAFLAGS=$(get_NINJAOPTS)
[[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-09-20 18:27 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2023-09-20 18:27 UTC (permalink / raw
To: gentoo-commits
commit: 2500fef79aee6e4a51d275f2cf0cc7e8fccc2043
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 20 18:19:50 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Sep 20 18:26:19 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2500fef7
dev-qt/qtwebengine: extend -g warning and increase visibility
If this comes up more often an issue, may opt to transform -g*
(other than -g0) for -g without USE=custom-cflags. Albeit do
not overly want to give surprises, nor assume when something
is going to work or not given the toolchain and other options.
Note that this does not affect <qtwebengine-6.5.2-r1 nor
qtwebengine:5 because they simply do not respect *FLAGS.
Bug: https://bugs.gentoo.org/914475
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild | 12 ++++++++----
dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild | 12 ++++++++----
dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 12 ++++++++----
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 12 ++++++++----
4 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
index 879eb11787e6..90835addd93b 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
@@ -112,10 +112,14 @@ qtwebengine_check-reqs() {
[[ ${MERGE_TYPE} == binary ]] && return
if is-flagq '-g?(gdb)?([1-9])'; then #307861
- ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb),"
- ewarn "which is non-trivial with ${PN}. May experience extended"
- ewarn "compilation times and increased disk/memory usage. If run into"
- ewarn "issues, please disable before reporting a bug."
+ ewarn
+ ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which"
+ ewarn "is non-trivial with ${PN}. May experience extended compilation"
+ ewarn "times, increased disk/memory usage, and potentially linking issues"
+ ewarn "when using more expensive debug symbols (e.g. -ggdb3 rather than -g)."
+ ewarn
+ ewarn "If run into issues, please try disabling before reporting a bug."
+ ewarn
fi
local CHECKREQS_DISK_BUILD=7G
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
index 09ccd2e4157f..e844d475fc12 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
@@ -113,10 +113,14 @@ qtwebengine_check-reqs() {
[[ ${MERGE_TYPE} == binary ]] && return
if is-flagq '-g?(gdb)?([1-9])'; then #307861
- ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb),"
- ewarn "which is non-trivial with ${PN}. May experience extended"
- ewarn "compilation times and increased disk/memory usage. If run into"
- ewarn "issues, please disable before reporting a bug."
+ ewarn
+ ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which"
+ ewarn "is non-trivial with ${PN}. May experience extended compilation"
+ ewarn "times, increased disk/memory usage, and potentially linking issues"
+ ewarn "when using more expensive debug symbols (e.g. -ggdb3 rather than -g)."
+ ewarn
+ ewarn "If run into issues, please try disabling before reporting a bug."
+ ewarn
fi
local CHECKREQS_DISK_BUILD=7G
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
index ae0537379e3e..d21b26363aa2 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
@@ -119,10 +119,14 @@ qtwebengine_check-reqs() {
[[ ${MERGE_TYPE} == binary ]] && return
if is-flagq '-g?(gdb)?([1-9])'; then #307861
- ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb),"
- ewarn "which is non-trivial with ${PN}. May experience extended"
- ewarn "compilation times and increased disk/memory usage. If run into"
- ewarn "issues, please disable before reporting a bug."
+ ewarn
+ ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which"
+ ewarn "is non-trivial with ${PN}. May experience extended compilation"
+ ewarn "times, increased disk/memory usage, and potentially linking issues"
+ ewarn "when using more expensive debug symbols (e.g. -ggdb3 rather than -g)."
+ ewarn
+ ewarn "If run into issues, please try disabling before reporting a bug."
+ ewarn
fi
local CHECKREQS_DISK_BUILD=7G
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 6e9010b87a95..89e31598639c 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -119,10 +119,14 @@ qtwebengine_check-reqs() {
[[ ${MERGE_TYPE} == binary ]] && return
if is-flagq '-g?(gdb)?([1-9])'; then #307861
- ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb),"
- ewarn "which is non-trivial with ${PN}. May experience extended"
- ewarn "compilation times and increased disk/memory usage. If run into"
- ewarn "issues, please disable before reporting a bug."
+ ewarn
+ ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb), which"
+ ewarn "is non-trivial with ${PN}. May experience extended compilation"
+ ewarn "times, increased disk/memory usage, and potentially linking issues"
+ ewarn "when using more expensive debug symbols (e.g. -ggdb3 rather than -g)."
+ ewarn
+ ewarn "If run into issues, please try disabling before reporting a bug."
+ ewarn
fi
local CHECKREQS_DISK_BUILD=7G
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-09-18 20:04 Arthur Zamarin
0 siblings, 0 replies; 301+ messages in thread
From: Arthur Zamarin @ 2023-09-18 20:04 UTC (permalink / raw
To: gentoo-commits
commit: d19db41f66051c7626679e7e619ece8079a40284
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 18 20:04:33 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 18 20:04:33 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d19db41f
dev-qt/qtwebengine: Stabilize 5.15.10_p20230815 amd64, #913051
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.10_p20230815.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.10_p20230815.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.10_p20230815.ebuild
index d77b298fdba3..9c6d4bac3072 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.10_p20230815.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.10_p20230815.ebuild
@@ -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 ~ppc64 ~x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-09-16 10:50 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2023-09-16 10:50 UTC (permalink / raw
To: gentoo-commits
commit: 00b21135ba3cf40c7b54aef4c7364c45a367796d
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 16 10:41:31 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Sep 16 10:49:24 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00b21135
dev-qt/qtwebengine: update patchset for 6.6 branch
6.6-1 -> 6.6-2 changes:
Removed:
* screencast-gio.patch (fix was backported from 6.7)
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 31ce773cfa1b..9727983d2fab 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -5,4 +5,5 @@ DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3
DIST qtwebengine-5.15.8_p20230313-patchset.tar.xz 45904 BLAKE2B 9f58b9808fd445a06e6a2cd6d5f7bc9782bd6de13138fdebc9e81bd9f69e7ae673a71bd3ed6b011a47e84cc64b5b703a7cfc8d5f740eaaa663da1db8ef9ef05b SHA512 21b0b853358260fa1bdc96c97c5b2af7007c744d10abeebf9f0e708a0cd7dece583d86c0554a4e327a0d615bb403b0d328acaa6622b50d7a8059bc0802edbcec
DIST qtwebengine-6.5-patchset-1.tar.xz 12936 BLAKE2B f44af36689596da0177f0607cf242d9cce3c376f4a5c28d7902a6b44651ce9272d745a824580268e999c2d58b72424d72eb6027d7461184bf7f04e0223e5195f SHA512 f639eb09d18c19c7b0d422d6acdce62404be0fcce905374c5d47266340191f7ca66875680bb09d80e72db718e34b7dc6e7db5f2f16407a0edb892930513ea407
DIST qtwebengine-6.6-patchset-1.tar.xz 9648 BLAKE2B c1bb02662ed5952e22ac3c3ee68f5787503bcc6d12d05c22090cf9ba22511c76308aa1bb751df0a822585de63694f8ce0f254558416e392abe437995e30b7e99 SHA512 a634a2976bc19ada61671bc017a4456111214cc47a40c88812465f0ba25d025b3aa4da32467c59f7053d21650f3ac72010118b3b6962d34bb347d42b9109f95f
+DIST qtwebengine-6.6-patchset-2.tar.xz 9248 BLAKE2B 87934910aff613044771c12e696323808e553e808835255c92676fa50ff54ef67ad5a0ffb5cc22b027e3865d8d3d3011755c1db7f3b709816449cf59ea5cbebf SHA512 564b9fd57e902f4b30f2fbdfa2823e677091c2910e0bf1c8559a6dc4c99500c6b1251d509276870278f78f45f201e0388329c04d7518548f85cefbe1419dffcc
DIST qtwebengine-everywhere-src-6.5.2.tar.xz 412356700 BLAKE2B a48a513cffbf140aab08d748bc7826e841b7e1a87d113abbd0d8e7df5b9eb1ff2a44b89ae341c161eae26fd004699a1392f811252eb25aa13e0ce8e08f6be0a1 SHA512 f5791002495ebfa9912477f39a96d28bd4f4329f636f6b2055f1b811503b3c394c3ddd7baed5643f78f1905b1e8f860b4202b5d8e4afe5791e5450b9f46eac12
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
index 6e9010b87a95..ae0537379e3e 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
@@ -12,7 +12,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs
DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
SRC_URI+="
- https://dev.gentoo.org/~ionen/distfiles/${PN}-6.6-patchset-1.tar.xz
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.6-patchset-2.tar.xz
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-09-15 4:49 Sam James
0 siblings, 0 replies; 301+ messages in thread
From: Sam James @ 2023-09-15 4:49 UTC (permalink / raw
To: gentoo-commits
commit: b5fadde05108531f5d4f3766211bb01a75ecb6c5
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 15 04:47:50 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 15 04:47:50 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5fadde0
dev-qt/qtwebengine: Stabilize 6.5.2-r1 amd64, #914113
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
index 4f2f7fbf799d..879eb11787e6 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI+="
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64"
+ KEYWORDS="amd64"
fi
IUSE="
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-09-14 20:43 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2023-09-14 20:43 UTC (permalink / raw
To: gentoo-commits
commit: 2b89daf0afa671cb9134b77cbd1e290a571201c5
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 13 16:54:03 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Sep 14 20:42:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b89daf0
dev-qt/qtwebengine: note that libva is dlopen
Still keep := though, ensures that remain compatible
with the library that gets opened.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
index 34cc431d2a98..6e9010b87a95 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
designer? ( qml widgets )
"
-# dlopen: krb5, pciutils, udev
+# dlopen: krb5, libva, pciutils, udev
RDEPEND="
app-arch/snappy:=
dev-libs/expat
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 34cc431d2a98..6e9010b87a95 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -28,7 +28,7 @@ REQUIRED_USE="
designer? ( qml widgets )
"
-# dlopen: krb5, pciutils, udev
+# dlopen: krb5, libva, pciutils, udev
RDEPEND="
app-arch/snappy:=
dev-libs/expat
^ permalink raw reply related [flat|nested] 301+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-09-13 16:42 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2023-09-13 16:42 UTC (permalink / raw
To: gentoo-commits
commit: 240bcb6f8e1f90dc60a1daa26051153fe0f155d9
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 13 04:27:01 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Sep 13 16:40:19 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=240bcb6f
dev-qt/qtwebengine: add new tiff dependency in 6.6+
Upstream has unbundled by default.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 5 +++--
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
index f4d5c7bf79a9..dbb97f456745 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
@@ -48,6 +48,7 @@ RDEPEND="
media-libs/libwebp:=
media-libs/openjpeg:2=
media-libs/opus
+ media-libs/tiff:=
sys-apps/dbus
sys-apps/pciutils
sys-libs/zlib:=[minizip]
@@ -197,8 +198,8 @@ src_configure() {
# not necessary to pass these (default), but in case detection fails
$(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
freetype glib harfbuzz lcms2 libevent libjpeg \
- libopenjpeg2 libpci libpng libvpx libwebp libxml \
- minizip opus poppler snappy zlib)
+ libopenjpeg2 libpci libpng libtiff libvpx libwebp \
+ libxml minizip opus poppler snappy zlib)
# TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
-DINSTALL_GN=OFF
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index f4d5c7bf79a9..dbb97f456745 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -48,6 +48,7 @@ RDEPEND="
media-libs/libwebp:=
media-libs/openjpeg:2=
media-libs/opus
+ media-libs/tiff:=
sys-apps/dbus
sys-apps/pciutils
sys-libs/zlib:=[minizip]
@@ -197,8 +198,8 @@ src_configure() {
# not necessary to pass these (default), but in case detection fails
$(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
freetype glib harfbuzz lcms2 libevent libjpeg \
- libopenjpeg2 libpci libpng libvpx libwebp libxml \
- minizip opus poppler snappy zlib)
+ libopenjpeg2 libpci libpng libtiff libvpx libwebp \
+ libxml minizip opus poppler snappy zlib)
# TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
-DINSTALL_GN=OFF
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-09-13 16:42 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2023-09-13 16:42 UTC (permalink / raw
To: gentoo-commits
commit: 4ec9e688806931661e0b493346664c03666ae241
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 13 16:11:32 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Sep 13 16:40:20 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ec9e688
dev-qt/qtwebengine: drop 6.5.2-r0
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.5.2.ebuild | 275 ----------------------------
1 file changed, 275 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.2.ebuild
deleted file mode 100644
index 67509126a0c5..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-6.5.2.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="xml(+)"
-inherit check-reqs estack flag-o-matic multiprocessing
-inherit prefix python-any-r1 qt6-build toolchain-funcs
-
-DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64"
-fi
-
-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/qtdeclarative-${PV}:6
- ~dev-qt/qtwebchannel-${PV}:6
- media-libs/fontconfig
- media-libs/freetype
- media-libs/harfbuzz:=
- media-libs/lcms:2
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- >=media-libs/libvpx-1.5:=[svc(+)]
- media-libs/libwebp:=
- media-libs/openjpeg:2=
- 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/libxcb:=
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libxkbcommon
- x11-libs/libxkbfile
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libxshmfence:=
- x11-libs/libXtst
- alsa? ( media-libs/alsa-lib )
- geolocation? ( ~dev-qt/qtpositioning-${PV}:6 )
- kerberos? ( virtual/krb5 )
- pulseaudio? ( media-libs/libpulse:= )
- screencast? ( media-video/pipewire:= )
- system-icu? ( >=dev-libs/icu-69.1:= )
- widgets? (
- ~dev-qt/qtbase-${PV}:6[widgets]
- )
-"
-DEPEND="
- ${RDEPEND}
- media-libs/libglvnd
-"
-BDEPEND="
- $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
- dev-util/gperf
- dev-util/ninja
- dev-util/re2c
- net-libs/nodejs[ssl]
- sys-devel/bison
- sys-devel/flex
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-5.15.10_p20230623-ffmpeg-binutils-2.41.patch
-)
-
-python_check_deps() {
- python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
-}
-
-qtwebengine_check-reqs() {
- [[ ${MERGE_TYPE} == binary ]] && return
-
- # 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
-
- # (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_prepare() {
- qt6-build_src_prepare
-
- # bug 620444 - ensure local headers are used
- find . -type f -name "*.pr[fio]" -exec \
- 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
-
- # for www-plugins/chrome-binary-plugins (widevine) search paths on prefix
- hprefixify -w /Gentoo/ src/core/content_client_qt.cpp
-
- # store chromium versions, only used in postinst for a warning
- local chromium
- mapfile -t chromium < CHROMIUM_VERSION || die
- [[ ${chromium[1]} =~ ^Based.*:[^0-9]+([0-9.]+$) ]] &&
- QT6_CHROMIUM_VER=${BASH_REMATCH[1]} || die
- [[ ${chromium[2]} =~ ^Patched.+:[^0-9]+([0-9.]+$) ]] &&
- QT6_CHROMIUM_PATCHES_VER=${BASH_REMATCH[1]} || die
-}
-
-src_configure() {
- export NINJA_PATH=${BROOT}/usr/bin/ninja
- export NINJAFLAGS=${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}
-
- local mycmakeargs=(
- #-DQT_FEATURE_accessibility=off
- #-DQT_FEATURE_force_asserts=off
- #-DQT_FEATURE_opengl=off
- #-DQT_FEATURE_printer=off
- -DQT_FEATURE_qtpdf_build=off
- -DQT_FEATURE_qtpdf_quick_build=off
- -DQT_FEATURE_qtpdf_widgets_build=off
- -DQT_FEATURE_qtwebengine_build=on
- -DQT_FEATURE_qtwebengine_quick_build=on
- -DQT_FEATURE_qtwebengine_widgets_build=on
- #-DQT_FEATURE_ssl=off
- #-DQT_FEATURE_static=off
- #-DQT_FEATURE_system_zlib=off
- #-DQT_FEATURE_system_png=off
- #-DQT_FEATURE_system_jpeg=off
- #-DQT_FEATURE_system_freetype=off
- #-DQT_FEATURE_system_harfbuzz=off
- #-DQT_FEATURE_use_gold_linker=off
- #-DQT_FEATURE_use_lld_linker=off
- -DQT_FEATURE_webengine_embedded_build=off
- -DQT_FEATURE_webengine_extensions=on
- #-DQT_FEATURE_webengine_full_debug_info=$(usex debug)
- -DQT_FEATURE_webengine_geolocation=$(usex geolocation on off)
- -DQT_FEATURE_webengine_jumbo_build=$(usex jumbo-build)
- #-DQT_FEATURE_webengine_jumbo_file_merge_limit
- -DQT_FEATURE_webengine_kerberos=$(usex kerberos on off)
- -DQT_FEATURE_webengine_native_spellchecker=off
- -DQT_FEATURE_webengine_ozone_x11=on
- -DQT_FEATURE_webengine_pepper_plugins=on
- -DQT_FEATURE_webengine_proprietary_codecs=$(usex bindist off on)
- -DQT_FEATURE_webengine_printing_and_pdf=on
- -DQT_FEATURE_webengine_sanitizer=on
- -DQT_FEATURE_webengine_spellchecker=on
- -DQT_FEATURE_webengine_system_opus=on
- -DQT_FEATURE_webengine_system_libwebp=on
- -DQT_FEATURE_webengine_system_alsa=$(usex alsa on off)
- -DQT_FEATURE_webengine_system_ffmpeg=off # https://bugs.gentoo.org/831487
- -DQT_FEATURE_webengine_system_icu=$(usex system-icu)
- -DQT_FEATURE_webengine_system_libevent=on
- -DQT_FEATURE_webengine_system_libopenjpeg2=on
- -DQT_FEATURE_webengine_system_libpci=on
- -DQT_FEATURE_webengine_system_libpng=on
- -DQT_FEATURE_webengine_system_pulseaudio=$(usex pulseaudio on off)
- -DQT_FEATURE_webengine_system_zlib=on
- -DQT_FEATURE_webengine_webchannel=on
- -DQT_FEATURE_webengine_webrtc=on
- -DQT_FEATURE_webengine_webrtc_pipewire=$(usex screencast on off)
- #-DQT_FEATURE_xcb=off
-
- # TODO: fix gn cross build or split + depend on dev-qt/qtwebengine-gn
- -DINSTALL_GN=off
- )
-
- qt6-build_src_configure
-}
-
-src_test() {
- if [[ ${EUID} == 0 ]]; then
- # almost every tests fail, so skip entirely
- ewarn "Skipping tests due to running as root (chromium refuses this configuration)."
- return
- fi
-
- local CMAKE_SKIP_TESTS=(
- # fails with network sandbox
- tst_loadsignals
- tst_qquickwebengineview
- tst_qwebengineview
- # certs verfication seems flaky and gives expiration warnings
- tst_qwebengineclientcertificatestore
- )
-
- # prevent using the system's qtwebengine
- # (use glob to avoid unnecessary complications with arch dir)
- local resources=( "${BUILD_DIR}/src/core/${CMAKE_BUILD_TYPE}/"* )
- [[ -d ${resources[0]} ]] || die "invalid resources path: ${resources[0]}"
- local -x QTWEBENGINEPROCESS_PATH=${BUILD_DIR}${QT6_LIBEXECDIR#"${QT6_PREFIX}"}/QtWebEngineProcess
- local -x QTWEBENGINE_LOCALES_PATH=${resources[0]}/qtwebengine_locales
- local -x QTWEBENGINE_RESOURCES_PATH=${resources[0]}
-
- # random failures in several tests without -j1
- qt6-build_src_test -j1
-}
-
-pkg_postinst() {
- elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with"
- elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. 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
- 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 "tl;dr your web browsing experience will be compromised."
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-09-13 16:42 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2023-09-13 16:42 UTC (permalink / raw
To: gentoo-commits
commit: 20c7f907410ee554047dcda14fd30a340358a153
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 12 14:38:24 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Sep 13 16:40:20 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20c7f907
dev-qt/qtwebengine: update patchset for 6.6 branch
6.5-1 -> 6.6-1 changes:
Added:
* libcxx17.patch (import from 6.5.2 ebuild)
* screencast-gio.patch (regression fix backported from 6.7)
Updated:
* musl-no-execinfo.patch (reduced, mostly fixed upstream)
* musl-no-res-ninit.patch (reduced, mostly fixed upstream)
Removed (fixed upstream):
* musl-lfs64.patch
* musl-no-canonicalize.patch
* musl-no-temp-retry.patch
* musl-no-user-vfp.patch
* musl-pthread-stack.patch
* musl-stacksize.patch
* musl-stdint.patch
* musl-systypes.patch
* narrowing-cast.patch
Still a way to go before release, so may still need updates.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 2310ef4cde61..31ce773cfa1b 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -4,4 +4,5 @@ DIST qtwebengine-5.15.10_p20230815.tar.xz 299275336 BLAKE2B 9c64f09d982086d51af7
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
DIST qtwebengine-6.5-patchset-1.tar.xz 12936 BLAKE2B f44af36689596da0177f0607cf242d9cce3c376f4a5c28d7902a6b44651ce9272d745a824580268e999c2d58b72424d72eb6027d7461184bf7f04e0223e5195f SHA512 f639eb09d18c19c7b0d422d6acdce62404be0fcce905374c5d47266340191f7ca66875680bb09d80e72db718e34b7dc6e7db5f2f16407a0edb892930513ea407
+DIST qtwebengine-6.6-patchset-1.tar.xz 9648 BLAKE2B c1bb02662ed5952e22ac3c3ee68f5787503bcc6d12d05c22090cf9ba22511c76308aa1bb751df0a822585de63694f8ce0f254558416e392abe437995e30b7e99 SHA512 a634a2976bc19ada61671bc017a4456111214cc47a40c88812465f0ba25d025b3aa4da32467c59f7053d21650f3ac72010118b3b6962d34bb347d42b9109f95f
DIST qtwebengine-everywhere-src-6.5.2.tar.xz 412356700 BLAKE2B a48a513cffbf140aab08d748bc7826e841b7e1a87d113abbd0d8e7df5b9eb1ff2a44b89ae341c161eae26fd004699a1392f811252eb25aa13e0ce8e08f6be0a1 SHA512 f5791002495ebfa9912477f39a96d28bd4f4329f636f6b2055f1b811503b3c394c3ddd7baed5643f78f1905b1e8f860b4202b5d8e4afe5791e5450b9f46eac12
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
index 603fe3d64dec..34cc431d2a98 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
@@ -12,7 +12,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs
DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
SRC_URI+="
- https://dev.gentoo.org/~ionen/distfiles/${PN}-6.5-patchset-1.tar.xz
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.6-patchset-1.tar.xz
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 603fe3d64dec..34cc431d2a98 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -12,7 +12,7 @@ inherit prefix python-any-r1 qt6-build toolchain-funcs
DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
SRC_URI+="
- https://dev.gentoo.org/~ionen/distfiles/${PN}-6.5-patchset-1.tar.xz
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.6-patchset-1.tar.xz
"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-09-13 16:42 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2023-09-13 16:42 UTC (permalink / raw
To: gentoo-commits
commit: 304b8a6226b03e31d374495ae159a5d71d0bc733
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 13 14:00:27 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Sep 13 16:40:20 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=304b8a62
dev-qt/qtwebengine: add IUSE=vaapi in 6.6+
wrt [X], it currently auto-uses va_x11.h if ozone x11 is enabled,
it *could* be optional (use_vaapi_x11) but it probably makes little
sense to introduce IUSE=X unless we can make ozone_x11 optional too.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild | 18 ++++++++++++++----
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 18 ++++++++++++++----
2 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
index dbb97f456745..603fe3d64dec 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.9999.ebuild
@@ -20,8 +20,9 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
fi
IUSE="
- +alsa bindist custom-cflags designer geolocation +jumbo-build kerberos
- opengl pdfium pulseaudio qml screencast +system-icu vulkan +widgets
+ +alsa bindist custom-cflags designer geolocation +jumbo-build
+ kerberos opengl pdfium pulseaudio qml screencast +system-icu
+ vaapi vulkan +widgets
"
REQUIRED_USE="
designer? ( qml widgets )
@@ -44,7 +45,6 @@ RDEPEND="
media-libs/lcms:2
media-libs/libjpeg-turbo:=
media-libs/libpng:=
- media-libs/libvpx:=
media-libs/libwebp:=
media-libs/openjpeg:2=
media-libs/opus
@@ -76,6 +76,12 @@ RDEPEND="
x11-libs/libdrm
)
system-icu? ( dev-libs/icu:= )
+ vaapi? (
+ media-libs/libva:=[X]
+ media-libs/mesa[gbm(+)]
+ x11-libs/libdrm
+ )
+ !vaapi? ( media-libs/libvpx:= )
widgets? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] )
"
DEPEND="
@@ -177,6 +183,7 @@ src_configure() {
$(qt_feature pulseaudio webengine_system_pulseaudio)
$(qt_feature screencast webengine_webrtc_pipewire)
$(qt_feature system-icu webengine_system_icu)
+ $(qt_feature vaapi webengine_vaapi)
$(qt_feature vulkan webengine_vulkan)
-DQT_FEATURE_webengine_embedded_build=OFF
-DQT_FEATURE_webengine_extensions=ON
@@ -195,10 +202,13 @@ src_configure() {
# (see discussions in https://github.com/gentoo/gentoo/pull/32281)
-DQT_FEATURE_webengine_system_re2=OFF
+ # bundled is currently required when using vaapi (forced regardless)
+ $(qt_feature !vaapi webengine_system_libvpx)
+
# not necessary to pass these (default), but in case detection fails
$(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
freetype glib harfbuzz lcms2 libevent libjpeg \
- libopenjpeg2 libpci libpng libtiff libvpx libwebp \
+ libopenjpeg2 libpci libpng libtiff libwebp \
libxml minizip opus poppler snappy zlib)
# TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index dbb97f456745..603fe3d64dec 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -20,8 +20,9 @@ if [[ ${QT6_BUILD_TYPE} == release ]]; then
fi
IUSE="
- +alsa bindist custom-cflags designer geolocation +jumbo-build kerberos
- opengl pdfium pulseaudio qml screencast +system-icu vulkan +widgets
+ +alsa bindist custom-cflags designer geolocation +jumbo-build
+ kerberos opengl pdfium pulseaudio qml screencast +system-icu
+ vaapi vulkan +widgets
"
REQUIRED_USE="
designer? ( qml widgets )
@@ -44,7 +45,6 @@ RDEPEND="
media-libs/lcms:2
media-libs/libjpeg-turbo:=
media-libs/libpng:=
- media-libs/libvpx:=
media-libs/libwebp:=
media-libs/openjpeg:2=
media-libs/opus
@@ -76,6 +76,12 @@ RDEPEND="
x11-libs/libdrm
)
system-icu? ( dev-libs/icu:= )
+ vaapi? (
+ media-libs/libva:=[X]
+ media-libs/mesa[gbm(+)]
+ x11-libs/libdrm
+ )
+ !vaapi? ( media-libs/libvpx:= )
widgets? ( ~dev-qt/qtdeclarative-${PV}:6[widgets] )
"
DEPEND="
@@ -177,6 +183,7 @@ src_configure() {
$(qt_feature pulseaudio webengine_system_pulseaudio)
$(qt_feature screencast webengine_webrtc_pipewire)
$(qt_feature system-icu webengine_system_icu)
+ $(qt_feature vaapi webengine_vaapi)
$(qt_feature vulkan webengine_vulkan)
-DQT_FEATURE_webengine_embedded_build=OFF
-DQT_FEATURE_webengine_extensions=ON
@@ -195,10 +202,13 @@ src_configure() {
# (see discussions in https://github.com/gentoo/gentoo/pull/32281)
-DQT_FEATURE_webengine_system_re2=OFF
+ # bundled is currently required when using vaapi (forced regardless)
+ $(qt_feature !vaapi webengine_system_libvpx)
+
# not necessary to pass these (default), but in case detection fails
$(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
freetype glib harfbuzz lcms2 libevent libjpeg \
- libopenjpeg2 libpci libpng libtiff libvpx libwebp \
+ libopenjpeg2 libpci libpng libtiff libwebp \
libxml minizip opus poppler snappy zlib)
# TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-09-09 16:22 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2023-09-09 16:22 UTC (permalink / raw
To: gentoo-commits
commit: 794ccccb83a9ee3ddb0cbcf80d8b77eab56df2ad
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 8 20:36:45 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Sep 9 16:07:21 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=794ccccb
dev-qt/qtwebengine: rename IUSE=pdf to pdfium (qt6)
This is in part a message to future revdeps that having their
own USE=pdf will not work too well given it is default on
desktop profile and we do not really want to pull webengine
by default unless really wanted. Plus gives a way to disable
globally for arches where qtwebengine is not keyworded.
At worst this will become innacurate if qtpdf changes its
backing library.
IUSE is still in live-only so should not really disrupt.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/metadata.xml | 2 +-
dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild | 6 +++---
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 6 +++---
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index 7bf30c9e28a5..ba1d70545ae8 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -13,7 +13,7 @@
<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="jumbo-build">Combine source files to speed up build process.</flag>
- <flag name="pdf">Build the QtPdf module</flag>
+ <flag name="pdfium">Build the QtPdf module based on chromium's PDFium library</flag>
<flag name="qml">Build QML/QtQuick bindings and imports</flag>
<flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg> instead of bundled.</flag>
<flag name="widgets">Enable QtWidgets support</flag>
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
index de90fe927c8f..09ccd2e4157f 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
@@ -21,7 +21,7 @@ fi
IUSE="
+alsa bindist custom-cflags designer geolocation +jumbo-build kerberos
- opengl pdf pulseaudio qml screencast +system-icu vulkan +widgets
+ opengl pdfium pulseaudio qml screencast +system-icu vulkan +widgets
"
REQUIRED_USE="
designer? ( qml widgets )
@@ -83,7 +83,7 @@ DEPEND="
x11-base/xorg-proto
x11-libs/libxshmfence
screencast? ( media-libs/libepoxy[egl(+)] )
- pdf? ( net-print/cups )
+ pdfium? ( net-print/cups )
test? (
widgets? ( app-text/poppler[cxx(+)] )
)
@@ -159,7 +159,7 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
- $(qt_feature pdf qtpdf_build)
+ $(qt_feature pdfium qtpdf_build)
$(qt_feature qml qtpdf_quick_build)
$(qt_feature widgets qtpdf_widgets_build)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 2ecd3fe98f7b..f4d5c7bf79a9 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -21,7 +21,7 @@ fi
IUSE="
+alsa bindist custom-cflags designer geolocation +jumbo-build kerberos
- opengl pdf pulseaudio qml screencast +system-icu vulkan +widgets
+ opengl pdfium pulseaudio qml screencast +system-icu vulkan +widgets
"
REQUIRED_USE="
designer? ( qml widgets )
@@ -83,7 +83,7 @@ DEPEND="
x11-base/xorg-proto
x11-libs/libxshmfence
screencast? ( media-libs/libepoxy[egl(+)] )
- pdf? ( net-print/cups )
+ pdfium? ( net-print/cups )
test? (
widgets? ( app-text/poppler[cxx(+)] )
)
@@ -158,7 +158,7 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
- $(qt_feature pdf qtpdf_build)
+ $(qt_feature pdfium qtpdf_build)
$(qt_feature qml qtpdf_quick_build)
$(qt_feature widgets qtpdf_widgets_build)
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-09-07 20:37 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2023-09-07 20:37 UTC (permalink / raw
To: gentoo-commits
commit: d2c791edc7ed0e77835178b7fd1d84321f6d46cf
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 7 06:13:28 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Sep 7 20:36:57 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2c791ed
dev-qt/qtwebengine: add IUSE=pdf for QtPdf support in live
Nothing seems too special here, so can just enable it.
Live-only given IUSE=pdf is a default on desktop profiles and will
cause a big unnecessary rebuild (nothing needs QtPdf yet). Note
that QtPdf is fairly trivial (and small'ish) after chromium bits
are already built either way, and does not hurt as a default.
Does require cups at build time (dlopen, left DEPEND-only). May be
possible to be optional but would rather no pdf-only IUSE=cups on
this big package (may revisit if someone wants this).
Would be nicer split (or allow IUSE=-webengine) but, even though the
option exists, build system files note that webengine cannot really
be disabled and then QtPdf still needs parts of chromium to be built
(splitting would cause to rebuild some of the same things twice, but
it is not nearly as big as webengine proper). May revisit.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/metadata.xml | 1 +
dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild | 9 +++++----
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 9 +++++----
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index ca6040fdb1aa..7bf30c9e28a5 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -13,6 +13,7 @@
<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="jumbo-build">Combine source files to speed up build process.</flag>
+ <flag name="pdf">Build the QtPdf module</flag>
<flag name="qml">Build QML/QtQuick bindings and imports</flag>
<flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg> instead of bundled.</flag>
<flag name="widgets">Enable QtWidgets support</flag>
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
index 4f2f7fbf799d..de90fe927c8f 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
@@ -21,7 +21,7 @@ fi
IUSE="
+alsa bindist custom-cflags designer geolocation +jumbo-build kerberos
- opengl pulseaudio qml screencast +system-icu vulkan +widgets
+ opengl pdf pulseaudio qml screencast +system-icu vulkan +widgets
"
REQUIRED_USE="
designer? ( qml widgets )
@@ -83,6 +83,7 @@ DEPEND="
x11-base/xorg-proto
x11-libs/libxshmfence
screencast? ( media-libs/libepoxy[egl(+)] )
+ pdf? ( net-print/cups )
test? (
widgets? ( app-text/poppler[cxx(+)] )
)
@@ -158,9 +159,9 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
- -DQT_FEATURE_qtpdf_build=OFF # TODO?
- -DQT_FEATURE_qtpdf_quick_build=OFF
- -DQT_FEATURE_qtpdf_widgets_build=OFF
+ $(qt_feature pdf qtpdf_build)
+ $(qt_feature qml qtpdf_quick_build)
+ $(qt_feature widgets qtpdf_widgets_build)
-DQT_FEATURE_qtwebengine_build=ON
$(qt_feature qml qtwebengine_quick_build)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 45ffa95a789a..2ecd3fe98f7b 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -21,7 +21,7 @@ fi
IUSE="
+alsa bindist custom-cflags designer geolocation +jumbo-build kerberos
- opengl pulseaudio qml screencast +system-icu vulkan +widgets
+ opengl pdf pulseaudio qml screencast +system-icu vulkan +widgets
"
REQUIRED_USE="
designer? ( qml widgets )
@@ -83,6 +83,7 @@ DEPEND="
x11-base/xorg-proto
x11-libs/libxshmfence
screencast? ( media-libs/libepoxy[egl(+)] )
+ pdf? ( net-print/cups )
test? (
widgets? ( app-text/poppler[cxx(+)] )
)
@@ -157,9 +158,9 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
- -DQT_FEATURE_qtpdf_build=OFF # TODO?
- -DQT_FEATURE_qtpdf_quick_build=OFF
- -DQT_FEATURE_qtpdf_widgets_build=OFF
+ $(qt_feature pdf qtpdf_build)
+ $(qt_feature qml qtpdf_quick_build)
+ $(qt_feature widgets qtpdf_widgets_build)
-DQT_FEATURE_qtwebengine_build=ON
$(qt_feature qml qtwebengine_quick_build)
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-09-06 1:28 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2023-09-06 1:28 UTC (permalink / raw
To: gentoo-commits
commit: 6fa466c9e66a84f17a0c4ec490adfb715c9c6827
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 6 01:26:46 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Sep 6 01:27:37 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fa466c9
dev-qt/qtwebengine: remove qtbase[X] dep (qt6)
While this currently still requires X11 dependencies,
qtbase[X] itself should not be necessary.
Sparing the revbump.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
index d00c5f329f78..45ffa95a789a 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
@@ -36,7 +36,7 @@ RDEPEND="
dev-libs/libxslt
dev-libs/nspr
dev-libs/nss
- ~dev-qt/qtbase-${PV}:6[X,gui,opengl=,vulkan?,widgets?]
+ ~dev-qt/qtbase-${PV}:6[gui,opengl=,vulkan?,widgets?]
~dev-qt/qtwebchannel-${PV}:6[qml?]
media-libs/fontconfig
media-libs/freetype
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
index d00c5f329f78..45ffa95a789a 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
@@ -36,7 +36,7 @@ RDEPEND="
dev-libs/libxslt
dev-libs/nspr
dev-libs/nss
- ~dev-qt/qtbase-${PV}:6[X,gui,opengl=,vulkan?,widgets?]
+ ~dev-qt/qtbase-${PV}:6[gui,opengl=,vulkan?,widgets?]
~dev-qt/qtwebchannel-${PV}:6[qml?]
media-libs/fontconfig
media-libs/freetype
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index d00c5f329f78..45ffa95a789a 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -36,7 +36,7 @@ RDEPEND="
dev-libs/libxslt
dev-libs/nspr
dev-libs/nss
- ~dev-qt/qtbase-${PV}:6[X,gui,opengl=,vulkan?,widgets?]
+ ~dev-qt/qtbase-${PV}:6[gui,opengl=,vulkan?,widgets?]
~dev-qt/qtwebchannel-${PV}:6[qml?]
media-libs/fontconfig
media-libs/freetype
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-09-05 13:05 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2023-09-05 13:05 UTC (permalink / raw
To: gentoo-commits
commit: d1b8e8ef131c26a47369bf8d03f372714a535308
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 31 21:09:34 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 5 13:01:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1b8e8ef
dev-qt/qtwebengine: refactor qt6 ebuild, various fixes incl. musl
Essentially a rewrite, so only have a not exhaustive summary
of changes rather than split commits.
Bugs addressed:
* respect *FLAGS wrt bug #652172 (fwics should be no issues left)
* hopefully fixed musl/libcxx (tested with llvm-musl) wrt bug #876520
(not planning to review Qt5's myself, so no changes on that end)
IUSE changes:
* enable alsa by default, finding that you have no audio options
only after building is not great and alsa is cheap
* enable widgets by default, needed by both falkon and qutebrowser
* add custom-cflags, if going to use *FLAGS then should strip-flags
like chromium's ebuild
* add opengl, unfortunately littered in QT_CONFIG(opengl) and need
qtbase[opengl=] to avoid ABI/automagic issues
* add vulkan, has its own feature so should only need qtbase[vulkan?]
* add qml similarly to other packages
Misc:
* support EXTRA_GN like qtwebengine:5 and chromium (Gentoo-specific)
* build dir went from >9GB to ~6.3GB by dropping -g1
* drop estack+extglob, setting extglob is technically not needed for
use in bash [[ ]] tests which is-flagq does
* drop INCLUDEPATH, tried to sed qmake files but this is using cmake
* respect NINJA env var to allow samu (NINJA_PATH was a no-op)
* use get_NINJAOPTS for NINJAFLAGS and ignore environment (NINJAOPTS
is the var to set for this, while NINJAFLAGS is a private
qtwebengine var, ninja does not actually use this directly)
* drop icu's bundling check for simplicity (and consistency with other
system libraries), bug #630834 prompted adding this but does not
seem so fragile anymore (plus iwdevtools would report lib misuse,
albeit not headers)
* switch to bundled re2 to be spared headaches (see github PR#32281)
* optfeature on chrome-binary-plugins for widevine support
* cleanup/reduce QT_FEATURE and old comments
* fix designer automagic
* various dependencies adjustments, wrt re2c that is only needed if
we build ninja
* do not redefine _FORTIFY_SOURCE (use gentoo's defaults), upstream
actually switched to =3 in chromium-118 (albeit only for ChromeOS)
and "hopefully" is fine for this older version (tests pass at least)
Also moved patches to a tarball (like qt5). It is simple small patches
mostly adjusting macros rather than add actual code, but was beginning
to add up.
Considered reducing RAM requirements a little bit (generally *seems*
not so bad), but there is rather bad spikes and I do not think it can
be considered safe unless we assume everyone is not using RAM for
anything else. Plus usage will likely keep growing with versions.
Bug: https://bugs.gentoo.org/652172
Bug: https://bugs.gentoo.org/876520
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/metadata.xml | 1 +
dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild | 267 +++++++++++++++++++++++++
dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild | 252 ++++++++++++-----------
dev-qt/qtwebengine/qtwebengine-6.9999.ebuild | 252 ++++++++++++-----------
5 files changed, 517 insertions(+), 256 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index a8d8ae85776c..2310ef4cde61 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -3,4 +3,5 @@ DIST qtwebengine-5.15.10_p20230815-patchset.tar.xz 44880 BLAKE2B 6179ca4ad69f922
DIST qtwebengine-5.15.10_p20230815.tar.xz 299275336 BLAKE2B 9c64f09d982086d51af7d4134f174db9c23162bc3317ea4f19e44d91a52ad63aff56bacc7ae64a2bf693d900ef3ef5231c7333eb56237123799066055fc49450 SHA512 4e6abd825d124fddc63bc8ff92e94940b829289277aa17423403c6ce168c12fff1d52b604ae127c1a0fdbca852e3795482acefbe6e506a3059c0d32bec45a709
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
+DIST qtwebengine-6.5-patchset-1.tar.xz 12936 BLAKE2B f44af36689596da0177f0607cf242d9cce3c376f4a5c28d7902a6b44651ce9272d745a824580268e999c2d58b72424d72eb6027d7461184bf7f04e0223e5195f SHA512 f639eb09d18c19c7b0d422d6acdce62404be0fcce905374c5d47266340191f7ca66875680bb09d80e72db718e34b7dc6e7db5f2f16407a0edb892930513ea407
DIST qtwebengine-everywhere-src-6.5.2.tar.xz 412356700 BLAKE2B a48a513cffbf140aab08d748bc7826e841b7e1a87d113abbd0d8e7df5b9eb1ff2a44b89ae341c161eae26fd004699a1392f811252eb25aa13e0ce8e08f6be0a1 SHA512 f5791002495ebfa9912477f39a96d28bd4f4329f636f6b2055f1b811503b3c394c3ddd7baed5643f78f1905b1e8f860b4202b5d8e4afe5791e5450b9f46eac12
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index 4e29fc2c2a66..ca6040fdb1aa 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -13,6 +13,7 @@
<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="jumbo-build">Combine source files to speed up build process.</flag>
+ <flag name="qml">Build QML/QtQuick bindings and imports</flag>
<flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg> instead of bundled.</flag>
<flag name="widgets">Enable QtWidgets support</flag>
</use>
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
new file mode 100644
index 000000000000..0b096d27620e
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
@@ -0,0 +1,267 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# py3.12: uses imp and distutils among potentially more issues, refer to
+# www-client/chromium for when adding/backporting support may be viable
+PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_REQ_USE="xml(+)"
+inherit check-reqs flag-o-matic multiprocessing optfeature
+inherit prefix python-any-r1 qt6-build toolchain-funcs
+
+DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
+SRC_URI+="
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.5-patchset-1.tar.xz
+"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64"
+fi
+
+IUSE="
+ +alsa bindist custom-cflags designer geolocation +jumbo-build kerberos
+ opengl pulseaudio qml screencast +system-icu vulkan +widgets
+"
+REQUIRED_USE="
+ designer? ( qml widgets )
+"
+
+# dlopen: krb5, pciutils, udev
+RDEPEND="
+ app-arch/snappy:=
+ dev-libs/expat
+ dev-libs/libevent:=
+ dev-libs/libxml2[icu]
+ dev-libs/libxslt
+ dev-libs/nspr
+ dev-libs/nss
+ =dev-qt/qtbase-${PV}*:6[X,gui,opengl=,vulkan?,widgets?]
+ =dev-qt/qtwebchannel-${PV}*:6[qml?]
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/harfbuzz:=
+ media-libs/lcms:2
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ media-libs/libvpx:=
+ media-libs/libwebp:=
+ media-libs/openjpeg:2=
+ media-libs/opus
+ sys-apps/dbus
+ sys-apps/pciutils
+ sys-libs/zlib:=[minizip]
+ virtual/libudev
+ x11-libs/libX11
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXrandr
+ x11-libs/libXtst
+ x11-libs/libxcb:=
+ x11-libs/libxkbcommon
+ x11-libs/libxkbfile
+ alsa? ( media-libs/alsa-lib )
+ designer? ( =dev-qt/qttools-${PV}*:6[designer] )
+ geolocation? ( =dev-qt/qtpositioning-${PV}*:6 )
+ kerberos? ( virtual/krb5 )
+ pulseaudio? ( media-libs/libpulse[glib] )
+ qml? ( =dev-qt/qtdeclarative-${PV}*:6 )
+ screencast? (
+ dev-libs/glib:2
+ media-libs/mesa[gbm(+)]
+ media-video/pipewire:=
+ x11-libs/libdrm
+ )
+ system-icu? ( dev-libs/icu:= )
+ widgets? ( =dev-qt/qtdeclarative-${PV}*:6[widgets] )
+"
+DEPEND="
+ ${RDEPEND}
+ media-libs/libglvnd
+ x11-base/xorg-proto
+ x11-libs/libxshmfence
+ screencast? ( media-libs/libepoxy[egl(+)] )
+ test? (
+ widgets? ( app-text/poppler[cxx(+)] )
+ )
+"
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
+ dev-util/gperf
+ net-libs/nodejs[ssl]
+ sys-devel/bison
+ sys-devel/flex
+"
+
+PATCHES=( "${WORKDIR}"/patches/${PN} )
+[[ ${PV} == 6.9999 ]] || # keep for 6.x.9999
+ PATCHES+=( "${WORKDIR}"/patches/chromium )
+
+PATCHES+=(
+ # add extras as needed here, may merge in set if carries across versions
+)
+
+python_check_deps() {
+ python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+}
+
+qtwebengine_check-reqs() {
+ [[ ${MERGE_TYPE} == binary ]] && return
+
+ if is-flagq '-g?(gdb)?([1-9])'; then #307861
+ ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb),"
+ ewarn "which is non-trivial with ${PN}. May experience extended"
+ ewarn "compilation times and increased disk/memory usage. If run into"
+ ewarn "issues, please disable before reporting a bug."
+ fi
+
+ local CHECKREQS_DISK_BUILD=7G
+ local CHECKREQS_DISK_USR=220M
+
+ if ! has distcc ${FEATURES}; then #830661
+ # assume ~2GB per job or 1.5GB if clang, possible with less
+ # depending on free memory and *FLAGS, but prefer being safe as
+ # users having OOM issues with qtwebengine been rather common
+ tc-is-clang && : 15 || : 20
+ local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G
+ fi
+
+ check-reqs_${EBUILD_PHASE_FUNC} #570534
+}
+
+pkg_pretend() {
+ qtwebengine_check-reqs
+}
+
+pkg_setup() {
+ qtwebengine_check-reqs
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ qt6-build_src_prepare
+
+ # for www-plugins/chrome-binary-plugins (widevine) search paths on prefix
+ hprefixify -w /Gentoo/ src/core/content_client_qt.cpp
+
+ # store chromium versions, only used in postinst for a warning
+ local chromium
+ mapfile -t chromium < CHROMIUM_VERSION || die
+ [[ ${chromium[1]} =~ ^Based.*:[^0-9]+([0-9.]+$) ]] &&
+ QT6_CHROMIUM_VER=${BASH_REMATCH[1]} || die
+ [[ ${chromium[2]} =~ ^Patched.+:[^0-9]+([0-9.]+$) ]] &&
+ QT6_CHROMIUM_PATCHES_VER=${BASH_REMATCH[1]} || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DQT_FEATURE_qtpdf_build=OFF # TODO?
+ -DQT_FEATURE_qtpdf_quick_build=OFF
+ -DQT_FEATURE_qtpdf_widgets_build=OFF
+
+ -DQT_FEATURE_qtwebengine_build=ON
+ $(qt_feature qml qtwebengine_quick_build)
+ $(qt_feature widgets qtwebengine_widgets_build)
+
+ $(cmake_use_find_package designer Qt6Designer)
+
+ $(qt_feature alsa webengine_system_alsa)
+ $(qt_feature !bindist webengine_proprietary_codecs)
+ $(qt_feature geolocation webengine_geolocation)
+ $(qt_feature jumbo-build webengine_jumbo_build)
+ $(qt_feature kerberos webengine_kerberos)
+ $(qt_feature pulseaudio webengine_system_pulseaudio)
+ $(qt_feature screencast webengine_webrtc_pipewire)
+ $(qt_feature system-icu webengine_system_icu)
+ $(qt_feature vulkan webengine_vulkan)
+ -DQT_FEATURE_webengine_embedded_build=OFF
+ -DQT_FEATURE_webengine_extensions=ON
+ -DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet
+ -DQT_FEATURE_webengine_pepper_plugins=ON
+ -DQT_FEATURE_webengine_printing_and_pdf=ON
+ -DQT_FEATURE_webengine_spellchecker=ON
+ -DQT_FEATURE_webengine_webchannel=ON
+ -DQT_FEATURE_webengine_webrtc=ON
+
+ # needs a modified ffmpeg to be usable, and even then it may not
+ # cooperate with new major ffmpeg versions (bug #831487)
+ -DQT_FEATURE_webengine_system_ffmpeg=OFF
+
+ # preemptively using bundled to avoid complications, may revisit
+ # (see discussions in https://github.com/gentoo/gentoo/pull/32281)
+ -DQT_FEATURE_webengine_system_re2=OFF
+
+ # not necessary to pass these (default), but in case detection fails
+ $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
+ freetype glib harfbuzz lcms2 libevent libjpeg \
+ libopenjpeg2 libpci libpng libvpx libwebp libxml \
+ minizip opus poppler snappy zlib)
+
+ # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
+ -DINSTALL_GN=OFF
+ )
+
+ local mygnargs=(
+ # prefer no dlopen where possible
+ link_pulseaudio=true
+ rtc_link_pipewire=true
+ )
+
+ use custom-cflags || strip-flags # fragile
+
+ export NINJA NINJAFLAGS=$(get_NINJAOPTS)
+ [[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
+
+ local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
+ einfo "Extra Gn args: ${EXTRA_GN}"
+
+ qt6-build_src_configure
+}
+
+src_test() {
+ if [[ ${EUID} == 0 ]]; then
+ # almost every tests fail, so skip entirely
+ ewarn "Skipping tests due to running as root (chromium refuses this configuration)."
+ return
+ fi
+
+ local CMAKE_SKIP_TESTS=(
+ # fails with network sandbox
+ tst_loadsignals
+ tst_qquickwebengineview
+ tst_qwebengineview
+ # certs verfication seems flaky and gives expiration warnings
+ tst_qwebengineclientcertificatestore
+ )
+
+ # prevent using the system's qtwebengine
+ # (use glob to avoid unnecessary complications with arch dir)
+ local resources=( "${BUILD_DIR}/src/core/${CMAKE_BUILD_TYPE}/"* )
+ [[ -d ${resources[0]} ]] || die "invalid resources path: ${resources[0]}"
+ local -x QTWEBENGINEPROCESS_PATH=${BUILD_DIR}${QT6_LIBEXECDIR#"${QT6_PREFIX}"}/QtWebEngineProcess
+ local -x QTWEBENGINE_LOCALES_PATH=${resources[0]}/qtwebengine_locales
+ local -x QTWEBENGINE_RESOURCES_PATH=${resources[0]}
+
+ # random failures in several tests without -j1
+ qt6-build_src_test -j1
+}
+
+pkg_postinst() {
+ # plugin may also be found in $HOME if provided by chrome or firefox
+ use amd64 &&
+ optfeature "Widevine DRM support (protected media playback)" \
+ www-plugins/chrome-binary-plugins
+
+ elog
+ elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with"
+ elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. 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
+ 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 "tl;dr your web browsing experience will be compromised."
+}
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
index 0914c4a43390..0b096d27620e 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.9999.ebuild
@@ -3,89 +3,106 @@
EAPI=8
+# py3.12: uses imp and distutils among potentially more issues, refer to
+# www-client/chromium for when adding/backporting support may be viable
PYTHON_COMPAT=( python3_{10..11} )
PYTHON_REQ_USE="xml(+)"
-inherit check-reqs estack flag-o-matic multiprocessing
+inherit check-reqs flag-o-matic multiprocessing optfeature
inherit prefix python-any-r1 qt6-build toolchain-funcs
DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
+SRC_URI+="
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.5-patchset-1.tar.xz
+"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64"
fi
IUSE="
- alsa bindist designer geolocation +jumbo-build kerberos
- pulseaudio screencast +system-icu widgets
+ +alsa bindist custom-cflags designer geolocation +jumbo-build kerberos
+ opengl pulseaudio qml screencast +system-icu vulkan +widgets
+"
+REQUIRED_USE="
+ designer? ( qml widgets )
"
-REQUIRED_USE="designer? ( widgets )"
+# dlopen: krb5, pciutils, udev
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/qtdeclarative-${PV}*:6
- =dev-qt/qtwebchannel-${PV}*:6
+ dev-libs/nspr
+ dev-libs/nss
+ =dev-qt/qtbase-${PV}*:6[X,gui,opengl=,vulkan?,widgets?]
+ =dev-qt/qtwebchannel-${PV}*:6[qml?]
media-libs/fontconfig
media-libs/freetype
media-libs/harfbuzz:=
media-libs/lcms:2
media-libs/libjpeg-turbo:=
media-libs/libpng:=
- >=media-libs/libvpx-1.5:=[svc(+)]
+ media-libs/libvpx:=
media-libs/libwebp:=
media-libs/openjpeg:2=
media-libs/opus
sys-apps/dbus
sys-apps/pciutils
- sys-libs/zlib[minizip]
+ sys-libs/zlib:=[minizip]
virtual/libudev
- x11-libs/libdrm
x11-libs/libX11
x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libxcb:=
x11-libs/libXdamage
x11-libs/libXext
x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libxkbcommon
- x11-libs/libxkbfile
x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libxshmfence:=
x11-libs/libXtst
+ x11-libs/libxcb:=
+ x11-libs/libxkbcommon
+ x11-libs/libxkbfile
alsa? ( media-libs/alsa-lib )
+ designer? ( =dev-qt/qttools-${PV}*:6[designer] )
geolocation? ( =dev-qt/qtpositioning-${PV}*:6 )
kerberos? ( virtual/krb5 )
- pulseaudio? ( media-libs/libpulse:= )
- screencast? ( media-video/pipewire:= )
- system-icu? ( >=dev-libs/icu-69.1:= )
- widgets? (
- =dev-qt/qtbase-${PV}*:6[widgets]
+ pulseaudio? ( media-libs/libpulse[glib] )
+ qml? ( =dev-qt/qtdeclarative-${PV}*:6 )
+ screencast? (
+ dev-libs/glib:2
+ media-libs/mesa[gbm(+)]
+ media-video/pipewire:=
+ x11-libs/libdrm
)
+ system-icu? ( dev-libs/icu:= )
+ widgets? ( =dev-qt/qtdeclarative-${PV}*:6[widgets] )
"
DEPEND="
${RDEPEND}
media-libs/libglvnd
+ x11-base/xorg-proto
+ x11-libs/libxshmfence
+ screencast? ( media-libs/libepoxy[egl(+)] )
+ test? (
+ widgets? ( app-text/poppler[cxx(+)] )
+ )
"
BDEPEND="
$(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
dev-util/gperf
- dev-util/ninja
- dev-util/re2c
net-libs/nodejs[ssl]
sys-devel/bison
sys-devel/flex
"
+PATCHES=( "${WORKDIR}"/patches/${PN} )
+[[ ${PV} == 6.9999 ]] || # keep for 6.x.9999
+ PATCHES+=( "${WORKDIR}"/patches/chromium )
+
+PATCHES+=(
+ # add extras as needed here, may merge in set if carries across versions
+)
+
python_check_deps() {
python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
}
@@ -93,36 +110,25 @@ python_check_deps() {
qtwebengine_check-reqs() {
[[ ${MERGE_TYPE} == binary ]] && return
- # 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
-
- # (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
+ if is-flagq '-g?(gdb)?([1-9])'; then #307861
+ ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb),"
+ ewarn "which is non-trivial with ${PN}. May experience extended"
+ ewarn "compilation times and increased disk/memory usage. If run into"
+ ewarn "issues, please disable before reporting a bug."
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
+ local CHECKREQS_DISK_BUILD=7G
+ local CHECKREQS_DISK_USR=220M
+
+ if ! has distcc ${FEATURES}; then #830661
+ # assume ~2GB per job or 1.5GB if clang, possible with less
+ # depending on free memory and *FLAGS, but prefer being safe as
+ # users having OOM issues with qtwebengine been rather common
+ tc-is-clang && : 15 || : 20
+ local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G
fi
- check-reqs_${EBUILD_PHASE_FUNC}
+ check-reqs_${EBUILD_PHASE_FUNC} #570534
}
pkg_pretend() {
@@ -137,26 +143,6 @@ pkg_setup() {
src_prepare() {
qt6-build_src_prepare
- # bug 620444 - ensure local headers are used
- find . -type f -name "*.pr[fio]" -exec \
- 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
-
# for www-plugins/chrome-binary-plugins (widevine) search paths on prefix
hprefixify -w /Gentoo/ src/core/content_client_qt.cpp
@@ -170,63 +156,67 @@ src_prepare() {
}
src_configure() {
- export NINJA_PATH=${BROOT}/usr/bin/ninja
- export NINJAFLAGS=${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}
-
local mycmakeargs=(
- #-DQT_FEATURE_accessibility=off
- #-DQT_FEATURE_force_asserts=off
- #-DQT_FEATURE_opengl=off
- #-DQT_FEATURE_printer=off
- -DQT_FEATURE_qtpdf_build=off
- -DQT_FEATURE_qtpdf_quick_build=off
- -DQT_FEATURE_qtpdf_widgets_build=off
- -DQT_FEATURE_qtwebengine_build=on
- -DQT_FEATURE_qtwebengine_quick_build=on
- -DQT_FEATURE_qtwebengine_widgets_build=on
- #-DQT_FEATURE_ssl=off
- #-DQT_FEATURE_static=off
- #-DQT_FEATURE_system_zlib=off
- #-DQT_FEATURE_system_png=off
- #-DQT_FEATURE_system_jpeg=off
- #-DQT_FEATURE_system_freetype=off
- #-DQT_FEATURE_system_harfbuzz=off
- #-DQT_FEATURE_use_gold_linker=off
- #-DQT_FEATURE_use_lld_linker=off
- -DQT_FEATURE_webengine_embedded_build=off
- -DQT_FEATURE_webengine_extensions=on
- #-DQT_FEATURE_webengine_full_debug_info=$(usex debug)
- -DQT_FEATURE_webengine_geolocation=$(usex geolocation on off)
- -DQT_FEATURE_webengine_jumbo_build=$(usex jumbo-build)
- #-DQT_FEATURE_webengine_jumbo_file_merge_limit
- -DQT_FEATURE_webengine_kerberos=$(usex kerberos on off)
- -DQT_FEATURE_webengine_native_spellchecker=off
- -DQT_FEATURE_webengine_ozone_x11=on
- -DQT_FEATURE_webengine_pepper_plugins=on
- -DQT_FEATURE_webengine_proprietary_codecs=$(usex bindist off on)
- -DQT_FEATURE_webengine_printing_and_pdf=on
- -DQT_FEATURE_webengine_sanitizer=on
- -DQT_FEATURE_webengine_spellchecker=on
- -DQT_FEATURE_webengine_system_opus=on
- -DQT_FEATURE_webengine_system_libwebp=on
- -DQT_FEATURE_webengine_system_alsa=$(usex alsa on off)
- -DQT_FEATURE_webengine_system_ffmpeg=off # https://bugs.gentoo.org/831487
- -DQT_FEATURE_webengine_system_icu=$(usex system-icu)
- -DQT_FEATURE_webengine_system_libevent=on
- -DQT_FEATURE_webengine_system_libopenjpeg2=on
- -DQT_FEATURE_webengine_system_libpci=on
- -DQT_FEATURE_webengine_system_libpng=on
- -DQT_FEATURE_webengine_system_pulseaudio=$(usex pulseaudio on off)
- -DQT_FEATURE_webengine_system_zlib=on
- -DQT_FEATURE_webengine_webchannel=on
- -DQT_FEATURE_webengine_webrtc=on
- -DQT_FEATURE_webengine_webrtc_pipewire=$(usex screencast on off)
- #-DQT_FEATURE_xcb=off
-
- # TODO: fix gn cross build or split + depend on dev-qt/qtwebengine-gn
- -DINSTALL_GN=off
+ -DQT_FEATURE_qtpdf_build=OFF # TODO?
+ -DQT_FEATURE_qtpdf_quick_build=OFF
+ -DQT_FEATURE_qtpdf_widgets_build=OFF
+
+ -DQT_FEATURE_qtwebengine_build=ON
+ $(qt_feature qml qtwebengine_quick_build)
+ $(qt_feature widgets qtwebengine_widgets_build)
+
+ $(cmake_use_find_package designer Qt6Designer)
+
+ $(qt_feature alsa webengine_system_alsa)
+ $(qt_feature !bindist webengine_proprietary_codecs)
+ $(qt_feature geolocation webengine_geolocation)
+ $(qt_feature jumbo-build webengine_jumbo_build)
+ $(qt_feature kerberos webengine_kerberos)
+ $(qt_feature pulseaudio webengine_system_pulseaudio)
+ $(qt_feature screencast webengine_webrtc_pipewire)
+ $(qt_feature system-icu webengine_system_icu)
+ $(qt_feature vulkan webengine_vulkan)
+ -DQT_FEATURE_webengine_embedded_build=OFF
+ -DQT_FEATURE_webengine_extensions=ON
+ -DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet
+ -DQT_FEATURE_webengine_pepper_plugins=ON
+ -DQT_FEATURE_webengine_printing_and_pdf=ON
+ -DQT_FEATURE_webengine_spellchecker=ON
+ -DQT_FEATURE_webengine_webchannel=ON
+ -DQT_FEATURE_webengine_webrtc=ON
+
+ # needs a modified ffmpeg to be usable, and even then it may not
+ # cooperate with new major ffmpeg versions (bug #831487)
+ -DQT_FEATURE_webengine_system_ffmpeg=OFF
+
+ # preemptively using bundled to avoid complications, may revisit
+ # (see discussions in https://github.com/gentoo/gentoo/pull/32281)
+ -DQT_FEATURE_webengine_system_re2=OFF
+
+ # not necessary to pass these (default), but in case detection fails
+ $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
+ freetype glib harfbuzz lcms2 libevent libjpeg \
+ libopenjpeg2 libpci libpng libvpx libwebp libxml \
+ minizip opus poppler snappy zlib)
+
+ # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
+ -DINSTALL_GN=OFF
+ )
+
+ local mygnargs=(
+ # prefer no dlopen where possible
+ link_pulseaudio=true
+ rtc_link_pipewire=true
)
+ use custom-cflags || strip-flags # fragile
+
+ export NINJA NINJAFLAGS=$(get_NINJAOPTS)
+ [[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
+
+ local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
+ einfo "Extra Gn args: ${EXTRA_GN}"
+
qt6-build_src_configure
}
@@ -259,6 +249,12 @@ src_test() {
}
pkg_postinst() {
+ # plugin may also be found in $HOME if provided by chrome or firefox
+ use amd64 &&
+ optfeature "Widevine DRM support (protected media playback)" \
+ www-plugins/chrome-binary-plugins
+
+ elog
elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with"
elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. Extensive as it is, the"
elog "list of backports is impossible to evaluate, but always bound to be behind"
diff --git a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
index 0914c4a43390..0b096d27620e 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.9999.ebuild
@@ -3,89 +3,106 @@
EAPI=8
+# py3.12: uses imp and distutils among potentially more issues, refer to
+# www-client/chromium for when adding/backporting support may be viable
PYTHON_COMPAT=( python3_{10..11} )
PYTHON_REQ_USE="xml(+)"
-inherit check-reqs estack flag-o-matic multiprocessing
+inherit check-reqs flag-o-matic multiprocessing optfeature
inherit prefix python-any-r1 qt6-build toolchain-funcs
DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
+SRC_URI+="
+ https://dev.gentoo.org/~ionen/distfiles/${PN}-6.5-patchset-1.tar.xz
+"
if [[ ${QT6_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64"
fi
IUSE="
- alsa bindist designer geolocation +jumbo-build kerberos
- pulseaudio screencast +system-icu widgets
+ +alsa bindist custom-cflags designer geolocation +jumbo-build kerberos
+ opengl pulseaudio qml screencast +system-icu vulkan +widgets
+"
+REQUIRED_USE="
+ designer? ( qml widgets )
"
-REQUIRED_USE="designer? ( widgets )"
+# dlopen: krb5, pciutils, udev
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/qtdeclarative-${PV}*:6
- =dev-qt/qtwebchannel-${PV}*:6
+ dev-libs/nspr
+ dev-libs/nss
+ =dev-qt/qtbase-${PV}*:6[X,gui,opengl=,vulkan?,widgets?]
+ =dev-qt/qtwebchannel-${PV}*:6[qml?]
media-libs/fontconfig
media-libs/freetype
media-libs/harfbuzz:=
media-libs/lcms:2
media-libs/libjpeg-turbo:=
media-libs/libpng:=
- >=media-libs/libvpx-1.5:=[svc(+)]
+ media-libs/libvpx:=
media-libs/libwebp:=
media-libs/openjpeg:2=
media-libs/opus
sys-apps/dbus
sys-apps/pciutils
- sys-libs/zlib[minizip]
+ sys-libs/zlib:=[minizip]
virtual/libudev
- x11-libs/libdrm
x11-libs/libX11
x11-libs/libXcomposite
- x11-libs/libXcursor
- x11-libs/libxcb:=
x11-libs/libXdamage
x11-libs/libXext
x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libxkbcommon
- x11-libs/libxkbfile
x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libxshmfence:=
x11-libs/libXtst
+ x11-libs/libxcb:=
+ x11-libs/libxkbcommon
+ x11-libs/libxkbfile
alsa? ( media-libs/alsa-lib )
+ designer? ( =dev-qt/qttools-${PV}*:6[designer] )
geolocation? ( =dev-qt/qtpositioning-${PV}*:6 )
kerberos? ( virtual/krb5 )
- pulseaudio? ( media-libs/libpulse:= )
- screencast? ( media-video/pipewire:= )
- system-icu? ( >=dev-libs/icu-69.1:= )
- widgets? (
- =dev-qt/qtbase-${PV}*:6[widgets]
+ pulseaudio? ( media-libs/libpulse[glib] )
+ qml? ( =dev-qt/qtdeclarative-${PV}*:6 )
+ screencast? (
+ dev-libs/glib:2
+ media-libs/mesa[gbm(+)]
+ media-video/pipewire:=
+ x11-libs/libdrm
)
+ system-icu? ( dev-libs/icu:= )
+ widgets? ( =dev-qt/qtdeclarative-${PV}*:6[widgets] )
"
DEPEND="
${RDEPEND}
media-libs/libglvnd
+ x11-base/xorg-proto
+ x11-libs/libxshmfence
+ screencast? ( media-libs/libepoxy[egl(+)] )
+ test? (
+ widgets? ( app-text/poppler[cxx(+)] )
+ )
"
BDEPEND="
$(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
dev-util/gperf
- dev-util/ninja
- dev-util/re2c
net-libs/nodejs[ssl]
sys-devel/bison
sys-devel/flex
"
+PATCHES=( "${WORKDIR}"/patches/${PN} )
+[[ ${PV} == 6.9999 ]] || # keep for 6.x.9999
+ PATCHES+=( "${WORKDIR}"/patches/chromium )
+
+PATCHES+=(
+ # add extras as needed here, may merge in set if carries across versions
+)
+
python_check_deps() {
python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
}
@@ -93,36 +110,25 @@ python_check_deps() {
qtwebengine_check-reqs() {
[[ ${MERGE_TYPE} == binary ]] && return
- # 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
-
- # (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
+ if is-flagq '-g?(gdb)?([1-9])'; then #307861
+ ewarn "Used CFLAGS/CXXFLAGS seem to enable debug info (-g or -ggdb),"
+ ewarn "which is non-trivial with ${PN}. May experience extended"
+ ewarn "compilation times and increased disk/memory usage. If run into"
+ ewarn "issues, please disable before reporting a bug."
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
+ local CHECKREQS_DISK_BUILD=7G
+ local CHECKREQS_DISK_USR=220M
+
+ if ! has distcc ${FEATURES}; then #830661
+ # assume ~2GB per job or 1.5GB if clang, possible with less
+ # depending on free memory and *FLAGS, but prefer being safe as
+ # users having OOM issues with qtwebengine been rather common
+ tc-is-clang && : 15 || : 20
+ local CHECKREQS_MEMORY=$(($(makeopts_jobs)*_/10))G
fi
- check-reqs_${EBUILD_PHASE_FUNC}
+ check-reqs_${EBUILD_PHASE_FUNC} #570534
}
pkg_pretend() {
@@ -137,26 +143,6 @@ pkg_setup() {
src_prepare() {
qt6-build_src_prepare
- # bug 620444 - ensure local headers are used
- find . -type f -name "*.pr[fio]" -exec \
- 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
-
# for www-plugins/chrome-binary-plugins (widevine) search paths on prefix
hprefixify -w /Gentoo/ src/core/content_client_qt.cpp
@@ -170,63 +156,67 @@ src_prepare() {
}
src_configure() {
- export NINJA_PATH=${BROOT}/usr/bin/ninja
- export NINJAFLAGS=${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}
-
local mycmakeargs=(
- #-DQT_FEATURE_accessibility=off
- #-DQT_FEATURE_force_asserts=off
- #-DQT_FEATURE_opengl=off
- #-DQT_FEATURE_printer=off
- -DQT_FEATURE_qtpdf_build=off
- -DQT_FEATURE_qtpdf_quick_build=off
- -DQT_FEATURE_qtpdf_widgets_build=off
- -DQT_FEATURE_qtwebengine_build=on
- -DQT_FEATURE_qtwebengine_quick_build=on
- -DQT_FEATURE_qtwebengine_widgets_build=on
- #-DQT_FEATURE_ssl=off
- #-DQT_FEATURE_static=off
- #-DQT_FEATURE_system_zlib=off
- #-DQT_FEATURE_system_png=off
- #-DQT_FEATURE_system_jpeg=off
- #-DQT_FEATURE_system_freetype=off
- #-DQT_FEATURE_system_harfbuzz=off
- #-DQT_FEATURE_use_gold_linker=off
- #-DQT_FEATURE_use_lld_linker=off
- -DQT_FEATURE_webengine_embedded_build=off
- -DQT_FEATURE_webengine_extensions=on
- #-DQT_FEATURE_webengine_full_debug_info=$(usex debug)
- -DQT_FEATURE_webengine_geolocation=$(usex geolocation on off)
- -DQT_FEATURE_webengine_jumbo_build=$(usex jumbo-build)
- #-DQT_FEATURE_webengine_jumbo_file_merge_limit
- -DQT_FEATURE_webengine_kerberos=$(usex kerberos on off)
- -DQT_FEATURE_webengine_native_spellchecker=off
- -DQT_FEATURE_webengine_ozone_x11=on
- -DQT_FEATURE_webengine_pepper_plugins=on
- -DQT_FEATURE_webengine_proprietary_codecs=$(usex bindist off on)
- -DQT_FEATURE_webengine_printing_and_pdf=on
- -DQT_FEATURE_webengine_sanitizer=on
- -DQT_FEATURE_webengine_spellchecker=on
- -DQT_FEATURE_webengine_system_opus=on
- -DQT_FEATURE_webengine_system_libwebp=on
- -DQT_FEATURE_webengine_system_alsa=$(usex alsa on off)
- -DQT_FEATURE_webengine_system_ffmpeg=off # https://bugs.gentoo.org/831487
- -DQT_FEATURE_webengine_system_icu=$(usex system-icu)
- -DQT_FEATURE_webengine_system_libevent=on
- -DQT_FEATURE_webengine_system_libopenjpeg2=on
- -DQT_FEATURE_webengine_system_libpci=on
- -DQT_FEATURE_webengine_system_libpng=on
- -DQT_FEATURE_webengine_system_pulseaudio=$(usex pulseaudio on off)
- -DQT_FEATURE_webengine_system_zlib=on
- -DQT_FEATURE_webengine_webchannel=on
- -DQT_FEATURE_webengine_webrtc=on
- -DQT_FEATURE_webengine_webrtc_pipewire=$(usex screencast on off)
- #-DQT_FEATURE_xcb=off
-
- # TODO: fix gn cross build or split + depend on dev-qt/qtwebengine-gn
- -DINSTALL_GN=off
+ -DQT_FEATURE_qtpdf_build=OFF # TODO?
+ -DQT_FEATURE_qtpdf_quick_build=OFF
+ -DQT_FEATURE_qtpdf_widgets_build=OFF
+
+ -DQT_FEATURE_qtwebengine_build=ON
+ $(qt_feature qml qtwebengine_quick_build)
+ $(qt_feature widgets qtwebengine_widgets_build)
+
+ $(cmake_use_find_package designer Qt6Designer)
+
+ $(qt_feature alsa webengine_system_alsa)
+ $(qt_feature !bindist webengine_proprietary_codecs)
+ $(qt_feature geolocation webengine_geolocation)
+ $(qt_feature jumbo-build webengine_jumbo_build)
+ $(qt_feature kerberos webengine_kerberos)
+ $(qt_feature pulseaudio webengine_system_pulseaudio)
+ $(qt_feature screencast webengine_webrtc_pipewire)
+ $(qt_feature system-icu webengine_system_icu)
+ $(qt_feature vulkan webengine_vulkan)
+ -DQT_FEATURE_webengine_embedded_build=OFF
+ -DQT_FEATURE_webengine_extensions=ON
+ -DQT_FEATURE_webengine_ozone_x11=ON # needed, cannot do optional X yet
+ -DQT_FEATURE_webengine_pepper_plugins=ON
+ -DQT_FEATURE_webengine_printing_and_pdf=ON
+ -DQT_FEATURE_webengine_spellchecker=ON
+ -DQT_FEATURE_webengine_webchannel=ON
+ -DQT_FEATURE_webengine_webrtc=ON
+
+ # needs a modified ffmpeg to be usable, and even then it may not
+ # cooperate with new major ffmpeg versions (bug #831487)
+ -DQT_FEATURE_webengine_system_ffmpeg=OFF
+
+ # preemptively using bundled to avoid complications, may revisit
+ # (see discussions in https://github.com/gentoo/gentoo/pull/32281)
+ -DQT_FEATURE_webengine_system_re2=OFF
+
+ # not necessary to pass these (default), but in case detection fails
+ $(printf -- '-DQT_FEATURE_webengine_system_%s=ON ' \
+ freetype glib harfbuzz lcms2 libevent libjpeg \
+ libopenjpeg2 libpci libpng libvpx libwebp libxml \
+ minizip opus poppler snappy zlib)
+
+ # TODO: fixup gn cross, or package dev-qt/qtwebengine-gn with =ON
+ -DINSTALL_GN=OFF
+ )
+
+ local mygnargs=(
+ # prefer no dlopen where possible
+ link_pulseaudio=true
+ rtc_link_pipewire=true
)
+ use custom-cflags || strip-flags # fragile
+
+ export NINJA NINJAFLAGS=$(get_NINJAOPTS)
+ [[ ${NINJA_VERBOSE^^} == OFF ]] || NINJAFLAGS+=" -v"
+
+ local -x EXTRA_GN="${mygnargs[*]} ${EXTRA_GN}"
+ einfo "Extra Gn args: ${EXTRA_GN}"
+
qt6-build_src_configure
}
@@ -259,6 +249,12 @@ src_test() {
}
pkg_postinst() {
+ # plugin may also be found in $HOME if provided by chrome or firefox
+ use amd64 &&
+ optfeature "Widevine DRM support (protected media playback)" \
+ www-plugins/chrome-binary-plugins
+
+ elog
elog "This version of Qt WebEngine is based on Chromium version ${QT6_CHROMIUM_VER}, with"
elog "additional security fixes up to ${QT6_CHROMIUM_PATCHES_VER}. Extensive as it is, the"
elog "list of backports is impossible to evaluate, but always bound to be behind"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-09-05 13:05 Ionen Wolkens
0 siblings, 0 replies; 301+ messages in thread
From: Ionen Wolkens @ 2023-09-05 13:05 UTC (permalink / raw
To: gentoo-commits
commit: 2a58daaa62534c18ba80ddbc40ca3a7df63c5103
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 1 07:33:30 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Sep 5 13:01:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a58daaa
dev-qt/qtwebengine: switch to global USE for geolocation
Fixes ProbableGlobalUse, knowing it's done through
qtpositioning does not seem particularly useful.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
dev-qt/qtwebengine/metadata.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index 2df7b72763ab..4e29fc2c2a66 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -12,7 +12,6 @@
</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>
<flag name="jumbo-build">Combine source files to speed up build process.</flag>
<flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg> instead of bundled.</flag>
<flag name="widgets">Enable QtWidgets support</flag>
^ permalink raw reply related [flat|nested] 301+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-08-26 11:56 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2023-08-26 11:56 UTC (permalink / raw
To: gentoo-commits
commit: f371276d06c8bb67cfbcefcded9114b7eaac2c49
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 26 11:37:26 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 26 11:56:28 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f371276d
dev-qt/qtwebengine: add 5.15.10_p20230815
Bug: https://bugs.gentoo.org/913050
Bug: https://bugs.gentoo.org/913051
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 2 +
.../qtwebengine-5.15.10_p20230815.ebuild | 267 +++++++++++++++++++++
2 files changed, 269 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index ccfd59ce9f34..a8d8ae85776c 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,4 +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.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
DIST qtwebengine-everywhere-src-6.5.2.tar.xz 412356700 BLAKE2B a48a513cffbf140aab08d748bc7826e841b7e1a87d113abbd0d8e7df5b9eb1ff2a44b89ae341c161eae26fd004699a1392f811252eb25aa13e0ce8e08f6be0a1 SHA512 f5791002495ebfa9912477f39a96d28bd4f4329f636f6b2055f1b811503b3c394c3ddd7baed5643f78f1905b1e8f860b4202b5d8e4afe5791e5450b9f46eac12
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.10_p20230815.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.10_p20230815.ebuild
new file mode 100644
index 000000000000..d77b298fdba3
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.10_p20230815.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PATCHSET="${P}-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() {
+ 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."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-07-21 2:52 Jimi Huotari
0 siblings, 0 replies; 301+ messages in thread
From: Jimi Huotari @ 2023-07-21 2:52 UTC (permalink / raw
To: gentoo-commits
commit: 3d3f40761330a8f2151aa381ac9ccc42279ea781
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 21 02:51:14 2023 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Fri Jul 21 02:51:14 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d3f4076
dev-qt/qtwebengine: update 6.5.2 Chromium security patches version
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.5.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.2.ebuild
index 062731444eb5..bad90757778b 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{9..11} )
PYTHON_REQ_USE="xml(+)"
CHROMIUM_VER="108.0.5359.181"
-CHROMIUM_PATCHES_VER="113.0.5672.126"
+CHROMIUM_PATCHES_VER="114.0.5735.133"
inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-07-20 19:41 Jimi Huotari
0 siblings, 0 replies; 301+ messages in thread
From: Jimi Huotari @ 2023-07-20 19:41 UTC (permalink / raw
To: gentoo-commits
commit: 05e18c38f8c24e72114fb255e82e188389635167
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 20 19:33:45 2023 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Thu Jul 20 19:41:01 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05e18c38
dev-qt/qtwebengine: add 6.5.2
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-6.5.2.ebuild | 244 ++++++++++++++++++++++++++++
2 files changed, 245 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 8a68922e234c..e9a3fda5b3d3 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -2,3 +2,4 @@ DIST qtwebengine-5.15.10_p20230623.tar.xz 299264220 BLAKE2B 93afb88f79a6675dc581
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
DIST qtwebengine-everywhere-src-6.5.1.tar.xz 412377436 BLAKE2B 1ff179daf1433246b931558f52f1cf193eff4a1d646e6f6037a40fe85fa28cf944b7f361fd68cb01b1247680d376762c2c5317be125f5b24cc08e4bbfa6f0def SHA512 68aae60184af6189b70207a458458a3dab23d49891f12ac57ede01a0eb43c403378e7d85baa074d3b12120624eff78d674cbd9112f7d1be84c33ce9bf95ca428
+DIST qtwebengine-everywhere-src-6.5.2.tar.xz 412356700 BLAKE2B a48a513cffbf140aab08d748bc7826e841b7e1a87d113abbd0d8e7df5b9eb1ff2a44b89ae341c161eae26fd004699a1392f811252eb25aa13e0ce8e08f6be0a1 SHA512 f5791002495ebfa9912477f39a96d28bd4f4329f636f6b2055f1b811503b3c394c3ddd7baed5643f78f1905b1e8f860b4202b5d8e4afe5791e5450b9f46eac12
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.2.ebuild
new file mode 100644
index 000000000000..062731444eb5
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.2.ebuild
@@ -0,0 +1,244 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="xml(+)"
+CHROMIUM_VER="108.0.5359.181"
+CHROMIUM_PATCHES_VER="113.0.5672.126"
+
+inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
+
+DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64"
+fi
+
+IUSE="
+ alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast
+ +system-icu widgets
+"
+REQUIRED_USE="designer? ( widgets )"
+
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
+ dev-util/gperf
+ dev-util/ninja
+ dev-util/re2c
+ net-libs/nodejs[ssl]
+ sys-devel/bison
+ sys-devel/flex
+"
+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/qtdeclarative-${PV}*
+ =dev-qt/qtwebchannel-${PV}*
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/harfbuzz:=
+ media-libs/lcms:2
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ >=media-libs/libvpx-1.5:=[svc(+)]
+ media-libs/libwebp:=
+ media-libs/openjpeg:2=
+ 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/libxcb:=
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libxkbcommon
+ x11-libs/libxkbfile
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXScrnSaver
+ x11-libs/libxshmfence:=
+ x11-libs/libXtst
+ alsa? ( media-libs/alsa-lib )
+ geolocation? ( =dev-qt/qtpositioning-${PV}* )
+ kerberos? ( virtual/krb5 )
+ pulseaudio? ( media-libs/libpulse:= )
+ screencast? ( media-video/pipewire:= )
+ system-icu? ( >=dev-libs/icu-69.1:= )
+ widgets? (
+ =dev-qt/qtbase-${PV}*[widgets]
+ )
+"
+DEPEND="${RDEPEND}
+ media-libs/libglvnd
+"
+
+python_check_deps() {
+ python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+}
+
+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
+}
+
+pkg_preinst() {
+ elog "This version of Qt WebEngine is based on Chromium version ${CHROMIUM_VER}, with"
+ elog "additional security fixes up to ${CHROMIUM_PATCHES_VER}. 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."
+}
+
+src_unpack() {
+ # bug 307861
+ eshopts_push -s extglob
+ if is-flagq '-g?(gdb)?([1-9])'; then
+ ewarn
+ 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."
+ ewarn
+ fi
+ eshopts_pop
+
+ case ${QT6_BUILD_TYPE} in
+ live) git-r3_src_unpack ;&
+ release) default ;;
+ esac
+}
+
+src_prepare() {
+ # bug 620444 - ensure local headers are used
+ find . -type f -name "*.pr[fio]" -exec \
+ 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
+
+ qt6-build_src_prepare
+}
+
+src_configure() {
+ export NINJA_PATH="${BROOT}"/usr/bin/ninja
+ export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
+
+ local mycmakeargs=(
+ #-DQT_FEATURE_accessibility=off
+ #-DQT_FEATURE_force_asserts=off
+ #-DQT_FEATURE_opengl=off
+ #-DQT_FEATURE_printer=off
+ -DQT_FEATURE_qtpdf_build=off
+ -DQT_FEATURE_qtpdf_quick_build=off
+ -DQT_FEATURE_qtpdf_widgets_build=off
+ -DQT_FEATURE_qtwebengine_build=on
+ -DQT_FEATURE_qtwebengine_quick_build=on
+ -DQT_FEATURE_qtwebengine_widgets_build=on
+ #-DQT_FEATURE_ssl=off
+ #-DQT_FEATURE_static=off
+ #-DQT_FEATURE_system_zlib=off
+ #-DQT_FEATURE_system_png=off
+ #-DQT_FEATURE_system_jpeg=off
+ #-DQT_FEATURE_system_freetype=off
+ #-DQT_FEATURE_system_harfbuzz=off
+ #-DQT_FEATURE_use_gold_linker=off
+ #-DQT_FEATURE_use_lld_linker=off
+ -DQT_FEATURE_webengine_embedded_build=off
+ -DQT_FEATURE_webengine_extensions=on
+ #-DQT_FEATURE_webengine_full_debug_info=$(usex debug)
+ -DQT_FEATURE_webengine_geolocation=$(usex geolocation on off)
+ -DQT_FEATURE_webengine_jumbo_build=$(usex jumbo-build)
+ #-DQT_FEATURE_webengine_jumbo_file_merge_limit
+ -DQT_FEATURE_webengine_kerberos=$(usex kerberos on off)
+ -DQT_FEATURE_webengine_native_spellchecker=off
+ -DQT_FEATURE_webengine_ozone_x11=on
+ -DQT_FEATURE_webengine_pepper_plugins=on
+ -DQT_FEATURE_webengine_proprietary_codecs=$(usex bindist off on)
+ -DQT_FEATURE_webengine_printing_and_pdf=on
+ -DQT_FEATURE_webengine_sanitizer=on
+ -DQT_FEATURE_webengine_spellchecker=on
+ -DQT_FEATURE_webengine_system_opus=on
+ -DQT_FEATURE_webengine_system_libwebp=on
+ -DQT_FEATURE_webengine_system_alsa=$(usex alsa on off)
+ -DQT_FEATURE_webengine_system_ffmpeg=off # https://bugs.gentoo.org/831487
+ -DQT_FEATURE_webengine_system_icu=$(usex system-icu)
+ -DQT_FEATURE_webengine_system_libevent=on
+ -DQT_FEATURE_webengine_system_libopenjpeg2=on
+ -DQT_FEATURE_webengine_system_libpci=on
+ -DQT_FEATURE_webengine_system_libpng=on
+ -DQT_FEATURE_webengine_system_pulseaudio=$(usex pulseaudio on off)
+ -DQT_FEATURE_webengine_system_zlib=on
+ -DQT_FEATURE_webengine_webchannel=on
+ -DQT_FEATURE_webengine_webrtc=on
+ -DQT_FEATURE_webengine_webrtc_pipewire=$(usex screencast on off)
+ #-DQT_FEATURE_xcb=off
+ )
+
+ qt6-build_src_configure
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-07-13 8:42 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2023-07-13 8:42 UTC (permalink / raw
To: gentoo-commits
commit: bb5fab846ae931348e67bfbb9449edcfd292b956
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 13 07:36:05 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 13 08:42:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb5fab84
dev-qt/qtwebengine: drop 5.15.9_p20230505, 5.15.10_p20230505
Bug: https://bugs.gentoo.org/906857
Bug: https://bugs.gentoo.org/909778
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 -
.../qtwebengine-5.15.10_p20230505.ebuild | 269 ---------------------
.../qtwebengine-5.15.9_p20230505.ebuild | 269 ---------------------
3 files changed, 539 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 9ef8749c01cd..8a68922e234c 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,5 +1,4 @@
DIST qtwebengine-5.15.10_p20230623.tar.xz 299264220 BLAKE2B 93afb88f79a6675dc58123831d0555a60d28428b93d32e185c21eb25401dfeeeee727ca20fc0ba3bda4ff2a298950e081a2eadcaeea095261941fe0d56b0d668 SHA512 9027899474d9d9dec5a5ca1e80e49404a0df2e23fe1666a437c07e99cbbbf787afd619eccf3d901545ed0a865c5fb439dce64f8339cbeb09213a0d4404456543
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
-DIST qtwebengine-5.15.9_p20230505.tar.xz 298713240 BLAKE2B 835e93a0b33e7294d72571c9031524a0e3002100e36433501cc83bac91646b788c1030ee9ce90edce39c6ee2ee61a1d697e021b6346804d3be0f0b930e6084d0 SHA512 61d16399a7d8f5c135c5c097c2dcb7ebeccfe7e31769e950443ffa8178f55ad22d90307b7bd2b2ebdcb3ee0dd2064266159c27da4fc5b35ddac346ca9f336cc1
DIST qtwebengine-everywhere-src-6.5.1.tar.xz 412377436 BLAKE2B 1ff179daf1433246b931558f52f1cf193eff4a1d646e6f6037a40fe85fa28cf944b7f361fd68cb01b1247680d376762c2c5317be125f5b24cc08e4bbfa6f0def SHA512 68aae60184af6189b70207a458458a3dab23d49891f12ac57ede01a0eb43c403378e7d85baa074d3b12120624eff78d674cbd9112f7d1be84c33ce9bf95ca428
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.10_p20230505.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.10_p20230505.ebuild
deleted file mode 100644
index 17c0ac67b5e6..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.10_p20230505.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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/10_p/9_p}.tar.xz"
- S="${WORKDIR}/${P/10_p/9_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/${PN}-5.15.8_p20230313-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}/${PN}-5.15.8_p20230313-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}"/qtwebengine-5.15.8_p20230313-patchset/015-gcc13.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."
-}
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230505.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230505.ebuild
deleted file mode 100644
index ce07a4c85372..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230505.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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/${PN}-5.15.8_p20230313-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}/${PN}-5.15.8_p20230313-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}"/qtwebengine-5.15.8_p20230313-patchset/015-gcc13.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."
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-07-09 17:00 Arthur Zamarin
0 siblings, 0 replies; 301+ messages in thread
From: Arthur Zamarin @ 2023-07-09 17:00 UTC (permalink / raw
To: gentoo-commits
commit: ffc9d4f7ae0b056ce274c1f61ea9dd5d7c5a3f4e
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 9 16:59:17 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 9 16:59:17 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffc9d4f7
dev-qt/qtwebengine: Stabilize 5.15.10_p20230623 amd64, #909313
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.10_p20230623.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.10_p20230623.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.10_p20230623.ebuild
index a04fccf21565..ce07a4c85372 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.10_p20230623.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.10_p20230623.ebuild
@@ -11,7 +11,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 ~ppc64 ~x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-07-06 17:17 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2023-07-06 17:17 UTC (permalink / raw
To: gentoo-commits
commit: 889551ac2facf734cf81217fa3fbd3951c50e037
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 6 17:09:05 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 6 17:16:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=889551ac
dev-qt/qtwebengine: add 5.15.10_p20230623
Bug: https://bugs.gentoo.org/909313
Bug: https://bugs.gentoo.org/909778
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
.../qtwebengine-5.15.10_p20230623.ebuild | 269 +++++++++++++++++++++
2 files changed, 270 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 6cbfc321ebb4..9ef8749c01cd 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,3 +1,4 @@
+DIST qtwebengine-5.15.10_p20230623.tar.xz 299264220 BLAKE2B 93afb88f79a6675dc58123831d0555a60d28428b93d32e185c21eb25401dfeeeee727ca20fc0ba3bda4ff2a298950e081a2eadcaeea095261941fe0d56b0d668 SHA512 9027899474d9d9dec5a5ca1e80e49404a0df2e23fe1666a437c07e99cbbbf787afd619eccf3d901545ed0a865c5fb439dce64f8339cbeb09213a0d4404456543
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
DIST qtwebengine-5.15.9_p20230505.tar.xz 298713240 BLAKE2B 835e93a0b33e7294d72571c9031524a0e3002100e36433501cc83bac91646b788c1030ee9ce90edce39c6ee2ee61a1d697e021b6346804d3be0f0b930e6084d0 SHA512 61d16399a7d8f5c135c5c097c2dcb7ebeccfe7e31769e950443ffa8178f55ad22d90307b7bd2b2ebdcb3ee0dd2064266159c27da4fc5b35ddac346ca9f336cc1
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.10_p20230623.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.10_p20230623.ebuild
new file mode 100644
index 000000000000..af47654684b8
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.10_p20230623.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/${PN}-5.15.8_p20230313-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}/${PN}-5.15.8_p20230313-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}"/qtwebengine-5.15.8_p20230313-patchset/015-gcc13.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."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-06-13 11:42 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2023-06-13 11:42 UTC (permalink / raw
To: gentoo-commits
commit: 42adf69fd8c0fd311fff99163c54b77a53f754ba
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 13 11:32:36 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 13 11:41:20 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42adf69f
dev-qt/qtwebengine: add 5.15.10_p20230505
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../qtwebengine-5.15.10_p20230505.ebuild | 269 +++++++++++++++++++++
1 file changed, 269 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.10_p20230505.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.10_p20230505.ebuild
new file mode 100644
index 000000000000..17c0ac67b5e6
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.10_p20230505.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/10_p/9_p}.tar.xz"
+ S="${WORKDIR}/${P/10_p/9_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/${PN}-5.15.8_p20230313-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}/${PN}-5.15.8_p20230313-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}"/qtwebengine-5.15.8_p20230313-patchset/015-gcc13.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."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-05-22 18:36 Arthur Zamarin
0 siblings, 0 replies; 301+ messages in thread
From: Arthur Zamarin @ 2023-05-22 18:36 UTC (permalink / raw
To: gentoo-commits
commit: 919b87571155e35f2f14a4c1da4d844273b1745f
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon May 22 18:36:46 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon May 22 18:36:46 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=919b8757
dev-qt/qtwebengine: Stabilize 5.15.9_p20230505 arm64, #906883
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.9_p20230505.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230505.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230505.ebuild
index 16c5e5948529..ce07a4c85372 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230505.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230505.ebuild
@@ -11,7 +11,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 ~ppc64 ~x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-05-21 23:08 Sam James
0 siblings, 0 replies; 301+ messages in thread
From: Sam James @ 2023-05-21 23:08 UTC (permalink / raw
To: gentoo-commits
commit: e5228a3a605a9f22d27375382bf7976d8b2d3ec1
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 21 23:07:55 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 21 23:07:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5228a3a
dev-qt/qtwebengine: Stabilize 5.15.9_p20230505 amd64, #906883
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.9_p20230505.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230505.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230505.ebuild
index af47654684b8..16c5e5948529 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230505.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230505.ebuild
@@ -11,7 +11,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 ~ppc64 ~x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-05-21 7:05 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2023-05-21 7:05 UTC (permalink / raw
To: gentoo-commits
commit: 97eee0b31f22ceab91ecc73e62e8d88ede6b3eb7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 20 19:10:10 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 21 07:04:53 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97eee0b3
dev-qt/qtwebengine: add 5.15.9_p20230505, equiv. to upstream 5.15.14
Patched with security patches up to Chromium version: 113.0.5672.64
Bug: https://bugs.gentoo.org/906857
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
.../qtwebengine-5.15.9_p20230505.ebuild | 269 +++++++++++++++++++++
2 files changed, 270 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 0c36c4546c82..05769985093e 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,4 +1,5 @@
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
DIST qtwebengine-5.15.9_p20230421.tar.xz 298205148 BLAKE2B 2969f37af6c53dab5847dc46a9b64f5756b4ea45f9ef3c48db980a1032e89ebd48e9ba4fdc8c56cb72044ab4f48477ac1f9c1171f333390155a7304288b77a0c SHA512 a78dd781056c63d98438186ba256ad03b35fe3870b877e56bce41ec135defc29ee9230a3482a69f8680cedc9328a683ffc62dab45a202b709d2a4017a1188cf3
+DIST qtwebengine-5.15.9_p20230505.tar.xz 298713240 BLAKE2B 835e93a0b33e7294d72571c9031524a0e3002100e36433501cc83bac91646b788c1030ee9ce90edce39c6ee2ee61a1d697e021b6346804d3be0f0b930e6084d0 SHA512 61d16399a7d8f5c135c5c097c2dcb7ebeccfe7e31769e950443ffa8178f55ad22d90307b7bd2b2ebdcb3ee0dd2064266159c27da4fc5b35ddac346ca9f336cc1
DIST qtwebengine-everywhere-src-6.5.0.tar.xz 411792556 BLAKE2B 42aa5023462ee2db6ef24da1858873897ac5d6bd170adc389617525745708529578dcbcf694d1cadf3b591770f4e925ad24f61500cd13ef90236bda412797cb7 SHA512 02413eaf5e4e4d5d8401bf28ea2362cc9f147cc002c014b1a50daf3dfa092b1c923652eefb0b727e94e36d3d53ddf93b5b4c5e8830986902b34b53a848d7a8e0
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230505.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230505.ebuild
new file mode 100644
index 000000000000..af47654684b8
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230505.ebuild
@@ -0,0 +1,269 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/${PN}-5.15.8_p20230313-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}/${PN}-5.15.8_p20230313-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}"/qtwebengine-5.15.8_p20230313-patchset/015-gcc13.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."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-05-06 11:26 Jimi Huotari
0 siblings, 0 replies; 301+ messages in thread
From: Jimi Huotari @ 2023-05-06 11:26 UTC (permalink / raw
To: gentoo-commits
commit: 4b6d2d5409342df59398f1a909d62c251a37994f
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sat May 6 11:23:18 2023 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sat May 6 11:25:52 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b6d2d54
dev-qt/qtwebengine: drop 6.4.3
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 -
dev-qt/qtwebengine/qtwebengine-6.4.3.ebuild | 252 ----------------------------
2 files changed, 253 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index f8bfd98f6de1..0c36c4546c82 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,5 +1,4 @@
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
DIST qtwebengine-5.15.9_p20230421.tar.xz 298205148 BLAKE2B 2969f37af6c53dab5847dc46a9b64f5756b4ea45f9ef3c48db980a1032e89ebd48e9ba4fdc8c56cb72044ab4f48477ac1f9c1171f333390155a7304288b77a0c SHA512 a78dd781056c63d98438186ba256ad03b35fe3870b877e56bce41ec135defc29ee9230a3482a69f8680cedc9328a683ffc62dab45a202b709d2a4017a1188cf3
-DIST qtwebengine-everywhere-src-6.4.3.tar.xz 440562844 BLAKE2B 86155ffbb12bef9dad461c2bb0dc4fce53b269c6f9f61cd1ec49cc25bb0516dcfc903ce8b48751c9c47614d448c2cd290f3f313d5fdfe0a3643534fa7e2e9f3f SHA512 e9e8bdeac942350bf779a9fabfb59ffdfec366ec23cb1c58fa416a777c9399bfa9828107f6a1c079414a8aa52a35d0547e3bd673053d994e19308e11733e0d39
DIST qtwebengine-everywhere-src-6.5.0.tar.xz 411792556 BLAKE2B 42aa5023462ee2db6ef24da1858873897ac5d6bd170adc389617525745708529578dcbcf694d1cadf3b591770f4e925ad24f61500cd13ef90236bda412797cb7 SHA512 02413eaf5e4e4d5d8401bf28ea2362cc9f147cc002c014b1a50daf3dfa092b1c923652eefb0b727e94e36d3d53ddf93b5b4c5e8830986902b34b53a848d7a8e0
diff --git a/dev-qt/qtwebengine/qtwebengine-6.4.3.ebuild b/dev-qt/qtwebengine/qtwebengine-6.4.3.ebuild
deleted file mode 100644
index 99c9282be639..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-6.4.3.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="xml(+)"
-CHROMIUM_VER="102.0.5005.177"
-CHROMIUM_PATCHES_VER="110.0.5481.78"
-
-inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
-
-DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64"
-fi
-
-IUSE="
- alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast
- +system-ffmpeg +system-icu widgets
-"
-REQUIRED_USE="designer? ( widgets )"
-
-BDEPEND="
- $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
- dev-util/gperf
- dev-util/ninja
- dev-util/re2c
- net-libs/nodejs[ssl]
- sys-devel/bison
- sys-devel/flex
-"
-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/qtdeclarative-${PV}*
- =dev-qt/qtwebchannel-${PV}*
- media-libs/fontconfig
- media-libs/freetype
- media-libs/harfbuzz:=
- media-libs/lcms:2
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- >=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/libxcb:=
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libxkbcommon
- x11-libs/libxkbfile
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libxshmfence:=
- x11-libs/libXtst
- alsa? ( media-libs/alsa-lib )
- geolocation? ( =dev-qt/qtpositioning-${PV}* )
- kerberos? ( virtual/krb5 )
- pulseaudio? ( media-libs/libpulse:= )
- screencast? ( media-video/pipewire:= )
- system-ffmpeg? ( <media-video/ffmpeg-5:= )
- system-icu? ( >=dev-libs/icu-69.1:= )
- widgets? (
- =dev-qt/qtbase-${PV}*[widgets]
- )
-"
-DEPEND="${RDEPEND}
- media-libs/libglvnd
-"
-
-python_check_deps() {
- python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
-}
-
-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
-}
-
-pkg_preinst() {
- elog "This version of Qt WebEngine is based on Chromium version ${CHROMIUM_VER}, with"
- elog "additional security fixes up to ${CHROMIUM_PATCHES_VER}. 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."
-}
-
-src_unpack() {
- # bug 307861
- eshopts_push -s extglob
- if is-flagq '-g?(gdb)?([1-9])'; then
- ewarn
- 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."
- ewarn
- fi
- eshopts_pop
-
- case ${QT6_BUILD_TYPE} in
- live) git-r3_src_unpack ;&
- release) default ;;
- esac
-}
-
-src_prepare() {
- # bug 620444 - ensure local headers are used
- find . -type f -name "*.pr[fio]" -exec \
- 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
-
- qt6-build_src_prepare
-}
-
-src_configure() {
- export NINJA_PATH="${BROOT}"/usr/bin/ninja
- export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
- local mycmakeargs=(
- #-DQT_FEATURE_accessibility=off
- #-DQT_FEATURE_force_asserts=off
- #-DQT_FEATURE_opengl=off
- #-DQT_FEATURE_printer=off
- -DQT_FEATURE_qtpdf_build=off
- -DQT_FEATURE_qtpdf_quick_build=off
- -DQT_FEATURE_qtpdf_widgets_build=off
- -DQT_FEATURE_qtwebengine_build=on
- -DQT_FEATURE_qtwebengine_quick_build=on
- -DQT_FEATURE_qtwebengine_widgets_build=on
- #-DQT_FEATURE_ssl=off
- #-DQT_FEATURE_static=off
- #-DQT_FEATURE_system_zlib=off
- #-DQT_FEATURE_system_png=off
- #-DQT_FEATURE_system_jpeg=off
- #-DQT_FEATURE_system_freetype=off
- #-DQT_FEATURE_system_harfbuzz=off
- #-DQT_FEATURE_use_gold_linker=off
- #-DQT_FEATURE_use_lld_linker=off
- -DQT_FEATURE_webengine_embedded_build=off
- -DQT_FEATURE_webengine_extensions=on
- #-DQT_FEATURE_webengine_full_debug_info=$(usex debug)
- -DQT_FEATURE_webengine_geolocation=$(usex geolocation on off)
- -DQT_FEATURE_webengine_jumbo_build=$(usex jumbo-build)
- #-DQT_FEATURE_webengine_jumbo_file_merge_limit
- -DQT_FEATURE_webengine_kerberos=$(usex kerberos on off)
- -DQT_FEATURE_webengine_native_spellchecker=off
- -DQT_FEATURE_webengine_ozone_x11=on
- -DQT_FEATURE_webengine_pepper_plugins=on
- -DQT_FEATURE_webengine_proprietary_codecs=$(usex bindist off on)
- -DQT_FEATURE_webengine_printing_and_pdf=on
- -DQT_FEATURE_webengine_sanitizer=on
- -DQT_FEATURE_webengine_spellchecker=on
- -DQT_FEATURE_webengine_system_opus=on
- -DQT_FEATURE_webengine_system_libwebp=on
- -DQT_FEATURE_webengine_system_alsa=$(usex alsa on off)
- -DQT_FEATURE_webengine_system_ffmpeg=$(usex system-ffmpeg)
- -DQT_FEATURE_webengine_system_icu=$(usex system-icu)
- -DQT_FEATURE_webengine_system_libevent=on
- -DQT_FEATURE_webengine_system_libpci=on
- -DQT_FEATURE_webengine_system_libpng=on
- -DQT_FEATURE_webengine_system_pulseaudio=$(usex pulseaudio on off)
- -DQT_FEATURE_webengine_system_zlib=on
- -DQT_FEATURE_webengine_webchannel=on
- -DQT_FEATURE_webengine_webrtc=on
- -DQT_FEATURE_webengine_webrtc_pipewire=$(usex screencast on off)
- #-DQT_FEATURE_xcb=off
- )
-
- qt6-build_src_configure
-}
-
-src_install() {
- qt6-build_src_install
-
- # bug 601472
- if [[ ! -f ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]]; then
- die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
- fi
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-05-01 12:54 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2023-05-01 12:54 UTC (permalink / raw
To: gentoo-commits
commit: 2fe03d5d0bc73539c6f9951bc8d8c642400cd903
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 1 11:53:48 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 1 12:53:25 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fe03d5d
dev-qt/qtwebengine: cleanup vulnerable 5.15.8_p20230313
Bug: https://bugs.gentoo.org/904290
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 -
.../qtwebengine-5.15.8_p20230313.ebuild | 266 ---------------------
2 files changed, 267 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 733200f12d54..f8bfd98f6de1 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,6 +1,5 @@
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
-DIST qtwebengine-5.15.8_p20230313.tar.xz 298163692 BLAKE2B 653e2577ea7e670fdffec2cf2db5392621109571b430b9b66c7bc23739a14eb36ffa5f989ec2b98d77e718b0a69bd2b3948f0340fd9e86aaf10372c8b13286ee SHA512 34062e54f95f441420b41ede88d0f0f98445677d301eedbe0be2e57cc5c280d4e564abb99ccf754eb2c0efaccc21ff4e34bc20163c970b4d5309ca85c5f37577
DIST qtwebengine-5.15.9_p20230421.tar.xz 298205148 BLAKE2B 2969f37af6c53dab5847dc46a9b64f5756b4ea45f9ef3c48db980a1032e89ebd48e9ba4fdc8c56cb72044ab4f48477ac1f9c1171f333390155a7304288b77a0c SHA512 a78dd781056c63d98438186ba256ad03b35fe3870b877e56bce41ec135defc29ee9230a3482a69f8680cedc9328a683ffc62dab45a202b709d2a4017a1188cf3
DIST qtwebengine-everywhere-src-6.4.3.tar.xz 440562844 BLAKE2B 86155ffbb12bef9dad461c2bb0dc4fce53b269c6f9f61cd1ec49cc25bb0516dcfc903ce8b48751c9c47614d448c2cd290f3f313d5fdfe0a3643534fa7e2e9f3f SHA512 e9e8bdeac942350bf779a9fabfb59ffdfec366ec23cb1c58fa416a777c9399bfa9828107f6a1c079414a8aa52a35d0547e3bd673053d994e19308e11733e0d39
DIST qtwebengine-everywhere-src-6.5.0.tar.xz 411792556 BLAKE2B 42aa5023462ee2db6ef24da1858873897ac5d6bd170adc389617525745708529578dcbcf694d1cadf3b591770f4e925ad24f61500cd13ef90236bda412797cb7 SHA512 02413eaf5e4e4d5d8401bf28ea2362cc9f147cc002c014b1a50daf3dfa092b1c923652eefb0b727e94e36d3d53ddf93b5b4c5e8830986902b34b53a848d7a8e0
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230313.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230313.ebuild
deleted file mode 100644
index 513947fbdd92..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230313.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..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/${PN}-5.15.8_p20230313-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}/${P}-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() {
- 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."
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-04-23 16:00 Arthur Zamarin
0 siblings, 0 replies; 301+ messages in thread
From: Arthur Zamarin @ 2023-04-23 16:00 UTC (permalink / raw
To: gentoo-commits
commit: 23ab2627a57113f2d609cf9d6db9ff6bc4110049
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 23 15:58:52 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 23 15:58:52 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23ab2627
dev-qt/qtwebengine: Stabilize 5.15.9_p20230421 amd64, #904373
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.9_p20230421.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230421.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230421.ebuild
index d78c39e5f62a..3290e47d0cd2 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230421.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230421.ebuild
@@ -11,7 +11,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 ~ppc64 ~x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-04-17 19:39 Jimi Huotari
0 siblings, 0 replies; 301+ messages in thread
From: Jimi Huotari @ 2023-04-17 19:39 UTC (permalink / raw
To: gentoo-commits
commit: 4fc71f7a68659300ab99aacde4df662a24122ac6
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 17 18:26:28 2023 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Mon Apr 17 19:39:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fc71f7a
dev-qt/qtwebengine: drop 6.5.0 (0)
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.5.0.ebuild | 242 ----------------------------
1 file changed, 242 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.0.ebuild
deleted file mode 100644
index a53723d0d980..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-6.5.0.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="xml(+)"
-CHROMIUM_VER="108.0.5359.181"
-CHROMIUM_PATCHES_VER="110.0.5481.104"
-
-inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
-
-DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64"
-fi
-
-IUSE="
- alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast
- +system-icu widgets
-"
-REQUIRED_USE="designer? ( widgets )"
-
-BDEPEND="
- $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
- dev-util/gperf
- dev-util/ninja
- dev-util/re2c
- net-libs/nodejs[ssl]
- sys-devel/bison
- sys-devel/flex
-"
-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/qtdeclarative-${PV}*
- =dev-qt/qtwebchannel-${PV}*
- media-libs/fontconfig
- media-libs/freetype
- media-libs/harfbuzz:=
- media-libs/lcms:2
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- >=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/libxcb:=
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libxkbcommon
- x11-libs/libxkbfile
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libxshmfence:=
- x11-libs/libXtst
- alsa? ( media-libs/alsa-lib )
- geolocation? ( =dev-qt/qtpositioning-${PV}* )
- kerberos? ( virtual/krb5 )
- pulseaudio? ( media-libs/libpulse:= )
- screencast? ( media-video/pipewire:= )
- system-icu? ( >=dev-libs/icu-69.1:= )
- widgets? (
- =dev-qt/qtbase-${PV}*[widgets]
- )
-"
-DEPEND="${RDEPEND}
- media-libs/libglvnd
-"
-
-python_check_deps() {
- python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
-}
-
-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
-}
-
-pkg_preinst() {
- elog "This version of Qt WebEngine is based on Chromium version ${CHROMIUM_VER}, with"
- elog "additional security fixes up to ${CHROMIUM_PATCHES_VER}. 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."
-}
-
-src_unpack() {
- # bug 307861
- eshopts_push -s extglob
- if is-flagq '-g?(gdb)?([1-9])'; then
- ewarn
- 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."
- ewarn
- fi
- eshopts_pop
-
- case ${QT6_BUILD_TYPE} in
- live) git-r3_src_unpack ;&
- release) default ;;
- esac
-}
-
-src_prepare() {
- # bug 620444 - ensure local headers are used
- find . -type f -name "*.pr[fio]" -exec \
- 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
-
- qt6-build_src_prepare
-}
-
-src_configure() {
- export NINJA_PATH="${BROOT}"/usr/bin/ninja
- export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
- local mycmakeargs=(
- #-DQT_FEATURE_accessibility=off
- #-DQT_FEATURE_force_asserts=off
- #-DQT_FEATURE_opengl=off
- #-DQT_FEATURE_printer=off
- -DQT_FEATURE_qtpdf_build=off
- -DQT_FEATURE_qtpdf_quick_build=off
- -DQT_FEATURE_qtpdf_widgets_build=off
- -DQT_FEATURE_qtwebengine_build=on
- -DQT_FEATURE_qtwebengine_quick_build=on
- -DQT_FEATURE_qtwebengine_widgets_build=on
- #-DQT_FEATURE_ssl=off
- #-DQT_FEATURE_static=off
- #-DQT_FEATURE_system_zlib=off
- #-DQT_FEATURE_system_png=off
- #-DQT_FEATURE_system_jpeg=off
- #-DQT_FEATURE_system_freetype=off
- #-DQT_FEATURE_system_harfbuzz=off
- #-DQT_FEATURE_use_gold_linker=off
- #-DQT_FEATURE_use_lld_linker=off
- -DQT_FEATURE_webengine_embedded_build=off
- -DQT_FEATURE_webengine_extensions=on
- #-DQT_FEATURE_webengine_full_debug_info=$(usex debug)
- -DQT_FEATURE_webengine_geolocation=$(usex geolocation on off)
- -DQT_FEATURE_webengine_jumbo_build=$(usex jumbo-build)
- #-DQT_FEATURE_webengine_jumbo_file_merge_limit
- -DQT_FEATURE_webengine_kerberos=$(usex kerberos on off)
- -DQT_FEATURE_webengine_native_spellchecker=off
- -DQT_FEATURE_webengine_ozone_x11=on
- -DQT_FEATURE_webengine_pepper_plugins=on
- -DQT_FEATURE_webengine_proprietary_codecs=$(usex bindist off on)
- -DQT_FEATURE_webengine_printing_and_pdf=on
- -DQT_FEATURE_webengine_sanitizer=on
- -DQT_FEATURE_webengine_spellchecker=on
- -DQT_FEATURE_webengine_system_opus=on
- -DQT_FEATURE_webengine_system_libwebp=on
- -DQT_FEATURE_webengine_system_alsa=$(usex alsa on off)
- -DQT_FEATURE_webengine_system_ffmpeg=off # https://bugs.gentoo.org/831487
- -DQT_FEATURE_webengine_system_icu=$(usex system-icu)
- -DQT_FEATURE_webengine_system_libevent=on
- -DQT_FEATURE_webengine_system_libpci=on
- -DQT_FEATURE_webengine_system_libpng=on
- -DQT_FEATURE_webengine_system_pulseaudio=$(usex pulseaudio on off)
- -DQT_FEATURE_webengine_system_zlib=on
- -DQT_FEATURE_webengine_webchannel=on
- -DQT_FEATURE_webengine_webrtc=on
- -DQT_FEATURE_webengine_webrtc_pipewire=$(usex screencast on off)
- #-DQT_FEATURE_xcb=off
- )
-
- qt6-build_src_configure
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-04-15 18:39 Jimi Huotari
0 siblings, 0 replies; 301+ messages in thread
From: Jimi Huotari @ 2023-04-15 18:39 UTC (permalink / raw
To: gentoo-commits
commit: f504e2e4b8cfb99907930558e1eab22499e9f0da
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 15 18:39:44 2023 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sat Apr 15 18:39:44 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f504e2e4
dev-qt/qtwebengine: add 6.5.0
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-6.5.0.ebuild | 242 ++++++++++++++++++++++++++++
2 files changed, 243 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 4931710d770c..fe4d8f25d96f 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -3,3 +3,4 @@ DIST qtwebengine-5.15.8_p20230313-patchset.tar.xz 45904 BLAKE2B 9f58b9808fd445a0
DIST qtwebengine-5.15.8_p20230313.tar.xz 298163692 BLAKE2B 653e2577ea7e670fdffec2cf2db5392621109571b430b9b66c7bc23739a14eb36ffa5f989ec2b98d77e718b0a69bd2b3948f0340fd9e86aaf10372c8b13286ee SHA512 34062e54f95f441420b41ede88d0f0f98445677d301eedbe0be2e57cc5c280d4e564abb99ccf754eb2c0efaccc21ff4e34bc20163c970b4d5309ca85c5f37577
DIST qtwebengine-5.15.9_p20230404.tar.xz 298175824 BLAKE2B 8a260c6d39d99698871154f59e86dece89ac7cb5bd08797e7f42aced638ef528c4272beb46346d39b3df14aac08f7ab4d286cc12688cb4ff62ff327258c3b841 SHA512 d97eecd3b2d0b4ad198f7c8484ed70ca6b2751ee9167a3c51c3406acbd18d06265249902c4c7b7ccd8285d7dd8dd2c8fbe4022612f5ca4b1a7972e1577059996
DIST qtwebengine-everywhere-src-6.4.3.tar.xz 440562844 BLAKE2B 86155ffbb12bef9dad461c2bb0dc4fce53b269c6f9f61cd1ec49cc25bb0516dcfc903ce8b48751c9c47614d448c2cd290f3f313d5fdfe0a3643534fa7e2e9f3f SHA512 e9e8bdeac942350bf779a9fabfb59ffdfec366ec23cb1c58fa416a777c9399bfa9828107f6a1c079414a8aa52a35d0547e3bd673053d994e19308e11733e0d39
+DIST qtwebengine-everywhere-src-6.5.0.tar.xz 411792556 BLAKE2B 42aa5023462ee2db6ef24da1858873897ac5d6bd170adc389617525745708529578dcbcf694d1cadf3b591770f4e925ad24f61500cd13ef90236bda412797cb7 SHA512 02413eaf5e4e4d5d8401bf28ea2362cc9f147cc002c014b1a50daf3dfa092b1c923652eefb0b727e94e36d3d53ddf93b5b4c5e8830986902b34b53a848d7a8e0
diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.5.0.ebuild
new file mode 100644
index 000000000000..a53723d0d980
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.0.ebuild
@@ -0,0 +1,242 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="xml(+)"
+CHROMIUM_VER="108.0.5359.181"
+CHROMIUM_PATCHES_VER="110.0.5481.104"
+
+inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
+
+DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64"
+fi
+
+IUSE="
+ alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast
+ +system-icu widgets
+"
+REQUIRED_USE="designer? ( widgets )"
+
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
+ dev-util/gperf
+ dev-util/ninja
+ dev-util/re2c
+ net-libs/nodejs[ssl]
+ sys-devel/bison
+ sys-devel/flex
+"
+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/qtdeclarative-${PV}*
+ =dev-qt/qtwebchannel-${PV}*
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/harfbuzz:=
+ media-libs/lcms:2
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ >=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/libxcb:=
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libxkbcommon
+ x11-libs/libxkbfile
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXScrnSaver
+ x11-libs/libxshmfence:=
+ x11-libs/libXtst
+ alsa? ( media-libs/alsa-lib )
+ geolocation? ( =dev-qt/qtpositioning-${PV}* )
+ kerberos? ( virtual/krb5 )
+ pulseaudio? ( media-libs/libpulse:= )
+ screencast? ( media-video/pipewire:= )
+ system-icu? ( >=dev-libs/icu-69.1:= )
+ widgets? (
+ =dev-qt/qtbase-${PV}*[widgets]
+ )
+"
+DEPEND="${RDEPEND}
+ media-libs/libglvnd
+"
+
+python_check_deps() {
+ python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+}
+
+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
+}
+
+pkg_preinst() {
+ elog "This version of Qt WebEngine is based on Chromium version ${CHROMIUM_VER}, with"
+ elog "additional security fixes up to ${CHROMIUM_PATCHES_VER}. 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."
+}
+
+src_unpack() {
+ # bug 307861
+ eshopts_push -s extglob
+ if is-flagq '-g?(gdb)?([1-9])'; then
+ ewarn
+ 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."
+ ewarn
+ fi
+ eshopts_pop
+
+ case ${QT6_BUILD_TYPE} in
+ live) git-r3_src_unpack ;&
+ release) default ;;
+ esac
+}
+
+src_prepare() {
+ # bug 620444 - ensure local headers are used
+ find . -type f -name "*.pr[fio]" -exec \
+ 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
+
+ qt6-build_src_prepare
+}
+
+src_configure() {
+ export NINJA_PATH="${BROOT}"/usr/bin/ninja
+ export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
+
+ local mycmakeargs=(
+ #-DQT_FEATURE_accessibility=off
+ #-DQT_FEATURE_force_asserts=off
+ #-DQT_FEATURE_opengl=off
+ #-DQT_FEATURE_printer=off
+ -DQT_FEATURE_qtpdf_build=off
+ -DQT_FEATURE_qtpdf_quick_build=off
+ -DQT_FEATURE_qtpdf_widgets_build=off
+ -DQT_FEATURE_qtwebengine_build=on
+ -DQT_FEATURE_qtwebengine_quick_build=on
+ -DQT_FEATURE_qtwebengine_widgets_build=on
+ #-DQT_FEATURE_ssl=off
+ #-DQT_FEATURE_static=off
+ #-DQT_FEATURE_system_zlib=off
+ #-DQT_FEATURE_system_png=off
+ #-DQT_FEATURE_system_jpeg=off
+ #-DQT_FEATURE_system_freetype=off
+ #-DQT_FEATURE_system_harfbuzz=off
+ #-DQT_FEATURE_use_gold_linker=off
+ #-DQT_FEATURE_use_lld_linker=off
+ -DQT_FEATURE_webengine_embedded_build=off
+ -DQT_FEATURE_webengine_extensions=on
+ #-DQT_FEATURE_webengine_full_debug_info=$(usex debug)
+ -DQT_FEATURE_webengine_geolocation=$(usex geolocation on off)
+ -DQT_FEATURE_webengine_jumbo_build=$(usex jumbo-build)
+ #-DQT_FEATURE_webengine_jumbo_file_merge_limit
+ -DQT_FEATURE_webengine_kerberos=$(usex kerberos on off)
+ -DQT_FEATURE_webengine_native_spellchecker=off
+ -DQT_FEATURE_webengine_ozone_x11=on
+ -DQT_FEATURE_webengine_pepper_plugins=on
+ -DQT_FEATURE_webengine_proprietary_codecs=$(usex bindist off on)
+ -DQT_FEATURE_webengine_printing_and_pdf=on
+ -DQT_FEATURE_webengine_sanitizer=on
+ -DQT_FEATURE_webengine_spellchecker=on
+ -DQT_FEATURE_webengine_system_opus=on
+ -DQT_FEATURE_webengine_system_libwebp=on
+ -DQT_FEATURE_webengine_system_alsa=$(usex alsa on off)
+ -DQT_FEATURE_webengine_system_ffmpeg=off # https://bugs.gentoo.org/831487
+ -DQT_FEATURE_webengine_system_icu=$(usex system-icu)
+ -DQT_FEATURE_webengine_system_libevent=on
+ -DQT_FEATURE_webengine_system_libpci=on
+ -DQT_FEATURE_webengine_system_libpng=on
+ -DQT_FEATURE_webengine_system_pulseaudio=$(usex pulseaudio on off)
+ -DQT_FEATURE_webengine_system_zlib=on
+ -DQT_FEATURE_webengine_webchannel=on
+ -DQT_FEATURE_webengine_webrtc=on
+ -DQT_FEATURE_webengine_webrtc_pipewire=$(usex screencast on off)
+ #-DQT_FEATURE_xcb=off
+ )
+
+ qt6-build_src_configure
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-04-13 21:45 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2023-04-13 21:45 UTC (permalink / raw
To: gentoo-commits
commit: 72eea290fa968752af3943cdcbe85601d3cf1714
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 13 21:12:50 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Apr 13 21:44:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72eea290
dev-qt/qtwebengine: 5.15.9_p20230404 version bump
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
.../qtwebengine-5.15.9_p20230404.ebuild | 266 +++++++++++++++++++++
2 files changed, 267 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index e8759573bd2a..4931710d770c 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,4 +1,5 @@
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
DIST qtwebengine-5.15.8_p20230313.tar.xz 298163692 BLAKE2B 653e2577ea7e670fdffec2cf2db5392621109571b430b9b66c7bc23739a14eb36ffa5f989ec2b98d77e718b0a69bd2b3948f0340fd9e86aaf10372c8b13286ee SHA512 34062e54f95f441420b41ede88d0f0f98445677d301eedbe0be2e57cc5c280d4e564abb99ccf754eb2c0efaccc21ff4e34bc20163c970b4d5309ca85c5f37577
+DIST qtwebengine-5.15.9_p20230404.tar.xz 298175824 BLAKE2B 8a260c6d39d99698871154f59e86dece89ac7cb5bd08797e7f42aced638ef528c4272beb46346d39b3df14aac08f7ab4d286cc12688cb4ff62ff327258c3b841 SHA512 d97eecd3b2d0b4ad198f7c8484ed70ca6b2751ee9167a3c51c3406acbd18d06265249902c4c7b7ccd8285d7dd8dd2c8fbe4022612f5ca4b1a7972e1577059996
DIST qtwebengine-everywhere-src-6.4.3.tar.xz 440562844 BLAKE2B 86155ffbb12bef9dad461c2bb0dc4fce53b269c6f9f61cd1ec49cc25bb0516dcfc903ce8b48751c9c47614d448c2cd290f3f313d5fdfe0a3643534fa7e2e9f3f SHA512 e9e8bdeac942350bf779a9fabfb59ffdfec366ec23cb1c58fa416a777c9399bfa9828107f6a1c079414a8aa52a35d0547e3bd673053d994e19308e11733e0d39
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230404.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230404.ebuild
new file mode 100644
index 000000000000..d592d8220523
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230404.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..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/${PN}-5.15.8_p20230313-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}/${PN}-5.15.8_p20230313-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() {
+ 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."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-04-09 19:34 Arthur Zamarin
0 siblings, 0 replies; 301+ messages in thread
From: Arthur Zamarin @ 2023-04-09 19:34 UTC (permalink / raw
To: gentoo-commits
commit: 86e744ea87b1afe034a2f0caa951e7f0cce3d5a1
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 9 19:33:57 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 9 19:33:57 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86e744ea
dev-qt/qtwebengine: Stabilize 5.15.8_p20230313 amd64, #903115
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.8_p20230313.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230313.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230313.ebuild
index e799185fe3ac..513947fbdd92 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230313.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230313.ebuild
@@ -11,7 +11,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 ~ppc64 ~x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-04-09 19:25 Arthur Zamarin
0 siblings, 0 replies; 301+ messages in thread
From: Arthur Zamarin @ 2023-04-09 19:25 UTC (permalink / raw
To: gentoo-commits
commit: 56e1a913de6cae5a35977b309088195210ca85fa
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 9 19:25:03 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 9 19:25:03 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56e1a913
dev-qt/qtwebengine: Stabilize 5.15.8_p20230313 arm64, #903115
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.8_p20230313.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230313.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230313.ebuild
index a1974da9731d..e799185fe3ac 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230313.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230313.ebuild
@@ -11,7 +11,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 ~ppc64 ~x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-03-29 15:41 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2023-03-29 15:41 UTC (permalink / raw
To: gentoo-commits
commit: 736b77725cd517497c08aea2a696a19be73d3872
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 29 15:29:23 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 29 15:32:47 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=736b7772
dev-qt/qtwebengine: add 5.15.8_p20230313
Bug: https://bugs.gentoo.org/903115
Bug: https://bugs.gentoo.org/903544
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 2 +
.../qtwebengine-5.15.8_p20230313.ebuild | 266 +++++++++++++++++++++
2 files changed, 268 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 0de91a0efcc3..96741df51b44 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -2,4 +2,6 @@ DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3
DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
DIST qtwebengine-5.15.8_p20230112.tar.xz 320881876 BLAKE2B 681fb4e2c6dfb80f1f2839092bbbd891a0a0d68f6b31dbdfe8693b8ea9a0ecd9611ba692b0565f32fc2ad199de715cf61e333d796df618572f79d9ed88545ffb SHA512 1806e7a3134579a5cfc0c932cc95ffb15edc515c2ff32b01eee9de8245938f95301610cd7b57451a07a9e38451111973b88c1d64a03f1371e58106bf202b143e
+DIST qtwebengine-5.15.8_p20230313-patchset.tar.xz 45904 BLAKE2B 9f58b9808fd445a06e6a2cd6d5f7bc9782bd6de13138fdebc9e81bd9f69e7ae673a71bd3ed6b011a47e84cc64b5b703a7cfc8d5f740eaaa663da1db8ef9ef05b SHA512 21b0b853358260fa1bdc96c97c5b2af7007c744d10abeebf9f0e708a0cd7dece583d86c0554a4e327a0d615bb403b0d328acaa6622b50d7a8059bc0802edbcec
+DIST qtwebengine-5.15.8_p20230313.tar.xz 298163692 BLAKE2B 653e2577ea7e670fdffec2cf2db5392621109571b430b9b66c7bc23739a14eb36ffa5f989ec2b98d77e718b0a69bd2b3948f0340fd9e86aaf10372c8b13286ee SHA512 34062e54f95f441420b41ede88d0f0f98445677d301eedbe0be2e57cc5c280d4e564abb99ccf754eb2c0efaccc21ff4e34bc20163c970b4d5309ca85c5f37577
DIST qtwebengine-everywhere-src-6.4.3.tar.xz 440562844 BLAKE2B 86155ffbb12bef9dad461c2bb0dc4fce53b269c6f9f61cd1ec49cc25bb0516dcfc903ce8b48751c9c47614d448c2cd290f3f313d5fdfe0a3643534fa7e2e9f3f SHA512 e9e8bdeac942350bf779a9fabfb59ffdfec366ec23cb1c58fa416a777c9399bfa9828107f6a1c079414a8aa52a35d0547e3bd673053d994e19308e11733e0d39
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230313.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230313.ebuild
new file mode 100644
index 000000000000..a1974da9731d
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230313.ebuild
@@ -0,0 +1,266 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..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/${PN}-5.15.8_p20230313-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}/${P}-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() {
+ 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."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-03-26 16:59 Jimi Huotari
0 siblings, 0 replies; 301+ messages in thread
From: Jimi Huotari @ 2023-03-26 16:59 UTC (permalink / raw
To: gentoo-commits
commit: 31f1924d72b462f6ef043d68ceee87908eed3bba
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 26 16:53:38 2023 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sun Mar 26 16:59:02 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31f1924d
dev-qt/qtwebengine: drop 6.4.2
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 -
dev-qt/qtwebengine/qtwebengine-6.4.2.ebuild | 243 ----------------------------
2 files changed, 244 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index ff91ecba4e92..0de91a0efcc3 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -2,5 +2,4 @@ DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3
DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
DIST qtwebengine-5.15.8_p20230112.tar.xz 320881876 BLAKE2B 681fb4e2c6dfb80f1f2839092bbbd891a0a0d68f6b31dbdfe8693b8ea9a0ecd9611ba692b0565f32fc2ad199de715cf61e333d796df618572f79d9ed88545ffb SHA512 1806e7a3134579a5cfc0c932cc95ffb15edc515c2ff32b01eee9de8245938f95301610cd7b57451a07a9e38451111973b88c1d64a03f1371e58106bf202b143e
-DIST qtwebengine-everywhere-src-6.4.2.tar.xz 440538956 BLAKE2B df94e0e8e22d11614d0d35002c0e404e6735d75e7b43bef1bfd3d5e1230a997625fe8471d8a9154798cc1f9b9c296c2b697ec70fba0428d509d1352d6d3fafee SHA512 47b184a690d4fa5ccccaa3533903068df7b28825aeb16b7c75e3c7cc29fe0cfdf07501c5f0311926c22852f626b0cd59c836d44527261dc7d5c1efbf7e15439b
DIST qtwebengine-everywhere-src-6.4.3.tar.xz 440562844 BLAKE2B 86155ffbb12bef9dad461c2bb0dc4fce53b269c6f9f61cd1ec49cc25bb0516dcfc903ce8b48751c9c47614d448c2cd290f3f313d5fdfe0a3643534fa7e2e9f3f SHA512 e9e8bdeac942350bf779a9fabfb59ffdfec366ec23cb1c58fa416a777c9399bfa9828107f6a1c079414a8aa52a35d0547e3bd673053d994e19308e11733e0d39
diff --git a/dev-qt/qtwebengine/qtwebengine-6.4.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.4.2.ebuild
deleted file mode 100644
index c1a7dff6aa69..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-6.4.2.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="xml(+)"
-CHROMIUM_VER="102.0.5005.177"
-CHROMIUM_PATCHES_VER="108.0.5359.94"
-
-inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
-
-DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64"
-fi
-
-IUSE="
- alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast
- +system-ffmpeg +system-icu widgets
-"
-REQUIRED_USE="designer? ( widgets )"
-
-BDEPEND="
- $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
- dev-util/gperf
- dev-util/ninja
- dev-util/re2c
- net-libs/nodejs[ssl]
- sys-devel/bison
- sys-devel/flex
-"
-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/qtdeclarative-${PV}*
- =dev-qt/qtwebchannel-${PV}*
- media-libs/fontconfig
- media-libs/freetype
- media-libs/harfbuzz:=
- media-libs/lcms:2
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- >=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/libxcb:=
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libxkbcommon
- x11-libs/libxkbfile
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libxshmfence:=
- x11-libs/libXtst
- alsa? ( media-libs/alsa-lib )
- geolocation? ( =dev-qt/qtpositioning-${PV}* )
- kerberos? ( virtual/krb5 )
- pulseaudio? ( media-libs/libpulse:= )
- screencast? ( media-video/pipewire:= )
- system-ffmpeg? ( media-video/ffmpeg:= )
- system-icu? ( >=dev-libs/icu-69.1:= )
- widgets? (
- =dev-qt/qtbase-${PV}*[widgets]
- )
-"
-DEPEND="${RDEPEND}
- media-libs/libglvnd
-"
-
-python_check_deps() {
- python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
-}
-
-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
-}
-
-pkg_preinst() {
- elog "This version of Qt WebEngine is based on Chromium version ${CHROMIUM_VER}, with"
- elog "additional security fixes up to ${CHROMIUM_PATCHES_VER}. 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."
-}
-
-src_unpack() {
- # bug 307861
- eshopts_push -s extglob
- if is-flagq '-g?(gdb)?([1-9])'; then
- ewarn
- 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."
- ewarn
- fi
- eshopts_pop
-
- case ${QT6_BUILD_TYPE} in
- live) git-r3_src_unpack ;&
- release) default ;;
- esac
-}
-
-src_prepare() {
- # bug 620444 - ensure local headers are used
- find . -type f -name "*.pr[fio]" -exec \
- 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
-
- qt6-build_src_prepare
-}
-
-src_configure() {
- export NINJA_PATH="${BROOT}"/usr/bin/ninja
- export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
- local mycmakeargs=(
- #-DQT_FEATURE_accessibility=off
- #-DQT_FEATURE_force_asserts=off
- #-DQT_FEATURE_opengl=off
- #-DQT_FEATURE_printer=off
- -DQT_FEATURE_qtpdf_build=off
- -DQT_FEATURE_qtpdf_quick_build=off
- -DQT_FEATURE_qtpdf_widgets_build=off
- -DQT_FEATURE_qtwebengine_build=on
- -DQT_FEATURE_qtwebengine_quick_build=on
- -DQT_FEATURE_qtwebengine_widgets_build=on
- #-DQT_FEATURE_ssl=off
- #-DQT_FEATURE_static=off
- #-DQT_FEATURE_system_zlib=off
- #-DQT_FEATURE_system_png=off
- #-DQT_FEATURE_system_jpeg=off
- #-DQT_FEATURE_system_freetype=off
- #-DQT_FEATURE_system_harfbuzz=off
- #-DQT_FEATURE_use_gold_linker=off
- #-DQT_FEATURE_use_lld_linker=off
- -DQT_FEATURE_webengine_embedded_build=off
- -DQT_FEATURE_webengine_extensions=on
- #-DQT_FEATURE_webengine_full_debug_info=$(usex debug)
- -DQT_FEATURE_webengine_geolocation=$(usex geolocation on off)
- -DQT_FEATURE_webengine_jumbo_build=$(usex jumbo-build)
- #-DQT_FEATURE_webengine_jumbo_file_merge_limit
- -DQT_FEATURE_webengine_kerberos=$(usex kerberos on off)
- -DQT_FEATURE_webengine_native_spellchecker=off
- -DQT_FEATURE_webengine_ozone_x11=on
- -DQT_FEATURE_webengine_pepper_plugins=on
- -DQT_FEATURE_webengine_proprietary_codecs=$(usex bindist off on)
- -DQT_FEATURE_webengine_printing_and_pdf=on
- -DQT_FEATURE_webengine_sanitizer=on
- -DQT_FEATURE_webengine_spellchecker=on
- -DQT_FEATURE_webengine_system_opus=on
- -DQT_FEATURE_webengine_system_libwebp=on
- -DQT_FEATURE_webengine_system_alsa=$(usex alsa on off)
- -DQT_FEATURE_webengine_system_ffmpeg=$(usex system-ffmpeg)
- -DQT_FEATURE_webengine_system_icu=$(usex system-icu)
- -DQT_FEATURE_webengine_system_libevent=on
- -DQT_FEATURE_webengine_system_libpci=on
- -DQT_FEATURE_webengine_system_libpng=on
- -DQT_FEATURE_webengine_system_pulseaudio=$(usex pulseaudio on off)
- -DQT_FEATURE_webengine_system_zlib=on
- -DQT_FEATURE_webengine_webchannel=on
- -DQT_FEATURE_webengine_webrtc=on
- -DQT_FEATURE_webengine_webrtc_pipewire=$(usex screencast on off)
- #-DQT_FEATURE_xcb=off
- )
-
- qt6-build_src_configure
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-03-19 16:47 Jimi Huotari
0 siblings, 0 replies; 301+ messages in thread
From: Jimi Huotari @ 2023-03-19 16:47 UTC (permalink / raw
To: gentoo-commits
commit: d040613dd25a4eb7c6576581171e3fbc86f23db4
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 19 16:44:43 2023 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sun Mar 19 16:46:46 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d040613d
dev-qt/qtwebengine: fixup build/no-build detection for 6.4.3
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-6.4.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-6.4.3.ebuild b/dev-qt/qtwebengine/qtwebengine-6.4.3.ebuild
index 0e845c7f19a8..99c9282be639 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.4.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.4.3.ebuild
@@ -246,7 +246,7 @@ src_install() {
qt6-build_src_install
# bug 601472
- if [[ ! -f ${D}${QT6_LIBDIR}/libQt6WebEngine.so ]]; then
+ if [[ ! -f ${D}${QT6_LIBDIR}/libQt6WebEngineCore.so ]]; then
die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
fi
}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-03-19 13:09 Jimi Huotari
0 siblings, 0 replies; 301+ messages in thread
From: Jimi Huotari @ 2023-03-19 13:09 UTC (permalink / raw
To: gentoo-commits
commit: d4f5f5958ce0fc56fd92c32c9d4523edabd62a1f
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 19 11:27:15 2023 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sun Mar 19 13:06:42 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4f5f595
dev-qt/qtwebengine: add 6.4.3
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-6.4.3.ebuild | 252 ++++++++++++++++++++++++++++
2 files changed, 253 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 9c51541e07a1..ff91ecba4e92 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -3,3 +3,4 @@ DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d140687
DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
DIST qtwebengine-5.15.8_p20230112.tar.xz 320881876 BLAKE2B 681fb4e2c6dfb80f1f2839092bbbd891a0a0d68f6b31dbdfe8693b8ea9a0ecd9611ba692b0565f32fc2ad199de715cf61e333d796df618572f79d9ed88545ffb SHA512 1806e7a3134579a5cfc0c932cc95ffb15edc515c2ff32b01eee9de8245938f95301610cd7b57451a07a9e38451111973b88c1d64a03f1371e58106bf202b143e
DIST qtwebengine-everywhere-src-6.4.2.tar.xz 440538956 BLAKE2B df94e0e8e22d11614d0d35002c0e404e6735d75e7b43bef1bfd3d5e1230a997625fe8471d8a9154798cc1f9b9c296c2b697ec70fba0428d509d1352d6d3fafee SHA512 47b184a690d4fa5ccccaa3533903068df7b28825aeb16b7c75e3c7cc29fe0cfdf07501c5f0311926c22852f626b0cd59c836d44527261dc7d5c1efbf7e15439b
+DIST qtwebengine-everywhere-src-6.4.3.tar.xz 440562844 BLAKE2B 86155ffbb12bef9dad461c2bb0dc4fce53b269c6f9f61cd1ec49cc25bb0516dcfc903ce8b48751c9c47614d448c2cd290f3f313d5fdfe0a3643534fa7e2e9f3f SHA512 e9e8bdeac942350bf779a9fabfb59ffdfec366ec23cb1c58fa416a777c9399bfa9828107f6a1c079414a8aa52a35d0547e3bd673053d994e19308e11733e0d39
diff --git a/dev-qt/qtwebengine/qtwebengine-6.4.3.ebuild b/dev-qt/qtwebengine/qtwebengine-6.4.3.ebuild
new file mode 100644
index 000000000000..0e845c7f19a8
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-6.4.3.ebuild
@@ -0,0 +1,252 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="xml(+)"
+CHROMIUM_VER="102.0.5005.177"
+CHROMIUM_PATCHES_VER="110.0.5481.78"
+
+inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
+
+DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64"
+fi
+
+IUSE="
+ alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast
+ +system-ffmpeg +system-icu widgets
+"
+REQUIRED_USE="designer? ( widgets )"
+
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
+ dev-util/gperf
+ dev-util/ninja
+ dev-util/re2c
+ net-libs/nodejs[ssl]
+ sys-devel/bison
+ sys-devel/flex
+"
+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/qtdeclarative-${PV}*
+ =dev-qt/qtwebchannel-${PV}*
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/harfbuzz:=
+ media-libs/lcms:2
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ >=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/libxcb:=
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libxkbcommon
+ x11-libs/libxkbfile
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXScrnSaver
+ x11-libs/libxshmfence:=
+ x11-libs/libXtst
+ alsa? ( media-libs/alsa-lib )
+ geolocation? ( =dev-qt/qtpositioning-${PV}* )
+ kerberos? ( virtual/krb5 )
+ pulseaudio? ( media-libs/libpulse:= )
+ screencast? ( media-video/pipewire:= )
+ system-ffmpeg? ( <media-video/ffmpeg-5:= )
+ system-icu? ( >=dev-libs/icu-69.1:= )
+ widgets? (
+ =dev-qt/qtbase-${PV}*[widgets]
+ )
+"
+DEPEND="${RDEPEND}
+ media-libs/libglvnd
+"
+
+python_check_deps() {
+ python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+}
+
+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
+}
+
+pkg_preinst() {
+ elog "This version of Qt WebEngine is based on Chromium version ${CHROMIUM_VER}, with"
+ elog "additional security fixes up to ${CHROMIUM_PATCHES_VER}. 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."
+}
+
+src_unpack() {
+ # bug 307861
+ eshopts_push -s extglob
+ if is-flagq '-g?(gdb)?([1-9])'; then
+ ewarn
+ 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."
+ ewarn
+ fi
+ eshopts_pop
+
+ case ${QT6_BUILD_TYPE} in
+ live) git-r3_src_unpack ;&
+ release) default ;;
+ esac
+}
+
+src_prepare() {
+ # bug 620444 - ensure local headers are used
+ find . -type f -name "*.pr[fio]" -exec \
+ 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
+
+ qt6-build_src_prepare
+}
+
+src_configure() {
+ export NINJA_PATH="${BROOT}"/usr/bin/ninja
+ export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
+
+ local mycmakeargs=(
+ #-DQT_FEATURE_accessibility=off
+ #-DQT_FEATURE_force_asserts=off
+ #-DQT_FEATURE_opengl=off
+ #-DQT_FEATURE_printer=off
+ -DQT_FEATURE_qtpdf_build=off
+ -DQT_FEATURE_qtpdf_quick_build=off
+ -DQT_FEATURE_qtpdf_widgets_build=off
+ -DQT_FEATURE_qtwebengine_build=on
+ -DQT_FEATURE_qtwebengine_quick_build=on
+ -DQT_FEATURE_qtwebengine_widgets_build=on
+ #-DQT_FEATURE_ssl=off
+ #-DQT_FEATURE_static=off
+ #-DQT_FEATURE_system_zlib=off
+ #-DQT_FEATURE_system_png=off
+ #-DQT_FEATURE_system_jpeg=off
+ #-DQT_FEATURE_system_freetype=off
+ #-DQT_FEATURE_system_harfbuzz=off
+ #-DQT_FEATURE_use_gold_linker=off
+ #-DQT_FEATURE_use_lld_linker=off
+ -DQT_FEATURE_webengine_embedded_build=off
+ -DQT_FEATURE_webengine_extensions=on
+ #-DQT_FEATURE_webengine_full_debug_info=$(usex debug)
+ -DQT_FEATURE_webengine_geolocation=$(usex geolocation on off)
+ -DQT_FEATURE_webengine_jumbo_build=$(usex jumbo-build)
+ #-DQT_FEATURE_webengine_jumbo_file_merge_limit
+ -DQT_FEATURE_webengine_kerberos=$(usex kerberos on off)
+ -DQT_FEATURE_webengine_native_spellchecker=off
+ -DQT_FEATURE_webengine_ozone_x11=on
+ -DQT_FEATURE_webengine_pepper_plugins=on
+ -DQT_FEATURE_webengine_proprietary_codecs=$(usex bindist off on)
+ -DQT_FEATURE_webengine_printing_and_pdf=on
+ -DQT_FEATURE_webengine_sanitizer=on
+ -DQT_FEATURE_webengine_spellchecker=on
+ -DQT_FEATURE_webengine_system_opus=on
+ -DQT_FEATURE_webengine_system_libwebp=on
+ -DQT_FEATURE_webengine_system_alsa=$(usex alsa on off)
+ -DQT_FEATURE_webengine_system_ffmpeg=$(usex system-ffmpeg)
+ -DQT_FEATURE_webengine_system_icu=$(usex system-icu)
+ -DQT_FEATURE_webengine_system_libevent=on
+ -DQT_FEATURE_webengine_system_libpci=on
+ -DQT_FEATURE_webengine_system_libpng=on
+ -DQT_FEATURE_webengine_system_pulseaudio=$(usex pulseaudio on off)
+ -DQT_FEATURE_webengine_system_zlib=on
+ -DQT_FEATURE_webengine_webchannel=on
+ -DQT_FEATURE_webengine_webrtc=on
+ -DQT_FEATURE_webengine_webrtc_pipewire=$(usex screencast on off)
+ #-DQT_FEATURE_xcb=off
+ )
+
+ qt6-build_src_configure
+}
+
+src_install() {
+ qt6-build_src_install
+
+ # bug 601472
+ if [[ ! -f ${D}${QT6_LIBDIR}/libQt6WebEngine.so ]]; then
+ die "${CATEGORY}/${PF} failed to build anything. Please report to https://bugs.gentoo.org/"
+ fi
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-02-09 10:02 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2023-02-09 10:02 UTC (permalink / raw
To: gentoo-commits
commit: 68ecba9deb066543351c13e44408b2db4762d323
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 8 22:19:20 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 9 09:48:35 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68ecba9d
dev-qt/qtwebengine: drop 6.4.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 -
dev-qt/qtwebengine/qtwebengine-6.4.0.ebuild | 245 ----------------------------
2 files changed, 246 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index fa3afa457d35..9c51541e07a1 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -2,5 +2,4 @@ DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3
DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
DIST qtwebengine-5.15.8_p20230112.tar.xz 320881876 BLAKE2B 681fb4e2c6dfb80f1f2839092bbbd891a0a0d68f6b31dbdfe8693b8ea9a0ecd9611ba692b0565f32fc2ad199de715cf61e333d796df618572f79d9ed88545ffb SHA512 1806e7a3134579a5cfc0c932cc95ffb15edc515c2ff32b01eee9de8245938f95301610cd7b57451a07a9e38451111973b88c1d64a03f1371e58106bf202b143e
-DIST qtwebengine-everywhere-src-6.4.0.tar.xz 440346968 BLAKE2B ffe9ad9f71034d14f016a71bf3e6034853d5c2b17a3ab3e8aefc1c3a79896363eb2ce41446f16e126ec313608619900ee7ac41750978c28f135df5bbc2e0be5c SHA512 a024781c675c60ca746abb6cd977872b51e3f4a7ff9f934450b82e9b19883c68c0c6c630c28997624f0caceed3c43e8b0658419ecb18cf08fa9081275bedd2a7
DIST qtwebengine-everywhere-src-6.4.2.tar.xz 440538956 BLAKE2B df94e0e8e22d11614d0d35002c0e404e6735d75e7b43bef1bfd3d5e1230a997625fe8471d8a9154798cc1f9b9c296c2b697ec70fba0428d509d1352d6d3fafee SHA512 47b184a690d4fa5ccccaa3533903068df7b28825aeb16b7c75e3c7cc29fe0cfdf07501c5f0311926c22852f626b0cd59c836d44527261dc7d5c1efbf7e15439b
diff --git a/dev-qt/qtwebengine/qtwebengine-6.4.0.ebuild b/dev-qt/qtwebengine/qtwebengine-6.4.0.ebuild
deleted file mode 100644
index 6b9a8677483e..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-6.4.0.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10} )
-PYTHON_REQ_USE="xml(+)"
-CHROMIUM_VER="102.0.5005.177"
-CHROMIUM_PATCHES_VER="104.0.5112.102"
-
-inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
-
-DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64"
-fi
-
-IUSE="
- alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast
- +system-ffmpeg +system-icu widgets
-"
-REQUIRED_USE="designer? ( widgets )"
-
-BDEPEND="
- $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
- dev-util/gperf
- dev-util/ninja
- dev-util/re2c
- net-libs/nodejs[ssl]
- sys-devel/bison
- sys-devel/flex
-"
-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/qtdeclarative-${PV}*
- =dev-qt/qtwebchannel-${PV}*
- media-libs/fontconfig
- media-libs/freetype
- media-libs/harfbuzz:=
- media-libs/lcms:2
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- >=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/libxcb:=
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libxkbcommon
- x11-libs/libxkbfile
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libxshmfence:=
- x11-libs/libXtst
- alsa? ( media-libs/alsa-lib )
- geolocation? ( =dev-qt/qtpositioning-${PV}* )
- kerberos? ( virtual/krb5 )
- pulseaudio? ( media-libs/libpulse:= )
- screencast? ( media-video/pipewire:= )
- system-ffmpeg? ( media-video/ffmpeg:= )
- system-icu? ( >=dev-libs/icu-69.1:= )
- widgets? (
- =dev-qt/qtbase-${PV}*[widgets]
- )
-"
-DEPEND="${RDEPEND}
- media-libs/libglvnd
-"
-
-PATCHES=( "${FILESDIR}/${PN}-6.4.0-no-websocket-intercept.patch" ) # QTBUG-107144
-
-python_check_deps() {
- python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
-}
-
-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
-}
-
-pkg_preinst() {
- elog "This version of Qt WebEngine is based on Chromium version ${CHROMIUM_VER}, with"
- elog "additional security fixes up to ${CHROMIUM_PATCHES_VER}. 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."
-}
-
-src_unpack() {
- # bug 307861
- eshopts_push -s extglob
- if is-flagq '-g?(gdb)?([1-9])'; then
- ewarn
- 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."
- ewarn
- fi
- eshopts_pop
-
- case ${QT6_BUILD_TYPE} in
- live) git-r3_src_unpack ;&
- release) default ;;
- esac
-}
-
-src_prepare() {
- # bug 620444 - ensure local headers are used
- find . -type f -name "*.pr[fio]" -exec \
- 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
-
- qt6-build_src_prepare
-}
-
-src_configure() {
- export NINJA_PATH="${BROOT}"/usr/bin/ninja
- export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
- local mycmakeargs=(
- #-DQT_FEATURE_accessibility=off
- #-DQT_FEATURE_force_asserts=off
- #-DQT_FEATURE_opengl=off
- #-DQT_FEATURE_printer=off
- -DQT_FEATURE_qtpdf_build=off
- -DQT_FEATURE_qtpdf_quick_build=off
- -DQT_FEATURE_qtpdf_widgets_build=off
- -DQT_FEATURE_qtwebengine_build=on
- -DQT_FEATURE_qtwebengine_quick_build=on
- -DQT_FEATURE_qtwebengine_widgets_build=on
- #-DQT_FEATURE_ssl=off
- #-DQT_FEATURE_static=off
- #-DQT_FEATURE_system_zlib=off
- #-DQT_FEATURE_system_png=off
- #-DQT_FEATURE_system_jpeg=off
- #-DQT_FEATURE_system_freetype=off
- #-DQT_FEATURE_system_harfbuzz=off
- #-DQT_FEATURE_use_gold_linker=off
- #-DQT_FEATURE_use_lld_linker=off
- -DQT_FEATURE_webengine_embedded_build=off
- -DQT_FEATURE_webengine_extensions=on
- #-DQT_FEATURE_webengine_full_debug_info=$(usex debug)
- -DQT_FEATURE_webengine_geolocation=$(usex geolocation on off)
- -DQT_FEATURE_webengine_jumbo_build=$(usex jumbo-build)
- #-DQT_FEATURE_webengine_jumbo_file_merge_limit
- -DQT_FEATURE_webengine_kerberos=$(usex kerberos on off)
- -DQT_FEATURE_webengine_native_spellchecker=off
- -DQT_FEATURE_webengine_ozone_x11=on
- -DQT_FEATURE_webengine_pepper_plugins=on
- -DQT_FEATURE_webengine_proprietary_codecs=$(usex bindist off on)
- -DQT_FEATURE_webengine_printing_and_pdf=on
- -DQT_FEATURE_webengine_sanitizer=on
- -DQT_FEATURE_webengine_spellchecker=on
- -DQT_FEATURE_webengine_system_opus=on
- -DQT_FEATURE_webengine_system_libwebp=on
- -DQT_FEATURE_webengine_system_alsa=$(usex alsa on off)
- -DQT_FEATURE_webengine_system_ffmpeg=$(usex system-ffmpeg)
- -DQT_FEATURE_webengine_system_icu=$(usex system-icu)
- -DQT_FEATURE_webengine_system_libevent=on
- -DQT_FEATURE_webengine_system_libpci=on
- -DQT_FEATURE_webengine_system_libpng=on
- -DQT_FEATURE_webengine_system_pulseaudio=$(usex pulseaudio on off)
- -DQT_FEATURE_webengine_system_zlib=on
- -DQT_FEATURE_webengine_webchannel=on
- -DQT_FEATURE_webengine_webrtc=on
- -DQT_FEATURE_webengine_webrtc_pipewire=$(usex screencast on off)
- #-DQT_FEATURE_xcb=off
- )
-
- qt6-build_src_configure
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-02-07 10:37 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2023-02-07 10:37 UTC (permalink / raw
To: gentoo-commits
commit: 6df9b07ea38f7f40332416138e01567597fb9f02
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 5 22:51:23 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Feb 7 10:36:58 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6df9b07e
dev-qt/qtwebengine: destabilize 5.15.8_p20230112 for ~x86
Bug: https://bugs.gentoo.org/893234
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild
index 633b4b16422e..eacf340d227b 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild
@@ -11,7 +11,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 ~ppc64 ~x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-01-24 9:45 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2023-01-24 9:45 UTC (permalink / raw
To: gentoo-commits
commit: eaa7be44ddbf8aa370024de0ccfe9b96b6df3637
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 23 19:22:32 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 09:34:52 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaa7be44
dev-qt/qtwebengine: cleanup vulnerable 5.15.7_p20221122
Bug: https://bugs.gentoo.org/888181
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 -
.../qtwebengine-5.15.7_p20221122.ebuild | 282 ---------------------
2 files changed, 283 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 44b9d711211e..fa3afa457d35 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,7 +1,6 @@
DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
-DIST qtwebengine-5.15.7_p20221122.tar.xz 319323408 BLAKE2B f0f7d566e84a78bae964bf34ccb305d51ae3c0b73bea2b382edca373a5240ab63ce6d90a1f81c8e70fd1f1eb05f9985fccbdae36958afe9dd8fa9c95a72775e0 SHA512 42665d2d7d227aeb04b9f7af0728ea5b07978e221b858fd2855595ad588d709bacbea18ab9e0c3a023579e5e3b80cdf6d3ff721573631ee43626bd37fb424225
DIST qtwebengine-5.15.8_p20230112.tar.xz 320881876 BLAKE2B 681fb4e2c6dfb80f1f2839092bbbd891a0a0d68f6b31dbdfe8693b8ea9a0ecd9611ba692b0565f32fc2ad199de715cf61e333d796df618572f79d9ed88545ffb SHA512 1806e7a3134579a5cfc0c932cc95ffb15edc515c2ff32b01eee9de8245938f95301610cd7b57451a07a9e38451111973b88c1d64a03f1371e58106bf202b143e
DIST qtwebengine-everywhere-src-6.4.0.tar.xz 440346968 BLAKE2B ffe9ad9f71034d14f016a71bf3e6034853d5c2b17a3ab3e8aefc1c3a79896363eb2ce41446f16e126ec313608619900ee7ac41750978c28f135df5bbc2e0be5c SHA512 a024781c675c60ca746abb6cd977872b51e3f4a7ff9f934450b82e9b19883c68c0c6c630c28997624f0caceed3c43e8b0658419ecb18cf08fa9081275bedd2a7
DIST qtwebengine-everywhere-src-6.4.2.tar.xz 440538956 BLAKE2B df94e0e8e22d11614d0d35002c0e404e6735d75e7b43bef1bfd3d5e1230a997625fe8471d8a9154798cc1f9b9c296c2b697ec70fba0428d509d1352d6d3fafee SHA512 47b184a690d4fa5ccccaa3533903068df7b28825aeb16b7c75e3c7cc29fe0cfdf07501c5f0311926c22852f626b0cd59c836d44527261dc7d5c1efbf7e15439b
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.7_p20221122.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.7_p20221122.ebuild
deleted file mode 100644
index af5c7e8c0a98..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.7_p20221122.ebuild
+++ /dev/null
@@ -1,282 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-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/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2
- https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.3_p20220406-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-ffmpeg +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-ffmpeg? ( media-video/ffmpeg:0= )
- 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=(
- "${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, bug 695446
- "${FILESDIR}/${PN}-5.15.3_p20220505-extra-gn.patch" # downstream, bug 774186
- "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
- "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
- "${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746
- "${FILESDIR}/${PN}-5.15.3_p20220329-clang14.patch" # by FreeBSD, bug 836604
- "${FILESDIR}/${PN}-5.15.3_p20220406-gcc12-includes.patch" # by openSUSE, bug 840326
- "${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
- "${WORKDIR}/${PN}-5.15.3_p20220406-patchset" # bug 698988 (py2--), pipewire-3
-)
-
-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
-
- if use system-ffmpeg && has_version '>=media-video/ffmpeg-5'; then
- eapply "${FILESDIR}/${PN}-5.15.3_p20220406-ffmpeg5.patch" # by Archlinux, bug 831437
- 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 '')
- $(usex system-ffmpeg -system-ffmpeg -qt-ffmpeg)
- $(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."
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-01-21 9:15 Arthur Zamarin
0 siblings, 0 replies; 301+ messages in thread
From: Arthur Zamarin @ 2023-01-21 9:15 UTC (permalink / raw
To: gentoo-commits
commit: c0f6f4b2ecfe39351cfe17768a2d7215e0ade327
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 21 09:14:09 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 21 09:14:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0f6f4b2
dev-qt/qtwebengine: Stabilize 5.15.8_p20230112 x86, #888946
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild
index eacf340d227b..633b4b16422e 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild
@@ -11,7 +11,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 ~ppc64 x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-01-17 20:56 Arthur Zamarin
0 siblings, 0 replies; 301+ messages in thread
From: Arthur Zamarin @ 2023-01-17 20:56 UTC (permalink / raw
To: gentoo-commits
commit: 19276e950eaef0e8d08940cdc14f819e49dfc207
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 17 20:55:32 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 17 20:55:32 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19276e95
dev-qt/qtwebengine: Stabilize 5.15.8_p20230112 arm64, #888946
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild
index 750f833311f2..eacf340d227b 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild
@@ -11,7 +11,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 ~ppc64 ~x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-01-17 20:04 Sam James
0 siblings, 0 replies; 301+ messages in thread
From: Sam James @ 2023-01-17 20:04 UTC (permalink / raw
To: gentoo-commits
commit: bed7eef0a57f4ba8680137be5fee44ad639d64a2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 17 20:03:30 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 17 20:03:30 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bed7eef0
dev-qt/qtwebengine: Stabilize 5.15.8_p20230112 amd64, #888946
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild
index 62c77057afa3..750f833311f2 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild
@@ -11,7 +11,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 ~ppc64 ~x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-01-15 12:36 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2023-01-15 12:36 UTC (permalink / raw
To: gentoo-commits
commit: 90c0da93ba084e79f9e5468d1b3759bc0a351a89
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 14 12:12:33 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 12:36:32 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90c0da93
dev-qt/qtwebengine: add 5.15.8_p20230112
Fixes CVE-2022-4437 and CVE-2022-4438.
Snapshotted at:
Branch: 5.15
Commit: 38e0df6c6e5a1186b68df9b3d6f4cafbb211f2da
Submodule qtwebengine-chromium.git:
Branch: 87-based
Commit: 97a1254923022e66fa75245c3ace64f58112cba6
Patched with security patches up to Chromium version: 98.0.4758.102
Bug: https://bugs.gentoo.org/888946
Bug: https://bugs.gentoo.org/888181
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
.../qtwebengine-5.15.8_p20230112.ebuild | 284 +++++++++++++++++++++
2 files changed, 285 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 6f9f75c68502..9e66ddba2e79 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -3,5 +3,6 @@ DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d140687
DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
DIST qtwebengine-5.15.7_p20221122.tar.xz 319323408 BLAKE2B f0f7d566e84a78bae964bf34ccb305d51ae3c0b73bea2b382edca373a5240ab63ce6d90a1f81c8e70fd1f1eb05f9985fccbdae36958afe9dd8fa9c95a72775e0 SHA512 42665d2d7d227aeb04b9f7af0728ea5b07978e221b858fd2855595ad588d709bacbea18ab9e0c3a023579e5e3b80cdf6d3ff721573631ee43626bd37fb424225
DIST qtwebengine-5.15.8_p20230106.tar.xz 319368288 BLAKE2B cbf6abc941cc20d7568c458726ccd371d5c6838b93e034e79767a2f98a00576a89a81eeb2964fb549df5f347cb8927863c15bf082c6abb749ed90cbe69c9677c SHA512 9b65cb69945516ee57945ccf59b2f60182673e7a77e29418269a285c708a5dcd4ddfdd6c23e187280e68d7abee4e1dc2d00da6678393a44e88b88702db337615
+DIST qtwebengine-5.15.8_p20230112.tar.xz 320881876 BLAKE2B 681fb4e2c6dfb80f1f2839092bbbd891a0a0d68f6b31dbdfe8693b8ea9a0ecd9611ba692b0565f32fc2ad199de715cf61e333d796df618572f79d9ed88545ffb SHA512 1806e7a3134579a5cfc0c932cc95ffb15edc515c2ff32b01eee9de8245938f95301610cd7b57451a07a9e38451111973b88c1d64a03f1371e58106bf202b143e
DIST qtwebengine-everywhere-src-6.4.0.tar.xz 440346968 BLAKE2B ffe9ad9f71034d14f016a71bf3e6034853d5c2b17a3ab3e8aefc1c3a79896363eb2ce41446f16e126ec313608619900ee7ac41750978c28f135df5bbc2e0be5c SHA512 a024781c675c60ca746abb6cd977872b51e3f4a7ff9f934450b82e9b19883c68c0c6c630c28997624f0caceed3c43e8b0658419ecb18cf08fa9081275bedd2a7
DIST qtwebengine-everywhere-src-6.4.2.tar.xz 440538956 BLAKE2B df94e0e8e22d11614d0d35002c0e404e6735d75e7b43bef1bfd3d5e1230a997625fe8471d8a9154798cc1f9b9c296c2b697ec70fba0428d509d1352d6d3fafee SHA512 47b184a690d4fa5ccccaa3533903068df7b28825aeb16b7c75e3c7cc29fe0cfdf07501c5f0311926c22852f626b0cd59c836d44527261dc7d5c1efbf7e15439b
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild
new file mode 100644
index 000000000000..62c77057afa3
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230112.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9,10} )
+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/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2
+ https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.3_p20220406-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-ffmpeg +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-ffmpeg? ( media-video/ffmpeg:0= )
+ 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=(
+ "${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, bug 695446
+ "${FILESDIR}/${PN}-5.15.3_p20220505-extra-gn.patch" # downstream, bug 774186
+ "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
+ "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
+ "${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746
+ "${FILESDIR}/${PN}-5.15.3_p20220329-clang14.patch" # by FreeBSD, bug 836604
+ "${FILESDIR}/${PN}-5.15.3_p20220406-gcc12-includes.patch" # by openSUSE, bug 840326
+ "${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
+ "${WORKDIR}/${PN}-5.15.3_p20220406-patchset" # bug 698988 (py2--), pipewire-3
+ "${FILESDIR}/${PN}-5.15.8_p20230106-v8-opcode-constexpr.patch" # bug 889042
+ "${FILESDIR}/${PN}-5.15.8_p20230106-widevine.patch" # bug 888783
+)
+
+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
+
+ if use system-ffmpeg && has_version '>=media-video/ffmpeg-5'; then
+ eapply "${FILESDIR}/${PN}-5.15.3_p20220406-ffmpeg5.patch" # by Archlinux, bug 831437
+ 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 '')
+ $(usex system-ffmpeg -system-ffmpeg -qt-ffmpeg)
+ $(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."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-01-15 12:36 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2023-01-15 12:36 UTC (permalink / raw
To: gentoo-commits
commit: 34cb774a2e29b124133fca8f6e0e22a6b89197d4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 15 12:33:53 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 12:36:33 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34cb774a
dev-qt/qtwebengine: drop 5.15.8_p20230106
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 -
.../qtwebengine-5.15.8_p20230106.ebuild | 284 ---------------------
2 files changed, 285 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 9e66ddba2e79..44b9d711211e 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -2,7 +2,6 @@ DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3
DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
DIST qtwebengine-5.15.7_p20221122.tar.xz 319323408 BLAKE2B f0f7d566e84a78bae964bf34ccb305d51ae3c0b73bea2b382edca373a5240ab63ce6d90a1f81c8e70fd1f1eb05f9985fccbdae36958afe9dd8fa9c95a72775e0 SHA512 42665d2d7d227aeb04b9f7af0728ea5b07978e221b858fd2855595ad588d709bacbea18ab9e0c3a023579e5e3b80cdf6d3ff721573631ee43626bd37fb424225
-DIST qtwebengine-5.15.8_p20230106.tar.xz 319368288 BLAKE2B cbf6abc941cc20d7568c458726ccd371d5c6838b93e034e79767a2f98a00576a89a81eeb2964fb549df5f347cb8927863c15bf082c6abb749ed90cbe69c9677c SHA512 9b65cb69945516ee57945ccf59b2f60182673e7a77e29418269a285c708a5dcd4ddfdd6c23e187280e68d7abee4e1dc2d00da6678393a44e88b88702db337615
DIST qtwebengine-5.15.8_p20230112.tar.xz 320881876 BLAKE2B 681fb4e2c6dfb80f1f2839092bbbd891a0a0d68f6b31dbdfe8693b8ea9a0ecd9611ba692b0565f32fc2ad199de715cf61e333d796df618572f79d9ed88545ffb SHA512 1806e7a3134579a5cfc0c932cc95ffb15edc515c2ff32b01eee9de8245938f95301610cd7b57451a07a9e38451111973b88c1d64a03f1371e58106bf202b143e
DIST qtwebengine-everywhere-src-6.4.0.tar.xz 440346968 BLAKE2B ffe9ad9f71034d14f016a71bf3e6034853d5c2b17a3ab3e8aefc1c3a79896363eb2ce41446f16e126ec313608619900ee7ac41750978c28f135df5bbc2e0be5c SHA512 a024781c675c60ca746abb6cd977872b51e3f4a7ff9f934450b82e9b19883c68c0c6c630c28997624f0caceed3c43e8b0658419ecb18cf08fa9081275bedd2a7
DIST qtwebengine-everywhere-src-6.4.2.tar.xz 440538956 BLAKE2B df94e0e8e22d11614d0d35002c0e404e6735d75e7b43bef1bfd3d5e1230a997625fe8471d8a9154798cc1f9b9c296c2b697ec70fba0428d509d1352d6d3fafee SHA512 47b184a690d4fa5ccccaa3533903068df7b28825aeb16b7c75e3c7cc29fe0cfdf07501c5f0311926c22852f626b0cd59c836d44527261dc7d5c1efbf7e15439b
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230106.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230106.ebuild
deleted file mode 100644
index 90cfa552b3be..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.8_p20230106.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10} )
-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/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2
- https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.3_p20220406-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-ffmpeg +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-ffmpeg? ( media-video/ffmpeg:0= )
- 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=(
- "${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, bug 695446
- "${FILESDIR}/${PN}-5.15.3_p20220505-extra-gn.patch" # downstream, bug 774186
- "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
- "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
- "${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746
- "${FILESDIR}/${PN}-5.15.3_p20220329-clang14.patch" # by FreeBSD, bug 836604
- "${FILESDIR}/${PN}-5.15.3_p20220406-gcc12-includes.patch" # by openSUSE, bug 840326
- "${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
- "${WORKDIR}/${PN}-5.15.3_p20220406-patchset" # bug 698988 (py2--), pipewire-3
- "${FILESDIR}/${P}-v8-opcode-constexpr.patch" # bug 889042
- "${FILESDIR}/${P}-widevine.patch" # bug 888783
-)
-
-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
-
- if use system-ffmpeg && has_version '>=media-video/ffmpeg-5'; then
- eapply "${FILESDIR}/${PN}-5.15.3_p20220406-ffmpeg5.patch" # by Archlinux, bug 831437
- 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 '')
- $(usex system-ffmpeg -system-ffmpeg -qt-ffmpeg)
- $(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."
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2023-01-05 22:39 Jimi Huotari
0 siblings, 0 replies; 301+ messages in thread
From: Jimi Huotari @ 2023-01-05 22:39 UTC (permalink / raw
To: gentoo-commits
commit: f24095c2bd8e8362faf783cd12c870f230d166b1
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 5 14:58:30 2023 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Thu Jan 5 22:38:57 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f24095c2
dev-qt/qtwebengine: add 6.4.2
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-6.4.2.ebuild | 243 ++++++++++++++++++++++++++++
2 files changed, 244 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index a37635ce33d8..4fb15138c566 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -3,3 +3,4 @@ DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d140687
DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
DIST qtwebengine-5.15.7_p20221122.tar.xz 319323408 BLAKE2B f0f7d566e84a78bae964bf34ccb305d51ae3c0b73bea2b382edca373a5240ab63ce6d90a1f81c8e70fd1f1eb05f9985fccbdae36958afe9dd8fa9c95a72775e0 SHA512 42665d2d7d227aeb04b9f7af0728ea5b07978e221b858fd2855595ad588d709bacbea18ab9e0c3a023579e5e3b80cdf6d3ff721573631ee43626bd37fb424225
DIST qtwebengine-everywhere-src-6.4.0.tar.xz 440346968 BLAKE2B ffe9ad9f71034d14f016a71bf3e6034853d5c2b17a3ab3e8aefc1c3a79896363eb2ce41446f16e126ec313608619900ee7ac41750978c28f135df5bbc2e0be5c SHA512 a024781c675c60ca746abb6cd977872b51e3f4a7ff9f934450b82e9b19883c68c0c6c630c28997624f0caceed3c43e8b0658419ecb18cf08fa9081275bedd2a7
+DIST qtwebengine-everywhere-src-6.4.2.tar.xz 440538956 BLAKE2B df94e0e8e22d11614d0d35002c0e404e6735d75e7b43bef1bfd3d5e1230a997625fe8471d8a9154798cc1f9b9c296c2b697ec70fba0428d509d1352d6d3fafee SHA512 47b184a690d4fa5ccccaa3533903068df7b28825aeb16b7c75e3c7cc29fe0cfdf07501c5f0311926c22852f626b0cd59c836d44527261dc7d5c1efbf7e15439b
diff --git a/dev-qt/qtwebengine/qtwebengine-6.4.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.4.2.ebuild
new file mode 100644
index 000000000000..c1a7dff6aa69
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-6.4.2.ebuild
@@ -0,0 +1,243 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_REQ_USE="xml(+)"
+CHROMIUM_VER="102.0.5005.177"
+CHROMIUM_PATCHES_VER="108.0.5359.94"
+
+inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
+
+DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64"
+fi
+
+IUSE="
+ alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast
+ +system-ffmpeg +system-icu widgets
+"
+REQUIRED_USE="designer? ( widgets )"
+
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
+ dev-util/gperf
+ dev-util/ninja
+ dev-util/re2c
+ net-libs/nodejs[ssl]
+ sys-devel/bison
+ sys-devel/flex
+"
+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/qtdeclarative-${PV}*
+ =dev-qt/qtwebchannel-${PV}*
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/harfbuzz:=
+ media-libs/lcms:2
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ >=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/libxcb:=
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libxkbcommon
+ x11-libs/libxkbfile
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXScrnSaver
+ x11-libs/libxshmfence:=
+ x11-libs/libXtst
+ alsa? ( media-libs/alsa-lib )
+ geolocation? ( =dev-qt/qtpositioning-${PV}* )
+ kerberos? ( virtual/krb5 )
+ pulseaudio? ( media-libs/libpulse:= )
+ screencast? ( media-video/pipewire:= )
+ system-ffmpeg? ( media-video/ffmpeg:= )
+ system-icu? ( >=dev-libs/icu-69.1:= )
+ widgets? (
+ =dev-qt/qtbase-${PV}*[widgets]
+ )
+"
+DEPEND="${RDEPEND}
+ media-libs/libglvnd
+"
+
+python_check_deps() {
+ python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+}
+
+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
+}
+
+pkg_preinst() {
+ elog "This version of Qt WebEngine is based on Chromium version ${CHROMIUM_VER}, with"
+ elog "additional security fixes up to ${CHROMIUM_PATCHES_VER}. 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."
+}
+
+src_unpack() {
+ # bug 307861
+ eshopts_push -s extglob
+ if is-flagq '-g?(gdb)?([1-9])'; then
+ ewarn
+ 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."
+ ewarn
+ fi
+ eshopts_pop
+
+ case ${QT6_BUILD_TYPE} in
+ live) git-r3_src_unpack ;&
+ release) default ;;
+ esac
+}
+
+src_prepare() {
+ # bug 620444 - ensure local headers are used
+ find . -type f -name "*.pr[fio]" -exec \
+ 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
+
+ qt6-build_src_prepare
+}
+
+src_configure() {
+ export NINJA_PATH="${BROOT}"/usr/bin/ninja
+ export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
+
+ local mycmakeargs=(
+ #-DQT_FEATURE_accessibility=off
+ #-DQT_FEATURE_force_asserts=off
+ #-DQT_FEATURE_opengl=off
+ #-DQT_FEATURE_printer=off
+ -DQT_FEATURE_qtpdf_build=off
+ -DQT_FEATURE_qtpdf_quick_build=off
+ -DQT_FEATURE_qtpdf_widgets_build=off
+ -DQT_FEATURE_qtwebengine_build=on
+ -DQT_FEATURE_qtwebengine_quick_build=on
+ -DQT_FEATURE_qtwebengine_widgets_build=on
+ #-DQT_FEATURE_ssl=off
+ #-DQT_FEATURE_static=off
+ #-DQT_FEATURE_system_zlib=off
+ #-DQT_FEATURE_system_png=off
+ #-DQT_FEATURE_system_jpeg=off
+ #-DQT_FEATURE_system_freetype=off
+ #-DQT_FEATURE_system_harfbuzz=off
+ #-DQT_FEATURE_use_gold_linker=off
+ #-DQT_FEATURE_use_lld_linker=off
+ -DQT_FEATURE_webengine_embedded_build=off
+ -DQT_FEATURE_webengine_extensions=on
+ #-DQT_FEATURE_webengine_full_debug_info=$(usex debug)
+ -DQT_FEATURE_webengine_geolocation=$(usex geolocation on off)
+ -DQT_FEATURE_webengine_jumbo_build=$(usex jumbo-build)
+ #-DQT_FEATURE_webengine_jumbo_file_merge_limit
+ -DQT_FEATURE_webengine_kerberos=$(usex kerberos on off)
+ -DQT_FEATURE_webengine_native_spellchecker=off
+ -DQT_FEATURE_webengine_ozone_x11=on
+ -DQT_FEATURE_webengine_pepper_plugins=on
+ -DQT_FEATURE_webengine_proprietary_codecs=$(usex bindist off on)
+ -DQT_FEATURE_webengine_printing_and_pdf=on
+ -DQT_FEATURE_webengine_sanitizer=on
+ -DQT_FEATURE_webengine_spellchecker=on
+ -DQT_FEATURE_webengine_system_opus=on
+ -DQT_FEATURE_webengine_system_libwebp=on
+ -DQT_FEATURE_webengine_system_alsa=$(usex alsa on off)
+ -DQT_FEATURE_webengine_system_ffmpeg=$(usex system-ffmpeg)
+ -DQT_FEATURE_webengine_system_icu=$(usex system-icu)
+ -DQT_FEATURE_webengine_system_libevent=on
+ -DQT_FEATURE_webengine_system_libpci=on
+ -DQT_FEATURE_webengine_system_libpng=on
+ -DQT_FEATURE_webengine_system_pulseaudio=$(usex pulseaudio on off)
+ -DQT_FEATURE_webengine_system_zlib=on
+ -DQT_FEATURE_webengine_webchannel=on
+ -DQT_FEATURE_webengine_webrtc=on
+ -DQT_FEATURE_webengine_webrtc_pipewire=$(usex screencast on off)
+ #-DQT_FEATURE_xcb=off
+ )
+
+ qt6-build_src_configure
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2022-12-06 17:07 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2022-12-06 17:07 UTC (permalink / raw
To: gentoo-commits
commit: acd584359ad952899442a4d7a0187df45e33fc7c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 5 20:09:19 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 6 17:05:58 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acd58435
dev-qt/qtwebengine: cleanup vulnerable 5.15.5_p20220618
Bug: https://bugs.gentoo.org/866332
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 -
.../qtwebengine-5.15.5_p20220618.ebuild | 283 ---------------------
2 files changed, 284 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 9721a6bd2a18..a37635ce33d8 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,6 +1,5 @@
DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
-DIST qtwebengine-5.15.5_p20220618.tar.xz 320131236 BLAKE2B 842322c94737cdf647277ccf226c0d015ac0b362af54c4298cbad6b4494aa4ef0e73830577fb391be31c91b4331b85f407ec58641897a7cc7237e7623043577d SHA512 b1bab7aa5edc7f7b9d4f8338a05dbbd55ae6e0312e1a7e6061895bd7a98c67780127c20db1dbbc81664bf483a5b8f7ed887cedd1baaa1a0259e28fd4b13d6944
DIST qtwebengine-5.15.7_p20221122.tar.xz 319323408 BLAKE2B f0f7d566e84a78bae964bf34ccb305d51ae3c0b73bea2b382edca373a5240ab63ce6d90a1f81c8e70fd1f1eb05f9985fccbdae36958afe9dd8fa9c95a72775e0 SHA512 42665d2d7d227aeb04b9f7af0728ea5b07978e221b858fd2855595ad588d709bacbea18ab9e0c3a023579e5e3b80cdf6d3ff721573631ee43626bd37fb424225
DIST qtwebengine-everywhere-src-6.4.0.tar.xz 440346968 BLAKE2B ffe9ad9f71034d14f016a71bf3e6034853d5c2b17a3ab3e8aefc1c3a79896363eb2ce41446f16e126ec313608619900ee7ac41750978c28f135df5bbc2e0be5c SHA512 a024781c675c60ca746abb6cd977872b51e3f4a7ff9f934450b82e9b19883c68c0c6c630c28997624f0caceed3c43e8b0658419ecb18cf08fa9081275bedd2a7
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
deleted file mode 100644
index 2e0e639465d3..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
+++ /dev/null
@@ -1,283 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10} )
-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/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2
- https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.3_p20220406-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-ffmpeg +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-sound/pulseaudio:= )
- screencast? ( media-video/pipewire:= )
- system-ffmpeg? ( media-video/ffmpeg:0= )
- 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=(
- "${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, bug 695446
- "${FILESDIR}/${PN}-5.15.3_p20220505-extra-gn.patch" # downstream, bug 774186
- "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
- "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
- "${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746
- "${FILESDIR}/${PN}-5.15.3_p20220329-clang14.patch" # by FreeBSD, bug 836604
- "${FILESDIR}/${PN}-5.15.3_p20220406-gcc12-includes.patch" # by openSUSE, bug 840326
- "${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
- "${WORKDIR}/${PN}-5.15.3_p20220406-patchset" # bug 698988 (py2--), pipewire-3
- "${FILESDIR}/${P}-fixup-CVE-2022-0796.patch" # bug 853097
-)
-
-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
-
- if use system-ffmpeg && has_version '>=media-video/ffmpeg-5'; then
- eapply "${FILESDIR}/${PN}-5.15.3_p20220406-ffmpeg5.patch" # by Archlinux, bug 831437
- 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 '')
- $(usex system-ffmpeg -system-ffmpeg -qt-ffmpeg)
- $(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."
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2022-12-04 19:22 Arthur Zamarin
0 siblings, 0 replies; 301+ messages in thread
From: Arthur Zamarin @ 2022-12-04 19:22 UTC (permalink / raw
To: gentoo-commits
commit: f488bded34c1497da66f4cc3b08cd929e7df8319
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 4 19:22:13 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 4 19:22:13 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f488bded
dev-qt/qtwebengine: Stabilize 5.15.7_p20221122 arm64, #883677
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.7_p20221122.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.7_p20221122.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.7_p20221122.ebuild
index 205c11ee566c..af5c7e8c0a98 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.7_p20221122.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.7_p20221122.ebuild
@@ -11,7 +11,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 ~ppc64 x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2022-12-03 20:37 Arthur Zamarin
0 siblings, 0 replies; 301+ messages in thread
From: Arthur Zamarin @ 2022-12-03 20:37 UTC (permalink / raw
To: gentoo-commits
commit: bf7070b161f5fa6ad5ffb4917c6435edbf98670c
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 3 20:37:10 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 3 20:37:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf7070b1
dev-qt/qtwebengine: Stabilize 5.15.7_p20221122 x86, #883677
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.7_p20221122.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.7_p20221122.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.7_p20221122.ebuild
index b20df7ddb80a..205c11ee566c 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.7_p20221122.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.7_p20221122.ebuild
@@ -11,7 +11,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 ~ppc64 x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2022-12-03 11:02 Sam James
0 siblings, 0 replies; 301+ messages in thread
From: Sam James @ 2022-12-03 11:02 UTC (permalink / raw
To: gentoo-commits
commit: 4748d71e2732c943c015b43fc0464ea56b531568
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 3 11:00:45 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 3 11:00:45 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4748d71e
dev-qt/qtwebengine: Stabilize 5.15.7_p20221122 amd64, #883677
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.7_p20221122.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.7_p20221122.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.7_p20221122.ebuild
index 571d2b62b77e..b20df7ddb80a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.7_p20221122.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.7_p20221122.ebuild
@@ -11,7 +11,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 ~ppc64 ~x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2022-12-01 19:19 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2022-12-01 19:19 UTC (permalink / raw
To: gentoo-commits
commit: 1ef2d666aefbdc84ae247f5b4f6eebbe8f4ef1ba
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 1 18:45:35 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 1 19:19:16 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ef2d666
dev-qt/qtwebengine: drop 6.3.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 -
dev-qt/qtwebengine/qtwebengine-6.3.2.ebuild | 242 ----------------------------
2 files changed, 243 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 1dd01f60b148..9721a6bd2a18 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -3,5 +3,4 @@ DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d140687
DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
DIST qtwebengine-5.15.5_p20220618.tar.xz 320131236 BLAKE2B 842322c94737cdf647277ccf226c0d015ac0b362af54c4298cbad6b4494aa4ef0e73830577fb391be31c91b4331b85f407ec58641897a7cc7237e7623043577d SHA512 b1bab7aa5edc7f7b9d4f8338a05dbbd55ae6e0312e1a7e6061895bd7a98c67780127c20db1dbbc81664bf483a5b8f7ed887cedd1baaa1a0259e28fd4b13d6944
DIST qtwebengine-5.15.7_p20221122.tar.xz 319323408 BLAKE2B f0f7d566e84a78bae964bf34ccb305d51ae3c0b73bea2b382edca373a5240ab63ce6d90a1f81c8e70fd1f1eb05f9985fccbdae36958afe9dd8fa9c95a72775e0 SHA512 42665d2d7d227aeb04b9f7af0728ea5b07978e221b858fd2855595ad588d709bacbea18ab9e0c3a023579e5e3b80cdf6d3ff721573631ee43626bd37fb424225
-DIST qtwebengine-everywhere-src-6.3.2.tar.xz 398294888 BLAKE2B 7fb59e9c0a09e4ffc2c59398e9249cb91c864168b81befa9ea7e2044ed328bc010f0e6d03ecfc74e006044b56c826b35dba05375aba6fee29e5d5aa08b33fa4c SHA512 deff0a7ad71c4c81b3f5cfff77919d9971eec0ba3713a94a28d902404189b4f92b237a89cc6ef3dec2ea7a766f8a7241638a1310e4ac68fe46ecdc61f69a958a
DIST qtwebengine-everywhere-src-6.4.0.tar.xz 440346968 BLAKE2B ffe9ad9f71034d14f016a71bf3e6034853d5c2b17a3ab3e8aefc1c3a79896363eb2ce41446f16e126ec313608619900ee7ac41750978c28f135df5bbc2e0be5c SHA512 a024781c675c60ca746abb6cd977872b51e3f4a7ff9f934450b82e9b19883c68c0c6c630c28997624f0caceed3c43e8b0658419ecb18cf08fa9081275bedd2a7
diff --git a/dev-qt/qtwebengine/qtwebengine-6.3.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.3.2.ebuild
deleted file mode 100644
index 2ce46d9ae13e..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-6.3.2.ebuild
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10} )
-PYTHON_REQ_USE="xml(+)"
-CHROMIUM_VER="94.0.4606.126"
-CHROMIUM_PATCHES_VER="104.0.5112.81"
-
-inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
-
-DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
-
-if [[ ${QT6_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64"
-fi
-
-IUSE="
- alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast
- +system-ffmpeg +system-icu widgets
-"
-REQUIRED_USE="designer? ( widgets )"
-
-BDEPEND="
- $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
- dev-util/gperf
- dev-util/ninja
- dev-util/re2c
- net-libs/nodejs[ssl]
- sys-devel/bison
- sys-devel/flex
-"
-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/qtdeclarative-${PV}*
- =dev-qt/qtwebchannel-${PV}*
- media-libs/fontconfig
- media-libs/freetype
- media-libs/harfbuzz:=
- media-libs/lcms:2
- media-libs/libjpeg-turbo:=
- media-libs/libpng:=
- >=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/libxcb:=
- x11-libs/libXdamage
- x11-libs/libXext
- x11-libs/libXfixes
- x11-libs/libXi
- x11-libs/libxkbcommon
- x11-libs/libxkbfile
- x11-libs/libXrandr
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libXtst
- alsa? ( media-libs/alsa-lib )
- geolocation? ( =dev-qt/qtpositioning-${PV}* )
- kerberos? ( virtual/krb5 )
- pulseaudio? ( media-libs/libpulse:= )
- screencast? ( media-video/pipewire:= )
- system-ffmpeg? ( media-video/ffmpeg:= )
- system-icu? ( >=dev-libs/icu-69.1:= )
- widgets? (
- =dev-qt/qtbase-${PV}*[widgets]
- )
-"
-DEPEND="${RDEPEND}
- media-libs/libglvnd
-"
-
-python_check_deps() {
- python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
-}
-
-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
-}
-
-pkg_preinst() {
- elog "This version of Qt WebEngine is based on Chromium version ${CHROMIUM_VER}, with"
- elog "additional security fixes up to ${CHROMIUM_PATCHES_VER}. 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."
-}
-
-src_unpack() {
- # bug 307861
- eshopts_push -s extglob
- if is-flagq '-g?(gdb)?([1-9])'; then
- ewarn
- 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."
- ewarn
- fi
- eshopts_pop
-
- case ${QT6_BUILD_TYPE} in
- live) git-r3_src_unpack ;&
- release) default ;;
- esac
-}
-
-src_prepare() {
- # bug 620444 - ensure local headers are used
- find . -type f -name "*.pr[fio]" -exec \
- 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
-
- qt6-build_src_prepare
-}
-
-src_configure() {
- export NINJA_PATH="${BROOT}"/usr/bin/ninja
- export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
- local mycmakeargs=(
- #-DQT_FEATURE_accessibility=off
- #-DQT_FEATURE_force_asserts=off
- #-DQT_FEATURE_opengl=off
- #-DQT_FEATURE_printer=off
- -DQT_FEATURE_qtpdf_build=off
- -DQT_FEATURE_qtpdf_quick_build=off
- -DQT_FEATURE_qtpdf_widgets_build=off
- -DQT_FEATURE_qtwebengine_build=on
- -DQT_FEATURE_qtwebengine_quick_build=on
- -DQT_FEATURE_qtwebengine_widgets_build=on
- #-DQT_FEATURE_ssl=off
- #-DQT_FEATURE_static=off
- #-DQT_FEATURE_system_zlib=off
- #-DQT_FEATURE_system_png=off
- #-DQT_FEATURE_system_jpeg=off
- #-DQT_FEATURE_system_freetype=off
- #-DQT_FEATURE_system_harfbuzz=off
- #-DQT_FEATURE_use_gold_linker=off
- #-DQT_FEATURE_use_lld_linker=off
- -DQT_FEATURE_webengine_embedded_build=off
- -DQT_FEATURE_webengine_extensions=on
- #-DQT_FEATURE_webengine_full_debug_info=$(usex debug)
- -DQT_FEATURE_webengine_geolocation=$(usex geolocation on off)
- -DQT_FEATURE_webengine_jumbo_build=$(usex jumbo-build)
- #-DQT_FEATURE_webengine_jumbo_file_merge_limit
- -DQT_FEATURE_webengine_kerberos=$(usex kerberos on off)
- -DQT_FEATURE_webengine_native_spellchecker=off
- -DQT_FEATURE_webengine_ozone_x11=on
- -DQT_FEATURE_webengine_pepper_plugins=on
- -DQT_FEATURE_webengine_proprietary_codecs=$(usex bindist off on)
- -DQT_FEATURE_webengine_printing_and_pdf=on
- -DQT_FEATURE_webengine_sanitizer=on
- -DQT_FEATURE_webengine_spellchecker=on
- -DQT_FEATURE_webengine_system_opus=on
- -DQT_FEATURE_webengine_system_libwebp=on
- -DQT_FEATURE_webengine_system_alsa=$(usex alsa on off)
- -DQT_FEATURE_webengine_system_ffmpeg=$(usex system-ffmpeg)
- -DQT_FEATURE_webengine_system_icu=$(usex system-icu)
- -DQT_FEATURE_webengine_system_libevent=on
- -DQT_FEATURE_webengine_system_libpci=on
- -DQT_FEATURE_webengine_system_libpng=on
- -DQT_FEATURE_webengine_system_pulseaudio=$(usex pulseaudio on off)
- -DQT_FEATURE_webengine_system_zlib=on
- -DQT_FEATURE_webengine_webchannel=on
- -DQT_FEATURE_webengine_webrtc=on
- -DQT_FEATURE_webengine_webrtc_pipewire=$(usex screencast on off)
- #-DQT_FEATURE_xcb=off
- )
-
- qt6-build_src_configure
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2022-11-29 20:51 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2022-11-29 20:51 UTC (permalink / raw
To: gentoo-commits
commit: b29d1aa9e776bef58cf639b10bdbe4d21a236d7c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 29 19:32:46 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 20:50:29 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b29d1aa9
dev-qt/qtwebengine: add 5.15.7_p20221122
Snapshotted at:
Branch: 5.15
Commit: 5d89f26414471689a9626515d098104e38bacbda
Submodule qtwebengine-chromium.git:
Branch: 87-based
Commit: 20f20a41961ae1f63cf04a02f743cd2d9892a3b0
Patched with security patches up to Chromium version: 98.0.4758.102
Bug: https://bugs.gentoo.org/866332
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
.../qtwebengine-5.15.7_p20221122.ebuild | 282 +++++++++++++++++++++
2 files changed, 283 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 5e8385ebb3cf..1dd01f60b148 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -2,5 +2,6 @@ DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3
DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
DIST qtwebengine-5.15.5_p20220618.tar.xz 320131236 BLAKE2B 842322c94737cdf647277ccf226c0d015ac0b362af54c4298cbad6b4494aa4ef0e73830577fb391be31c91b4331b85f407ec58641897a7cc7237e7623043577d SHA512 b1bab7aa5edc7f7b9d4f8338a05dbbd55ae6e0312e1a7e6061895bd7a98c67780127c20db1dbbc81664bf483a5b8f7ed887cedd1baaa1a0259e28fd4b13d6944
+DIST qtwebengine-5.15.7_p20221122.tar.xz 319323408 BLAKE2B f0f7d566e84a78bae964bf34ccb305d51ae3c0b73bea2b382edca373a5240ab63ce6d90a1f81c8e70fd1f1eb05f9985fccbdae36958afe9dd8fa9c95a72775e0 SHA512 42665d2d7d227aeb04b9f7af0728ea5b07978e221b858fd2855595ad588d709bacbea18ab9e0c3a023579e5e3b80cdf6d3ff721573631ee43626bd37fb424225
DIST qtwebengine-everywhere-src-6.3.2.tar.xz 398294888 BLAKE2B 7fb59e9c0a09e4ffc2c59398e9249cb91c864168b81befa9ea7e2044ed328bc010f0e6d03ecfc74e006044b56c826b35dba05375aba6fee29e5d5aa08b33fa4c SHA512 deff0a7ad71c4c81b3f5cfff77919d9971eec0ba3713a94a28d902404189b4f92b237a89cc6ef3dec2ea7a766f8a7241638a1310e4ac68fe46ecdc61f69a958a
DIST qtwebengine-everywhere-src-6.4.0.tar.xz 440346968 BLAKE2B ffe9ad9f71034d14f016a71bf3e6034853d5c2b17a3ab3e8aefc1c3a79896363eb2ce41446f16e126ec313608619900ee7ac41750978c28f135df5bbc2e0be5c SHA512 a024781c675c60ca746abb6cd977872b51e3f4a7ff9f934450b82e9b19883c68c0c6c630c28997624f0caceed3c43e8b0658419ecb18cf08fa9081275bedd2a7
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.7_p20221122.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.7_p20221122.ebuild
new file mode 100644
index 000000000000..571d2b62b77e
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.7_p20221122.ebuild
@@ -0,0 +1,282 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+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/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2
+ https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.3_p20220406-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-ffmpeg +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-ffmpeg? ( media-video/ffmpeg:0= )
+ 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=(
+ "${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, bug 695446
+ "${FILESDIR}/${PN}-5.15.3_p20220505-extra-gn.patch" # downstream, bug 774186
+ "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
+ "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
+ "${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746
+ "${FILESDIR}/${PN}-5.15.3_p20220329-clang14.patch" # by FreeBSD, bug 836604
+ "${FILESDIR}/${PN}-5.15.3_p20220406-gcc12-includes.patch" # by openSUSE, bug 840326
+ "${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
+ "${WORKDIR}/${PN}-5.15.3_p20220406-patchset" # bug 698988 (py2--), pipewire-3
+)
+
+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
+
+ if use system-ffmpeg && has_version '>=media-video/ffmpeg-5'; then
+ eapply "${FILESDIR}/${PN}-5.15.3_p20220406-ffmpeg5.patch" # by Archlinux, bug 831437
+ 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 '')
+ $(usex system-ffmpeg -system-ffmpeg -qt-ffmpeg)
+ $(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."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2022-10-06 16:15 Sam James
0 siblings, 0 replies; 301+ messages in thread
From: Sam James @ 2022-10-06 16:15 UTC (permalink / raw
To: gentoo-commits
commit: b9bfff99769df96416c910d095b414c76386bd02
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 6 16:14:26 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Oct 6 16:15:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9bfff99
dev-qt/qtwebengine: fix has_version default-libcxx test for Clang
We moved the flag to sys-devel/clang-common to prepare for proper
config file support (which is backported to 15.0.2, although it's
going to be better in 16.x).
Go for the hack for now, but keep the bug open as we want to
switch to the proper link test from the LLVM ebuilds.
Bug: https://bugs.gentoo.org/875641
Bug: https://bugs.gentoo.org/875563
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
index b1d2486b0259..2e0e639465d3 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
@@ -200,8 +200,10 @@ src_prepare() {
fi
# src/3rdparty/gn fails with libc++ due to passing of `-static-libstdc++`
- if tc-is-clang && has_version 'sys-devel/clang[default-libcxx]'; then
- eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch"
+ 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
if use system-ffmpeg && has_version '>=media-video/ffmpeg-5'; then
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2022-09-24 14:32 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2022-09-24 14:32 UTC (permalink / raw
To: gentoo-commits
commit: 0cc14b707a6b80a8b5e4679b49cc549f5ed4f2e1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 24 14:05:55 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 24 14:32:17 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cc14b70
dev-qt/qtwebengine: add 6.3.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-6.3.2.ebuild | 242 ++++++++++++++++++++++++++++
2 files changed, 243 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 6db838137ef4..221db31de27c 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -3,3 +3,4 @@ DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d140687
DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
DIST qtwebengine-5.15.5_p20220618.tar.xz 320131236 BLAKE2B 842322c94737cdf647277ccf226c0d015ac0b362af54c4298cbad6b4494aa4ef0e73830577fb391be31c91b4331b85f407ec58641897a7cc7237e7623043577d SHA512 b1bab7aa5edc7f7b9d4f8338a05dbbd55ae6e0312e1a7e6061895bd7a98c67780127c20db1dbbc81664bf483a5b8f7ed887cedd1baaa1a0259e28fd4b13d6944
DIST qtwebengine-everywhere-src-6.3.1.tar.xz 398269544 BLAKE2B 3b56a87fd93de0da9ccbfdeda0c5a3e07892dcb1c8dce848cc21c73cb45e7c94746bad299feaa68910ba036abf0c1c16fa423307fdc08c8af4e5e920e2e8a329 SHA512 e00601a7ec6400551f7707d15cf326340ae8d6a5bb8cda55df4619148414f4b3ca3daabfd7263dd5a2ff2ca8ba64f9e91c9db3f1a50bea4903148c57b6dc81dd
+DIST qtwebengine-everywhere-src-6.3.2.tar.xz 398294888 BLAKE2B 7fb59e9c0a09e4ffc2c59398e9249cb91c864168b81befa9ea7e2044ed328bc010f0e6d03ecfc74e006044b56c826b35dba05375aba6fee29e5d5aa08b33fa4c SHA512 deff0a7ad71c4c81b3f5cfff77919d9971eec0ba3713a94a28d902404189b4f92b237a89cc6ef3dec2ea7a766f8a7241638a1310e4ac68fe46ecdc61f69a958a
diff --git a/dev-qt/qtwebengine/qtwebengine-6.3.2.ebuild b/dev-qt/qtwebengine/qtwebengine-6.3.2.ebuild
new file mode 100644
index 000000000000..2ce46d9ae13e
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-6.3.2.ebuild
@@ -0,0 +1,242 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_REQ_USE="xml(+)"
+CHROMIUM_VER="94.0.4606.126"
+CHROMIUM_PATCHES_VER="104.0.5112.81"
+
+inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt6-build
+
+DESCRIPTION="Library for rendering dynamic web content in Qt6 C++ and QML applications"
+
+if [[ ${QT6_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64"
+fi
+
+IUSE="
+ alsa bindist designer geolocation +jumbo-build kerberos pulseaudio screencast
+ +system-ffmpeg +system-icu widgets
+"
+REQUIRED_USE="designer? ( widgets )"
+
+BDEPEND="
+ $(python_gen_any_dep 'dev-python/html5lib[${PYTHON_USEDEP}]')
+ dev-util/gperf
+ dev-util/ninja
+ dev-util/re2c
+ net-libs/nodejs[ssl]
+ sys-devel/bison
+ sys-devel/flex
+"
+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/qtdeclarative-${PV}*
+ =dev-qt/qtwebchannel-${PV}*
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/harfbuzz:=
+ media-libs/lcms:2
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ >=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/libxcb:=
+ x11-libs/libXdamage
+ x11-libs/libXext
+ x11-libs/libXfixes
+ x11-libs/libXi
+ x11-libs/libxkbcommon
+ x11-libs/libxkbfile
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXScrnSaver
+ x11-libs/libXtst
+ alsa? ( media-libs/alsa-lib )
+ geolocation? ( =dev-qt/qtpositioning-${PV}* )
+ kerberos? ( virtual/krb5 )
+ pulseaudio? ( media-libs/libpulse:= )
+ screencast? ( media-video/pipewire:= )
+ system-ffmpeg? ( media-video/ffmpeg:= )
+ system-icu? ( >=dev-libs/icu-69.1:= )
+ widgets? (
+ =dev-qt/qtbase-${PV}*[widgets]
+ )
+"
+DEPEND="${RDEPEND}
+ media-libs/libglvnd
+"
+
+python_check_deps() {
+ python_has_version "dev-python/html5lib[${PYTHON_USEDEP}]"
+}
+
+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
+}
+
+pkg_preinst() {
+ elog "This version of Qt WebEngine is based on Chromium version ${CHROMIUM_VER}, with"
+ elog "additional security fixes up to ${CHROMIUM_PATCHES_VER}. 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."
+}
+
+src_unpack() {
+ # bug 307861
+ eshopts_push -s extglob
+ if is-flagq '-g?(gdb)?([1-9])'; then
+ ewarn
+ 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."
+ ewarn
+ fi
+ eshopts_pop
+
+ case ${QT6_BUILD_TYPE} in
+ live) git-r3_src_unpack ;&
+ release) default ;;
+ esac
+}
+
+src_prepare() {
+ # bug 620444 - ensure local headers are used
+ find . -type f -name "*.pr[fio]" -exec \
+ 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
+
+ qt6-build_src_prepare
+}
+
+src_configure() {
+ export NINJA_PATH="${BROOT}"/usr/bin/ninja
+ export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
+
+ local mycmakeargs=(
+ #-DQT_FEATURE_accessibility=off
+ #-DQT_FEATURE_force_asserts=off
+ #-DQT_FEATURE_opengl=off
+ #-DQT_FEATURE_printer=off
+ -DQT_FEATURE_qtpdf_build=off
+ -DQT_FEATURE_qtpdf_quick_build=off
+ -DQT_FEATURE_qtpdf_widgets_build=off
+ -DQT_FEATURE_qtwebengine_build=on
+ -DQT_FEATURE_qtwebengine_quick_build=on
+ -DQT_FEATURE_qtwebengine_widgets_build=on
+ #-DQT_FEATURE_ssl=off
+ #-DQT_FEATURE_static=off
+ #-DQT_FEATURE_system_zlib=off
+ #-DQT_FEATURE_system_png=off
+ #-DQT_FEATURE_system_jpeg=off
+ #-DQT_FEATURE_system_freetype=off
+ #-DQT_FEATURE_system_harfbuzz=off
+ #-DQT_FEATURE_use_gold_linker=off
+ #-DQT_FEATURE_use_lld_linker=off
+ -DQT_FEATURE_webengine_embedded_build=off
+ -DQT_FEATURE_webengine_extensions=on
+ #-DQT_FEATURE_webengine_full_debug_info=$(usex debug)
+ -DQT_FEATURE_webengine_geolocation=$(usex geolocation on off)
+ -DQT_FEATURE_webengine_jumbo_build=$(usex jumbo-build)
+ #-DQT_FEATURE_webengine_jumbo_file_merge_limit
+ -DQT_FEATURE_webengine_kerberos=$(usex kerberos on off)
+ -DQT_FEATURE_webengine_native_spellchecker=off
+ -DQT_FEATURE_webengine_ozone_x11=on
+ -DQT_FEATURE_webengine_pepper_plugins=on
+ -DQT_FEATURE_webengine_proprietary_codecs=$(usex bindist off on)
+ -DQT_FEATURE_webengine_printing_and_pdf=on
+ -DQT_FEATURE_webengine_sanitizer=on
+ -DQT_FEATURE_webengine_spellchecker=on
+ -DQT_FEATURE_webengine_system_opus=on
+ -DQT_FEATURE_webengine_system_libwebp=on
+ -DQT_FEATURE_webengine_system_alsa=$(usex alsa on off)
+ -DQT_FEATURE_webengine_system_ffmpeg=$(usex system-ffmpeg)
+ -DQT_FEATURE_webengine_system_icu=$(usex system-icu)
+ -DQT_FEATURE_webengine_system_libevent=on
+ -DQT_FEATURE_webengine_system_libpci=on
+ -DQT_FEATURE_webengine_system_libpng=on
+ -DQT_FEATURE_webengine_system_pulseaudio=$(usex pulseaudio on off)
+ -DQT_FEATURE_webengine_system_zlib=on
+ -DQT_FEATURE_webengine_webchannel=on
+ -DQT_FEATURE_webengine_webrtc=on
+ -DQT_FEATURE_webengine_webrtc_pipewire=$(usex screencast on off)
+ #-DQT_FEATURE_xcb=off
+ )
+
+ qt6-build_src_configure
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2022-07-20 5:15 Sam James
0 siblings, 0 replies; 301+ messages in thread
From: Sam James @ 2022-07-20 5:15 UTC (permalink / raw
To: gentoo-commits
commit: 8a9b1fd52b6d812a2b3e9f51858b8eabfbccd332
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 20 05:14:24 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 20 05:14:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a9b1fd5
dev-qt/qtwebengine: drop now-global USE=screencast definitions
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/metadata.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index cbcf0f7a01d7..415d74652d63 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -14,7 +14,6 @@
<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>
<flag name="jumbo-build">Combine source files to speed up build process.</flag>
- <flag name="screencast">Enable support for remote desktop and screen cast using <pkg>media-video/pipewire</pkg></flag>
<flag name="system-ffmpeg">Use the system-wide <pkg>media-video/ffmpeg</pkg> instead of bundled.</flag>
<flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg> instead of bundled.</flag>
<flag name="widgets">Enable QtWidgets support</flag>
^ permalink raw reply related [flat|nested] 301+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2022-07-06 10:27 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2022-07-06 10:27 UTC (permalink / raw
To: gentoo-commits
commit: e66f923a9e2f5bc4ac35e24502c159cbfe759f6b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 6 09:18:25 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jul 6 10:27:27 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e66f923a
dev-qt/qtwebengine: Cleanup vulnerable 5.15.4_p20220526
Bug: https://bugs.gentoo.org/853229
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 -
.../qtwebengine-5.15.4_p20220526.ebuild | 280 ---------------------
2 files changed, 281 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 812fa7b3fb44..282326e1c880 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,5 +1,4 @@
DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
-DIST qtwebengine-5.15.4_p20220526.tar.xz 318787804 BLAKE2B 946331d1460f2db43730c7a1f506690eb1f6f25438e52ff627fff0776cbca439cde2d2654679a238ce0384b0a92bf8eb84db97d1093b2a733dd97fa08bf4c864 SHA512 a27d31ef46b5841fec91c10b91c3c1735ace77fde17fa09018836f8d11d85b34b08318b150b791a68efde59c1317109633e938dfbb5542c22033e8ba0ce46cad
DIST qtwebengine-5.15.5_p20220618.tar.xz 320131236 BLAKE2B 842322c94737cdf647277ccf226c0d015ac0b362af54c4298cbad6b4494aa4ef0e73830577fb391be31c91b4331b85f407ec58641897a7cc7237e7623043577d SHA512 b1bab7aa5edc7f7b9d4f8338a05dbbd55ae6e0312e1a7e6061895bd7a98c67780127c20db1dbbc81664bf483a5b8f7ed887cedd1baaa1a0259e28fd4b13d6944
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild
deleted file mode 100644
index 9ba4c484f9b3..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild
+++ /dev/null
@@ -1,280 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10} )
-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/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2
- https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.3_p20220406-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-ffmpeg +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-sound/pulseaudio:= )
- screencast? ( media-video/pipewire:= )
- system-ffmpeg? ( media-video/ffmpeg:0= )
- 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=(
- "${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, bug 695446
- "${FILESDIR}/${PN}-5.15.3_p20220505-extra-gn.patch" # downstream, bug 774186
- "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
- "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
- "${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746
- "${FILESDIR}/${PN}-5.15.3_p20220329-clang14.patch" # by FreeBSD, bug 836604
- "${FILESDIR}/${PN}-5.15.3_p20220406-gcc12-includes.patch" # by openSUSE, bug 840326
- "${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
- "${WORKDIR}/${PN}-5.15.3_p20220406-patchset" # bug 698988 (py2--), pipewire-3
-)
-
-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 && has_version 'sys-devel/clang[default-libcxx]'; then
- eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch"
- fi
-
- if use system-ffmpeg && has_version '>=media-video/ffmpeg-5'; then
- eapply "${FILESDIR}/${PN}-5.15.3_p20220406-ffmpeg5.patch" # by Archlinux, bug 831437
- 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 '')
- $(usex system-ffmpeg -system-ffmpeg -qt-ffmpeg)
- $(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."
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2022-07-04 18:00 Arthur Zamarin
0 siblings, 0 replies; 301+ messages in thread
From: Arthur Zamarin @ 2022-07-04 18:00 UTC (permalink / raw
To: gentoo-commits
commit: 925cd6a509ce05842bc26ebfb30d20839b838419
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 4 17:59:45 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 4 17:59:45 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=925cd6a5
dev-qt/qtwebengine: Stabilize 5.15.5_p20220618 arm64, #853232
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
index 37c741cf4852..b1d2486b0259 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
@@ -11,7 +11,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 ~ppc64 x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2022-07-02 18:26 Sam James
0 siblings, 0 replies; 301+ messages in thread
From: Sam James @ 2022-07-02 18:26 UTC (permalink / raw
To: gentoo-commits
commit: 1c8be0bf057dd9f0481a0fd2e53b816d7e644664
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 2 18:25:32 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 2 18:25:32 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c8be0bf
dev-qt/qtwebengine: Stabilize 5.15.5_p20220618 x86, #853232
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
index adbccff13eed..37c741cf4852 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
@@ -11,7 +11,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 ~ppc64 x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2022-06-30 22:19 Sam James
0 siblings, 0 replies; 301+ messages in thread
From: Sam James @ 2022-06-30 22:19 UTC (permalink / raw
To: gentoo-commits
commit: 770092bb32bbc841c080133fed7bf54336a72a47
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 22:19:37 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 22:19:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=770092bb
dev-qt/qtwebengine: Stabilize 5.15.5_p20220618 amd64, #853232
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
index 43b46b0fbaab..adbccff13eed 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
@@ -11,7 +11,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 ~ppc64 ~x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2022-06-19 12:26 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2022-06-19 12:26 UTC (permalink / raw
To: gentoo-commits
commit: 523f8ceb947e9c2cf9003c7cfc6dd7d21a53da5f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 19 12:17:03 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 19 12:25:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=523f8ceb
dev-qt/qtwebengine: 5.15.5_p20220618 version bump
One security fix: CVE-2022-0796: Use after free in Media
Snapshotted at:
Branch: 5.15
Commit: 1da56888ac5815a68e31d113a8022993a40b9f8f
Submodule qtwebengine-chromium.git:
Branch: 87-based
Commit: ecc2bb74f1f7140fc52650042299be18e826b27b
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
.../qtwebengine-5.15.5_p20220618.ebuild | 280 +++++++++++++++++++++
2 files changed, 281 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 20845b40ed3a..812fa7b3fb44 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -2,3 +2,4 @@ DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3
DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
DIST qtwebengine-5.15.4_p20220526.tar.xz 318787804 BLAKE2B 946331d1460f2db43730c7a1f506690eb1f6f25438e52ff627fff0776cbca439cde2d2654679a238ce0384b0a92bf8eb84db97d1093b2a733dd97fa08bf4c864 SHA512 a27d31ef46b5841fec91c10b91c3c1735ace77fde17fa09018836f8d11d85b34b08318b150b791a68efde59c1317109633e938dfbb5542c22033e8ba0ce46cad
+DIST qtwebengine-5.15.5_p20220618.tar.xz 320131236 BLAKE2B 842322c94737cdf647277ccf226c0d015ac0b362af54c4298cbad6b4494aa4ef0e73830577fb391be31c91b4331b85f407ec58641897a7cc7237e7623043577d SHA512 b1bab7aa5edc7f7b9d4f8338a05dbbd55ae6e0312e1a7e6061895bd7a98c67780127c20db1dbbc81664bf483a5b8f7ed887cedd1baaa1a0259e28fd4b13d6944
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
new file mode 100644
index 000000000000..3c78403a9c2b
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
@@ -0,0 +1,280 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9,10} )
+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/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2
+ https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.3_p20220406-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-ffmpeg +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-sound/pulseaudio:= )
+ screencast? ( media-video/pipewire:= )
+ system-ffmpeg? ( media-video/ffmpeg:0= )
+ 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=(
+ "${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, bug 695446
+ "${FILESDIR}/${PN}-5.15.3_p20220505-extra-gn.patch" # downstream, bug 774186
+ "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
+ "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
+ "${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746
+ "${FILESDIR}/${PN}-5.15.3_p20220329-clang14.patch" # by FreeBSD, bug 836604
+ "${FILESDIR}/${PN}-5.15.3_p20220406-gcc12-includes.patch" # by openSUSE, bug 840326
+ "${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
+ "${WORKDIR}/${PN}-5.15.3_p20220406-patchset" # bug 698988 (py2--), pipewire-3
+)
+
+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 && has_version 'sys-devel/clang[default-libcxx]'; then
+ eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch"
+ fi
+
+ if use system-ffmpeg && has_version '>=media-video/ffmpeg-5'; then
+ eapply "${FILESDIR}/${PN}-5.15.3_p20220406-ffmpeg5.patch" # by Archlinux, bug 831437
+ 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 '')
+ $(usex system-ffmpeg -system-ffmpeg -qt-ffmpeg)
+ $(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."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2022-06-14 17:32 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2022-06-14 17:32 UTC (permalink / raw
To: gentoo-commits
commit: 6cdbe0d99c748df0cda42c26aa7eca4e5537cc7c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 16:08:27 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 17:31:46 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cdbe0d9
dev-qt/qtwebengine: Cleanup vulnerable 5.15.3_p20220406
Bug: https://bugs.gentoo.org/847613
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 -
.../qtwebengine-5.15.3_p20220406.ebuild | 280 ---------------------
2 files changed, 281 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index f4c88d1eaac6..20845b40ed3a 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,5 +1,4 @@
DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
-DIST qtwebengine-5.15.3_p20220406.tar.xz 318979648 BLAKE2B 3aba9293c52f96379cfe37c418c7a29a28e2fc0a8526d35452bef28c03b101054131d0daf75f07f058f80fbd42678b6bd24733573318169908f1d5e18d147db8 SHA512 80bf51b547cc8e15473652327a0cb753211911e8c98b1cb8b2cd696af923e79eccdc74aa4b68b6184c74ceb3a9bd708c7313f48eab4381ebeaac8192daa163b6
DIST qtwebengine-5.15.4_p20220526.tar.xz 318787804 BLAKE2B 946331d1460f2db43730c7a1f506690eb1f6f25438e52ff627fff0776cbca439cde2d2654679a238ce0384b0a92bf8eb84db97d1093b2a733dd97fa08bf4c864 SHA512 a27d31ef46b5841fec91c10b91c3c1735ace77fde17fa09018836f8d11d85b34b08318b150b791a68efde59c1317109633e938dfbb5542c22033e8ba0ce46cad
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild
deleted file mode 100644
index a0c5b039fdfa..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild
+++ /dev/null
@@ -1,280 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10} )
-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/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2
- https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.3_p20220406-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-ffmpeg +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-sound/pulseaudio:= )
- screencast? ( media-video/pipewire:= )
- system-ffmpeg? ( media-video/ffmpeg:0= )
- 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=(
- "${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, bug 695446
- "${FILESDIR}/${PN}-5.15.2-extra_gn.patch" # downstream, bug 774186
- "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
- "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
- "${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746
- "${FILESDIR}/${PN}-5.15.3_p20220329-clang14.patch" # by FreeBSD, bug 836604
- "${FILESDIR}/${PN}-5.15.3_p20220406-gcc12-includes.patch" # by openSUSE, bug 840326
- "${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
- "${WORKDIR}/${PN}-5.15.3_p20220406-patchset" # bug 698988 (py2--), pipewire-3
-)
-
-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 && has_version 'sys-devel/clang[default-libcxx]'; then
- eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch"
- fi
-
- if use system-ffmpeg && has_version '>=media-video/ffmpeg-5'; then
- eapply "${FILESDIR}/${PN}-5.15.3_p20220406-ffmpeg5.patch" # by Archlinux, bug 831437
- 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 '')
- $(usex system-ffmpeg -system-ffmpeg -qt-ffmpeg)
- $(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, with"
- elog "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."
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2022-06-14 13:27 Sam James
0 siblings, 0 replies; 301+ messages in thread
From: Sam James @ 2022-06-14 13:27 UTC (permalink / raw
To: gentoo-commits
commit: 09cc809480006cb647b1011a5e31f0cb7808ef6d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 13:26:50 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 13:26:50 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09cc8094
dev-qt/qtwebengine: Stabilize 5.15.4_p20220526 arm64, #843353
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild
index 3474f4571515..9ba4c484f9b3 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild
@@ -11,7 +11,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 ~ppc64 x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2022-06-14 13:15 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2022-06-14 13:15 UTC (permalink / raw
To: gentoo-commits
commit: 6cbe1723f9fd3aa413e03453a2e1924cb9833723
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 13:15:10 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 13:15:21 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cbe1723
dev-qt/qtwebengine: Drop 5.15.4_p20220505
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 -
.../qtwebengine-5.15.4_p20220505.ebuild | 280 ---------------------
2 files changed, 281 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 3f7cebd254e7..f4c88d1eaac6 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -2,5 +2,4 @@ DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3
DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
DIST qtwebengine-5.15.3_p20220406.tar.xz 318979648 BLAKE2B 3aba9293c52f96379cfe37c418c7a29a28e2fc0a8526d35452bef28c03b101054131d0daf75f07f058f80fbd42678b6bd24733573318169908f1d5e18d147db8 SHA512 80bf51b547cc8e15473652327a0cb753211911e8c98b1cb8b2cd696af923e79eccdc74aa4b68b6184c74ceb3a9bd708c7313f48eab4381ebeaac8192daa163b6
-DIST qtwebengine-5.15.3_p20220505.tar.xz 318923536 BLAKE2B 18798ee82864bf513525be30aba58636518b5f13061826a5f80a791baeb3a7695f2626a3eec8b8be88ef6ae4a4caa989f9a35b8b9d8d6f85f727ce3e3a18e110 SHA512 c5f0688aa782f1e8f6a076b0bc4ba0c5bb0518a784399d915da924f1a4e798dff1d23158b3bc73e46629020f5490a15823d6d5b36463dc7ebdec14331fe4323e
DIST qtwebengine-5.15.4_p20220526.tar.xz 318787804 BLAKE2B 946331d1460f2db43730c7a1f506690eb1f6f25438e52ff627fff0776cbca439cde2d2654679a238ce0384b0a92bf8eb84db97d1093b2a733dd97fa08bf4c864 SHA512 a27d31ef46b5841fec91c10b91c3c1735ace77fde17fa09018836f8d11d85b34b08318b150b791a68efde59c1317109633e938dfbb5542c22033e8ba0ce46cad
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220505.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220505.ebuild
deleted file mode 100644
index 9c2a93d1c3b2..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220505.ebuild
+++ /dev/null
@@ -1,280 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9,10} )
-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/${PN}-5.15.3_p20220505.tar.xz"
- S="${WORKDIR}/${PN}-5.15.3_p20220505"
- 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/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2
- https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.3_p20220406-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-ffmpeg +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-sound/pulseaudio:= )
- screencast? ( media-video/pipewire:= )
- system-ffmpeg? ( media-video/ffmpeg:0= )
- 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=(
- "${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, bug 695446
- "${FILESDIR}/${PN}-5.15.3_p20220505-extra-gn.patch" # downstream, bug 774186
- "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
- "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
- "${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746
- "${FILESDIR}/${PN}-5.15.3_p20220329-clang14.patch" # by FreeBSD, bug 836604
- "${FILESDIR}/${PN}-5.15.3_p20220406-gcc12-includes.patch" # by openSUSE, bug 840326
- "${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
- "${WORKDIR}/${PN}-5.15.3_p20220406-patchset" # bug 698988 (py2--), pipewire-3
-)
-
-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 && has_version 'sys-devel/clang[default-libcxx]'; then
- eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch"
- fi
-
- if use system-ffmpeg && has_version '>=media-video/ffmpeg-5'; then
- eapply "${FILESDIR}/${PN}-5.15.3_p20220406-ffmpeg5.patch" # by Archlinux, bug 831437
- 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 '')
- $(usex system-ffmpeg -system-ffmpeg -qt-ffmpeg)
- $(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."
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2022-06-14 7:21 Agostino Sarubbo
0 siblings, 0 replies; 301+ messages in thread
From: Agostino Sarubbo @ 2022-06-14 7:21 UTC (permalink / raw
To: gentoo-commits
commit: 557f7b6eb64f162be5e7bf5aa888e057d1b685cf
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 14 07:21:07 2022 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 07:21:52 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=557f7b6e
dev-qt/qtwebengine: x86 stable wrt bug #843353
Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild
index 6c1f60c130b3..3474f4571515 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild
@@ -11,7 +11,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 ~ppc64 x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2022-06-10 7:49 Georgy Yakovlev
0 siblings, 0 replies; 301+ messages in thread
From: Georgy Yakovlev @ 2022-06-10 7:49 UTC (permalink / raw
To: gentoo-commits
commit: 71807899662f46b12f91b7c5d53ab7df499aebbe
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 10 07:45:53 2022 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Jun 10 07:48:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71807899
dev-qt/qtwebengine: don't use clang-format on ppc64
Closes: https://bugs.gentoo.org/849458
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild | 5 +++++
dev-qt/qtwebengine/qtwebengine-5.15.4_p20220505.ebuild | 5 +++++
dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild | 5 +++++
3 files changed, 15 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild
index db0d242c1aa1..a0c5b039fdfa 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild
@@ -227,6 +227,11 @@ src_prepare() {
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
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220505.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220505.ebuild
index c213bc2c4a1b..9c2a93d1c3b2 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220505.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220505.ebuild
@@ -227,6 +227,11 @@ src_prepare() {
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
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild
index f9d91b68a322..6c1f60c130b3 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild
@@ -227,6 +227,11 @@ src_prepare() {
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
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2022-06-10 3:16 Sam James
0 siblings, 0 replies; 301+ messages in thread
From: Sam James @ 2022-06-10 3:16 UTC (permalink / raw
To: gentoo-commits
commit: 58799ae10bb8775fce57f7c6440c504156259749
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 10 03:15:48 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 10 03:15:48 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58799ae1
dev-qt/qtwebengine: Stabilize 5.15.4_p20220526 amd64, #843353
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild
index ad2857918b76..f9d91b68a322 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild
@@ -11,7 +11,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 ~ppc64 ~x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2022-05-30 16:09 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2022-05-30 16:09 UTC (permalink / raw
To: gentoo-commits
commit: d9fd830429f4bc8f41e12c837107c8aefaebc0c3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 15:21:52 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 30 16:09:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9fd8304
dev-qt/qtwebengine: Re-add KEYWORDS to 5.15.4_p20220526
Bug: https://bugs.gentoo.org/847613
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild
index 2505b76ea618..ad2857918b76 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild
@@ -11,7 +11,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 ~ppc64 ~x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2022-05-26 19:35 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2022-05-26 19:35 UTC (permalink / raw
To: gentoo-commits
commit: fa0ed801438935af8cd8896d5b788483e7893fa1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 26 19:34:05 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 26 19:34:19 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa0ed801
dev-qt/qtwebengine: 5.15.4_p20220526 version bump
Various security fixes...
Snapshotted at:
Branch: 5.15
Commit: 79943b157ef381e5953f34f8e03049f2eecd6eb5
Submodule qtwebengine-chromium.git:
Branch: 87-based
Commit: 7857ff290ab254a5a1fe2e85e146680448b4d46e
Bug: https://bugs.gentoo.org/847613
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
.../qtwebengine-5.15.4_p20220526.ebuild | 275 +++++++++++++++++++++
2 files changed, 276 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 4b7a113801fc..3f7cebd254e7 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -3,3 +3,4 @@ DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d140687
DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
DIST qtwebengine-5.15.3_p20220406.tar.xz 318979648 BLAKE2B 3aba9293c52f96379cfe37c418c7a29a28e2fc0a8526d35452bef28c03b101054131d0daf75f07f058f80fbd42678b6bd24733573318169908f1d5e18d147db8 SHA512 80bf51b547cc8e15473652327a0cb753211911e8c98b1cb8b2cd696af923e79eccdc74aa4b68b6184c74ceb3a9bd708c7313f48eab4381ebeaac8192daa163b6
DIST qtwebengine-5.15.3_p20220505.tar.xz 318923536 BLAKE2B 18798ee82864bf513525be30aba58636518b5f13061826a5f80a791baeb3a7695f2626a3eec8b8be88ef6ae4a4caa989f9a35b8b9d8d6f85f727ce3e3a18e110 SHA512 c5f0688aa782f1e8f6a076b0bc4ba0c5bb0518a784399d915da924f1a4e798dff1d23158b3bc73e46629020f5490a15823d6d5b36463dc7ebdec14331fe4323e
+DIST qtwebengine-5.15.4_p20220526.tar.xz 318787804 BLAKE2B 946331d1460f2db43730c7a1f506690eb1f6f25438e52ff627fff0776cbca439cde2d2654679a238ce0384b0a92bf8eb84db97d1093b2a733dd97fa08bf4c864 SHA512 a27d31ef46b5841fec91c10b91c3c1735ace77fde17fa09018836f8d11d85b34b08318b150b791a68efde59c1317109633e938dfbb5542c22033e8ba0ce46cad
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild
new file mode 100644
index 000000000000..2505b76ea618
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220526.ebuild
@@ -0,0 +1,275 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9,10} )
+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/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2
+ https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.3_p20220406-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-ffmpeg +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-sound/pulseaudio:= )
+ screencast? ( media-video/pipewire:= )
+ system-ffmpeg? ( media-video/ffmpeg:0= )
+ 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=(
+ "${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, bug 695446
+ "${FILESDIR}/${PN}-5.15.3_p20220505-extra-gn.patch" # downstream, bug 774186
+ "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
+ "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
+ "${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746
+ "${FILESDIR}/${PN}-5.15.3_p20220329-clang14.patch" # by FreeBSD, bug 836604
+ "${FILESDIR}/${PN}-5.15.3_p20220406-gcc12-includes.patch" # by openSUSE, bug 840326
+ "${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
+ "${WORKDIR}/${PN}-5.15.3_p20220406-patchset" # bug 698988 (py2--), pipewire-3
+)
+
+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 && has_version 'sys-devel/clang[default-libcxx]'; then
+ eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch"
+ fi
+
+ if use system-ffmpeg && has_version '>=media-video/ffmpeg-5'; then
+ eapply "${FILESDIR}/${PN}-5.15.3_p20220406-ffmpeg5.patch" # by Archlinux, bug 831437
+ 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
+ ./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 '')
+ $(usex system-ffmpeg -system-ffmpeg -qt-ffmpeg)
+ $(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."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2022-05-01 7:30 Michał Górny
0 siblings, 0 replies; 301+ messages in thread
From: Michał Górny @ 2022-05-01 7:30 UTC (permalink / raw
To: gentoo-commits
commit: 0ff07c7d9859b60a13f7fe13b4a89fb446658a41
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 28 10:39:25 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun May 1 07:30:28 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ff07c7d
dev-qt/qtwebengine: Prepare for makeopts_jobs default inf change
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild
index 6d206e2f1198..6a665711c4c2 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild
@@ -233,7 +233,7 @@ src_prepare() {
src_configure() {
export NINJA_PATH=/usr/bin/ninja
- export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
+ export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs "${MAKEOPTS}" 999) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
local myqmakeargs=(
--
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2022-04-15 20:15 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2022-04-15 20:15 UTC (permalink / raw
To: gentoo-commits
commit: 158495d23d60c02745db1acf3848a061256949ba
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 15 19:41:35 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Apr 15 20:14:50 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=158495d2
dev-qt/qtwebengine: Cleanup obsolete and vulnerable 5.15.3_p20220329
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 -
.../qtwebengine-5.15.3_p20220329.ebuild | 266 ---------------------
2 files changed, 267 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index df0bef8de677..174ba7d55d18 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,6 +1,5 @@
DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
DIST qtwebengine-5.15.2_p20211216.tar.xz 318953468 BLAKE2B 65b1bc5be8d08d10b75fee20f78a9a783f878874907335818cddde500e80633e91a999e92fd3de69d004c3621a8337c9bef2c949e03e552cab1d89d901e0dae2 SHA512 f72db4b6dcbdaa171bf2997ab3a77325f9845ef1d72cd994e6152f0f92d350de348ff15b1cde1140ab98b7eb10d6e2d2a3ac6b7d773ab43de37144faad37c3f3
-DIST qtwebengine-5.15.3_p20220329.tar.xz 318910384 BLAKE2B df4e88628eed5fa2304eec986dd397cd5f51e42f9fdf2dca1bc6d84ad40be406d112701124c745d003b4c22a33d5a69b39b66747e7b9a970a7c91b46ef3943f7 SHA512 650d9056477479fc4630102d7270185c99cdf1ec855f3f407725dd74a737756b7180565a924594c1b75dcbb061d3642af2447610bf22acd9c4cb2c90c7cf842b
DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7 SHA512 47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
DIST qtwebengine-5.15.3_p20220406.tar.xz 318979648 BLAKE2B 3aba9293c52f96379cfe37c418c7a29a28e2fc0a8526d35452bef28c03b101054131d0daf75f07f058f80fbd42678b6bd24733573318169908f1d5e18d147db8 SHA512 80bf51b547cc8e15473652327a0cb753211911e8c98b1cb8b2cd696af923e79eccdc74aa4b68b6184c74ceb3a9bd708c7313f48eab4381ebeaac8192daa163b6
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220329.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220329.ebuild
deleted file mode 100644
index 5331549093bf..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220329.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python2_7 )
-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/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2
- 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 +system-ffmpeg +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-sound/pulseaudio:= )
- system-ffmpeg? ( media-video/ffmpeg:0= )
- 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=(
- "${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, bug 695446
- "${FILESDIR}/${PN}-5.15.2-extra_gn.patch" # downstream, bug 774186
- "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
- "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
- "${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746
- "${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
- "${FILESDIR}/${PN}-5.15.3_p20220329-clang14.patch" # fixes build with clang 14
-)
-
-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.2 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\.[3456789]/${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 && has_version 'sys-devel/clang[default-libcxx]'; then
- eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch"
- 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
- ./generate_gni.sh || die
- popd >/dev/null || die
- fi
-}
-
-src_configure() {
- export NINJA_PATH=/usr/bin/ninja
- export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -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 system-ffmpeg -system-ffmpeg -qt-ffmpeg)
- $(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, with"
- elog "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."
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2022-04-14 0:19 Sam James
0 siblings, 0 replies; 301+ messages in thread
From: Sam James @ 2022-04-14 0:19 UTC (permalink / raw
To: gentoo-commits
commit: 6cdb150c9bd82175d9150442ddc54eb914d15883
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 14 00:19:00 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Apr 14 00:19:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cdb150c
dev-qt/qtwebengine: Stabilize 5.15.3_p20220406 x86, #835762
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild
index 67fede220507..6d206e2f1198 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild
@@ -11,7 +11,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 ~ppc64 x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2022-04-12 22:49 Sam James
0 siblings, 0 replies; 301+ messages in thread
From: Sam James @ 2022-04-12 22:49 UTC (permalink / raw
To: gentoo-commits
commit: 6ffca7c0d0a3cd91129a47016a943f66e68d68ff
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 12 22:49:19 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 22:49:19 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ffca7c0
dev-qt/qtwebengine: Stabilize 5.15.3_p20220406 amd64, #835762
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild
index 40e66fd523e2..67fede220507 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild
@@ -11,7 +11,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 ~ppc64 ~x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2022-04-12 19:35 Arthur Zamarin
0 siblings, 0 replies; 301+ messages in thread
From: Arthur Zamarin @ 2022-04-12 19:35 UTC (permalink / raw
To: gentoo-commits
commit: ad66908eaaee9ee5db0613533da5577c4303b5ce
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 12 19:35:25 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 12 19:35:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad66908e
dev-qt/qtwebengine: Stabilize 5.15.3_p20220406 arm64, #835762
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild
index 2cc0403ea2bd..40e66fd523e2 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild
@@ -11,7 +11,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 ~ppc64 ~x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2022-03-30 5:52 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2022-03-30 5:52 UTC (permalink / raw
To: gentoo-commits
commit: b71ef3813eee40a6575dfb3e6c4127e9ca49c043
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 30 05:50:11 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 30 05:52:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b71ef381
dev-qt/qtwebengine: Drop 5.15.3_p20220310
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 -
.../qtwebengine-5.15.3_p20220310.ebuild | 265 ---------------------
2 files changed, 266 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index edffb438ff5c..eedc182c4dad 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,5 +1,4 @@
DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
DIST qtwebengine-5.15.2_p20211216.tar.xz 318953468 BLAKE2B 65b1bc5be8d08d10b75fee20f78a9a783f878874907335818cddde500e80633e91a999e92fd3de69d004c3621a8337c9bef2c949e03e552cab1d89d901e0dae2 SHA512 f72db4b6dcbdaa171bf2997ab3a77325f9845ef1d72cd994e6152f0f92d350de348ff15b1cde1140ab98b7eb10d6e2d2a3ac6b7d773ab43de37144faad37c3f3
-DIST qtwebengine-5.15.3_p20220310.tar.xz 319290976 BLAKE2B 0a0e74e7d94e59d81687ceb4d791034d43daaeef887894acedc2d2568a8c74e4b7303440518d377c16de21a546e2609fdd89ab64c0664c230df4657cec9d399c SHA512 e57c7c51d0f27d116d2dc80043cb563a1dbce2357221ba87ae3c3b0e8c781e3ef09f69b8f6f20fcb7d85d596ae312b2f85ebc35ba7ee283ab30caa8f796fe2d6
DIST qtwebengine-5.15.3_p20220329.tar.xz 318910384 BLAKE2B df4e88628eed5fa2304eec986dd397cd5f51e42f9fdf2dca1bc6d84ad40be406d112701124c745d003b4c22a33d5a69b39b66747e7b9a970a7c91b46ef3943f7 SHA512 650d9056477479fc4630102d7270185c99cdf1ec855f3f407725dd74a737756b7180565a924594c1b75dcbb061d3642af2447610bf22acd9c4cb2c90c7cf842b
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220310.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220310.ebuild
deleted file mode 100644
index 8c44a49805d8..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220310.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python2_7 )
-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/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2
- 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 +system-ffmpeg +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-sound/pulseaudio:= )
- system-ffmpeg? ( media-video/ffmpeg:0= )
- 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=(
- "${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, bug 695446
- "${FILESDIR}/${PN}-5.15.2-extra_gn.patch" # downstream, bug 774186
- "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
- "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
- "${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746
- "${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
-)
-
-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.2 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\.[3456789]/${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 && has_version 'sys-devel/clang[default-libcxx]'; then
- eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch"
- 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
- ./generate_gni.sh || die
- popd >/dev/null || die
- fi
-}
-
-src_configure() {
- export NINJA_PATH=/usr/bin/ninja
- export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -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 system-ffmpeg -system-ffmpeg -qt-ffmpeg)
- $(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, with"
- elog "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."
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2022-03-21 11:04 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2022-03-21 11:04 UTC (permalink / raw
To: gentoo-commits
commit: 1e602f47727177ee20a22fef51e3c6c448c40461
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 17 22:16:14 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 11:03:39 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e602f47
dev-qt/qtwebengine: 5.15.3_p20220310 version bump
Patched with security patches up to Chromium version: 98.0.4758.102
Snapshotted at:
Branch: 5.15
Commit: 9e3ad4273df3aeb16687e924c65fe451e4c03ad2
Submodule qtwebengine-chromium.git:
Branch: 87-based
Commit: 1629f9b8f7f05288f17ed73f2dc328581dffce6a
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
.../qtwebengine-5.15.3_p20220310.ebuild | 265 +++++++++++++++++++++
2 files changed, 266 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 7a80969c4c8e..e846fb1d2b18 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,3 +1,4 @@
DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
DIST qtwebengine-5.15.2_p20211216.tar.xz 318953468 BLAKE2B 65b1bc5be8d08d10b75fee20f78a9a783f878874907335818cddde500e80633e91a999e92fd3de69d004c3621a8337c9bef2c949e03e552cab1d89d901e0dae2 SHA512 f72db4b6dcbdaa171bf2997ab3a77325f9845ef1d72cd994e6152f0f92d350de348ff15b1cde1140ab98b7eb10d6e2d2a3ac6b7d773ab43de37144faad37c3f3
+DIST qtwebengine-5.15.3_p20220310.tar.xz 319290976 BLAKE2B 0a0e74e7d94e59d81687ceb4d791034d43daaeef887894acedc2d2568a8c74e4b7303440518d377c16de21a546e2609fdd89ab64c0664c230df4657cec9d399c SHA512 e57c7c51d0f27d116d2dc80043cb563a1dbce2357221ba87ae3c3b0e8c781e3ef09f69b8f6f20fcb7d85d596ae312b2f85ebc35ba7ee283ab30caa8f796fe2d6
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220310.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220310.ebuild
new file mode 100644
index 000000000000..8c44a49805d8
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220310.ebuild
@@ -0,0 +1,265 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python2_7 )
+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/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2
+ 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 +system-ffmpeg +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-sound/pulseaudio:= )
+ system-ffmpeg? ( media-video/ffmpeg:0= )
+ 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=(
+ "${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, bug 695446
+ "${FILESDIR}/${PN}-5.15.2-extra_gn.patch" # downstream, bug 774186
+ "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
+ "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
+ "${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746
+ "${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
+)
+
+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.2 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\.[3456789]/${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 && has_version 'sys-devel/clang[default-libcxx]'; then
+ eapply "${FILESDIR}/${PN}-5.15.2_p20210521-clang-libc++.patch"
+ 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
+ ./generate_gni.sh || die
+ popd >/dev/null || die
+ fi
+}
+
+src_configure() {
+ export NINJA_PATH=/usr/bin/ninja
+ export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -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 system-ffmpeg -system-ffmpeg -qt-ffmpeg)
+ $(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, with"
+ elog "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."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2022-01-06 19:59 Sam James
0 siblings, 0 replies; 301+ messages in thread
From: Sam James @ 2022-01-06 19:59 UTC (permalink / raw
To: gentoo-commits
commit: 2b2510ae5cffece67dc8b03cd463d23eaaa3bebe
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 6 19:53:32 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 6 19:59:43 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b2510ae
dev-qt/qtwebengine: disable CHECKREQS_MEMORY for distcc
It's harder to calculate properly for this case.
Bug: https://bugs.gentoo.org/830661
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild
index 3baacbff39c9..55f8f5631a65 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -136,7 +136,11 @@ qtwebengine_check-reqs() {
local CHECKREQS_DISK_BUILD="7G"
local CHECKREQS_DISK_USR="150M"
- local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G
+ 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}
}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2022-01-04 21:08 Sam James
0 siblings, 0 replies; 301+ messages in thread
From: Sam James @ 2022-01-04 21:08 UTC (permalink / raw
To: gentoo-commits
commit: 2b134e09a3ab94f3c33419cf0b8114d004cec477
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 4 21:07:49 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 4 21:07:58 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b134e09
dev-qt/qtwebengine: add check-reqs for disk space and memory usage
For now, assumes:
- RAM/memory: 2GB per job for GCC, 1.5GB per job for Clang
- Disk (build): 7GB
- Disk (installed): 150MB
(Also moves pkg_preinst to the end of the ebuild to reflect
phase execution order, as per devmanual.)
Closes: https://bugs.gentoo.org/570534
Thanks-to: Ionen Wolkens <ionen <AT> gentoo.org>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../qtwebengine-5.15.2_p20211216.ebuild | 61 ++++++++++++++++------
1 file changed, 45 insertions(+), 16 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild
index 7923a290ab0e..3baacbff39c9 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="xml(+)"
-inherit estack flag-o-matic multiprocessing python-any-r1 qt5-build
+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/"
@@ -110,29 +110,47 @@ PATCHES=(
"${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
)
-pkg_preinst() {
- elog "This version of Qt WebEngine is based on Chromium version 87.0.4280, with"
- elog "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."
-}
-
-src_unpack() {
- # bug 307861
+qtwebengine_check-reqs() {
+ # bug #307861
eshopts_push -s extglob
if is-flagq '-g?(gdb)?([1-9])'; then
- ewarn
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."
- ewarn
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"
+ local CHECKREQS_MEMORY=$(($(makeopts_jobs)*multiplier/10))G
+
+ 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 ;;
@@ -231,3 +249,14 @@ src_install() {
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, with"
+ elog "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."
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-12-28 6:00 Sam James
0 siblings, 0 replies; 301+ messages in thread
From: Sam James @ 2021-12-28 6:00 UTC (permalink / raw
To: gentoo-commits
commit: a79b4043a7336e6a3c092c333d5c3cc368a1721b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 28 06:00:28 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Dec 28 06:00:28 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a79b4043
dev-qt/qtwebengine: Stabilize 5.15.2_p20211216 arm64, #829196
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild
index 9fcb6782662a..7923a290ab0e 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild
@@ -11,7 +11,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 ~ppc64 x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-12-27 14:14 Agostino Sarubbo
0 siblings, 0 replies; 301+ messages in thread
From: Agostino Sarubbo @ 2021-12-27 14:14 UTC (permalink / raw
To: gentoo-commits
commit: d1613fc50c586d6471d62377995f7b2644cfed10
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 27 14:14:24 2021 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Dec 27 14:14:24 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1613fc5
dev-qt/qtwebengine: x86 stable wrt bug #829196
Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild
index ed0df3dff09b..9fcb6782662a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild
@@ -11,7 +11,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 ~ppc64 x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-12-26 8:07 Agostino Sarubbo
0 siblings, 0 replies; 301+ messages in thread
From: Agostino Sarubbo @ 2021-12-26 8:07 UTC (permalink / raw
To: gentoo-commits
commit: 059b1bb6e245c98515d10219139850f144b7e269
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 26 08:07:15 2021 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Dec 26 08:07:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=059b1bb6
dev-qt/qtwebengine: amd64 stable wrt bug #829196
Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild
index 381ae49128b7..ed0df3dff09b 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211216.ebuild
@@ -11,7 +11,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 ~ppc64 ~x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-12-25 0:10 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2021-12-25 0:10 UTC (permalink / raw
To: gentoo-commits
commit: 1ed997118916a829d4d149cb933bb64232ad87c7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 25 00:09:46 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 25 00:10:29 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ed99711
dev-qt/qtwebengine: Drop 5.15.2_p20211210
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 -
.../qtwebengine-5.15.2_p20211210.ebuild | 228 ---------------------
2 files changed, 229 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 3288fa450f84..9ee52fe9cdbc 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,5 +1,4 @@
DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
DIST qtwebengine-5.15.2_p20211019.tar.xz 320325744 BLAKE2B fac2f2a44e0f443a2642c0a0b3888ff15d047ce5b2de6673213db308e60f3e26b12adf98ad1dcf305630f0bc55abff078942711fbd10d05dc5a4095faadead25 SHA512 4abd2ca416228bbafa31aad9deae1466748930c02bcc08b559bbbb21fda598f720137e2af0cfa176dd534c8da97934d76e59b72c124b73564378fda0deaddaee
-DIST qtwebengine-5.15.2_p20211210.tar.xz 318959420 BLAKE2B 84296cb89af428018485860cff026b374ae876038ce7eb75edb8dca7416ef8c541ad50b942dec1c7fbf59010f22a2b70452b29e35b2237054e08332f92a2d016 SHA512 d7afeed45db0a4bc7bcbc74837b1b32953114fc0afb62aeb969ef7361792313179f428d7ff43a14140b222d02c18f5118022037b1a9f9cd8852a93a4f34f545e
DIST qtwebengine-5.15.2_p20211216.tar.xz 318953468 BLAKE2B 65b1bc5be8d08d10b75fee20f78a9a783f878874907335818cddde500e80633e91a999e92fd3de69d004c3621a8337c9bef2c949e03e552cab1d89d901e0dae2 SHA512 f72db4b6dcbdaa171bf2997ab3a77325f9845ef1d72cd994e6152f0f92d350de348ff15b1cde1140ab98b7eb10d6e2d2a3ac6b7d773ab43de37144faad37c3f3
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211210.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211210.ebuild
deleted file mode 100644
index 0db381b9e6e0..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211210.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml(+)"
-inherit estack flag-o-matic multiprocessing python-any-r1 qt5-build
-
-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"
- SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2"
- 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
-
-# patchset based on https://github.com/chromium-ppc64le releases
-SRC_URI+=" 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 +system-ffmpeg +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-sound/pulseaudio:= )
- system-ffmpeg? ( media-video/ffmpeg:0= )
- 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=(
- "${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, bug 695446
- "${FILESDIR}/${PN}-5.15.2-extra_gn.patch" # downstream, bug 774186
- "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
- "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
- "${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746
- "${FILESDIR}/${PN}-5.15.2_p20211210-sandbox-glibc-2.34.patch" # bug 828099, systemwide-clang?
- "${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
-)
-
-pkg_preinst() {
- elog "This version of Qt WebEngine is based on Chromium version 87.0.4280, with"
- elog "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."
-}
-
-src_unpack() {
- # bug 307861
- eshopts_push -s extglob
- if is-flagq '-g?(gdb)?([1-9])'; then
- ewarn
- 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."
- ewarn
- fi
- eshopts_pop
-
- 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.2 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\.[3456789]/${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
-
- 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
- ./generate_gni.sh || die
- popd >/dev/null || die
- fi
-}
-
-src_configure() {
- export NINJA_PATH=/usr/bin/ninja
- export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -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 system-ffmpeg -system-ffmpeg -qt-ffmpeg)
- $(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
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-12-14 18:13 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2021-12-14 18:13 UTC (permalink / raw
To: gentoo-commits
commit: 5641d2a545db9729548d4ebccd835c4faa37651d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 14 18:11:39 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 14 18:13:04 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5641d2a5
dev-qt/qtwebengine: Drop 5.15.2_p20211207
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 -
.../qtwebengine-5.15.2_p20211207.ebuild | 229 ---------------------
2 files changed, 230 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 442937aef415..10ebdc5d5c7d 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,5 +1,4 @@
DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
DIST qtwebengine-5.15.2_p20211019.tar.xz 320325744 BLAKE2B fac2f2a44e0f443a2642c0a0b3888ff15d047ce5b2de6673213db308e60f3e26b12adf98ad1dcf305630f0bc55abff078942711fbd10d05dc5a4095faadead25 SHA512 4abd2ca416228bbafa31aad9deae1466748930c02bcc08b559bbbb21fda598f720137e2af0cfa176dd534c8da97934d76e59b72c124b73564378fda0deaddaee
-DIST qtwebengine-5.15.2_p20211207.tar.xz 318947940 BLAKE2B a60091af26f7012ce5d770f1ad8e5b4ee62b09a9ebdb96d497bca95c373c025eb1adfc00a7e11ed758b33948b757176b914a12b6b3f6a82574fbb0950130743d SHA512 af8af67458a4d99a20f49fb55dceaa2adb6b5c7ad6eaa2a15b30adb6643dc443ea5b9658b28925597d37e57c8a23d3903c0cf2532df94de30f7bef29f78c67ef
DIST qtwebengine-5.15.2_p20211210.tar.xz 318959420 BLAKE2B 84296cb89af428018485860cff026b374ae876038ce7eb75edb8dca7416ef8c541ad50b942dec1c7fbf59010f22a2b70452b29e35b2237054e08332f92a2d016 SHA512 d7afeed45db0a4bc7bcbc74837b1b32953114fc0afb62aeb969ef7361792313179f428d7ff43a14140b222d02c18f5118022037b1a9f9cd8852a93a4f34f545e
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211207.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211207.ebuild
deleted file mode 100644
index 3cb43905ff9b..000000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211207.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml(+)"
-inherit estack flag-o-matic multiprocessing python-any-r1 qt5-build
-
-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"
- SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2"
- 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
-
-# patchset based on https://github.com/chromium-ppc64le releases
-SRC_URI+=" 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 +system-ffmpeg +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-sound/pulseaudio:= )
- system-ffmpeg? ( media-video/ffmpeg:0= )
- 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=(
- "${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, bug 695446
- "${FILESDIR}/${PN}-5.15.2-extra_gn.patch" # downstream, bug 774186
- "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
- "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
- "${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746
- "${FILESDIR}/${PN}-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch" # bug 811312
- "${FILESDIR}/${PN}-5.15.2_p20210824-breakpad-glibc-2.34.patch" # bug 811312
- "${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
-)
-
-pkg_preinst() {
- elog "This version of Qt WebEngine is based on Chromium version 87.0.4280, with"
- elog "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."
-}
-
-src_unpack() {
- # bug 307861
- eshopts_push -s extglob
- if is-flagq '-g?(gdb)?([1-9])'; then
- ewarn
- 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."
- ewarn
- fi
- eshopts_pop
-
- 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.2 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\.[3456789]/${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
-
- 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
- ./generate_gni.sh || die
- popd >/dev/null || die
- fi
-}
-
-src_configure() {
- export NINJA_PATH=/usr/bin/ninja
- export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -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 system-ffmpeg -system-ffmpeg -qt-ffmpeg)
- $(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
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-12-08 15:08 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2021-12-08 15:08 UTC (permalink / raw
To: gentoo-commits
commit: f2d3cb1848a1c3061a77ac8f58a51b45d18ee541
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 8 13:04:33 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Dec 8 15:07:46 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2d3cb18
dev-qt/qtwebengine: 5.15.2_p20211207 snapshot bump
Patched with security patches up to Chromium version: 96.0.4664.45
Snapshotted at:
Branch: 5.15
Commit: cf53bf7fa434c78d902b78378e55b4c38c095bba
Submodule qtwebengine-chromium.git:
Branch: 87-based
Commit: b3ec1114d8fe670f1e93d6ccb19fd614bcbc398c
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
.../qtwebengine-5.15.2_p20211207.ebuild | 229 +++++++++++++++++++++
2 files changed, 230 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 6b5014232157..f4ced6dc187c 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,3 +1,4 @@
DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
DIST qtwebengine-5.15.2_p20211019.tar.xz 320325744 BLAKE2B fac2f2a44e0f443a2642c0a0b3888ff15d047ce5b2de6673213db308e60f3e26b12adf98ad1dcf305630f0bc55abff078942711fbd10d05dc5a4095faadead25 SHA512 4abd2ca416228bbafa31aad9deae1466748930c02bcc08b559bbbb21fda598f720137e2af0cfa176dd534c8da97934d76e59b72c124b73564378fda0deaddaee
+DIST qtwebengine-5.15.2_p20211207.tar.xz 318947940 BLAKE2B a60091af26f7012ce5d770f1ad8e5b4ee62b09a9ebdb96d497bca95c373c025eb1adfc00a7e11ed758b33948b757176b914a12b6b3f6a82574fbb0950130743d SHA512 af8af67458a4d99a20f49fb55dceaa2adb6b5c7ad6eaa2a15b30adb6643dc443ea5b9658b28925597d37e57c8a23d3903c0cf2532df94de30f7bef29f78c67ef
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211207.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211207.ebuild
new file mode 100644
index 000000000000..3cb43905ff9b
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211207.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml(+)"
+inherit estack flag-o-matic multiprocessing python-any-r1 qt5-build
+
+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"
+ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2"
+ 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
+
+# patchset based on https://github.com/chromium-ppc64le releases
+SRC_URI+=" 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 +system-ffmpeg +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-sound/pulseaudio:= )
+ system-ffmpeg? ( media-video/ffmpeg:0= )
+ 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=(
+ "${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, bug 695446
+ "${FILESDIR}/${PN}-5.15.2-extra_gn.patch" # downstream, bug 774186
+ "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
+ "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
+ "${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746
+ "${FILESDIR}/${PN}-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch" # bug 811312
+ "${FILESDIR}/${PN}-5.15.2_p20210824-breakpad-glibc-2.34.patch" # bug 811312
+ "${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
+)
+
+pkg_preinst() {
+ elog "This version of Qt WebEngine is based on Chromium version 87.0.4280, with"
+ elog "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."
+}
+
+src_unpack() {
+ # bug 307861
+ eshopts_push -s extglob
+ if is-flagq '-g?(gdb)?([1-9])'; then
+ ewarn
+ 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."
+ ewarn
+ fi
+ eshopts_pop
+
+ 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.2 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\.[3456789]/${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
+
+ 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
+ ./generate_gni.sh || die
+ popd >/dev/null || die
+ fi
+}
+
+src_configure() {
+ export NINJA_PATH=/usr/bin/ninja
+ export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -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 system-ffmpeg -system-ffmpeg -qt-ffmpeg)
+ $(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
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-11-09 23:54 Sam James
0 siblings, 0 replies; 301+ messages in thread
From: Sam James @ 2021-11-09 23:54 UTC (permalink / raw
To: gentoo-commits
commit: 4e95f6c58f420c51d1dbcab0690949f47d9efc78
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 9 23:53:56 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 9 23:53:56 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e95f6c5
dev-qt/qtwebengine: Stabilize 5.15.2_p20211019 arm64, #820893
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019.ebuild
index 450e1222e4d..1f1725cb3e3 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019.ebuild
@@ -11,7 +11,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 ~ppc64 x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-11-09 22:40 Georgy Yakovlev
0 siblings, 0 replies; 301+ messages in thread
From: Georgy Yakovlev @ 2021-11-09 22:40 UTC (permalink / raw
To: gentoo-commits
commit: ed5ba69b5cac5b8e6ea4f601967ff9f43c1ae625
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 9 22:02:06 2021 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Nov 9 22:39:42 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed5ba69b
dev-qt/qtwebengine: update SRC_URI with new ppc64le patchset
added struct kernel_stat patch for
src/3rdparty/chromium/sandbox/linux/system_headers/linux_stat.h
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019.ebuild | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 583c82fbf8f..5118d883b8b 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,4 +1,5 @@
DIST qtwebengine-5.15.2-chromium87-ppc64le.tar.xz 28536 BLAKE2B 98f8e01e7026d9df1d30ae453d4394d3c4ad04c0620a2496235d45f5f1080c2280e040826cde7f72d9771bfc80d0c3df56c9dcbe4f763cec432ad56de37d64c5 SHA512 c90a76f44a9d720624016fd082ab3036f12e13b9789e869ebaf5e4774afca7d4187faf187f365f696d1a7eda05ca75516556ee9d291cdb3408d57cc4b23e2654
+DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6 SHA512 3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db79248aaaa8098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
DIST qtwebengine-5.15.2_p20210824.tar.xz 320214264 BLAKE2B fe611805107822f495e0921de4fc9a8737bd3238a332e03d27421a3fd14dc1417c1d69e9ec5e9f6bf922f98045cbdf9ee2c76621db988c8b1e6e0e90b2c6dc7e SHA512 3a5f9ef45ba488aee601e092d1c4a5f707a854d5b9f0a5e62cb88dcdf280163182abc98b0a55b28591e81e18b5147142d404dcdc92feb61414ce2d4ce0d2dca6
DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
DIST qtwebengine-5.15.2_p20211019.tar.xz 320325744 BLAKE2B fac2f2a44e0f443a2642c0a0b3888ff15d047ce5b2de6673213db308e60f3e26b12adf98ad1dcf305630f0bc55abff078942711fbd10d05dc5a4095faadead25 SHA512 4abd2ca416228bbafa31aad9deae1466748930c02bcc08b559bbbb21fda598f720137e2af0cfa176dd534c8da97934d76e59b72c124b73564378fda0deaddaee
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019.ebuild
index 5b40e567cea..450e1222e4d 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019.ebuild
@@ -28,7 +28,7 @@ else
fi
# patchset based on https://github.com/chromium-ppc64le releases
-SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-chromium87-ppc64le.tar.xz )"
+SRC_URI+=" 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 +system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-11-08 10:11 Agostino Sarubbo
0 siblings, 0 replies; 301+ messages in thread
From: Agostino Sarubbo @ 2021-11-08 10:11 UTC (permalink / raw
To: gentoo-commits
commit: 0557c89ee3d8264842efcc3902572e95ac5a412c
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 8 10:11:26 2021 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Nov 8 10:11:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0557c89e
dev-qt/qtwebengine: x86 stable wrt bug #820893
Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019.ebuild
index aeb212526d1..5b40e567cea 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019.ebuild
@@ -11,7 +11,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 ~ppc64 x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-11-06 1:35 Sam James
0 siblings, 0 replies; 301+ messages in thread
From: Sam James @ 2021-11-06 1:35 UTC (permalink / raw
To: gentoo-commits
commit: 197515053dff0cb9d40c6d58c34cc6dfe65e0b95
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 6 01:35:43 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Nov 6 01:35:43 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19751505
dev-qt/qtwebengine: Stabilize 5.15.2_p20211019 amd64, #820893
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019.ebuild
index b1c4b3c9219..aeb212526d1 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019.ebuild
@@ -11,7 +11,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 ~ppc64 ~x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-11-05 7:01 Sam James
0 siblings, 0 replies; 301+ messages in thread
From: Sam James @ 2021-11-05 7:01 UTC (permalink / raw
To: gentoo-commits
commit: 0aa1d9f9b6ba9c91712c6b2a5f3473e596f144d8
Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 5 06:55:18 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 5 07:01:23 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0aa1d9f9
dev-qt/qtwebengine: add jumbo-build patch
Closes: https://bugs.gentoo.org/813957
Thanks-to: Marco Genasci <fedeliallalinea <AT> gmail.com> (enhancing patch)
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019.ebuild | 2 ++
2 files changed, 3 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 08a2cf6a291..583c82fbf8f 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,3 +1,4 @@
DIST qtwebengine-5.15.2-chromium87-ppc64le.tar.xz 28536 BLAKE2B 98f8e01e7026d9df1d30ae453d4394d3c4ad04c0620a2496235d45f5f1080c2280e040826cde7f72d9771bfc80d0c3df56c9dcbe4f763cec432ad56de37d64c5 SHA512 c90a76f44a9d720624016fd082ab3036f12e13b9789e869ebaf5e4774afca7d4187faf187f365f696d1a7eda05ca75516556ee9d291cdb3408d57cc4b23e2654
DIST qtwebengine-5.15.2_p20210824.tar.xz 320214264 BLAKE2B fe611805107822f495e0921de4fc9a8737bd3238a332e03d27421a3fd14dc1417c1d69e9ec5e9f6bf922f98045cbdf9ee2c76621db988c8b1e6e0e90b2c6dc7e SHA512 3a5f9ef45ba488aee601e092d1c4a5f707a854d5b9f0a5e62cb88dcdf280163182abc98b0a55b28591e81e18b5147142d404dcdc92feb61414ce2d4ce0d2dca6
+DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101 SHA512 61cbfbe4ff340b75ea8d356e031e932ac03fe65dd009999ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
DIST qtwebengine-5.15.2_p20211019.tar.xz 320325744 BLAKE2B fac2f2a44e0f443a2642c0a0b3888ff15d047ce5b2de6673213db308e60f3e26b12adf98ad1dcf305630f0bc55abff078942711fbd10d05dc5a4095faadead25 SHA512 4abd2ca416228bbafa31aad9deae1466748930c02bcc08b559bbbb21fda598f720137e2af0cfa176dd534c8da97934d76e59b72c124b73564378fda0deaddaee
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019.ebuild
index 98e557b4269..b1c4b3c9219 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019.ebuild
@@ -14,6 +14,7 @@ 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"
+ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2"
S="${WORKDIR}/${P}"
QT5_BUILD_DIR="${S}_build"
fi
@@ -107,6 +108,7 @@ PATCHES=(
"${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746
"${FILESDIR}/${PN}-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch" # bug 811312
"${FILESDIR}/${PN}-5.15.2_p20210824-breakpad-glibc-2.34.patch" # bug 811312
+ "${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
)
pkg_preinst() {
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-10-20 16:43 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2021-10-20 16:43 UTC (permalink / raw
To: gentoo-commits
commit: c6401cd4b38d5eedea3d67da0ed6683648f23d7a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 20 16:42:06 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 20 16:43:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6401cd4
dev-qt/qtwebengine: Drop 5.15.2_p20211015 w/o keywords
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 -
.../qtwebengine-5.15.2_p20211015.ebuild | 227 ---------------------
2 files changed, 228 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 0e5883588ad..08a2cf6a291 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,4 +1,3 @@
DIST qtwebengine-5.15.2-chromium87-ppc64le.tar.xz 28536 BLAKE2B 98f8e01e7026d9df1d30ae453d4394d3c4ad04c0620a2496235d45f5f1080c2280e040826cde7f72d9771bfc80d0c3df56c9dcbe4f763cec432ad56de37d64c5 SHA512 c90a76f44a9d720624016fd082ab3036f12e13b9789e869ebaf5e4774afca7d4187faf187f365f696d1a7eda05ca75516556ee9d291cdb3408d57cc4b23e2654
DIST qtwebengine-5.15.2_p20210824.tar.xz 320214264 BLAKE2B fe611805107822f495e0921de4fc9a8737bd3238a332e03d27421a3fd14dc1417c1d69e9ec5e9f6bf922f98045cbdf9ee2c76621db988c8b1e6e0e90b2c6dc7e SHA512 3a5f9ef45ba488aee601e092d1c4a5f707a854d5b9f0a5e62cb88dcdf280163182abc98b0a55b28591e81e18b5147142d404dcdc92feb61414ce2d4ce0d2dca6
-DIST qtwebengine-5.15.2_p20211015.tar.xz 319006520 BLAKE2B 12224fdbbfbf45bae795bea1b3f1aef51ce016f08cdcd022cb96264de4ee438146d5ad19dbed668abd24ceddfca9f57f6af5ac76c7d81dd867142d3691e8f992 SHA512 b41022d1bc60729b035c8ffde55b3e1d3535b8639f0752749b05625fd1ceb640c4c610722e81f82313237c2b7fa7105a5624da15ef5d88058f8d5b9a642faa67
DIST qtwebengine-5.15.2_p20211019.tar.xz 320325744 BLAKE2B fac2f2a44e0f443a2642c0a0b3888ff15d047ce5b2de6673213db308e60f3e26b12adf98ad1dcf305630f0bc55abff078942711fbd10d05dc5a4095faadead25 SHA512 4abd2ca416228bbafa31aad9deae1466748930c02bcc08b559bbbb21fda598f720137e2af0cfa176dd534c8da97934d76e59b72c124b73564378fda0deaddaee
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211015.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211015.ebuild
deleted file mode 100644
index af29c22fe43..00000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211015.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml(+)"
-inherit estack flag-o-matic multiprocessing python-any-r1 qt5-build
-
-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
-
-# patchset based on https://github.com/chromium-ppc64le releases
-SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-chromium87-ppc64le.tar.xz )"
-
-IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +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-sound/pulseaudio:= )
- system-ffmpeg? ( media-video/ffmpeg:0= )
- 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=(
- "${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, bug 695446
- "${FILESDIR}/${PN}-5.15.2-extra_gn.patch" # downstream, bug 774186
- "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
- "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
- "${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746
- "${FILESDIR}/${PN}-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch" # bug 811312
- "${FILESDIR}/${PN}-5.15.2_p20210824-breakpad-glibc-2.34.patch" # bug 811312
-)
-
-pkg_preinst() {
- elog "This version of Qt WebEngine is based on Chromium version 87.0.4280, with"
- elog "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."
-}
-
-src_unpack() {
- # bug 307861
- eshopts_push -s extglob
- if is-flagq '-g?(gdb)?([1-9])'; then
- ewarn
- 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."
- ewarn
- fi
- eshopts_pop
-
- 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.2 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\.[3456789]/${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
-
- 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
- ./generate_gni.sh || die
- popd >/dev/null || die
- fi
-}
-
-src_configure() {
- export NINJA_PATH=/usr/bin/ninja
- export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -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 system-ffmpeg -system-ffmpeg -qt-ffmpeg)
- $(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
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-10-20 16:43 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2021-10-20 16:43 UTC (permalink / raw
To: gentoo-commits
commit: b3ab484a8786b3c9be656759cd7118e95ca52b76
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 20 13:07:48 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 20 16:43:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3ab484a
dev-qt/qtwebengine: 5.15.2_p20211019 snapshot bump for testing
Snapshotted at:
Branch: 5.15
Commit: 03b3df668088d0750af6a59410ee4d0d00ba88ae
Submodule qtwebengine-chromium.git:
Branch: 87-based
Commit: 8c0a9b4459f5200a24ab9e687a3fb32e975382e5
Fixes build on arm64.
Bug: https://bugs.gentoo.org/815397
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
.../qtwebengine-5.15.2_p20211019.ebuild | 227 +++++++++++++++++++++
2 files changed, 228 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 6b129dae702..0e5883588ad 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,3 +1,4 @@
DIST qtwebengine-5.15.2-chromium87-ppc64le.tar.xz 28536 BLAKE2B 98f8e01e7026d9df1d30ae453d4394d3c4ad04c0620a2496235d45f5f1080c2280e040826cde7f72d9771bfc80d0c3df56c9dcbe4f763cec432ad56de37d64c5 SHA512 c90a76f44a9d720624016fd082ab3036f12e13b9789e869ebaf5e4774afca7d4187faf187f365f696d1a7eda05ca75516556ee9d291cdb3408d57cc4b23e2654
DIST qtwebengine-5.15.2_p20210824.tar.xz 320214264 BLAKE2B fe611805107822f495e0921de4fc9a8737bd3238a332e03d27421a3fd14dc1417c1d69e9ec5e9f6bf922f98045cbdf9ee2c76621db988c8b1e6e0e90b2c6dc7e SHA512 3a5f9ef45ba488aee601e092d1c4a5f707a854d5b9f0a5e62cb88dcdf280163182abc98b0a55b28591e81e18b5147142d404dcdc92feb61414ce2d4ce0d2dca6
DIST qtwebengine-5.15.2_p20211015.tar.xz 319006520 BLAKE2B 12224fdbbfbf45bae795bea1b3f1aef51ce016f08cdcd022cb96264de4ee438146d5ad19dbed668abd24ceddfca9f57f6af5ac76c7d81dd867142d3691e8f992 SHA512 b41022d1bc60729b035c8ffde55b3e1d3535b8639f0752749b05625fd1ceb640c4c610722e81f82313237c2b7fa7105a5624da15ef5d88058f8d5b9a642faa67
+DIST qtwebengine-5.15.2_p20211019.tar.xz 320325744 BLAKE2B fac2f2a44e0f443a2642c0a0b3888ff15d047ce5b2de6673213db308e60f3e26b12adf98ad1dcf305630f0bc55abff078942711fbd10d05dc5a4095faadead25 SHA512 4abd2ca416228bbafa31aad9deae1466748930c02bcc08b559bbbb21fda598f720137e2af0cfa176dd534c8da97934d76e59b72c124b73564378fda0deaddaee
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019.ebuild
new file mode 100644
index 00000000000..98e557b4269
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211019.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="xml(+)"
+inherit estack flag-o-matic multiprocessing python-any-r1 qt5-build
+
+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
+
+# patchset based on https://github.com/chromium-ppc64le releases
+SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-chromium87-ppc64le.tar.xz )"
+
+IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +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-sound/pulseaudio:= )
+ system-ffmpeg? ( media-video/ffmpeg:0= )
+ 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=(
+ "${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, bug 695446
+ "${FILESDIR}/${PN}-5.15.2-extra_gn.patch" # downstream, bug 774186
+ "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
+ "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
+ "${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746
+ "${FILESDIR}/${PN}-5.15.2_p20210824-abseil-cpp-glibc-2.34.patch" # bug 811312
+ "${FILESDIR}/${PN}-5.15.2_p20210824-breakpad-glibc-2.34.patch" # bug 811312
+)
+
+pkg_preinst() {
+ elog "This version of Qt WebEngine is based on Chromium version 87.0.4280, with"
+ elog "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."
+}
+
+src_unpack() {
+ # bug 307861
+ eshopts_push -s extglob
+ if is-flagq '-g?(gdb)?([1-9])'; then
+ ewarn
+ 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."
+ ewarn
+ fi
+ eshopts_pop
+
+ 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.2 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\.[3456789]/${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
+
+ 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
+ ./generate_gni.sh || die
+ popd >/dev/null || die
+ fi
+}
+
+src_configure() {
+ export NINJA_PATH=/usr/bin/ninja
+ export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -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 system-ffmpeg -system-ffmpeg -qt-ffmpeg)
+ $(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
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-09-22 20:01 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2021-09-22 20:01 UTC (permalink / raw
To: gentoo-commits
commit: 469ec94d660d20e27975683a21318f606217b6d5
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 15 19:58:40 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 22 20:01:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=469ec94d
dev-qt/qtwebengine: usex -> qt_use
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Davide Pesavento <pesa <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild
index e314dd7ce46..e3f9df28c79 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild
@@ -204,13 +204,13 @@ src_configure() {
-printing-and-pdf
-system-opus
-system-webp
- $(usex alsa '-alsa' '-no-alsa')
- $(usex bindist '-no-proprietary-codecs' '-proprietary-codecs')
- $(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation')
- $(usex kerberos '-webengine-kerberos' '-no-webengine-kerberos')
- $(usex pulseaudio '-pulseaudio' '-no-pulseaudio')
- $(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg')
- $(usex system-icu '-webengine-icu' '-no-webengine-icu')
+ $(qt_use alsa)
+ $(qt_use !bindist proprietary-codecs)
+ $(qt_use geolocation webengine-geolocation)
+ $(qt_use kerberos webengine-kerberos)
+ $(qt_use pulseaudio)
+ $(usex system-ffmpeg -system-ffmpeg -qt-ffmpeg)
+ $(qt_use system-icu webengine-icu)
)
qt5-build_src_configure
}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-09-19 4:11 Sam James
0 siblings, 0 replies; 301+ messages in thread
From: Sam James @ 2021-09-19 4:11 UTC (permalink / raw
To: gentoo-commits
commit: 9b56473b5a90b3e94e59f830d7f064137c56f1b8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 19 04:10:50 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 19 04:10:50 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b56473b
dev-qt/qtwebengine: Stabilize 5.15.2_p20210824-r1 arm64, #811441
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild
index 95f6a4ad7e5..e314dd7ce46 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild
@@ -10,7 +10,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 ~ppc64 x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-09-18 22:07 Sam James
0 siblings, 0 replies; 301+ messages in thread
From: Sam James @ 2021-09-18 22:07 UTC (permalink / raw
To: gentoo-commits
commit: 76008a3a367b89beca32c5748b4b66f55a3c9756
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 18 22:06:59 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 18 22:06:59 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76008a3a
dev-qt/qtwebengine: Stabilize 5.15.2_p20210824-r1 amd64, #811441
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild
index b1b5dd8a07c..95f6a4ad7e5 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild
@@ -10,7 +10,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 ~ppc64 x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-09-15 7:29 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2021-09-15 7:29 UTC (permalink / raw
To: gentoo-commits
commit: 71e50ca9750a01ae4342693b495eaa18f4723d0f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 15 07:28:12 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Sep 15 07:28:48 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71e50ca9
dev-qt/qtwebengine: Fix .qmake.conf
Bug: https://bugs.gentoo.org/811441
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
...5.2_p20210824.ebuild => qtwebengine-5.15.2_p20210824-r1.ebuild} | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild
similarity index 96%
rename from dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild
rename to dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild
index 303ae1fe054..b1b5dd8a07c 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824-r1.ebuild
@@ -141,11 +141,10 @@ 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
-
- # We need to make sure this integrates well into Qt 5.15.2 installation.
- # Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
- sed -e "/^MODULE_VERSION/s/5.*/${QT5_PV}*/" -i .qmake.conf || die
fi
+ # We need to make sure this integrates well into Qt 5.15.2 installation.
+ # Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
+ sed -e "/^MODULE_VERSION/s/5\.15\.[3456789]/${QT5_PV}/" -i .qmake.conf || die
# QTBUG-88657 - jumbo-build could still make trouble
if ! use jumbo-build; then
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-09-15 6:36 Agostino Sarubbo
0 siblings, 0 replies; 301+ messages in thread
From: Agostino Sarubbo @ 2021-09-15 6:36 UTC (permalink / raw
To: gentoo-commits
commit: ccd9bc436550aeb8903aaaf3fa64ef949bc79433
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 15 06:35:53 2021 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Sep 15 06:35:53 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccd9bc43
dev-qt/qtwebengine: x86 stable wrt bug #811441
Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild
index 8bb770ed5db..303ae1fe054 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild
@@ -10,7 +10,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 ~ppc64 x86"
if [[ ${PV} == ${QT5_PV}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-09-13 9:32 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2021-09-13 9:32 UTC (permalink / raw
To: gentoo-commits
commit: 532f4bc2737531af5f11e4f63f3ebd90854c63c9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 8 08:16:56 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 13 09:31:03 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=532f4bc2
dev-qt/qtwebengine: Switch from ~QTVER to =QT5_PV* version deps
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../qtwebengine-5.15.2_p20210824.ebuild | 27 +++++++++++-----------
1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild
index 223cd21ff67..a8e5942a0be 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild
@@ -4,7 +4,6 @@
EAPI=8
PYTHON_COMPAT=( python2_7 )
-QTVER=$(ver_cut 1-3)
inherit estack flag-o-matic multiprocessing python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
@@ -12,7 +11,7 @@ HOMEPAGE="https://www.qt.io/"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
- if [[ ${PV} == ${QTVER}_p* ]]; then
+ 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"
@@ -42,12 +41,12 @@ RDEPEND="
dev-libs/libxml2[icu]
dev-libs/libxslt
dev-libs/re2:=
- ~dev-qt/qtcore-${QTVER}
- ~dev-qt/qtdeclarative-${QTVER}
- ~dev-qt/qtgui-${QTVER}
- ~dev-qt/qtnetwork-${QTVER}
- ~dev-qt/qtprintsupport-${QTVER}
- ~dev-qt/qtwebchannel-${QTVER}[qml]
+ =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:=
@@ -76,15 +75,15 @@ RDEPEND="
x11-libs/libXScrnSaver
x11-libs/libXtst
alsa? ( media-libs/alsa-lib )
- designer? ( ~dev-qt/designer-${QTVER} )
- geolocation? ( ~dev-qt/qtpositioning-${QTVER} )
+ designer? ( =dev-qt/designer-${QT5_PV}* )
+ geolocation? ( =dev-qt/qtpositioning-${QT5_PV}* )
kerberos? ( virtual/krb5 )
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
system-icu? ( >=dev-libs/icu-69.1:= )
widgets? (
- ~dev-qt/qtdeclarative-${QTVER}[widgets]
- ~dev-qt/qtwidgets-${QTVER}
+ =dev-qt/qtdeclarative-${QT5_PV}*[widgets]
+ =dev-qt/qtwidgets-${QT5_PV}*
)
"
DEPEND="${RDEPEND}"
@@ -137,13 +136,13 @@ src_unpack() {
}
src_prepare() {
- if [[ ${PV} == ${QTVER}_p* ]]; then
+ 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
# We need to make sure this integrates well into Qt 5.15.2 installation.
# Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
- sed -e "/^MODULE_VERSION/s/5.*/${QTVER}/" -i .qmake.conf || die
+ sed -e "/^MODULE_VERSION/s/5.*/${QT5_PV}*/" -i .qmake.conf || die
fi
# QTBUG-88657 - jumbo-build could still make trouble
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-09-02 18:38 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2021-09-02 18:38 UTC (permalink / raw
To: gentoo-commits
commit: 65d22cb153e059dfec7e973a92c2dd95aad1730e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 28 10:07:17 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 2 18:38:07 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65d22cb1
dev-qt/qtwebengine: 5.15.2_p20210824 snapshot bump, EAPI-8 bump
Snapshotted at:
Branch: 5.15.6
Commit: 2acbba86362ac3a1c2d8c20390dc263875f8f09c
Additional cherry-pick from branch 5.15:
Fix crash when clicking on a link in PDF
Commit: 7f4a6ff45743cecbfe0dd14ef29afd0874a2ed39
Submodule qtwebengine-chromium.git:
Branch: 87-based
Commit: 9f71911e38c041cedc5291c5e772b7d03ce8b8c
Bug: https://bugs.gentoo.org/810781
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
.../qtwebengine-5.15.2_p20210824.ebuild | 224 +++++++++++++++++++++
2 files changed, 225 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 562f5ae1546..c4c1b9d408f 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,2 +1,3 @@
DIST qtwebengine-5.15.2-chromium87-ppc64le.tar.xz 28536 BLAKE2B 98f8e01e7026d9df1d30ae453d4394d3c4ad04c0620a2496235d45f5f1080c2280e040826cde7f72d9771bfc80d0c3df56c9dcbe4f763cec432ad56de37d64c5 SHA512 c90a76f44a9d720624016fd082ab3036f12e13b9789e869ebaf5e4774afca7d4187faf187f365f696d1a7eda05ca75516556ee9d291cdb3408d57cc4b23e2654
DIST qtwebengine-5.15.2_p20210625.tar.xz 320144708 BLAKE2B cd11e69a34ff0fa07d26262906a12304c39a12575024d61db18bc696284e9c5700090e5bfed217c89d2c8eac49b0ccb7d7ee0ba716ec3a81878de1301566884d SHA512 517a8cdaff684894456db8cfb5cfca412b8764e7035623d8190d9a06f6995742097a53eb67329d12bf8dc0a56372f7d09a54532ba804a5bff245ca8ef042a4e1
+DIST qtwebengine-5.15.2_p20210824.tar.xz 320214264 BLAKE2B fe611805107822f495e0921de4fc9a8737bd3238a332e03d27421a3fd14dc1417c1d69e9ec5e9f6bf922f98045cbdf9ee2c76621db988c8b1e6e0e90b2c6dc7e SHA512 3a5f9ef45ba488aee601e092d1c4a5f707a854d5b9f0a5e62cb88dcdf280163182abc98b0a55b28591e81e18b5147142d404dcdc92feb61414ce2d4ce0d2dca6
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild
new file mode 100644
index 00000000000..1a87eb9defb
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python2_7 )
+QTVER=$(ver_cut 1-3)
+inherit estack flag-o-matic multiprocessing python-any-r1 qt5-build
+
+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} == ${QTVER}_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
+
+# patchset based on https://github.com/chromium-ppc64le releases
+SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-chromium87-ppc64le.tar.xz )"
+
+IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +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-${QTVER}
+ ~dev-qt/qtdeclarative-${QTVER}
+ ~dev-qt/qtgui-${QTVER}
+ ~dev-qt/qtnetwork-${QTVER}
+ ~dev-qt/qtprintsupport-${QTVER}
+ ~dev-qt/qtwebchannel-${QTVER}[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/mesa[egl,X(+)]
+ 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-${QTVER} )
+ geolocation? ( ~dev-qt/qtpositioning-${QTVER} )
+ kerberos? ( virtual/krb5 )
+ pulseaudio? ( media-sound/pulseaudio:= )
+ system-ffmpeg? ( media-video/ffmpeg:0= )
+ system-icu? ( >=dev-libs/icu-69.1:= )
+ widgets? (
+ ~dev-qt/qtdeclarative-${QTVER}[widgets]
+ ~dev-qt/qtwidgets-${QTVER}
+ )
+"
+DEPEND="${RDEPEND}"
+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=(
+ "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" # bug 695446
+ "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
+ "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
+ "${FILESDIR}/${PN}-5.15.2_p20210406-glibc-2.33.patch" # by Fedora, bug 769989
+ "${FILESDIR}/${PN}-5.15.2_p20210521-gcc11.patch" # by Fedora, bug 768261
+)
+
+pkg_preinst() {
+ elog "This version of Qt WebEngine is based on Chromium version 87.0.4280, with"
+ elog "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."
+}
+
+src_unpack() {
+ # bug 307861
+ eshopts_push -s extglob
+ if is-flagq '-g?(gdb)?([1-9])'; then
+ ewarn
+ 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."
+ ewarn
+ fi
+ eshopts_pop
+
+ case ${QT5_BUILD_TYPE} in
+ live) git-r3_src_unpack ;&
+ release) default ;;
+ esac
+}
+
+src_prepare() {
+ if [[ ${PV} == ${QTVER}_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
+
+ # We need to make sure this integrates well into Qt 5.15.2 installation.
+ # Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
+ sed -e "/^MODULE_VERSION/s/5.*/${QTVER}/" -i .qmake.conf || die
+ fi
+
+ # 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
+
+ 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
+ ./generate_gni.sh || die
+ popd >/dev/null || die
+ fi
+}
+
+src_configure() {
+ export NINJA_PATH=/usr/bin/ninja
+ export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
+
+ local myqmakeargs=(
+ --
+ -no-build-qtpdf
+ -printing-and-pdf
+ -system-opus
+ -system-webp
+ $(usex alsa '-alsa' '-no-alsa')
+ $(usex bindist '-no-proprietary-codecs' '-proprietary-codecs')
+ $(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation')
+ $(usex kerberos '-webengine-kerberos' '-no-webengine-kerberos')
+ $(usex pulseaudio '-pulseaudio' '-no-pulseaudio')
+ $(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg')
+ $(usex system-icu '-webengine-icu' '-no-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
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-08-26 12:05 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2021-08-26 12:05 UTC (permalink / raw
To: gentoo-commits
commit: 793d6b2acce7e2e3ab6969bb2b57abc5480b3770
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 26 12:05:05 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Aug 26 12:05:22 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=793d6b2a
dev-qt/qtwebengine: Add missing sys-devel/flex BDEPEND
Reported-by: Joonas Niilola <juippis <AT> gentoo.org>
Closes: https://bugs.gentoo.org/810463
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild
index 96ad0847cb2..3b18dfa1b72 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild
@@ -94,6 +94,7 @@ BDEPEND="${PYTHON_DEPS}
dev-util/re2c
net-libs/nodejs[ssl]
sys-devel/bison
+ sys-devel/flex
ppc64? ( >=dev-util/gn-0.1807 )
"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-07-22 6:07 Sam James
0 siblings, 0 replies; 301+ messages in thread
From: Sam James @ 2021-07-22 6:07 UTC (permalink / raw
To: gentoo-commits
commit: 58808754a4a4c8d887059660f681698552669c85
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 22 06:06:36 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul 22 06:06:36 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58808754
dev-qt/qtwebengine: Stabilize 5.15.2_p20210625 arm64, #800181
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild
index cdadd75b334..96ad0847cb2 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild
@@ -11,7 +11,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 ~ppc64 x86"
if [[ ${PV} == ${QTVER}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-07-18 0:33 Sam James
0 siblings, 0 replies; 301+ messages in thread
From: Sam James @ 2021-07-18 0:33 UTC (permalink / raw
To: gentoo-commits
commit: 46b57a3108c5c69c354a8264d9849a48e4af9198
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 18 00:33:30 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 18 00:33:38 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46b57a31
dev-qt/qtwebengine: Stabilize 5.15.2_p20210625 amd64, #800181
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild
index 0a38090c525..cdadd75b334 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild
@@ -11,7 +11,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 ~ppc64 x86"
if [[ ${PV} == ${QTVER}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-07-17 7:44 Agostino Sarubbo
0 siblings, 0 replies; 301+ messages in thread
From: Agostino Sarubbo @ 2021-07-17 7:44 UTC (permalink / raw
To: gentoo-commits
commit: b9fb62a50acc44cfeac1c5041f5f69907b73a2f9
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 17 07:43:50 2021 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Jul 17 07:43:50 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9fb62a5
dev-qt/qtwebengine: x86 stable wrt bug #800181
Package-Manager: Portage-3.0.20, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild
index 3736cd09ac1..0a38090c525 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild
@@ -11,7 +11,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 ~ppc64 x86"
if [[ ${PV} == ${QTVER}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-07-04 20:40 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2021-07-04 20:40 UTC (permalink / raw
To: gentoo-commits
commit: 393d361644d173d4ea6bfaaaa224f4a07ffef9bf
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 3 14:45:46 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 4 20:40:06 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=393d3616
dev-qt/qtwebengine: Drop 5.15.2_p20210521
Overshadowed by 5.15.2_p20210625.
Bug: https://bugs.gentoo.org/800181
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 -
.../qtwebengine-5.15.2_p20210521.ebuild | 215 ---------------------
2 files changed, 216 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 99cd2facee1..7ee8f9bdba7 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,4 +1,3 @@
DIST qtwebengine-5.15.2-chromium87-ppc64le.tar.xz 28536 BLAKE2B 98f8e01e7026d9df1d30ae453d4394d3c4ad04c0620a2496235d45f5f1080c2280e040826cde7f72d9771bfc80d0c3df56c9dcbe4f763cec432ad56de37d64c5 SHA512 c90a76f44a9d720624016fd082ab3036f12e13b9789e869ebaf5e4774afca7d4187faf187f365f696d1a7eda05ca75516556ee9d291cdb3408d57cc4b23e2654
DIST qtwebengine-5.15.2_p20210421.tar.xz 320142308 BLAKE2B 1ed6e3daad8e8da7336c1575f524f1474eb043a44a86eebdc2375e9a01dbb21a4bf622b01525c627ff5846bb375b19617ca78f418749d6e4ce53b376da0b8317 SHA512 3a57cc8eb1aab086ae2ef69b1b1eaac47827d1f460ff53d5954b0dcb6753cc0e5fb24db490ea186141e6659e26a59862e8096126450a9fde6ed1230c00e4ceaa
-DIST qtwebengine-5.15.2_p20210521.tar.xz 320126348 BLAKE2B 49a910d19487a720bca751d40bb694536d2ac7002b10de5b949b9bb98baf5f86001e89f522bb05edafc5c050a55f7ac15b6689138cff0912990472735a46bfbc SHA512 f71941667abd1a797442dedb501010cb67512e2df9a818b15ff8901a49987211bddcba80e7cc2a4652db9bf56fc9d969e8fa38de1f3ad112838a1a9c9facde8f
DIST qtwebengine-5.15.2_p20210625.tar.xz 320144708 BLAKE2B cd11e69a34ff0fa07d26262906a12304c39a12575024d61db18bc696284e9c5700090e5bfed217c89d2c8eac49b0ccb7d7ee0ba716ec3a81878de1301566884d SHA512 517a8cdaff684894456db8cfb5cfca412b8764e7035623d8190d9a06f6995742097a53eb67329d12bf8dc0a56372f7d09a54532ba804a5bff245ca8ef042a4e1
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210521.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210521.ebuild
deleted file mode 100644
index 4d991de9d35..00000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210521.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-QTVER=$(ver_cut 1-3)
-inherit estack flag-o-matic multiprocessing python-any-r1 qt5-build
-
-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} == ${QTVER}_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
-
-# patchset based on https://github.com/chromium-ppc64le releases
-SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-chromium87-ppc64le.tar.xz )"
-
-IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +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-${QTVER}
- ~dev-qt/qtdeclarative-${QTVER}
- ~dev-qt/qtgui-${QTVER}
- ~dev-qt/qtnetwork-${QTVER}
- ~dev-qt/qtprintsupport-${QTVER}
- ~dev-qt/qtwebchannel-${QTVER}[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/mesa[egl,X(+)]
- 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/libXrandr
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libXtst
- alsa? ( media-libs/alsa-lib )
- designer? ( ~dev-qt/designer-${QTVER} )
- geolocation? ( ~dev-qt/qtpositioning-${QTVER} )
- kerberos? ( virtual/krb5 )
- pulseaudio? ( media-sound/pulseaudio:= )
- system-ffmpeg? ( media-video/ffmpeg:0= )
- system-icu? ( >=dev-libs/icu-68.2:= )
- widgets? (
- ~dev-qt/qtdeclarative-${QTVER}[widgets]
- ~dev-qt/qtwidgets-${QTVER}
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
- dev-util/gperf
- dev-util/ninja
- dev-util/re2c
- net-libs/nodejs[ssl]
- sys-devel/bison
- ppc64? ( >=dev-util/gn-0.1807 )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" # bug 695446
- "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
- "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
- "${FILESDIR}/${PN}-5.15.2_p20210406-glibc-2.33.patch" # by Fedora, bug 769989
- "${FILESDIR}/${P}-gcc11.patch" # by Fedora, bug 768261
-)
-
-src_unpack() {
- # bug 307861
- eshopts_push -s extglob
- if is-flagq '-g?(gdb)?([1-9])'; then
- ewarn
- 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."
- ewarn
- fi
- eshopts_pop
-
- case ${QT5_BUILD_TYPE} in
- live) git-r3_src_unpack ;&
- release) default ;;
- esac
-}
-
-src_prepare() {
- if [[ ${PV} == ${QTVER}_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
-
- # We need to make sure this integrates well into Qt 5.15.2 installation.
- # Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
- sed -e "/^MODULE_VERSION/s/5.*/${QTVER}/" -i .qmake.conf || die
- fi
-
- # 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 630834 - pass appropriate options to ninja when building GN
- sed -e "s/\['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
- -i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die
-
- # 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
-
- 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
- ./generate_gni.sh || die
- popd >/dev/null || die
- fi
-}
-
-src_configure() {
- export NINJA_PATH=/usr/bin/ninja
- export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
- local myqmakeargs=(
- --
- -no-build-qtpdf
- -printing-and-pdf
- -system-opus
- -system-webp
- $(usex alsa '-alsa' '-no-alsa')
- $(usex bindist '-no-proprietary-codecs' '-proprietary-codecs')
- $(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation')
- $(usex kerberos '-webengine-kerberos' '-no-webengine-kerberos')
- $(usex pulseaudio '-pulseaudio' '-no-pulseaudio')
- $(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg')
- $(usex system-icu '-webengine-icu' '-no-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
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-07-02 18:53 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2021-07-02 18:53 UTC (permalink / raw
To: gentoo-commits
commit: 2b6bfff4302a3c4f8ccdc19d76add554441012bc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 2 17:57:45 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jul 2 18:51:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b6bfff4
dev-qt/qtwebengine: 5.15.2_p20210625 snapshot bump
Snapshotted at:
Branch: 5.15
Commit: 7b9e9c92286aec8102ab221434e785a1def0af87
Submodule qtwebengine-chromium.git:
Branch: 87-based
Commit: 0b959ee26c9e4098744021d949d0fc67cc0316d8
Closes: https://bugs.gentoo.org/792054
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
.../qtwebengine-5.15.2_p20210625.ebuild | 212 +++++++++++++++++++++
2 files changed, 213 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index a189e345d82..99cd2facee1 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,3 +1,4 @@
DIST qtwebengine-5.15.2-chromium87-ppc64le.tar.xz 28536 BLAKE2B 98f8e01e7026d9df1d30ae453d4394d3c4ad04c0620a2496235d45f5f1080c2280e040826cde7f72d9771bfc80d0c3df56c9dcbe4f763cec432ad56de37d64c5 SHA512 c90a76f44a9d720624016fd082ab3036f12e13b9789e869ebaf5e4774afca7d4187faf187f365f696d1a7eda05ca75516556ee9d291cdb3408d57cc4b23e2654
DIST qtwebengine-5.15.2_p20210421.tar.xz 320142308 BLAKE2B 1ed6e3daad8e8da7336c1575f524f1474eb043a44a86eebdc2375e9a01dbb21a4bf622b01525c627ff5846bb375b19617ca78f418749d6e4ce53b376da0b8317 SHA512 3a57cc8eb1aab086ae2ef69b1b1eaac47827d1f460ff53d5954b0dcb6753cc0e5fb24db490ea186141e6659e26a59862e8096126450a9fde6ed1230c00e4ceaa
DIST qtwebengine-5.15.2_p20210521.tar.xz 320126348 BLAKE2B 49a910d19487a720bca751d40bb694536d2ac7002b10de5b949b9bb98baf5f86001e89f522bb05edafc5c050a55f7ac15b6689138cff0912990472735a46bfbc SHA512 f71941667abd1a797442dedb501010cb67512e2df9a818b15ff8901a49987211bddcba80e7cc2a4652db9bf56fc9d969e8fa38de1f3ad112838a1a9c9facde8f
+DIST qtwebengine-5.15.2_p20210625.tar.xz 320144708 BLAKE2B cd11e69a34ff0fa07d26262906a12304c39a12575024d61db18bc696284e9c5700090e5bfed217c89d2c8eac49b0ccb7d7ee0ba716ec3a81878de1301566884d SHA512 517a8cdaff684894456db8cfb5cfca412b8764e7035623d8190d9a06f6995742097a53eb67329d12bf8dc0a56372f7d09a54532ba804a5bff245ca8ef042a4e1
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild
new file mode 100644
index 00000000000..424e09b3692
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+QTVER=$(ver_cut 1-3)
+inherit estack flag-o-matic multiprocessing python-any-r1 qt5-build
+
+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} == ${QTVER}_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
+
+# patchset based on https://github.com/chromium-ppc64le releases
+SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-chromium87-ppc64le.tar.xz )"
+
+IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +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-${QTVER}
+ ~dev-qt/qtdeclarative-${QTVER}
+ ~dev-qt/qtgui-${QTVER}
+ ~dev-qt/qtnetwork-${QTVER}
+ ~dev-qt/qtprintsupport-${QTVER}
+ ~dev-qt/qtwebchannel-${QTVER}[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/mesa[egl,X(+)]
+ 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-${QTVER} )
+ geolocation? ( ~dev-qt/qtpositioning-${QTVER} )
+ kerberos? ( virtual/krb5 )
+ pulseaudio? ( media-sound/pulseaudio:= )
+ system-ffmpeg? ( media-video/ffmpeg:0= )
+ system-icu? ( >=dev-libs/icu-69.1:= )
+ widgets? (
+ ~dev-qt/qtdeclarative-${QTVER}[widgets]
+ ~dev-qt/qtwidgets-${QTVER}
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}
+ dev-util/gperf
+ dev-util/ninja
+ dev-util/re2c
+ net-libs/nodejs[ssl]
+ sys-devel/bison
+ ppc64? ( >=dev-util/gn-0.1807 )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" # bug 695446
+ "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
+ "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
+ "${FILESDIR}/${PN}-5.15.2_p20210406-glibc-2.33.patch" # by Fedora, bug 769989
+ "${FILESDIR}/${PN}-5.15.2_p20210521-gcc11.patch" # by Fedora, bug 768261
+)
+
+src_unpack() {
+ # bug 307861
+ eshopts_push -s extglob
+ if is-flagq '-g?(gdb)?([1-9])'; then
+ ewarn
+ 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."
+ ewarn
+ fi
+ eshopts_pop
+
+ case ${QT5_BUILD_TYPE} in
+ live) git-r3_src_unpack ;&
+ release) default ;;
+ esac
+}
+
+src_prepare() {
+ if [[ ${PV} == ${QTVER}_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
+
+ # We need to make sure this integrates well into Qt 5.15.2 installation.
+ # Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
+ sed -e "/^MODULE_VERSION/s/5.*/${QTVER}/" -i .qmake.conf || die
+ fi
+
+ # 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
+
+ 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
+ ./generate_gni.sh || die
+ popd >/dev/null || die
+ fi
+}
+
+src_configure() {
+ export NINJA_PATH=/usr/bin/ninja
+ export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
+
+ local myqmakeargs=(
+ --
+ -no-build-qtpdf
+ -printing-and-pdf
+ -system-opus
+ -system-webp
+ $(usex alsa '-alsa' '-no-alsa')
+ $(usex bindist '-no-proprietary-codecs' '-proprietary-codecs')
+ $(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation')
+ $(usex kerberos '-webengine-kerberos' '-no-webengine-kerberos')
+ $(usex pulseaudio '-pulseaudio' '-no-pulseaudio')
+ $(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg')
+ $(usex system-icu '-webengine-icu' '-no-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
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-07-02 18:53 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2021-07-02 18:53 UTC (permalink / raw
To: gentoo-commits
commit: 0348581f74f1e546b932ee972007f73343166f25
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 2 18:45:39 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Jul 2 18:51:17 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0348581f
dev-qt/qtwebengine: Add pkg_preinst() disclaimer
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild
index 424e09b3692..3736cd09ac1 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210625.ebuild
@@ -105,6 +105,17 @@ PATCHES=(
"${FILESDIR}/${PN}-5.15.2_p20210521-gcc11.patch" # by Fedora, bug 768261
)
+pkg_preinst() {
+ elog "This version of Qt WebEngine is based on Chromium version 87.0.4280, with"
+ elog "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."
+}
+
src_unpack() {
# bug 307861
eshopts_push -s extglob
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-06-01 10:48 Sam James
0 siblings, 0 replies; 301+ messages in thread
From: Sam James @ 2021-06-01 10:48 UTC (permalink / raw
To: gentoo-commits
commit: 6d0e9aace5c97beb51130cd89b9c2987236e2a8e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 1 10:47:21 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 1 10:47:21 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d0e9aac
dev-qt/qtwebengine: Stabilize 5.15.2_p20210421 arm64, #787950
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2_p20210421.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210421.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210421.ebuild
index 536444f345d..21f59ef813e 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210421.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210421.ebuild
@@ -11,7 +11,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 ~ppc64 x86"
if [[ ${PV} == ${QTVER}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-06-01 9:00 Sam James
0 siblings, 0 replies; 301+ messages in thread
From: Sam James @ 2021-06-01 9:00 UTC (permalink / raw
To: gentoo-commits
commit: 5e7d944f125a4d225ac4418a985af2d474d02b7d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 1 08:59:55 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 1 08:59:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e7d944f
dev-qt/qtwebengine: Stabilize 5.15.2_p20210421 amd64, #787950
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2_p20210421.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210421.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210421.ebuild
index 4f41e981b13..536444f345d 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210421.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210421.ebuild
@@ -11,7 +11,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 ~ppc64 x86"
if [[ ${PV} == ${QTVER}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-06-01 9:00 Sam James
0 siblings, 0 replies; 301+ messages in thread
From: Sam James @ 2021-06-01 9:00 UTC (permalink / raw
To: gentoo-commits
commit: 6cae7a731d748cda10cff8467456373a23e5534f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 1 08:59:49 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun 1 08:59:49 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cae7a73
dev-qt/qtwebengine: Stabilize 5.15.2_p20210421 x86, #787950
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2_p20210421.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210421.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210421.ebuild
index 530c311847a..4f41e981b13 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210421.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210421.ebuild
@@ -11,7 +11,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 ~ppc64 x86"
if [[ ${PV} == ${QTVER}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-05-20 20:55 Georgy Yakovlev
0 siblings, 0 replies; 301+ messages in thread
From: Georgy Yakovlev @ 2021-05-20 20:55 UTC (permalink / raw
To: gentoo-commits
commit: 625041ca6151436eae3f58ed86c4a35e06a17f32
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Thu May 20 20:54:12 2021 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Thu May 20 20:54:30 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=625041ca
dev-qt/qtwebengine: dev-util/gn required on ppc64
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2_p20210224.ebuild | 1 +
dev-qt/qtwebengine/qtwebengine-5.15.2_p20210421.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210224.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210224.ebuild
index aab23359050..756f19123c4 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210224.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210224.ebuild
@@ -86,6 +86,7 @@ DEPEND="${RDEPEND}
dev-util/re2c
net-libs/nodejs
sys-devel/bison
+ ppc64? ( >=dev-util/gn-0.1807 )
"
PATCHES=(
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210421.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210421.ebuild
index 39fbcd088e1..530c311847a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210421.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210421.ebuild
@@ -94,6 +94,7 @@ BDEPEND="
dev-util/re2c
net-libs/nodejs[ssl]
sys-devel/bison
+ ppc64? ( >=dev-util/gn-0.1807 )
"
PATCHES=(
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-05-17 21:15 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2021-05-17 21:15 UTC (permalink / raw
To: gentoo-commits
commit: 745dc079e719f85197ed8ae4dd59c6851217e94b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 16 18:45:06 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 17 21:14:48 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=745dc079
dev-qt/qtwebengine: Drop 5.15.2_p20210406
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 -
.../qtwebengine-5.15.2_p20210406.ebuild | 190 ---------------------
2 files changed, 191 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index c90cb18e7b0..ba4cfde1b5e 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,4 +1,3 @@
DIST qtwebengine-5.15.2-chromium87-ppc64le.tar.xz 28536 BLAKE2B 98f8e01e7026d9df1d30ae453d4394d3c4ad04c0620a2496235d45f5f1080c2280e040826cde7f72d9771bfc80d0c3df56c9dcbe4f763cec432ad56de37d64c5 SHA512 c90a76f44a9d720624016fd082ab3036f12e13b9789e869ebaf5e4774afca7d4187faf187f365f696d1a7eda05ca75516556ee9d291cdb3408d57cc4b23e2654
DIST qtwebengine-5.15.2_p20210224.tar.xz 320052028 BLAKE2B a1ebaae7cf114041576f4920de1e484bea70c715a470e83e7c47bd8ff95480fc4e408bba173990480732bd464a9eb07d304f4afdb90d943c0a8cbe1e8299df84 SHA512 939292511703f3a6d758d38f1c860ffacd003be65761b19f23e8817bf1121cb9e6351216f737126d8defb1c97ca877e1c6f352e7cfee8e9289274d0793348b51
-DIST qtwebengine-5.15.2_p20210406.tar.xz 320144324 BLAKE2B 45aafc32f4642fee5525f0504d61ed47c3085d5eff566271701805942ce5fcb2233655111592059775991da5b89dc1702031373f6ff171722ed163265d894daa SHA512 c4a0d5fec3247c04acc447c1c819d1e5dcb1d3c0cbb57a87a5cfa5c0c2b765e82c9f75a7297ba57303df5e1004d75dc554ffd70e24ecb8655126136672f38fdb
DIST qtwebengine-5.15.2_p20210421.tar.xz 320142308 BLAKE2B 1ed6e3daad8e8da7336c1575f524f1474eb043a44a86eebdc2375e9a01dbb21a4bf622b01525c627ff5846bb375b19617ca78f418749d6e4ce53b376da0b8317 SHA512 3a57cc8eb1aab086ae2ef69b1b1eaac47827d1f460ff53d5954b0dcb6753cc0e5fb24db490ea186141e6659e26a59862e8096126450a9fde6ed1230c00e4ceaa
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210406.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210406.ebuild
deleted file mode 100644
index 8e61171efc8..00000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210406.ebuild
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-QTVER=$(ver_cut 1-3)
-inherit multiprocessing python-any-r1 qt5-build
-
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
- if [[ ${PV} == ${QTVER}_p* ]]; then
- SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
- S="${WORKDIR}/${P}"
- QT5_BUILD_DIR="${S}_build"
- fi
-fi
-
-# patchset based on https://github.com/chromium-ppc64le releases
-SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-chromium87-ppc64le.tar.xz )"
-
-IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +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-${QTVER}
- ~dev-qt/qtdeclarative-${QTVER}
- ~dev-qt/qtgui-${QTVER}
- ~dev-qt/qtnetwork-${QTVER}
- ~dev-qt/qtprintsupport-${QTVER}
- ~dev-qt/qtwebchannel-${QTVER}[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/mesa[egl,X(+)]
- 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/libXrandr
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libXtst
- alsa? ( media-libs/alsa-lib )
- designer? ( ~dev-qt/designer-${QTVER} )
- geolocation? ( ~dev-qt/qtpositioning-${QTVER} )
- kerberos? ( virtual/krb5 )
- pulseaudio? ( media-sound/pulseaudio:= )
- system-ffmpeg? ( media-video/ffmpeg:0= )
- system-icu? ( >=dev-libs/icu-68.2:= )
- widgets? (
- ~dev-qt/qtdeclarative-${QTVER}[widgets]
- ~dev-qt/qtwidgets-${QTVER}
- )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- ${PYTHON_DEPS}
- dev-util/gperf
- dev-util/ninja
- dev-util/re2c
- net-libs/nodejs[ssl]
- sys-devel/bison
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" # bug 695446
- "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
- "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
- "${FILESDIR}/${P}-glibc-2.33.patch" # by Fedora, bug 769989
- "${FILESDIR}/${P}-gcc11.patch" # by Fedora, bug 768261
- "${FILESDIR}/${P}-icu69.patch" # bug 781236
-)
-
-src_prepare() {
- if [[ ${PV} == ${QTVER}_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
-
- # We need to make sure this integrates well into Qt 5.15.2 installation.
- # Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
- sed -e "/^MODULE_VERSION/s/5.*/${QTVER}/" -i .qmake.conf || die
- fi
-
- # 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 630834 - pass appropriate options to ninja when building GN
- sed -e "s/\['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
- -i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die
-
- # 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
-
- 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
- ./generate_gni.sh || die
- popd >/dev/null || die
- fi
-}
-
-src_configure() {
- export NINJA_PATH=/usr/bin/ninja
- export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
- local myqmakeargs=(
- --
- -no-build-qtpdf
- -printing-and-pdf
- -system-opus
- -system-webp
- $(usex alsa '-alsa' '-no-alsa')
- $(usex bindist '-no-proprietary-codecs' '-proprietary-codecs')
- $(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation')
- $(usex kerberos '-webengine-kerberos' '-no-webengine-kerberos')
- $(usex pulseaudio '-pulseaudio' '-no-pulseaudio')
- $(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg')
- $(usex system-icu '-webengine-icu' '-no-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
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-05-03 6:29 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2021-05-03 6:29 UTC (permalink / raw
To: gentoo-commits
commit: 9a20720cd91737be4b926c242608ee06f1d31a5c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 21 15:36:51 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 3 06:25:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a20720c
dev-qt/qtwebengine: 5.15.2_p20210421 bump, fix build with GCC-11
Snapshotted at:
Branch: 5.15.4
Commit: 0d4ca9cfb0d6e538172005e1c4b0b3a021b1c18c
Submodule qtwebengine-chromium.git:
Branch: 87-based
Commit: 3f594ea1afb8b18c864715a796ef21099d432a13
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
.../qtwebengine-5.15.2_p20210421.ebuild | 216 +++++++++++++++++++++
2 files changed, 217 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 8f706a89789..c90cb18e7b0 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,3 +1,4 @@
DIST qtwebengine-5.15.2-chromium87-ppc64le.tar.xz 28536 BLAKE2B 98f8e01e7026d9df1d30ae453d4394d3c4ad04c0620a2496235d45f5f1080c2280e040826cde7f72d9771bfc80d0c3df56c9dcbe4f763cec432ad56de37d64c5 SHA512 c90a76f44a9d720624016fd082ab3036f12e13b9789e869ebaf5e4774afca7d4187faf187f365f696d1a7eda05ca75516556ee9d291cdb3408d57cc4b23e2654
DIST qtwebengine-5.15.2_p20210224.tar.xz 320052028 BLAKE2B a1ebaae7cf114041576f4920de1e484bea70c715a470e83e7c47bd8ff95480fc4e408bba173990480732bd464a9eb07d304f4afdb90d943c0a8cbe1e8299df84 SHA512 939292511703f3a6d758d38f1c860ffacd003be65761b19f23e8817bf1121cb9e6351216f737126d8defb1c97ca877e1c6f352e7cfee8e9289274d0793348b51
DIST qtwebengine-5.15.2_p20210406.tar.xz 320144324 BLAKE2B 45aafc32f4642fee5525f0504d61ed47c3085d5eff566271701805942ce5fcb2233655111592059775991da5b89dc1702031373f6ff171722ed163265d894daa SHA512 c4a0d5fec3247c04acc447c1c819d1e5dcb1d3c0cbb57a87a5cfa5c0c2b765e82c9f75a7297ba57303df5e1004d75dc554ffd70e24ecb8655126136672f38fdb
+DIST qtwebengine-5.15.2_p20210421.tar.xz 320142308 BLAKE2B 1ed6e3daad8e8da7336c1575f524f1474eb043a44a86eebdc2375e9a01dbb21a4bf622b01525c627ff5846bb375b19617ca78f418749d6e4ce53b376da0b8317 SHA512 3a57cc8eb1aab086ae2ef69b1b1eaac47827d1f460ff53d5954b0dcb6753cc0e5fb24db490ea186141e6659e26a59862e8096126450a9fde6ed1230c00e4ceaa
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210421.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210421.ebuild
new file mode 100644
index 00000000000..3aaec6f3807
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210421.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+QTVER=$(ver_cut 1-3)
+inherit estack flag-o-matic multiprocessing python-any-r1 qt5-build
+
+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} == ${QTVER}_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
+
+# patchset based on https://github.com/chromium-ppc64le releases
+SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-chromium87-ppc64le.tar.xz )"
+
+IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio +system-ffmpeg +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-${QTVER}
+ ~dev-qt/qtdeclarative-${QTVER}
+ ~dev-qt/qtgui-${QTVER}
+ ~dev-qt/qtnetwork-${QTVER}
+ ~dev-qt/qtprintsupport-${QTVER}
+ ~dev-qt/qtwebchannel-${QTVER}[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/mesa[egl,X(+)]
+ 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/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXScrnSaver
+ x11-libs/libXtst
+ alsa? ( media-libs/alsa-lib )
+ designer? ( ~dev-qt/designer-${QTVER} )
+ geolocation? ( ~dev-qt/qtpositioning-${QTVER} )
+ kerberos? ( virtual/krb5 )
+ pulseaudio? ( media-sound/pulseaudio:= )
+ system-ffmpeg? ( media-video/ffmpeg:0= )
+ system-icu? ( >=dev-libs/icu-68.2:= )
+ widgets? (
+ ~dev-qt/qtdeclarative-${QTVER}[widgets]
+ ~dev-qt/qtwidgets-${QTVER}
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ ${PYTHON_DEPS}
+ dev-util/gperf
+ dev-util/ninja
+ dev-util/re2c
+ net-libs/nodejs[ssl]
+ sys-devel/bison
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" # bug 695446
+ "${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
+ "${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
+ "${FILESDIR}/${PN}-5.15.2_p20210406-glibc-2.33.patch" # by Fedora, bug 769989
+ "${FILESDIR}/${PN}-5.15.2_p20210406-gcc11.patch" # by Fedora, bug 768261
+ "${FILESDIR}/${PN}-5.15.2_p20210406-icu69.patch" # bug 781236
+)
+
+src_unpack() {
+ # bug 307861
+ eshopts_push -s extglob
+ if is-flagq '-g?(gdb)?([1-9])'; then
+ ewarn
+ 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."
+ ewarn
+ fi
+ eshopts_pop
+
+ case ${QT5_BUILD_TYPE} in
+ live) git-r3_src_unpack ;&
+ release) default ;;
+ esac
+}
+
+src_prepare() {
+ if [[ ${PV} == ${QTVER}_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
+
+ # We need to make sure this integrates well into Qt 5.15.2 installation.
+ # Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
+ sed -e "/^MODULE_VERSION/s/5.*/${QTVER}/" -i .qmake.conf || die
+ fi
+
+ # 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 630834 - pass appropriate options to ninja when building GN
+ sed -e "s/\['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
+ -i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die
+
+ # 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
+
+ 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
+ ./generate_gni.sh || die
+ popd >/dev/null || die
+ fi
+}
+
+src_configure() {
+ export NINJA_PATH=/usr/bin/ninja
+ export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
+
+ local myqmakeargs=(
+ --
+ -no-build-qtpdf
+ -printing-and-pdf
+ -system-opus
+ -system-webp
+ $(usex alsa '-alsa' '-no-alsa')
+ $(usex bindist '-no-proprietary-codecs' '-proprietary-codecs')
+ $(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation')
+ $(usex kerberos '-webengine-kerberos' '-no-webengine-kerberos')
+ $(usex pulseaudio '-pulseaudio' '-no-pulseaudio')
+ $(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg')
+ $(usex system-icu '-webengine-icu' '-no-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
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-04-24 21:11 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2021-04-24 21:11 UTC (permalink / raw
To: gentoo-commits
commit: b6c22e02295937b559fec79f5a862aa6164d71e0
Author: Alec Moskvin <alecm <AT> gmx <DOT> com>
AuthorDate: Sat Mar 20 17:18:54 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 24 21:10:15 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6c22e02
dev-qt/qtwebengine: depend on net-libs/nodejs[ssl]
Closes: https://github.com/gentoo/gentoo/pull/20021
Closes: https://bugs.gentoo.org/777405
Signed-off-by: Alec Moskvin <alecm <AT> gmx.com>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2_p20210406.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210406.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210406.ebuild
index a2353504bc3..8699e94a3bd 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210406.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210406.ebuild
@@ -84,7 +84,7 @@ DEPEND="${RDEPEND}
dev-util/gperf
dev-util/ninja
dev-util/re2c
- net-libs/nodejs
+ net-libs/nodejs[ssl]
sys-devel/bison
"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-04-24 21:11 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2021-04-24 21:11 UTC (permalink / raw
To: gentoo-commits
commit: 2b13108b03d9ac3f36357107c236d47127481245
Author: Nils Freydank <holgersson <AT> posteo <DOT> de>
AuthorDate: Sun Apr 18 20:47:43 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Apr 24 21:10:42 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b13108b
dev-qt/qtwebengine: Move some DEPENDs to BDEPEND
This commit changes two things:
1. Some deps were in DEPEND which are actually CBUILD dependencies, so
they're moved into BDEPEND now.
2. DEPEND contained an old gzip dep to a version which is not in the
tree anymore.
Committer-comment:
Fixed DEPEND/BDEPEND, rebased onto 29de6e40, updated git summary accordingly.
See also: https://github.com/gentoo/qt/pull/237
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Nils Freydank <holgersson <AT> posteo.de>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2_p20210406.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210406.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210406.ebuild
index 8699e94a3bd..8e61171efc8 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210406.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210406.ebuild
@@ -78,9 +78,9 @@ RDEPEND="
~dev-qt/qtwidgets-${QTVER}
)
"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
${PYTHON_DEPS}
- >=app-arch/gzip-1.7
dev-util/gperf
dev-util/ninja
dev-util/re2c
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-03-12 20:08 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2021-03-12 20:08 UTC (permalink / raw
To: gentoo-commits
commit: 3c7f3e2ab46b00c1723148574e8182a1da0fe49a
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Wed Mar 10 18:00:00 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 12 20:06:39 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c7f3e2a
dev-qt/qtwebengine: Set correct QT5_BUILD_DIR.
Closes: https://bugs.gentoo.org/775275
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2_p20210224.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210224.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210224.ebuild
index bd9662af876..ac7c856f3db 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210224.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210224.ebuild
@@ -14,6 +14,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
if [[ ${PV} == ${QTVER}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
+ QT5_BUILD_DIR="${S}_build"
fi
fi
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-03-07 19:44 Sam James
0 siblings, 0 replies; 301+ messages in thread
From: Sam James @ 2021-03-07 19:44 UTC (permalink / raw
To: gentoo-commits
commit: ae2b00e83c93bce40fadb78d0c845a4d6d56fe8b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 7 19:43:55 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 7 19:43:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae2b00e8
dev-qt/qtwebengine: Stabilize 5.15.2_p20210224 arm64, #773040
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2_p20210224.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210224.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210224.ebuild
index 582efabc3f0..2c33bc250e6 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210224.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210224.ebuild
@@ -10,7 +10,7 @@ inherit multiprocessing python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
+ KEYWORDS="amd64 ~arm arm64 x86"
if [[ ${PV} == ${QTVER}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-03-06 18:37 Sam James
0 siblings, 0 replies; 301+ messages in thread
From: Sam James @ 2021-03-06 18:37 UTC (permalink / raw
To: gentoo-commits
commit: 9f318b0899e41722eb8161e88f2d8bd9650e29ab
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 6 18:37:28 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 6 18:37:28 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f318b08
dev-qt/qtwebengine: Stabilize 5.15.2_p20210224 amd64, #773040
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2_p20210224.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210224.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210224.ebuild
index dc081055916..582efabc3f0 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210224.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210224.ebuild
@@ -10,7 +10,7 @@ inherit multiprocessing python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
if [[ ${PV} == ${QTVER}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-03-06 15:11 Thomas Deutschmann
0 siblings, 0 replies; 301+ messages in thread
From: Thomas Deutschmann @ 2021-03-06 15:11 UTC (permalink / raw
To: gentoo-commits
commit: 7a3418d546266e89671be3237108673ccda2d9d5
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 6 14:42:14 2021 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Mar 6 14:42:14 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a3418d5
dev-qt/qtwebengine: x86 stable (bug #773040)
Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2_p20210224.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210224.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210224.ebuild
index 5271d30d4ae..dc081055916 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210224.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210224.ebuild
@@ -10,7 +10,7 @@ inherit multiprocessing python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 x86"
if [[ ${PV} == ${QTVER}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-02-26 21:23 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2021-02-26 21:23 UTC (permalink / raw
To: gentoo-commits
commit: e47bb76493c6ac7a58f4ee67de402fbc252af32f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 26 21:22:55 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 26 21:22:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e47bb764
dev-qt/qtwebengine: Drop 5.15.2_p20210205
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 -
.../qtwebengine-5.15.2_p20210205.ebuild | 183 ---------------------
2 files changed, 184 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 56dc6ae1cdc..c9426eb2cca 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,4 +1,3 @@
DIST qtwebengine-5.15.2-ppc64.tar.xz 43868 BLAKE2B 97a2db64c688cc3ce178a6f00c29d3408221302c992bf0df31edd5c11f7cd978b92d9222201644991fca4fc0824b19d994a71c472732dbbdda3729bdd04a67f3 SHA512 835e7da4670cd823a1674052d64971bfd98d54edb6c5df8e9d09aa8103d496a4c16f0eb9d47c46db466e1c640e3326d4e43b284161129d648bfe693a902ec9cc
-DIST qtwebengine-5.15.2_p20210205.tar.xz 317422912 BLAKE2B a5cdbea0347db21b7fb981a358ad6419ea9cebef98f3d8fef3618b9010164986257cb87caef6a09648e463c3b864ce28e0591a2a783b8b5727b69d85b4b3289c SHA512 8e8b4918f7c3232aafd9f2d13655501e0d03d90514ef3a0b8319df1c8792aeaf7800f370cee15634c708ee14f86ef831749556cb6710578d03c3c2e468149be0
DIST qtwebengine-5.15.2_p20210224.tar.xz 320052028 BLAKE2B a1ebaae7cf114041576f4920de1e484bea70c715a470e83e7c47bd8ff95480fc4e408bba173990480732bd464a9eb07d304f4afdb90d943c0a8cbe1e8299df84 SHA512 939292511703f3a6d758d38f1c860ffacd003be65761b19f23e8817bf1121cb9e6351216f737126d8defb1c97ca877e1c6f352e7cfee8e9289274d0793348b51
DIST qtwebengine-everywhere-src-5.15.2.tar.xz 280142544 BLAKE2B cf84a07292e69b5746d6575d65295b5bf4e054d448361f26e63cbe20ddd0773f60893e656d74b3b8c191e2829e09398a65896c8d96d3a7ef210ac1f21cd90e63 SHA512 de64c30819f5e2f8620c853ff22b2f9717641477aef4432a552a72d1d67ed62ed61572afee6de3f2c9f32dee28f4f786ffd63fc465aa42c0ae1e87ea28341756
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210205.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210205.ebuild
deleted file mode 100644
index d8a78a0113b..00000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210205.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-QTVER=$(ver_cut 1-3)
-inherit multiprocessing python-any-r1 qt5-build
-
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
- if [[ ${PV} == ${QTVER}_p* ]]; then
- SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
- S="${WORKDIR}/${P}"
- fi
-fi
-
-# patchset based on https://github.com/chromium-ppc64le releases
-SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-ppc64.tar.xz )"
-
-IUSE="alsa bindist designer geolocation kerberos pulseaudio +system-ffmpeg +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-${QTVER}
- ~dev-qt/qtdeclarative-${QTVER}
- ~dev-qt/qtgui-${QTVER}
- ~dev-qt/qtnetwork-${QTVER}
- ~dev-qt/qtprintsupport-${QTVER}
- ~dev-qt/qtwebchannel-${QTVER}[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/mesa[egl,X(+)]
- 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/libXrandr
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libXtst
- alsa? ( media-libs/alsa-lib )
- designer? ( ~dev-qt/designer-${QTVER} )
- geolocation? ( ~dev-qt/qtpositioning-${QTVER} )
- kerberos? ( virtual/krb5 )
- pulseaudio? ( media-sound/pulseaudio:= )
- system-ffmpeg? ( media-video/ffmpeg:0= )
- system-icu? ( >=dev-libs/icu-60.2:= )
- widgets? (
- ~dev-qt/qtdeclarative-${QTVER}[widgets]
- ~dev-qt/qtwidgets-${QTVER}
- )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- >=app-arch/gzip-1.7
- dev-util/gperf
- dev-util/ninja
- dev-util/re2c
- net-libs/nodejs
- sys-devel/bison
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" ) # bug 695446
-
-src_prepare() {
- if [[ ${PV} == ${QTVER}_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
-
- # We need to make sure this integrates well into Qt 5.15.2 installation.
- # Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
- sed -e "/^MODULE_VERSION/s/5.*/${QTVER}/" -i .qmake.conf || die
- fi
-
- # QTBUG-88657 - jumbo-build is broken
- #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 630834 - pass appropriate options to ninja when building GN
- sed -e "s/\['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
- -i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die
-
- # 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
-
- 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 "${WORKDIR}/${PN}-ppc64"
- 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
- # generate_gni.sh runs git at the end of process, prevent it.
- git() { : ; }
- export -f git
- ./generate_gni.sh || die
- unset git
- popd >/dev/null || die
- fi
-}
-
-src_configure() {
- export NINJA_PATH=/usr/bin/ninja
- export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
- local myqmakeargs=(
- --
- -no-build-qtpdf
- -printing-and-pdf
- -system-opus
- -system-webp
- $(usex alsa '-alsa' '-no-alsa')
- $(usex bindist '-no-proprietary-codecs' '-proprietary-codecs')
- $(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation')
- $(usex kerberos '-webengine-kerberos' '-no-webengine-kerberos')
- $(usex pulseaudio '-pulseaudio' '-no-pulseaudio')
- $(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg')
- $(usex system-icu '-webengine-icu' '-no-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
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-02-08 19:38 Georgy Yakovlev
0 siblings, 0 replies; 301+ messages in thread
From: Georgy Yakovlev @ 2021-02-08 19:38 UTC (permalink / raw
To: gentoo-commits
commit: b0b138dac735ba5047e399034873a672ba3109e5
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 8 19:38:16 2021 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Feb 8 19:38:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0b138da
dev-qt/qtwebengine: drop ~ppc64 keyword from snapshot
needs patches rebased, keywords will be re-added later.
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2_p20210205.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210205.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210205.ebuild
index d6a1b6cb87f..d8a78a0113b 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210205.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210205.ebuild
@@ -10,7 +10,7 @@ inherit multiprocessing python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
if [[ ${PV} == ${QTVER}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-02-07 17:54 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2021-02-07 17:54 UTC (permalink / raw
To: gentoo-commits
commit: 0e7fc4d3f6702f899df2e46d1123814ba0ddcfbe
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 7 17:53:01 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 7 17:53:51 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e7fc4d3
dev-qt/qtwebengine: Restore KEYWORDS
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2_p20210205.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210205.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210205.ebuild
index e78bacb1133..d6a1b6cb87f 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210205.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210205.ebuild
@@ -10,7 +10,7 @@ inherit multiprocessing python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
-# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
if [[ ${PV} == ${QTVER}_p* ]]; then
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
S="${WORKDIR}/${P}"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-02-07 13:42 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2021-02-07 13:42 UTC (permalink / raw
To: gentoo-commits
commit: cc0a474c200facc581ddffb33b3652c1ca85375e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 7 13:05:38 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 7 13:42:42 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc0a474c
dev-qt/qtwebengine: Drop 5.15.2_p20210126 snapshot
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 -
.../qtwebengine-5.15.2_p20210126.ebuild | 183 ---------------------
2 files changed, 184 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 928d6ee9870..8e7d67bb1e8 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,4 +1,3 @@
DIST qtwebengine-5.15.2-ppc64.tar.xz 43868 BLAKE2B 97a2db64c688cc3ce178a6f00c29d3408221302c992bf0df31edd5c11f7cd978b92d9222201644991fca4fc0824b19d994a71c472732dbbdda3729bdd04a67f3 SHA512 835e7da4670cd823a1674052d64971bfd98d54edb6c5df8e9d09aa8103d496a4c16f0eb9d47c46db466e1c640e3326d4e43b284161129d648bfe693a902ec9cc
-DIST qtwebengine-5.15.2_p20210126.tar.xz 316160016 BLAKE2B 8de7b37585a040673d200de3149bfb878cd3d6d71e5b5343960022b1ca111364b2d351b1ca4cf760d9de46d4b247f2a7638c5d217210ad3f1d416b703d70d4a9 SHA512 448ca09609150756c64b05dd48178445fda7eb935e8cfa4bb30a1cc520de50939e5e85c2b6a60cff40147849a7b19b48a15d1eb923aeca969779482060c44a77
DIST qtwebengine-5.15.2_p20210205.tar.xz 317422912 BLAKE2B a5cdbea0347db21b7fb981a358ad6419ea9cebef98f3d8fef3618b9010164986257cb87caef6a09648e463c3b864ce28e0591a2a783b8b5727b69d85b4b3289c SHA512 8e8b4918f7c3232aafd9f2d13655501e0d03d90514ef3a0b8319df1c8792aeaf7800f370cee15634c708ee14f86ef831749556cb6710578d03c3c2e468149be0
DIST qtwebengine-everywhere-src-5.15.2.tar.xz 280142544 BLAKE2B cf84a07292e69b5746d6575d65295b5bf4e054d448361f26e63cbe20ddd0773f60893e656d74b3b8c191e2829e09398a65896c8d96d3a7ef210ac1f21cd90e63 SHA512 de64c30819f5e2f8620c853ff22b2f9717641477aef4432a552a72d1d67ed62ed61572afee6de3f2c9f32dee28f4f786ffd63fc465aa42c0ae1e87ea28341756
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210126.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210126.ebuild
deleted file mode 100644
index c064f099c1a..00000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210126.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-QTVER=$(ver_cut 1-3)
-inherit multiprocessing python-any-r1 qt5-build
-
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
- if [[ ${PV} == ${QTVER}_p* ]]; then
- SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
- S="${WORKDIR}/${P}"
- fi
-fi
-
-# patchset based on https://github.com/chromium-ppc64le releases
-SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-ppc64.tar.xz )"
-
-IUSE="alsa bindist designer geolocation kerberos pulseaudio +system-ffmpeg +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-${QTVER}
- ~dev-qt/qtdeclarative-${QTVER}
- ~dev-qt/qtgui-${QTVER}
- ~dev-qt/qtnetwork-${QTVER}
- ~dev-qt/qtprintsupport-${QTVER}
- ~dev-qt/qtwebchannel-${QTVER}[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/mesa[egl,X(+)]
- 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/libXrandr
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libXtst
- alsa? ( media-libs/alsa-lib )
- designer? ( ~dev-qt/designer-${QTVER} )
- geolocation? ( ~dev-qt/qtpositioning-${QTVER} )
- kerberos? ( virtual/krb5 )
- pulseaudio? ( media-sound/pulseaudio:= )
- system-ffmpeg? ( media-video/ffmpeg:0= )
- system-icu? ( >=dev-libs/icu-60.2:= )
- widgets? (
- ~dev-qt/qtdeclarative-${QTVER}[widgets]
- ~dev-qt/qtwidgets-${QTVER}
- )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- >=app-arch/gzip-1.7
- dev-util/gperf
- dev-util/ninja
- dev-util/re2c
- net-libs/nodejs
- sys-devel/bison
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" ) # bug 695446
-
-src_prepare() {
- if [[ ${PV} == ${QTVER}_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
-
- # We need to make sure this integrates well into Qt 5.15.2 installation.
- # Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
- sed -e "/^MODULE_VERSION/s/5.*/${QTMIN}/" -i .qmake.conf || die
- fi
-
- # QTBUG-88657 - jumbo-build is broken
- #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 630834 - pass appropriate options to ninja when building GN
- sed -e "s/\['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
- -i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die
-
- # 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
-
- 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 "${WORKDIR}/${PN}-ppc64"
- 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
- # generate_gni.sh runs git at the end of process, prevent it.
- git() { : ; }
- export -f git
- ./generate_gni.sh || die
- unset git
- popd >/dev/null || die
- fi
-}
-
-src_configure() {
- export NINJA_PATH=/usr/bin/ninja
- export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
- local myqmakeargs=(
- --
- -no-build-qtpdf
- -printing-and-pdf
- -system-opus
- -system-webp
- $(usex alsa '-alsa' '-no-alsa')
- $(usex bindist '-no-proprietary-codecs' '-proprietary-codecs')
- $(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation')
- $(usex kerberos '-webengine-kerberos' '-no-webengine-kerberos')
- $(usex pulseaudio '-pulseaudio' '-no-pulseaudio')
- $(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg')
- $(usex system-icu '-webengine-icu' '-no-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
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-02-07 13:42 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2021-02-07 13:42 UTC (permalink / raw
To: gentoo-commits
commit: 09ed381b5b2c292770b089b410afa9fb1d770ec2
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 7 12:48:14 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 7 13:42:40 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09ed381b
dev-qt/qtwebengine: 5.15.2_p20210205 snapshot bump
Snapshotted at:
Branch: 5.15
Commit: a4fce092cbd877560dd75b38a2e495aaa75f60f3
Submodule qtwebengine-chromium.git:
Branch: 87-based
Commit: 19c6bab869563fc97a5047eeea6eed7992458af8
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
.../qtwebengine-5.15.2_p20210205.ebuild | 183 +++++++++++++++++++++
2 files changed, 184 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 80ac5d47606..928d6ee9870 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,3 +1,4 @@
DIST qtwebengine-5.15.2-ppc64.tar.xz 43868 BLAKE2B 97a2db64c688cc3ce178a6f00c29d3408221302c992bf0df31edd5c11f7cd978b92d9222201644991fca4fc0824b19d994a71c472732dbbdda3729bdd04a67f3 SHA512 835e7da4670cd823a1674052d64971bfd98d54edb6c5df8e9d09aa8103d496a4c16f0eb9d47c46db466e1c640e3326d4e43b284161129d648bfe693a902ec9cc
DIST qtwebengine-5.15.2_p20210126.tar.xz 316160016 BLAKE2B 8de7b37585a040673d200de3149bfb878cd3d6d71e5b5343960022b1ca111364b2d351b1ca4cf760d9de46d4b247f2a7638c5d217210ad3f1d416b703d70d4a9 SHA512 448ca09609150756c64b05dd48178445fda7eb935e8cfa4bb30a1cc520de50939e5e85c2b6a60cff40147849a7b19b48a15d1eb923aeca969779482060c44a77
+DIST qtwebengine-5.15.2_p20210205.tar.xz 317422912 BLAKE2B a5cdbea0347db21b7fb981a358ad6419ea9cebef98f3d8fef3618b9010164986257cb87caef6a09648e463c3b864ce28e0591a2a783b8b5727b69d85b4b3289c SHA512 8e8b4918f7c3232aafd9f2d13655501e0d03d90514ef3a0b8319df1c8792aeaf7800f370cee15634c708ee14f86ef831749556cb6710578d03c3c2e468149be0
DIST qtwebengine-everywhere-src-5.15.2.tar.xz 280142544 BLAKE2B cf84a07292e69b5746d6575d65295b5bf4e054d448361f26e63cbe20ddd0773f60893e656d74b3b8c191e2829e09398a65896c8d96d3a7ef210ac1f21cd90e63 SHA512 de64c30819f5e2f8620c853ff22b2f9717641477aef4432a552a72d1d67ed62ed61572afee6de3f2c9f32dee28f4f786ffd63fc465aa42c0ae1e87ea28341756
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210205.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210205.ebuild
new file mode 100644
index 00000000000..e78bacb1133
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210205.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+QTVER=$(ver_cut 1-3)
+inherit multiprocessing python-any-r1 qt5-build
+
+DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ if [[ ${PV} == ${QTVER}_p* ]]; then
+ SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
+ S="${WORKDIR}/${P}"
+ fi
+fi
+
+# patchset based on https://github.com/chromium-ppc64le releases
+SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-ppc64.tar.xz )"
+
+IUSE="alsa bindist designer geolocation kerberos pulseaudio +system-ffmpeg +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-${QTVER}
+ ~dev-qt/qtdeclarative-${QTVER}
+ ~dev-qt/qtgui-${QTVER}
+ ~dev-qt/qtnetwork-${QTVER}
+ ~dev-qt/qtprintsupport-${QTVER}
+ ~dev-qt/qtwebchannel-${QTVER}[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/mesa[egl,X(+)]
+ 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/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXScrnSaver
+ x11-libs/libXtst
+ alsa? ( media-libs/alsa-lib )
+ designer? ( ~dev-qt/designer-${QTVER} )
+ geolocation? ( ~dev-qt/qtpositioning-${QTVER} )
+ kerberos? ( virtual/krb5 )
+ pulseaudio? ( media-sound/pulseaudio:= )
+ system-ffmpeg? ( media-video/ffmpeg:0= )
+ system-icu? ( >=dev-libs/icu-60.2:= )
+ widgets? (
+ ~dev-qt/qtdeclarative-${QTVER}[widgets]
+ ~dev-qt/qtwidgets-${QTVER}
+ )
+"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ >=app-arch/gzip-1.7
+ dev-util/gperf
+ dev-util/ninja
+ dev-util/re2c
+ net-libs/nodejs
+ sys-devel/bison
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" ) # bug 695446
+
+src_prepare() {
+ if [[ ${PV} == ${QTVER}_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
+
+ # We need to make sure this integrates well into Qt 5.15.2 installation.
+ # Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
+ sed -e "/^MODULE_VERSION/s/5.*/${QTVER}/" -i .qmake.conf || die
+ fi
+
+ # QTBUG-88657 - jumbo-build is broken
+ #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 630834 - pass appropriate options to ninja when building GN
+ sed -e "s/\['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
+ -i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die
+
+ # 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
+
+ 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 "${WORKDIR}/${PN}-ppc64"
+ 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
+ # generate_gni.sh runs git at the end of process, prevent it.
+ git() { : ; }
+ export -f git
+ ./generate_gni.sh || die
+ unset git
+ popd >/dev/null || die
+ fi
+}
+
+src_configure() {
+ export NINJA_PATH=/usr/bin/ninja
+ export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
+
+ local myqmakeargs=(
+ --
+ -no-build-qtpdf
+ -printing-and-pdf
+ -system-opus
+ -system-webp
+ $(usex alsa '-alsa' '-no-alsa')
+ $(usex bindist '-no-proprietary-codecs' '-proprietary-codecs')
+ $(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation')
+ $(usex kerberos '-webengine-kerberos' '-no-webengine-kerberos')
+ $(usex pulseaudio '-pulseaudio' '-no-pulseaudio')
+ $(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg')
+ $(usex system-icu '-webengine-icu' '-no-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
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-02-05 22:30 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2021-02-05 22:30 UTC (permalink / raw
To: gentoo-commits
commit: ee12689df2696db2b28973e3cb8877f89a8c97e3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 5 22:19:08 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 5 22:30:19 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee12689d
dev-qt/qtwebengine: 5.15.2_p20210126 snapshot bump w/o KEYWORDS
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
.../qtwebengine-5.15.2_p20210126.ebuild | 183 +++++++++++++++++++++
2 files changed, 184 insertions(+)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index a509a377cd2..80ac5d47606 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,2 +1,3 @@
DIST qtwebengine-5.15.2-ppc64.tar.xz 43868 BLAKE2B 97a2db64c688cc3ce178a6f00c29d3408221302c992bf0df31edd5c11f7cd978b92d9222201644991fca4fc0824b19d994a71c472732dbbdda3729bdd04a67f3 SHA512 835e7da4670cd823a1674052d64971bfd98d54edb6c5df8e9d09aa8103d496a4c16f0eb9d47c46db466e1c640e3326d4e43b284161129d648bfe693a902ec9cc
+DIST qtwebengine-5.15.2_p20210126.tar.xz 316160016 BLAKE2B 8de7b37585a040673d200de3149bfb878cd3d6d71e5b5343960022b1ca111364b2d351b1ca4cf760d9de46d4b247f2a7638c5d217210ad3f1d416b703d70d4a9 SHA512 448ca09609150756c64b05dd48178445fda7eb935e8cfa4bb30a1cc520de50939e5e85c2b6a60cff40147849a7b19b48a15d1eb923aeca969779482060c44a77
DIST qtwebengine-everywhere-src-5.15.2.tar.xz 280142544 BLAKE2B cf84a07292e69b5746d6575d65295b5bf4e054d448361f26e63cbe20ddd0773f60893e656d74b3b8c191e2829e09398a65896c8d96d3a7ef210ac1f21cd90e63 SHA512 de64c30819f5e2f8620c853ff22b2f9717641477aef4432a552a72d1d67ed62ed61572afee6de3f2c9f32dee28f4f786ffd63fc465aa42c0ae1e87ea28341756
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210126.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210126.ebuild
new file mode 100644
index 00000000000..c064f099c1a
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210126.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+QTVER=$(ver_cut 1-3)
+inherit multiprocessing python-any-r1 qt5-build
+
+DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ if [[ ${PV} == ${QTVER}_p* ]]; then
+ SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
+ S="${WORKDIR}/${P}"
+ fi
+fi
+
+# patchset based on https://github.com/chromium-ppc64le releases
+SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-ppc64.tar.xz )"
+
+IUSE="alsa bindist designer geolocation kerberos pulseaudio +system-ffmpeg +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-${QTVER}
+ ~dev-qt/qtdeclarative-${QTVER}
+ ~dev-qt/qtgui-${QTVER}
+ ~dev-qt/qtnetwork-${QTVER}
+ ~dev-qt/qtprintsupport-${QTVER}
+ ~dev-qt/qtwebchannel-${QTVER}[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/mesa[egl,X(+)]
+ 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/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXScrnSaver
+ x11-libs/libXtst
+ alsa? ( media-libs/alsa-lib )
+ designer? ( ~dev-qt/designer-${QTVER} )
+ geolocation? ( ~dev-qt/qtpositioning-${QTVER} )
+ kerberos? ( virtual/krb5 )
+ pulseaudio? ( media-sound/pulseaudio:= )
+ system-ffmpeg? ( media-video/ffmpeg:0= )
+ system-icu? ( >=dev-libs/icu-60.2:= )
+ widgets? (
+ ~dev-qt/qtdeclarative-${QTVER}[widgets]
+ ~dev-qt/qtwidgets-${QTVER}
+ )
+"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ >=app-arch/gzip-1.7
+ dev-util/gperf
+ dev-util/ninja
+ dev-util/re2c
+ net-libs/nodejs
+ sys-devel/bison
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" ) # bug 695446
+
+src_prepare() {
+ if [[ ${PV} == ${QTVER}_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
+
+ # We need to make sure this integrates well into Qt 5.15.2 installation.
+ # Otherwise revdeps fail w/o heavy changes. This is the simplest way to do it.
+ sed -e "/^MODULE_VERSION/s/5.*/${QTMIN}/" -i .qmake.conf || die
+ fi
+
+ # QTBUG-88657 - jumbo-build is broken
+ #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 630834 - pass appropriate options to ninja when building GN
+ sed -e "s/\['ninja'/&, '-j$(makeopts_jobs)', '-l$(makeopts_loadavg "${MAKEOPTS}" 0)', '-v'/" \
+ -i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die
+
+ # 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
+
+ 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 "${WORKDIR}/${PN}-ppc64"
+ 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
+ # generate_gni.sh runs git at the end of process, prevent it.
+ git() { : ; }
+ export -f git
+ ./generate_gni.sh || die
+ unset git
+ popd >/dev/null || die
+ fi
+}
+
+src_configure() {
+ export NINJA_PATH=/usr/bin/ninja
+ export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
+
+ local myqmakeargs=(
+ --
+ -no-build-qtpdf
+ -printing-and-pdf
+ -system-opus
+ -system-webp
+ $(usex alsa '-alsa' '-no-alsa')
+ $(usex bindist '-no-proprietary-codecs' '-proprietary-codecs')
+ $(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation')
+ $(usex kerberos '-webengine-kerberos' '-no-webengine-kerberos')
+ $(usex pulseaudio '-pulseaudio' '-no-pulseaudio')
+ $(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg')
+ $(usex system-icu '-webengine-icu' '-no-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
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-01-10 9:06 Sam James
0 siblings, 0 replies; 301+ messages in thread
From: Sam James @ 2021-01-10 9:06 UTC (permalink / raw
To: gentoo-commits
commit: f2cbadc95350b827ef9bdbdf998961718c55ddb3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 10 09:05:37 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 10 09:05:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2cbadc9
dev-qt/qtwebengine: Stabilize 5.15.2 amd64, #754852
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.ebuild
index 836b2159693..22dc29bb00a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applic
SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-ppc64.tar.xz )"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm arm64 ~ppc64 x86"
+ KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
fi
IUSE="alsa bindist designer geolocation kerberos pulseaudio +system-ffmpeg +system-icu widgets"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-01-09 21:16 Sam James
0 siblings, 0 replies; 301+ messages in thread
From: Sam James @ 2021-01-09 21:16 UTC (permalink / raw
To: gentoo-commits
commit: c052e2048f78c40b13f3bb556ae61c823d63f86f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 9 21:15:51 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 9 21:16:19 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c052e204
dev-qt/qtwebengine: Stabilize 5.15.2 x86, #754852
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.ebuild
index b5abbe734b3..836b2159693 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applic
SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-ppc64.tar.xz )"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm arm64 ~ppc64 x86"
fi
IUSE="alsa bindist designer geolocation kerberos pulseaudio +system-ffmpeg +system-icu widgets"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2021-01-09 15:15 Sam James
0 siblings, 0 replies; 301+ messages in thread
From: Sam James @ 2021-01-09 15:15 UTC (permalink / raw
To: gentoo-commits
commit: 4b1a5a4d920970f9cdef18959e105fc75c3b8279
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 9 15:15:32 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 9 15:15:32 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b1a5a4d
dev-qt/qtwebengine: Stabilize 5.15.2 arm64, #754852
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.ebuild
index b0f613093dd..b5abbe734b3 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applic
SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-ppc64.tar.xz )"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86"
fi
IUSE="alsa bindist designer geolocation kerberos pulseaudio +system-ffmpeg +system-icu widgets"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2020-11-27 21:50 Georgy Yakovlev
0 siblings, 0 replies; 301+ messages in thread
From: Georgy Yakovlev @ 2020-11-27 21:50 UTC (permalink / raw
To: gentoo-commits
commit: 48caab0321a0c86278bd6caf2b995a52673e6f9c
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 27 21:49:58 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 21:49:58 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48caab03
dev-qt/qtwebengine: prevent git from running in src_prepare on ppc64
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.2.ebuild | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.ebuild
index 4dadfbefc9f..ae2669805a1 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.ebuild
@@ -131,7 +131,11 @@ src_prepare() {
mkdir -vp source/config/linux/ppc64 || die
mkdir -p source/libvpx/test || die
touch source/libvpx/test/test.mk || die
+ # generate_gni.sh runs git at the end of process, prevent it.
+ git() { : ; }
+ export -f git
./generate_gni.sh || die
+ unset git
popd >/dev/null || die
fi
}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2020-11-27 21:50 Georgy Yakovlev
0 siblings, 0 replies; 301+ messages in thread
From: Georgy Yakovlev @ 2020-11-27 21:50 UTC (permalink / raw
To: gentoo-commits
commit: 7313b75ebbc454452aadcee1f84e65dce51eeddd
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 27 21:40:20 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Nov 27 21:41:15 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7313b75e
dev-qt/qtwebengine: refresh ppc64le patch for 5.15.2
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-5.15.2.ebuild | 18 +++++++++++++-----
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 018b4ed98ca..0beead995ee 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,3 +1,4 @@
DIST qtwebengine-5.15.0-ppc64.tar.xz 48156 BLAKE2B 6901b04ca869e6980e7f624000dd292fad2b514d8b1853d2796a11fa0e1b1c3a80f284cc1e3c242133b6886bb56329430229645af1ad8cac927371e3941b9fab SHA512 c2613a8d889bb9d7184a65ab6127c8329a945386f23cb860219b8e161d0a43683fa66f69d8d1441f5920fa370fda7c4629865fa452be9ab8a8b1515e5f93504b
+DIST qtwebengine-5.15.2-ppc64.tar.xz 43868 BLAKE2B 97a2db64c688cc3ce178a6f00c29d3408221302c992bf0df31edd5c11f7cd978b92d9222201644991fca4fc0824b19d994a71c472732dbbdda3729bdd04a67f3 SHA512 835e7da4670cd823a1674052d64971bfd98d54edb6c5df8e9d09aa8103d496a4c16f0eb9d47c46db466e1c640e3326d4e43b284161129d648bfe693a902ec9cc
DIST qtwebengine-everywhere-src-5.15.1.tar.xz 278488056 BLAKE2B f369e435510644b36a7305a1a2b907f09f533f995c0c1a367a801cb9f277f66914f4511f20926ed4c865e9e5ec921c12d4406191706d263320a861250cebb3a0 SHA512 651520fcf89681b06c57f1992223f06ecbe3750a88ffae7a94a339503957e09d327ee1ae7e4bce88bfb09131b3b9c9abfc44f7bccb9c50d286181eaf306991a4
DIST qtwebengine-everywhere-src-5.15.2.tar.xz 280142544 BLAKE2B cf84a07292e69b5746d6575d65295b5bf4e054d448361f26e63cbe20ddd0773f60893e656d74b3b8c191e2829e09398a65896c8d96d3a7ef210ac1f21cd90e63 SHA512 de64c30819f5e2f8620c853ff22b2f9717641477aef4432a552a72d1d67ed62ed61572afee6de3f2c9f32dee28f4f786ffd63fc465aa42c0ae1e87ea28341756
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.2.ebuild
index 7fae6bdb85e..4dadfbefc9f 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2.ebuild
@@ -9,7 +9,7 @@ inherit multiprocessing python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
# patchset based on https://github.com/chromium-ppc64le releases
-SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.0-ppc64.tar.xz )"
+SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-ppc64.tar.xz )"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
@@ -87,10 +87,6 @@ PATCHES=(
)
src_prepare() {
- if use ppc64; then
- eapply "${WORKDIR}/${PN}-ppc64"
- fi
-
# QTBUG-88657 - jumbo-build is broken
#if ! use jumbo-build; then
sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
@@ -126,6 +122,18 @@ src_prepare() {
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 "${WORKDIR}/${PN}-ppc64"
+ 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
+ ./generate_gni.sh || die
+ popd >/dev/null || die
+ fi
}
src_configure() {
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2020-10-18 14:45 Thomas Deutschmann
0 siblings, 0 replies; 301+ messages in thread
From: Thomas Deutschmann @ 2020-10-18 14:45 UTC (permalink / raw
To: gentoo-commits
commit: 2fa3413e45a92a0c58260dc08ba1313a852c400d
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 18 14:41:37 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Oct 18 14:45:14 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fa3413e
dev-qt/qtwebengine: x86 stable (bug #734600)
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.1.ebuild
index 9cd78f243dd..6eb50c9e447 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applic
SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.0-ppc64.tar.xz )"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
fi
IUSE="alsa bindist designer geolocation jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2020-10-12 15:22 Sam James
0 siblings, 0 replies; 301+ messages in thread
From: Sam James @ 2020-10-12 15:22 UTC (permalink / raw
To: gentoo-commits
commit: fc629e3a417cd762bfae958149609564d9beda7f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 15:04:51 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 15:22:35 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc629e3a
dev-qt/qtwebengine: Stabilize 5.15.1 amd64, #734600
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.1.ebuild
index 8d31dcc73ed..9cd78f243dd 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applic
SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.0-ppc64.tar.xz )"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~ppc64 ~x86"
fi
IUSE="alsa bindist designer geolocation jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2020-10-12 11:45 Sam James
0 siblings, 0 replies; 301+ messages in thread
From: Sam James @ 2020-10-12 11:45 UTC (permalink / raw
To: gentoo-commits
commit: a2eca3427d071faf3d267fd7e9e6d419b36c0f6f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 12 11:29:21 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 11:45:37 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2eca342
dev-qt/qtwebengine: Stabilize 5.15.1 arm64, #734600
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.1.ebuild
index 689f6885127..8d31dcc73ed 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applic
SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.0-ppc64.tar.xz )"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86"
fi
IUSE="alsa bindist designer geolocation jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2020-10-10 19:27 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2020-10-10 19:27 UTC (permalink / raw
To: gentoo-commits
commit: 0e313cfdb446c76fe4af167c9b03b20ea4fb222f
Author: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 2 17:35:07 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 10 19:27:04 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e313cfd
dev-qt/qtwebengine: add use default for libvpx dependency
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/17752
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.15.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.1.ebuild
index 2fa0f1bc340..689f6885127 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.1.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
media-libs/lcms:2
media-libs/libjpeg-turbo:=
media-libs/libpng:0=
- >=media-libs/libvpx-1.5:=[svc]
+ >=media-libs/libvpx-1.5:=[svc(+)]
media-libs/libwebp:=
media-libs/mesa[egl,X(+)]
media-libs/opus
^ permalink raw reply related [flat|nested] 301+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2020-09-13 13:40 Thomas Deutschmann
0 siblings, 0 replies; 301+ messages in thread
From: Thomas Deutschmann @ 2020-09-13 13:40 UTC (permalink / raw
To: gentoo-commits
commit: 1928c27bec20c12df7d1a527a8243d8152c39d91
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 13 13:37:42 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Sep 13 13:37:42 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1928c27b
dev-qt/qtwebengine: fix building with >=bison-3.7
Closes: https://bugs.gentoo.org/740580
Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
index ed927baae79..99d5a260ec3 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
@@ -82,6 +82,7 @@ PATCHES=(
"${FILESDIR}/${PN}-5.14.1-disable-fatal-warnings.patch" # bug 695446
"${FILESDIR}/${P}-icu67.patch" # bug 720054
"${FILESDIR}/${P}-gcc-10.patch" # bug 721876
+ "${FILESDIR}/${PN}-5.15.0-bison-3.7-build.patch" # bug 740580
)
src_prepare() {
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2020-05-27 23:20 Georgy Yakovlev
0 siblings, 0 replies; 301+ messages in thread
From: Georgy Yakovlev @ 2020-05-27 23:20 UTC (permalink / raw
To: gentoo-commits
commit: 6872de562364512bc40a98e3a932cfeab3e64d18
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed May 27 22:41:47 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed May 27 23:19:02 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6872de56
dev-qt/qtwebengine: update metadata.xml
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/15982
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
dev-qt/qtwebengine/metadata.xml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index 180beb2cfc8..ea633503ac7 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -5,6 +5,11 @@
<email>qt@gentoo.org</email>
<name>Gentoo Qt Project</name>
</maintainer>
+ <maintainer type="person">
+ <description>ppc64 patchset maintainer</description>
+ <email>gyakovlev@gentoo.org</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>
^ permalink raw reply related [flat|nested] 301+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2020-05-27 23:20 Georgy Yakovlev
0 siblings, 0 replies; 301+ messages in thread
From: Georgy Yakovlev @ 2020-05-27 23:20 UTC (permalink / raw
To: gentoo-commits
commit: ad3dd068e31ba548ef3fa46e637d7c676deccbf4
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed May 27 01:46:34 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed May 27 23:18:58 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad3dd068
dev-qt/qtwebengine: add ~ppc64 keyword and patchset
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Acked-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Reviewed-by: Davide Pesavento <pesa <AT> gentoo.org>
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-5.15.0.ebuild | 9 ++++++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 54ede5508f3..e74e7044864 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,3 +1,4 @@
+DIST qtwebengine-5.15.0-ppc64.tar.xz 48156 BLAKE2B 6901b04ca869e6980e7f624000dd292fad2b514d8b1853d2796a11fa0e1b1c3a80f284cc1e3c242133b6886bb56329430229645af1ad8cac927371e3941b9fab SHA512 c2613a8d889bb9d7184a65ab6127c8329a945386f23cb860219b8e161d0a43683fa66f69d8d1441f5920fa370fda7c4629865fa452be9ab8a8b1515e5f93504b
DIST qtwebengine-everywhere-src-5.14.1.tar.xz 242438244 BLAKE2B d24210b2e04522b27409cc5ccfe722114f711c1c5e9aaff76882c178b0c455b475b90fd2acd5f7ba4f5dfba85c228c4baf2c231d3661eadf83e984d7e7b9e30f SHA512 fafa2fbc789941e837e35945857a6da00e73bd2abe512290674b9957719b998d8b8b95a35c709a171c9d0d111e6f418cec630dfcdbe47ecbae25a3b94e4c99f9
DIST qtwebengine-everywhere-src-5.14.2.tar.xz 242467568 BLAKE2B 2b69af846d9f6b1b1bd6380f56868e7fe86c88baf00e4b596e6a825d636472f837c1fc3b9ed41182dcc20dc0ba03360182aba39aee4adca66f407a8346f90fbf SHA512 bcfd9ece04bdbfded5272ce1b3ab482e88349b1f5c5a071f58f6e66fcb9604d1fc38fe909ae3d9631bdf0bf7c081d7590620c3388f1a577b5236f68b084699bf
DIST qtwebengine-everywhere-src-5.15.0.tar.xz 278257432 BLAKE2B 832b15a0a542297f47ecaa057f29e24eb99dd142b314aa15243d864b715c74ec9dfc2ba23aa9be417581151d684d08dfcba173ea2d9311e19ca7af3d941f590b SHA512 11983470f0da9abfffba072406b2c67b475d8cf65412fdcfd925758e2a9449f509780e5b1001fb6868445c2c9540e5aa0e754954b70f1795b47335bad7c749b2
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.0.ebuild
index 92d70124554..eb31e0dc68f 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.0.ebuild
@@ -8,8 +8,11 @@ inherit multiprocessing python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
+# patchset based on https://github.com/chromium-ppc64le releases
+SRC_URI+=" ppc64? ( https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.0-ppc64.tar.xz )"
+
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
fi
IUSE="alsa bindist designer geolocation jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets"
@@ -85,6 +88,10 @@ PATCHES=(
)
src_prepare() {
+ if use ppc64; then
+ eapply "${WORKDIR}/${PN}-ppc64"
+ fi
+
if ! use jumbo-build; then
sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
src/buildtools/config/common.pri || die
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2020-05-20 13:32 Mikle Kolyada
0 siblings, 0 replies; 301+ messages in thread
From: Mikle Kolyada @ 2020-05-20 13:32 UTC (permalink / raw
To: gentoo-commits
commit: 6c6a8c483ec234a4d1f686377b27e7a3a8b8c72e
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Wed May 20 13:31:29 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Wed May 20 13:31:29 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c6a8c48
dev-qt/qtwebengine: arm64 stable wrt bug #719732
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="arm64"
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
index d633e6f892f..ed927baae79 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
@@ -9,7 +9,7 @@ inherit multiprocessing python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
+ KEYWORDS="amd64 ~arm arm64 x86"
fi
IUSE="alsa bindist designer geolocation jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2020-05-20 9:50 Mikle Kolyada
0 siblings, 0 replies; 301+ messages in thread
From: Mikle Kolyada @ 2020-05-20 9:50 UTC (permalink / raw
To: gentoo-commits
commit: aa12ce36f76e1305279eed1383b12093e0f7292a
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Wed May 20 09:49:48 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Wed May 20 09:49:48 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa12ce36
dev-qt/qtwebengine: x86 stable wrt bug #719732
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
index 9d16901a20d..d633e6f892f 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
@@ -9,7 +9,7 @@ inherit multiprocessing python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
IUSE="alsa bindist designer geolocation jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2020-05-19 19:32 Mikle Kolyada
0 siblings, 0 replies; 301+ messages in thread
From: Mikle Kolyada @ 2020-05-19 19:32 UTC (permalink / raw
To: gentoo-commits
commit: 80d230e6d6b4c6384a891ff4e7faca37deb05948
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue May 19 19:31:18 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue May 19 19:31:18 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80d230e6
dev-qt/qtwebengine: amd64 stable wrt bug #719732
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
index e063003ad5a..9d16901a20d 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
@@ -9,7 +9,7 @@ inherit multiprocessing python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~x86"
fi
IUSE="alsa bindist designer geolocation jumbo-build kerberos pulseaudio +system-ffmpeg +system-icu widgets"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2020-04-29 18:09 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2020-04-29 18:09 UTC (permalink / raw
To: gentoo-commits
commit: e89598d59927472104961d95b69d9be13f97e236
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sun Apr 26 12:57:02 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr 29 18:08:25 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e89598d5
dev-qt/qtwebengine: Fix using generated headers
Closes: https://bugs.gentoo.org/717122
Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
index 029e99a265a..a834319edbc 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.14.2.ebuild
@@ -91,7 +91,8 @@ src_prepare() {
-i src/3rdparty/chromium/tools/gn/bootstrap/bootstrap.py || die
# bug 620444 - ensure local headers are used
- find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
+ 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.
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2020-03-28 10:03 Mart Raudsepp
0 siblings, 0 replies; 301+ messages in thread
From: Mart Raudsepp @ 2020-03-28 10:03 UTC (permalink / raw
To: gentoo-commits
commit: a419842b2fce52e0199d799f9a4732aa02ce73e5
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 28 09:14:04 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Mar 28 10:03:14 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a419842b
dev-qt/qtwebengine: arm64 stable (bug #699328)
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild
index 601e198c642..4706adab319 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild
@@ -9,7 +9,7 @@ inherit multiprocessing python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
+ KEYWORDS="amd64 ~arm arm64 x86"
fi
IUSE="alsa bindist designer geolocation jumbo-build pulseaudio +system-ffmpeg +system-icu widgets"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2020-03-19 13:15 Agostino Sarubbo
0 siblings, 0 replies; 301+ messages in thread
From: Agostino Sarubbo @ 2020-03-19 13:15 UTC (permalink / raw
To: gentoo-commits
commit: 49614e125a87b513dba48901e203d636813b598d
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 19 13:15:30 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Mar 19 13:15:30 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49614e12
dev-qt/qtwebengine: x86 stable wrt bug #699328
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild
index 152ddf124a3..4579f329664 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild
@@ -9,7 +9,7 @@ inherit multiprocessing python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
IUSE="alsa bindist designer geolocation jumbo-build pulseaudio +system-ffmpeg +system-icu widgets"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2020-03-19 12:46 Agostino Sarubbo
0 siblings, 0 replies; 301+ messages in thread
From: Agostino Sarubbo @ 2020-03-19 12:46 UTC (permalink / raw
To: gentoo-commits
commit: 1a9c80965ea3ff38e2ed17af18d5f14b7a21852d
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 19 12:45:34 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Mar 19 12:45:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a9c8096
dev-qt/qtwebengine: amd64 stable wrt bug #699328
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild
index 92e75c3c12e..152ddf124a3 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild
@@ -9,7 +9,7 @@ inherit multiprocessing python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~x86"
fi
IUSE="alsa bindist designer geolocation jumbo-build pulseaudio +system-ffmpeg +system-icu widgets"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2020-02-10 6:52 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2020-02-10 6:52 UTC (permalink / raw
To: gentoo-commits
commit: 23fe04e8b4e04658c111b418a8fb11ed7a8f6b43
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 29 22:47:30 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 10 06:52:42 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23fe04e8
dev-qt/qtwebengine: Re-add USE geolocation
Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Jimi Huotari <chiitoo <AT> gentoo.org>
(cherry picked from commit 7064af6a1dceefb550fcc9c43ba9ccfbff2c5187)
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild
index 1152cf4edeb..92e75c3c12e 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
-IUSE="alsa bindist designer jumbo-build pulseaudio +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer geolocation jumbo-build pulseaudio +system-ffmpeg +system-icu widgets"
REQUIRED_USE="designer? ( widgets )"
RDEPEND="
@@ -24,7 +24,6 @@ RDEPEND="
~dev-qt/qtdeclarative-${PV}
~dev-qt/qtgui-${PV}
~dev-qt/qtnetwork-${PV}
- ~dev-qt/qtpositioning-${PV}
~dev-qt/qtprintsupport-${PV}
~dev-qt/qtwebchannel-${PV}[qml]
dev-libs/expat
@@ -60,6 +59,7 @@ RDEPEND="
x11-libs/libXtst
alsa? ( media-libs/alsa-lib )
designer? ( ~dev-qt/designer-${PV} )
+ geolocation? ( ~dev-qt/qtpositioning-${PV} )
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
system-icu? ( >=dev-libs/icu-60.2:= )
@@ -106,14 +106,15 @@ src_configure() {
local myqmakeargs=(
--
- -opus
-printing-and-pdf
- -webp
- $(usex alsa '-alsa' '')
- $(usex bindist '' '-proprietary-codecs')
- $(usex pulseaudio '-pulseaudio' '')
- $(usex system-ffmpeg '-ffmpeg' '')
- $(usex system-icu '-webengine-icu' '')
+ -system-opus
+ -system-webp
+ $(usex alsa '-alsa' '-no-alsa')
+ $(usex bindist '-no-proprietary-codecs' '-proprietary-codecs')
+ $(usex geolocation '-webengine-geolocation' '-no-webengine-geolocation')
+ $(usex pulseaudio '-pulseaudio' '-no-pulseaudio')
+ $(usex system-ffmpeg '-system-ffmpeg' '-qt-ffmpeg')
+ $(usex system-icu '-webengine-icu' '-no-webengine-icu')
)
qt5-build_src_configure
}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2020-02-08 13:25 Mikle Kolyada
0 siblings, 0 replies; 301+ messages in thread
From: Mikle Kolyada @ 2020-02-08 13:25 UTC (permalink / raw
To: gentoo-commits
commit: 3580f0f4d02d957343df05fb5d5de700ba9f4a9b
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 8 13:24:23 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Feb 8 13:25:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3580f0f4
dev-qt/qtwebengine: arm stable wrt bug #699240
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
index 0f097f91df8..3a69fc34880 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -8,7 +8,7 @@ inherit multiprocessing pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm arm64 ~x86"
+ KEYWORDS="amd64 arm arm64 ~x86"
fi
IUSE="alsa bindist designer jumbo-build pax_kernel pulseaudio
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2020-01-15 22:02 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2020-01-15 22:02 UTC (permalink / raw
To: gentoo-commits
commit: c479b013151c5901f11baa6cf9adc16a256a9fab
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 15 21:55:20 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 15 21:55:20 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c479b013
dev-qt/qtwebengine: 5.12.3: Use pulseaudio-13 patch from 5.12.5
Tested-by: Douglas Paul <doug-gentoo <AT> bogon.ca>
Closes: https://bugs.gentoo.org/705434
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
index 89678ac41d1..f79b8784315 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
@@ -82,6 +82,7 @@ DEPEND="${RDEPEND}
PATCHES+=(
"${FILESDIR}/${PN}-5.12.0-nouveau-disable-gpu.patch" # bug 609752
+ "${FILESDIR}/${PN}-5.12.5-pulseaudio-13.patch" # bug 694960, 705434
"${FILESDIR}/${PN}-5.12.5-icu-65.patch"
)
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2020-01-12 9:41 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2020-01-12 9:41 UTC (permalink / raw
To: gentoo-commits
commit: b7c17aee4baab33d284f1f2b8190dbde5ce76be5
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 12 09:20:38 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jan 12 09:41:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7c17aee
dev-qt/qtwebengine: 5.12.3: Use ICU-65 patch from 5.12.5
Reported-by: Thomas Deutschmann <whissi <AT> gentoo.org>
Closes: https://bugs.gentoo.org/705180
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
index 42855d0017a..89678ac41d1 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -82,6 +82,7 @@ DEPEND="${RDEPEND}
PATCHES+=(
"${FILESDIR}/${PN}-5.12.0-nouveau-disable-gpu.patch" # bug 609752
+ "${FILESDIR}/${PN}-5.12.5-icu-65.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2019-12-22 16:29 Aaron Bauman
0 siblings, 0 replies; 301+ messages in thread
From: Aaron Bauman @ 2019-12-22 16:29 UTC (permalink / raw
To: gentoo-commits
commit: 4e218242802f1ab6d7551fd9194cade1c7c901ec
Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 22 16:24:02 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun Dec 22 16:29:27 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e218242
dev-qt/qtwebengine: arm64 stable (bug #699240)
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
Package-Manager: Portage-2.3.82, Repoman-2.3.20
dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
index e2b6c3c5783..0f097f91df8 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
@@ -8,7 +8,7 @@ inherit multiprocessing pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~x86"
fi
IUSE="alsa bindist designer jumbo-build pax_kernel pulseaudio
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2019-12-18 11:23 Agostino Sarubbo
0 siblings, 0 replies; 301+ messages in thread
From: Agostino Sarubbo @ 2019-12-18 11:23 UTC (permalink / raw
To: gentoo-commits
commit: a957153a62d794f82f37777e638413012a16daf0
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 18 11:22:40 2019 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Dec 18 11:22:40 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a957153a
dev-qt/qtwebengine: amd64 stable wrt bug #699240
Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
index d1ab4b2fa14..e2b6c3c5783 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
@@ -8,7 +8,7 @@ inherit multiprocessing pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~x86"
fi
IUSE="alsa bindist designer jumbo-build pax_kernel pulseaudio
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2019-11-12 15:01 Aaron Bauman
0 siblings, 0 replies; 301+ messages in thread
From: Aaron Bauman @ 2019-11-12 15:01 UTC (permalink / raw
To: gentoo-commits
commit: ac1c1ffb4f4f56d30dad31a6372c51a395de6ef0
Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 12 14:57:05 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue Nov 12 15:00:53 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac1c1ffb
dev-qt/qtwebengine: arm64 stable (bug #691738)
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
Package-Manager: Portage-2.3.79, Repoman-2.3.18
dev-qt/qtwebengine/qtwebengine-5.12.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.5.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.5.ebuild
index f646cfa81f9..f1ee561f344 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.5.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.5.ebuild
@@ -8,7 +8,7 @@ inherit multiprocessing pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~x86"
fi
IUSE="alsa bindist designer jumbo-build pax_kernel pulseaudio
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2019-10-20 16:10 Mikle Kolyada
0 siblings, 0 replies; 301+ messages in thread
From: Mikle Kolyada @ 2019-10-20 16:10 UTC (permalink / raw
To: gentoo-commits
commit: cc5d4a1a3f99bb40759c74df20f7e276001cf640
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 20 16:09:15 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Oct 20 16:09:15 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc5d4a1a
dev-qt/qtwebengine: amd64 stable wrt bug #691738
Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.12.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.5.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.5.ebuild
index e2ece0cda96..7809c2d12c0 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.5.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.5.ebuild
@@ -8,7 +8,7 @@ inherit multiprocessing pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~x86"
fi
IUSE="alsa bindist designer jumbo-build pax_kernel pulseaudio
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2019-05-24 20:48 Aaron Bauman
0 siblings, 0 replies; 301+ messages in thread
From: Aaron Bauman @ 2019-05-24 20:48 UTC (permalink / raw
To: gentoo-commits
commit: fcd9a8801d4b70f7889d4150d8bd3e678fcc25a9
Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Fri May 24 20:33:50 2019 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri May 24 20:47:56 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fcd9a880
dev-qt/qtwebengine: arm64 stable
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.12
RepoMan-Options: --include-arches="arm64"
dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
index d0131e42fb5..d2e02e66be2 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit multiprocessing pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm ~arm64 x86"
+ KEYWORDS="amd64 arm arm64 x86"
fi
IUSE="alsa bindist designer geolocation jumbo-build pax_kernel pulseaudio
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2019-05-23 13:20 Mikle Kolyada
0 siblings, 0 replies; 301+ messages in thread
From: Mikle Kolyada @ 2019-05-23 13:20 UTC (permalink / raw
To: gentoo-commits
commit: bdf7c591716b6f006ee5e8b4354eea8db775617f
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Thu May 23 13:19:57 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Thu May 23 13:19:57 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdf7c591
dev-qt/qtwebengine: arm stable wrt bug #685260
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="arm"
dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
index 893d775d8ce..d0131e42fb5 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit multiprocessing pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
+ KEYWORDS="amd64 arm ~arm64 x86"
fi
IUSE="alsa bindist designer geolocation jumbo-build pax_kernel pulseaudio
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2019-05-21 20:50 Mikle Kolyada
0 siblings, 0 replies; 301+ messages in thread
From: Mikle Kolyada @ 2019-05-21 20:50 UTC (permalink / raw
To: gentoo-commits
commit: d6f950f8bc023d5aec047582df7caada208ba85a
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue May 21 20:48:36 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue May 21 20:50:37 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6f950f8
dev-qt/qtwebengine: x86 stable wrt bug #685260
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="x86"
dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
index 0295bb8e9b4..893d775d8ce 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit multiprocessing pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
IUSE="alsa bindist designer geolocation jumbo-build pax_kernel pulseaudio
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2019-05-21 15:03 Mikle Kolyada
0 siblings, 0 replies; 301+ messages in thread
From: Mikle Kolyada @ 2019-05-21 15:03 UTC (permalink / raw
To: gentoo-commits
commit: 3fee7f4a51524b2a5a6c27738f4fcf3b55da7790
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue May 21 15:01:25 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue May 21 15:01:25 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fee7f4a
dev-qt/qtwebengine: amd64 stable wrt bug #685260
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"
dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
index 1dc84dc7c80..0295bb8e9b4 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
@@ -8,7 +8,7 @@ inherit multiprocessing pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~x86"
fi
IUSE="alsa bindist designer geolocation jumbo-build pax_kernel pulseaudio
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2019-04-26 17:51 Anthony G. Basile
0 siblings, 0 replies; 301+ messages in thread
From: Anthony G. Basile @ 2019-04-26 17:51 UTC (permalink / raw
To: gentoo-commits
commit: 62e2b2ad1a3676a82b00e32da874baba36b008f2
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 26 17:44:18 2019 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Apr 26 17:44:18 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62e2b2ad
dev-qt/qtwebengine: stable on arm
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild
index 9b56288c128..1d40ca8178b 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild
@@ -8,7 +8,7 @@ inherit multiprocessing pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 x86"
+ KEYWORDS="amd64 arm ~arm64 x86"
fi
IUSE="alsa bindist designer geolocation +jumbo-build pax_kernel pulseaudio
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2019-04-25 2:32 Michael Palimaka
0 siblings, 0 replies; 301+ messages in thread
From: Michael Palimaka @ 2019-04-25 2:32 UTC (permalink / raw
To: gentoo-commits
commit: 338b50dea17865a694592881b3ba51531ebfe8d4
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 25 02:31:40 2019 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Apr 25 02:31:51 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=338b50de
dev-qt/qtwebengine: remove unused dependency
Closes: https://bugs.gentoo.org/610836
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
index 262c3dcd7ec..1dc84dc7c80 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
@@ -43,7 +43,6 @@ RDEPEND="
media-libs/opus
sys-apps/dbus
sys-apps/pciutils
- sys-libs/libcap
sys-libs/zlib[minizip]
virtual/libudev
x11-libs/libdrm
^ permalink raw reply related [flat|nested] 301+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2019-04-24 20:15 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2019-04-24 20:15 UTC (permalink / raw
To: gentoo-commits
commit: 1a5727aa51c8d2ad854de6ce4972eab98b6d7a14
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 24 20:12:34 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Apr 24 20:14:38 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a5727aa
dev-qt/qtwebengine: Block broken sys-devel/binutils-2.31.1-r5
Thanks-to: Arfrever Frehtes Taifersar Arahesis <arfrever.fta <AT> gmail.com>
Closes: https://bugs.gentoo.org/683794
Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
index 8541b566a52..262c3dcd7ec 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
@@ -77,6 +77,7 @@ DEPEND="${RDEPEND}
dev-util/re2c
sys-devel/bison
pax_kernel? ( sys-apps/elfix )
+ !!=sys-devel/binutils-2.31.1-r5
!!=sys-devel/binutils-2.32-r0
"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2019-02-10 23:46 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2019-02-10 23:46 UTC (permalink / raw
To: gentoo-commits
commit: 331e523d220c6fad10ceb0aa8038719933cdb2b9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 10 23:10:42 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 10 23:45:56 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=331e523d
dev-qt/qtwebengine: Restrict to <media-libs/libvpx-1.8
Bug: https://bugs.gentoo.org/677612
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild
index d61f504ee12..9b56288c128 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild
@@ -38,6 +38,7 @@ RDEPEND="
media-libs/libjpeg-turbo:=
media-libs/libpng:0=
>=media-libs/libvpx-1.5:=[svc]
+ <media-libs/libvpx-1.8
media-libs/libwebp:=
media-libs/mesa[egl]
media-libs/opus
^ permalink raw reply related [flat|nested] 301+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2019-01-09 10:40 Mikle Kolyada
0 siblings, 0 replies; 301+ messages in thread
From: Mikle Kolyada @ 2019-01-09 10:40 UTC (permalink / raw
To: gentoo-commits
commit: cee466bbb7eb7e485a1cfe8338e18fae889d771e
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 9 10:38:52 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Wed Jan 9 10:38:52 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cee466bb
dev-qt/qtwebengine: x86 stable wrt bug #670864
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild
index 350f9747039..d61f504ee12 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild
@@ -8,7 +8,7 @@ inherit multiprocessing pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
IUSE="alsa bindist designer geolocation +jumbo-build pax_kernel pulseaudio
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2019-01-09 10:32 Mikle Kolyada
0 siblings, 0 replies; 301+ messages in thread
From: Mikle Kolyada @ 2019-01-09 10:32 UTC (permalink / raw
To: gentoo-commits
commit: c96da0ca7413f760f90541027e385fd3c46967d2
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 9 10:31:03 2019 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Wed Jan 9 10:31:03 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c96da0ca
dev-qt/qtwebengine: amd64 stable wrt bug #670864
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild
index ea4481da33d..350f9747039 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,7 +8,7 @@ inherit multiprocessing pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~x86"
fi
IUSE="alsa bindist designer geolocation +jumbo-build pax_kernel pulseaudio
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2018-11-13 11:32 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2018-11-13 11:32 UTC (permalink / raw
To: gentoo-commits
commit: 19cf4c4fde46c3c327067f687f62697fc69d140b
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 13 11:14:40 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 13 11:32:43 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19cf4c4f
dev-qt/qtwebengine: Add missing DEPEND
Bug: https://bugs.gentoo.org/669642
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild
index 90eb3ad2944..503918439e7 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild
@@ -34,6 +34,7 @@ RDEPEND="
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]
^ permalink raw reply related [flat|nested] 301+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2018-10-24 18:06 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2018-10-24 18:06 UTC (permalink / raw
To: gentoo-commits
commit: f299cadc4f9b84476599a4f561ff3588071600a1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 24 18:06:08 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 24 18:06:08 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f299cadc
dev-qt/qtwebengine: Fix x86 build with GCC-8 (again)
Closes: https://bugs.gentoo.org/657124
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild
index a057c51763d..57fa9ada481 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild
@@ -79,6 +79,7 @@ DEPEND="${RDEPEND}
"
PATCHES+=(
+ "${FILESDIR}/${PN}-5.9.6-gcc8.patch" # bug 657124
"${FILESDIR}/${PN}-5.11.1-nouveau-disable-gpu.patch" # bug 609752
)
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2018-10-19 7:53 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2018-10-19 7:53 UTC (permalink / raw
To: gentoo-commits
commit: 02c290ff4b1be7ce630c83ba62f3b562aaaf2c24
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 19 07:34:56 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct 19 07:53:36 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02c290ff
dev-qt/qtwebengine: Re-drop net-libs/libsrtp DEPEND
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild
index 663539e4d9b..a057c51763d 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild
@@ -40,7 +40,6 @@ RDEPEND="
media-libs/libwebp:=
media-libs/mesa[egl]
media-libs/opus
- net-libs/libsrtp:0=
sys-apps/dbus
sys-apps/pciutils
sys-libs/libcap
^ permalink raw reply related [flat|nested] 301+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2018-10-17 22:21 Thomas Deutschmann
0 siblings, 0 replies; 301+ messages in thread
From: Thomas Deutschmann @ 2018-10-17 22:21 UTC (permalink / raw
To: gentoo-commits
commit: 6966302260c66f6e0a1f7bc8ba1beedcde718e02
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 17 22:13:35 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Oct 17 22:21:30 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69663022
dev-qt/qtwebengine: x86 stable (bug #664566)
Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
index e79f7713825..ba8cd487b93 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
@@ -8,7 +8,7 @@ inherit multiprocessing pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
IUSE="alsa bindist designer geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2018-10-16 16:09 Mikle Kolyada
0 siblings, 0 replies; 301+ messages in thread
From: Mikle Kolyada @ 2018-10-16 16:09 UTC (permalink / raw
To: gentoo-commits
commit: 01fb131871b6e7afb7f2e45c6f2cb270334065cd
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 16 16:07:27 2018 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue Oct 16 16:09:24 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01fb1318
dev-qt/qtwebengine: amd64 stable wrt bug #664566
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11
dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
index fc11c5106e8..e79f7713825 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,7 +8,7 @@ inherit multiprocessing pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~x86"
fi
IUSE="alsa bindist designer geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2018-09-13 17:28 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2018-09-13 17:28 UTC (permalink / raw
To: gentoo-commits
commit: bea0a42f4ba3826e34eaa817abf0cd2f6bc4786e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 13 17:27:21 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep 13 17:28:01 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bea0a42f
dev-qt/qtwebengine: Drop net-libs/libsrtp DEPEND
It is currently not supported to unbundle from chromium source.
Package-Manager: Portage-2.3.49, Repoman-2.3.10
dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
index ba14ab9efae..fc11c5106e8 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
@@ -39,7 +39,6 @@ RDEPEND="
media-libs/libwebp:=
media-libs/mesa[egl]
media-libs/opus
- net-libs/libsrtp:0=
sys-apps/dbus
sys-apps/pciutils
sys-libs/libcap
^ permalink raw reply related [flat|nested] 301+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2018-07-15 16:13 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2018-07-15 16:13 UTC (permalink / raw
To: gentoo-commits
commit: 4775614739e2f47136a32c7cbf7c1ce0f7d0a9a1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 15 11:37:43 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jul 15 16:11:41 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47756147
dev-qt/qtwebengine: Raise system-icu dependency to >=ICU-60.2
Closes: https://bugs.gentoo.org/660418
Package-Manager: Portage-2.3.41, Repoman-2.3.9
dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
index b1eb5634dd5..ba14ab9efae 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
@@ -62,7 +62,7 @@ RDEPEND="
geolocation? ( ~dev-qt/qtpositioning-${PV} )
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
- system-icu? ( dev-libs/icu:= )
+ system-icu? ( >=dev-libs/icu-60.2:= )
widgets? (
~dev-qt/qtdeclarative-${PV}[widgets]
~dev-qt/qtwidgets-${PV}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2018-07-15 14:23 Thomas Deutschmann
0 siblings, 0 replies; 301+ messages in thread
From: Thomas Deutschmann @ 2018-07-15 14:23 UTC (permalink / raw
To: gentoo-commits
commit: e95c3ce65bd7ed0f56be6b04d40d1b5dbe86cf2b
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 15 14:10:30 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 15 14:20:54 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e95c3ce6
dev-qt/qtwebengine: x86 stable (bug #655664)
Package-Manager: Portage-2.3.42, Repoman-2.3.9
dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild
index a8c75e67834..aa584285a43 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild
@@ -8,7 +8,7 @@ inherit multiprocessing pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
IUSE="alsa bindist designer geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2018-07-13 13:41 Mikle Kolyada
0 siblings, 0 replies; 301+ messages in thread
From: Mikle Kolyada @ 2018-07-13 13:41 UTC (permalink / raw
To: gentoo-commits
commit: e92e4fa6438c62402a8f5faaf7b65e5662cbcd1e
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 13 13:40:00 2018 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Fri Jul 13 13:41:44 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e92e4fa6
dev-qt/qtwebengine: amd64 stable wrt bug #655664
Package-Manager: Portage-2.3.40, Repoman-2.3.9
dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild
index 2d2d8d59074..a8c75e67834 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild
@@ -8,7 +8,7 @@ inherit multiprocessing pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~x86"
fi
IUSE="alsa bindist designer geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2018-07-12 10:38 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2018-07-12 10:38 UTC (permalink / raw
To: gentoo-commits
commit: 788a887f418635c64ef058b12f541601363c3321
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 7 08:39:50 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 12 09:59:31 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=788a887f
dev-qt/qtwebengine: Drop unused dependency
(Unfortunately) it currently uses chromium's bundled protobuf.
Thanks-to: Arfrever Frehtes Taifersar Arahesis <arfrever.fta <AT> gmail.com>
Bug: https://bugs.gentoo.org/660586
Package-Manager: Portage-2.3.41, Repoman-2.3.9
dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild | 1 -
dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild | 1 -
2 files changed, 2 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
index 495c4d06013..b1eb5634dd5 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
@@ -29,7 +29,6 @@ RDEPEND="
dev-libs/libevent:=
dev-libs/libxml2[icu]
dev-libs/libxslt
- dev-libs/protobuf:=
dev-libs/re2:=
media-libs/fontconfig
media-libs/freetype
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild
index d68b02f9d10..2d2d8d59074 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild
@@ -29,7 +29,6 @@ RDEPEND="
dev-libs/libevent:=
dev-libs/libxml2[icu]
dev-libs/libxslt
- dev-libs/protobuf:=
dev-libs/re2:=
media-libs/fontconfig
media-libs/freetype
^ permalink raw reply related [flat|nested] 301+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2018-07-12 10:38 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2018-07-12 10:38 UTC (permalink / raw
To: gentoo-commits
commit: 73383dc2a1ffffc09f6e3fa612718929e904f030
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 6 20:35:37 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 12 09:59:28 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73383dc2
dev-qt/qtwebengine: Restrict to <ffmpeg-4
Closes: https://bugs.gentoo.org/654744
Package-Manager: Portage-2.3.41, Repoman-2.3.9
dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild
index 4c3fa54cc2c..d68b02f9d10 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild
@@ -62,7 +62,7 @@ RDEPEND="
designer? ( ~dev-qt/designer-${PV} )
geolocation? ( ~dev-qt/qtpositioning-${PV} )
pulseaudio? ( media-sound/pulseaudio:= )
- system-ffmpeg? ( media-video/ffmpeg:0= )
+ system-ffmpeg? ( <media-video/ffmpeg-4:0= )
system-icu? ( dev-libs/icu:= )
widgets? (
~dev-qt/qtdeclarative-${PV}[widgets]
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2018-06-27 19:00 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2018-06-27 19:00 UTC (permalink / raw
To: gentoo-commits
commit: 600c333f7d330ad6896a0463e1faa3cf406743a1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 26 13:44:58 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 27 19:00:20 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=600c333f
dev-qt/qtwebengine: Drop 5.9.6 (r0)
Package-Manager: Portage-2.3.40, Repoman-2.3.9
dev-qt/qtwebengine/qtwebengine-5.9.6.ebuild | 130 ----------------------------
1 file changed, 130 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.6.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.6.ebuild
deleted file mode 100644
index 0ee631f3821..00000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.9.6.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit multiprocessing pax-utils python-any-r1 qt5-build
-
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-IUSE="alsa bindist designer geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
-REQUIRED_USE="designer? ( widgets )"
-
-RDEPEND="
- app-arch/snappy:=
- dev-libs/glib:2
- dev-libs/nspr
- dev-libs/nss
- ~dev-qt/qtcore-${PV}
- ~dev-qt/qtdeclarative-${PV}
- ~dev-qt/qtgui-${PV}
- ~dev-qt/qtnetwork-${PV}
- ~dev-qt/qtprintsupport-${PV}
- ~dev-qt/qtwebchannel-${PV}[qml]
- dev-libs/expat
- dev-libs/libevent:=
- dev-libs/libxml2[icu]
- dev-libs/libxslt
- dev-libs/protobuf:=
- dev-libs/re2:=
- media-libs/fontconfig
- media-libs/freetype
- media-libs/harfbuzz:=
- media-libs/libpng:0=
- >=media-libs/libvpx-1.5:=[svc]
- media-libs/libwebp:=
- media-libs/mesa
- media-libs/opus
- net-libs/libsrtp:0=
- sys-apps/dbus
- sys-apps/pciutils
- sys-libs/libcap
- sys-libs/zlib[minizip]
- virtual/jpeg:0
- 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/libXrandr
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libXtst
- alsa? ( media-libs/alsa-lib )
- designer? ( ~dev-qt/designer-${PV} )
- geolocation? ( ~dev-qt/qtpositioning-${PV} )
- pulseaudio? ( media-sound/pulseaudio:= )
- system-ffmpeg? ( media-video/ffmpeg:0= )
- system-icu? ( dev-libs/icu:= )
- widgets? (
- ~dev-qt/qtdeclarative-${PV}[widgets]
- ~dev-qt/qtwidgets-${PV}
- )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- >=app-arch/gzip-1.7
- dev-util/gperf
- dev-util/ninja
- dev-util/re2c
- sys-devel/bison
- pax_kernel? ( sys-apps/elfix )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.9.4-jpeg-9-1.patch"
- "${FILESDIR}/${PN}-5.9.4-jpeg-9-2.patch"
- "${FILESDIR}/${PN}-5.9.6-gcc8.patch" # bug 657124
-)
-
-src_prepare() {
- use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
-
- # bug 620444 - ensure local headers are used
- find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
-
- qt_use_disable_config alsa alsa src/core/config/linux.pri
- qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri
-
- qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
-
- qt_use_disable_mod geolocation positioning \
- mkspecs/features/configure.prf \
- src/core/core_chromium.pri \
- src/core/core_common.pri
-
- 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) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
-
- local myqmakeargs=(
- $(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
- $(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '')
- $(usex system-icu 'WEBENGINE_CONFIG+=use_system_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
-
- pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2018-06-27 19:00 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2018-06-27 19:00 UTC (permalink / raw
To: gentoo-commits
commit: d88e48c5c2b63f9ad50d86329e8cae481d99ff97
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 26 13:40:47 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 27 19:00:20 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d88e48c5
dev-qt/qtwebengine: Disable GPU when using nouveau
Kindly borrowed from opensuse
(disable-gpu-when-using-nouveau-boo-1005323.diff).
Bug: https://bugs.gentoo.org/609752
Bug: https://bugs.gentoo.org/609752
Package-Manager: Portage-2.3.40, Repoman-2.3.9
dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild
index 321ce8a986d..4c3fa54cc2c 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild
@@ -83,6 +83,7 @@ PATCHES=(
"${FILESDIR}/${PN}-5.9.4-jpeg-9-1.patch"
"${FILESDIR}/${PN}-5.9.4-jpeg-9-2.patch"
"${FILESDIR}/${PN}-5.9.6-gcc8.patch" # bug 657124
+ "${FILESDIR}/${PN}-5.11.1-nouveau-disable-gpu.patch" # bug 609752
)
src_prepare() {
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2018-06-27 19:00 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2018-06-27 19:00 UTC (permalink / raw
To: gentoo-commits
commit: 727b37cf3827dfefdcc0202160f6d19b9a9c2350
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 26 13:33:54 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 27 19:00:20 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=727b37cf
dev-qt/qtwebengine: Add missing mesa[egl] use dep
Package-Manager: Portage-2.3.40, Repoman-2.3.9
dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild | 130 +++++++++++++++++++++++++
1 file changed, 130 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild
new file mode 100644
index 00000000000..321ce8a986d
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.6-r1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+inherit multiprocessing pax-utils python-any-r1 qt5-build
+
+DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+IUSE="alsa bindist designer geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
+REQUIRED_USE="designer? ( widgets )"
+
+RDEPEND="
+ app-arch/snappy:=
+ dev-libs/glib:2
+ dev-libs/nspr
+ dev-libs/nss
+ ~dev-qt/qtcore-${PV}
+ ~dev-qt/qtdeclarative-${PV}
+ ~dev-qt/qtgui-${PV}
+ ~dev-qt/qtnetwork-${PV}
+ ~dev-qt/qtprintsupport-${PV}
+ ~dev-qt/qtwebchannel-${PV}[qml]
+ dev-libs/expat
+ dev-libs/libevent:=
+ dev-libs/libxml2[icu]
+ dev-libs/libxslt
+ dev-libs/protobuf:=
+ dev-libs/re2:=
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/harfbuzz:=
+ media-libs/libpng:0=
+ >=media-libs/libvpx-1.5:=[svc]
+ media-libs/libwebp:=
+ media-libs/mesa[egl]
+ media-libs/opus
+ net-libs/libsrtp:0=
+ sys-apps/dbus
+ sys-apps/pciutils
+ sys-libs/libcap
+ sys-libs/zlib[minizip]
+ virtual/jpeg:0
+ 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/libXrandr
+ x11-libs/libXrender
+ x11-libs/libXScrnSaver
+ x11-libs/libXtst
+ alsa? ( media-libs/alsa-lib )
+ designer? ( ~dev-qt/designer-${PV} )
+ geolocation? ( ~dev-qt/qtpositioning-${PV} )
+ pulseaudio? ( media-sound/pulseaudio:= )
+ system-ffmpeg? ( media-video/ffmpeg:0= )
+ system-icu? ( dev-libs/icu:= )
+ widgets? (
+ ~dev-qt/qtdeclarative-${PV}[widgets]
+ ~dev-qt/qtwidgets-${PV}
+ )
+"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ >=app-arch/gzip-1.7
+ dev-util/gperf
+ dev-util/ninja
+ dev-util/re2c
+ sys-devel/bison
+ pax_kernel? ( sys-apps/elfix )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-5.9.4-jpeg-9-1.patch"
+ "${FILESDIR}/${PN}-5.9.4-jpeg-9-2.patch"
+ "${FILESDIR}/${PN}-5.9.6-gcc8.patch" # bug 657124
+)
+
+src_prepare() {
+ use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
+
+ # bug 620444 - ensure local headers are used
+ find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
+
+ qt_use_disable_config alsa alsa src/core/config/linux.pri
+ qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri
+
+ qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
+
+ qt_use_disable_mod geolocation positioning \
+ mkspecs/features/configure.prf \
+ src/core/core_chromium.pri \
+ src/core/core_common.pri
+
+ 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) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
+
+ local myqmakeargs=(
+ $(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
+ $(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '')
+ $(usex system-icu 'WEBENGINE_CONFIG+=use_system_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
+
+ pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess
+}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2018-06-23 17:04 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2018-06-23 17:04 UTC (permalink / raw
To: gentoo-commits
commit: 713c497e45ccc5d47954b959ffe1b4b5dc4a5e3b
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 21 10:11:17 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 23 16:43:51 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=713c497e
dev-qt/qtwebengine: adjust USE="designer" description
This will describe the purpose of the flag more accurately.
Package-Manager: Portage-2.3.40, Repoman-2.3.9
dev-qt/qtwebengine/metadata.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index d6bd8540b0f..cd7c273bf4c 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -6,7 +6,8 @@
<name>Gentoo Qt Project</name>
</maintainer>
<use>
- <flag name="designer">Install QWebEngineView plugin for displaying web pages in <pkg>dev-qt/designer</pkg></flag>
+ <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>
<flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
^ permalink raw reply related [flat|nested] 301+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2018-06-23 17:04 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2018-06-23 17:04 UTC (permalink / raw
To: gentoo-commits
commit: a7789e0d7926d1b36cec95e984cb33bf85bb1152
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Fri Jun 15 00:11:55 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 23 16:43:51 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7789e0d
dev-qt/qtwebengine: Add "designer" USE flag
Bug: https://bugs.gentoo.org/652508
dev-qt/qtwebengine/metadata.xml | 1 +
dev-qt/qtwebengine/qtwebengine-5.11.0_rc2.ebuild | 6 +++++-
dev-qt/qtwebengine/qtwebengine-5.9.6.ebuild | 6 +++++-
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index d93362dc7bc..d6bd8540b0f 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -6,6 +6,7 @@
<name>Gentoo Qt Project</name>
</maintainer>
<use>
+ <flag name="designer">Install QWebEngineView plugin for displaying web pages in <pkg>dev-qt/designer</pkg></flag>
<flag name="geolocation">Enable physical position determination
via <pkg>dev-qt/qtpositioning</pkg></flag>
<flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.0_rc2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.0_rc2.ebuild
index 82890439c64..152fe1ffb78 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.0_rc2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.0_rc2.ebuild
@@ -11,7 +11,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
-IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
+REQUIRED_USE="designer? ( widgets )"
RDEPEND="
app-arch/snappy:=
@@ -58,6 +59,7 @@ RDEPEND="
x11-libs/libXScrnSaver
x11-libs/libXtst
alsa? ( media-libs/alsa-lib )
+ designer? ( ~dev-qt/designer-${PV} )
geolocation? ( ~dev-qt/qtpositioning-${PV} )
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
@@ -88,6 +90,8 @@ src_prepare() {
qt_use_disable_config alsa webengine-alsa src/core/config/linux.pri
qt_use_disable_config pulseaudio webengine-pulseaudio src/core/config/linux.pri
+ qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
+
qt_use_disable_mod geolocation positioning \
mkspecs/features/configure.prf \
src/core/core_chromium.pri \
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.6.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.6.ebuild
index df6b40f6890..6788f042ae3 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.6.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.6.ebuild
@@ -11,7 +11,8 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
fi
-IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
+REQUIRED_USE="designer? ( widgets )"
RDEPEND="
app-arch/snappy:=
@@ -58,6 +59,7 @@ RDEPEND="
x11-libs/libXScrnSaver
x11-libs/libXtst
alsa? ( media-libs/alsa-lib )
+ designer? ( ~dev-qt/designer-${PV} )
geolocation? ( ~dev-qt/qtpositioning-${PV} )
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
@@ -91,6 +93,8 @@ src_prepare() {
qt_use_disable_config alsa alsa src/core/config/linux.pri
qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri
+ qt_use_disable_mod designer webenginewidgets src/plugins/plugins.pro
+
qt_use_disable_mod geolocation positioning \
mkspecs/features/configure.prf \
src/core/core_chromium.pri \
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2018-05-25 19:12 Aaron Bauman
0 siblings, 0 replies; 301+ messages in thread
From: Aaron Bauman @ 2018-05-25 19:12 UTC (permalink / raw
To: gentoo-commits
commit: a6984f28982995357acf7e9189fea646c23b1a20
Author: kermeat <snowman.sp <AT> gmail <DOT> com>
AuthorDate: Wed Mar 28 12:16:59 2018 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri May 25 19:12:06 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6984f28
dev-qt/qtwebengine: fix dependencies
skip build if mesa without egl:
"khronos development headers appear to be missing (mesa/libegl1-mesa-dev)"
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Closes: https://github.com/gentoo/gentoo/pull/7683
dev-qt/qtwebengine/qtwebengine-5.9.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.4.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.4.ebuild
index d26a1ed6409..b3c814f5d93 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.4.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.4.ebuild
@@ -36,7 +36,7 @@ RDEPEND="
media-libs/libpng:0=
>=media-libs/libvpx-1.5:=[svc]
media-libs/libwebp:=
- media-libs/mesa
+ media-libs/mesa[egl]
media-libs/opus
net-libs/libsrtp:0=
sys-apps/dbus
^ permalink raw reply related [flat|nested] 301+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2018-01-31 0:46 Andreas Sturmlechner
0 siblings, 0 replies; 301+ messages in thread
From: Andreas Sturmlechner @ 2018-01-31 0:46 UTC (permalink / raw
To: gentoo-commits
commit: c3f06fdd6dc71c5f125f9da80c5f4fcd7e53839f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 30 23:30:39 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jan 31 00:45:46 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3f06fdd
dev-qt/qtwebengine: 5.7.1-r2: Switch off USE=system-icu, fix dep
Fix build and ease dependency resolution with a future stable icu-60.2.
Bug: https://bugs.gentoo.org/618648
Package-Manager: Portage-2.3.21, Repoman-2.3.6
dev-qt/qtwebengine/qtwebengine-5.7.1-r2.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.1-r2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.1-r2.ebuild
index 78b06c03f6e..78b9daea288 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.1-r2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="amd64 ~arm ~arm64 x86"
fi
-IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg system-icu widgets"
RDEPEND="
app-arch/snappy:=
@@ -59,7 +59,7 @@ RDEPEND="
geolocation? ( ~dev-qt/qtpositioning-${PV} )
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
- system-icu? ( dev-libs/icu:= )
+ system-icu? ( <dev-libs/icu-59:= )
widgets? ( ~dev-qt/qtwidgets-${PV} )
"
DEPEND="${RDEPEND}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2018-01-15 11:08 Michael Palimaka
0 siblings, 0 replies; 301+ messages in thread
From: Michael Palimaka @ 2018-01-15 11:08 UTC (permalink / raw
To: gentoo-commits
commit: 4e1d94a283f0a15b6f0c07cb803d9ee140c16f5d
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 15 11:08:05 2018 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jan 15 11:08:22 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e1d94a2
dev-qt/qtwebengine: dev-libs/libxml2 must be build with USE="icu"
Closes: https://bugs.gentoo.org/644602
Package-Manager: Portage-2.3.14, Repoman-2.3.6
dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild
index e6d72ee568d..e8a3d5f814e 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -26,7 +26,7 @@ RDEPEND="
~dev-qt/qtwebchannel-${PV}[qml]
dev-libs/expat
dev-libs/libevent:=
- dev-libs/libxml2
+ dev-libs/libxml2[icu]
dev-libs/libxslt
dev-libs/protobuf:=
dev-libs/re2:=
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2017-12-23 0:45 Michael Palimaka
0 siblings, 0 replies; 301+ messages in thread
From: Michael Palimaka @ 2017-12-23 0:45 UTC (permalink / raw
To: gentoo-commits
commit: c643acddbf02f0337a4d1a13ef46288f1200689d
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 23 00:45:13 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Dec 23 00:45:30 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c643acdd
dev-qt/qtwebengine: add missing dependency
Closes: https://bugs.gentoo.org/638998
Package-Manager: Portage-2.3.14, Repoman-2.3.6
dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild
index dce0a939886..e6d72ee568d 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild
@@ -29,6 +29,7 @@ RDEPEND="
dev-libs/libxml2
dev-libs/libxslt
dev-libs/protobuf:=
+ dev-libs/re2:=
media-libs/fontconfig
media-libs/freetype
media-libs/harfbuzz:=
^ permalink raw reply related [flat|nested] 301+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2017-12-10 12:15 Michael Palimaka
0 siblings, 0 replies; 301+ messages in thread
From: Michael Palimaka @ 2017-12-10 12:15 UTC (permalink / raw
To: gentoo-commits
commit: fb114b9eb07f3f4bdd8f20432b25f67ca92c1fd0
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 10 12:15:22 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 12:15:44 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb114b9e
dev-qt/qtwebengine: add missing USE dependency
Closes: https://bugs.gentoo.org/638872
Package-Manager: Portage-2.3.14, Repoman-2.3.6
dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild
index b0e35e0db27..dce0a939886 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild
@@ -61,7 +61,10 @@ RDEPEND="
pulseaudio? ( media-sound/pulseaudio:= )
system-ffmpeg? ( media-video/ffmpeg:0= )
system-icu? ( dev-libs/icu:= )
- widgets? ( ~dev-qt/qtwidgets-${PV} )
+ widgets? (
+ ~dev-qt/qtdeclarative-${PV}[widgets]
+ ~dev-qt/qtwidgets-${PV}
+ )
"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2017-11-28 10:49 Michael Palimaka
0 siblings, 0 replies; 301+ messages in thread
From: Michael Palimaka @ 2017-11-28 10:49 UTC (permalink / raw
To: gentoo-commits
commit: c90e793013d05b338c1fe7ed9274a90189984f4c
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 28 10:48:48 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Nov 28 10:48:58 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c90e7930
dev-qt/qtwebengine: add missing dependency
Closes: https://bugs.gentoo.org/639026
Package-Manager: Portage-2.3.14, Repoman-2.3.6
dev-qt/qtwebengine/qtwebengine-5.9.2.ebuild | 1 +
dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.2.ebuild
index ba128d2eddb..2c0bd6388d5 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.2.ebuild
@@ -65,6 +65,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
+ >=app-arch/gzip-1.7
dev-util/gperf
dev-util/ninja
dev-util/re2c
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild
index ba128d2eddb..2c0bd6388d5 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild
@@ -65,6 +65,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
+ >=app-arch/gzip-1.7
dev-util/gperf
dev-util/ninja
dev-util/re2c
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2017-10-10 12:32 Michael Palimaka
0 siblings, 0 replies; 301+ messages in thread
From: Michael Palimaka @ 2017-10-10 12:32 UTC (permalink / raw
To: gentoo-commits
commit: cf87fb57d800410d24974ef1bbaad9b68adb298d
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 10 12:29:15 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Oct 10 12:32:10 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf87fb57
dev-qt/qtwebengine: add missing dependency
Closes: https://bugs.gentoo.org/633750
Package-Manager: Portage-2.3.8, Repoman-2.3.3
dev-qt/qtwebengine/qtwebengine-5.9.2.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.2.ebuild
index 52d738f401f..ba128d2eddb 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.2.ebuild
@@ -22,6 +22,7 @@ RDEPEND="
~dev-qt/qtdeclarative-${PV}
~dev-qt/qtgui-${PV}
~dev-qt/qtnetwork-${PV}
+ ~dev-qt/qtprintsupport-${PV}
~dev-qt/qtwebchannel-${PV}[qml]
dev-libs/expat
dev-libs/libevent:=
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2017-08-31 15:45 Chí-Thanh Christopher Nguyễn
0 siblings, 0 replies; 301+ messages in thread
From: Chí-Thanh Christopher Nguyễn @ 2017-08-31 15:45 UTC (permalink / raw
To: gentoo-commits
commit: 36332d7cdba4b89dbee52213b76762f42dfa5506
Author: Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 31 15:44:40 2017 +0000
Commit: Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org>
CommitDate: Thu Aug 31 15:44:40 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36332d7c
dev-qt/qtwebengine: keyword ~arm
Package-Manager: Portage-2.3.6, Repoman-2.3.1
dev-qt/qtwebengine/qtwebengine-5.7.1-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.1-r2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.1-r2.ebuild
index 18f8b32465c..78b06c03f6e 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.1-r2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.1-r2.ebuild
@@ -8,7 +8,7 @@ inherit multiprocessing pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm64 x86"
+ KEYWORDS="amd64 ~arm ~arm64 x86"
fi
IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2017-07-30 14:30 David Seifert
0 siblings, 0 replies; 301+ messages in thread
From: David Seifert @ 2017-07-30 14:30 UTC (permalink / raw
To: gentoo-commits
commit: 808a591346cbcde3f323febec5a78a9abef810ea
Author: Sergey Alirzaev <zl29ah <AT> gmail <DOT> com>
AuthorDate: Sun Jul 16 10:53:48 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jul 30 14:30:36 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=808a5913
dev-qt/qtwebengine: := dep on app-arch/snappy
libsnappy.so.1.1.5: cannot open shared object file: No such file or directory
Closes: https://github.com/gentoo/gentoo/pull/5115
.../{qtwebengine-5.6.2.ebuild => qtwebengine-5.6.2-r1.ebuild} | 2 +-
.../{qtwebengine-5.7.1-r1.ebuild => qtwebengine-5.7.1-r2.ebuild} | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.2-r1.ebuild
similarity index 99%
rename from dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild
rename to dev-qt/qtwebengine/qtwebengine-5.6.2-r1.ebuild
index 470e14a2984..c2d123d0085 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.2-r1.ebuild
@@ -14,7 +14,7 @@ fi
IUSE="bindist geolocation pax_kernel +system-ffmpeg +system-icu widgets"
RDEPEND="
- app-arch/snappy
+ app-arch/snappy:=
dev-libs/glib:2
dev-libs/nspr
dev-libs/nss
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.1-r2.ebuild
similarity index 99%
rename from dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild
rename to dev-qt/qtwebengine/qtwebengine-5.7.1-r2.ebuild
index a9886dbe2f5..18f8b32465c 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.1-r2.ebuild
@@ -14,7 +14,7 @@ fi
IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
RDEPEND="
- app-arch/snappy
+ app-arch/snappy:=
dev-libs/glib:2
dev-libs/nspr
dev-libs/nss
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2017-07-04 15:49 Agostino Sarubbo
0 siblings, 0 replies; 301+ messages in thread
From: Agostino Sarubbo @ 2017-07-04 15:49 UTC (permalink / raw
To: gentoo-commits
commit: 8578af613024fb45bfa636d7fc3b1c6eab4b5702
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 4 15:46:41 2017 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Jul 4 15:46:41 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8578af61
dev-qt/qtwebengine: x86 stable wrt bug #620334
Package-Manager: Portage-2.3.6, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild
index 48771b38ede..a9886dbe2f5 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit multiprocessing pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm64 x86"
fi
IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2017-07-04 14:02 Agostino Sarubbo
0 siblings, 0 replies; 301+ messages in thread
From: Agostino Sarubbo @ 2017-07-04 14:02 UTC (permalink / raw
To: gentoo-commits
commit: 5e49f6c1a350e73b179b794c5cb196aa782f4e2a
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 4 14:01:35 2017 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Jul 4 14:01:35 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e49f6c1
dev-qt/qtwebengine: amd64 stable wrt bug #620334
Package-Manager: Portage-2.3.6, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild
index 89b5654472b..48771b38ede 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit multiprocessing pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~arm64 ~x86"
+ KEYWORDS="amd64 ~arm64 ~x86"
fi
IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2017-06-25 15:11 Alexis Ballier
0 siblings, 0 replies; 301+ messages in thread
From: Alexis Ballier @ 2017-06-25 15:11 UTC (permalink / raw
To: gentoo-commits
commit: 62f2f9e8346f41a76b4c5c9917dcd040654ef4d0
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 25 14:48:10 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Jun 25 15:09:44 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62f2f9e8
dev-qt/qtwebengine: keyword ~arm64
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild
index 743f5327132..89b5654472b 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild
@@ -8,7 +8,7 @@ inherit multiprocessing pax-utils python-any-r1 qt5-build
DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~x86"
fi
IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2017-06-24 2:29 Michael Palimaka
0 siblings, 0 replies; 301+ messages in thread
From: Michael Palimaka @ 2017-06-24 2:29 UTC (permalink / raw
To: gentoo-commits
commit: 6f0d04eababcfbe4d723332b492a0404fb1591f0
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 24 02:29:30 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jun 24 02:29:41 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f0d04ea
dev-qt/qtwebengine: die if nothing is built
Gentoo-bug: 601472
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild
index 0542aa911b0..743f5327132 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild
@@ -113,5 +113,10 @@ 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
+
pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess
}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2017-06-05 12:44 Michael Palimaka
0 siblings, 0 replies; 301+ messages in thread
From: Michael Palimaka @ 2017-06-05 12:44 UTC (permalink / raw
To: gentoo-commits
commit: b755bd568ec2b8ef058aaade242c59fa09beb1e9
Author: Arfrever Frehtes Taifersar Arahesis <arfrever.fta <AT> gmail <DOT> com>
AuthorDate: Mon Jun 5 12:44:04 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jun 5 12:44:26 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b755bd56
dev-qt/qtwebengine: allow NINJAFLAGS to be overridden
Gentoo-bug: 592660
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild
index f8c8f6b4d0e..0542aa911b0 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild
@@ -98,7 +98,7 @@ src_prepare() {
src_configure() {
export NINJA_PATH=/usr/bin/ninja
- export NINJAFLAGS="-j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v"
+ export NINJAFLAGS="${NINJAFLAGS:--j$(makeopts_jobs) -l$(makeopts_loadavg "${MAKEOPTS}" 0) -v}"
local myqmakeargs=(
$(usex alsa 'WEBENGINE_CONFIG+=use_alsa' '')
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2017-06-03 15:53 Michael Palimaka
0 siblings, 0 replies; 301+ messages in thread
From: Michael Palimaka @ 2017-06-03 15:53 UTC (permalink / raw
To: gentoo-commits
commit: 6c41329c2994b1b0cae447258b88609b08cae708
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 3 15:53:43 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jun 3 15:53:50 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c41329c
dev-qt/qtwebengine: remove 5.7.1-r0
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-qt/qtwebengine/qtwebengine-5.7.1.ebuild | 112 ----------------------------
1 file changed, 112 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.1.ebuild
deleted file mode 100644
index 95830652c9f..00000000000
--- a/dev-qt/qtwebengine/qtwebengine-5.7.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit pax-utils python-any-r1 qt5-build
-
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="~amd64 ~x86"
-fi
-
-IUSE="bindist geolocation pax_kernel +system-ffmpeg +system-icu widgets"
-
-RDEPEND="
- app-arch/snappy
- dev-libs/glib:2
- dev-libs/nspr
- dev-libs/nss
- ~dev-qt/qtcore-${PV}
- ~dev-qt/qtdeclarative-${PV}
- ~dev-qt/qtgui-${PV}
- ~dev-qt/qtnetwork-${PV}
- ~dev-qt/qtwebchannel-${PV}[qml]
- dev-libs/expat
- dev-libs/jsoncpp:=
- dev-libs/libevent:=
- dev-libs/libxml2
- dev-libs/libxslt
- dev-libs/protobuf:=
- media-libs/alsa-lib
- media-libs/flac
- media-libs/fontconfig
- media-libs/freetype
- media-libs/harfbuzz:=
- media-libs/libpng:0=
- >=media-libs/libvpx-1.5:=[svc]
- media-libs/libwebp:=
- media-libs/mesa
- media-libs/opus
- media-libs/speex
- net-libs/libsrtp:0=
- sys-apps/dbus
- sys-apps/pciutils
- sys-libs/libcap
- sys-libs/zlib[minizip]
- 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/libXrandr
- x11-libs/libXrender
- x11-libs/libXScrnSaver
- x11-libs/libXtst
- geolocation? ( ~dev-qt/qtpositioning-${PV} )
- system-ffmpeg? ( media-video/ffmpeg:0= )
- system-icu? ( dev-libs/icu:= )
- widgets? ( ~dev-qt/qtwidgets-${PV} )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- dev-util/gperf
- dev-util/ninja
- dev-util/re2c
- sys-devel/bison
- pax_kernel? ( sys-apps/elfix )
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-5.7.0-fix-system-ffmpeg.patch"
- "${FILESDIR}/${PN}-5.7.0-icu58.patch"
- "${FILESDIR}/${PN}-5.7.0-undef-madv_free.patch"
-)
-
-src_prepare() {
- use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" )
-
- if use system-icu; then
- # ensure build against system headers - bug #601264
- rm -r src/3rdparty/chromium/third_party/icu/source || die
- fi
-
- qt_use_disable_mod geolocation positioning \
- src/core/core_common.pri \
- src/core/core_gyp_generator.pro
-
- qt_use_disable_mod widgets widgets src/src.pro
-
- qt5-build_src_prepare
-}
-
-src_configure() {
- export NINJA_PATH=/usr/bin/ninja
-
- local myqmakeargs=(
- $(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
- $(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '')
- $(usex system-icu 'WEBENGINE_CONFIG+=use_system_icu' '')
- )
- qt5-build_src_configure
-}
-
-src_install() {
- qt5-build_src_install
-
- pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess
-}
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2016-12-15 5:18 Davide Pesavento
0 siblings, 0 replies; 301+ messages in thread
From: Davide Pesavento @ 2016-12-15 5:18 UTC (permalink / raw
To: gentoo-commits
commit: 9a8bf607bfe748c59ee9ba1af062f03d67abd774
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 15 05:17:18 2016 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Thu Dec 15 05:18:09 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a8bf607
dev-qt/qtwebengine: fix typo in comment
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild
index eec6892..11e8312 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild
@@ -75,7 +75,7 @@ src_prepare() {
use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-paxmark-mksnapshot.patch" )
if use system-icu; then
- # ensuire build against system headers - bug #601264
+ # ensure build against system headers - bug #601264
rm -r src/3rdparty/chromium/third_party/icu/source || die
fi
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2016-12-06 6:54 Michael Palimaka
0 siblings, 0 replies; 301+ messages in thread
From: Michael Palimaka @ 2016-12-06 6:54 UTC (permalink / raw
To: gentoo-commits
commit: 79d9e7f90a0e12ed552152fa6117d5df4d6b6825
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Sat Nov 26 22:54:33 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Dec 6 06:54:11 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79d9e7f9
dev-qt/qtwebengine: Use correct libsrtp slot.
dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild | 2 +-
dev-qt/qtwebengine/qtwebengine-5.7.0.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild
index e7f210f..c3a5a3a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
media-libs/mesa
media-libs/opus
media-libs/speex
- net-libs/libsrtp:=
+ net-libs/libsrtp:0=
sys-apps/dbus
sys-apps/pciutils
sys-libs/libcap
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.0.ebuild
index b8e0985..6f3b624 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.0.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
media-libs/mesa
media-libs/opus
media-libs/speex
- net-libs/libsrtp:=
+ net-libs/libsrtp:0=
sys-apps/dbus
sys-apps/pciutils
sys-libs/libcap
^ permalink raw reply related [flat|nested] 301+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2016-08-31 18:24 Michael Palimaka
0 siblings, 0 replies; 301+ messages in thread
From: Michael Palimaka @ 2016-08-31 18:24 UTC (permalink / raw
To: gentoo-commits
commit: d689e3c66e9444fc460b3ae86549a46fc72ded7b
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 31 18:24:09 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 18:24:18 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d689e3c6
dev-qt/qtwebengine: relax media-video/ffmpeg dependency for 5.7.0
Package-Manager: portage-2.3.0
dev-qt/qtwebengine/qtwebengine-5.7.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.7.0.ebuild
index e94423e..cdebff6 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.0.ebuild
@@ -58,7 +58,7 @@ RDEPEND="
x11-libs/libXScrnSaver
x11-libs/libXtst
geolocation? ( ~dev-qt/qtpositioning-${PV} )
- system-ffmpeg? ( =media-video/ffmpeg-2*:0= )
+ system-ffmpeg? ( media-video/ffmpeg:0= )
system-icu? ( dev-libs/icu:= )
widgets? ( ~dev-qt/qtwidgets-${PV} )
"
^ permalink raw reply related [flat|nested] 301+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/
@ 2016-05-08 1:08 Davide Pesavento
0 siblings, 0 replies; 301+ messages in thread
From: Davide Pesavento @ 2016-05-08 1:08 UTC (permalink / raw
To: gentoo-commits
commit: 1914e16b251241690a27a007c714c864250b42ed
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun May 8 01:07:59 2016 +0000
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun May 8 01:07:59 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1914e16b
dev-qt/qtwebengine: add a few missing deps and several slot operators
Package-Manager: portage-2.2.28
dev-qt/qtwebengine/qtwebengine-5.6.0.ebuild | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.0.ebuild b/dev-qt/qtwebengine/qtwebengine-5.6.0.ebuild
index b08dbf7..b32329b 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.0.ebuild
@@ -25,8 +25,8 @@ RDEPEND="
~dev-qt/qtnetwork-${PV}
~dev-qt/qtwebchannel-${PV}[qml]
dev-libs/expat
- dev-libs/jsoncpp
- dev-libs/libevent
+ dev-libs/jsoncpp:=
+ dev-libs/libevent:=
dev-libs/libxml2
dev-libs/libxslt
media-libs/alsa-lib
@@ -35,15 +35,17 @@ RDEPEND="
media-libs/freetype
media-libs/harfbuzz:=
media-libs/libpng:0=
- >=media-libs/libvpx-1.4
- media-libs/libwebp
+ >=media-libs/libvpx-1.4:=
+ media-libs/libwebp:=
+ media-libs/mesa
media-libs/opus
media-libs/speex
- net-libs/libsrtp
+ net-libs/libsrtp:=
sys-apps/dbus
sys-apps/pciutils
sys-libs/libcap
- sys-libs/zlib
+ sys-libs/zlib[minizip]
+ x11-libs/libdrm
x11-libs/libX11
x11-libs/libXcomposite
x11-libs/libXcursor
@@ -78,15 +80,15 @@ src_prepare() {
qt_use_disable_mod geolocation positioning \
src/core/core_common.pri \
src/core/core_gyp_generator.pro
- qt_use_disable_mod widgets widgets \
- src/src.pro \
- tests/quicktestbrowser/quicktestbrowser.pro
+
+ qt_use_disable_mod widgets widgets src/src.pro
qt5-build_src_prepare
}
src_configure() {
- export NINJA_PATH="/usr/bin/ninja"
+ export NINJA_PATH=/usr/bin/ninja
+
local myqmakeargs=(
$(usex bindist '' 'WEBENGINE_CONFIG+=use_proprietary_codecs')
$(usex system-ffmpeg 'WEBENGINE_CONFIG+=use_system_ffmpeg' '')
^ permalink raw reply related [flat|nested] 301+ messages in thread
end of thread, other threads:[~2024-11-23 11:36 UTC | newest]
Thread overview: 301+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-06 11:39 [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/ Jimi Huotari
-- strict thread matches above, loose matches on Subject: below --
2024-11-23 11:36 Andreas Sturmlechner
2024-11-21 21:39 Andreas Sturmlechner
2024-10-09 14:14 Ionen Wolkens
2024-10-09 6:22 Ionen Wolkens
2024-10-08 5:03 Ionen Wolkens
2024-09-27 7:26 Ionen Wolkens
2024-09-25 2:20 Ionen Wolkens
2024-09-24 9:57 Ionen Wolkens
2024-09-22 8:16 Ionen Wolkens
2024-09-03 7:44 Ionen Wolkens
2024-09-03 7:44 Ionen Wolkens
2024-09-03 0:31 Ionen Wolkens
2024-09-02 17:52 Ionen Wolkens
2024-07-23 7:50 Ionen Wolkens
2024-07-16 1:29 Ionen Wolkens
2024-07-08 11:16 Arthur Zamarin
2024-06-21 1:10 Ionen Wolkens
2024-06-21 0:56 Ionen Wolkens
2024-06-18 18:14 Ionen Wolkens
2024-06-11 22:02 Ionen Wolkens
2024-06-11 22:02 Ionen Wolkens
2024-06-08 5:27 Arthur Zamarin
2024-06-06 16:43 Andreas Sturmlechner
2024-06-04 19:36 Ionen Wolkens
2024-06-02 4:04 Sam James
2024-06-01 10:25 Arthur Zamarin
2024-05-31 6:12 Andreas Sturmlechner
2024-05-30 12:52 Andreas Sturmlechner
2024-05-30 12:52 Andreas Sturmlechner
2024-05-23 3:36 Arthur Zamarin
2024-05-22 17:03 Sam James
2024-05-21 6:53 Ionen Wolkens
2024-05-20 8:49 Ionen Wolkens
2024-05-17 10:08 Ionen Wolkens
2024-05-17 4:32 Ionen Wolkens
2024-05-15 18:08 Andreas Sturmlechner
2024-05-13 5:49 Ionen Wolkens
2024-05-10 10:26 Ionen Wolkens
2024-05-09 12:13 Ionen Wolkens
2024-05-08 16:18 Ionen Wolkens
2024-04-23 15:08 Ionen Wolkens
2024-04-14 15:06 Ionen Wolkens
2024-04-13 18:06 Ionen Wolkens
2024-04-13 17:50 Arthur Zamarin
2024-04-05 15:01 Andreas Sturmlechner
2024-04-04 4:23 Arthur Zamarin
2024-04-03 17:30 Ionen Wolkens
2024-04-03 17:01 Ionen Wolkens
2024-04-03 15:25 Andreas Sturmlechner
2024-04-02 13:06 Ionen Wolkens
2024-04-02 6:09 Arthur Zamarin
2024-04-01 18:29 Arthur Zamarin
2024-03-30 0:29 Ionen Wolkens
2024-03-30 0:29 Ionen Wolkens
2024-03-30 0:29 Ionen Wolkens
2024-03-26 7:10 Ionen Wolkens
2024-03-24 18:39 Ionen Wolkens
2024-03-23 17:01 Andreas Sturmlechner
2024-03-22 6:16 Arthur Zamarin
2024-03-12 20:32 Ionen Wolkens
2024-03-12 20:32 Ionen Wolkens
2024-03-12 12:01 Ionen Wolkens
2024-03-04 14:53 Ionen Wolkens
2024-02-22 6:16 Ionen Wolkens
2024-02-22 6:16 Ionen Wolkens
2024-02-20 14:30 Arthur Zamarin
2024-02-14 12:24 Ionen Wolkens
2024-01-31 7:18 Joonas Niilola
2024-01-29 14:38 Ionen Wolkens
2024-01-29 4:22 Ionen Wolkens
2024-01-24 14:49 Ionen Wolkens
2024-01-22 19:38 Andreas Sturmlechner
2024-01-15 21:59 Andreas Sturmlechner
2024-01-10 9:15 Ionen Wolkens
2024-01-09 14:08 Ionen Wolkens
2024-01-08 16:43 Ionen Wolkens
2024-01-08 12:59 Ionen Wolkens
2024-01-01 21:14 Andreas Sturmlechner
2023-12-24 8:28 Ionen Wolkens
2023-12-22 22:40 Mart Raudsepp
2023-12-17 18:29 Arthur Zamarin
2023-12-13 3:12 Ionen Wolkens
2023-12-12 21:25 Ionen Wolkens
2023-11-27 8:47 Ionen Wolkens
2023-11-27 8:47 Ionen Wolkens
2023-11-25 16:12 Andreas Sturmlechner
2023-11-23 8:16 Ionen Wolkens
2023-11-22 15:21 Ionen Wolkens
2023-11-22 15:21 Ionen Wolkens
2023-11-21 21:25 Ionen Wolkens
2023-11-21 19:53 Sam James
2023-11-15 19:28 Ionen Wolkens
2023-11-15 17:20 Arthur Zamarin
2023-11-08 19:48 Andreas Sturmlechner
2023-11-08 19:48 Andreas Sturmlechner
2023-11-06 18:11 Andreas Sturmlechner
2023-11-03 11:16 Andreas Sturmlechner
2023-11-03 11:16 Andreas Sturmlechner
2023-10-22 8:36 Andreas Sturmlechner
2023-10-17 13:25 Ionen Wolkens
2023-10-10 14:51 Ionen Wolkens
2023-10-08 15:58 Andreas Sturmlechner
2023-09-28 13:07 Ionen Wolkens
2023-09-26 19:48 Ionen Wolkens
2023-09-26 15:16 Ionen Wolkens
2023-09-22 20:18 Ionen Wolkens
2023-09-22 4:46 Ionen Wolkens
2023-09-20 18:27 Ionen Wolkens
2023-09-18 20:04 Arthur Zamarin
2023-09-16 10:50 Ionen Wolkens
2023-09-15 4:49 Sam James
2023-09-14 20:43 Ionen Wolkens
2023-09-13 16:42 Ionen Wolkens
2023-09-13 16:42 Ionen Wolkens
2023-09-13 16:42 Ionen Wolkens
2023-09-13 16:42 Ionen Wolkens
2023-09-09 16:22 Ionen Wolkens
2023-09-07 20:37 Ionen Wolkens
2023-09-06 1:28 Ionen Wolkens
2023-09-05 13:05 Ionen Wolkens
2023-09-05 13:05 Ionen Wolkens
2023-08-26 11:56 Andreas Sturmlechner
2023-07-21 2:52 Jimi Huotari
2023-07-20 19:41 Jimi Huotari
2023-07-13 8:42 Andreas Sturmlechner
2023-07-09 17:00 Arthur Zamarin
2023-07-06 17:17 Andreas Sturmlechner
2023-06-13 11:42 Andreas Sturmlechner
2023-05-22 18:36 Arthur Zamarin
2023-05-21 23:08 Sam James
2023-05-21 7:05 Andreas Sturmlechner
2023-05-06 11:26 Jimi Huotari
2023-05-01 12:54 Andreas Sturmlechner
2023-04-23 16:00 Arthur Zamarin
2023-04-17 19:39 Jimi Huotari
2023-04-15 18:39 Jimi Huotari
2023-04-13 21:45 Andreas Sturmlechner
2023-04-09 19:34 Arthur Zamarin
2023-04-09 19:25 Arthur Zamarin
2023-03-29 15:41 Andreas Sturmlechner
2023-03-26 16:59 Jimi Huotari
2023-03-19 16:47 Jimi Huotari
2023-03-19 13:09 Jimi Huotari
2023-02-09 10:02 Andreas Sturmlechner
2023-02-07 10:37 Andreas Sturmlechner
2023-01-24 9:45 Andreas Sturmlechner
2023-01-21 9:15 Arthur Zamarin
2023-01-17 20:56 Arthur Zamarin
2023-01-17 20:04 Sam James
2023-01-15 12:36 Andreas Sturmlechner
2023-01-15 12:36 Andreas Sturmlechner
2023-01-05 22:39 Jimi Huotari
2022-12-06 17:07 Andreas Sturmlechner
2022-12-04 19:22 Arthur Zamarin
2022-12-03 20:37 Arthur Zamarin
2022-12-03 11:02 Sam James
2022-12-01 19:19 Andreas Sturmlechner
2022-11-29 20:51 Andreas Sturmlechner
2022-10-06 16:15 Sam James
2022-09-24 14:32 Andreas Sturmlechner
2022-07-20 5:15 Sam James
2022-07-06 10:27 Andreas Sturmlechner
2022-07-04 18:00 Arthur Zamarin
2022-07-02 18:26 Sam James
2022-06-30 22:19 Sam James
2022-06-19 12:26 Andreas Sturmlechner
2022-06-14 17:32 Andreas Sturmlechner
2022-06-14 13:27 Sam James
2022-06-14 13:15 Andreas Sturmlechner
2022-06-14 7:21 Agostino Sarubbo
2022-06-10 7:49 Georgy Yakovlev
2022-06-10 3:16 Sam James
2022-05-30 16:09 Andreas Sturmlechner
2022-05-26 19:35 Andreas Sturmlechner
2022-05-01 7:30 Michał Górny
2022-04-15 20:15 Andreas Sturmlechner
2022-04-14 0:19 Sam James
2022-04-12 22:49 Sam James
2022-04-12 19:35 Arthur Zamarin
2022-03-30 5:52 Andreas Sturmlechner
2022-03-21 11:04 Andreas Sturmlechner
2022-01-06 19:59 Sam James
2022-01-04 21:08 Sam James
2021-12-28 6:00 Sam James
2021-12-27 14:14 Agostino Sarubbo
2021-12-26 8:07 Agostino Sarubbo
2021-12-25 0:10 Andreas Sturmlechner
2021-12-14 18:13 Andreas Sturmlechner
2021-12-08 15:08 Andreas Sturmlechner
2021-11-09 23:54 Sam James
2021-11-09 22:40 Georgy Yakovlev
2021-11-08 10:11 Agostino Sarubbo
2021-11-06 1:35 Sam James
2021-11-05 7:01 Sam James
2021-10-20 16:43 Andreas Sturmlechner
2021-10-20 16:43 Andreas Sturmlechner
2021-09-22 20:01 Andreas Sturmlechner
2021-09-19 4:11 Sam James
2021-09-18 22:07 Sam James
2021-09-15 7:29 Andreas Sturmlechner
2021-09-15 6:36 Agostino Sarubbo
2021-09-13 9:32 Andreas Sturmlechner
2021-09-02 18:38 Andreas Sturmlechner
2021-08-26 12:05 Andreas Sturmlechner
2021-07-22 6:07 Sam James
2021-07-18 0:33 Sam James
2021-07-17 7:44 Agostino Sarubbo
2021-07-04 20:40 Andreas Sturmlechner
2021-07-02 18:53 Andreas Sturmlechner
2021-07-02 18:53 Andreas Sturmlechner
2021-06-01 10:48 Sam James
2021-06-01 9:00 Sam James
2021-06-01 9:00 Sam James
2021-05-20 20:55 Georgy Yakovlev
2021-05-17 21:15 Andreas Sturmlechner
2021-05-03 6:29 Andreas Sturmlechner
2021-04-24 21:11 Andreas Sturmlechner
2021-04-24 21:11 Andreas Sturmlechner
2021-03-12 20:08 Andreas Sturmlechner
2021-03-07 19:44 Sam James
2021-03-06 18:37 Sam James
2021-03-06 15:11 Thomas Deutschmann
2021-02-26 21:23 Andreas Sturmlechner
2021-02-08 19:38 Georgy Yakovlev
2021-02-07 17:54 Andreas Sturmlechner
2021-02-07 13:42 Andreas Sturmlechner
2021-02-07 13:42 Andreas Sturmlechner
2021-02-05 22:30 Andreas Sturmlechner
2021-01-10 9:06 Sam James
2021-01-09 21:16 Sam James
2021-01-09 15:15 Sam James
2020-11-27 21:50 Georgy Yakovlev
2020-11-27 21:50 Georgy Yakovlev
2020-10-18 14:45 Thomas Deutschmann
2020-10-12 15:22 Sam James
2020-10-12 11:45 Sam James
2020-10-10 19:27 Andreas Sturmlechner
2020-09-13 13:40 Thomas Deutschmann
2020-05-27 23:20 Georgy Yakovlev
2020-05-27 23:20 Georgy Yakovlev
2020-05-20 13:32 Mikle Kolyada
2020-05-20 9:50 Mikle Kolyada
2020-05-19 19:32 Mikle Kolyada
2020-04-29 18:09 Andreas Sturmlechner
2020-03-28 10:03 Mart Raudsepp
2020-03-19 13:15 Agostino Sarubbo
2020-03-19 12:46 Agostino Sarubbo
2020-02-10 6:52 Andreas Sturmlechner
2020-02-08 13:25 Mikle Kolyada
2020-01-15 22:02 Andreas Sturmlechner
2020-01-12 9:41 Andreas Sturmlechner
2019-12-22 16:29 Aaron Bauman
2019-12-18 11:23 Agostino Sarubbo
2019-11-12 15:01 Aaron Bauman
2019-10-20 16:10 Mikle Kolyada
2019-05-24 20:48 Aaron Bauman
2019-05-23 13:20 Mikle Kolyada
2019-05-21 20:50 Mikle Kolyada
2019-05-21 15:03 Mikle Kolyada
2019-04-26 17:51 Anthony G. Basile
2019-04-25 2:32 Michael Palimaka
2019-04-24 20:15 Andreas Sturmlechner
2019-02-10 23:46 Andreas Sturmlechner
2019-01-09 10:40 Mikle Kolyada
2019-01-09 10:32 Mikle Kolyada
2018-11-13 11:32 Andreas Sturmlechner
2018-10-24 18:06 Andreas Sturmlechner
2018-10-19 7:53 Andreas Sturmlechner
2018-10-17 22:21 Thomas Deutschmann
2018-10-16 16:09 Mikle Kolyada
2018-09-13 17:28 Andreas Sturmlechner
2018-07-15 16:13 Andreas Sturmlechner
2018-07-15 14:23 Thomas Deutschmann
2018-07-13 13:41 Mikle Kolyada
2018-07-12 10:38 Andreas Sturmlechner
2018-07-12 10:38 Andreas Sturmlechner
2018-06-27 19:00 Andreas Sturmlechner
2018-06-27 19:00 Andreas Sturmlechner
2018-06-27 19:00 Andreas Sturmlechner
2018-06-23 17:04 Andreas Sturmlechner
2018-06-23 17:04 Andreas Sturmlechner
2018-05-25 19:12 Aaron Bauman
2018-01-31 0:46 Andreas Sturmlechner
2018-01-15 11:08 Michael Palimaka
2017-12-23 0:45 Michael Palimaka
2017-12-10 12:15 Michael Palimaka
2017-11-28 10:49 Michael Palimaka
2017-10-10 12:32 Michael Palimaka
2017-08-31 15:45 Chí-Thanh Christopher Nguyễn
2017-07-30 14:30 David Seifert
2017-07-04 15:49 Agostino Sarubbo
2017-07-04 14:02 Agostino Sarubbo
2017-06-25 15:11 Alexis Ballier
2017-06-24 2:29 Michael Palimaka
2017-06-05 12:44 Michael Palimaka
2017-06-03 15:53 Michael Palimaka
2016-12-15 5:18 Davide Pesavento
2016-12-06 6:54 Michael Palimaka
2016-08-31 18:24 Michael Palimaka
2016-05-08 1:08 Davide Pesavento
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox