1
0
libqt5-qtwebengine/0001-skia-Some-includes-to-fix-build-with-GCC-12.patch
Christophe Giboudeaux 24d3c1c898 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
2022-03-25 18:13:14 +00:00

42 lines
1.5 KiB
Diff

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