forked from pool/libqt5-qtwebengine
Accepting request 964897 from home:Vogtinator:qt5.15
Not fully built yet, but past the old failure already. - Add patch to fix build with GCC 12: * 0001-skia-Some-includes-to-fix-build-with-GCC-12.patch OBS-URL: https://build.opensuse.org/request/show/964897 OBS-URL: https://build.opensuse.org/package/show/KDE:Qt:5.15/libqt5-qtwebengine?expand=0&rev=36
This commit is contained in:
parent
07d137cab7
commit
24d3c1c898
41
0001-skia-Some-includes-to-fix-build-with-GCC-12.patch
Normal file
41
0001-skia-Some-includes-to-fix-build-with-GCC-12.patch
Normal file
@ -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
|
||||||
|
|
@ -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
|
Tue Jan 04 22:22:01 UTC 2022 - christophe@krop.fr
|
||||||
|
|
||||||
|
@ -47,6 +47,8 @@ Patch1: disable-gpu-when-using-nouveau-boo-1005323.diff
|
|||||||
Patch2: sandbox-statx-futex_time64.patch
|
Patch2: sandbox-statx-futex_time64.patch
|
||||||
# PATCH-FIX-OPENSUSE
|
# PATCH-FIX-OPENSUSE
|
||||||
Patch3: rtc-dont-use-h264.patch
|
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
|
# http://www.chromium.org/blink is not ported to PowerPC & s390
|
||||||
ExcludeArch: ppc ppc64 ppc64le s390 s390x
|
ExcludeArch: ppc ppc64 ppc64le s390 s390x
|
||||||
# Try to fix i586 MemoryErrors with rpmlint
|
# Try to fix i586 MemoryErrors with rpmlint
|
||||||
|
Loading…
Reference in New Issue
Block a user