up to 5.15.13

diff --git a/gcc12.patch b/gcc12.patch
deleted file mode 100644 (file)
index b3a0e04..0000000
--- a/gcc12.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 6bdd69cdfc1e6a695fbe2c4fd6929e79cc7ab3a0 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Mon, 16 May 2022 20:01:49 +0000
-Subject: [PATCH] chromium: skia: Fix build with gcc-12
-
-* fixes:
-/OE/build/test-oe-build-time/poky/build/tmp/work/core2-64-poky-linux/qtwebengine/5.15.8+gitAUTOINC+73e76f9e86_48a205f9e0-r0/recipe-sysroot-native/usr/bin/x86_64-poky-linux/x86_64-poky-linux-g++ -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 --sysroot=/OE/build/test-oe-build-time/poky/build/tmp/work/core2-64-poky-linux/qtwebengine/5.15.8+gitAUTOINC+73e76f9e86_48a205f9e0-r0/recipe-sysroot -MMD -MF obj/skia/skia/SkParseColor.o.d -DUSE_UDEV -DUSE_AURA=1 -DUSE_NSS_CERTS=1 -DUSE_OZONE=1 -DOFFICIAL_BUILD -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNO_UNWIND_TABLES -DCR_SYSROOT_HASH=5f64b417e1018dcf8fcc81dc2714e0f264b9b911 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DSK_CODEC_DECODES_PNG -DSK_CODEC_DECODES_WEBP -DSK_ENCODE_PNG -DSK_ENCODE_WEBP -DSK_USER_CONFIG_HEADER=\"../../skia/config/SkUserConfig.h\" -DSK_GL -DSK_CODEC_DECODES_JPEG -DSK_ENCODE_JPEG -DSK_USE_LIBGIFCODEC -DSK_VULKAN_HEADER=\"../../skia/config/SkVulkanConfig.h\" -DSK_VULKAN=1 -DSK_SUPPORT_GPU=1 -DSK_GPU_WORKAROUNDS_HEADER=\"gpu/config/gpu_driver_bug_workaround_autogen.h\" -DSKIA_IMPLEMENTATION=1 -DSK_GAMMA_EXPONENT=1.2 -DSK_GAMMA_CONTRAST=0.2 -DSK_DEFAULT_FONT_CACHE_LIMIT=20971520 -DWEBP_EXTERN=extern -DUSE_SYSTEM_LIBJPEG -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DUSE_CHROMIUM_ICU=1 -DU_ENABLE_TRACING=1 -DU_ENABLE_RESOURCE_TRACING=0 -DU_STATIC_IMPLEMENTATION -DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE -DUCHAR_TYPE=uint16_t -Igen -I../../../../git/src/3rdparty/chromium -I../../../../git/src/3rdparty/chromium/third_party/skia -I../../../../git/src/3rdparty/chromium/third_party/libgifcodec -I../../../../git/src/3rdparty/chromium/third_party/vulkan/include -I../../../../git/src/3rdparty/chromium/third_party/vulkan_headers/include -I../../../../git/src/3rdparty/chromium/third_party/perfetto/include -Igen/third_party/perfetto/build_config -Igen/third_party/perfetto -Igen -Igen -I../../../../git/src/3rdparty/chromium/third_party/libwebp/src -Igen -I../../../../git/src/3rdparty/chromium/third_party/abseil-cpp -I../../../../git/src/3rdparty/chromium/third_party/boringssl/src/include -I../../../../git/src/3rdparty/chromium/third_party/protobuf/src -Igen/protoc_out -I../../../../git/src/3rdparty/chromium/third_party/icu/source/common -I../../../../git/src/3rdparty/chromium/third_party/icu/source/i18n -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -fno-unwind-tables -fno-asynchronous-unwind-tables -fPIC -pipe -pthread -m64 -fno-omit-frame-pointer -g1 -fvisibility=hidden -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-comments -Wno-packed-not-aligned -Wno-dangling-else -Wno-missing-field-initializers -Wno-unused-parameter -O2 -fno-ident -fdata-sections -ffunction-sections -I/OE/build/test-oe-build-time/poky/build/tmp/work/core2-64-poky-linux/qtwebengine/5.15.8+gitAUTOINC+73e76f9e86_48a205f9e0-r0/recipe-sysroot/usr/include/libpng16 -I/OE/build/test-oe-build-time/poky/build/tmp/work/core2-64-poky-linux/qtwebengine/5.15.8+gitAUTOINC+73e76f9e86_48a205f9e0-r0/recipe-sysroot/usr/include/freetype2 -I/OE/build/test-oe-build-time/poky/build/tmp/work/core2-64-poky-linux/qtwebengine/5.15.8+gitAUTOINC+73e76f9e86_48a205f9e0-r0/recipe-sysroot/usr/include/libpng16 -std=gnu++14 -fno-exceptions -fno-rtti --sysroot=../../../../recipe-sysroot -fvisibility-inlines-hidden -std=c++17 -Wno-narrowing -Wno-class-memaccess -Wno-attributes -Wno-class-memaccess -Wno-subobject-linkage -Wno-invalid-offsetof -Wno-return-type -Wno-deprecated-copy -c ../../../../git/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp -o obj/skia/skia/SkParseColor.o
-../../../../git/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp: In static member function 'static const char* SkParse::FindNamedColor(const char*, size_t, SkColor*)':
-../../../../git/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp:300:49: error: no matching function for call to 'begin(const char* const [140])'
-  300 |     const auto rec = std::lower_bound(std::begin(gColorNames),
-      |                                       ~~~~~~~~~~^~~~~~~~~~~~~
-In file included from ../../../../recipe-sysroot/usr/include/c++/12.1.0/utility:73,
-                 from ../../../../git/src/3rdparty/chromium/third_party/skia/include/core/SkImageInfo.h:11,
-                 from ../../../../git/src/3rdparty/chromium/third_party/skia/include/core/SkColor.h:11,
-                 from ../../../../git/src/3rdparty/chromium/third_party/skia/include/utils/SkParse.h:13,
-                 from ../../../../git/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp:9:
-../../../../recipe-sysroot/usr/include/c++/12.1.0/initializer_list:90:5: note: candidate: 'template<class _Tp> constexpr const _Tp* std::begin(initializer_list<_Tp>)'
-   90 |     begin(initializer_list<_Tp> __ils) noexcept
-      |     ^~~~~
-../../../../recipe-sysroot/usr/include/c++/12.1.0/initializer_list:90:5: note:   template argument deduction/substitution failed:
-../../../../git/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp:300:49: note:   mismatched types 'std::initializer_list<_Tp>' and 'const char* const*'
-  300 |     const auto rec = std::lower_bound(std::begin(gColorNames),
-      |                                       ~~~~~~~~~~^~~~~~~~~~~~~
-../../../../git/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp:301:49: error: no matching function for call to 'end(const char* const [140])'
-  301 |                                       std::end  (gColorNames),
-      |                                       ~~~~~~~~~~^~~~~~~~~~~~~
-../../../../recipe-sysroot/usr/include/c++/12.1.0/initializer_list:101:5: note: candidate: 'template<class _Tp> constexpr const _Tp* std::end(initializer_list<_Tp>)'
-  101 |     end(initializer_list<_Tp> __ils) noexcept
-      |     ^~~
-../../../../recipe-sysroot/usr/include/c++/12.1.0/initializer_list:101:5: note:   template argument deduction/substitution failed:
-../../../../git/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp:301:49: note:   mismatched types 'std::initializer_list<_Tp>' and 'const char* const*'
-  301 |                                       std::end  (gColorNames),
-      |                                       ~~~~~~~~~~^~~~~~~~~~~~~
-../../../../git/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp:307:24: error: no matching function for call to 'end(const char* const [140])'
-  307 |     if (rec == std::end(gColorNames) || 0 != strcmp(name, *rec)) {
-      |                ~~~~~~~~^~~~~~~~~~~~~
-../../../../recipe-sysroot/usr/include/c++/12.1.0/initializer_list:101:5: note: candidate: 'template<class _Tp> constexpr const _Tp* std::end(initializer_list<_Tp>)'
-  101 |     end(initializer_list<_Tp> __ils) noexcept
-      |     ^~~
-../../../../recipe-sysroot/usr/include/c++/12.1.0/initializer_list:101:5: note:   template argument deduction/substitution failed:
-../../../../git/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp:307:24: note:   mismatched types 'std::initializer_list<_Tp>' and 'const char* const*'
-  307 |     if (rec == std::end(gColorNames) || 0 != strcmp(name, *rec)) {
-      |                ~~~~~~~~^~~~~~~~~~~~~
-[67/9144] CXX obj/skia/skia/GrClipStack.o
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- chromium/third_party/skia/src/utils/SkParseColor.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/chromium/third_party/skia/src/utils/SkParseColor.cpp b/chromium/third_party/skia/src/utils/SkParseColor.cpp
-index 7260365b2c6..cd07eb48650 100644
---- a/chromium/third_party/skia/src/utils/SkParseColor.cpp
-+++ b/chromium/third_party/skia/src/utils/SkParseColor.cpp
-@@ -7,6 +7,7 @@
- 
- 
- #include "include/utils/SkParse.h"
-+#include <vector>
- 
- static constexpr const char* gColorNames[] = {
-     "aliceblue",

diff --git a/icu.patch b/icu.patch
deleted file mode 100644 (file)
index b61c923..0000000
--- a/icu.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/libxml/src/encoding.c.TRUE qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/libxml/src/encoding.c
---- qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/libxml/src/encoding.c.TRUE     2021-05-28 07:05:45.000000000 -0500
-+++ qtwebengine-everywhere-src-5.15.5/src/3rdparty/chromium/third_party/libxml/src/encoding.c  2021-06-24 09:44:41.592468805 -0500
-@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler
- #ifdef LIBXML_ICU_ENABLED
-     else if (handler->uconv_out != NULL) {
-         ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
--                              TRUE);
-+                              1);
-     }
- #endif /* LIBXML_ICU_ENABLED */
-     else {

diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index c59d8e6341f744d6328349ec3bfc7b15322369f9..e11530f9cedb8a7b653223b69a836d9fef01592c 100644 (file)
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -15,16 +15,14 @@
 Summary:       The Qt5 WebEngine library
 Summary(pl.UTF-8):     Biblioteka Qt5 WebEngine
 Name:          qt5-%{orgname}
-Version:       %{base_version}.12
-Release:       2
+Version:       %{base_version}.13
+Release:       1
 License:       LGPL v3 or GPL v2 or GPL v3 or commercial
 Group:         X11/Libraries
 Source0:       qtwebengine-%{version}.tar.xz
-# Source0-md5: 68c6f74b74a4b5b273e25f0ebc61ddd0
+# Source0-md5: ffde639b265fc8c663455c3ab92996cd
 Patch0:                x32.patch
 Patch1:                %{name}-gn-dynamic.patch
-Patch2:                icu.patch
-Patch3:                gcc12.patch
 URL:           https://www.qt.io/
 BuildRequires: Qt5Core-devel >= %{qtbase_ver}
 BuildRequires: Qt5Designer-devel >= %{qttools_ver}
@@ -281,10 +279,6 @@ Przykłady do biblioteki Qt5 WebEngine.
 %patch0 -p1
 %endif
 %patch1 -p1
-%patch2 -p1
-cd src/3rdparty
-%patch3 -p1
-cd ../..
 
 %{qt5bindir}/syncqt.pl -version %{version}