public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/
Date: Sat, 18 Jun 2022 14:27:28 +0000 (UTC)	[thread overview]
Message-ID: <1655562406.2223eef5da0d0a43c39eedc8c9be4d6dfd8d3ca9.asturm@gentoo> (raw)

commit:     2223eef5da0d0a43c39eedc8c9be4d6dfd8d3ca9
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 26 19:34:05 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 18 14:26:46 2022 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=2223eef5

dev-qt/qtwebengine: Sync with 5.15.4_p20220526::gentoo

Fix build with GCC 12

Bug: https://bugs.gentoo.org/840326
Closes: https://bugs.gentoo.org/847298
Signed-off-by: Sam James <sam <AT> gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...webengine-5.15.3_p20220406-gcc12-includes.patch | 32 ++++++++++++++++++++++
 .../qtwebengine-5.15.3_p20220505-extra-gn.patch    | 10 +++++++
 dev-qt/qtwebengine/qtwebengine-5.15.5.9999.ebuild  |  7 +++--
 3 files changed, 46 insertions(+), 3 deletions(-)

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 00000000..cd476564
--- /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 <fvogt@suse.de>
+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 <array>
++
+ /** \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 <algorithm> // std::lower_bound
++
+ static constexpr const char* gColorNames[] = {
+     "aliceblue",
+     "antiquewhite",

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 00000000..a319f521
--- /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.5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.5.9999.ebuild
index 438a2c86..3c78403a 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.15.5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.5.9999.ebuild
@@ -104,11 +104,12 @@ BDEPEND="${PYTHON_DEPS}
 
 PATCHES=(
 	"${FILESDIR}/${PN}-5.15.2-disable-fatal-warnings.patch" # downstream, bug 695446
-	"${FILESDIR}/${PN}-5.15.2-extra_gn.patch" # downstream, bug 774186
+	"${FILESDIR}/${PN}-5.15.3_p20220505-extra-gn.patch" # downstream, bug 774186
 	"${FILESDIR}/${PN}-5.15.2_p20210224-chromium-87-v8-icu68.patch" # downstream, bug 757606
 	"${FILESDIR}/${PN}-5.15.2_p20210224-disable-git.patch" # downstream snapshot fix
 	"${FILESDIR}/${PN}-5.15.2_p20211015-pdfium-system-lcms2.patch" # by Debian, QTBUG-61746
 	"${FILESDIR}/${PN}-5.15.3_p20220329-clang14.patch" # by FreeBSD, bug 836604
+	"${FILESDIR}/${PN}-5.15.3_p20220406-gcc12-includes.patch" # by openSUSE, bug 840326
 	"${WORKDIR}/${PN}-5.15.2_p20211019-jumbo-build.patch" # bug 813957
 	"${WORKDIR}/${PN}-5.15.3_p20220406-patchset" # bug 698988 (py2--), pipewire-3
 )
@@ -268,8 +269,8 @@ src_install() {
 }
 
 pkg_preinst() {
-	elog "This version of Qt WebEngine is based on Chromium version 87.0.4280, with"
-	elog "additional security fixes from newer versions. Extensive as it is, the"
+	elog "This version of Qt WebEngine is based on Chromium version 87.0.4280.144,"
+	elog "with additional security fixes from newer versions. Extensive as it is, the"
 	elog "list of backports is impossible to evaluate, but always bound to be behind"
 	elog "Chromium's release schedule."
 	elog "In addition, various online services may deny service based on an outdated"


             reply	other threads:[~2022-06-18 14:27 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-18 14:27 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-11-22 19:15 [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/files/, dev-qt/qtwebengine/ Andreas Sturmlechner
2024-11-21 15:58 Andreas Sturmlechner
2024-03-23 13:35 Andreas Sturmlechner
2022-04-09 15:05 Andreas Sturmlechner
2022-04-05 17:07 Andreas Sturmlechner
2021-12-24 23:33 Andreas Sturmlechner
2021-09-30 11:35 Andreas Sturmlechner
2021-09-30 11:35 Andreas Sturmlechner
2021-09-30 11:35 Andreas Sturmlechner
2021-03-14 15:36 Andreas Sturmlechner
2020-06-03 10:45 Andreas Sturmlechner
2020-05-10  5:40 Jimi Huotari
2020-04-30  9:26 Andreas Sturmlechner
2020-02-28 20:34 Jimi Huotari
2020-02-10  6:47 Andreas Sturmlechner
2019-10-29 23:54 Jimi Huotari
2019-09-30 19:28 Andreas Sturmlechner
2019-03-16 22:39 Andreas Sturmlechner
2019-02-05 20:38 Andreas Sturmlechner
2019-02-04 18:40 Jimi Huotari
2018-10-31 19:29 Jimi Huotari
2018-09-21 11:26 Jimi Huotari
2018-08-25  4:32 Jimi Huotari
2018-08-24 22:58 Jimi Huotari
2018-06-16 18:06 Andreas Sturmlechner
2018-04-11 12:56 Jimi Huotari
2017-12-09 23:02 Jimi Huotari
2017-06-04  5:10 Michael Palimaka
2016-12-06  8:21 Michael Palimaka
2016-12-06  7:24 Michael Palimaka
2016-05-08  1:28 Davide Pesavento
2016-04-19  1:21 Davide Pesavento
2016-01-17 19:14 Michael Palimaka

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1655562406.2223eef5da0d0a43c39eedc8c9be4d6dfd8d3ca9.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox