[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/

2024-07-02 Thread Ionen Wolkens
commit: b82f15dc07759e6099ddcd020876762a25360b85
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Jul  2 21:27:57 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Jul  3 00:39:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b82f15dc

dev-qt/qtwebengine: backport wayland text rendering fix (qt6)

See patch header.

Tempting to revbump, albeit will still spare users for now. Will
at least give stable users the fixed vresion when stabilized soon.
~testing users annoyed by this are invited to manually rebuild.

Also add to 6.7. so it is not forgotten with 6.7.3, "currently"
not marked to be picked to the 6.7 branch for the 6.7.3 release
and may or may not still be needed until 6.8.0.

Signed-off-by: Ionen Wolkens  gentoo.org>

 .../files/qtwebengine-6.7.2-QTBUG-113574.patch | 41 ++
 dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild|  1 +
 dev-qt/qtwebengine/qtwebengine-6.7..ebuild |  1 +
 3 files changed, 43 insertions(+)

diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.2-QTBUG-113574.patch 
b/dev-qt/qtwebengine/files/qtwebengine-6.7.2-QTBUG-113574.patch
new file mode 100644
index ..d8a9158c8a01
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.7.2-QTBUG-113574.patch
@@ -0,0 +1,41 @@
+Backport of [1] from 6.8/6.9 for [2].
+
+[1] https://codereview.qt-project.org/c/qt/qtwebengine/+/569910
+[2] https://bugreports.qt.io/browse/QTBUG-113574
+
+From 21a9add47def34322b799683e1e1daff88dc4a06 Mon Sep 17 00:00:00 2001
+From: David Edmundson 
+Date: Wed, 19 Jun 2024 10:37:45 +0100
+Subject: [PATCH] Use device pixel ratio of the window rather than the screen
+
+Window device pixel ratio can differ from the screen depending on the
+platform. The window is the more authorative source with new events in
+Qt to support that.
+
+In Chromium the rendering is still based off a screen factor, but each
+view will have a completely independent set of screen variables, so we
+can adjust the screen to match our current view.
+
+Chromium itself also alters the screen scale factor on a per window
+basis for their own native Wayland backend or if recording a window.
+--- a/src/core/render_widget_host_view_qt.cpp
 b/src/core/render_widget_host_view_qt.cpp
+@@ -875,4 +875,9 @@
+ 
+ display::ScreenInfos newScreenInfos = 
screenInfosFromQtForUpdate(window->screen());
++
++// We always want to use the scale from our current window
++// This screen information is stored on a per-view basis
++auto  = newScreenInfos.mutable_current();
++screen.device_scale_factor = window->devicePixelRatio();
+ if (screen_infos_ == newScreenInfos)
+ return false;
+--- a/src/core/render_widget_host_view_qt_delegate_item.cpp
 b/src/core/render_widget_host_view_qt_delegate_item.cpp
+@@ -346,4 +346,6 @@
+ onHide();
+ }
++} else if (change == QQuickItem::ItemDevicePixelRatioHasChanged) {
++m_client->visualPropertiesChanged();
+ }
+ }

diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild
index 3726d7743a00..1ad6561ecc65 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.2.ebuild
@@ -110,6 +110,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
 
 PATCHES+=(
# add extras as needed here, may merge in set if carries across versions
+   "${FILESDIR}"/${PN}-6.7.2-QTBUG-113574.patch
 )
 
 python_check_deps() {

diff --git a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
index 3726d7743a00..1ad6561ecc65 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
@@ -110,6 +110,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
 
 PATCHES+=(
# add extras as needed here, may merge in set if carries across versions
+   "${FILESDIR}"/${PN}-6.7.2-QTBUG-113574.patch
 )
 
 python_check_deps() {



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-06-20 Thread Ionen Wolkens
commit: a2dfd665eeb527282c2bc51756b2881c134ce8b4
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Jun 21 01:00:40 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Jun 21 01:03:45 2024 +
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  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..ebuild | 6 ++
 dev-qt/qtwebengine/qtwebengine-6.8..ebuild | 6 ++
 dev-qt/qtwebengine/qtwebengine-6..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
index 196438e3994d..3726d7743a00 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.8..ebuild
index 700b65e1e2c1..16c70f30d158 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.8..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.8..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6..ebuild
index 700b65e1e2c1..16c70f30d158 100644
--- a/dev-qt/qtwebengine/qtwebengine-6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6..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)
+  

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-06-20 Thread Ionen Wolkens
commit: a3342167040e3534ea627b7ee3d7f123727cf064
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Jun 21 00:42:59 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Jun 21 00:53:14 2024 +
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  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..ebuild | 2 ++
 dev-qt/qtwebengine/qtwebengine-6.8..ebuild | 2 ++
 dev-qt/qtwebengine/qtwebengine-6..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
index 842cb8d0e9d9..196438e3994d 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.8..ebuild
index 03b2d57d8bcb..700b65e1e2c1 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.8..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.8..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6..ebuild
index 03b2d57d8bcb..700b65e1e2c1 100644
--- a/dev-qt/qtwebengine/qtwebengine-6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6..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



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-06-18 Thread Ionen Wolkens
commit: d1f89602b5723ca1d100a97ed4739fade0eacd9c
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Jun 18 09:27:42 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Jun 18 18:13:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1f89602

dev-qt/qtwebengine: add 6.7.2

Signed-off-by: Ionen Wolkens  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 55044 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 ..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? ( 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-06-11 Thread Ionen Wolkens
commit: 2ce673a5a9f98048aeb9160e6a7dc99554b80aad
Author: Christopher Bayliss  icloud  com>
AuthorDate: Thu Jun  6 22:27:09 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Jun 11 21:58:12 2024 +
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  icloud.com>
Closes: https://github.com/gentoo/gentoo/pull/37062
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild| 1 +
 dev-qt/qtwebengine/qtwebengine-6.7..ebuild | 1 +
 dev-qt/qtwebengine/qtwebengine-6.8..ebuild | 1 +
 dev-qt/qtwebengine/qtwebengine-6..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
index 537ecdc04552..19867e211c6f 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.8..ebuild
index 503abab72225..6ee08b8eae93 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.8..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.8..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6..ebuild
index 503abab72225..6ee08b8eae93 100644
--- a/dev-qt/qtwebengine/qtwebengine-6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6..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



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-06-11 Thread Ionen Wolkens
commit: ab9bf839b7bd0227c73a4ba39867c3ab9327bcaa
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Jun 11 21:59:45 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Jun 11 22:01:14 2024 +
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  gentoo.org>

 dev-qt/qtwebengine/qtwebengine-6.7.1.ebuild| 2 +-
 dev-qt/qtwebengine/qtwebengine-6.7..ebuild | 2 +-
 dev-qt/qtwebengine/qtwebengine-6.8..ebuild | 2 +-
 dev-qt/qtwebengine/qtwebengine-6..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
index 19867e211c6f..842cb8d0e9d9 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.8..ebuild
index 6ee08b8eae93..03b2d57d8bcb 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.8..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.8..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6..ebuild
index 6ee08b8eae93..03b2d57d8bcb 100644
--- a/dev-qt/qtwebengine/qtwebengine-6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6..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? (



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/

2024-06-08 Thread Ionen Wolkens
commit: bcc5ab3323a7554b02228ce7ffb0feec6a04cab8
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Jun  8 05:40:59 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Jun  8 13:39:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcc5ab33

dev-qt/qtwebengine: drop 6.7.0

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qtwebengine/Manifest|   2 -
 .../files/qtwebengine-6.7.0-clang18.patch  |  96 --
 .../qtwebengine-6.7.0-displaykey-header.patch  |  12 -
 .../files/qtwebengine-6.7.0-ninja1.12.patch|  30 --
 dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild| 333 -
 5 files changed, 473 deletions(-)

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 44d89ade0b0e..f1a827dabed7 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,8 +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-6.tar.xz 8140 BLAKE2B 
773ee76ecf118ce45eb5dbebf4a574c3cff90f50cd87a469511688ed77db7a96012bec0dd03312bf2d366d709d95a2ac3432e9e0bd5a517b69a5bbd250a94420
 SHA512 
4db6abbd2a598f8194b9ba7035abad7228f6056fc5e5572329a9a0474f36135428b401edf5fa96e1ac866328d078b015fffd90949ef84f1cea9a1b39e5b9d5ff
 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.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/files/qtwebengine-6.7.0-clang18.patch 
b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-clang18.patch
deleted file mode 100644
index c5ae8cc17c5a..
--- a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-clang18.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-Patch status: fixed in >=chromium-122.0.6200.0
-
-https://bugs.gentoo.org/925486
-https://webrtc-review.googlesource.com/c/src/+/332240
-https://webrtc.googlesource.com/src/+/267f9bdd5
-From: Tommi 
-Date: Thu, 21 Dec 2023 14:08:26 +0100
-Subject: [PATCH] Update LegacyStatsCollector to conform with Wc++11-narrowing
 a/src/3rdparty/chromium/third_party/webrtc/pc/legacy_stats_collector.cc
-+++ b/src/3rdparty/chromium/third_party/webrtc/pc/legacy_stats_collector.cc
-@@ -189,7 +189,8 @@
-   {StatsReport::kStatsValueNamePreemptiveExpandRate,
-info.preemptive_expand_rate},
--  {StatsReport::kStatsValueNameTotalAudioEnergy, 
info.total_output_energy},
-+  {StatsReport::kStatsValueNameTotalAudioEnergy,
-+   static_cast(info.total_output_energy)},
-   {StatsReport::kStatsValueNameTotalSamplesDuration,
--   info.total_output_duration}};
-+   static_cast(info.total_output_duration)}};
- 
-   const IntForAdd ints[] = {
-@@ -245,7 +246,8 @@
- 
-   const FloatForAdd floats[] = {
--  {StatsReport::kStatsValueNameTotalAudioEnergy, info.total_input_energy},
-+  {StatsReport::kStatsValueNameTotalAudioEnergy,
-+   

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-06-07 Thread Arthur Zamarin
commit: 040b437fbe9194901332ec26eb42a2fd92fd8e33
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jun  8 05:25:51 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jun  8 05:25:51 2024 +
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  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="



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-06-06 Thread Andreas Sturmlechner
commit: 5fdbc5e26e6df381ff996050ec1a96f10460d0f1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jun  6 16:41:17 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jun  6 16:43:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5fdbc5e2

dev-qt/qtwebengine: drop 5.15.13_p20240510

Signed-off-by: Andreas Sturmlechner  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..
--- 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? ( 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-06-04 Thread Ionen Wolkens
commit: b6c46bfbe2c42dad635fff9e636516730aa2
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Jun  4 08:16:59 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Jun  4 19:30:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6c46bfb

dev-qt/qtwebengine: add 6.8.

Not really tested yet beside checking that the patches apply.

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qtwebengine/qtwebengine-6.8..ebuild | 334 +
 1 file changed, 334 insertions(+)

diff --git a/dev-qt/qtwebengine/qtwebengine-6.8..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.8..ebuild
new file mode 100644
index ..503abab72225
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-6.8..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. ]] || # too fragile for 6., but keep for 6.x.
+   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 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-06-01 Thread Sam James
commit: 2b9f8a680eecca8f9749be6bad62d6b55b54297f
Author: Sam James  gentoo  org>
AuthorDate: Sun Jun  2 04:03:18 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun  2 04:03:18 2024 +
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  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="



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-06-01 Thread Arthur Zamarin
commit: 8891ce78eb8356fa483d957f863b1bc0b9322ff8
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Jun  1 09:36:10 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Jun  1 10:25:32 2024 +
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  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"



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-05-31 Thread Andreas Sturmlechner
commit: 5f7f0fb0b879df3ba83421f5132f3e320a3bd960
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri May 31 06:11:16 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri May 31 06:12:14 2024 +
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  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



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/

2024-05-30 Thread Andreas Sturmlechner
commit: 1e39f42e95f96eb7fbff4b8510d61f95d23afd0d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu May 30 12:06:21 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu May 30 12:34:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e39f42e

dev-qt/qtwebengine: Fix build w/ ICU-75

Patch sourced from Arch Linux.

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../qtwebengine-5.15.14_p20240510-icu-75.patch | 102 +
 .../qtwebengine-5.15.14_p20240510.ebuild   |   3 +
 2 files changed, 105 insertions(+)

diff --git 
a/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-icu-75.patch 
b/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-icu-75.patch
new file mode 100644
index ..d17e4ae602f2
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.14_p20240510-icu-75.patch
@@ -0,0 +1,102 @@
+Thanks to Arch Linux:
+https://gitlab.archlinux.org/archlinux/packaging/packages/qt5-webengine/-/blob/main/qt5-webengine-icu-75.patch?ref_type=heads
+
+diff --git a/src/3rdparty/chromium/build/config/compiler/BUILD.gn 
b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+index b511a58c5a8..abd78a74ead 100644
+--- a/src/3rdparty/chromium/build/config/compiler/BUILD.gn
 b/src/3rdparty/chromium/build/config/compiler/BUILD.gn
+@@ -566,7 +566,7 @@ config("compiler") {
+   # Override Chromium's default for projects that wish to stay on C++11.
+   cflags_cc += [ "-std=${standard_prefix}++11" ]
+ } else {
+-  cflags_cc += [ "-std=${standard_prefix}++14" ]
++  cflags_cc += [ "-std=${standard_prefix}++17" ]
+ }
+   } else if (!is_win && !is_nacl) {
+ if (target_os == "android") {
+diff --git 
a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h
 
b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h
+index f03ba1e4ab4..b1495f7ae74 100644
+--- 
a/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h
 
b/src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc_constants.h
+@@ -195,7 +195,7 @@ NumPartitionPagesPerSuperPage() {
+ //
+ // __STDCPP_DEFAULT_NEW_ALIGNMENT__ is C++17. As such, it is not defined on 
all
+ // platforms, as Chrome's requirement is C++14 as of 2020.
+-#if defined(__STDCPP_DEFAULT_NEW_ALIGNMENT__)
++#if 0
+ static constexpr size_t kAlignment =
+ std::max(alignof(std::max_align_t), __STDCPP_DEFAULT_NEW_ALIGNMENT__);
+ #else
+diff --git 
a/src/3rdparty/chromium/third_party/webrtc/common_video/h264/sps_parser.h 
b/src/3rdparty/chromium/third_party/webrtc/common_video/h264/sps_parser.h
+index 76e627d27a3..942435f44a0 100644
+--- a/src/3rdparty/chromium/third_party/webrtc/common_video/h264/sps_parser.h
 b/src/3rdparty/chromium/third_party/webrtc/common_video/h264/sps_parser.h
+@@ -12,6 +12,7 @@
+ #define COMMON_VIDEO_H264_SPS_PARSER_H_
+ 
+ #include "absl/types/optional.h"
++#include 
+ 
+ namespace rtc {
+ class BitBuffer;
+diff --git 
a/src/3rdparty/chromium/third_party/webrtc/common_video/h264/pps_parser.h 
b/src/3rdparty/chromium/third_party/webrtc/common_video/h264/pps_parser.h
+index d6c31b06887..d8852dfd186 100644
+--- a/src/3rdparty/chromium/third_party/webrtc/common_video/h264/pps_parser.h
 b/src/3rdparty/chromium/third_party/webrtc/common_video/h264/pps_parser.h
+@@ -12,6 +12,7 @@
+ #define COMMON_VIDEO_H264_PPS_PARSER_H_
+ 
+ #include "absl/types/optional.h"
++#include 
+ 
+ namespace rtc {
+ class BitBuffer;
+diff --git 
a/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/reverb_model_estimator.h
 
b/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/reverb_model_estimator.h
+index 3b9971abae1..d4458038527 100644
+--- 
a/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/reverb_model_estimator.h
 
b/src/3rdparty/chromium/third_party/webrtc/modules/audio_processing/aec3/reverb_model_estimator.h
+@@ -13,6 +13,7 @@
+ 
+ #include 
+ #include 
++#include 
+ 
+ #include "absl/types/optional.h"
+ #include "api/array_view.h"
+diff --git 
a/src/3rdparty/chromium/third_party/webrtc/modules/include/module_common_types_public.h
 
b/src/3rdparty/chromium/third_party/webrtc/modules/include/module_common_types_public.h
+index 345e45ce127..e686e5d691a 100644
+--- 
a/src/3rdparty/chromium/third_party/webrtc/modules/include/module_common_types_public.h
 
b/src/3rdparty/chromium/third_party/webrtc/modules/include/module_common_types_public.h
+@@ -12,6 +12,7 @@
+ #define MODULES_INCLUDE_MODULE_COMMON_TYPES_PUBLIC_H_
+ 
+ #include 
++#include 
+ 
+ #include "absl/types/optional.h"
+ 
+diff --git 
a/src/3rdparty/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc
 
b/src/3rdparty/chromium/third_party/blink/renderer/core/page/scrolling/text_fragment_selector_generator.cc
+index 8fcc799b795..bc69ddcf18c 100644
+--- 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-05-30 Thread Andreas Sturmlechner
commit: 97d175b281a41ab520956d2d4f9cac7c5df533de
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu May 30 12:01:01 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu May 30 12:34:41 2024 +
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  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



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-05-30 Thread Andreas Sturmlechner
commit: 957412b2d9b7b92b2f77cb3358345ee8086b7a12
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu May 30 10:22:10 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu May 30 12:34:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=957412b2

dev-qt/qtwebengine: add 5.15.14_p20240510

Signed-off-by: Andreas Sturmlechner  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 ..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
+   # 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/

2024-05-23 Thread Andreas Sturmlechner
commit: 50a6e3e045ea76761e442d15cc917e0159161f53
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed May 22 17:08:24 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu May 23 16:01:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50a6e3e0

dev-qt/qtwebengine: drop vulnerable 5.15.13_p20240322

Bug: https://bugs.gentoo.org/931960
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtwebengine/Manifest|   1 -
 .../qtwebengine-5.15.13_p20240322-ninja1.12.patch  |  23 --
 .../qtwebengine-5.15.13_p20240322.ebuild   | 247 -
 3 files changed, 271 deletions(-)

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 4bfa9d6ff21c..8eddd1481bd2 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,5 +1,4 @@
 DIST qtwebengine-5.15.13_p20240322-patchset.tar.xz 26112 BLAKE2B 
21eb036520e052f28d7579022d84d4b7136521d025569b22653229d8099140a99726ce5ddebced0d9aa113d3e215fc023ad042a372f2318dfc7cafe5d9e397c9
 SHA512 
cbc4373ed6a107a3fd2bf1cb73c96e3c00b4428410933dbb1b1eb5116de22e29ca5e102702e1f6f8a12abff6b60ea072b84e77da64c6d60e360bf0ad2e542166
-DIST qtwebengine-5.15.13_p20240322.tar.xz 301394204 BLAKE2B 
f9bb5bb79edbe0bc862a718feb3b11a56d8c6d2eee1dd711c9b4460f64308fdfbaa4c3551eebad3af5844564a49703574a7fb9d74e15abd0a6aeb8c707a14059
 SHA512 
b1f459fbb3d21118043a53ce6e292c6a45f8512830f4dbf6982713970f980ccfb8c1ea1c1d7ce373991632de8c44b5053fa1ccb883e19cd8f35a961e67472f5a
 DIST qtwebengine-5.15.13_p20240510.tar.xz 301422784 BLAKE2B 
b63acccb4740ddb3dd5c76ef9808d946eb2c93b10b45125622adcb5c5e951644ac54612e7aeb9e009e00c5ca8913d3f8b5dfa530c274fec87c4a8377bf1068fb
 SHA512 
0ccc1be0825f4cf2387879241a21f033b5a0198da4e93f2e0533296ec485b103c1ab35aa71a2a9d9c16364979d45d3dd2e13f7e6d0e2a21f94d85294c5819eb3
 DIST qtwebengine-6.7-patchset-6.tar.xz 8140 BLAKE2B 
773ee76ecf118ce45eb5dbebf4a574c3cff90f50cd87a469511688ed77db7a96012bec0dd03312bf2d366d709d95a2ac3432e9e0bd5a517b69a5bbd250a94420
 SHA512 
4db6abbd2a598f8194b9ba7035abad7228f6056fc5e5572329a9a0474f36135428b401edf5fa96e1ac866328d078b015fffd90949ef84f1cea9a1b39e5b9d5ff
 DIST qtwebengine-6.7-patchset-8.tar.xz 8320 BLAKE2B 
88f31506865aeef02d6ad0c46dacd478f4c77330815648bf5377762b9f053f5a51b6426c1fbeef81fff5c3a9f4e853f8d51013d5df27fcd0ab0449ce369e18e5
 SHA512 
1d8e1f8e15a13c6f1675208ba1a329dfa335031e06577de39dc89464b40bd5cf7df7bce4f09f6e67a84c1c2f7aa1fbf6d2d94ea8c142ec5ea67bac8cef1b03b1

diff --git 
a/dev-qt/qtwebengine/files/qtwebengine-5.15.13_p20240322-ninja1.12.patch 
b/dev-qt/qtwebengine/files/qtwebengine-5.15.13_p20240322-ninja1.12.patch
deleted file mode 100644
index 2da3dc27fab2..
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.13_p20240322-ninja1.12.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Quoting the description from qtwebengine-6.7.0-ninja1.12.patch:
-"""
-Patch status: pending being looked at upstream
-
-Issue[1][2][3] also exist in chromium itself[4], and unclear
-why this started happening only with ninja-1.12.0 at the moment.
-
-Just a quickfix, likely not fully correct and seems there may
-be further unresolved race issues.
-
-[1] https://bugs.gentoo.org/930107
-[2] https://bugreports.qt.io/browse/QTBUG-124375
-[3] https://github.com/ninja-build/ninja/issues/2417
-[4] https://bugs.gentoo.org/930112
-"""
-
-This has a hunk removed but is otherwise the same.
 a/src/3rdparty/chromium/content/browser/BUILD.gn
-+++ b/src/3rdparty/chromium/content/browser/BUILD.gn
-@@ -198,2 +198,3 @@
- "//components/services/storage/public/mojom",
-+"//components/spellcheck:buildflags",
- "//components/sqlite_proto",

diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240322.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240322.ebuild
deleted file mode 100644
index c8cd5e9574d1..
--- a/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240322.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PATCHSET="${PN}-5.15.13_p20240322-patchset"
-PYTHON_COMPAT=( python3_{10..11} )
-PYTHON_REQ_USE="xml(+)"
-inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build 
toolchain-funcs
-
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML 
applications"
-HOMEPAGE="https://www.qt.io/;
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-   KEYWORDS="amd64 arm64 ~x86"
-   if [[ ${PV} == ${QT5_PV}_p* ]]; then
-   SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz;
-   S="${WORKDIR}/${P}"
-   QT5_BUILD_DIR="${S}_build"
-   fi
-else
-   EGIT_BRANCH="5.15"
-   EGIT_REPO_URI=(
-   "https://code.qt.io/qt/${QT5_MODULE}.git;
-   "https://github.com/qt/${QT5_MODULE}.git;
-   )
-   inherit git-r3
-fi
-
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz;
-

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-05-22 Thread Arthur Zamarin
commit: 97f6191c9ddd554b508449278fa2d7c083904c3d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu May 23 03:35:56 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu May 23 03:35:56 2024 +
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  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}"



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-05-22 Thread Sam James
commit: 134a587cb1e2067712125b90ac36c99c731ffab5
Author: Sam James  gentoo  org>
AuthorDate: Wed May 22 17:03:01 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed May 22 17:03:01 2024 +
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  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}"



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-05-21 Thread Ionen Wolkens
commit: e66c77828f3a44486b6e6ba1fdff4b46bbe0ac52
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue May 21 06:50:19 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue May 21 06:53:02 2024 +
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  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.



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-05-20 Thread Ionen Wolkens
commit: 8703befb84a1d6f2d60141d341a0555c7cd286d6
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon May 20 08:25:13 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon May 20 08:45:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8703befb

dev-qt/qtwebengine: add 6.7.1

Signed-off-by: Ionen Wolkens  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 ..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? ( 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-05-17 Thread Ionen Wolkens
commit: bcec86406f541175ae8e3c273bf8f4cc18c0372a
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri May 17 06:06:17 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri May 17 10:08:33 2024 +
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  gentoo.org>

 dev-qt/qtwebengine/Manifest| 2 +-
 dev-qt/qtwebengine/qtwebengine-6.7..ebuild | 2 +-
 dev-qt/qtwebengine/qtwebengine-6..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 
282481e78f3fbc7351dba0e70025e33c9ba78dcd67200a9762ee7c884d279253b1a4cb50652fcd41bbf64e11e6486b17759c0335636531a81022e5cf8aab
 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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
index 20e7cb3baaa6..a5407eb45c18 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6..ebuild
index 20e7cb3baaa6..a5407eb45c18 100644
--- a/dev-qt/qtwebengine/qtwebengine-6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6..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



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-05-16 Thread Ionen Wolkens
commit: 43fecd92f7197cbeb286843f239a09fb994cecef
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri May 17 01:23:40 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri May 17 04:16:36 2024 +
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  gentoo.org>

 dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild| 3 ++-
 dev-qt/qtwebengine/qtwebengine-6.7..ebuild | 3 ++-
 dev-qt/qtwebengine/qtwebengine-6..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 '=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 '=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 '

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-05-15 Thread Andreas Sturmlechner
commit: a6496c97480d7817363d7d0c230c8332969745b3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue May 14 18:34:40 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed May 15 18:08:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6496c97

dev-qt/qtwebengine: add 5.15.13_p20240510

Signed-off-by: Andreas Sturmlechner  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 
282481e78f3fbc7351dba0e70025e33c9ba78dcd67200a9762ee7c884d279253b1a4cb50652fcd41bbf64e11e6486b17759c0335636531a81022e5cf8aab
 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 ..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
+   

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-05-12 Thread Ionen Wolkens
commit: 544cb92a031bc2c68a705945f8e0b43a5d01ce59
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon May 13 01:36:46 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon May 13 05:48:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=544cb92a

dev-qt/qtwebengine: enable py3.13 (qt6)

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild| 2 +-
 dev-qt/qtwebengine/qtwebengine-6.7..ebuild | 2 +-
 dev-qt/qtwebengine/qtwebengine-6..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
index 75871dab769b..df7ff429e088 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6..ebuild
index 75871dab769b..df7ff429e088 100644
--- a/dev-qt/qtwebengine/qtwebengine-6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6..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



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-05-10 Thread Ionen Wolkens
commit: a167b24a4097bb2d462875285b170818a7336eb0
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri May 10 10:25:16 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri May 10 10:25:16 2024 +
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  gentoo.org>

 dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild| 1 +
 dev-qt/qtwebengine/qtwebengine-6.7..ebuild | 1 +
 dev-qt/qtwebengine/qtwebengine-6..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
index bba17446d874..75871dab769b 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6..ebuild
index bba17446d874..75871dab769b 100644
--- a/dev-qt/qtwebengine/qtwebengine-6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6..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} &&



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-05-09 Thread Ionen Wolkens
commit: 754d6f5226a532ed086afa276b48e89ffafe0484
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu May  9 08:19:17 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu May  9 12:12:58 2024 +
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  gentoo.org>

 dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild| 18 +++---
 dev-qt/qtwebengine/qtwebengine-6.7..ebuild | 18 +++---
 dev-qt/qtwebengine/qtwebengine-6..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  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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
index 750f700160b2..bba17446d874 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7..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 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-05-08 Thread Ionen Wolkens
commit: 7f3dcfe18e8f64b9f69ff8b16a2e5bfe440473a9
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed May  8 08:54:14 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed May  8 16:17:44 2024 +
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  gentoo.org>

 dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild| 11 +++
 dev-qt/qtwebengine/qtwebengine-6.7..ebuild | 11 +++
 dev-qt/qtwebengine/qtwebengine-6..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  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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
index 6dc080fed1e4..750f700160b2 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7..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  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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6..ebuild
index 6dc080fed1e4..750f700160b2 100644
--- a/dev-qt/qtwebengine/qtwebengine-6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6..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  without 
'evex512')
+   use amd64 && tc-is-clang && [[ $(clang-major-version) -ge 18 ]] 
&&
+   filter-flags -march=native
fi
 
export NINJA NINJAFLAGS=$(get_NINJAOPTS)



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/

2024-04-29 Thread Sam James
commit: e209990c6d94a01863c46f3285cdd18d0ec98201
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 29 23:50:28 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 29 23:50:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e209990c

dev-qt/qtwebengine: fix build w/ ninja-1.12 for qt5

Same as Ionen's patch for qt6 but with a hunk removed.

Closes: https://bugs.gentoo.org/930107
Signed-off-by: Sam James  gentoo.org>

 .../qtwebengine-5.15.13_p20240322-ninja1.12.patch  | 23 ++
 .../qtwebengine-5.15.13_p20240322.ebuild   |  5 -
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git 
a/dev-qt/qtwebengine/files/qtwebengine-5.15.13_p20240322-ninja1.12.patch 
b/dev-qt/qtwebengine/files/qtwebengine-5.15.13_p20240322-ninja1.12.patch
new file mode 100644
index ..2da3dc27fab2
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.13_p20240322-ninja1.12.patch
@@ -0,0 +1,23 @@
+Quoting the description from qtwebengine-6.7.0-ninja1.12.patch:
+"""
+Patch status: pending being looked at upstream
+
+Issue[1][2][3] also exist in chromium itself[4], and unclear
+why this started happening only with ninja-1.12.0 at the moment.
+
+Just a quickfix, likely not fully correct and seems there may
+be further unresolved race issues.
+
+[1] https://bugs.gentoo.org/930107
+[2] https://bugreports.qt.io/browse/QTBUG-124375
+[3] https://github.com/ninja-build/ninja/issues/2417
+[4] https://bugs.gentoo.org/930112
+"""
+
+This has a hunk removed but is otherwise the same.
+--- a/src/3rdparty/chromium/content/browser/BUILD.gn
 b/src/3rdparty/chromium/content/browser/BUILD.gn
+@@ -198,2 +198,3 @@
+ "//components/services/storage/public/mojom",
++"//components/spellcheck:buildflags",
+ "//components/sqlite_proto",

diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240322.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240322.ebuild
index 22bb5cdc0734..c8cd5e9574d1 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240322.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.13_p20240322.ebuild
@@ -98,7 +98,10 @@ BDEPEND="${PYTHON_DEPS}
sys-devel/flex
 "
 
-PATCHES=( "${WORKDIR}/${PATCHSET}" )
+PATCHES=(
+   "${WORKDIR}/${PATCHSET}"
+   "${FILESDIR}"/qtwebengine-5.15.13_p20240322-ninja1.12.patch
+)
 
 qtwebengine_check-reqs() {
# bug #307861



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-04-23 Thread Ionen Wolkens
commit: 16c6810ab658ec0606551f0835ec8687c580fe48
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Apr 23 12:27:25 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Apr 23 15:07:40 2024 +
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  gentoo.org>

 dev-qt/qtwebengine/Manifest| 1 +
 dev-qt/qtwebengine/qtwebengine-6.7..ebuild | 5 +
 dev-qt/qtwebengine/qtwebengine-6..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 
282481e78f3fbc7351dba0e70025e33c9ba78dcd67200a9762ee7c884d279253b1a4cb50652fcd41bbf64e11e6486b17759c0335636531a81022e5cf8aab
 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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
index f9dd54161654..6dc080fed1e4 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6..ebuild
index 501485c774f4..6dc080fed1e4 100644
--- a/dev-qt/qtwebengine/qtwebengine-6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6..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



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/

2024-04-19 Thread Ionen Wolkens
commit: 787bfd67fdfc588356dfc798ec3a093926455634
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Apr 19 07:25:46 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Apr 19 07:52:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=787bfd67

dev-qt/qtwebengine: drop 6.6.2, 6.6.3

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qtwebengine/Manifest|   4 -
 .../files/qtwebengine-6.6.2-clang18.patch  |  80 --
 dev-qt/qtwebengine/qtwebengine-6.6.2.ebuild| 314 -
 dev-qt/qtwebengine/qtwebengine-6.6.3.ebuild| 313 
 4 files changed, 711 deletions(-)

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index a6606fb6f91b..55c0e432a96a 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,8 +1,4 @@
 DIST qtwebengine-5.15.13_p20240322-patchset.tar.xz 26112 BLAKE2B 
21eb036520e052f28d7579022d84d4b7136521d025569b22653229d8099140a99726ce5ddebced0d9aa113d3e215fc023ad042a372f2318dfc7cafe5d9e397c9
 SHA512 
cbc4373ed6a107a3fd2bf1cb73c96e3c00b4428410933dbb1b1eb5116de22e29ca5e102702e1f6f8a12abff6b60ea072b84e77da64c6d60e360bf0ad2e542166
 DIST qtwebengine-5.15.13_p20240322.tar.xz 301394204 BLAKE2B 
f9bb5bb79edbe0bc862a718feb3b11a56d8c6d2eee1dd711c9b4460f64308fdfbaa4c3551eebad3af5844564a49703574a7fb9d74e15abd0a6aeb8c707a14059
 SHA512 
b1f459fbb3d21118043a53ce6e292c6a45f8512830f4dbf6982713970f980ccfb8c1ea1c1d7ce373991632de8c44b5053fa1ccb883e19cd8f35a961e67472f5a
-DIST qtwebengine-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
-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/files/qtwebengine-6.6.2-clang18.patch 
b/dev-qt/qtwebengine/files/qtwebengine-6.6.2-clang18.patch
deleted file mode 100644
index 97dbe299c2b3..
--- a/dev-qt/qtwebengine/files/qtwebengine-6.6.2-clang18.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Patch status: fixed in >=chromium-122.0.6200.0
-
-https://bugs.gentoo.org/925486
-https://webrtc.googlesource.com/src/+/267f9bdd5
-https://webrtc-review.googlesource.com/c/src/+/332240
 a/src/3rdparty/chromium/third_party/webrtc/pc/legacy_stats_collector.cc
-+++ b/src/3rdparty/chromium/third_party/webrtc/pc/legacy_stats_collector.cc
-@@ -190,7 +190,7 @@
-   {StatsReport::kStatsValueNamePreemptiveExpandRate,
-info.preemptive_expand_rate},
--  {StatsReport::kStatsValueNameTotalAudioEnergy, 
info.total_output_energy},
-+  {StatsReport::kStatsValueNameTotalAudioEnergy, 
static_cast(info.total_output_energy)},
-   {StatsReport::kStatsValueNameTotalSamplesDuration,
--   info.total_output_duration}};
-+   static_cast(info.total_output_duration)}};
- 
-   const IntForAdd ints[] = {
-@@ -246,7 +246,7 @@
- 
-   const FloatForAdd floats[] = {
--  {StatsReport::kStatsValueNameTotalAudioEnergy, info.total_input_energy},
-+  {StatsReport::kStatsValueNameTotalAudioEnergy, 
static_cast(info.total_input_energy)},
-   {StatsReport::kStatsValueNameTotalSamplesDuration,
--   info.total_input_duration}};
-+   

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/

2024-04-18 Thread Conrad Kostecki
commit: 9ddfb399a442cf366fc13bf042e49d0c233898fc
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Thu Apr 18 18:05:17 2024 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Thu Apr 18 19:31:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ddfb399

dev-qt/qtwebengine: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../files/qtwebengine-5.15.2-enable-ppc64.patch| 37 --
 1 file changed, 37 deletions(-)

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-enable-ppc64.patch 
b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-enable-ppc64.patch
deleted file mode 100644
index 4fb19ccdd2e5..
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-enable-ppc64.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 463f1234c57a36e78ff666bd55094a9d4e68f296 Mon Sep 17 00:00:00 2001
-From: q66 
-Date: Sat, 18 Jan 2020 23:52:55 +0100
-Subject: [PATCH 1/3] Enable ppc64 builds
-

- configure.pri  | 1 +
- mkspecs/features/functions.prf | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/configure.pri b/configure.pri
-index 3a144e3f8..cabe8b24a 100644
 a/configure.pri2021-02-24 10:45:58.0 +0100
-+++ -  2021-03-07 21:18:43.124754796 +0100
-@@ -144,6 +144,7 @@
- contains(QT_ARCH, "arm")|contains(QT_ARCH, "arm64"): return(true)
- contains(QT_ARCH, "mips"): return(true)
- contains(QT_ARCH, "mips64"): return(true)
-+contains(QT_ARCH, "power64"): return(true)
- qtLog("Architecture not supported.")
- return(false)
- }
-diff --git a/mkspecs/features/functions.prf b/mkspecs/features/functions.prf
-index 512e2523b..e31123654 100644
 a/mkspecs/features/functions.prf   2021-02-24 10:45:58.0 +0100
-+++ -  2021-03-07 21:19:21.345036293 +0100
-@@ -107,6 +107,7 @@
- contains(qtArch, "mips"): return(mipsel)
- contains(qtArch, "mips64"): return(mips64el)
- contains(qtArch, "mips64el"): return(mips64el)
-+contains(qtArch, "power64"): return(ppc64)
- return(unknown)
- }
- 
--- 
-2.26.0
-



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/

