From fac656cd233169b7c74b643d6fc4c4bc8adbb27b Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Fri, 4 Mar 2022 12:21:41 +0100 Subject: [PATCH] 5.15.3 + kde-5.15 fixes --- .gitignore | 2 ++ 0068-Bump-version.patch | 25 ------------------------- qt5-qtbase.spec | 20 ++++++++++---------- sources | 4 ++-- 4 files changed, 14 insertions(+), 37 deletions(-) delete mode 100644 0068-Bump-version.patch diff --git a/.gitignore b/.gitignore index 1ec5fc2..7dbc4f4 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ /kde-5.15-rollup-20211206.patch.gz /kde-5.15-rollup-20220107.patch.gz /kde-5.15-rollup-20220131.patch.gz +/qtbase-everywhere-opensource-src-5.15.3.tar.xz +/kde-5.15-rollup-20220304.patch.gz diff --git a/0068-Bump-version.patch b/0068-Bump-version.patch deleted file mode 100644 index 6720f2e..0000000 --- a/0068-Bump-version.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6344955d17e17e2398720fe60c34cfc2a4a95208 Mon Sep 17 00:00:00 2001 -From: Liang Qi -Date: Tue, 17 Nov 2020 11:07:30 +0100 -Subject: [PATCH 068/220] Bump version - -Change-Id: I5697edf968dfaebe25c73899d26ed234631e55dc -Reviewed-by: Kevin Funk -Reviewed-by: Jani Heikkinen ---- - .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 - diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index c317bdf..9b950d5 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -57,14 +57,14 @@ BuildRequires: pkgconfig(libsystemd) Name: qt5-qtbase Summary: Qt5 - QtBase components -Version: 5.15.2 -Release: 35%{?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 @@ -141,12 +141,11 @@ 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-20220304.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-20220304.patch.gz Patch102: qtbase-everywhere-src-5.15.2-CVE-2022-2525.patch # Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires. @@ -421,8 +420,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 @@ -581,7 +578,7 @@ translationdir=%{_qt5_translationdir} Name: Qt5 Description: Qt5 Configuration -Version: 5.15.2 +Version: 5.15.3 EOF # rpm macros @@ -1097,6 +1094,9 @@ fi %changelog +* Fri Mar 04 2022 Jan Grulich - 5.15.3-1 +- 5.15.3 + kde-5.15 fixes + * Thu Feb 17 2022 Than Ngo - 5.15.2-35 - Fixed CVE-2022-25255 diff --git a/sources b/sources index ee7b5bb..ff90289 100644 --- a/sources +++ b/sources @@ -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-20220304.patch.gz) = eee2ee1fbb6be6042261dc35f008b8a91ebd7ceedba469d37220d6185b296d6de9bb65c8c4da4d83d0462d7eb183f9e06fc6c2f748700c400af77980d1c8ed5f