From 82aa8e1565b0940c6fbfa7425d99f9f307543eff Mon Sep 17 00:00:00 2001 From: Rmys Date: Tue, 11 Apr 2023 04:49:13 +0300 Subject: [PATCH] qt5-webengine --- desktop/toolkit/qt5/qt5-webengine/actions.py | 2 +- .../qt5-webengine/files/qt5-webengine-gcc12.patch | 13 +++++++++++++ desktop/toolkit/qt5/qt5-webengine/pspec.xml | 6 +++--- 3 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 desktop/toolkit/qt5/qt5-webengine/files/qt5-webengine-gcc12.patch diff --git a/desktop/toolkit/qt5/qt5-webengine/actions.py b/desktop/toolkit/qt5/qt5-webengine/actions.py index aed5ecc9dc..62abc9ad39 100755 --- a/desktop/toolkit/qt5/qt5-webengine/actions.py +++ b/desktop/toolkit/qt5/qt5-webengine/actions.py @@ -12,7 +12,7 @@ from pisi.actionsapi import get def setup(): shelltools.system("mkdir .git") - pisitools.dosed(".qmake.conf", "5.15.10", "5.15.7") + # pisitools.dosed(".qmake.conf", "5.15.10", "5.15.7") #shelltools.unlinkDir("src/3rdparty") #shelltools.move("../qtwebengine-chromium-*", "src/3rdparty") diff --git a/desktop/toolkit/qt5/qt5-webengine/files/qt5-webengine-gcc12.patch b/desktop/toolkit/qt5/qt5-webengine/files/qt5-webengine-gcc12.patch new file mode 100644 index 0000000000..c88b58abbe --- /dev/null +++ b/desktop/toolkit/qt5/qt5-webengine/files/qt5-webengine-gcc12.patch @@ -0,0 +1,13 @@ +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..b5a6aae3596 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 ++ + static constexpr const char* gColorNames[] = { + "aliceblue", + "antiquewhite", diff --git a/desktop/toolkit/qt5/qt5-webengine/pspec.xml b/desktop/toolkit/qt5/qt5-webengine/pspec.xml index c33fc8cb32..98ce98211f 100755 --- a/desktop/toolkit/qt5/qt5-webengine/pspec.xml +++ b/desktop/toolkit/qt5/qt5-webengine/pspec.xml @@ -11,8 +11,8 @@ Provides support for web applications using the Chromium browser project Provides support for web applications using the Chromium browser project LGPLv2.1-linking-exception - https://sourceforge.net/projects/pisilinux/files/source/qtwebengine-everywhere-opensource-src-5.15.10.tar.xz/download - + + https://download.qt.io/official_releases/qt/5.15/5.15.9/submodules/qtwebengine-everywhere-opensource-src-5.15.9.tar.xz qtwebengine-5.15.7-build_fixes-1.patch qtwebengine-everywhere-src-5.15.5-TRUE.patch @@ -88,7 +88,7 @@ mit-kerberos-devel - + qt5-webengine-gcc12.patch