2024-04-17 Thread Ionen Wolkens
commit: 865b42c15b520af89040fd4a6e6e6c4cd54125c2
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Apr 17 09:47:57 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Apr 17 10:16:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=865b42c1

dev-qt/qtwebengine: add one more race fix for ninja-1.12 (Qt6)

Bug: https://bugs.gentoo.org/930107
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch | 12 
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch 
b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch
index cd6f6a3cc89d..2d12daccd224 100644
--- a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch
@@ -3,15 +3,13 @@ Patch status: pending being looked at upstream
 Issue[1][2][3] also exist in chromium itself[4], and unclear
 why this started happening only with ninja-1.12.0 at the moment.
 
-Just a quickfix, likely not correct and seems there may be
-further unresolved race issues[5]. Arguably better to not
-use ninja-1.12.0 for this yet (1.11.1 or samurai are fine).
+Just a quickfix, likely not fully correct and seems there may
+be further unresolved race issues.
 
 [1] https://bugs.gentoo.org/930107
 [2] https://bugreports.qt.io/browse/QTBUG-124375
 [3] https://github.com/ninja-build/ninja/issues/2417
 [4] https://bugs.gentoo.org/930112
-[5] https://bugs.gentoo.org/930107#c17
 --- a/src/3rdparty/chromium/content/browser/BUILD.gn
 +++ b/src/3rdparty/chromium/content/browser/BUILD.gn
 @@ -198,2 +198,3 @@
