From 04871f51e062564153aaed5bdddce8808dd0e47e Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Mon, 31 Jan 2022 14:06:49 +0100 Subject: [PATCH] Sync with Fedora: - sync kde/5.15 branch patches Resolves: bz#2018876 --- .gitignore | 1 + qt5-qtbase.spec | 12 +++++++++--- sources | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1f05980..c237d25 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /kde-5.15-rollup-20210907.patch.gz /kde-5.15-rollup-20211012.patch.gz /kde-5.15-rollup-20211206.patch.gz +/kde-5.15-rollup-20220131.patch.gz diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index 0e57c91..f2758f5 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -57,7 +57,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt5-qtbase Summary: Qt5 - QtBase components Version: 5.15.2 -Release: 28%{?dist} +Release: 29%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details @@ -143,9 +143,9 @@ Patch90: %{name}-gcc11.patch # 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 # patch100 in lookaside cache due to large'ish size -- rdieter -Patch100: kde-5.15-rollup-20211206.patch.gz +Patch100: kde-5.15-rollup-20220131.patch.gz # HACK to make 'fedpkg sources' consider it 'used" -Source100: kde-5.15-rollup-20211206.patch.gz +Source100: kde-5.15-rollup-20220131.patch.gz Patch101: 0068-Bump-version.patch Patch102: qtbase-CVE-2021-38593.patch @@ -1119,6 +1119,12 @@ fi %changelog +* Mon Jan 31 2022 Jan Grulich - 5.15.2-29 +- Sync with Fedora: + - sync kde/5.15 branch patches + + Resolves: bz#2018876 + * Tue Dec 07 2021 Jan Grulich - 5.15.2-28 - Sync with Fedora: - sync kde/5.15 branch patches diff --git a/sources b/sources index e87f69a..ee7b5bb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (qtbase-everywhere-src-5.15.2.tar.xz) = a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9 -SHA512 (kde-5.15-rollup-20211206.patch.gz) = fd5a79e8d6cfbd9c1e559ce85f74ae461d054116a40d174a781095a2cc0571dffa32f7e26931652ac734d8064d00792650dbb8e1b1d1286db3c0072c943b2a47 +SHA512 (kde-5.15-rollup-20220131.patch.gz) = 9430861f8a283995fc9aa4a55b7f10eb13747668583db5c18b233def1b7bcac33f6d02140808d1ad9693204387510483bfdb62b1f8b12925e0afa46224a2e8af