[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/, 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/, 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/, 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/, 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/, 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/, 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/, 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/, 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/, dev-qt/qtwebengine/files/

2023-10-05 Thread Ionen Wolkens
commit: f0b3fbf765c8b98cffe91574d8a9f03d5326563d
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Thu Oct  5 14:28:20 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Oct  5 19:38:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0b3fbf7

dev-qt/qtwebengine: fix build with gcc13+musl

Primarily been testing musl on a llvm-musl profile, so overlooked
this. Does not manifest as an issue if use any of gcc12, clang,
or glibc.

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

 .../files/qtwebengine-6.5.2-cstdint.patch  | 27 ++
 .../files/qtwebengine-6.6.0-cstdint.patch  | 16 +
 dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild |  1 +
 dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild|  1 +
 dev-qt/qtwebengine/qtwebengine-6.6.0_rc.ebuild |  1 +
 dev-qt/qtwebengine/qtwebengine-6.6..ebuild |  1 +
 6 files changed, 47 insertions(+)

diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.2-cstdint.patch 
b/dev-qt/qtwebengine/files/qtwebengine-6.5.2-cstdint.patch
new file mode 100644
index ..cf8e55c556c6
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.2-cstdint.patch
@@ -0,0 +1,27 @@
+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.
+
+[1] https://crrev.com/01e21a077a0354d85e8359195613c2781f67a3a2
+--- 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 a/dev-qt/qtwebengine/files/qtwebengine-6.6.0-cstdint.patch 
b/dev-qt/qtwebengine/files/qtwebengine-6.6.0-cstdint.patch
new file mode 100644
index ..d59d327af7c5
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.6.0-cstdint.patch
@@ -0,0 +1,16 @@
+Patch status: limbo, 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.
+--- 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 a/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
index 01b5cf6327c3..0d9285e3a57c 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
@@ -102,6 +102,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
 PATCHES+=(
# add extras as needed here, may merge in set if carries across versions
"${FILESDIR}"/${PN}-6.5.2-libcxx17.patch
+   "${FILESDIR}"/${PN}-6.5.2-cstdint.patch
 )
 
 python_check_deps() {

diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild
index 26cc25ef040a..cf093a70d1af 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.3.ebuild
@@ -103,6 +103,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
 PATCHES+=(
# add extras as needed here, may merge in set if carries across versions
"${FILESDIR}"/${PN}-6.5.2-libcxx17.patch
+   "${FILESDIR}"/${PN}-6.5.2-cstdint.patch
 )
 
 python_check_deps() {

diff --git a/dev-qt/qtwebengine/qtwebengine-6.6.0_rc.ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.6.0_rc.ebuild
index 876a6ad25d54..768571ff7ca4 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.6.0_rc.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.6.0_rc.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.6.0-cstdint.patch
 )
 
 python_check_deps() {

diff --git a/dev-qt/qtwebengine/qtwebengine-6.6..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.6..ebuild
index 876a6ad25d54..768571ff7ca4 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.6.0-cstdint.patch
 )
 
 

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

2023-09-07 Thread Ionen Wolkens
commit: 89c3fd669808db42d622817849840ca069c8b6f7
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Sep  6 20:01:31 2023 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Sep  7 10:01:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89c3fd66

dev-qt/qtwebengine: fix build with >=libcxx-17

May(?) need a revbump given updating to libcxx-17 while built against
<17 unpatched could give symbol issues, ...but let's spare having
everyone rebuild, esp given by the time llvm:17 is released may have
qtwebengine-6.5.3 in the tree to trigger a build.

Thanks-to: Violet Purcell  inventati.org>
Signed-off-by: Ionen Wolkens  gentoo.org>

 .../files/qtwebengine-6.5.2-libcxx17.patch | 83 ++
 dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild |  1 +
 dev-qt/qtwebengine/qtwebengine-6.5..ebuild |  1 +
 3 files changed, 85 insertions(+)

diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.2-libcxx17.patch 
b/dev-qt/qtwebengine/files/qtwebengine-6.5.2-libcxx17.patch
new file mode 100644
index ..8acbbf4463ce
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.2-libcxx17.patch
@@ -0,0 +1,83 @@
+Patch status: fixed in >=chromium-116.0.5809.0
+
+Backport of [2][3] in order to fix building with libcxx-17
+(and hopefully runtime if upgrade from 16->17 without rebuilding).
+
+In order to apply cleanly, also needed [4] which seems fine to have.
+
+[1] https://crbug.com/1449299
+[2] https://crrev.com/9bfbbffdba73668fdb483e5a850911d2b64c35d7
+[3] https://crrev.com/4878976cd7391fbc02f87af4b7fb539b5c1f3817
+[4] https://crrev.com/5b5551edd3961481e617e510276b9f015a35b861
+--- a/src/3rdparty/chromium/base/containers/checked_iterators.h
 b/src/3rdparty/chromium/base/containers/checked_iterators.h
+@@ -24,4 +24,7 @@
+   using reference = T&;
+   using iterator_category = std::random_access_iterator_tag;
++#if defined(__cpp_lib_ranges)
++  using iterator_concept = std::contiguous_iterator_tag;
++#endif
+ 
+   // Required for converting constructor below.
+@@ -31,8 +34,6 @@
+   // Required for certain libc++ algorithm optimizations that are not 
available
+   // for NaCl.
+-#if defined(_LIBCPP_VERSION) && !BUILDFLAG(IS_NACL)
+   template 
+   friend struct std::pointer_traits;
+-#endif
+ 
+   constexpr CheckedContiguousIterator() = default;
+@@ -147,4 +148,10 @@
+   }
+ 
++  constexpr friend CheckedContiguousIterator operator+(
++  difference_type lhs,
++  const CheckedContiguousIterator& rhs) {
++return rhs + lhs;
++  }
++
+   constexpr CheckedContiguousIterator& operator-=(difference_type rhs) {
+ if (rhs < 0) {
+@@ -218,5 +225,4 @@
+ }  // namespace base
+ 
+-#if defined(_LIBCPP_VERSION) && !BUILDFLAG(IS_NACL)
+ // Specialize both std::__is_cpp17_contiguous_iterator and std::pointer_traits
+ // for CCI in case we compile with libc++ outside of NaCl. The former is
+@@ -236,11 +242,28 @@
+ // [2] https://wg21.link/std.iterator.tags
+ // [3] https://wg21.link/pointer.traits.optmem
+-namespace std {
++
++#if defined(_LIBCPP_VERSION)
++
++_LIBCPP_BEGIN_NAMESPACE_STD
+ 
+ template 
++struct __is_cpp17_contiguous_iterator;
++template 
+ struct __is_cpp17_contiguous_iterator<::base::CheckedContiguousIterator>
+ : true_type {};
+ 
+ template 
++struct __libcpp_is_contiguous_iterator;
++template 
++struct __libcpp_is_contiguous_iterator<::base::CheckedContiguousIterator>
++: true_type {};
++
++_LIBCPP_END_NAMESPACE_STD
++
++#endif
++
++namespace std {
++
++template 
+ struct pointer_traits<::base::CheckedContiguousIterator> {
+   using pointer = ::base::CheckedContiguousIterator;
+@@ -261,5 +284,4 @@
+ 
+ }  // namespace std
+-#endif
+ 
+ #endif  // BASE_CONTAINERS_CHECKED_ITERATORS_H_

diff --git a/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
index 45ffa95a789a..4f2f7fbf799d 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5.2-r1.ebuild
@@ -101,6 +101,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
 
 PATCHES+=(
# add extras as needed here, may merge in set if carries across versions
+   "${FILESDIR}"/${PN}-6.5.2-libcxx17.patch
 )
 
 python_check_deps() {

diff --git a/dev-qt/qtwebengine/qtwebengine-6.5..ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.5..ebuild
index 45ffa95a789a..4f2f7fbf799d 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.5..ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.5..ebuild
@@ -101,6 +101,7 @@ PATCHES=( "${WORKDIR}"/patches/${PN} )
 
 PATCHES+=(
# add extras as needed here, may merge in set if carries across versions
+   "${FILESDIR}"/${PN}-6.5.2-libcxx17.patch
 )
 
 python_check_deps() {



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

2023-05-24 Thread Andreas Sturmlechner
commit: 92a014e0248ada5ff0ab0e8b5799943cf06c61cd
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed May 24 11:14:49 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed May 24 11:15:04 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92a014e0

dev-qt/qtwebengine: drop 5.15.9_p20230421

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

 dev-qt/qtwebengine/Manifest|   1 -
 .../qtwebengine-5.15.9_p20230421-gcc-13.patch  | 134 --
 .../qtwebengine-5.15.9_p20230421.ebuild| 272 -
 3 files changed, 407 deletions(-)

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 05769985093e..1641a6908ec3 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,5 +1,4 @@
 DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B 
aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6
 SHA512 
3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db792488098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
 DIST qtwebengine-5.15.8_p20230313-patchset.tar.xz 45904 BLAKE2B 
9f58b9808fd445a06e6a2cd6d5f7bc9782bd6de13138fdebc9e81bd9f69e7ae673a71bd3ed6b011a47e84cc64b5b703a7cfc8d5f740eaaa663da1db8ef9ef05b
 SHA512 
21b0b853358260fa1bdc96c97c5b2af7007c744d10abeebf9f0e708a0cd7dece583d86c0554a4e327a0d615bb403b0d328acaa6622b50d7a8059bc0802edbcec
-DIST qtwebengine-5.15.9_p20230421.tar.xz 298205148 BLAKE2B 
2969f37af6c53dab5847dc46a9b64f5756b4ea45f9ef3c48db980a1032e89ebd48e9ba4fdc8c56cb72044ab4f48477ac1f9c1171f90155a7304288b77a0c
 SHA512 
a78dd781056c63d98438186ba256ad03b35fe3870b877e56bce41ec135defc29ee9230a3482a69f8680cedc9328a683ffc62dab45a202b709d2a4017a1188cf3
 DIST qtwebengine-5.15.9_p20230505.tar.xz 298713240 BLAKE2B 
835e93a0b33e7294d72571c9031524a0e3002100e36433501cc83bac91646b788c1030ee9ce90edce39c6ee2ee61a1d697e021b6346804d3be0f0b930e6084d0
 SHA512 
61d16399a7d8f5c135c5c097c2dcb7ebeccfe7e31769e950443ffa8178f55ad22d90307b7bd2b2ebdcb3ee0dd2064266159c27da4fc5b35ddac346ca9f336cc1
 DIST qtwebengine-everywhere-src-6.5.0.tar.xz 411792556 BLAKE2B 
42aa5023462ee2db6ef24da1858873897ac5d6bd170adc389617525745708529578dcbcf694d1cadf3b591770f4e925ad24f61500cd13ef90236bda412797cb7
 SHA512 
02413eaf5e4e4d5d8401bf28ea2362cc9f147cc002c014b1a50daf3dfa092b1c923652eefb0b727e94e36d3d53ddf93b5b4c5e8830986902b34b53a848d7a8e0

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.9_p20230421-gcc-13.patch 
b/dev-qt/qtwebengine/files/qtwebengine-5.15.9_p20230421-gcc-13.patch
deleted file mode 100644
index f8d180e97037..
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.9_p20230421-gcc-13.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-Pending upstream:
-https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/473909
-https://codereview.qt-project.org/c/qt/qtwebengine/+/473911
-
-diff --git 
a/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc 
b/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc
-index 213b630..98266a1 100644
 a/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc
-+++ b/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc
-@@ -2,6 +2,8 @@
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
- 
-+#include 
-+
- #include "device/base/synchronization/one_writer_seqlock.h"
- 
- namespace device {
-diff --git 
a/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_format.h 
b/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_format.h
-index 286a41c..25d2413 100644
 a/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_format.h
-+++ b/src/3rdparty/chromium/gpu/command_buffer/common/webgpu_cmd_format.h
-@@ -5,6 +5,7 @@
- #ifndef GPU_COMMAND_BUFFER_COMMON_WEBGPU_CMD_FORMAT_H_
- #define GPU_COMMAND_BUFFER_COMMON_WEBGPU_CMD_FORMAT_H_
- 
-+#include 
- #include 
- 
- #include "gpu/command_buffer/common/gl2_types.h"
-diff --git 
a/src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h 
b/src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h
-index bcba574..f4916be 100644
 a/src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h
-+++ b/src/3rdparty/chromium/gpu/command_buffer/service/shared_context_state.h
-@@ -5,6 +5,7 @@
- #ifndef GPU_COMMAND_BUFFER_SERVICE_SHARED_CONTEXT_STATE_H_
- #define GPU_COMMAND_BUFFER_SERVICE_SHARED_CONTEXT_STATE_H_
- 
-+#include 
- #include 
- #include 
- 
-diff --git a/src/3rdparty/chromium/gpu/config/gpu_util.h 
b/src/3rdparty/chromium/gpu/config/gpu_util.h
-index b4d6dfb..0dc300a 100644
 a/src/3rdparty/chromium/gpu/config/gpu_util.h
-+++ b/src/3rdparty/chromium/gpu/config/gpu_util.h
-@@ -5,6 +5,8 @@
- #ifndef GPU_CONFIG_GPU_UTIL_H_
- #define GPU_CONFIG_GPU_UTIL_H_
- 
-+#include 
-+

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

2023-04-25 Thread Andreas Sturmlechner
commit: 1ed8a8474f6b8126506b3710e67e4ae02d85ac6d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Apr 25 13:12:48 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Apr 25 15:38:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ed8a847

dev-qt/qtwebengine: drop 5.15.9_p20230404

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

 dev-qt/qtwebengine/Manifest|   1 -
 .../qtwebengine-5.15.9_p20230404-gcc-13.patch  |  24 --
 .../qtwebengine-5.15.9_p20230404.ebuild| 269 -
 3 files changed, 294 deletions(-)

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 1aada11e4a56..733200f12d54 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,7 +1,6 @@
 DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B 
aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6
 SHA512 
3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db792488098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
 DIST qtwebengine-5.15.8_p20230313-patchset.tar.xz 45904 BLAKE2B 
9f58b9808fd445a06e6a2cd6d5f7bc9782bd6de13138fdebc9e81bd9f69e7ae673a71bd3ed6b011a47e84cc64b5b703a7cfc8d5f740eaaa663da1db8ef9ef05b
 SHA512 
21b0b853358260fa1bdc96c97c5b2af7007c744d10abeebf9f0e708a0cd7dece583d86c0554a4e327a0d615bb403b0d328acaa6622b50d7a8059bc0802edbcec
 DIST qtwebengine-5.15.8_p20230313.tar.xz 298163692 BLAKE2B 
653e2577ea7e670fdffec2cf2db5392621109571b430b9b66c7bc23739a14eb36ffa5f989ec2b98d77e718b0a69bd2b3948f0340fd9e86aaf10372c8b13286ee
 SHA512 
34062e54f95f441420b41ede88d0f0f98445677d301eedbe0be2e57cc5c280d4e564abb99ccf754eb2c0efaccc21ff4e34bc20163c970b4d5309ca85c5f37577
-DIST qtwebengine-5.15.9_p20230404.tar.xz 298175824 BLAKE2B 
8a260c6d39d99698871154f59e86dece89ac7cb5bd08797e7f42aced638ef528c4272beb46346d39b3df14aac08f7ab4d286cc12688cb4ff62ff327258c3b841
 SHA512 
d97eecd3b2d0b4ad198f7c8484ed70ca6b2751ee9167a3c51c3406acbd18d06265249902c4c7b7ccd8285d7dd8dd2c8fbe4022612f5ca4b1a7972e1577059996
 DIST qtwebengine-5.15.9_p20230421.tar.xz 298205148 BLAKE2B 
2969f37af6c53dab5847dc46a9b64f5756b4ea45f9ef3c48db980a1032e89ebd48e9ba4fdc8c56cb72044ab4f48477ac1f9c1171f90155a7304288b77a0c
 SHA512 
a78dd781056c63d98438186ba256ad03b35fe3870b877e56bce41ec135defc29ee9230a3482a69f8680cedc9328a683ffc62dab45a202b709d2a4017a1188cf3
 DIST qtwebengine-everywhere-src-6.4.3.tar.xz 440562844 BLAKE2B 
86155ffbb12bef9dad461c2bb0dc4fce53b269c6f9f61cd1ec49cc25bb0516dcfc903ce8b48751c9c47614d448c2cd290f3f313d5fdfe0a3643534fa7e2e9f3f
 SHA512 
e9e8bdeac942350bf779a9fabfb59ffdfec366ec23cb1c58fa416a777c9399bfa9828107f6a1c079414a8aa52a35d0547e3bd673053d994e19308e11733e0d39
 DIST qtwebengine-everywhere-src-6.5.0.tar.xz 411792556 BLAKE2B 
42aa5023462ee2db6ef24da1858873897ac5d6bd170adc389617525745708529578dcbcf694d1cadf3b591770f4e925ad24f61500cd13ef90236bda412797cb7
 SHA512 
02413eaf5e4e4d5d8401bf28ea2362cc9f147cc002c014b1a50daf3dfa092b1c923652eefb0b727e94e36d3d53ddf93b5b4c5e8830986902b34b53a848d7a8e0

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.9_p20230404-gcc-13.patch 
b/dev-qt/qtwebengine/files/qtwebengine-5.15.9_p20230404-gcc-13.patch
deleted file mode 100644
index 41b519b452a2..
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.9_p20230404-gcc-13.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-This is on top of the GCC 13 patches in our patchset.
-
-https://bugs.gentoo.org/904342
 
a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.cc
-+++ 
b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.cc
-@@ -4,6 +4,7 @@
- 
- #include 
"third_party/blink/renderer/platform/graphics/dark_mode_image_classifier.h"
- 
-+#include 
- #include 
- 
- #include "base/memory/singleton.h"
 
a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_types.h
-+++ 
b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_types.h
-@@ -5,6 +5,8 @@
- #ifndef THIRD_PARTY_BLINK_RENDERER_PLATFORM_GRAPHICS_DARK_MODE_TYPES_H_
- #define THIRD_PARTY_BLINK_RENDERER_PLATFORM_GRAPHICS_DARK_MODE_TYPES_H_
- 
-+#include 
-+
- namespace blink {
- 
- enum class DarkModeResult : uint8_t {

diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230404.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230404.ebuild
deleted file mode 100644
index 244fa3852b46..
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230404.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="xml(+)"
-inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build 
toolchain-funcs
-
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML 

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

2023-04-17 Thread Jimi Huotari
commit: 218cd03d9bb0e0856782f172f677b4e48b8a7831
Author: Jimi Huotari  gentoo  org>
AuthorDate: Mon Apr 17 18:25:19 2023 +
Commit: Jimi Huotari  gentoo  org>
CommitDate: Mon Apr 17 19:39:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=218cd03d

dev-qt/qtwebengine: fix build with GCC-13

Also add a dependency on 'media-libs/openjpeg', so that the system
package is used.

Signed-off-by: Jimi Huotari  gentoo.org>

 .../files/qtwebengine-6.5.0-gcc-13-build.patch | 394 +
 dev-qt/qtwebengine/qtwebengine-6.5.0-r1.ebuild | 246 +
 2 files changed, 640 insertions(+)

diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.5.0-gcc-13-build.patch 
b/dev-qt/qtwebengine/files/qtwebengine-6.5.0-gcc-13-build.patch
new file mode 100644
index ..0993771177b4
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.5.0-gcc-13-build.patch
@@ -0,0 +1,394 @@
+Upstream: 
https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?h=108-based=9de0d8a90d9
+
+From 9de0d8a90d9b0176542db8b54d678a9fcbb69337 Mon Sep 17 00:00:00 2001
+From: Martin Negyokru 
+Date: Fri, 3 Mar 2023 16:56:50 +0100
+Subject: Fixes for building with GCC-13
+
+Pick-to: 102-based
+Pick-to: 87-based
+Fixes: QTBUG-111697
+Change-Id: I51fca3b3eb627b2617ff5c6c051fa1182671244d
+Reviewed-on: 
https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/464490
+Reviewed-by: Allan Sandfeld Jensen 
+---
+ chromium/base/debug/profiler.h| 1 +
+ chromium/cc/trees/target_property.cc  | 2 ++
+ chromium/components/metrics/psi_memory_parser.h   | 2 ++
+ chromium/components/viz/common/shared_element_resource_id.h   | 1 +
+ chromium/content/public/browser/browsing_data_remover_delegate.h  | 1 +
+ chromium/device/base/synchronization/one_writer_seqlock.h | 1 +
+ chromium/device/bluetooth/public/cpp/bluetooth_uuid.h | 1 +
+ chromium/extensions/common/constants.h| 2 ++
+ chromium/extensions/renderer/bindings/api_invocation_errors.h | 1 +
+ chromium/gpu/config/gpu_feature_info.h| 1 +
+ chromium/net/base/parse_number.h  | 2 ++
+ chromium/net/cookies/cookie_inclusion_status.h| 1 +
+ .../net/third_party/quiche/src/quiche/quic/core/crypto/quic_hkdf.h| 1 +
+ .../net/third_party/quiche/src/quiche/quic/core/quic_connection_id.h  | 1 +
+ chromium/pdf/document_attachment_info.h   | 1 +
+ chromium/sandbox/linux/syscall_broker/broker_file_permission.h| 1 +
+ chromium/third_party/angle/include/GLSLANG/ShaderVars.h   | 1 +
+ .../blink/public/common/bluetooth/web_bluetooth_device_id.h   | 1 +
+ .../third_party/blink/public/common/interest_group/auction_config.h   | 1 +
+ .../blink/public/common/origin_trials/origin_trial_public_key.h   | 1 +
+ .../renderer/platform/graphics/paint/effect_paint_property_node.h | 2 +-
+ chromium/third_party/pdfium/constants/annotation_flags.h  | 2 ++
+ chromium/third_party/perfetto/include/perfetto/ext/base/uuid.h| 1 +
+ chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h   | 4 
+ chromium/third_party/webrtc/rtc_base/third_party/base64/base64.h  | 1 +
+ chromium/ui/base/prediction/kalman_filter.h   | 2 ++
+ chromium/ui/events/types/scroll_types.h   | 2 ++
+ chromium/ui/gfx/geometry/linear_gradient.h| 1 +
+ 28 files changed, 38 insertions(+), 1 deletion(-)
+
+diff --git a/src/3rdparty/chromium/base/debug/profiler.h 
b/src/3rdparty/chromium/base/debug/profiler.h
+index 5f0deadd5d3..80c73feb922 100644
+--- a/src/3rdparty/chromium/base/debug/profiler.h
 b/src/3rdparty/chromium/base/debug/profiler.h
+@@ -6,6 +6,7 @@
+ #define BASE_DEBUG_PROFILER_H_
+ 
+ #include 
++#include 
+ 
+ #include 
+ 
+diff --git a/src/3rdparty/chromium/cc/trees/target_property.cc 
b/src/3rdparty/chromium/cc/trees/target_property.cc
+index f6e873a01a1..714bd5efed1 100644
+--- a/src/3rdparty/chromium/cc/trees/target_property.cc
 b/src/3rdparty/chromium/cc/trees/target_property.cc
+@@ -2,6 +2,8 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+ 
++#include 
++
+ #include "cc/trees/target_property.h"
+ 
+ #include "ui/gfx/animation/keyframe/target_property.h"
+diff --git a/src/3rdparty/chromium/components/metrics/psi_memory_parser.h 
b/src/3rdparty/chromium/components/metrics/psi_memory_parser.h
+index b8b22f4ab74..3d7ec9ca63a 100644
+--- a/src/3rdparty/chromium/components/metrics/psi_memory_parser.h
 b/src/3rdparty/chromium/components/metrics/psi_memory_parser.h
+@@ -5,6 +5,8 @@
+ #ifndef COMPONENTS_METRICS_PSI_MEMORY_PARSER_H_
+ #define COMPONENTS_METRICS_PSI_MEMORY_PARSER_H_
+ 

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

2023-04-14 Thread Sam James
commit: f0d451f42732bc1c8685e56d64f13d73d2596d77
Author: Sam James  gentoo  org>
AuthorDate: Sat Apr 15 01:05:53 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Apr 15 02:10:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0d451f4

dev-qt/qtwebengine: fix build w/ GCC 13

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

 .../files/qtwebengine-5.15.9_p20230404-gcc-13.patch| 14 ++
 dev-qt/qtwebengine/qtwebengine-5.15.9_p20230404.ebuild |  5 -
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.9_p20230404-gcc-13.patch 
b/dev-qt/qtwebengine/files/qtwebengine-5.15.9_p20230404-gcc-13.patch
new file mode 100644
index ..af925558b1f7
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.9_p20230404-gcc-13.patch
@@ -0,0 +1,14 @@
+This is on top of the GCC 13 patches in our patchset.
+
+https://bugs.gentoo.org/904342
+--- 
a/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_types.h
 
b/src/3rdparty/chromium/third_party/blink/renderer/platform/graphics/dark_mode_types.h
+@@ -7,6 +7,8 @@
+ 
+ namespace blink {
+ 
++#include 
++
+ enum class DarkModeResult : uint8_t {
+   kDoNotApplyFilter,
+   kApplyFilter,

diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230404.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230404.ebuild
index d592d8220523..244fa3852b46 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230404.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9_p20230404.ebuild
@@ -100,7 +100,10 @@ BDEPEND="${PYTHON_DEPS}
ppc64? ( >=dev-util/gn-0.1807 )
 "
 
-PATCHES=( "${WORKDIR}/${PN}-5.15.8_p20230313-patchset" )
+PATCHES=(
+   "${WORKDIR}/${PN}-5.15.8_p20230313-patchset"
+   "${FILESDIR}/${PN}-5.15.9_p20230404-gcc-13.patch"
+)
 
 qtwebengine_check-reqs() {
# bug #307861



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

2023-04-09 Thread Andreas Sturmlechner
commit: ad78682a89f566aac4a43ee935038e6068212b84
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr  9 20:11:23 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr  9 20:17:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad78682a

dev-qt/qtwebengine: Cleanup vulnerable 5.15.8_p20230112

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

 dev-qt/qtwebengine/Manifest|   3 -
 ...qtwebengine-5.15.2-disable-fatal-warnings.patch |  12 -
 ...ine-5.15.2_p20210224-chromium-87-v8-icu68.patch | 192 -
 .../qtwebengine-5.15.2_p20210224-disable-git.patch |  15 -
 ...gine-5.15.2_p20211015-pdfium-system-lcms2.patch |  79 
 .../qtwebengine-5.15.3_p20220329-clang14.patch |  42 --
 .../qtwebengine-5.15.3_p20220406-ffmpeg5.patch | 169 
 ...webengine-5.15.3_p20220406-gcc12-includes.patch |  32 --
 .../qtwebengine-5.15.3_p20220505-extra-gn.patch|  10 -
 ...gine-5.15.8_p20230106-v8-opcode-constexpr.patch |  43 --
 .../qtwebengine-5.15.8_p20230106-widevine.patch|  82 
 .../files/qtwebengine-5.15.8_p20230112-gcc13.patch | 431 -
 .../qtwebengine-5.15.8_p20230112.ebuild| 285 --
 13 files changed, 1395 deletions(-)

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 96741df51b44..e8759573bd2a 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,7 +1,4 @@
 DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B 
aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6
 SHA512 
3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db792488098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
-DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B 
fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101
 SHA512 
61cbfbe4ff340b75ea8d356e031e932ac03fe65dd00ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
-DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B 
ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7
 SHA512 
47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
-DIST qtwebengine-5.15.8_p20230112.tar.xz 320881876 BLAKE2B 
681fb4e2c6dfb80f1f2839092bbbd891a0a0d68f6b31dbdfe8693b8ea9a0ecd9611ba692b0565f32fc2ad199de715cf61e333d796df618572f79d9ed88545ffb
 SHA512 
1806e7a3134579a5cfc0c932cc95ffb15edc515c2ff32b01eee9de8245938f95301610cd7b57451a07a9e3845973b88c1d64a03f1371e58106bf202b143e
 DIST qtwebengine-5.15.8_p20230313-patchset.tar.xz 45904 BLAKE2B 
9f58b9808fd445a06e6a2cd6d5f7bc9782bd6de13138fdebc9e81bd9f69e7ae673a71bd3ed6b011a47e84cc64b5b703a7cfc8d5f740eaaa663da1db8ef9ef05b
 SHA512 
21b0b853358260fa1bdc96c97c5b2af7007c744d10abeebf9f0e708a0cd7dece583d86c0554a4e327a0d615bb403b0d328acaa6622b50d7a8059bc0802edbcec
 DIST qtwebengine-5.15.8_p20230313.tar.xz 298163692 BLAKE2B 
653e2577ea7e670fdffec2cf2db5392621109571b430b9b66c7bc23739a14eb36ffa5f989ec2b98d77e718b0a69bd2b3948f0340fd9e86aaf10372c8b13286ee
 SHA512 
34062e54f95f441420b41ede88d0f0f98445677d301eedbe0be2e57cc5c280d4e564abb99ccf754eb2c0efaccc21ff4e34bc20163c970b4d5309ca85c5f37577
 DIST qtwebengine-everywhere-src-6.4.3.tar.xz 440562844 BLAKE2B 
86155ffbb12bef9dad461c2bb0dc4fce53b269c6f9f61cd1ec49cc25bb0516dcfc903ce8b48751c9c47614d448c2cd290f3f313d5fdfe0a3643534fa7e2e9f3f
 SHA512 
e9e8bdeac942350bf779a9fabfb59ffdfec366ec23cb1c58fa416a777c9399bfa9828107f6a1c079414a8aa52a35d0547e3bd673053d994e19308e11733e0d39

diff --git 
a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-disable-fatal-warnings.patch 
b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-disable-fatal-warnings.patch
deleted file mode 100644
index b0f5f3d30e0b..
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-disable-fatal-warnings.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/buildtools/config/common.pri 
b/src/buildtools/config/common.pri
-index cf990c79..910a88ca 100644
 a/src/buildtools/config/common.pri
-+++ b/src/buildtools/config/common.pri
-@@ -26,6 +26,7 @@ gn_args += \
- skia_use_dawn=false \
- toolkit_views=false \
- treat_warnings_as_errors=false \
-+fatal_linker_warnings=false \
- use_allocator_shim=false \
- use_allocator=\"none\" \
- use_custom_libcxx=false \

diff --git 
a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch
 
b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch
deleted file mode 100644
index a6856975a663..
--- 
a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-chromium-87-v8-icu68.patch
+++ /dev/null
@@ -1,192 +0,0 @@

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

2022-09-24 Thread Andreas Sturmlechner
commit: 3dd59537579dea7d0b2b32593d65ac1151412874
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Sep 24 14:07:31 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Sep 24 14:32:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dd59537

dev-qt/qtwebengine: drop 6.3.1

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

 dev-qt/qtwebengine/Manifest|   1 -
 .../files/qtwebengine-6.3.1-favicon.patch  |  28 ---
 .../files/qtwebengine-6.3.1-widevine.patch |  18 --
 dev-qt/qtwebengine/qtwebengine-6.3.1.ebuild| 247 -
 4 files changed, 294 deletions(-)

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 221db31de27c..504702a1976a 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -2,5 +2,4 @@ DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 
BLAKE2B aa101d14446f3
 DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B 
fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101
 SHA512 
61cbfbe4ff340b75ea8d356e031e932ac03fe65dd00ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
 DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B 
ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7
 SHA512 
47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
 DIST qtwebengine-5.15.5_p20220618.tar.xz 320131236 BLAKE2B 
842322c94737cdf647277ccf226c0d015ac0b362af54c4298cbad6b4494aa4ef0e73830577fb391be31c91b4331b85f407ec58641897a7cc7237e7623043577d
 SHA512 
b1bab7aa5edc7f7b9d4f8338a05dbbd55ae6e0312e1a7e6061895bd7a98c67780127c20db1dbbc81664bf483a5b8f7ed887cedd1baaa1a0259e28fd4b13d6944
-DIST qtwebengine-everywhere-src-6.3.1.tar.xz 398269544 BLAKE2B 
3b56a87fd93de0da9ccbfdeda0c5a3e07892dcb1c8dce848cc21c73cb45e7c94746bad299feaa68910ba036abf0c1c16fa423307fdc08c8af4e5e920e2e8a329
 SHA512 
e00601a7ec6400551f7707d15cf326340ae8d6a5bb8cda55df4619148414f4b3ca3daabfd7263dd5a2ff2ca8ba64f9e91c9db3f1a50bea4903148c57b6dc81dd
 DIST qtwebengine-everywhere-src-6.3.2.tar.xz 398294888 BLAKE2B 
7fb59e9c0a09e4ffc2c59398e9249cb91c864168b81befa9ea7e2044ed328bc010f0e6d03ecfc74e006044b56c826b35dba05375aba6fee29e5d5aa08b33fa4c
 SHA512 
deff0a7ad71c4c81b3f5cfff77919d9971eec0ba3713a94a28d902404189b4f92b237a89cc6ef3dec2ea7a766f8a7241638a1310e4ac68fe46ecdc61f69a958a

diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.3.1-favicon.patch 
b/dev-qt/qtwebengine/files/qtwebengine-6.3.1-favicon.patch
deleted file mode 100644
index 8c9544b16935..
--- a/dev-qt/qtwebengine/files/qtwebengine-6.3.1-favicon.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Backport dev branch fix for favicons sometime not showing in
-some consumers like qutebrowser. Not currently included in
-upcoming 6.3.2 so may be needed beyond 6.3.1.
-
-https://bugreports.qt.io/browse/QTBUG-103735
-https://github.com/qt/qtwebengine/commit/c5de1b2123
 a/src/core/favicon_driver_qt.cpp
-+++ b/src/core/favicon_driver_qt.cpp
-@@ -300,15 +300,15 @@ void 
FaviconDriverQt::DidStartNavigation(content::NavigationHandle *navigation_h
- return;
- 
- m_faviconUrls.reset();
--m_completedHandlersCount = 0;
--m_latestFavicon = FaviconStatusQt();
- 
- if (!navigation_handle->IsSameDocument()) {
-+m_completedHandlersCount = 0;
-+m_latestFavicon = FaviconStatusQt();
- m_documentOnLoadCompleted = false;
- m_manifestUrl = GURL();
--}
- 
--m_viewClient->iconChanged(QUrl());
-+m_viewClient->iconChanged(QUrl());
-+}
- 
- content::ReloadType reload_type = navigation_handle->GetReloadType();
- if (reload_type == content::ReloadType::NONE || IsOffTheRecord())

diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.3.1-widevine.patch 
b/dev-qt/qtwebengine/files/qtwebengine-6.3.1-widevine.patch
deleted file mode 100644
index 74da3f35f793..
--- a/dev-qt/qtwebengine/files/qtwebengine-6.3.1-widevine.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Backport from 6.3.2
-https://bugreports.qt.io/browse/QTBUG-104238
-https://github.com/qutebrowser/qutebrowser/issues/7231
 a/src/core/content_client_qt.cpp
-+++ b/src/core/content_client_qt.cpp
-@@ -54,4 +54,5 @@
- #include "media/base/media_switches.h"
- #include "media/base/video_codecs.h"
-+#include "media/cdm/supported_audio_codecs.h"
- #include "media/media_buildflags.h"
- #include "ui/base/layout.h"
-@@ -276,4 +277,6 @@
- #endif  // BUILDFLAG(USE_PROPRIETARY_CODECS)
- 
-+capability->audio_codecs = media::GetCdmSupportedAudioCodecs();
-+
- // Add the supported encryption schemes as if they came from the
- // component manifest. This list must match the CDM that is being

diff --git 

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

2022-08-17 Thread Ionen Wolkens
commit: 86ee2059ef3322c2f01aaeac896b1d8a2ccb51ac
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Wed Aug 17 18:32:03 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Aug 17 21:19:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86ee2059

dev-qt/qtwebengine: backport :6 favicon display fix

Not worth a revbump rebuild, but is still annoying and
wanted to toss it here at least for future builds.

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

 .../files/qtwebengine-6.3.1-favicon.patch  | 28 ++
 dev-qt/qtwebengine/qtwebengine-6.3.1.ebuild|  1 +
 2 files changed, 29 insertions(+)

diff --git a/dev-qt/qtwebengine/files/qtwebengine-6.3.1-favicon.patch 
b/dev-qt/qtwebengine/files/qtwebengine-6.3.1-favicon.patch
new file mode 100644
index ..8c9544b16935
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-6.3.1-favicon.patch
@@ -0,0 +1,28 @@
+Backport dev branch fix for favicons sometime not showing in
+some consumers like qutebrowser. Not currently included in
+upcoming 6.3.2 so may be needed beyond 6.3.1.
+
+https://bugreports.qt.io/browse/QTBUG-103735
+https://github.com/qt/qtwebengine/commit/c5de1b2123
+--- a/src/core/favicon_driver_qt.cpp
 b/src/core/favicon_driver_qt.cpp
+@@ -300,15 +300,15 @@ void 
FaviconDriverQt::DidStartNavigation(content::NavigationHandle *navigation_h
+ return;
+ 
+ m_faviconUrls.reset();
+-m_completedHandlersCount = 0;
+-m_latestFavicon = FaviconStatusQt();
+ 
+ if (!navigation_handle->IsSameDocument()) {
++m_completedHandlersCount = 0;
++m_latestFavicon = FaviconStatusQt();
+ m_documentOnLoadCompleted = false;
+ m_manifestUrl = GURL();
+-}
+ 
+-m_viewClient->iconChanged(QUrl());
++m_viewClient->iconChanged(QUrl());
++}
+ 
+ content::ReloadType reload_type = navigation_handle->GetReloadType();
+ if (reload_type == content::ReloadType::NONE || IsOffTheRecord())

diff --git a/dev-qt/qtwebengine/qtwebengine-6.3.1.ebuild 
b/dev-qt/qtwebengine/qtwebengine-6.3.1.ebuild
index 468f7bbc29d7..91f14a1f75cf 100644
--- a/dev-qt/qtwebengine/qtwebengine-6.3.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-6.3.1.ebuild
@@ -88,6 +88,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
"${FILESDIR}"/${P}-widevine.patch
+   "${FILESDIR}"/${P}-favicon.patch
 )
 
 python_check_deps() {



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

2022-06-20 Thread Andreas Sturmlechner
commit: 25cd576ef58a97ee613b2f8e97640109a598cbb3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jun 20 18:53:23 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jun 20 18:53:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25cd576e

dev-qt/qtwebengine: Fixup fix for CVE-2022-0796

Thanks-to: Michael  gmail.com>
Thanks-to: Jimi Huotari  gentoo.org>
Closes: https://bugs.gentoo.org/853097
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...gine-5.15.5_p20220618-fixup-CVE-2022-0796.patch | 48 ++
 .../qtwebengine-5.15.5_p20220618.ebuild|  1 +
 2 files changed, 49 insertions(+)

diff --git 
a/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-fixup-CVE-2022-0796.patch
 
b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-fixup-CVE-2022-0796.patch
new file mode 100644
index ..c38bf1bdeeb3
--- /dev/null
+++ 
b/dev-qt/qtwebengine/files/qtwebengine-5.15.5_p20220618-fixup-CVE-2022-0796.patch
@@ -0,0 +1,48 @@
+From 7e11d69b957595a172a3eb60db17141daed29d63 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20Br=C3=BCning?= 
+Date: Mon, 20 Jun 2022 17:19:58 +0200
+Subject: Fixup: CVE-2022-0796: Use after free in Media
+
+Commit ecc2bb74f1f accidentally introduced a build break due to an
+apparent typo.
+
+This fixes it.
+
+Change-Id: I746c6f10ecd2b212b847a291677e24e527d6b922
+Reviewed-by: Michal Klocek 
+---
+ chromium/content/renderer/media/batching_media_log.h | 12 ++--
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/3rdparty/chromium/content/renderer/media/batching_media_log.h 
b/src/3rdparty/chromium/content/renderer/media/batching_media_log.h
+index b68535aea42..a28d426878f 100644
+--- a/src/3rdparty/chromium/content/renderer/media/batching_media_log.h
 b/src/3rdparty/chromium/content/renderer/media/batching_media_log.h
+@@ -72,18 +72,18 @@ class CONTENT_EXPORT BatchingMediaLog : public 
media::MediaLog {
+   // guarantees provided by MediaLog, since SendQueuedMediaEvents must also
+   // be synchronized with respect to AddEvent.
+   mutable base::Lock lock_;
+-  const base::TickClock* tick_clock_ GUARDED_BY(LOCK);
+-  base::TimeTicks last_ipc_send_time_ GUARDED_BY(LOCK);
+-  std::vector queued_media_events_ GUARDED_BY(LOCK);
++  const base::TickClock* tick_clock_ GUARDED_BY(lock_);
++  base::TimeTicks last_ipc_send_time_ GUARDED_BY(lock_);
++  std::vector queued_media_events_ GUARDED_BY(lock_);
+ 
+   // impl for sending queued events.
+-  std::vector> event_handlers_ GUARDED_BY(LOCK);
++  std::vector> event_handlers_ 
GUARDED_BY(lock_);
+ 
+   // For enforcing max 1 pending send.
+-  bool ipc_send_pending_ GUARDED_BY(LOCK);
++  bool ipc_send_pending_ GUARDED_BY(lock_);
+ 
+   // Limits the number of events we send over IPC to one.
+-  std::unique_ptr last_duration_changed_event_ 
GUARDED_BY(LOCK);
++  std::unique_ptr last_duration_changed_event_ 
GUARDED_BY(lock_);
+ 
+   // Holds the earliest MEDIA_ERROR_LOG_ENTRY event added to this log. This is
+   // most likely to contain the most specific information available describing
+-- 
+cgit v1.2.1
+

diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
index 3c78403a9c2b..43b46b0fbaab 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.5_p20220618.ebuild
@@ -112,6 +112,7 @@ PATCHES=(
"${FILESDIR}/${PN}-5.15.3_p20220406-gcc12-includes.patch" # by 
openSUSE, bug 840326
"${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
"${WORKDIR}/${PN}-5.15.3_p20220406-patchset" # bug 698988 (py2--), 
pipewire-3
+   "${FILESDIR}/${P}-fixup-CVE-2022-0796.patch" # bug 853097
 )
 
 qtwebengine_check-reqs() {



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

2022-05-20 Thread Andreas Sturmlechner
commit: 7e019f9d500d6aaaf0691b2e84687b497340f0a3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri May 20 18:47:55 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri May 20 19:42:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e019f9d

dev-qt/qtwebengine: 5.15.4_p20220505 version bump

No additional security fixes in webengine-chromium over p20220404.

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtwebengine/Manifest|   1 +
 .../qtwebengine-5.15.3_p20220505-extra-gn.patch|  10 +
 .../qtwebengine-5.15.4_p20220505.ebuild| 275 +
 3 files changed, 286 insertions(+)

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index a6eb68fd50eb..4b7a113801fc 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -2,3 +2,4 @@ DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 
BLAKE2B aa101d14446f3
 DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B 
fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101
 SHA512 
61cbfbe4ff340b75ea8d356e031e932ac03fe65dd00ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
 DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B 
ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7
 SHA512 
47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
 DIST qtwebengine-5.15.3_p20220406.tar.xz 318979648 BLAKE2B 
3aba9293c52f96379cfe37c418c7a29a28e2fc0a8526d35452bef28c03b101054131d0daf75f07f058f80fbd42678b6bd24733573318169908f1d5e18d147db8
 SHA512 
80bf51b547cc8e15473652327a0cb753211911e8c98b1cb8b2cd696af923e79eccdc74aa4b68b6184c74ceb3a9bd708c7313f48eab4381ebeaac8192daa163b6
+DIST qtwebengine-5.15.3_p20220505.tar.xz 318923536 BLAKE2B 
18798ee82864bf513525be30aba58636518b5f13061826a5f80a791baeb3a7695f2626a3eec8b8be88ef6ae4a4caa989f9a35b8b9d8d6f85f727ce3e3a18e110
 SHA512 
c5f0688aa782f1e8f6a076b0bc4ba0c5bb0518a784399d915da924f1a4e798dff1d23158b3bc73e46629020f5490a15823d6d5b36463dc7ebdec14331fe4323e

diff --git 
a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220505-extra-gn.patch 
b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220505-extra-gn.patch
new file mode 100644
index ..a319f521ca67
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220505-extra-gn.patch
@@ -0,0 +1,10 @@
+--- a/src/core/gn_run.pro
 b/src/core/gn_run.pro
+@@ -64,6 +64,7 @@
+ }
+ } else {
+ gn_args+= 
"qtwebengine_target=\"$$system_path($$OUT_PWD/$$getConfigDir()):QtWebEngineCore\""
++gn_args += $$(EXTRA_GN)
+ gn_args = $$system_quote($$gn_args)
+ gn_build_root = 
$$system_quote($$system_path($$OUT_PWD/$$getConfigDir()))
+ gn_run = $$gn_binary gen $$gn_build_root $$gn_python --args=$$gn_args 
--root=$$gn_src_root

diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220505.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220505.ebuild
new file mode 100644
index ..c213bc2c4a1b
--- /dev/null
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.4_p20220505.ebuild
@@ -0,0 +1,275 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_REQ_USE="xml(+)"
+inherit check-reqs estack flag-o-matic multiprocessing python-any-r1 qt5-build 
toolchain-funcs
+
+DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML 
applications"
+HOMEPAGE="https://www.qt.io/;
+
+if [[ ${QT5_BUILD_TYPE} == release ]]; then
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+   if [[ ${PV} == ${QT5_PV}_p* ]]; then
+   
SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.3_p20220505.tar.xz;
+   S="${WORKDIR}/${PN}-5.15.3_p20220505"
+   QT5_BUILD_DIR="${S}_build"
+   fi
+else
+   EGIT_BRANCH="5.15"
+   EGIT_REPO_URI=(
+   "https://code.qt.io/qt/${QT5_MODULE}.git;
+   "https://github.com/qt/${QT5_MODULE}.git;
+   )
+   inherit git-r3
+fi
+
+# ppc64 patchset based on https://github.com/chromium-ppc64le releases
+SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-5.15.2_p20211019-jumbo-build.patch.bz2
+   
https://dev.gentoo.org/~asturm/distfiles/${PN}-5.15.3_p20220406-patchset.tar.xz
+   ppc64? ( 
https://dev.gentoo.org/~gyakovlev/distfiles/${PN}-5.15.2-r1-chromium87-ppc64le.tar.xz
 )"
+
+IUSE="alsa bindist designer geolocation +jumbo-build kerberos pulseaudio 
screencast +system-ffmpeg +system-icu widgets"
+REQUIRED_USE="designer? ( widgets )"
+
+RDEPEND="
+   app-arch/snappy:=
+   dev-libs/glib:2
+   

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

2022-05-14 Thread Sam James
commit: 004ae99be115c5409f1287e6128975e51829896c
Author: Sam James  gentoo  org>
AuthorDate: Sat May 14 07:01:33 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 14 21:22:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=004ae99b

dev-qt/qtwebengine: fix build with GCC 12

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

 ...webengine-5.15.3_p20220406-gcc12-includes.patch | 32 ++
 .../qtwebengine-5.15.3_p20220406.ebuild|  1 +
 2 files changed, 33 insertions(+)

diff --git 
a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-gcc12-includes.patch 
b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-gcc12-includes.patch
new file mode 100644
index ..cd476564037a
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-gcc12-includes.patch
@@ -0,0 +1,32 @@
+https://build.opensuse.org/package/view_file/KDE:Qt:5.15/libqt5-qtwebengine/0001-skia-Some-includes-to-fix-build-with-GCC-12.patch?expand=1
+https://bugs.gentoo.org/840326
+
+From 68799a1e0815b20ca59ce354a55280399257a201 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt 
+Date: Fri, 25 Mar 2022 15:29:28 +0100
+Subject: [PATCH] skia: Some includes to fix build with GCC 12
+
+Those includes got introduced upstream for other reasons and fixed building
+with GCC 12 as a side effect.
+--- a/src/3rdparty/chromium/third_party/skia/include/core/SkColor.h
 b/src/3rdparty/chromium/third_party/skia/include/core/SkColor.h
+@@ -12,6 +12,8 @@
+ #include "include/core/SkScalar.h"
+ #include "include/core/SkTypes.h"
+ 
++#include 
++
+ /** \file SkColor.h
+ 
+ Types, consts, functions, and macros for colors.
+--- a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
 b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
+@@ -8,6 +8,8 @@
+ 
+ #include "include/utils/SkParse.h"
+ 
++#include  // std::lower_bound
++
+ static constexpr const char* gColorNames[] = {
+ "aliceblue",
+ "antiquewhite",

diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild
index 6a665711c4c2..db0d242c1aa1 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.3_p20220406.ebuild
@@ -109,6 +109,7 @@ PATCHES=(
"${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream 
snapshot fix
"${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by 
Debian, QTBUG-61746
"${FILESDIR}/${PN}-5.15.3_p20220329-clang14.patch" # by FreeBSD, bug 
836604
+   "${FILESDIR}/${PN}-5.15.3_p20220406-gcc12-includes.patch" # by 
openSUSE, bug 840326
"${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
"${WORKDIR}/${PN}-5.15.3_p20220406-patchset" # bug 698988 (py2--), 
pipewire-3
 )



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

2022-04-17 Thread Sam James
commit: bcd3f4c1d0d989c0858270e2f4bf3a83f6da9fc7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Apr 15 21:36:17 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 17 19:27:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcd3f4c1

dev-qt/qtwebengine: Cleanup vulnerable 5.15.2_p20211216

Bug: https://bugs.gentoo.org/836830
Bug: https://bugs.gentoo.org/835761
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>
Signed-off-by: Sam James  gentoo.org>

 dev-qt/qtwebengine/Manifest|   1 -
 ...ngine-5.15.2_p20211210-sandbox-glibc-2.34.patch |  27 ---
 .../qtwebengine-5.15.2_p20211216.ebuild| 266 -
 3 files changed, 294 deletions(-)

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 174ba7d55d18..a6eb68fd50eb 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,5 +1,4 @@
 DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 BLAKE2B 
aa101d14446f3282fda8932cc75a249d88b79319f0886d95777292776d94ac5f4fc114c3893b2801fbba6abb14f381172bb14b15b5ffef12413db3a16e4d1ca6
 SHA512 
3324e0076eb18e2ae2248428d2730cfb3413761514b2bb57e25b8db792488098d9f7cebfa08f1a3b39b1d0a382aafed75c5ae8273918909335957921305e
 DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B 
fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101
 SHA512 
61cbfbe4ff340b75ea8d356e031e932ac03fe65dd00ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
-DIST qtwebengine-5.15.2_p20211216.tar.xz 318953468 BLAKE2B 
65b1bc5be8d08d10b75fee20f78a9a783f878874907335818cddde500e80633e91a999e92fd3de69d004c3621a8337c9bef2c949e03e552cab1d89d901e0dae2
 SHA512 
f72db4b6dcbdaa171bf2997ab3a77325f9845ef1d72cd994e6152f0f92d350de348ff15b1cde1140ab98b7eb10d6e2d2a3ac6b7d773ab43de37144faad37c3f3
 DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B 
ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7
 SHA512 
47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
 DIST qtwebengine-5.15.3_p20220406.tar.xz 318979648 BLAKE2B 
3aba9293c52f96379cfe37c418c7a29a28e2fc0a8526d35452bef28c03b101054131d0daf75f07f058f80fbd42678b6bd24733573318169908f1d5e18d147db8
 SHA512 
80bf51b547cc8e15473652327a0cb753211911e8c98b1cb8b2cd696af923e79eccdc74aa4b68b6184c74ceb3a9bd708c7313f48eab4381ebeaac8192daa163b6

diff --git 
a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211210-sandbox-glibc-2.34.patch
 
b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211210-sandbox-glibc-2.34.patch
deleted file mode 100644
index aac512a368d7..
--- 
a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211210-sandbox-glibc-2.34.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Patch taken from www-client/chromium:
-https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/chromium-glibc-2.34.patch
-
-Dropped parts already upstream.
-
-diff --git a/src/3rdparty/chromium/sandbox/linux/services/credentials.cc 
b/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
-index ca6b595..1c1ee42 100644
 a/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
-+++ b/src/3rdparty/chromium/sandbox/linux/services/credentials.cc
-@@ -11,6 +11,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- #include 
-@@ -100,7 +101,8 @@ bool ChrootToSafeEmptyDir() {
-   // TODO(crbug.com/1247458) Broken in MSan builds after LLVM f1bb30a4956f.
-   clone_flags |= CLONE_VM | CLONE_VFORK | CLONE_SETTLS;
- 
--  char tls_buf[PTHREAD_STACK_MIN] = {0};
-+  char tls_buf[PTHREAD_STACK_MIN];
-+  memset(tls_buf, 0, PTHREAD_STACK_MIN);
-   tls = tls_buf;
- #endif
- 

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

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

2022-04-09 Thread Andreas Sturmlechner
commit: 2d116d254a1306d4ead0244525846b3eb11f52f9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Apr  9 12:49:26 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Apr  9 16:03:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d116d25

dev-qt/qtwebengine: 5.15.3_p20220406 version bump

Fix 5.15.3 version downsedding after 5.15.10 bump
No additional security fixes in webengine-chromium over p20220330.
${P}-patchset contains patches to drop catapult as well.

Thanks-to: Jimi Huotari  gentoo.org>
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtwebengine/Manifest|  3 +-
 ... => qtwebengine-5.15.3_p20220406-ffmpeg5.patch} | 32 +++---
 ebuild => qtwebengine-5.15.3_p20220406.ebuild} | 10 ---
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 8dfa38137abb..df0bef8de677 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -2,4 +2,5 @@ DIST qtwebengine-5.15.2-r1-chromium87-ppc64le.tar.xz 28784 
BLAKE2B aa101d14446f3
 DIST qtwebengine-5.15.2_p20211019-jumbo-build.patch.bz2 2930 BLAKE2B 
fca1d1406874d04eafb64bb4d8730512a6307ba44fb99d76f428ca1bd4a303758e0c3bd8f92a59f7bcf62e5b767c5a8ed239028bdb74ad7a8b62abf88d38c101
 SHA512 
61cbfbe4ff340b75ea8d356e031e932ac03fe65dd00ff897ca4b0185d1d989490daf75ffeaaabb3e92c870c11c7ff8ad2cd6372f5363b3d774b8ecca6d89
 DIST qtwebengine-5.15.2_p20211216.tar.xz 318953468 BLAKE2B 
65b1bc5be8d08d10b75fee20f78a9a783f878874907335818cddde500e80633e91a999e92fd3de69d004c3621a8337c9bef2c949e03e552cab1d89d901e0dae2
 SHA512 
f72db4b6dcbdaa171bf2997ab3a77325f9845ef1d72cd994e6152f0f92d350de348ff15b1cde1140ab98b7eb10d6e2d2a3ac6b7d773ab43de37144faad37c3f3
 DIST qtwebengine-5.15.3_p20220329.tar.xz 318910384 BLAKE2B 
df4e88628eed5fa2304eec986dd397cd5f51e42f9fdf2dca1bc6d84ad40be406d112701124c745d003b4c22a33d5a69b39b66747e7b9a970a7c91b46ef3943f7
 SHA512 
650d9056477479fc4630102d7270185c99cdf1ec855f3f407725dd74a737756b7180565a924594c1b75dcbb061d3642af2447610bf22acd9c4cb2c90c7cf842b
-DIST qtwebengine-5.15.3_p20220330.tar.xz 401852524 BLAKE2B 
7ac18135a9c0f99085db332c1b324308cc5c5a350b978bb6944e93a203174390f31ce6addcc9b89ba40a305b6af68cc9b0516fd6d90f8ee12d0d24e60b11d0d1
 SHA512 
53e95548c1fb2fe37f2e63dff56306e6e34f2f1a5e8d811145600111d586528060d26c6ae9833f0a7ad4fee029d44a8275f8c5ac5d511b72fbd24fb0812f592b
+DIST qtwebengine-5.15.3_p20220406-patchset.tar.xz 35480 BLAKE2B 
ce6aeebbb3255196611130d04ee7a3907ba45d6d2a283f2433e2176cf67e473e74137b180de0a9998762cc54439bb06825815e81e9f95f9413ce2956ac9308b7
 SHA512 
47e29a1429dce2db324929af91c8ef8421c75ae48f5a491db71b434f8017a5b1e7475e9938989e331e8e012220852848565242e09747892e1a8a8d3ab7386840
+DIST qtwebengine-5.15.3_p20220406.tar.xz 318979648 BLAKE2B 
3aba9293c52f96379cfe37c418c7a29a28e2fc0a8526d35452bef28c03b101054131d0daf75f07f058f80fbd42678b6bd24733573318169908f1d5e18d147db8
 SHA512 
80bf51b547cc8e15473652327a0cb753211911e8c98b1cb8b2cd696af923e79eccdc74aa4b68b6184c74ceb3a9bd708c7313f48eab4381ebeaac8192daa163b6

diff --git 
a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220330-ffmpeg5.patch 
b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-ffmpeg5.patch
similarity index 87%
rename from dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220330-ffmpeg5.patch
rename to dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-ffmpeg5.patch
index d85c1985883c..15c192667f22 100644
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220330-ffmpeg5.patch
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.3_p20220406-ffmpeg5.patch
@@ -16,8 +16,8 @@ Subject: [PATCH] Fix build with ffmpeg 5
 
 diff --git a/chromium/media/ffmpeg/ffmpeg_common.h 
b/chromium/media/ffmpeg/ffmpeg_common.h
 index 2734a485cbd..70b1877a43c 100644
 a/chromium/media/ffmpeg/ffmpeg_common.h
-+++ b/chromium/media/ffmpeg/ffmpeg_common.h
+--- a/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h
 b/src/3rdparty/chromium/media/ffmpeg/ffmpeg_common.h
 @@ -29,6 +29,7 @@ extern "C" {
  #include 
  #include 
@@ -28,8 +28,8 @@ index 2734a485cbd..70b1877a43c 100644
  #include 
 diff --git a/chromium/media/filters/audio_file_reader.cc 
b/chromium/media/filters/audio_file_reader.cc
 index cb81d920def..bd73908d0ca 100644
 a/chromium/media/filters/audio_file_reader.cc
-+++ b/chromium/media/filters/audio_file_reader.cc
+--- a/src/3rdparty/chromium/media/filters/audio_file_reader.cc
 b/src/3rdparty/chromium/media/filters/audio_file_reader.cc
 @@ -85,7 +85,7 @@ bool AudioFileReader::OpenDemuxer() {
  }
  
@@ -41,8 +41,8 @@ index cb81d920def..bd73908d0ca 100644
  if (codec_context_->sample_fmt == AV_SAMPLE_FMT_S16P)
 diff --git a/chromium/media/filters/ffmpeg_audio_decoder.cc 
b/chromium/media/filters/ffmpeg_audio_decoder.cc
 index 0d825ed791b..72fac6167ef 100644
 a/chromium/media/filters/ffmpeg_audio_decoder.cc
-+++ 

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

2021-10-17 Thread Andreas Sturmlechner
commit: 307dcbdb331d9c909e824b0a7aa41c3948579bfb
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Oct 17 06:43:59 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Oct 17 06:53:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=307dcbdb

dev-qt/qtwebengine: 5.15.2_p20211015 snapshot bump w/o keywords

Snapshotted at:
Branch: 5.15
Commit: 5f6a292bc53b9adf14c0e45a7de226a56449dbca

Submodule qtwebengine-chromium.git:
Branch: 87-based
Commit: d33026ed7c5f25bd0c7936963021936148015522

- Add missing PYTHON_REQ_USE="xml(+)"
- Add pdfium-system-lcms2 patch
- Drop obsolete GCC-11 patch
- Replace media-libs/{mesa -> libglvnd} in DEPEND
- Docu: Add upstream link for version downpatch rationale

Bug: https://bugs.gentoo.org/818217
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtwebengine/Manifest|   1 +
 ...gine-5.15.2_p20211015-pdfium-system-lcms2.patch |  79 +++
 .../qtwebengine-5.15.2_p20211015.ebuild| 227 +
 3 files changed, 307 insertions(+)

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index b4883d999d5..6b129dae702 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,2 +1,3 @@
 DIST qtwebengine-5.15.2-chromium87-ppc64le.tar.xz 28536 BLAKE2B 
98f8e01e7026d9df1d30ae453d4394d3c4ad04c0620a2496235d45f5f1080c2280e040826cde7f72d9771bfc80d0c3df56c9dcbe4f763cec432ad56de37d64c5
 SHA512 
c90a76f44a9d720624016fd082ab3036f12e13b9789e869ebaf5e4774afca7d4187faf187f365f696d1a7eda05ca75516556ee9d291cdb3408d57cc4b23e2654
 DIST qtwebengine-5.15.2_p20210824.tar.xz 320214264 BLAKE2B 
fe611805107822f495e0921de4fc9a8737bd3238a332e03d27421a3fd14dc1417c1d69e9ec5e9f6bf922f98045cbdf9ee2c76621db988c8b1e6e0e90b2c6dc7e
 SHA512 
3a5f9ef45ba488aee601e092d1c4a5f707a854d5b9f0a5e62cb88dcdf280163182abc98b0a55b28591e81e18b5147142d404dcdc92feb61414ce2d4ce0d2dca6
+DIST qtwebengine-5.15.2_p20211015.tar.xz 319006520 BLAKE2B 
12224fdbbfbf45bae795bea1b3f1aef51ce016f08cdcd022cb96264de4ee438146d5ad19dbed668abd24ceddfca9f57f6af5ac76c7d81dd867142d3691e8f992
 SHA512 
b41022d1bc60729b035c8ffde55b3e1d3535b8639f0752749b05625fd1ceb640c4c610722e81f82313237c2b7fa7105a5624da15ef5d88058f8d5b9a642faa67

diff --git 
a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch
 
b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch
new file mode 100644
index 000..b3c2ffb315a
--- /dev/null
+++ 
b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20211015-pdfium-system-lcms2.patch
@@ -0,0 +1,79 @@
+Description: Use system lcms2
+Author: Sandro Knauß 
+Origin: Debian
+Forwarded: https://bugreports.qt.io/browse/QTBUG-61746
+Reviewed-by: Sandro Knauß 
+Last-Update: 2021-03-08
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/3rdparty/chromium/third_party/pdfium/third_party/BUILD.gn
 b/src/3rdparty/chromium/third_party/pdfium/third_party/BUILD.gn
+@@ -239,58 +239,19 @@ if (!pdf_use_skia && !pdf_use_skia_paths
+   }
+ }
+ 
+-config("fx_lcms2_warnings") {
+-  visibility = [ ":*" ]
+-  if (is_clang) {
+-cflags = [
+-  # cmslut.cc is sloppy with aggregate initialization. Version 2.7 of this
+-  # library doesn't appear to have this problem.
+-  "-Wno-missing-braces",
+-]
+-  }
++import("//build/shim_headers.gni")
++
++shim_headers("lcms2_shim") {
++  root_path = "lcms/include"
++  headers = [
++"lcms2.h",
++"lcms2_plugin.h",
++  ]
+ }
+ 
+ source_set("fx_lcms2") {
+-  configs -= [ "//build/config/compiler:chromium_code" ]
+-  configs += [
+-"//build/config/compiler:no_chromium_code",
+-"//build/config/sanitizers:cfi_icall_generalize_pointers",
+-":pdfium_third_party_config",
+-
+-# Must be after no_chromium_code for warning flags to be ordered 
correctly.
+-":fx_lcms2_warnings",
+-  ]
+-  sources = [
+-"lcms/include/lcms2.h",
+-"lcms/include/lcms2_plugin.h",
+-"lcms/src/cmsalpha.c",
+-"lcms/src/cmscam02.c",
+-"lcms/src/cmscgats.c",
+-"lcms/src/cmscnvrt.c",
+-"lcms/src/cmserr.c",
+-"lcms/src/cmsgamma.c",
+-"lcms/src/cmsgmt.c",
+-"lcms/src/cmshalf.c",
+-"lcms/src/cmsintrp.c",
+-"lcms/src/cmsio0.c",
+-"lcms/src/cmsio1.c",
+-"lcms/src/cmslut.c",
+-"lcms/src/cmsmd5.c",
+-"lcms/src/cmsmtrx.c",
+-"lcms/src/cmsnamed.c",
+-"lcms/src/cmsopt.c",
+-"lcms/src/cmspack.c",
+-"lcms/src/cmspcs.c",
+-"lcms/src/cmsplugin.c",
+-"lcms/src/cmsps2.c",
+-"lcms/src/cmssamp.c",
+-"lcms/src/cmssm.c",
+-"lcms/src/cmstypes.c",
+-"lcms/src/cmsvirt.c",
+-"lcms/src/cmswtpnt.c",
+-"lcms/src/cmsxform.c",
+-  ]
+-  deps = [ "../core/fxcrt" ]
++  deps = [ ":lcms2_shim" ]
++  libs = ["lcms2"]
+ }
+ 
+ if (!build_with_chromium) {

diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20211015.ebuild 

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

2021-09-02 Thread Andreas Sturmlechner
commit: 5cb1eb3cca7137dea7140befea7ead10f144b233
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Aug 28 10:13:58 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Sep  2 18:38:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cb1eb3c

dev-qt/qtwebengine: Support EXTRA_GN env var

Thanks-to: Jannik Glückert  gmail.com>
Closes: https://bugs.gentoo.org/774186
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtwebengine/files/qtwebengine-5.15.2-extra_gn.patch | 12 
 dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild |  1 +
 2 files changed, 13 insertions(+)

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-extra_gn.patch 
b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-extra_gn.patch
new file mode 100644
index 000..0488122ce92
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-extra_gn.patch
@@ -0,0 +1,12 @@
+diff --git a/src/core/gn_run.pro b/src/core/gn_run.pro
+index 3d6fda80e..3d0bc86fe 100644
+--- a/src/core/gn_run.pro
 b/src/core/gn_run.pro
+@@ -38,5 +38,6 @@ build_pass|!debug_and_release {
+ }
+ 
++gn_args += $$(EXTRA_GN)
+ gn_args = $$system_quote($$gn_args)
+ gn_src_root = 
$$system_quote($$system_path($$QTWEBENGINE_ROOT/$$getChromiumSrcDir()))
+ gn_build_root = $$system_quote($$system_path($$OUT_PWD/$$getConfigDir()))
+ gn_python = "--script-executable=$$pythonPathForSystem()"

diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild
index 1a87eb9defb..abc242e938b 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild
@@ -100,6 +100,7 @@ BDEPEND="${PYTHON_DEPS}
 
 PATCHES=(
"${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" # bug 695446
+   "${FILESDIR}/${PN}-5.15.2-extra_gn.patch" # downstream, bug 774186
"${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # 
downstream, bug 757606
"${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream 
snapshot fix
"${FILESDIR}/${PN}-5.15.2_p20210406-glibc-2.33.patch" # by Fedora, bug 
769989



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

2021-09-02 Thread Andreas Sturmlechner
commit: 93fcae1fceea4e266fc330a358ead8f005fac8fb
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Aug 28 10:16:32 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Sep  2 18:38:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93fcae1f

dev-qt/qtwebengine: Rebase disable-fatal-warnings.patch

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/qtwebengine-5.15.2-disable-fatal-warnings.patch| 12 
 dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild   |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git 
a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-disable-fatal-warnings.patch 
b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-disable-fatal-warnings.patch
new file mode 100644
index 000..b0f5f3d30e0
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-disable-fatal-warnings.patch
@@ -0,0 +1,12 @@
+diff --git a/src/buildtools/config/common.pri 
b/src/buildtools/config/common.pri
+index cf990c79..910a88ca 100644
+--- a/src/buildtools/config/common.pri
 b/src/buildtools/config/common.pri
+@@ -26,6 +26,7 @@ gn_args += \
+ skia_use_dawn=false \
+ toolkit_views=false \
+ treat_warnings_as_errors=false \
++fatal_linker_warnings=false \
+ use_allocator_shim=false \
+ use_allocator=\"none\" \
+ use_custom_libcxx=false \

diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild
index abc242e938b..223cd21ff67 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.2_p20210824.ebuild
@@ -99,7 +99,7 @@ BDEPEND="${PYTHON_DEPS}
 "
 
 PATCHES=(
-   "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" # bug 695446
+   "${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, 
bug 695446
"${FILESDIR}/${PN}-5.15.2-extra_gn.patch" # downstream, bug 774186
"${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # 
downstream, bug 757606
"${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream 
snapshot fix



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

2021-06-14 Thread Andreas Sturmlechner
commit: 34183adb0b20533e5a61c1ab863ace6108193aa7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jun 14 09:25:07 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jun 14 09:25:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34183adb

dev-qt/qtwebengine: 5.15.2_p20210224 security cleanup

Bug: https://bugs.gentoo.org/787950
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtwebengine/Manifest|   1 -
 ...-5.15.2_p20210224-fix-crash-w-app-locales.patch | 135 ---
 .../qtwebengine-5.15.2_p20210224.ebuild| 189 -
 3 files changed, 325 deletions(-)

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 33cfb335e2b..a189e345d82 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,4 +1,3 @@
 DIST qtwebengine-5.15.2-chromium87-ppc64le.tar.xz 28536 BLAKE2B 
98f8e01e7026d9df1d30ae453d4394d3c4ad04c0620a2496235d45f5f1080c2280e040826cde7f72d9771bfc80d0c3df56c9dcbe4f763cec432ad56de37d64c5
 SHA512 
c90a76f44a9d720624016fd082ab3036f12e13b9789e869ebaf5e4774afca7d4187faf187f365f696d1a7eda05ca75516556ee9d291cdb3408d57cc4b23e2654
-DIST qtwebengine-5.15.2_p20210224.tar.xz 320052028 BLAKE2B 
a1ebaae7cf114041576f4920de1e484bea70c715a470e83e7c47bd8ff95480fc4e408bba173990480732bd464a9eb07d304f4afdb90d943c0a8cbe1e8299df84
 SHA512 
939292511703f3a6d758d38f1c860ffacd003be65761b19f23e8817bf1121cb9e6351216f737126d8defb1c97ca877e1c6f352e7cfee8e9289274d0793348b51
 DIST qtwebengine-5.15.2_p20210421.tar.xz 320142308 BLAKE2B 
1ed6e3daad8e8da7336c1575f524f1474eb043a44a86eebdc2375e9a01dbb21a4bf622b01525c627ff5846bb375b19617ca78f418749d6e4ce53b376da0b8317
 SHA512 
3a57cc8eb1aab086ae2ef69b1b1eaac47827d1f460ff53d5954b0dcb6753cc0e5fb24db490ea186141e6659e26a59862e8096126450a9fde6ed1230c00e4ceaa
 DIST qtwebengine-5.15.2_p20210521.tar.xz 320126348 BLAKE2B 
49a910d19487a720bca751d40bb694536d2ac7002b10de5b949b9bb98baf5f86001e89f522bb05edafc5c050a55f7ac15b6689138cff0912990472735a46bfbc
 SHA512 
f71941667abd1a797442dedb501010cb67512e2df9a818b15ff8901a49987211bddcba80e7cc2a4652db9bf56fc9d969e8fa38de1f3ad112838a1a9c9facde8f

diff --git 
a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-fix-crash-w-app-locales.patch
 
b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-fix-crash-w-app-locales.patch
deleted file mode 100644
index 3a372381ebd..000
--- 
a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210224-fix-crash-w-app-locales.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From 199ea00a9eea13315a652c62778738629185b059 Mon Sep 17 00:00:00 2001
-From: Allan Sandfeld Jensen 
-Date: Wed, 10 Mar 2021 17:14:27 +0100
-Subject: Fix normalization of app locales
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Use the internal Chromium routine to get the app locale Chromium
-expects.
-
-Fixes: QTBUG-91715
-Change-Id: I5042eb066cb6879ad69628959912f2841867b4e8
-Reviewed-by: Michael Brüning 

- src/core/content_browser_client_qt.cpp |  7 ++-
- src/core/content_browser_client_qt.h   |  2 ++
- src/core/web_engine_library_info.cpp   | 18 
- .../widgets/qwebengineview/tst_qwebengineview.cpp  | 24 ++
- 4 files changed, 40 insertions(+), 11 deletions(-)
-
-diff --git a/src/core/content_browser_client_qt.cpp 
b/src/core/content_browser_client_qt.cpp
-index e13ecd8d1..c2c78ff8b 100644
 a/src/core/content_browser_client_qt.cpp
-+++ b/src/core/content_browser_client_qt.cpp
-@@ -471,7 +471,12 @@ std::unique_ptr 
ContentBrowserClientQt::CreateClientCertSt
- 
- std::string ContentBrowserClientQt::GetApplicationLocale()
- {
--return WebEngineLibraryInfo::getApplicationLocale();
-+std::string bcp47Name = QLocale().bcp47Name().toStdString();
-+if (m_cachedQtLocale != bcp47Name) {
-+m_cachedQtLocale = bcp47Name;
-+m_appLocale = WebEngineLibraryInfo::getApplicationLocale();
-+}
-+return m_appLocale;
- }
- 
- std::string ContentBrowserClientQt::GetAcceptLangs(content::BrowserContext 
*context)
-diff --git a/src/core/content_browser_client_qt.h 
b/src/core/content_browser_client_qt.h
-index 7c8aa3ac9..1ccd2926d 100644
 a/src/core/content_browser_client_qt.h
-+++ b/src/core/content_browser_client_qt.h
-@@ -269,6 +269,8 @@ public:
- 
- private:
- scoped_refptr m_shareGroupQtQuick;
-+std::string m_appLocale;
-+std::string m_cachedQtLocale;
- };
- 
- } // namespace QtWebEngineCore
-diff --git a/src/core/web_engine_library_info.cpp 
b/src/core/web_engine_library_info.cpp
-index 2ad5b7565..09a4141b0 100644
 a/src/core/web_engine_library_info.cpp
-+++ b/src/core/web_engine_library_info.cpp
-@@ -46,6 +46,7 @@
- #include "components/spellcheck/spellcheck_buildflags.h"
- #include "content/public/common/content_paths.h"
- #include "sandbox/policy/switches.h"

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

2021-05-23 Thread Andreas Sturmlechner
commit: 154b6c93890d4ed1d8a72edbf1442325979efc14
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun May 23 19:14:58 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May 23 19:18:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=154b6c93

dev-qt/qtwebengine: 5.15.2_p20210521 snapshot bump

Snapshotted at:
Branch: 5.15
Commit: 2240a3f8ebcd317e11fac446aec14bc004067cd9

Submodule qtwebengine-chromium.git:
Branch: 87-based
Commit: dc35950b9eed3be05c4dc747720f495148ffe14

QTBUG-91773, ICU-69.1 and (some) GCC-11 fixes are upstream.

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtwebengine/Manifest|   1 +
 .../files/qtwebengine-5.15.2_p20210521-gcc11.patch |  74 +++
 .../qtwebengine-5.15.2_p20210521.ebuild| 215 +
 3 files changed, 290 insertions(+)

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index ba4cfde1b5e..33cfb335e2b 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,3 +1,4 @@
 DIST qtwebengine-5.15.2-chromium87-ppc64le.tar.xz 28536 BLAKE2B 
98f8e01e7026d9df1d30ae453d4394d3c4ad04c0620a2496235d45f5f1080c2280e040826cde7f72d9771bfc80d0c3df56c9dcbe4f763cec432ad56de37d64c5
 SHA512 
c90a76f44a9d720624016fd082ab3036f12e13b9789e869ebaf5e4774afca7d4187faf187f365f696d1a7eda05ca75516556ee9d291cdb3408d57cc4b23e2654
 DIST qtwebengine-5.15.2_p20210224.tar.xz 320052028 BLAKE2B 
a1ebaae7cf114041576f4920de1e484bea70c715a470e83e7c47bd8ff95480fc4e408bba173990480732bd464a9eb07d304f4afdb90d943c0a8cbe1e8299df84
 SHA512 
939292511703f3a6d758d38f1c860ffacd003be65761b19f23e8817bf1121cb9e6351216f737126d8defb1c97ca877e1c6f352e7cfee8e9289274d0793348b51
 DIST qtwebengine-5.15.2_p20210421.tar.xz 320142308 BLAKE2B 
1ed6e3daad8e8da7336c1575f524f1474eb043a44a86eebdc2375e9a01dbb21a4bf622b01525c627ff5846bb375b19617ca78f418749d6e4ce53b376da0b8317
 SHA512 
3a57cc8eb1aab086ae2ef69b1b1eaac47827d1f460ff53d5954b0dcb6753cc0e5fb24db490ea186141e6659e26a59862e8096126450a9fde6ed1230c00e4ceaa
+DIST qtwebengine-5.15.2_p20210521.tar.xz 320126348 BLAKE2B 
49a910d19487a720bca751d40bb694536d2ac7002b10de5b949b9bb98baf5f86001e89f522bb05edafc5c050a55f7ac15b6689138cff0912990472735a46bfbc
 SHA512 
f71941667abd1a797442dedb501010cb67512e2df9a818b15ff8901a49987211bddcba80e7cc2a4652db9bf56fc9d969e8fa38de1f3ad112838a1a9c9facde8f

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-gcc11.patch 
b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-gcc11.patch
new file mode 100644
index 000..0014ec13544
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.15.2_p20210521-gcc11.patch
@@ -0,0 +1,74 @@
+diff --git 
a/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp 
b/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp
+index 013f1dfb2..3ce63c192 100644
+--- a/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp
 b/src/3rdparty/chromium/third_party/angle/src/libANGLE/HandleAllocator.cpp
+@@ -9,6 +9,7 @@
+ 
+ #include "libANGLE/HandleAllocator.h"
+ 
++#include 
+ #include 
+ #include 
+ 
+diff --git 
a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc 
b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc
+index be91def6b..73f202356 100644
+--- 
a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc
 
b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_atk_hyperlink.cc
+@@ -245,7 +245,7 @@ static void 
AXPlatformAtkHyperlinkInit(AXPlatformAtkHyperlink* self, gpointer) {
+ }
+ 
+ GType ax_platform_atk_hyperlink_get_type() {
+-  static volatile gsize type_volatile = 0;
++  static gsize type_volatile = 0;
+ 
+   AXPlatformNodeAuraLinux::EnsureGTypeInit();
+ 
+diff --git 
a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc 
b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc
+index 04125c6fd..6c64e5d8e 100644
+--- 
a/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc
 
b/src/3rdparty/chromium/ui/accessibility/platform/ax_platform_node_auralinux.cc
+@@ -2274,7 +2274,7 @@ void ClassInit(gpointer class_pointer, gpointer /* 
class_data */) {
+ GType GetType() {
+   AXPlatformNodeAuraLinux::EnsureGTypeInit();
+ 
+-  static volatile gsize type_volatile = 0;
++  static gsize type_volatile = 0;
+   if (g_once_init_enter(_volatile)) {
+ static const GTypeInfo type_info = {
+ sizeof(AXPlatformNodeAuraLinuxClass),  // class_size
+diff --git a/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc 
b/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc
+index c663a2074..38a342484 100644
+--- a/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc
 b/src/3rdparty/chromium/ui/gtk/gtk_key_bindings_handler.cc
+@@ -141,7 +141,7 @@ void 

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

2021-03-24 Thread Andreas Sturmlechner
commit: f16bf0c1808fac00085c2ef8833879ed39642425
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Mar 24 12:14:09 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Mar 24 12:14:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f16bf0c1

dev-qt/qtwebengine: 5.15.2 security cleanup

Bug: https://bugs.gentoo.org/773040
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtwebengine/Manifest|   2 -
 .../qtwebengine-5.15.2-icu-68-v8-runtime-fix.patch | 170 
 .../files/qtwebengine-5.15.2-icu-68.patch  | 302 -
 dev-qt/qtwebengine/qtwebengine-5.15.2.ebuild   | 172 
 4 files changed, 646 deletions(-)

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 47e1c209376..428373e2515 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,4 +1,2 @@
 DIST qtwebengine-5.15.2-chromium87-ppc64le.tar.xz 28536 BLAKE2B 
98f8e01e7026d9df1d30ae453d4394d3c4ad04c0620a2496235d45f5f1080c2280e040826cde7f72d9771bfc80d0c3df56c9dcbe4f763cec432ad56de37d64c5
 SHA512 
c90a76f44a9d720624016fd082ab3036f12e13b9789e869ebaf5e4774afca7d4187faf187f365f696d1a7eda05ca75516556ee9d291cdb3408d57cc4b23e2654
-DIST qtwebengine-5.15.2-ppc64.tar.xz 43868 BLAKE2B 
97a2db64c688cc3ce178a6f00c29d3408221302c992bf0df31edd5c11f7cd978b92d901644991fca4fc0824b19d994a71c472732dbbdda3729bdd04a67f3
 SHA512 
835e7da4670cd823a1674052d64971bfd98d54edb6c5df8e9d09aa8103d496a4c16f0eb9d47c46db466e1c640e3326d4e43b284161129d648bfe693a902ec9cc
 DIST qtwebengine-5.15.2_p20210224.tar.xz 320052028 BLAKE2B 
a1ebaae7cf114041576f4920de1e484bea70c715a470e83e7c47bd8ff95480fc4e408bba173990480732bd464a9eb07d304f4afdb90d943c0a8cbe1e8299df84
 SHA512 
939292511703f3a6d758d38f1c860ffacd003be65761b19f23e8817bf1121cb9e6351216f737126d8defb1c97ca877e1c6f352e7cfee8e9289274d0793348b51
-DIST qtwebengine-everywhere-src-5.15.2.tar.xz 280142544 BLAKE2B 
cf84a07292e69b5746d6575d65295b5bf4e054d448361f26e63cbe20ddd0773f60893e656d74b3b8c191e2829e09398a65896c8d96d3a7ef210ac1f21cd90e63
 SHA512 
de64c30819f5e2f8620c853ff22b2f9717641477aef4432a552a72d1d67ed62ed61572afee6de3f2c9f32dee28f4f786ffd63fc465aa42c0ae1e87ea28341756

diff --git 
a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-icu-68-v8-runtime-fix.patch 
b/dev-qt/qtwebengine/files/qtwebengine-5.15.2-icu-68-v8-runtime-fix.patch
deleted file mode 100644
index 7d6401759a7..000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.15.2-icu-68-v8-runtime-fix.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-From b0a7f5691113534c2cf771f2dd3cece5e93bc7d4 Mon Sep 17 00:00:00 2001
-From: Frank Tang 
-Date: Tue, 03 Nov 2020 23:20:37 -0800
-Subject: [PATCH] Update to ICU68-1
-
-ICU68-1 change the output skeleton format. So we need to change
-resolvedOptions code for 68 migration.
-
-Chromium roll
-https://chromium-review.googlesource.com/c/chromium/src/+/2474093
-
-Bug: v8:10945
-Change-Id: I3b2c7fbe8abb22df8fa51287c498ca3245b8c55b
-Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2477431
-Commit-Queue: Frank Tang 
-Reviewed-by: Jakob Kummerow 
-Reviewed-by: Shu-yu Guo 
-Cr-Commit-Position: refs/heads/master@{#70972}
-
-(ported to work with  CurrencySignString(Isolate* isolate,
- Handle UnitDisplayString(Isolate* isolate,
-  const icu::UnicodeString& skeleton) {
-   // Ex: skeleton as
--  // "measure-unit/length-meter .### rounding-mode-half-up 
unit-width-full-name"
-+  // =ICU-68.1: "unit/length-meter .### rounding-mode-half-up 
unit-width-full-name"
-   if (skeleton.indexOf("unit-width-full-name") >= 0) {
- return ReadOnlyRoots(isolate).long_string_handle();
-   }
-   // Ex: skeleton as
--  // "measure-unit/length-meter .### rounding-mode-half-up unit-width-narrow".
-+  // =ICU-68.1: "unit/length-meter .### rounding-mode-half-up 
unit-width-narrow".
-   if (skeleton.indexOf("unit-width-narrow") >= 0) {
- return ReadOnlyRoots(isolate).narrow_string_handle();
-   }
-   // Ex: skeleton as
--  // "measure-unit/length-foot .### rounding-mode-half-up"
-+  // =ICU-68.1: "unit/length-foot .### rounding-mode-half-up"
-   return ReadOnlyRoots(isolate).short_string_handle();
- }
- 
-@@ -423,7 +426,8 @@ Notation NotationFromSkeleton(const icu::UnicodeString& 
skeleton) {
- return Notation::COMPACT;
-   }
-   // Ex: skeleton as
--  // "measure-unit/length-foot .### rounding-mode-half-up"
-+  // =ICU-68.1: "unit/length-foot .### rounding-mode-half-up"
-   return Notation::STANDARD;
- }
- 
-@@ -563,14 +567,23 @@ namespace {
- 
- // Ex: percent .### rounding-mode-half-up
- // Special case for "percent"
--// Ex: "measure-unit/length-kilometer per-measure-unit/duration-hour .###
--// rounding-mode-half-up" should return "kilometer-per-unit".
--// Ex: "measure-unit/duration-year .### rounding-mode-half-up" should return
--// "year".
-+// =ICU-68.1:
-+//   Ex: 

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

2020-04-26 Thread Andreas Sturmlechner
commit: 9fb143d71dcdcdf31abc464f9b767eae39c98734
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Apr 26 13:37:12 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Apr 26 18:11:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fb143d7

dev-qt/qtwebengine: Drop vulnerable 5.13.2

Effectively dropping package without revdeps back to ~arm.

Bug: https://bugs.gentoo.org/713900
Bug: https://bugs.gentoo.org/699328
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 dev-qt/qtwebengine/Manifest|   1 -
 .../files/qtwebengine-5.12.5-icu-65.patch  |  33 --
 dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild   | 126 -
 3 files changed, 160 deletions(-)

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index f57dd06cf81..0de015b4566 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,3 +1,2 @@
-DIST qtwebengine-everywhere-src-5.13.2.tar.xz 255593964 BLAKE2B 
458f718183aa53376e1aeeb6306b0b3960bd001aebf61e9650d30afd408af003183b7748a87aa0c6a1aa0b3a4be548b417609146b71dc6afa46db49c4b48919f
 SHA512 
10ae5cca36230069ef117cae15b84e29124c43e4864dbfa7a1f99879764b871355281edcb1942e86ec3a4cac12bbfd2749577745c8c7e736eb6a9909876554d0
 DIST qtwebengine-everywhere-src-5.14.1.tar.xz 242438244 BLAKE2B 
d24210b2e04522b27409cc5ccfe722114f711c1c5e9aaff76882c178b0c455b475b90fd2acd5f7ba4f5dfba85c228c4baf2c231d3661eadf83e984d7e7b9e30f
 SHA512 
fafa2fbc789941e837e35945857a6da00e73bd2abe512290674b9957719b998d8b8b95a35c709a171c9d0d111e6f418cec630dfcdbe47ecbae25a3b94e4c99f9
 DIST qtwebengine-everywhere-src-5.14.2.tar.xz 242467568 BLAKE2B 
2b69af846d9f6b1b1bd6380f56868e7fe86c88baf00e4b596e6a825d636472f837c1fc3b9ed41182dcc20dc0ba03360182aba39aee4adca66f407a8346f90fbf
 SHA512 
bcfd9ece04bdbfded5272ce1b3ab482e88349b1f5c5a071f58f6e66fcb9604d1fc38fe909ae3d9631bdf0bf7c081d7590620c3388f1a577b5236f68b084699bf

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch 
b/dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch
deleted file mode 100644
index d7fdaebdb66..000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.12.5-icu-65.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 27947d92157b0987ceef9ae31fe0d3e7f8b653df Mon Sep 17 00:00:00 2001
-From: Kirill Burtsev 
-Date: Fri, 23 Aug 2019 15:09:25 +0200
-Subject: Fix compilation with system ICU
-
-ICU upstream now requires that ICU4C API macros are used with a
-trailing semicolon.
-
-- https://unicode-org.atlassian.net/browse/ICU-20601
-- https://github.com/unicode-org/icu/pull/759
-
-Change-Id: Ie05c005ebcded9a228386db5d9abe9863787ec2b
-Fixes: QTBUG-78911
-Reviewed-by: Jimi Huotari 
-Reviewed-by: Allan Sandfeld Jensen 

- .../blink/renderer/core/dom/document.cc|  2 +-
- chromium/third_party/icu/BUILD.gn  | 28 +++---
- 2 files changed, 21 insertions(+), 9 deletions(-)
-
-diff --git a/chromium/third_party/blink/renderer/core/dom/document.cc 
b/chromium/third_party/blink/renderer/core/dom/document.cc
-index 920dab7c48d..43fd422393c 100644
 a/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc
-+++ b/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc
-@@ -6065,7 +6065,7 @@ static ParseQualifiedNameResult 
ParseQualifiedNameInternal(
- 
-   for (unsigned i = 0; i < length;) {
- UChar32 c;
--U16_NEXT(characters, i, length, c)
-+U16_NEXT(characters, i, length, c);
- if (c == ':') {
-   if (saw_colon)
- return ParseQualifiedNameResult(kQNMultipleColons);

diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
deleted file mode 100644
index 7e5b3e377e4..000
--- a/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit multiprocessing python-any-r1 qt5-build
-
-DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML 
applications"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
-   KEYWORDS="arm"
-fi
-
-IUSE="alsa bindist designer jumbo-build pulseaudio +system-ffmpeg +system-icu 
widgets"
-REQUIRED_USE="designer? ( widgets )"
-
-RDEPEND="
-   app-arch/snappy:=
-   dev-libs/glib:2
-   dev-libs/nspr
-   dev-libs/nss
-   ~dev-qt/qtcore-${PV}
-   ~dev-qt/qtdeclarative-${PV}
-   ~dev-qt/qtgui-${PV}
-   ~dev-qt/qtnetwork-${PV}
-   ~dev-qt/qtpositioning-${PV}
-   ~dev-qt/qtprintsupport-${PV}
-   ~dev-qt/qtwebchannel-${PV}[qml]
-   dev-libs/expat
-   dev-libs/libevent:=
-   dev-libs/libxml2[icu]
-   dev-libs/libxslt
-   dev-libs/re2:=
-   media-libs/fontconfig
-   media-libs/freetype
-   media-libs/harfbuzz:=
-   media-libs/lcms:2
-   

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

2020-03-22 Thread Andreas Sturmlechner
commit: f2b3edf188a8d02dff24998b5e73e7e17a951f1c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Mar 22 14:01:16 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Mar 22 14:40:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2b3edf1

dev-qt/qtwebengine: Detect >=dev-util/ninja-1.10

Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../qtwebengine-5.14.1-detect-ninja-1.10.patch | 27 ++
 dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild   |  1 +
 2 files changed, 28 insertions(+)

diff --git 
a/dev-qt/qtwebengine/files/qtwebengine-5.14.1-detect-ninja-1.10.patch 
b/dev-qt/qtwebengine/files/qtwebengine-5.14.1-detect-ninja-1.10.patch
new file mode 100644
index 000..8200fb9f906
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.14.1-detect-ninja-1.10.patch
@@ -0,0 +1,27 @@
+From 8c1a4841174a90299ba2e2851b4d9e79da3b9b25 Mon Sep 17 00:00:00 2001
+From: Kirill Burtsev 
+Date: Fri, 6 Mar 2020 17:38:45 +0100
+Subject: [PATCH] Support build with system ninja >= 1.10.0
+
+Fixes: QTBUG-82715
+Change-Id: I9a269efa20d092f75a8a43cb20d1e0dc0f46b9f9
+Reviewed-by: Michal Klocek 
+---
+ configure.pri | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.pri b/configure.pri
+index 3a144e3f8e..3cfce71e03 100644
+--- a/configure.pri
 b/configure.pri
+@@ -163,7 +163,7 @@ defineTest(qtConfTest_detectNinja) {
+ !isEmpty(ninja) {
+ qtLog("Found ninja from path: $$ninja")
+ qtRunLoggedCommand("$$ninja --version", version)|return(false)
+-contains(version, "1.[7-9].*"): return(true)
++contains(version, "1\.([7-9]|1[0-9])\..*"): return(true)
+ qtLog("Ninja version too old")
+ }
+ qtLog("Building own ninja")
+-- 
+2.16.3

diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild
index 4579f329664..601e198c642 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild
@@ -79,6 +79,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
"${FILESDIR}/${P}-disable-fatal-warnings.patch" # bug 695446
+   "${FILESDIR}/${P}-detect-ninja-1.10.patch" # QTBUG-82715, fixed in Qt 
5.14.2
 )
 
 src_prepare() {



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

2020-02-09 Thread Andreas Sturmlechner
commit: c5eefaf080581309a9d4c6dd03c55a84957aa3b5
Author: Stephan Hartmann  googlemail  com>
AuthorDate: Sat Feb  8 21:35:41 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Feb 10 06:41:45 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5eefaf0

dev-qt/qtwebengine: fix building on x86

Closes: https://bugs.gentoo.org/695446
Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Stephan Hartmann  googlemail.com>
Closes: https://github.com/gentoo/gentoo/pull/14598
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/qtwebengine-5.14.1-disable-fatal-warnings.patch| 12 
 dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild |  4 
 2 files changed, 16 insertions(+)

diff --git 
a/dev-qt/qtwebengine/files/qtwebengine-5.14.1-disable-fatal-warnings.patch 
b/dev-qt/qtwebengine/files/qtwebengine-5.14.1-disable-fatal-warnings.patch
new file mode 100644
index 000..40f1f5d6c2a
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.14.1-disable-fatal-warnings.patch
@@ -0,0 +1,12 @@
+diff --git a/src/buildtools/config/common.pri 
b/src/buildtools/config/common.pri
+index 97d3953..dd3d222 100644
+--- a/src/buildtools/config/common.pri
 b/src/buildtools/config/common.pri
+@@ -25,6 +25,7 @@ gn_args += \
+ v8_use_external_startup_data=false \
+ toolkit_views=false \
+ treat_warnings_as_errors=false \
++fatal_linker_warnings=false \
+ safe_browsing_mode=0 \
+ optimize_webui=false \
+ forbid_non_component_debug_builds=false

diff --git a/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild
index ce5929f9ca8..1152cf4edeb 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild
@@ -77,6 +77,10 @@ DEPEND="${RDEPEND}
sys-devel/bison
 "
 
+PATCHES=(
+   "${FILESDIR}/${P}-disable-fatal-warnings.patch" # bug 695446
+)
+
 src_prepare() {
if ! use jumbo-build; then
sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \



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

2020-02-08 Thread Andreas Sturmlechner
commit: 71b0725e2b295f383bdbe98571545aaf705c5a03
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb  8 20:23:27 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb  8 21:34:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71b0725e

dev-qt/qtwebengine: pax_kernel is dead

Closes: https://bugs.gentoo.org/708676
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../qtwebengine-5.11.2-paxmark-mksnapshot.patch| 41 --
 dev-qt/qtwebengine/metadata.xml|  1 -
 dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild   | 11 ++
 dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild   | 11 ++
 dev-qt/qtwebengine/qtwebengine-5.14.1.ebuild   | 11 ++
 5 files changed, 9 insertions(+), 66 deletions(-)

diff --git 
a/dev-qt/qtwebengine/files/qtwebengine-5.11.2-paxmark-mksnapshot.patch 
b/dev-qt/qtwebengine/files/qtwebengine-5.11.2-paxmark-mksnapshot.patch
deleted file mode 100644
index f7a5c064fc4..000
--- a/dev-qt/qtwebengine/files/qtwebengine-5.11.2-paxmark-mksnapshot.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Bug: https://bugs.gentoo.org/634220
-
 a/src/3rdparty/chromium/v8/BUILD.gn
-+++ b/src/3rdparty/chromium/v8/BUILD.gn
-@@ -803,6 +803,7 @@
- 
- deps = [
-   ":mksnapshot($v8_snapshot_toolchain)",
-+  ":run_paxmark",
- ]
- 
- script = "tools/run.py"
-@@ -854,6 +855,28 @@
- }
-   }
- }
-+action("run_paxmark") {
-+  visibility = [ ":*" ]  # Only targets in this file can depend on this.
-+
-+  deps = [
-+":mksnapshot($v8_snapshot_toolchain)",
-+  ]
-+
-+  script = "/usr/sbin/pypaxctl"
-+
-+  sources = []
-+
-+  outputs = [
-+ "$target_out_dir/mksnapshot",
-+  ]
-+
-+  args = [
-+"-sm",
-+"./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
-+  "root_out_dir") + "/mksnapshot",
-+   root_build_dir),
-+  ]
-+}
- 
- action("v8_dump_build_config") {
-   script = "tools/testrunner/utils/dump_build_config.py"

diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index acca7340ba1..180beb2cfc8 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -11,7 +11,6 @@
Enable physical position determination
via dev-qt/qtpositioning
Combine source files to speed up build 
process.
-   Enable building under a PaX enabled 
kernel
Use the system-wide 
media-video/ffmpeg
instead of bundled.
Use the system-wide 
dev-libs/icu

diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
index fbd7648f6f0..8161d840612 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 PYTHON_COMPAT=( python2_7 )
-inherit multiprocessing pax-utils python-any-r1 qt5-build
+inherit multiprocessing python-any-r1 qt5-build
 
 DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML 
applications"
 
@@ -11,8 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="arm x86"
 fi
 
-IUSE="alsa bindist designer geolocation jumbo-build pax_kernel pulseaudio
-   +system-ffmpeg +system-icu widgets"
+IUSE="alsa bindist designer geolocation jumbo-build pulseaudio +system-ffmpeg 
+system-icu widgets"
 REQUIRED_USE="designer? ( widgets )"
 
 RDEPEND="
@@ -75,7 +75,6 @@ DEPEND="${RDEPEND}
dev-util/ninja
dev-util/re2c
sys-devel/bison
-   pax_kernel? ( sys-apps/elfix )
!!=sys-devel/binutils-2.31.1-r5
!!=sys-devel/binutils-2.32-r0
 "
@@ -87,8 +86,6 @@ PATCHES+=(
 )
 
 src_prepare() {
-   use pax_kernel && PATCHES+=( 
"${FILESDIR}/${PN}-5.11.2-paxmark-mksnapshot.patch" )
-
if ! use jumbo-build; then
sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \
src/core/config/common.pri || die
@@ -137,6 +134,4 @@ src_install() {
if [[ ! -f ${D%/}${QT5_LIBDIR}/libQt5WebEngine.so ]]; then
die "${CATEGORY}/${PF} failed to build anything. Please report 
to https://bugs.gentoo.org/;
fi
-
-   pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess
 }

diff --git a/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
index 3a69fc34880..f5c244acbfc 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.13.2.ebuild
@@ -2,8 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 PYTHON_COMPAT=( python2_7 )
-inherit multiprocessing pax-utils python-any-r1 qt5-build
+inherit multiprocessing python-any-r1 qt5-build
 
 DESCRIPTION="Library for rendering 

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

2019-10-20 Thread Andreas Sturmlechner
commit: fecf0bc327c7b831f9eb1fcedb018240b88af21a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Oct 19 22:32:47 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Oct 20 14:19:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fecf0bc3

dev-qt/qtwebengine: Drop obsolete patch, already upstreamed in 5.12.5

Fix applied in slightly different place, upstream commit
6e2562dd1efff2b96848e8ec166e8c233029d6cc

Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...webrtc-missing-header-w-linux-headers-5.2.patch | 26 --
 dev-qt/qtwebengine/qtwebengine-5.12.5.ebuild   |  2 --
 2 files changed, 28 deletions(-)

diff --git 
a/dev-qt/qtwebengine/files/qtwebengine-5.12.4-webrtc-missing-header-w-linux-headers-5.2.patch
 
b/dev-qt/qtwebengine/files/qtwebengine-5.12.4-webrtc-missing-header-w-linux-headers-5.2.patch
deleted file mode 100644
index 8acd0b0d06c..000
--- 
a/dev-qt/qtwebengine/files/qtwebengine-5.12.4-webrtc-missing-header-w-linux-headers-5.2.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Jiri Slaby 
-Date: Thu, 11 Jul 2019 09:35:13 +0200
-Subject: fix build after y2038 changes in glibc
-Patch-mainline: submitted on 2019/07/11
-References: QTBUG-76963
-
-SIOCGSTAMP is defined in linux/sockios.h since kernel 5.2. Include that
-file wherever needed.
-
-Signed-off-by: Jiri Slaby 

- chromium/third_party/webrtc/rtc_base/physical_socket_server.cc | 1 +
- 1 file changed, 1 insertion(+)
-
 a/src/3rdparty/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc
-+++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc
-@@ -67,6 +67,7 @@ typedef void* SockOptArg;
- #endif  // WEBRTC_POSIX
- 
- #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && 
!defined(__native_client__)
-+#include 
- 
- int64_t GetSocketRecvTimestamp(int socket) {
-   struct timeval tv_ioctl;
--- 
-2.21.0

diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.5.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.12.5.ebuild
index 6e11493a7ab..e2ece0cda96 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.5.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.5.ebuild
@@ -81,8 +81,6 @@ DEPEND="${RDEPEND}
 PATCHES+=(
"${FILESDIR}/${PN}-5.12.0-nouveau-disable-gpu.patch" # bug 609752
"${FILESDIR}/${P}-pulseaudio-13.patch" # bug 694960
-   # QTBUG-76963, not yet upstream:
-   
"${FILESDIR}/${PN}-5.12.4-webrtc-missing-header-w-linux-headers-5.2.patch"
 )
 
 src_prepare() {



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

2019-09-25 Thread Andreas Sturmlechner
commit: aac59bedeac24a8a9341ac08066c0087efab4585
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Sep 25 19:48:05 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Sep 25 21:33:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aac59bed

dev-qt/qtwebengine: Fix build with >=media-sound/pulseaudio-13.0

Reported-by: Guy  gmail.com>
Tested-by: josef64 in #gentoo-qt IRC
Closes: https://bugs.gentoo.org/694960
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/qtwebengine-5.12.5-pulseaudio-13.patch   | 88 ++
 dev-qt/qtwebengine/qtwebengine-5.12.5.ebuild   |  1 +
 2 files changed, 89 insertions(+)

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.12.5-pulseaudio-13.patch 
b/dev-qt/qtwebengine/files/qtwebengine-5.12.5-pulseaudio-13.patch
new file mode 100644
index 000..1e57f0ed834
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.12.5-pulseaudio-13.patch
@@ -0,0 +1,88 @@
+From 7ac85fb4cc6f44a21761a591ac497ae3d6bf966d Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen 
+Date: Mon, 23 Sep 2019 13:49:53 +0200
+Subject: [PATCH] Fix building with pulseaudio 13
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+The function signature changed though the ABI stayed the same.
+
+Change-Id: I86ca361b5e4f0c523e1031910df438c23beee876
+Fixes: QTBUG-77037
+Reviewed-by: Jüri Valdmann 
+---
+ src/3rdparty/chromium/media/audio/pulse/pulse.sigs | 16 

+ src/3rdparty/chromium/media/audio/pulse/pulse_stub_header.fragment | 11 
+++
+ 2 files changed, 19 insertions(+), 8 deletions(-)
+
+diff --git a/src/3rdparty/chromium/media/audio/pulse/pulse.sigs 
b/src/3rdparty/chromium/media/audio/pulse/pulse.sigs
+index 8b5888786a9..daaeb149c13 100644
+--- a/src/3rdparty/chromium/media/audio/pulse/pulse.sigs
 b/src/3rdparty/chromium/media/audio/pulse/pulse.sigs
+@@ -24,11 +24,11 @@ pa_operation* 
pa_context_get_source_info_by_index(pa_context* c, uint32_t idx, p
+ pa_operation* pa_context_get_source_info_by_name(pa_context* c, const char* 
name, pa_source_info_cb_t cb, void *userdata);
+ pa_operation* pa_context_get_source_info_list(pa_context* c, 
pa_source_info_cb_t cb, void* userdata);
+ pa_operation* pa_context_get_sink_info_list(pa_context* c, pa_sink_info_cb_t 
cb, void* userdata);
+-pa_context_state_t pa_context_get_state(pa_context* c);
++pa_context_state_t pa_context_get_state(const_pa_context_ptr c);
+ pa_context* pa_context_new(pa_mainloop_api* mainloop, const char* name);
+ pa_operation* pa_context_set_source_volume_by_index(pa_context* c, uint32_t 
idx, const pa_cvolume* volume, pa_context_success_cb_t cb, void* userdata);
+ void pa_context_set_state_callback(pa_context* c, pa_context_notify_cb_t cb, 
void* userdata);
+-pa_operation_state_t pa_operation_get_state(pa_operation* o);
++pa_operation_state_t pa_operation_get_state(const_pa_operation_ptr o);
+ void pa_context_unref(pa_context* c);
+ void pa_operation_unref(pa_operation* o);
+ int pa_stream_begin_write(pa_stream* p, void** data, size_t* nbytes);
+@@ -38,23 +38,23 @@ pa_operation* pa_stream_cork(pa_stream* s, int b, 
pa_stream_success_cb_t cb, voi
+ int pa_stream_disconnect(pa_stream* s);
+ int pa_stream_drop(pa_stream *p);
+ pa_operation* pa_stream_flush(pa_stream* s, pa_stream_success_cb_t cb, void* 
userdata);
+-uint32_t pa_stream_get_device_index(pa_stream* s);
++uint32_t pa_stream_get_device_index(const_pa_stream_ptr s);
+ int pa_stream_get_latency(pa_stream* s, pa_usec_t* r_usec, int* negative);
+-pa_stream_state_t pa_stream_get_state(pa_stream* p);
++pa_stream_state_t pa_stream_get_state(const_pa_stream_ptr p);
+ pa_stream* pa_stream_new(pa_context*  c, const char*  name, const 
pa_sample_spec*  ss, const pa_channel_map *  map);
+ pa_stream* pa_stream_new_with_proplist(pa_context* c, const char* name, const 
pa_sample_spec* ss, const pa_channel_map* map, pa_proplist* p);
+ pa_proplist* pa_proplist_new(void);
+-int pa_proplist_contains(pa_proplist* p, const char* key);
++int pa_proplist_contains(const_pa_proplist_ptr p, const char* key);
+ void pa_proplist_free(pa_proplist* p);
+-const char* pa_proplist_gets(pa_proplist* p, const char* key);
++const char* pa_proplist_gets(const_pa_proplist_ptr p, const char* key);
+ int pa_proplist_sets(pa_proplist* p, const char* key, const char* value);
+-size_t pa_stream_readable_size(pa_stream *p);
++size_t pa_stream_readable_size(const_pa_stream_ptr p);
+ int pa_stream_peek(pa_stream* p, const void** data, size_t* nbytes);
+ void pa_stream_set_read_callback(pa_stream* p, pa_stream_request_cb_t cb, 
void* userdata);
+ void pa_stream_set_state_callback(pa_stream* s, pa_stream_notify_cb_t cb, 
void* userdata);
+ int pa_stream_write(pa_stream* p, const void* data, size_t nbytes, 
pa_free_cb_t free_cb, int64_t offset, pa_seek_mode_t seek);
+ void 

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

2019-09-01 Thread Andreas Sturmlechner
commit: 0b676d8201b607caa6465c3020fb10b50d27df89
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Sep  1 23:04:38 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep  1 23:07:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b676d82

dev-qt/qtwebengine: Fix build with >=linux-headers-5.2

Tested-by: Aaron Bauman  gentoo.org>
Closes: https://bugs.gentoo.org/692352
Package-Manager: Portage-2.3.74, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...webrtc-missing-header-w-linux-headers-5.2.patch | 26 ++
 dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild   |  2 ++
 2 files changed, 28 insertions(+)

diff --git 
a/dev-qt/qtwebengine/files/qtwebengine-5.12.4-webrtc-missing-header-w-linux-headers-5.2.patch
 
b/dev-qt/qtwebengine/files/qtwebengine-5.12.4-webrtc-missing-header-w-linux-headers-5.2.patch
new file mode 100644
index 000..8acd0b0d06c
--- /dev/null
+++ 
b/dev-qt/qtwebengine/files/qtwebengine-5.12.4-webrtc-missing-header-w-linux-headers-5.2.patch
@@ -0,0 +1,26 @@
+From: Jiri Slaby 
+Date: Thu, 11 Jul 2019 09:35:13 +0200
+Subject: fix build after y2038 changes in glibc
+Patch-mainline: submitted on 2019/07/11
+References: QTBUG-76963
+
+SIOCGSTAMP is defined in linux/sockios.h since kernel 5.2. Include that
+file wherever needed.
+
+Signed-off-by: Jiri Slaby 
+---
+ chromium/third_party/webrtc/rtc_base/physical_socket_server.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc
 b/src/3rdparty/chromium/third_party/webrtc/rtc_base/physicalsocketserver.cc
+@@ -67,6 +67,7 @@ typedef void* SockOptArg;
+ #endif  // WEBRTC_POSIX
+ 
+ #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && 
!defined(__native_client__)
++#include 
+ 
+ int64_t GetSocketRecvTimestamp(int socket) {
+   struct timeval tv_ioctl;
+-- 
+2.21.0

diff --git a/dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild
index 204d8659fa8..2390a80c8e8 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild
@@ -83,6 +83,8 @@ PATCHES+=(
"${FILESDIR}/${P}-fix-should_override_user_agent_in_new_tabs.patch"
"${FILESDIR}/${P}-bump-V8-patchlevel.patch" # QTBUG-72532
"${FILESDIR}/${P}-fix-arm-32bit-segfaults.patch" # QTBUG-75097
+   # QTBUG-76963, not yet upstream:
+   "${FILESDIR}/${P}-webrtc-missing-header-w-linux-headers-5.2.patch"
 )
 
 src_prepare() {



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

2018-11-10 Thread Andreas Sturmlechner
commit: 07df47de4fba65ea226811b9b6f586290cf7035c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Nov 10 19:50:52 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Nov 10 20:27:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07df47de

dev-qt/qtwebengine: Update paxmark-mksnapshot patches for 5.11.{1,2}

Reported-by: Han  outlook.com>
Thanks-to: Attila Tóth  atoth.sote.hu>
Thanks-to: Miroslaw Mieszczak  mieszczak.com.pl>
Closes: https://bugs.gentoo.org/670852
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../qtwebengine-5.11.1-paxmark-mksnapshot.patch| 41 ++
 .../qtwebengine-5.11.2-paxmark-mksnapshot.patch| 41 ++
 dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild   |  2 +-
 dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild   |  2 +-
 4 files changed, 84 insertions(+), 2 deletions(-)

diff --git 
a/dev-qt/qtwebengine/files/qtwebengine-5.11.1-paxmark-mksnapshot.patch 
b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-paxmark-mksnapshot.patch
new file mode 100644
index 000..352deefb22a
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.1-paxmark-mksnapshot.patch
@@ -0,0 +1,41 @@
+Bug: https://bugs.gentoo.org/634220
+
+--- a/src/3rdparty/chromium/v8/BUILD.gn
 b/src/3rdparty/chromium/v8/BUILD.gn
+@@ -661,6 +661,7 @@ action("run_mksnapshot") {
+ 
+ deps = [
+   ":mksnapshot($v8_snapshot_toolchain)",
++  ":run_paxmark",
+ ]
+ 
+ script = "tools/run.py"
+@@ -706,6 +707,28 @@ action("run_mksnapshot") {
+ args += [ rebase_path(v8_embed_script, root_build_dir) ]
+   }
+ }
++action("run_paxmark") {
++  visibility = [ ":*" ]  # Only targets in this file can depend on this.
++
++  deps = [
++":mksnapshot($v8_snapshot_toolchain)",
++  ]
++
++  script = "/usr/sbin/pypaxctl"
++
++  sources = []
++
++  outputs = [
++ "$target_out_dir/mksnapshot",
++  ]
++
++  args = [
++"-sm",
++"./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
++  "root_out_dir") + "/mksnapshot",
++   root_build_dir),
++  ]
++}
+ 
+ action("run_mkpeephole") {
+   visibility = [ ":*" ]  # Only targets in this file can depend on this.

diff --git 
a/dev-qt/qtwebengine/files/qtwebengine-5.11.2-paxmark-mksnapshot.patch 
b/dev-qt/qtwebengine/files/qtwebengine-5.11.2-paxmark-mksnapshot.patch
new file mode 100644
index 000..f7a5c064fc4
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.2-paxmark-mksnapshot.patch
@@ -0,0 +1,41 @@
+Bug: https://bugs.gentoo.org/634220
+
+--- a/src/3rdparty/chromium/v8/BUILD.gn
 b/src/3rdparty/chromium/v8/BUILD.gn
+@@ -803,6 +803,7 @@
+ 
+ deps = [
+   ":mksnapshot($v8_snapshot_toolchain)",
++  ":run_paxmark",
+ ]
+ 
+ script = "tools/run.py"
+@@ -854,6 +855,28 @@
+ }
+   }
+ }
++action("run_paxmark") {
++  visibility = [ ":*" ]  # Only targets in this file can depend on this.
++
++  deps = [
++":mksnapshot($v8_snapshot_toolchain)",
++  ]
++
++  script = "/usr/sbin/pypaxctl"
++
++  sources = []
++
++  outputs = [
++ "$target_out_dir/mksnapshot",
++  ]
++
++  args = [
++"-sm",
++"./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
++  "root_out_dir") + "/mksnapshot",
++   root_build_dir),
++  ]
++}
+ 
+ action("v8_dump_build_config") {
+   script = "tools/testrunner/utils/dump_build_config.py"

diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
index ba8cd487b93..72de09bfac9 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.1.ebuild
@@ -86,7 +86,7 @@ PATCHES+=(
 )
 
 src_prepare() {
-   use pax_kernel && PATCHES+=( 
"${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
+   use pax_kernel && PATCHES+=( 
"${FILESDIR}/${P}-paxmark-mksnapshot.patch" )
 
# bug 620444 - ensure local headers are used
find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH 
+= |&$$QTWEBENGINE_ROOT/include |' || die

diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild
index 57fa9ada481..90eb3ad2944 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.2.ebuild
@@ -84,7 +84,7 @@ PATCHES+=(
 )
 
 src_prepare() {
-   use pax_kernel && PATCHES+=( 
"${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
+   use pax_kernel && PATCHES+=( 
"${FILESDIR}/${P}-paxmark-mksnapshot.patch" )
 
if ! use jumbo-build; then
sed -i -e 's|use_jumbo_build=true|use_jumbo_build=false|' \



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

2018-05-09 Thread Andreas Sturmlechner
commit: 8fafb3271bb1a83928e492a18f8a2a037b56dc44
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed May  9 20:17:11 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed May  9 20:17:11 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fafb327

dev-qt/qtwebengine: Fix build without dev-qt/qtlocation

Thanks-to: Jimi Huotari  gentoo.org>
Tested-by: josef64 (via irc #gentoo-qt)
Package-Manager: Portage-2.3.36, Repoman-2.3.9

 ...webengine-5.11.0-fix-build-w-o-qtlocation.patch | 56 ++
 dev-qt/qtwebengine/qtwebengine-5.11.0_rc.ebuild|  2 +
 2 files changed, 58 insertions(+)

diff --git 
a/dev-qt/qtwebengine/files/qtwebengine-5.11.0-fix-build-w-o-qtlocation.patch 
b/dev-qt/qtwebengine/files/qtwebengine-5.11.0-fix-build-w-o-qtlocation.patch
new file mode 100644
index 000..2c5012ee34b
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.0-fix-build-w-o-qtlocation.patch
@@ -0,0 +1,56 @@
+From 383ee1aa19b7b72c686d70f34bc9c377a51aaf5e Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen 
+Date: Wed, 9 May 2018 13:23:17 +0200
+Subject: [PATCH] Fix build without qtlocation
+
+Change-Id: I81ac6fcf14563a6d093c51d93754d438992ee52a
+---
+ src/core/content_browser_client_qt.cpp | 10 +-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/src/core/content_browser_client_qt.cpp 
b/src/core/content_browser_client_qt.cpp
+index 30ec43ca0..3878bd1bf 100644
+--- a/src/core/content_browser_client_qt.cpp
 b/src/core/content_browser_client_qt.cpp
+@@ -68,6 +68,7 @@
+ #include "content/public/common/main_function_params.h"
+ #include "content/public/common/service_names.mojom.h"
+ #include "content/public/common/url_constants.h"
++#include "device/geolocation/public/cpp/location_provider.h"
+ #include "mojo/public/cpp/bindings/binding.h"
+ #include "mojo/public/cpp/bindings/binding_set.h"
+ #include "printing/features/features.h"
+@@ -93,7 +94,6 @@
+ #include "certificate_error_controller_p.h"
+ #include "desktop_screen_qt.h"
+ #include "devtools_manager_delegate_qt.h"
+-#include "location_provider_qt.h"
+ #include "media_capture_devices_dispatcher.h"
+ #include "net/network_delegate_qt.h"
+ #include "net/qrc_protocol_handler_qt.h"
+@@ -123,6 +123,10 @@
+ #include "renderer_host/pepper/pepper_host_factory_qt.h"
+ #endif
+ 
++#if defined(QT_USE_POSITIONING)
++#include "location_provider_qt.h"
++#endif
++
+ #include 
+ #include 
+ #ifndef QT_NO_OPENGL
+@@ -737,7 +741,11 @@ bool ContentBrowserClientQt::CanCreateWindow(
+ 
+ std::unique_ptr 
ContentBrowserClientQt::OverrideSystemLocationProvider()
+ {
++#if defined(QT_USE_POSITIONING)
+ return base::WrapUnique(new LocationProviderQt());
++#else
++return nullptr;
++#endif
+ }
+ 
+ scoped_refptr 
GetSystemRequestContextOnUIThread()
+-- 
+2.16.3
+

diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.0_rc.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.11.0_rc.ebuild
index 32064b192b0..735be56a730 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.0_rc.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.0_rc.ebuild
@@ -77,6 +77,8 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
 "
 
+PATCHES+=( "${FILESDIR}/${PN}-5.11.0-fix-build-w-o-qtlocation.patch" )
+
 src_prepare() {
use pax_kernel && PATCHES+=( 
"${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
use system-icu && has_version ">=dev-libs/icu-59" && \



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

2017-12-05 Thread Michael Palimaka
commit: 38591f8810ec877e3be5965f0ed753c5fcbf9f2b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Dec  5 00:52:02 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Dec  5 11:21:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38591f88

dev-qt/qtwebengine: Fix build with >=ICU-60

Closes: https://bugs.gentoo.org/639220
Package-Manager: Portage-2.3.16, Repoman-2.3.6

 .../qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch   | 16 
 dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild  |  2 ++
 2 files changed, 18 insertions(+)

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch 
b/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch
new file mode 100644
index 000..9866ab92919
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch
@@ -0,0 +1,16 @@
+Fix build with >=ICU-60
+
+Bug: https://bugs.gentoo.org/639220
+Bug: https://bugreports.qt.io/browse/QTBUG-64925
+
+--- a/src/3rdparty/chromium/components/url_formatter/url_formatter.cc
 b/src/3rdparty/chromium/components/url_formatter/url_formatter.cc
+@@ -488,7 +488,7 @@
+   // are added to the allowed set. The list has to be updated when a new
+   // version of Unicode is released. The current version is 9.0.0 and ICU 60
+   // will have Unicode 10.0 data.
+-#if U_ICU_VERSION_MAJOR_NUM < 60
++#if U_ICU_VERSION_MAJOR_NUM < 60 || defined(TOOLKIT_QT)
+   const icu::UnicodeSet aspirational_scripts(
+   icu::UnicodeString(
+   // Unified Canadian Syllabics

diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild
index 2c0bd6388d5..afb0d89df44 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild
@@ -73,6 +73,8 @@ DEPEND="${RDEPEND}
pax_kernel? ( sys-apps/elfix )
 "
 
+PATCHES=( "${FILESDIR}/${P}-icu-60.1.patch" )
+
 src_prepare() {
use pax_kernel && PATCHES+=( 
"${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" )
 



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

2017-06-04 Thread Michael Palimaka
commit: 90f45d0172ad22d6b8a6e77025499156b704dcc9
Author: Michael Palimaka  gentoo  org>
AuthorDate: Sun Jun  4 13:19:23 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sun Jun  4 13:19:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90f45d01

dev-qt/qtwebengine: assorted fixes

* Add missing dependencies
* Remove unused dependencies
* Fix build with GCC 7
* Respect MAKEOPTS
* Make build log verbose

Gentoo-bug: 590920
Gentoo-bug: 592660
Gentoo-bug: 610830
Gentoo-bug: 610834
Gentoo-bug: 610848
Gentoo-bug: 610860
Gentoo-bug: 617896
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 .../files/qtwebengine-5.7.1-gcc-7.patch| 144 +
 dev-qt/qtwebengine/qtwebengine-5.7.1-r1.ebuild |   9 +-
 2 files changed, 149 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.7.1-gcc-7.patch 
b/dev-qt/qtwebengine/files/qtwebengine-5.7.1-gcc-7.patch
new file mode 100644
index 000..a5c3072a477
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.7.1-gcc-7.patch
@@ -0,0 +1,144 @@
+From 64fdd317d4127142ad9e967197a2df6ac81ef55f Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen 
+Date: Wed, 29 Mar 2017 17:42:18 +0200
+Subject: [PATCH] Fix build with GCC 7.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Fixes some ambiguities and outright wrong code GCC 7 doesn't accept but
+earlier compilers did.
+
+Task-number:QTBUG-59776
+Change-Id: I012f121842ac6cde49db0d571efc62aabe2115e3
+Reviewed-by: Michael Brüning 
+---
+ .../mojo/public/cpp/bindings/interface_ptr_info.h |  2 +-
+ .../third_party/WebKit/Source/wtf/LinkedHashSet.h |  2 ++
+ chromium/v8/src/objects-body-descriptors.h|  2 +-
+ chromium/v8/src/objects-inl.h | 19 +++
+ chromium/v8/src/objects.h | 16 ++--
+ 5 files changed, 25 insertions(+), 16 deletions(-)
+
+diff --git 
a/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h 
b/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h
+index 5bd29d5..c94a5ac 100644
+--- a/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h
 b/src/3rdparty/chromium/mojo/public/cpp/bindings/interface_ptr_info.h
+@@ -34,7 +34,7 @@ class InterfacePtrInfo {
+ 
+   InterfacePtrInfo& operator=(InterfacePtrInfo&& other) {
+ if (this != ) {
+-  handle_ = other.handle_.Pass();
++  handle_ = std::move(other.handle_);
+   version_ = other.version_;
+   other.version_ = 0u;
+ }
+-- 
+2.7.4
+From 493441248c82d9f39d0947e3bbf4571736e1cf85 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen 
+Date: Wed, 29 Mar 2017 15:53:00 +0200
+Subject: [PATCH 1/1] Fix build with GCC 7.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Fixes a few problems with using undeclared functions and ambigious
+code.
+
+Task-number: QTBUG-59776
+Change-Id: I59813919b4867d5dd3499a45baed004a1a1c1a3c
+Reviewed-by: Michael Brüning 
+---
+ chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h |  2 ++
+ .../third_party/pdfium/fpdfsdk/javascript/global.cpp   |  8 
+ chromium/v8/src/objects-body-descriptors.h |  2 +-
+ chromium/v8/src/objects-inl.h  | 18 ++
+ chromium/v8/src/objects.h  | 16 ++--
+ 5 files changed, 27 insertions(+), 19 deletions(-)
+
+diff --git 
a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h 
b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h
+index e85c72f..6f94cd6 100644
+--- a/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h
 b/src/3rdparty/chromium/third_party/WebKit/Source/wtf/LinkedHashSet.h
+@@ -542,6 +542,8 @@ inline LinkedHashSet& LinkedHashSet::operator=(LinkedHas
+ return *this;
+ }
+ 
++inline void swapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b);
++
+ template
+ inline void LinkedHashSet::swap(LinkedHashSet& other)
+ {
+diff --git a/src/3rdparty/chromium/v8/src/objects-body-descriptors.h 
b/src/3rdparty/chromium/v8/src/objects-body-descriptors.h
+index 91cb888..a1c3634 100644
+--- a/src/3rdparty/chromium/v8/src/objects-body-descriptors.h
 b/src/3rdparty/chromium/v8/src/objects-body-descriptors.h
+@@ -99,7 +99,7 @@ class FixedBodyDescriptor final : public BodyDescriptorBase {
+ 
+   template 
+   static inline void IterateBody(HeapObject* obj, int object_size) {
+-IterateBody(obj);
++IterateBody(obj);
+   }
+ };
+ 
+diff --git a/src/3rdparty/chromium/v8/src/objects-inl.h 
b/src/3rdparty/chromium/v8/src/objects-inl.h
+index 58441d3..4c486ea 100644
+--- a/src/3rdparty/chromium/v8/src/objects-inl.h
 b/src/3rdparty/chromium/v8/src/objects-inl.h
+@@ 

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

2016-12-05 Thread Michael Palimaka
commit: c774a4445fb38143628450af34608353efc1bd78
Author: Aric Belsito  gmail  com>
AuthorDate: Wed Nov 23 23:56:40 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Dec  6 06:54:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c774a444

dev-qt/qtwebengine: Fix on PaX kernels

Gentoo-Bug: 582558
Gentoo-Bug: 579712

 .../files/qtwebengine-paxmark-mksnapshot.patch | 46 ++
 dev-qt/qtwebengine/metadata.xml|  1 +
 dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild| 13 +-
 dev-qt/qtwebengine/qtwebengine-5.7.0.ebuild| 13 +-
 4 files changed, 69 insertions(+), 4 deletions(-)

diff --git a/dev-qt/qtwebengine/files/qtwebengine-paxmark-mksnapshot.patch 
b/dev-qt/qtwebengine/files/qtwebengine-paxmark-mksnapshot.patch
new file mode 100644
index ..c71cedc
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-paxmark-mksnapshot.patch
@@ -0,0 +1,46 @@
+--- 
qtwebengine-opensource-src-5.6.0-orig/src/3rdparty/chromium/v8/tools/gyp/v8.gyp 
   2016-03-04 01:48:36.0 +1100
 qtwebengine-opensource-src-5.6.0/src/3rdparty/chromium/v8/tools/gyp/v8.gyp 
2016-05-01 19:15:44.052770543 +1000
+@@ -33,6 +33,7 @@
+ 'embed_script%': "",
+ 'v8_extra_library_files%': [],
+ 'mksnapshot_exec': 
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot<(EXECUTABLE_SUFFIX)',
++'mksnapshot_u_exec': 
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)mksnapshot_u<(EXECUTABLE_SUFFIX)',
+ 'remove_v8base_debug_symbols%': 0,
+   },
+   'includes': ['../../build/toolchain.gypi', '../../build/features.gypi'],
+@@ -1913,7 +1914,7 @@
+ ]
+ },
+ {
+-  'target_name': 'mksnapshot',
++  'target_name': 'mksnapshot_u',
+   'type': 'executable',
+   'dependencies': ['v8_base', 'v8_nosnapshot', 'v8_libplatform'],
+   'include_dirs+': [
+@@ -1936,5 +1937,26 @@
+ }],
+   ],
+ },
++{
++  'target_name': 'mksnapshot',
++  'type': 'executable',
++  'dependencies': ['mksnapshot_u'],
++  'actions': [
++{
++  'action_name': 'paxmark_m_mksnapshot',
++  'inputs': [
++'<(mksnapshot_u_exec)',
++  ],
++  'outputs': [
++'<(mksnapshot_exec)',
++  ],
++  'action': [
++'sh',
++'-c',
++'cp <(mksnapshot_u_exec) <(mksnapshot_exec) && paxmark.sh m 
<(mksnapshot_exec)',
++  ],
++},
++  ],
++},
+   ],
+ }

diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index 881cc17..9c08bb1 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -8,6 +8,7 @@

Enable physical position determination
via dev-qt/qtpositioning
+   Enable building under a PaX enabled 
kernel
Use the system-wide 
media-video/ffmpeg
instead of bundled.
Use the system-wide 
dev-libs/icu

diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild
index 38e8525..e7f210f 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1 qt5-build
+inherit pax-utils python-any-r1 qt5-build
 
 DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML 
applications"
 
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~x86"
 fi
 
-IUSE="bindist geolocation +system-ffmpeg +system-icu widgets"
+IUSE="bindist geolocation pax_kernel +system-ffmpeg +system-icu widgets"
 
 RDEPEND="
app-arch/snappy
@@ -68,9 +68,12 @@ DEPEND="${RDEPEND}
dev-util/ninja
dev-util/re2c
sys-devel/bison
+   pax_kernel? ( sys-apps/elfix )
 "
 
 src_prepare() {
+   use pax_kernel && PATCHES+=( 
"${FILESDIR}/${PN}-paxmark-mksnapshot.patch" )
+
if use system-icu; then
# ensuire build against system headers - bug #601264
rm -r src/3rdparty/chromium/third_party/icu/source || die
@@ -95,3 +98,9 @@ src_configure() {
)
qt5-build_src_configure
 }
+
+src_install() {
+   qt5-build_src_install
+
+   pax-mark m "${D%/}${QT5_LIBEXECDIR}"/QtWebEngineProcess
+}

diff --git a/dev-qt/qtwebengine/qtwebengine-5.7.0.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.7.0.ebuild
index 87c25c3..b8e0985 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.7.0.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.7.0.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=6
 PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1 qt5-build
+inherit pax-utils python-any-r1 qt5-build
 
 DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML 
applications"
 
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
KEYWORDS="~amd64 ~x86"
 fi
 
-IUSE="bindist geolocation +system-ffmpeg