@@ -24,3 +22,9 @@ use ninja-1.12.0 for this yet (1.11.1 or samurai are fine).
  "//content/public/browser",
 +"//components/web_cache/public/mojom",
  "//extensions/common",
+--- a/src/core/configure/BUILD.root.gn.in
 b/src/core/configure/BUILD.root.gn.in
+@@ -235,2 +235,3 @@
+   deps = [
++"//chrome/app:generated_resources",
+ "//components/zoom",



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/

2024-04-16 Thread Ionen Wolkens
commit: 4bdf521869a34c0534c64493235842e8b92a
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Apr 16 15:20:20 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Apr 17 00:15:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bdf5218

dev-qt/qtwebengine: "improve" build with ninja-1.12 (Qt6)

Most likely more issues, but should hopefully work in most cases
until figure out the rest. Users really having issues may want to
go back to ~ninja-1.11.1 or even app-alternatives/ninja[samurai]
which is known to work for this.

(if issues are widespread, may set a ninja upper bound if don't
find a proper fix at least before the next Qt bump)

Bug: https://bugs.gentoo.org/930107
Signed-off-by: Ionen Wolkens  gentoo.org>

 .../files/qtwebengine-6.7.0-ninja1.12.patch| 26 ++
 dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild|  1 +
 dev-qt/qtwebengine/qtwebengine-6.7..ebuild |  1 +
 3 files changed, 28 insertions(+)

diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch 
b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch
new file mode 100644
index ..cd6f6a3cc89d
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-ninja1.12.patch
@@ -0,0 +1,26 @@
+Patch status: pending being looked at upstream
+
+Issue[1][2][3] also exist in chromium itself[4], and unclear
+why this started happening only with ninja-1.12.0 at the moment.
+
+Just a quickfix, likely not correct and seems there may be
+further unresolved race issues[5]. Arguably better to not
+use ninja-1.12.0 for this yet (1.11.1 or samurai are fine).
+
+[1] https://bugs.gentoo.org/930107
+[2] https://bugreports.qt.io/browse/QTBUG-124375
+[3] https://github.com/ninja-build/ninja/issues/2417
+[4] https://bugs.gentoo.org/930112
+[5] https://bugs.gentoo.org/930107#c17
+--- a/src/3rdparty/chromium/content/browser/BUILD.gn
 b/src/3rdparty/chromium/content/browser/BUILD.gn
+@@ -198,2 +198,3 @@
+ "//components/services/storage/public/mojom",
++"//components/spellcheck:buildflags",
+ "//components/sqlite_proto",
+--- 
a/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn
 
b/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn
+@@ -22,2 +22,3 @@
+ "//content/public/browser",
++"//components/web_cache/public/mojom",
+ "//extensions/common",

diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
index ce4b07c90f2c..1035ff458cd5 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
@@ -108,6 +108,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-ninja1.12.patch
 )
 
 python_check_deps() {

diff --git a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
index bab0b63fc807..aae8a8cfa848 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
@@ -108,6 +108,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-ninja1.12.patch
 )
 
 python_check_deps() {



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/

2024-04-16 Thread Ionen Wolkens
commit: 289d48f871d477edab5f750d307b6cb5eb632331
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Apr 16 15:26:02 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Apr 17 00:15:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=289d48f8

dev-qt/qtwebengine: fix webdriver build under some configurations

Unknown what is causing this to fail exactly, 6.7.0's USE=webdriver
did build fine with all USE enabled last time tested so it could
be related to disabling something while relying on transitive headers.

Bug: https://bugs.gentoo.org/930107
Signed-off-by: Ionen Wolkens  gentoo.org>

 .../files/qtwebengine-6.7.0-displaykey-header.patch  | 12 
 dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild  |  1 +
 dev-qt/qtwebengine/qtwebengine-6.7..ebuild   |  1 +
 3 files changed, 14 insertions(+)

diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.7.0-displaykey-header.patch 
b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-displaykey-header.patch
new file mode 100644
index ..84dce821f80f
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-displaykey-header.patch
@@ -0,0 +1,12 @@
+TODO: merge with glx-headers patch in patchset, similar
+issues that seem to stem from Qt's GLX restoration.
+
+https://bugs.gentoo.org/930107#c8
+--- a/src/3rdparty/chromium/ui/gl/gl_display.h
 b/src/3rdparty/chromium/ui/gl/gl_display.h
+@@ -12,4 +12,5 @@
+ 
+ #include "ui/gl/gl_export.h"
++#include "ui/gl/gpu_preference.h"
+ 
+ #if defined(USE_EGL)

diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
index 1035ff458cd5..997dbaf4ec5f 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild
@@ -109,6 +109,7 @@ 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.7..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
index aae8a8cfa848..f9dd54161654 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
@@ -109,6 +109,7 @@ 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() {



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-04-14 Thread Ionen Wolkens
commit: 12566530e51223f01472b89ab6fdbd898d93111f
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Apr 14 07:40:03 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Apr 14 15:05:53 2024 +
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  gentoo.org>

 dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild| 10 +++---
 dev-qt/qtwebengine/qtwebengine-6.7..ebuild | 10 +++---
 dev-qt/qtwebengine/qtwebengine-6..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
index 69e355090337..bab0b63fc807 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6..ebuild
index 311a9544dc48..501485c774f4 100644
--- a/dev-qt/qtwebengine/qtwebengine-6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6..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="



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-04-13 Thread Ionen Wolkens
commit: c3c8c1ae09b1837167a653c5075be851adf04630
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sat Apr 13 17:43:15 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Apr 13 18:03:21 2024 +
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  gentoo.org>

 dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild| 3 +--
 dev-qt/qtwebengine/qtwebengine-6.7..ebuild | 3 +--
 dev-qt/qtwebengine/qtwebengine-6..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
index 259833ebd793..69e355090337 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6..ebuild
index faf29365b925..311a9544dc48 100644
--- a/dev-qt/qtwebengine/qtwebengine-6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6..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}



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-04-13 Thread Arthur Zamarin
commit: a86092815807ec5e0722b7a710a4474241be786e
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Apr 13 17:49:09 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Apr 13 17:50:54 2024 +
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  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="



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-04-05 Thread Andreas Sturmlechner
commit: 01b2aa626e4e6ba9171d4194c47e2ad74a53f41d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Apr  4 18:34:51 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr  5 15:00:59 2024 +
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  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 
3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db792488098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
 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..
--- 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;
-   

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-04-03 Thread Arthur Zamarin
commit: ab7993fa3d5ac7e8028e884f1f9cda398df33a9b
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Apr  4 04:21:48 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Apr  4 04:21:48 2024 +
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  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}"



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-04-03 Thread Ionen Wolkens
commit: bb7df8565d5c09d2be079b1f8433944d0fc2d090
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Apr  3 17:23:36 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Apr  3 17:23:39 2024 +
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  gentoo.org>

 dev-qt/qtwebengine/Manifest| 2 +-
 dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild| 2 +-
 dev-qt/qtwebengine/qtwebengine-6.7..ebuild | 2 +-
 dev-qt/qtwebengine/qtwebengine-6..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 
3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db792488098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
 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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
index 0d3fe2a590fb..259833ebd793 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7..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 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-04-03 Thread Ionen Wolkens
commit: 9499943107a60a8201d78a1bbe2bc34f32a2ab21
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Apr  3 16:59:25 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Apr  3 16:59:25 2024 +
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  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 
3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db792488098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
 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..
--- 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
-   

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-04-03 Thread Andreas Sturmlechner
commit: 8c24f0e96673243f8c1ad4babd3067da873f599e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Apr  3 15:20:47 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Apr  3 15:25:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c24f0e9

dev-qt/qtwebengine: add 5.15.13_p20240327

Signed-off-by: Andreas Sturmlechner  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 
3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db792488098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
 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 ..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}*
+   

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/

2024-04-02 Thread Ionen Wolkens
commit: 03a99428d35fcd93b2073cae67228807a23829c3
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Apr  3 03:47:53 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Apr  3 03:56:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03a99428

dev-qt/qtwebengine: update patchset for 6.6 and 6.7 branches

6.6-9 -> 6.6-10 changes:
  Added:
  * clang18.patch (imported from files/)
  Updated:
  * cstdint.patch (for bug #928466)

6.7-4 -> 6.7-5 changes:
  Added:
  * x11-header.patch (imported from files/)
  ...not adding clang18 given expect it to be fixed upstream soon
  Updated:
  * cstdint.patch (for bug #928466)
  ...gcc+musl still untested for 6.7.0, but updating what's known

Closes: https://bugs.gentoo.org/928466
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qtwebengine/Manifest|  3 ++-
 .../files/qtwebengine-6.7.0-x11-header.patch   | 22 --
 dev-qt/qtwebengine/qtwebengine-6.6.3.ebuild|  3 +--
 dev-qt/qtwebengine/qtwebengine-6.7.0.ebuild|  3 +--
 dev-qt/qtwebengine/qtwebengine-6.7..ebuild |  3 +--
 dev-qt/qtwebengine/qtwebengine-6..ebuild   |  2 +-
 6 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 1013b1f6ab01..0d2fb09def52 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -4,8 +4,9 @@ DIST qtwebengine-5.15.12_p20240122.tar.xz 299226288 BLAKE2B 
a16a2f428c4a3e7c681e
 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 
3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db792488098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
+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-4.tar.xz 7792 BLAKE2B 
99250f9c807870aeff0eafccd4a27c224785e34b21ba8dc9e663741cf123ebda6501b8f3d7b1e274cb4e543fe1f9d3fbb1ea54de85fcde4d11d2388f97674a60
 SHA512 
28dfb2c6c74a971f407e793f43b1224af5b2dac1c1b053badfee23e54d8fe6c390498a88d4da9d8f0de66f579234b1ccca527fc44997dd185ab1f570fbf63203
+DIST qtwebengine-6.7-patchset-5.tar.xz 8108 BLAKE2B 
60c77597992dcdbc758406fe6638f41cc0a542601812cf882c1e0a49ece15f1635c326dbc071966fc70ad3cf94c7fe91e34812a5e905205b41e8350c9fae2926
 SHA512 
a858f76e523a70bbf790b5438d3f0cdc4105e95305086ec11473f22582ea2eaddd20b3787599a3ced65cc3c8df01b5574937bf394a0f702584fff02bf35c2d1e
 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/files/qtwebengine-6.7.0-x11-header.patch 
b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-x11-header.patch
deleted file mode 100644
index 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-04-02 Thread Ionen Wolkens
commit: c1abc1d9a042475f51ecabe34fafa77c763ea124
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Apr  2 12:07:52 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Apr  2 13:05:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1abc1d9

dev-qt/qtwebengine: add 6.7.0

Signed-off-by: Ionen Wolkens  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 ..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="
+ 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-04-02 Thread Arthur Zamarin
commit: 101862818421effdbabfff71cfca8c17914426e6
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Apr  2 05:55:46 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Apr  2 05:55:46 2024 +
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  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="



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-04-01 Thread Arthur Zamarin
commit: 1c00dcb9d2bd73f3c9991a8aae2a1a12888e2c30
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Mon Apr  1 18:28:06 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Mon Apr  1 18:28:06 2024 +
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  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="



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-03-29 Thread Ionen Wolkens
commit: 9db87425dc16058028137425166af6cc858885fa
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Mar 29 22:22:49 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Mar 30 00:27:55 2024 +
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  gentoo.org>

 dev-qt/qtwebengine/qtwebengine-6.7..ebuild | 4 
 dev-qt/qtwebengine/qtwebengine-6..ebuild   | 4 
 2 files changed, 8 insertions(+)

diff --git a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
index a3998d60bc35..e8636461bcc4 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6..ebuild
index 1e77e0077e41..a7523d65072f 100644
--- a/dev-qt/qtwebengine/qtwebengine-6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6..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() {



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-03-29 Thread Ionen Wolkens
commit: ed980f570a62b31575e0adcd93dda95ecd09fdba
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Mar 29 18:34:01 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Mar 30 00:27:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed980f57

dev-qt/qtwebengine: apply x11-header.patch to 6.7. as well

May need this for longer than I thought.

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qtwebengine/qtwebengine-6.7..ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
index dcc7ec6d9b87..a3998d60bc35 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7..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() {



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-03-29 Thread Ionen Wolkens
commit: 91c54543e3a9b8fb56d786c98e6718d7d92d6ae0
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Mar 29 22:16:52 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sat Mar 30 00:27:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91c54543

dev-qt/qtwebengine: drop 6.6.

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qtwebengine/qtwebengine-6.6..ebuild | 314 -
 1 file changed, 314 deletions(-)

diff --git a/dev-qt/qtwebengine/qtwebengine-6.6..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
deleted file mode 100644
index 378b562a6fb0..
--- a/dev-qt/qtwebengine/qtwebengine-6.6..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. ]] || # too fragile for 6., but keep for 6.x.
-   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 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-03-26 Thread Ionen Wolkens
commit: 7b7714c0909169449919fb3c3645691741158255
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Mar 26 06:57:56 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Mar 26 07:08:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b7714c0

dev-qt/qtwebengine: add 6.6.3

Signed-off-by: Ionen Wolkens  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 ..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? ( 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-03-24 Thread Ionen Wolkens
commit: 50d091a2d1990adfd73aa8bdcdaa23571b20981b
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Mar 24 12:15:28 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Mar 24 18:37:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50d091a2

dev-qt/qtwebengine: drop 6.7.0_rc

Signed-off-by: Ionen Wolkens  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..
--- 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:=
-   

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-03-23 Thread Andreas Sturmlechner
commit: e50e0290feb058519b96767bc8cf903b6715a60e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Mar 23 12:34:45 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Mar 23 16:59:44 2024 +
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  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 
3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db792488098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
 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 ..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:=
+  

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/

2024-03-22 Thread Ionen Wolkens
commit: cb122c4d819496c6384278d7817855e5740d1670
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Mar 22 08:59:29 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Fri Mar 22 10:28:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb122c4d

dev-qt/qtwebengine: add 6.7.0_rc2

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qtwebengine/Manifest|   1 +
 .../files/qtwebengine-6.7.0-x11-header.patch   |  22 ++
 dev-qt/qtwebengine/qtwebengine-6.7.0_rc2.ebuild| 324 +
 3 files changed, 347 insertions(+)

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 236860df927f..5156f41feac0 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -6,3 +6,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.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/files/qtwebengine-6.7.0-x11-header.patch 
b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-x11-header.patch
new file mode 100644
index ..0951f2903dbb
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.7.0-x11-header.patch
@@ -0,0 +1,22 @@
+May possibly be working for upstream due to transitive headers,
+needs more looking into.
+
+Without this:
+
+gl_display.cc:945:10: error: 'x11' has not been declared
+  945 |   return x11::Connection::Get()->GetXlibDisplay();
+
+Likely a regression from [1].
+
+[1] 
https://github.com/qt/qtwebengine-chromium/commit/f2b407a61bea122d18a012f0049ba193725f0461
+--- a/src/3rdparty/chromium/ui/gl/gl_display.cc
 b/src/3rdparty/chromium/ui/gl/gl_display.cc
+@@ -29,4 +29,8 @@
+ #include "ui/gl/gl_surface.h"
+ 
++#if defined(USE_GLX)
++#include "ui/gfx/x/connection.h"
++#endif
++
+ #if BUILDFLAG(IS_OZONE)
+ #include "ui/ozone/buildflags.h"

diff --git a/dev-qt/qtwebengine/qtwebengine-6.7.0_rc2.ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7.0_rc2.ebuild
new file mode 100644
index ..a3998d60bc35
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-6.7.0_rc2.ebuild
@@ -0,0 +1,324 @@
+# 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]
+   

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-03-22 Thread Arthur Zamarin
commit: 747da6434461c5efb0c9fc2edd8226846d5402c3
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Mar 22 06:15:14 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Mar 22 06:15:14 2024 +
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  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="



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-03-12 Thread Ionen Wolkens
commit: e35e384cbc147de7be5fb8014daeb56c1e4a261f
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Mar 12 20:29:03 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Mar 12 20:31:18 2024 +
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  gentoo.org>

 dev-qt/qtwebengine/qtwebengine-6.6..ebuild | 8 
 dev-qt/qtwebengine/qtwebengine-6.7..ebuild | 8 
 dev-qt/qtwebengine/qtwebengine-6..ebuild   | 8 
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dev-qt/qtwebengine/qtwebengine-6.6..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
index d21e533a2dbe..378b562a6fb0 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
index b9e05d3a0b1a..dcc7ec6d9b87 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6..ebuild
index 0e04faa237c4..1e77e0077e41 100644
--- a/dev-qt/qtwebengine/qtwebengine-6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6..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



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-03-12 Thread Ionen Wolkens
commit: 5cb09adf7780486bbd2934d86b296e3ea8be4cfd
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Mar 12 16:30:03 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Mar 12 20:31:04 2024 +
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  gentoo.org>

 dev-qt/qtwebengine/qtwebengine-6.7.0_rc.ebuild | 2 ++
 dev-qt/qtwebengine/qtwebengine-6.7..ebuild | 2 ++
 dev-qt/qtwebengine/qtwebengine-6..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
index 225c6192d1bb..b9e05d3a0b1a 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6..ebuild
index 0bbfc95e92ec..0e04faa237c4 100644
--- a/dev-qt/qtwebengine/qtwebengine-6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6..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



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-03-12 Thread Ionen Wolkens
commit: f24c083a9fcd6d75143a1f6736d5330f29321492
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Mar 12 11:02:53 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Mar 12 11:59:36 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f24c083a

dev-qt/qtwebengine: add 6.7.0_rc

Signed-off-by: Ionen Wolkens  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 ..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
+   

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-03-04 Thread Ionen Wolkens
commit: f3796a1139d1b7a5d7611803bbfc093251fdc491
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Mar  4 13:35:04 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Mar  4 14:53:03 2024 +
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  gentoo.org>

 dev-qt/qtwebengine/metadata.xml| 1 +
 dev-qt/qtwebengine/qtwebengine-6.7..ebuild | 5 -
 dev-qt/qtwebengine/qtwebengine-6..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 @@
Build the QtPdf module based on chromium's 
PDFium library
Build QML/QtQuick bindings and imports
Use the system-wide 
dev-libs/icu instead of bundled.
+   Build tool for automated testing 
(ChromeDriver equivalent)
Enable QtWidgets support



diff --git a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
index 08af1005ed95..f5f10a5f3ebd 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6..ebuild
index db61cb1b8cff..a8e50ac17067 100644
--- a/dev-qt/qtwebengine/qtwebengine-6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6..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



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/

2024-02-25 Thread Ionen Wolkens
commit: cd804c66f16aa72e5b7c21433854a8f8931c
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Sun Feb 25 12:52:37 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Feb 25 18:45:15 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd804c66

dev-qt/qtwebengine: fix build with upcoming clang18

Do not want to trigger rebuilds over this, so straight-to-stable
with no revbump.

Entirely untested for 6.7, not worrying too much until 6.7.0-rc.
With some luck Qt may backport this themselves before release.
Will move in patchset later if the patch needs to stay.

Closes: https://bugs.gentoo.org/925486
Signed-off-by: Ionen Wolkens  gentoo.org>

 .../files/qtwebengine-6.6.2-clang18.patch  | 80 ++
 .../files/qtwebengine-6.7.0-clang18.patch  | 96 ++
 dev-qt/qtwebengine/qtwebengine-6.6.2.ebuild|  1 +
 dev-qt/qtwebengine/qtwebengine-6.6..ebuild |  1 +
 dev-qt/qtwebengine/qtwebengine-6.7..ebuild |  1 +
 5 files changed, 179 insertions(+)

diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.6.2-clang18.patch 
b/dev-qt/qtwebengine/files/qtwebengine-6.6.2-clang18.patch
new file mode 100644
index ..97dbe299c2b3
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.6.2-clang18.patch
@@ -0,0 +1,80 @@
+Patch status: fixed in >=chromium-122.0.6200.0
+
+https://bugs.gentoo.org/925486
+https://webrtc.googlesource.com/src/+/267f9bdd5
+https://webrtc-review.googlesource.com/c/src/+/332240
+--- a/src/3rdparty/chromium/third_party/webrtc/pc/legacy_stats_collector.cc
 b/src/3rdparty/chromium/third_party/webrtc/pc/legacy_stats_collector.cc
+@@ -190,7 +190,7 @@
+   {StatsReport::kStatsValueNamePreemptiveExpandRate,
+info.preemptive_expand_rate},
+-  {StatsReport::kStatsValueNameTotalAudioEnergy, 
info.total_output_energy},
++  {StatsReport::kStatsValueNameTotalAudioEnergy, 
static_cast(info.total_output_energy)},
+   {StatsReport::kStatsValueNameTotalSamplesDuration,
+-   info.total_output_duration}};
++   static_cast(info.total_output_duration)}};
+ 
+   const IntForAdd ints[] = {
+@@ -246,7 +246,7 @@
+ 
+   const FloatForAdd floats[] = {
+-  {StatsReport::kStatsValueNameTotalAudioEnergy, info.total_input_energy},
++  {StatsReport::kStatsValueNameTotalAudioEnergy, 
static_cast(info.total_input_energy)},
+   {StatsReport::kStatsValueNameTotalSamplesDuration,
+-   info.total_input_duration}};
++   static_cast(info.total_input_duration)}};
+ 
+   RTC_DCHECK_GE(info.audio_level, 0);
+@@ -342,5 +342,5 @@
+   {StatsReport::kStatsValueNameRenderDelayMs, info.render_delay_ms},
+   {StatsReport::kStatsValueNameTargetDelayMs, info.target_delay_ms},
+-  {StatsReport::kStatsValueNameFramesDecoded, info.frames_decoded},
++  {StatsReport::kStatsValueNameFramesDecoded, 
static_cast(info.frames_decoded)},
+   };
+ 
+@@ -386,13 +386,13 @@
+   {StatsReport::kStatsValueNameFirsReceived, info.firs_rcvd},
+   {StatsReport::kStatsValueNameFrameHeightSent, info.send_frame_height},
+-  {StatsReport::kStatsValueNameFrameRateInput, 
round(info.framerate_input)},
++  {StatsReport::kStatsValueNameFrameRateInput, 
static_cast(round(info.framerate_input))},
+   {StatsReport::kStatsValueNameFrameRateSent, info.framerate_sent},
+   {StatsReport::kStatsValueNameFrameWidthSent, info.send_frame_width},
+-  {StatsReport::kStatsValueNameNacksReceived, info.nacks_rcvd},
++  {StatsReport::kStatsValueNameNacksReceived, 
static_cast(info.nacks_rcvd)},
+   {StatsReport::kStatsValueNamePacketsLost, info.packets_lost},
+   {StatsReport::kStatsValueNamePacketsSent, info.packets_sent},
+   {StatsReport::kStatsValueNamePlisReceived, info.plis_rcvd},
+-  {StatsReport::kStatsValueNameFramesEncoded, info.frames_encoded},
+-  {StatsReport::kStatsValueNameHugeFramesSent, info.huge_frames_sent},
++  {StatsReport::kStatsValueNameFramesEncoded, 
static_cast(info.frames_encoded)},
++  {StatsReport::kStatsValueNameHugeFramesSent, 
static_cast(info.huge_frames_sent)},
+   };
+ 
+@@ -783,17 +783,17 @@
+ 
+   const Int64ForAdd int64s[] = {
+-  {StatsReport::kStatsValueNameBytesReceived, info.recv_total_bytes},
+-  {StatsReport::kStatsValueNameBytesSent, info.sent_total_bytes},
+-  {StatsReport::kStatsValueNamePacketsSent, info.sent_total_packets},
+-  {StatsReport::kStatsValueNameRtt, info.rtt},
++  {StatsReport::kStatsValueNameBytesReceived, 
static_cast(info.recv_total_bytes)},
++  {StatsReport::kStatsValueNameBytesSent, 
static_cast(info.sent_total_bytes)},
++  {StatsReport::kStatsValueNamePacketsSent, 
static_cast(info.sent_total_packets)},
++  {StatsReport::kStatsValueNameRtt, static_cast(info.rtt)},
+   {StatsReport::kStatsValueNameSendPacketsDiscarded,
+-   info.sent_discarded_packets},
++   static_cast(info.sent_discarded_packets)},
+   

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-02-21 Thread Ionen Wolkens
commit: 31de37fac1eac95b86c76fe456400e8915453c00
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Feb 22 02:26:44 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Feb 22 06:14:33 2024 +
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  gentoo.org>

 dev-qt/qtwebengine/qtwebengine-6.6.2.ebuild| 3 +--
 dev-qt/qtwebengine/qtwebengine-6.6..ebuild | 3 +--
 dev-qt/qtwebengine/qtwebengine-6.7..ebuild | 3 +--
 dev-qt/qtwebengine/qtwebengine-6..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
index d38931f4877c..3b1f69bd687c 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
index 273eeb91351c..db61cb1b8cff 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6..ebuild
index 273eeb91351c..db61cb1b8cff 100644
--- a/dev-qt/qtwebengine/qtwebengine-6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6..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



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-02-21 Thread Ionen Wolkens
commit: 11b3ca40d21abf372cd071a1905ed9457534f199
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Feb 22 04:55:49 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Feb 22 06:14:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11b3ca40

dev-qt/qtwebengine: drop 6.6.1

Signed-off-by: Ionen Wolkens  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 
3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db792488098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
-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..
--- 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
-   

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-02-20 Thread Arthur Zamarin
commit: 321aa55772301c7ff86c1cf5fca762e5dfcfb9d8
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Feb 20 06:44:45 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Feb 20 14:30:13 2024 +
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  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="



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-02-14 Thread Ionen Wolkens
commit: 20add58950c85c206d98e59943bd81b333e40968
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Feb 14 11:09:33 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Feb 14 12:22:13 2024 +
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  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 ..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="
+   

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/

2024-02-01 Thread Andreas Sturmlechner
commit: acf45c1ef3f684fe1c639477406c73485709ca97
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Feb  1 22:57:53 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb  1 23:00:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acf45c1e

dev-qt/qtwebengine: drop 5.15.11_p20231120, 5.15.12_p20240112

Bug: https://bugs.gentoo.org/922189
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtwebengine/Manifest|   2 -
 ...twebengine-5.15.11_p20231120-libxml2-2.12.patch |  43 ---
 .../files/qtwebengine-6.5.3-icu74.patch|  16 --
 .../qtwebengine-5.15.11_p20231120.ebuild   | 287 -
 .../qtwebengine-5.15.12_p20240112.ebuild   | 279 
 5 files changed, 627 deletions(-)

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 44b4faa28f73..e45296c7913c 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,7 +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_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 
3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db792488098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
 DIST qtwebengine-6.6-patchset-6.tar.xz 9828 BLAKE2B 
ae595c2f3a71abc183e256118b1c3d1e91284199a8f4aaa8bd9d2a67467353b6c145c3bd9d64c20d64321294c63d97a0a4dc3eeca570a1e25eb94dd8fb9aa501
 SHA512 
8def71c43125073ef6fc1867c36118f43b0af843cce4b47248359712b1f1bfb4d4eabc6b13ecbbb33e4ef10e1617abc488bb336dfbab043b4ef911d71ad386e2

diff --git 
a/dev-qt/qtwebengine/files/qtwebengine-5.15.11_p20231120-libxml2-2.12.patch 
b/dev-qt/qtwebengine/files/qtwebengine-5.15.11_p20231120-libxml2-2.12.patch
deleted file mode 100644
index 3a0a3df43469..
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.11_p20231120-libxml2-2.12.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 871f8ae9b65ce2679b0bc0be36902d65edf0c1e4 Mon Sep 17 00:00:00 2001
-From: Joey Arhar 
-Date: Thu, 2 Nov 2023 20:45:11 +
-Subject: [PATCH] Roll libxml from b8961a75 to 7a2d412f
-
-Bug: 934413
-Change-Id: I6fb176d76dba9a9adf411395fa5f6b950b52920a
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4985186
-Reviewed-by: David Baron 
-Commit-Queue: Joey Arhar 
-Cr-Commit-Position: refs/heads/main@{#1219084}

- .../blink/renderer/core/xml/xslt_processor.h  |2 +-
- .../core/xml/xslt_processor_libxslt.cc|2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
- create mode 100644 third_party/libxml/src/testparser.c
-
-diff --git a/third_party/blink/renderer/core/xml/xslt_processor.h 
b/third_party/blink/renderer/core/xml/xslt_processor.h
-index d53835e9675793..2eaea31ed29b90 100644
 
a/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h
-+++ 
b/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h
-@@ -77,7 +77,7 @@ class XSLTProcessor final : public ScriptWrappable {
- 
-   void reset();
- 
--  static void ParseErrorFunc(void* user_data, xmlError*);
-+  static void ParseErrorFunc(void* user_data, const xmlError*);
-   static void GenericErrorFunc(void* user_data, const char* msg, ...);
- 
-   // Only for libXSLT 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-01-30 Thread Joonas Niilola
commit: 167063bc8239d8b0747d5a0307ca7bb832fedc65
Author: Matoro Mahri  matoro  tk>
AuthorDate: Tue Jan 30 23:03:22 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Jan 31 07:17:54 2024 +
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.tk>
Signed-off-by: Joonas Niilola  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}"



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-01-29 Thread Ionen Wolkens
commit: f87339dac0c5039f8cb15743327bd296e62799a9
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Jan 29 02:25:58 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Jan 29 14:37:15 2024 +
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  gentoo.org>

 dev-qt/qtwebengine/Manifest| 4 ++--
 dev-qt/qtwebengine/qtwebengine-6.6..ebuild | 2 +-
 dev-qt/qtwebengine/qtwebengine-6.7..ebuild | 2 +-
 dev-qt/qtwebengine/qtwebengine-6..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 
3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db792488098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
 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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
index 66342c02291b..a3a0ae885509 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
index 24484454086e..bc07ef9ed464 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7..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 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-01-28 Thread Ionen Wolkens
commit: f7edd612e636e7da8d20be6170730b710b814c7a
Author: Matoro Mahri  matoro  tk>
AuthorDate: Mon Jan 29 03:21:15 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Jan 29 04:09:36 2024 +
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.tk>
Signed-off-by: Ionen Wolkens  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}"



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-01-24 Thread Ionen Wolkens
commit: 505c33c87b9adfc992ecc09424cbd646aec88558
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Jan 24 08:01:51 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Jan 24 14:49:13 2024 +
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  gentoo.org>

 dev-qt/qtwebengine/Manifest| 4 ++--
 dev-qt/qtwebengine/qtwebengine-6.6..ebuild | 2 +-
 dev-qt/qtwebengine/qtwebengine-6.7..ebuild | 2 +-
 dev-qt/qtwebengine/qtwebengine-6..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 
3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db792488098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
 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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
index 92a315e96855..66342c02291b 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
index b08109bae395..24484454086e 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7..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..ebuild 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-01-22 Thread Andreas Sturmlechner
commit: 7beb9333b115f33305c81e2bbecd04a36a94d0a2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jan 22 19:20:57 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jan 22 19:27:33 2024 +
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  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 
3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db792488098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
 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 ..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 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/

2024-01-17 Thread Andreas Sturmlechner
commit: 830d6ed5d3210ba88a668dabd2b0d0e446602ba2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jan 17 11:17:08 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jan 17 11:17:59 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=830d6ed5

dev-qt/qtwebengine: Restore accidentally dropped patch

Closes: https://bugs.gentoo.org/922312
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch | 16 
 1 file changed, 16 insertions(+)

diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch 
b/dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch
new file mode 100644
index ..3d42f3f933c5
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch
@@ -0,0 +1,16 @@
+Quick fix for a static_assert failure with icu74. Still waiting
+for a proper upstream fix and unknown if entirely right, but is
+an extension of [1] (is now 48 rather than 43).
+
+https://bugs.gentoo.org/917633
+
+[1] https://crrev.com/e60b571faa3f14dd9119a6792dccf12f8bf80192
+--- 
a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc
 
b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc
+@@ -163,3 +163,5 @@
+ 
+-#if U_ICU_VERSION_MAJOR_NUM >= 58
++#if U_ICU_VERSION_MAJOR_NUM >= 74
++#define BA_LB_COUNT (U_LB_COUNT - 8)
++#elif U_ICU_VERSION_MAJOR_NUM >= 58
+ #define BA_LB_COUNT (U_LB_COUNT - 3)



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/

2024-01-16 Thread Andreas Sturmlechner
commit: d0910fbff4bb5e77909934ef3685933f5a9e9b4b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jan 16 10:34:51 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jan 16 11:52:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0910fbf

dev-qt/qtwebengine: drop 5.15.12_p20231219

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtwebengine/Manifest|   1 -
 .../files/qtwebengine-6.5.3-icu74.patch|  16 --
 .../qtwebengine-5.15.12_p20231219.ebuild   | 283 -
 3 files changed, 300 deletions(-)

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index ec8686a19d22..6ea091fd48ce 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,7 +1,6 @@
 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.12_p20240112.tar.xz 299267300 BLAKE2B 
7ccdeee6a64638a2a486fdb69c7090e310c8e5711e5387ab4df44d432adac61fd62dbb923de4d8c299076512aa8a98434e47382fc53783f323c3fa6ce3447cc2
 SHA512 
2cb4d3386ef7cde547ccdc402ea03ca55141b902e878c75520579b7daa81d25dfda20b1ef824a8e19acbaa64bd11a51fa5caeaf82eb8dbdda2ecfd4836fd8bef
 DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B 
aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6
 SHA512 
3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db792488098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
 DIST qtwebengine-6.6-patchset-6.tar.xz 9828 BLAKE2B 
ae595c2f3a71abc183e256118b1c3d1e91284199a8f4aaa8bd9d2a67467353b6c145c3bd9d64c20d64321294c63d97a0a4dc3eeca570a1e25eb94dd8fb9aa501
 SHA512 
8def71c43125073ef6fc1867c36118f43b0af843cce4b47248359712b1f1bfb4d4eabc6b13ecbbb33e4ef10e1617abc488bb336dfbab043b4ef911d71ad386e2

diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch 
b/dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch
deleted file mode 100644
index 3d42f3f933c5..
--- a/dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Quick fix for a static_assert failure with icu74. Still waiting
-for a proper upstream fix and unknown if entirely right, but is
-an extension of [1] (is now 48 rather than 43).
-
-https://bugs.gentoo.org/917633
-
-[1] https://crrev.com/e60b571faa3f14dd9119a6792dccf12f8bf80192
 
a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc
-+++ 
b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc
-@@ -163,3 +163,5 @@
- 
--#if U_ICU_VERSION_MAJOR_NUM >= 58
-+#if U_ICU_VERSION_MAJOR_NUM >= 74
-+#define BA_LB_COUNT (U_LB_COUNT - 8)
-+#elif U_ICU_VERSION_MAJOR_NUM >= 58
- #define BA_LB_COUNT (U_LB_COUNT - 3)

diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.12_p20231219.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.15.12_p20231219.ebuild
deleted file mode 100644
index c325c99a4f20..
--- a/dev-qt/qtwebengine/qtwebengine-5.15.12_p20231219.ebuild
+++ /dev/null
@@ -1,283 +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
-   

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-01-15 Thread Andreas Sturmlechner
commit: 1ae2043b2fe1790ad208ee2e788878348ff4772c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jan 15 20:32:42 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jan 15 21:58:49 2024 +
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  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 
3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db792488098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
 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 ..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 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-01-10 Thread Ionen Wolkens
commit: 2e0505f87184b97e3eeb1621171beda057b5ba9c
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Jan 10 08:35:38 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Jan 10 09:08:21 2024 +
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  gentoo.org>

 dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild| 7 +++
 dev-qt/qtwebengine/qtwebengine-6.6..ebuild | 7 +++
 dev-qt/qtwebengine/qtwebengine-6.7..ebuild | 7 +++
 dev-qt/qtwebengine/qtwebengine-6..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
index 65de6a9759b5..92a315e96855 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
index eb94f0e7e253..b08109bae395 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6..ebuild
index eb94f0e7e253..b08109bae395 100644
--- a/dev-qt/qtwebengine/qtwebengine-6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6..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



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-01-09 Thread Ionen Wolkens
commit: cf6f3184a3dc040d0de50f6df909984a14ed179d
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Jan  9 14:05:44 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Jan  9 14:06:41 2024 +
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  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..ebuild  | 2 +-
 dev-qt/qtwebengine/qtwebengine-6.7..ebuild  | 2 +-
 dev-qt/qtwebengine/qtwebengine-6..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
index a2fb38c98575..65de6a9759b5 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
index e7cca530e966..eb94f0e7e253 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6..ebuild
index e7cca530e966..eb94f0e7e253 100644
--- a/dev-qt/qtwebengine/qtwebengine-6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6..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} )



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-01-08 Thread Ionen Wolkens
commit: f6c788b3553a3ad73bf999f19ce0ffb34a32e760
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Jan  8 13:08:46 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Jan  8 16:41:51 2024 +
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  gentoo.org>

 dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild| 7 +++
 dev-qt/qtwebengine/qtwebengine-6.6..ebuild | 7 +++
 dev-qt/qtwebengine/qtwebengine-6.7..ebuild | 7 +++
 dev-qt/qtwebengine/qtwebengine-6..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
index 46450368b95d..a2fb38c98575 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
index c5e7a9912cc0..e7cca530e966 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6..ebuild
index c5e7a9912cc0..e7cca530e966 100644
--- a/dev-qt/qtwebengine/qtwebengine-6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6..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 &&



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-01-08 Thread Ionen Wolkens
commit: 683c9b37059185648599d989b3407b0f7667b178
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Jan  8 12:53:31 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Jan  8 12:57:52 2024 +
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  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..ebuild  | 2 +-
 dev-qt/qtwebengine/qtwebengine-6.7..ebuild  | 2 +-
 dev-qt/qtwebengine/qtwebengine-6..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
index a7774dc3a138..46450368b95d 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
index 6db9fdd774d7..c5e7a9912cc0 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6..ebuild
index 6db9fdd774d7..c5e7a9912cc0 100644
--- a/dev-qt/qtwebengine/qtwebengine-6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6..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
 "
 



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/

