5.15.3 + sync with Fedora

Resolves: bz#2061354
2022-03-24 14:55:00 +01:00 · 2022-03-24 14:55:00 +01:00 · cf6242324d
parent 04871f51e0
commit cf6242324d
11 changed files with 50 additions and 197 deletions
--- a/.gitignore
+++ b/.gitignore
@ -10,3 +10,5 @@
 /kde-5.15-rollup-20211012.patch.gz
 /kde-5.15-rollup-20211206.patch.gz
 /kde-5.15-rollup-20220131.patch.gz
+/qtbase-everywhere-opensource-src-5.15.3.tar.xz
+/kde-5.15-rollup-20220324.patch.gz
--- a/0068-Bump-version.patch
+++ b/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
-
--- a/qt5-qtbase.spec
+++ b/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
-Release: 29%{?dist}
+Version: 5.15.3
+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
-Patch101: 0068-Bump-version.patch
+Source100: kde-5.15-rollup-20220324.patch.gz

-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
--- a/qtbase-CVE-2021-38593.patch
+++ b/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());
--- a/qtbase-QTBUG-89977.patch
+++ b/qtbase-QTBUG-89977.patch
@ -1,11 +0,0 @@
-diff -up qtbase-everywhere-src-5.15.2/src/corelib/text/qbytearray.h.foo qtbase-everywhere-src-5.15.2/src/corelib/text/qbytearray.h
--- qtbase-everywhere-src-5.15.2/src/corelib/text/qbytearray.h.foo	2020-10-27 03:02:11.000000000 -0500
-+++ qtbase-everywhere-src-5.15.2/src/corelib/text/qbytearray.h	2021-02-06 17:05:04.879201352 -0600
-@@ -51,6 +49,7 @@
- 
- #include <string>
- #include <iterator>
-+#include <limits>
- 
- #ifdef truncate
- #error qbytearray.h must be included before any header file that defines truncate
--- a/qtbase-QTBUG-90395.patch
+++ b/qtbase-QTBUG-90395.patch
@ -1,23 +0,0 @@
-diff -up qtbase-everywhere-src-5.15.2/src/corelib/global/qendian.h.QTBUG-90395 qtbase-everywhere-src-5.15.2/src/corelib/global/qendian.h
--- qtbase-everywhere-src-5.15.2/src/corelib/global/qendian.h.QTBUG-90395	2020-10-27 03:02:11.000000000 -0500
-+++ qtbase-everywhere-src-5.15.2/src/corelib/global/qendian.h	2021-02-06 16:36:27.072105717 -0600
-@@ -44,6 +44,8 @@
- #include <QtCore/qfloat16.h>
- #include <QtCore/qglobal.h>
- 
-+#include <limits>
-+
- // include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems
- #include <stdlib.h>
- #include <string.h>
-diff -up qtbase-everywhere-src-5.15.2/src/corelib/global/qfloat16.h.QTBUG-90395 qtbase-everywhere-src-5.15.2/src/corelib/global/qfloat16.h
--- qtbase-everywhere-src-5.15.2/src/corelib/global/qfloat16.h.QTBUG-90395	2021-02-06 16:36:27.074105730 -0600
-+++ qtbase-everywhere-src-5.15.2/src/corelib/global/qfloat16.h	2021-02-06 16:37:19.212440114 -0600
-@@ -43,6 +43,7 @@
- 
- #include <QtCore/qglobal.h>
- #include <QtCore/qmetatype.h>
-+#include <limits>
- #include <string.h>
- 
- #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__)
--- a/qtbase-ambiguous-python-shebang.patch
+++ b/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.
--- a/qtbase-emit-qscreen-geometry-changed-when-logical-dpi-changes.patch
+++ b/qtbase-emit-qscreen-geometry-changed-when-logical-dpi-changes.patch
@ -1,56 +0,0 @@
-diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
-index d294cc38..dd31e31c 100644
--- a/src/gui/kernel/qguiapplication.cpp
-+++ b/src/gui/kernel/qguiapplication.cpp
-@@ -3155,13 +3155,14 @@ void QGuiApplicationPrivate::processScreenGeometryChange(QWindowSystemInterfaceP
-     bool availableGeometryChanged = e->availableGeometry != s->d_func()->availableGeometry;
-     s->d_func()->availableGeometry = e->availableGeometry;
- 
-    if (geometryChanged) {
-        Qt::ScreenOrientation primaryOrientation = s->primaryOrientation();
-+    const Qt::ScreenOrientation primaryOrientation = s->primaryOrientation();
-+    if (geometryChanged)
-         s->d_func()->updatePrimaryOrientation();
- 
-        emit s->geometryChanged(s->geometry());
-+    s->d_func()->emitGeometryChangeSignals(geometryChanged, availableGeometryChanged);
-+
-+    if (geometryChanged) {
-         emit s->physicalSizeChanged(s->physicalSize());
-        emit s->physicalDotsPerInchChanged(s->physicalDotsPerInch());
-         emit s->logicalDotsPerInchChanged(s->logicalDotsPerInch());
- 
-         if (s->primaryOrientation() != primaryOrientation)
-@@ -3171,8 +3172,6 @@ void QGuiApplicationPrivate::processScreenGeometryChange(QWindowSystemInterfaceP
-             updateFilteredScreenOrientation(s);
-     }
- 
-    s->d_func()->emitGeometryChangeSignals(geometryChanged, availableGeometryChanged);
-
-     resetCachedDevicePixelRatio();
- }
- 
-diff --git a/src/gui/kernel/qscreen.cpp b/src/gui/kernel/qscreen.cpp
-index df628fcc..a1afc1ba 100644
--- a/src/gui/kernel/qscreen.cpp
-+++ b/src/gui/kernel/qscreen.cpp
-@@ -88,6 +88,9 @@ void QScreenPrivate::updateGeometriesWithSignals()
- void QScreenPrivate::emitGeometryChangeSignals(bool geometryChanged, bool availableGeometryChanged)
- {
-     Q_Q(QScreen);
-+    if (geometryChanged)
-+        emit q->geometryChanged(geometry);
-+
-     if (availableGeometryChanged)
-         emit q->availableGeometryChanged(availableGeometry);
- 
-@@ -96,6 +99,9 @@ void QScreenPrivate::emitGeometryChangeSignals(bool geometryChanged, bool availa
-         for (QScreen* sibling : siblings)
-             emit sibling->virtualGeometryChanged(sibling->virtualGeometry());
-     }
-+
-+    if (geometryChanged)
-+        emit q->physicalDotsPerInchChanged(q->physicalDotsPerInch());
- }
- 
- void QScreenPrivate::setPlatformScreen(QPlatformScreen *screen)
--- a/qtbase-everywhere-src-5.11.1-python3.patch
+++ b/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
- 
- #############################################################################
- ##
--- a/qtbase-filechooser-portal-send-window-id-in-hex.patch
+++ b/qtbase-filechooser-portal-send-window-id-in-hex.patch
@ -1,26 +0,0 @@
-From acaabc9108dfe75530960cf8e3ec4f3602cd82e0 Mon Sep 17 00:00:00 2001
-From: Jan Grulich <jgrulich@redhat.com>
-Date: Mon, 08 Mar 2021 12:29:21 +0100
-Subject: [PATCH] FileChooser portal: send window id in hex
-
-We send window id in decimal, however, it is expected to be send in hex.
-This causes a mismatch and makes portal dialog to show in background.
-
-Pick-to: 5.15 6.0 6.1
-Change-Id: Ibd77199bbb4a2ad4782a0457ddc5506c6b5608fe
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
-
-diff --git a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp
-index ec153f6..85bdd1a 100644
--- a/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp
-+++ b/src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp
-@@ -185,7 +185,7 @@
-                                                           QLatin1String("/org/freedesktop/portal/desktop"),
-                                                           QLatin1String("org.freedesktop.portal.FileChooser"),
-                                                           d->saveFile ? QLatin1String("SaveFile") : QLatin1String("OpenFile"));
-    QString parentWindowId = QLatin1String("x11:") + QString::number(d->winId);
-+    QString parentWindowId = QLatin1String("x11:") + QString::number(d->winId, 16);
- 
-     QVariantMap options;
-     if (!d->acceptLabel.isEmpty())
--- a/4
+++ b/4
@ -1,2 +1,2 @@
-SHA512 (qtbase-everywhere-src-5.15.2.tar.xz) = a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
-SHA512 (kde-5.15-rollup-20220131.patch.gz) = 9430861f8a283995fc9aa4a55b7f10eb13747668583db5c18b233def1b7bcac33f6d02140808d1ad9693204387510483bfdb62b1f8b12925e0afa46224a2e8af
+SHA512 (qtbase-everywhere-opensource-src-5.15.3.tar.xz) = 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
+SHA512 (kde-5.15-rollup-20220324.patch.gz) = bb0cf7d9ec5a922c6d83ce062c4d8d315a1dfbb4d55bfd7aa9504288ed64a8cf0f558d18f02ecb5a38b6a52b80c4ad97613950efeca2516ef000627b3958c506