From 5c28830e86d2018263153364b2f2203f84e912dc Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 11 Jan 2022 12:49:57 -0500
Subject: [PATCH] import qt5-qtbase-5.15.2-28.el9

---
 .gitignore            |  2 +-
 .qt5-qtbase.metadata  |  2 +-
 SPECS/qt5-qtbase.spec | 17 +++++++++++++----
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 97f5185..b8645ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/kde-5.15-rollup-20211012.patch.gz
+SOURCES/kde-5.15-rollup-20211206.patch.gz
 SOURCES/qtbase-everywhere-src-5.15.2.tar.xz
diff --git a/.qt5-qtbase.metadata b/.qt5-qtbase.metadata
index a98c50f..eca8585 100644
--- a/.qt5-qtbase.metadata
+++ b/.qt5-qtbase.metadata
@@ -1,2 +1,2 @@
-cd5af27701311d04f66777e184b0dcfbc9c14bc2 SOURCES/kde-5.15-rollup-20211012.patch.gz
+3c0fc9122c7ddebc77de7aef627d866d6519c1eb SOURCES/kde-5.15-rollup-20211206.patch.gz
 b5ad67fc6381ad7fae0296944734198488d096a3 SOURCES/qtbase-everywhere-src-5.15.2.tar.xz
diff --git a/SPECS/qt5-qtbase.spec b/SPECS/qt5-qtbase.spec
index 9521b04..0e57c91 100644
--- a/SPECS/qt5-qtbase.spec
+++ b/SPECS/qt5-qtbase.spec
@@ -57,7 +57,7 @@ BuildRequires: pkgconfig(libsystemd)
 Name:    qt5-qtbase
 Summary: Qt5 - QtBase components
 Version: 5.15.2
-Release: 27%{?dist}
+Release: 28%{?dist}
 
 
 # See LGPL_EXCEPTIONS.txt, for exception details
@@ -143,7 +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-20211012.patch.gz
+Patch100: kde-5.15-rollup-20211206.patch.gz
+# HACK to make 'fedpkg sources' consider it 'used"
+Source100: kde-5.15-rollup-20211206.patch.gz
 Patch101: 0068-Bump-version.patch
 
 Patch102: qtbase-CVE-2021-38593.patch
@@ -681,6 +683,9 @@ EOF
 mkdir -p %{buildroot}%{_qt5_headerdir}/QtXcb
 install -m 644 src/plugins/platforms/xcb/*.h %{buildroot}%{_qt5_headerdir}/QtXcb/
 
+# drop Qt5Bootstrap from -static (#2017661)
+rm -f %{buildroot}%{_qt5_libdir}/libQt5Bootstrap.*a
+rm -f %{buildroot}%{_qt5_libdir}/libQt5Bootstrap.prl
 
 %check
 # verify Qt5.pc
@@ -953,8 +958,6 @@ fi
 #{_qt5_archdatadir}/mkspecs/modules/qt_lib_*_private.pri
 
 %files static
-%{_qt5_libdir}/libQt5Bootstrap.*a
-%{_qt5_libdir}/libQt5Bootstrap.prl
 %{_qt5_headerdir}/QtOpenGLExtensions/
 %{_qt5_libdir}/libQt5OpenGLExtensions.*a
 %{_qt5_libdir}/libQt5OpenGLExtensions.prl
@@ -1116,6 +1119,12 @@ fi
 
 
 %changelog
+* Tue Dec 07 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-28
+- Sync with Fedora:
+  - sync kde/5.15 branch patches
+
+  Resolves: bz#2018876
+
 * Mon Oct 18 2021 Jan Grulich <jgrulich@redhat.com> - 5.15.2-27
 - Sync with Fedora:
   - sync kde/5.15 branch patches