From aa32f1d08026aa418384f2c6f5d9e0ae4cc9ac53 Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrulich@redhat.com>
Date: Mon, 31 Oct 2022 10:18:17 +0100
Subject: [PATCH] 5.15.7

---
 .gitignore                                     |  2 ++
 qt5-qtbase.spec                                | 18 +++++++++---------
 ...-everywhere-src-5.15.4-cve-2021-38593.patch | 12 ------------
 sources                                        |  4 ++--
 4 files changed, 13 insertions(+), 23 deletions(-)
 delete mode 100644 qtbase-everywhere-src-5.15.4-cve-2021-38593.patch

diff --git a/.gitignore b/.gitignore
index fd48a59..12964fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,5 @@
 /kde-5.15-rollup-20220824.patch.gz
 /qtbase-everywhere-opensource-src-5.15.6.tar.xz
 /kde-5.15-rollup-20220920.patch.gz
+/qtbase-everywhere-opensource-src-5.15.7.tar.xz
+/kde-5.15-rollup-20221031.patch.gz
diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec
index 1504935..e0588f8 100644
--- a/qt5-qtbase.spec
+++ b/qt5-qtbase.spec
@@ -60,8 +60,8 @@ BuildRequires: pkgconfig(libsystemd)
 
 Name:    qt5-qtbase
 Summary: Qt5 - QtBase components
-Version: 5.15.6
-Release: 2%{?dist}
+Version: 5.15.7
+Release: 1%{?dist}
 
 # See LGPL_EXCEPTIONS.txt, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
@@ -141,13 +141,11 @@ Patch90: %{name}-gcc11.patch
 
 ## upstream patches
 # https://invent.kde.org/qt/qt/qtbase, kde/5.15 branch
-# git diff v5.15.5-lts-lgpl..HEAD | gzip > kde-5.15-rollup-$(date +%Y%m%d).patch.gz
+# git diff v5.15.7-lts-lgpl..HEAD | gzip > kde-5.15-rollup-$(date +%Y%m%d).patch.gz
 # patch100 in lookaside cache due to large'ish size -- rdieter
-Patch100: kde-5.15-rollup-20220920.patch.gz
+Patch100: kde-5.15-rollup-20221031.patch.gz
 # HACK to make 'fedpkg sources' consider it 'used"
-Source100: kde-5.15-rollup-20220920.patch.gz
-# CVS-2021-38593
-Patch101: qtbase-everywhere-src-5.15.4-cve-2021-38593.patch
+Source100: kde-5.15-rollup-20221031.patch.gz
 
 # Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires.
 # Those themes are there for platform integration. If the required libraries are
@@ -425,7 +423,6 @@ Qt5 libraries used for drawing widgets and OpenGL items.
 
 ## upstream patches
 %patch100 -p1
-%patch101 -p1
 
 # move some bundled libs to ensure they're not accidentally used
 pushd src/3rdparty
@@ -587,7 +584,7 @@ translationdir=%{_qt5_translationdir}
 
 Name: Qt5
 Description: Qt5 Configuration
-Version: 5.15.6
+Version: 5.15.7
 EOF
 
 # rpm macros
@@ -1103,6 +1100,9 @@ fi
 
 
 %changelog
+* Mon Oct 31 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.7-1
+- 5.15.7
+
 * Tue Oct 11 2022 Rex Dieter <rdieter@gmail.com> - 5.15.6-2
 - make mixing verisons and private api usage a warning instead of fatal error
 
diff --git a/qtbase-everywhere-src-5.15.4-cve-2021-38593.patch b/qtbase-everywhere-src-5.15.4-cve-2021-38593.patch
deleted file mode 100644
index 2e67854..0000000
--- a/qtbase-everywhere-src-5.15.4-cve-2021-38593.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up qtbase-everywhere-src-5.15.4/src/gui/painting/qpaintengineex.cpp.me qtbase-everywhere-src-5.15.4/src/gui/painting/qpaintengineex.cpp
---- qtbase-everywhere-src-5.15.4/src/gui/painting/qpaintengineex.cpp.me	2022-05-30 14:21:52.215469841 +0200
-+++ qtbase-everywhere-src-5.15.4/src/gui/painting/qpaintengineex.cpp	2022-05-30 14:22:39.552558748 +0200
-@@ -426,7 +426,7 @@ void QPaintEngineEx::stroke(const QVecto
-         patternLength *= pw;
-         if (qFuzzyIsNull(patternLength)) {
-             pen.setStyle(Qt::NoPen);
--        } else if (extent / patternLength > 10000) {
-+        } else if (qFuzzyIsNull(extent) || extent / patternLength > 10000) {
-             // approximate stream of tiny dashes with semi-transparent solid line
-             pen.setStyle(Qt::SolidLine);
-             QColor color(pen.color());
diff --git a/sources b/sources
index 22f9ffa..aa0b879 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (qtbase-everywhere-opensource-src-5.15.6.tar.xz) = 4fc6973b9250cd78c4797ed9bb58bec949243cc5e8c3a546b5fbe8c6e6480d5e0745d273fac812f9f5f1fcd675cd8b867d47f57563bf6d23118b58032550103f
-SHA512 (kde-5.15-rollup-20220920.patch.gz) = bbfe6a34185f99500ee2ec0c75ae36f007d13cccf03765b49f271ec55bd76b562647a45b400a329af85fd74b22a38223796039ebb6b9b98c0e75ce1a2a81bbd0
+SHA512 (qtbase-everywhere-opensource-src-5.15.7.tar.xz) = 316de71fba1d5dd91354155dcd0f77e1ce2a798f8296a8699a795ea5e86ad10b6e233299775a92e23328290f3e041240585947e89ee7bd39eb464c5f0ffec343
+SHA512 (kde-5.15-rollup-20221031.patch.gz) = 6384a64a91bcdfc1818816425606e1f93dca5d870dfd492cfa24af92e358237faaf40a889d7c6d7331f3544414b7ef570d282732a2c5233de881f3fdb26173d3