2024-01-03 Thread Ionen Wolkens
commit: 86410e0304769439a662f4da5c335dfd56b65369
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Jan  3 14:46:26 2024 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Jan  3 19:09:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86410e03

dev-qt/qtwebengine: update patchset for 6.6 and 6.7 branches

6.6-5 -> 6.6-6 changes (only used by 6.6.1):
  Added:
  * gcc14.patch (imported from gentoo tree, not needed in 6.7)
  Updated:
  * cstdint.patch (>=qtwebengine-6.6.1 needs an extra for gcc+musl)

6.6-6 -> 6.6-7 changes (due for 6.6.2 if nothing else comes up):
  Removed:
  * libcxx17.patch (backported from 6.7)
  * libxml2-2.12.patch (upstreamed)

6.7-1 -> 6.7-2 changes (tentative, release is still far away):
  Updated:
  * cstdint.patch (>=qtwebengine-6.6.1 needs an extra for gcc+musl)
  Removed:
  * libxml2-2.12.patch (upstreamed)

Safe changes, and no need for revbumps.

For libxml2, Qt did the same changes that we did rather than do
like upstream chromium. Meaning we do not need to depend on the
newer libxml2 and it works for the old as well.

Hopefully more gcc+musl issues don't keep showing up given been using
clang+musl for testing musl and would rather not do both on top of
gcc+glibc (idea was to pickup most toolchain issues with only two
builds). Only know about this because a user mentioned it on IRC.

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qtwebengine/Manifest|  5 +++--
 dev-qt/qtwebengine/files/qtwebengine-6.6.1-gcc14.patch | 18 --
 dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild|  5 ++---
 dev-qt/qtwebengine/qtwebengine-6.6..ebuild |  5 ++---
 dev-qt/qtwebengine/qtwebengine-6.7..ebuild |  4 ++--
 dev-qt/qtwebengine/qtwebengine-6..ebuild   |  4 ++--
 6 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index ae07cf94dfaf..ce844f8c9264 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.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 
3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db792488098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
-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
+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-everywhere-src-6.6.1.tar.xz 421042656 BLAKE2B 
6982a1884d66162cc3c8518125c655d60ced9ec9e81670fb2e5b193aab655c4516bbc50d3c774764385fbe372863fdbf3e03a3c35f07dd9c3119880266b3131e
 SHA512 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2024-01-01 Thread Andreas Sturmlechner
commit: dd646c50ab71aa55081b4dddf68f0c090c0400e4
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jan  1 20:54:50 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jan  1 21:01:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd646c50

dev-qt/qtwebengine: add 5.15.12_p20231219

Signed-off-by: Andreas Sturmlechner  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 
3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db792488098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
 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 ..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="
+   

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2023-12-24 Thread Ionen Wolkens
commit: 64afdb690871b92f6916abc03210662c43eb2d8f
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Fri Dec 22 20:52:48 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Dec 24 08:27:32 2023 +
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  gentoo.org>

 dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild| 6 ++
 dev-qt/qtwebengine/qtwebengine-6.6..ebuild | 6 ++
 dev-qt/qtwebengine/qtwebengine-6.7..ebuild | 6 ++
 dev-qt/qtwebengine/qtwebengine-6..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
index dfbb26ef419e..f6ae0e6143f9 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
index 7337d24a2a37..5e4b82001f05 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6..ebuild
index 7337d24a2a37..5e4b82001f05 100644
--- a/dev-qt/qtwebengine/qtwebengine-6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6..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)



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2023-12-22 Thread Mart Raudsepp
commit: f0ab893b3a47909cae814c9c7f3c9ccf92d5a2d7
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Fri Dec 22 21:47:31 2023 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri Dec 22 22:29:20 2023 +
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  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="



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/

2023-12-19 Thread Ionen Wolkens
commit: 3baa4dfa3ad0fcc3ddabccb5af583672d19a005a
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Dec 19 19:40:48 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Dec 19 20:31:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3baa4dfa

dev-qt/qtwebengine: drop 6.5.3

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qtwebengine/Manifest|   2 -
 .../files/qtwebengine-6.5.2-cstdint.patch  |  30 ---
 .../files/qtwebengine-6.5.2-libcxx17.patch |  83 --
 .../files/qtwebengine-6.5.3-libxml2-2.12.patch |  39 ---
 dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild| 282 -
 5 files changed, 436 deletions(-)

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 47526a971afc..e111f7507c64 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.11_p20231120.tar.xz 299212012 BLAKE2B 
4f9fc9e3f380377f1eeaa8b04c6622c9e25d8b11151cccf7a04ef7dea88e4870db704dda3b303196e40bc8c1c6e76f495f911de5a74769b633952e35718a85de
 SHA512 
2d64edf0ec5322e25a6decfd92a1b1170135c852a8d154d30a336b894bfc4c24f08cb5c88028c68a4f74e6bd6767aaf827a5fa08a82a70fd49e1fa064ee56f27
 DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B 
aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6
 SHA512 
3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db792488098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
-DIST qtwebengine-6.5-patchset-1.tar.xz 12936 BLAKE2B 
f44af36689596da0177f0607cf242d9cce3c376f4a5c28d7902a6b44651ce9272d745a824580268e999c2d58b72424d72eb6027d7461184bf7f04e0223e5195f
 SHA512 
f639eb09d18c19c7b0d422d6acdce62404be0fcce905374c5d47266340191f7ca66875680bb09d80e72db718e34b7dc6e7db5f2f16407a0edb892930513ea407
 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
-DIST qtwebengine-everywhere-src-6.5.3.tar.xz 412372456 BLAKE2B 
131b4baf0267e77e1356568867db26fe86af165ddbd9abb5f2c6121e757011f5e18dfc41b30342eebf5d53f54492a20c1c77309782355b369b73c088d2102814
 SHA512 
8634eac4931fb27a0ded417de901955774d001dc74dc5779b216519b6b79f0a30f0774224abb14dffef779ca9df1cf384f822f9d5190e4d80b9f6ab0d012bc49
 DIST qtwebengine-everywhere-src-6.6.1.tar.xz 421042656 BLAKE2B 
6982a1884d66162cc3c8518125c655d60ced9ec9e81670fb2e5b193aab655c4516bbc50d3c774764385fbe372863fdbf3e03a3c35f07dd9c3119880266b3131e
 SHA512 
d1e4f5b664f8aca5e0a5927968be87e29e29172f1256f21dc6a29006258fb2be2be99b5b36c94a08c704580db9fac7defbb37193534129a21ca14a511fcdeea0

diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.2-cstdint.patch 
b/dev-qt/qtwebengine/files/qtwebengine-6.5.2-cstdint.patch
deleted file mode 100644
index 7de101830553..
--- a/dev-qt/qtwebengine/files/qtwebengine-6.5.2-cstdint.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Patch status: limbo, partially needs upstreaming
-
-Only manifests as an issue with gcc-13+musl which does not transitively
-include cstdint / stdint.h for the int32/64_t usage.
-
-Partially fixed by [1] (>=chromium-110.0.5434.0) given it removes the
-int64_t usage altogether in seed_response.h.
-
-See also [2] which fixed this for the 87 branch in Qt5.
-
-[1] https://crrev.com/01e21a077a0354d85e8359195613c2781f67a3a2
-[2] https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/489133
 a/src/3rdparty/chromium/components/variations/seed_response.h
-+++ b/src/3rdparty/chromium/components/variations/seed_response.h
-@@ -7,2 +7,3 @@
- 
-+#include 
- #include 
 a/src/3rdparty/chromium/gpu/config/gpu_driver_bug_workarounds.h
-+++ b/src/3rdparty/chromium/gpu/config/gpu_driver_bug_workarounds.h
-@@ -7,2 +7,3 @@
- 
-+#include 
- #include 
 a/src/3rdparty/chromium/third_party/webrtc/rtc_base/system/file_wrapper.h
-+++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/system/file_wrapper.h
-@@ -16,2 +16,3 @@
- 
-+#include 
- #include 

diff --git 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/

2023-12-18 Thread Ionen Wolkens
commit: 7f983f82c666d8b0f677109569c9b88e1701889d
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Dec 18 12:51:50 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Dec 18 18:18:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f983f82

dev-qt/qtwebengine: fix 6.6.x build with gcc14

Closes: https://bugs.gentoo.org/920257
Thanks-to: Sam James  gentoo.org>
Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qtwebengine/files/qtwebengine-6.6.1-gcc14.patch | 18 ++
 dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild|  1 +
 dev-qt/qtwebengine/qtwebengine-6.6..ebuild |  1 +
 3 files changed, 20 insertions(+)

diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.6.1-gcc14.patch 
b/dev-qt/qtwebengine/files/qtwebengine-6.6.1-gcc14.patch
new file mode 100644
index ..928e9b8f6e43
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.6.1-gcc14.patch
@@ -0,0 +1,18 @@
+Patch status: fixed in >=qtwebengine-6.7
+
+https://bugs.gentoo.org/920257
+https://chromium-review.googlesource.com/c/v8/v8/+/4583222
+From: Sam James 
+Date: Sun, 4 Jun 2023 04:15:16 +0100
+Subject: [PATCH] heap: Add missing  include for std::remove
+
+GCC 14 changes some internal includes within libstdc++ so this transient
+include gets lost. Include  explicitly for std::remove.
+--- a/src/3rdparty/chromium/v8/src/heap/cppgc/stats-collector.h
 b/src/3rdparty/chromium/v8/src/heap/cppgc/stats-collector.h
+@@ -9,4 +9,5 @@
+ #include 
+ 
++#include 
+ #include 
+ #include 

diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
index e6288297bd1a..3d763cf8f931 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.1.ebuild
@@ -111,6 +111,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
 
 PATCHES+=(
# add extras as needed here, may merge in set if carries across versions
+   "${FILESDIR}"/${PN}-6.6.1-gcc14.patch
 )
 
 python_check_deps() {

diff --git a/dev-qt/qtwebengine/qtwebengine-6.6..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
index 891fd475a802..dfbb26ef419e 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
@@ -111,6 +111,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
 
 PATCHES+=(
# add extras as needed here, may merge in set if carries across versions
+   "${FILESDIR}"/${PN}-6.6.1-gcc14.patch
 )
 
 python_check_deps() {



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2023-12-17 Thread Arthur Zamarin
commit: 30a24715d3ea44375bcb34eecae897cc47fc60cb
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Dec 17 18:26:55 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Dec 17 18:28:22 2023 +
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  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="



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2023-12-12 Thread Ionen Wolkens
commit: 1d6e40437171fb8669fd9dddce4dcd3feec6f100
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Dec 13 03:08:39 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Dec 13 03:11:08 2023 +
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  gentoo.org>

 dev-qt/qtwebengine/qtwebengine-6.7..ebuild | 4 ++--
 dev-qt/qtwebengine/qtwebengine-6..ebuild   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
index a97d134205c5..7337d24a2a37 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.7..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6..ebuild
index a97d134205c5..7337d24a2a37 100644
--- a/dev-qt/qtwebengine/qtwebengine-6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6..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



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2023-12-12 Thread Ionen Wolkens
commit: 228ab5056fe1e5982144c8ef1e12a78891f08a55
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Dec 12 14:29:30 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Dec 12 21:23:49 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=228ab505

dev-qt/qtwebengine: add 6.7.

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qtwebengine/qtwebengine-6.7..ebuild | 294 +
 1 file changed, 294 insertions(+)

diff --git a/dev-qt/qtwebengine/qtwebengine-6.7..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.7..ebuild
new file mode 100644
index ..a97d134205c5
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-6.7..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. ]] || # keep for 6.x.
+   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, 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2023-11-27 Thread Ionen Wolkens
commit: 840803e11e8265af6e12c375aa9cc05be372e4d8
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Nov 27 06:34:05 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Nov 27 08:45:45 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=840803e1

dev-qt/qtwebengine: add 6.6.1

Signed-off-by: Ionen Wolkens  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 ..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}
+   

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2023-11-27 Thread Ionen Wolkens
commit: 36c5af4d1347a501980f8eee91ae6c90a887f9d2
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Nov 27 06:31:07 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Nov 27 08:45:45 2023 +
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  gentoo.org>

 dev-qt/qtwebengine/Manifest| 2 +-
 dev-qt/qtwebengine/qtwebengine-6.6..ebuild | 4 +---
 dev-qt/qtwebengine/qtwebengine-6..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 
3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db792488098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
 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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
index 1e5d91078bc4..891fd475a802 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6..ebuild
index 00c8ec9e619c..891fd475a802 100644
--- a/dev-qt/qtwebengine/qtwebengine-6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6..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



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2023-11-25 Thread Andreas Sturmlechner
commit: 6616f0c736292450b52fe503cc1a904e55947ded
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Nov 25 16:11:02 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Nov 25 16:11:29 2023 +
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  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 
124e3291a16a1e92edd35b90d769428ab027d2c5b1e0a38ddc3f3d95c1d1817173eef9fe2dfc415775185d66dc1a9248b89b4a3d47843a5e40f2e70579eb
 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 
