Accepting request 964921 from KDE:Qt:5.15

OBS-URL: https://build.opensuse.org/request/show/964921
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtwebengine?expand=0&rev=76

0001-skia-Some-includes-to-fix-build-with-GCC-12.patch

@@ -0,0 +1,41 @@
+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.
+---
+ src/3rdparty/chromium/third_party/skia/include/core/SkColor.h     | 2 ++
+ src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/src/3rdparty/chromium/third_party/skia/include/core/SkColor.h b/src/3rdparty/chromium/third_party/skia/include/core/SkColor.h
+index 36527e38e53..f77c24ade82 100644
+--- 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.
+diff --git a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp
+index 7260365b2c6..3164650728e 100644
+--- 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",
+-- 
+2.34.1
+

libqt5-qtwebengine.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Mar 25 14:31:28 UTC 2022 - Fabian Vogt <fvogt@suse.com>
+
+- Add patch to fix build with GCC 12:
+  * 0001-skia-Some-includes-to-fix-build-with-GCC-12.patch
+
 -------------------------------------------------------------------
 Tue Jan 04 22:22:01 UTC 2022 - christophe@krop.fr
 

libqt5-qtwebengine.spec

@@ -47,6 +47,8 @@ Patch1:         disable-gpu-when-using-nouveau-boo-1005323.diff
 Patch2:         sandbox-statx-futex_time64.patch
 # PATCH-FIX-OPENSUSE
 Patch3:         rtc-dont-use-h264.patch
+# PATCH-FIX-UPSTREAM
+Patch4:         0001-skia-Some-includes-to-fix-build-with-GCC-12.patch
 # http://www.chromium.org/blink is not ported to PowerPC & s390
 ExcludeArch:    ppc ppc64 ppc64le s390 s390x
 # Try to fix i586 MemoryErrors with rpmlint