import qt5-qtbase-5.15.3-1.el9

.gitignore

@@ -1,2 +1,2 @@
-SOURCES/kde-5.15-rollup-20220131.patch.gz
+SOURCES/kde-5.15-rollup-20220324.patch.gz
-SOURCES/qtbase-everywhere-src-5.15.2.tar.xz
+SOURCES/qtbase-everywhere-opensource-src-5.15.3.tar.xz

.qt5-qtbase.metadata

@@ -1,2 +1,2 @@
-a732b8be038bfff5e60c34ea85e9bfa85db393e1 SOURCES/kde-5.15-rollup-20220131.patch.gz
+981f5fbeb315c2e4adc122cee944368598466b67 SOURCES/kde-5.15-rollup-20220324.patch.gz
-b5ad67fc6381ad7fae0296944734198488d096a3 SOURCES/qtbase-everywhere-src-5.15.2.tar.xz
+d7383126e1f412ef26096692b9e50a1887eb11f7 SOURCES/qtbase-everywhere-opensource-src-5.15.3.tar.xz

SOURCES/0068-Bump-version.patch

@@ -1,25 +0,0 @@
-From 6344955d17e17e2398720fe60c34cfc2a4a95208 Mon Sep 17 00:00:00 2001
-From: Liang Qi <liang.qi@qt.io>
-Date: Tue, 17 Nov 2020 11:07:30 +0100
-Subject: [PATCH 068/220] Bump version
-
-Change-Id: I5697edf968dfaebe25c73899d26ed234631e55dc
-Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
-Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
----
- .qmake.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/.qmake.conf b/.qmake.conf
-index 9476d20099..1bf1a80475 100644
---- a/.qmake.conf
-+++ b/.qmake.conf
-@@ -6,4 +6,4 @@ DEFINES += QT_NO_JAVA_STYLE_ITERATORS
- QT_SOURCE_TREE = $$PWD
- QT_BUILD_TREE = $$shadowed($$PWD)
- 
--MODULE_VERSION = 5.15.2
-+MODULE_VERSION = 5.15.3
--- 
-2.31.1
-

SOURCES/qtbase-CVE-2021-38593.patch

@@ -1,31 +0,0 @@
-From 6b400e3147dcfd8cc3a393ace1bd118c93762e0c Mon Sep 17 00:00:00 2001
-From: Eirik Aavitsland <eirik.aavitsland@qt.io>
-Date: Fri, 23 Jul 2021 15:53:56 +0200
-Subject: [PATCH] Improve fix for avoiding huge number of tiny dashes
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Some pathological cases were not caught by the previous fix.
-
-Fixes: QTBUG-95239
-Pick-to: 6.2 6.1 5.15
-Change-Id: I0337ee3923ff93ccb36c4d7b810a9c0667354cc5
-Reviewed-by: Robert Löhning <robert.loehning@qt.io>
----
- src/gui/painting/qpaintengineex.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp
-index 9fe51082..22e1b18f 100644
---- a/src/gui/painting/qpaintengineex.cpp
-+++ b/src/gui/painting/qpaintengineex.cpp
-@@ -426,7 +426,7 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &inPen)
-         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());

SOURCES/qtbase-ambiguous-python-shebang.patch

@@ -0,0 +1,30 @@
+diff --git a/mkspecs/features/uikit/devices.py b/mkspecs/features/uikit/devices.py
+index 8cdcb370..b0c927ea 100755
+--- a/mkspecs/features/uikit/devices.py
++++ b/mkspecs/features/uikit/devices.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ 
+ #############################################################################
+ ##
+diff --git a/tests/manual/xembed-raster/gtk-embedder.py b/tests/manual/xembed-raster/gtk-embedder.py
+index 5c37fd44..86ffa9fd 100755
+--- a/tests/manual/xembed-raster/gtk-embedder.py
++++ b/tests/manual/xembed-raster/gtk-embedder.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ #############################################################################
+ ##
+ ## Copyright (C) 2013 Canonical Ltd.
+diff --git a/tests/manual/xembed-widgets/gtk-embedder.py b/tests/manual/xembed-widgets/gtk-embedder.py
+index 2a7c92db..93135b14 100755
+--- a/tests/manual/xembed-widgets/gtk-embedder.py
++++ b/tests/manual/xembed-widgets/gtk-embedder.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python
++#!/usr/bin/python3
+ #############################################################################
+ ##
+ ## Copyright (C) 2013 Canonical Ltd.

