$ git diff --patch-with-stat --summary 9cbb4b1de02ce76c06177c7aac66d27145bf3946..2aea162d01141fa629d57094cbb46ad339720814
.abf.yml | 4 ++--
package-source.sh | 2 +-
qt5-qtwebengine.spec | 4 ++--
qtwebengine-5.15.4-compile.patch | 24 ++++++++++--------------
4 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/.abf.yml b/.abf.yml
index e6f112c..28202f1 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,3 +1,3 @@
sources:
- qtwebengine-chromium-87-20221120.tar.zst: 215208972ffd1e63f8276cfb9f87a19617cbc596
- qtwebengine-everywhere-src-5.15.12-20221120.tar.zst: 8520b2cdb4f11fd75b2b9f4e755beb5dbd5a54f1
+ qtwebengine-chromium-87-20230105.tar.zst: a50acc31c69d943ecebb720d587efe31d1058296
+ qtwebengine-everywhere-src-5.15.13-20230105.tar.zst: 14591d5fc01e6e2a00c69d3fba70a9f7942ba697
diff --git a/package-source.sh b/package-source.sh
index a2f0d4f..8c9e7b7 100755
--- a/package-source.sh
+++ b/package-source.sh
@@ -8,7 +8,7 @@ rm -rf qtwebengine qtwebengine-chromium
D="$(date +%Y%m%d)"
git clone -b 5.15 --depth 1 git://code.qt.io/qt/qtwebengine.git
cd qtwebengine
-git archive -o ../qtwebengine-everywhere-src-5.15.12-$D.tar --prefix qtwebengine-everywhere-src-5.15.12-$D/ origin/5.15
+git archive -o ../qtwebengine-everywhere-src-5.15.13-$D.tar --prefix qtwebengine-everywhere-src-5.15.13-$D/ origin/5.15
cd ..
git clone -b ${CHROMIUM}-based --depth 1 git://code.qt.io/qt/qtwebengine-chromium.git
cd qtwebengine-chromium
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index ea982e7..a8d7ee1 100644
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -1,6 +1,6 @@
%define _disable_ld_no_undefined 1
#define beta %{nil}
-%define snapshot 20221120
+%define snapshot 20230105
# exclude plugins (all architectures) and libv8.so (i686, it's static everywhere else)
%global __provides_exclude ^lib.*plugin\\.so.*|libv8\\.so$
@@ -31,7 +31,7 @@
Summary: Qt WebEngine
Name: qt5-qtwebengine
-Version: 5.15.12
+Version: 5.15.13
%if 0%{?snapshot}
Release: 0.%{?beta:%{beta}.}%{snapshot}.1
%define qttarballdir qtwebengine-everywhere-src-%{version}-%{snapshot}
diff --git a/qtwebengine-5.15.4-compile.patch b/qtwebengine-5.15.4-compile.patch
index 0f93031..82472ee 100644
--- a/qtwebengine-5.15.4-compile.patch
+++ b/qtwebengine-5.15.4-compile.patch
@@ -1,7 +1,7 @@
-diff -up qtwebengine-everywhere-src-5.15.4-20210513/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.h.omv~ qtwebengine-everywhere-src-5.15.4-20210513/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.h
---- qtwebengine-everywhere-src-5.15.4-20210513/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.h.omv~ 2021-05-13 19:51:26.378583230 +0200
-+++ qtwebengine-everywhere-src-5.15.4-20210513/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.h 2021-05-13 19:51:52.313796173 +0200
-@@ -22,6 +22,8 @@
+diff -up qtwebengine-everywhere-src-5.15.12-20230105/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.h.18~ qtwebengine-everywhere-src-5.15.12-20230105/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.h
+--- qtwebengine-everywhere-src-5.15.12-20230105/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.h.18~ 2022-12-22 09:25:26.000000000 +0100
++++ qtwebengine-everywhere-src-5.15.12-20230105/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/containers/string_pool.h 2023-01-05 18:41:29.662385687 +0100
+@@ -23,6 +23,8 @@
#include <unordered_map>
#include <vector>
@@ -10,20 +10,16 @@ diff -up qtwebengine-everywhere-src-5.15.4-20210513/src/3rdparty/chromium/third_
#include "perfetto/ext/base/optional.h"
#include "perfetto/ext/base/paged_memory.h"
-diff -up qtwebengine-everywhere-src-5.15.4-20210513/src/3rdparty/chromium/third_party/zlib/google/zip_internal.cc.omv~ qtwebengine-everywhere-src-5.15.4-20210513/src/3rdparty/chromium/third_party/zlib/google/zip_internal.cc
---- qtwebengine-everywhere-src-5.15.4-20210513/src/3rdparty/chromium/third_party/zlib/google/zip_internal.cc.omv~ 2021-05-13 20:39:03.287496737 +0200
-+++ qtwebengine-everywhere-src-5.15.4-20210513/src/3rdparty/chromium/third_party/zlib/google/zip_internal.cc 2021-05-13 20:39:39.165819059 +0200
-@@ -13,10 +13,12 @@
- #include "base/notreached.h"
+diff -up qtwebengine-everywhere-src-5.15.12-20230105/src/3rdparty/chromium/third_party/zlib/google/zip_internal.cc.18~ qtwebengine-everywhere-src-5.15.12-20230105/src/3rdparty/chromium/third_party/zlib/google/zip_internal.cc
+--- qtwebengine-everywhere-src-5.15.12-20230105/src/3rdparty/chromium/third_party/zlib/google/zip_internal.cc.18~ 2023-01-05 18:41:29.662385687 +0100
++++ qtwebengine-everywhere-src-5.15.12-20230105/src/3rdparty/chromium/third_party/zlib/google/zip_internal.cc 2023-01-05 18:42:05.620570089 +0100
+@@ -17,7 +17,8 @@
+ #include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
-#if defined(USE_SYSTEM_MINIZIP)
-+#if 1 //defined(USE_SYSTEM_MINIZIP)
++#if 1
+#include <zlib.h>
#include <minizip/ioapi.h>
#include <minizip/unzip.h>
#include <minizip/zip.h>
-+typedef unsigned long uLong;
- #else
- #include "third_party/zlib/contrib/minizip/unzip.h"
- #include "third_party/zlib/contrib/minizip/zip.h"