3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db792488098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
 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..
--- 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}*
-   

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2023-11-23 Thread Ionen Wolkens
commit: acecd249d7afa6abc8982334c918d409b2785bdb
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Nov 22 18:54:53 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Nov 23 08:04:09 2023 +
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. 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  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..ebuild | 2 ++
 dev-qt/qtwebengine/qtwebengine-6..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
index a9ffd7a62755..1e5d91078bc4 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6..ebuild
index 09fe7ac6df06..00c8ec9e619c 100644
--- a/dev-qt/qtwebengine/qtwebengine-6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6..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



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2023-11-22 Thread Ionen Wolkens
commit: 703e80d54161df80220ec80aa42fc2847dba04bb
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Nov 22 14:03:18 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Nov 22 15:20:30 2023 +
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  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..ebuild | 2 +-
 dev-qt/qtwebengine/qtwebengine-6..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
index 8154731705b2..70360020f177 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6..ebuild
index b44e003cb94e..9538c788489b 100644
--- a/dev-qt/qtwebengine/qtwebengine-6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6..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
 



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2023-11-22 Thread Ionen Wolkens
commit: 2df8e509b4de043ed8492d3fbb8a442d0e64932e
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Nov 22 13:59:43 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Nov 22 15:20:30 2023 +
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  gentoo.org>

 dev-qt/qtwebengine/qtwebengine-6.6..ebuild | 1 +
 dev-qt/qtwebengine/qtwebengine-6..ebuild   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/dev-qt/qtwebengine/qtwebengine-6.6..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
index 70360020f177..a9ffd7a62755 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6..ebuild
index 9538c788489b..09fe7ac6df06 100644
--- a/dev-qt/qtwebengine/qtwebengine-6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6..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)



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/

2023-11-22 Thread Ionen Wolkens
commit: 25616a65acf3a98a21c155c7a5ae11d8d83b63f6
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Nov 22 12:02:21 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Nov 22 12:44:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25616a65

dev-qt/qtwebengine: fix build with >=libxml2-2.12 (qt6)

For convenience, use LIBXML_VERSION rather than has_version
so that can include in patchset tarball later if still needed.

Formerly meant to fix only in upcoming 6.6.1 (soon) but is a
simple and safe fix so let's fix the others too.

Closes: https://bugs.gentoo.org/917601
Signed-off-by: Ionen Wolkens  gentoo.org>

 .../files/qtwebengine-6.5.3-libxml2-2.12.patch | 39 ++
 dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild|  1 +
 dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild|  1 +
 dev-qt/qtwebengine/qtwebengine-6.6..ebuild |  1 +
 4 files changed, 42 insertions(+)

diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.3-libxml2-2.12.patch 
b/dev-qt/qtwebengine/files/qtwebengine-6.5.3-libxml2-2.12.patch
new file mode 100644
index ..d725f3209106
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.3-libxml2-2.12.patch
@@ -0,0 +1,39 @@
+Patch status: fixed in >=chromium-121.0.6104.0 with caveat
+
+Fix build failure[1] with libxml2-2.12 due xmlError changes.
+
+For convenience, use LIBXML_VERSION like webkit did[2] rather than
+chromium's upstream fix[3] which relies on bundled libxml2 always
+being 2.12.x (spares having to use has_version).
+
+When fix lands in qtwebengine, will need to depend on >=libxml2-2.12
+unless Qt decides to do something different considering that cmake
+uses system libxml2 by default and it may be too early to enforce it.
+
+[1] https://bugs.gentoo.org/917601
+[2] 
https://github.com/WebKit/WebKit/commit/1bad176b2496579d760852c80cff3ad9fb7c3a4b
+[3] https://crrev.com/871f8ae9b65ce2679b0bc0be36902d65edf0c1e4
+--- 
a/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h
 
b/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h
+@@ -78,5 +78,9 @@
+   void reset();
+ 
++#if LIBXML_VERSION >= 21200
++  static void ParseErrorFunc(void* user_data, const xmlError*);
++#else
+   static void ParseErrorFunc(void* user_data, xmlError*);
++#endif
+   static void GenericErrorFunc(void* user_data, const char* msg, ...);
+ 
+--- 
a/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc
 
b/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc
+@@ -67,5 +67,9 @@
+ }
+ 
++#if LIBXML_VERSION >= 21200
++void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) {
++#else
+ void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) {
++#endif
+   FrameConsole* console = static_cast(user_data);
+   if (!console)

diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild
index 41ccab685127..0ad7cbecdb1b 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild
@@ -104,6 +104,7 @@ PATCHES+=(
"${FILESDIR}"/${PN}-6.5.2-libcxx17.patch
"${FILESDIR}"/${PN}-6.5.2-cstdint.patch
"${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.6.0.ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild
index 234c81fd1039..c1271196f83f 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild
@@ -112,6 +112,7 @@ 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.6..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
index b5b6023bdcaf..8154731705b2 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
@@ -112,6 +112,7 @@ 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() {



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/

2023-11-21 Thread Andreas Sturmlechner
commit: 5aa51046dca2c2b91565933eb81a2ba11d2012fb
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Nov 21 19:02:54 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Nov 21 22:19:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5aa51046

dev-qt/qtwebengine: add 5.15.11_p20231120, fix build w/ libxml2-2.12

Bug: https://bugs.gentoo.org/917645
Closes: https://bugs.gentoo.org/917601
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtwebengine/Manifest|   1 +
 ...twebengine-5.15.11_p20231120-libxml2-2.12.patch |  43 +++
 .../qtwebengine-5.15.11_p20231120.ebuild   | 287 +
 3 files changed, 331 insertions(+)

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 72510429d777..ed57417f7e02 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_p20231102.tar.xz 299223768 BLAKE2B 
f0c3e00e2b266d54bf4239ca15c1dff1142f5d49c70780e7774ad3503dedd257430f17966d61ca78e9f9b7c53f0775a3f4ce3a5cb58b0b2d1bd839e84d097d8c
 SHA512 
124e3291a16a1e92edd35b90d769428ab027d2c5b1e0a38ddc3f3d95c1d1817173eef9fe2dfc415775185d66dc1a9248b89b4a3d47843a5e40f2e70579eb
+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 
3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db792488098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
 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

diff --git 
a/dev-qt/qtwebengine/files/qtwebengine-5.15.11_p20231120-libxml2-2.12.patch 
b/dev-qt/qtwebengine/files/qtwebengine-5.15.11_p20231120-libxml2-2.12.patch
new file mode 100644
index ..3a0a3df43469
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.11_p20231120-libxml2-2.12.patch
@@ -0,0 +1,43 @@
+From 871f8ae9b65ce2679b0bc0be36902d65edf0c1e4 Mon Sep 17 00:00:00 2001
+From: Joey Arhar 
+Date: Thu, 2 Nov 2023 20:45:11 +
+Subject: [PATCH] Roll libxml from b8961a75 to 7a2d412f
+
+Bug: 934413
+Change-Id: I6fb176d76dba9a9adf411395fa5f6b950b52920a
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4985186
+Reviewed-by: David Baron 
+Commit-Queue: Joey Arhar 
+Cr-Commit-Position: refs/heads/main@{#1219084}
+---
+ .../blink/renderer/core/xml/xslt_processor.h  |2 +-
+ .../core/xml/xslt_processor_libxslt.cc|2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+ create mode 100644 third_party/libxml/src/testparser.c
+
+diff --git a/third_party/blink/renderer/core/xml/xslt_processor.h 
b/third_party/blink/renderer/core/xml/xslt_processor.h
+index d53835e9675793..2eaea31ed29b90 100644
+--- 
a/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h
 
b/src/3rdparty/chromium/third_party/blink/renderer/core/xml/xslt_processor.h
+@@ -77,7 +77,7 @@ class XSLTProcessor final : public ScriptWrappable {
+ 
+   void reset();
+ 
+-  static void ParseErrorFunc(void* user_data, xmlError*);
++  static void ParseErrorFunc(void* user_data, const xmlError*);
+   static void GenericErrorFunc(void* user_data, const char* msg, ...);
+ 
+   // Only for libXSLT callbacks
+diff --git a/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc 

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2023-11-21 Thread Ionen Wolkens
commit: 5f618bfe529fb29c23ff3913c6251cbf82a621c1
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Tue Nov 21 16:47:15 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Tue Nov 21 21:24:50 2023 +
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  gentoo.org>

 dev-qt/qtwebengine/Manifest| 2 +-
 dev-qt/qtwebengine/qtwebengine-6.6..ebuild | 2 +-
 dev-qt/qtwebengine/qtwebengine-6..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 
124e3291a16a1e92edd35b90d769428ab027d2c5b1e0a38ddc3f3d95c1d1817173eef9fe2dfc415775185d66dc1a9248b89b4a3d47843a5e40f2e70579eb
 DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B 
aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6
 SHA512 
3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db792488098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
 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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
index d7f460872c21..b5b6023bdcaf 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6..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..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6..ebuild
index 3d5179796e93..b44e003cb94e 100644
--- a/dev-qt/qtwebengine/qtwebengine-6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6..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
+   

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2023-11-21 Thread Sam James
commit: 659cf630a77405d45f76d4aa75fbb05d049bc630
Author: Paul Zander  gmail  com>
AuthorDate: Tue Nov 21 12:02:52 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Nov 21 19:52:11 2023 +
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  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33926
Signed-off-by: Sam James  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



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/files/

2023-11-20 Thread Ionen Wolkens
commit: ba397fa71f9bc9a074d9c65b63759e0145bb9fa0
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Nov 20 23:34:19 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Nov 20 23:34:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba397fa7

dev-qt/qtwebengine: add bug link to qt6 icu74 patch

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch 
b/dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch
index d08ede535862..3d42f3f933c5 100644
--- a/dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch
@@ -2,6 +2,8 @@ Quick fix for a static_assert failure with icu74. Still waiting
 for a proper upstream fix and unknown if entirely right, but is
 an extension of [1] (is now 48 rather than 43).
 
+https://bugs.gentoo.org/917633
+
 [1] https://crrev.com/e60b571faa3f14dd9119a6792dccf12f8bf80192
 --- 
a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc
 +++ 
b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/

2023-11-20 Thread Ionen Wolkens
commit: b7982facbd6d596888e100c11b07fff5599e2203
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Nov 20 12:43:15 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Nov 20 13:43:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7982fac

dev-qt/qtwebengine: fix build with icu74 (qt6)

Just a quick fix, not fixed in either upstreams yet.

Have not tried qt5.

Signed-off-by: Ionen Wolkens  gentoo.org>

 dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch | 14 ++
 dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild|  1 +
 dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild|  1 +
 dev-qt/qtwebengine/qtwebengine-6.6..ebuild |  1 +
 4 files changed, 17 insertions(+)

diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch 
b/dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch
new file mode 100644
index ..d08ede535862
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.3-icu74.patch
@@ -0,0 +1,14 @@
+Quick fix for a static_assert failure with icu74. Still waiting
+for a proper upstream fix and unknown if entirely right, but is
+an extension of [1] (is now 48 rather than 43).
+
+[1] https://crrev.com/e60b571faa3f14dd9119a6792dccf12f8bf80192
+--- 
a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc
 
b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc
+@@ -163,3 +163,5 @@
+ 
+-#if U_ICU_VERSION_MAJOR_NUM >= 58
++#if U_ICU_VERSION_MAJOR_NUM >= 74
++#define BA_LB_COUNT (U_LB_COUNT - 8)
++#elif U_ICU_VERSION_MAJOR_NUM >= 58
+ #define BA_LB_COUNT (U_LB_COUNT - 3)

diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild
index 286f497b5721..41ccab685127 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild
@@ -103,6 +103,7 @@ 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
+   "${FILESDIR}"/${PN}-6.5.3-icu74.patch
 )
 
 python_check_deps() {

diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild
index e276911c1b95..234c81fd1039 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.0.ebuild
@@ -111,6 +111,7 @@ 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
 )
 
 python_check_deps() {

diff --git a/dev-qt/qtwebengine/qtwebengine-6.6..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
index e96a31845a16..d7f460872c21 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
@@ -111,6 +111,7 @@ 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
 )
 
 python_check_deps() {



[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2023-11-15 Thread Ionen Wolkens
commit: 97ad64692e57cd0c056188385a98c38fe9b76b20
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Nov 15 18:01:01 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Nov 15 19:27:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97ad6469

dev-qt/qtwebengine: drop 6.5.2-r1

Signed-off-by: Ionen Wolkens  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..
--- 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 )
-  

[gentoo-commits] repo/gentoo:master commit in: dev-qt/qtwebengine/

2023-11-15 Thread Arthur Zamarin
commit: 91c21ec1f783c138fc05bf1d28b767d9858872a0
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Nov 15 17:19:06 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Nov 15 17:19:06 2023 +
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  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="



  1   2   3   4   >