SOURCES/qtbase-everywhere-src-5.11.1-python3.patch

@@ -1,9 +0,0 @@
-diff -up qtbase-everywhere-src-5.11.1/mkspecs/features/uikit/devices.py.me qtbase-everywhere-src-5.11.1/mkspecs/features/uikit/devices.py
---- qtbase-everywhere-src-5.11.1/mkspecs/features/uikit/devices.py.me	2018-06-23 11:29:21.750066271 +0200
-+++ qtbase-everywhere-src-5.11.1/mkspecs/features/uikit/devices.py	2018-06-23 11:30:07.457292033 +0200
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python3
- 
- #############################################################################
- ##

SPECS/qt5-qtbase.spec

@@ -29,6 +29,9 @@
 %endif
 %endif
 
+# Disable automatic .la file removal
+%global __brp_remove_la_files %nil
+
 %global platform linux-g++
 
 %if 0%{?use_clang}
@@ -56,15 +59,15 @@ BuildRequires: pkgconfig(libsystemd)
 
 Name:    qt5-qtbase
 Summary: Qt5 - QtBase components
-Version: 5.15.2
+Version: 5.15.3
-Release: 29%{?dist}
+Release: 1%{?dist}
 
 
 # See LGPL_EXCEPTIONS.txt, for exception details
 License: LGPLv2 with exceptions or GPLv3 with exceptions
 Url:     http://qt-project.org/
 %global  majmin %(echo %{version} | cut -d. -f1-2)
-Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz
+Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-opensource-src-%{version}.tar.xz
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=1227295
 Source1: qtlogging.ini
@@ -130,7 +133,7 @@ Patch64: qt5-qtbase-5.12.1-firebird-4.0.0.patch
 Patch65: qtbase-opensource-src-5.9.0-mysql.patch
 
 # python3
-Patch68: qtbase-everywhere-src-5.11.1-python3.patch
+Patch68: qtbase-ambiguous-python-shebang.patch
 
 # https://fedoraproject.org/wiki/Changes/Qt_Wayland_By_Default_On_Gnome
 # https://bugzilla.redhat.com/show_bug.cgi?id=1732129
@@ -141,14 +144,12 @@ Patch90: %{name}-gcc11.patch
 
 ## upstream patches
 # https://invent.kde.org/qt/qt/qtbase, kde/5.15 branch
-# git diff v5.15.2..HEAD | gzip > kde-5.15-rollup-$(date +%Y%m%d).patch.gz
+# git diff v5.15.3-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-20220131.patch.gz
+Patch100: kde-5.15-rollup-20220324.patch.gz
 # HACK to make 'fedpkg sources' consider it 'used"
-Source100: kde-5.15-rollup-20220131.patch.gz
+Source100: kde-5.15-rollup-20220324.patch.gz
-Patch101: 0068-Bump-version.patch
 
-Patch102: qtbase-CVE-2021-38593.patch
 
 # Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires.
 # Those themes are there for platform integration. If the required libraries are
@@ -183,6 +184,7 @@ BuildRequires: pkgconfig(fontconfig)
 BuildRequires: pkgconfig(gl)
 BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(gtk+-3.0)
+BuildRequires: pkgconfig(libproxy-1.0)
 # xcb-sm
 BuildRequires: pkgconfig(ice) pkgconfig(sm)
 BuildRequires: pkgconfig(libpng)
@@ -423,10 +425,6 @@ Qt5 libraries used for drawing widgets and OpenGL items.
 
 ## upstream patches
 %patch100 -p1
-# revert version bump
-%patch101 -p1 -R
-
-%patch102 -p1
 
 # move some bundled libs to ensure they're not accidentally used
 pushd src/3rdparty
@@ -599,7 +597,7 @@ translationdir=%{_qt5_translationdir}
 
 Name: Qt5
 Description: Qt5 Configuration
-Version: 5.15.2
+Version: 5.15.3
 EOF
 
 # rpm macros
@@ -1119,6 +1117,10 @@ fi
 
 
 %changelog
+* Thu Mar 24 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.3-1
+- 5.15.3 + sync with Fedora
+  Resolves: bz#2061354
+
 * Mon Jan 31 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.2-29
 - Sync with Fedora:
   - sync kde/5.15 branch patches