5.15.9 + sync with Fedora

Resolves: bz#2175727

.gitignore

@@ -12,3 +12,5 @@
 /kde-5.15-rollup-20220131.patch.gz
 /qtbase-everywhere-opensource-src-5.15.3.tar.xz
 /kde-5.15-rollup-20220324.patch.gz
+/qtbase-everywhere-opensource-src-5.15.9.tar.xz
+/kde-5.15-rollup-20230411.patch.gz

qt5-qtbase.spec

@@ -2,8 +2,6 @@
 %global multilib_archs x86_64 %{ix86} %{?mips} ppc64 ppc s390x s390 sparc64 sparcv9
 %global multilib_basearchs x86_64 %{?mips64} ppc64 s390x sparc64
 
-%global openssl -openssl-linked
-
 %if 0%{?fedora} < 29 && 0%{?rhel} < 9
 %ifarch %{ix86}
 %global no_sse2  -no-sse2
@@ -47,7 +45,6 @@
 %global qt_settings 1
 %endif
 
-%global journald -journald
 BuildRequires: make
 BuildRequires: pkgconfig(libsystemd)
 
@@ -59,7 +56,7 @@ BuildRequires: pkgconfig(libsystemd)
 
 Name:    qt5-qtbase
 Summary: Qt5 - QtBase components
-Version: 5.15.3
+Version: 5.15.9
 Release: 1%{?dist}
 
 
@@ -86,11 +83,8 @@ Source10: macros.qt5-qtbase
 # support multilib optflags
 Patch2: qtbase-multilib_optflags.patch
 
-# borrowed from opensuse
+# make mixing versions with private apis a warning instead of fatal error
-# track private api via properly versioned symbols
+Patch3: qtbase-everywhere-src-5.15.6-private_api_warning.patch
-# downside: binaries produced with these differently-versioned symbols are no longer
-# compatible with qt-project.org's Qt binary releases.
-Patch8: tell-the-truth-about-private-api.patch
 
 # upstreamable patches
 # namespace QT_VERSION_CHECK to workaround major/minor being pre-defined (#1396755)
@@ -132,9 +126,6 @@ Patch64: qt5-qtbase-5.12.1-firebird-4.0.0.patch
 # fix for new mariadb
 Patch65: qtbase-opensource-src-5.9.0-mysql.patch
 
-# python3
-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
 Patch80: qtbase-use-wayland-on-gnome.patch
@@ -144,12 +135,13 @@ Patch90: %{name}-gcc11.patch
 
 ## upstream patches
 # https://invent.kde.org/qt/qt/qtbase, kde/5.15 branch
-# git diff v5.15.3-lts-lgpl..HEAD | gzip > kde-5.15-rollup-$(date +%Y%m%d).patch.gz
+# git diff v5.15.9-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-20220324.patch.gz
+Patch100: kde-5.15-rollup-20230411.patch.gz
 # HACK to make 'fedpkg sources' consider it 'used"
-Source100: kde-5.15-rollup-20220324.patch.gz
+Source100: kde-5.15-rollup-20230411.patch.gz
 
+Patch101: qtbase-5.15.8-fix-missing-qtsan-include.patch
 
 # Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires.
 # Those themes are there for platform integration. If the required libraries are
@@ -174,11 +166,8 @@ BuildRequires: clang >= 3.7.0
 %else
 BuildRequires: gcc-c++
 %endif
-# http://bugzilla.redhat.com/1196359
-%if 0%{?fedora} || 0%{?rhel} > 6
 %global dbus -dbus-linked
 BuildRequires: pkgconfig(dbus-1)
-%endif
 BuildRequires: pkgconfig(libdrm)
 BuildRequires: pkgconfig(fontconfig)
 BuildRequires: pkgconfig(gl)
@@ -192,6 +181,7 @@ BuildRequires: pkgconfig(libudev)
 BuildRequires: openssl-devel
 BuildRequires: pkgconfig(libpulse) pkgconfig(libpulse-mainloop-glib)
 BuildRequires: pkgconfig(libinput)
+BuildRequires: pkgconfig(libsystemd)
 BuildRequires: pkgconfig(xcb-xkb) >= 1.10
 BuildRequires: pkgconfig(xcb-util)
 BuildRequires: pkgconfig(xkbcommon) >= 0.4.1
@@ -222,6 +212,7 @@ BuildRequires: libicu-devel
 %endif
 BuildRequires: pkgconfig(xcb) pkgconfig(xcb-glx) pkgconfig(xcb-icccm) pkgconfig(xcb-image) pkgconfig(xcb-keysyms) pkgconfig(xcb-renderutil)
 BuildRequires: pkgconfig(zlib)
+BuildRequires: pkgconfig(libzstd)
 BuildRequires: perl-generators
 # see patch68
 BuildRequires: python3
@@ -270,6 +261,12 @@ Summary: Common files for Qt5
 # offer upgrade path for qtquick1 somewhere... may as well be here -- rex
 Obsoletes: qt5-qtquick1 < 5.9.0
 Obsoletes: qt5-qtquick1-devel < 5.9.0
+%if "%{?ibase}" == "-no-sql-ibase"
+Obsoletes: qt5-qtbase-ibase < %{version}-%{release}
+%endif
+%if "%{?tds}" == "-no-sql-tds"
+Obsoletes: qt5-qtbase-tds < %{version}-%{release}
+%endif
 Requires: %{name} = %{version}-%{release}
 BuildArch: noarch
 %description common
@@ -378,7 +375,8 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %package gui
 Summary: Qt5 GUI-related libraries
 Requires: %{name}%{?_isa} = %{version}-%{release}
-%if ! 0%{?rhel} < 8
+# where Recommends are supported
+%if 0%{?fedora} || 0%{?rhel} >= 8
 Recommends: mesa-dri-drivers
 %endif
 Obsoletes: qt5-qtbase-x11 < 5.2.0
@@ -393,38 +391,36 @@ Qt5 libraries used for drawing widgets and OpenGL items.
 %prep
 %setup -q -n %{qt_module}-everywhere-src-%{version}
 
+## dowstream patches
+%patch -P3 -p1 -b .private_api_warning
+
 ## upstream fixes
-
+%patch -P50 -p1 -b .QT_VERSION_CHECK
-# omit '-b .tell-the-truth-about-private-api' so it doesn't end up in installed files -- rdieter
+#patch -P51 -p1 -b .hidpi_scale_at_192
-%patch8 -p1
+%patch -P52 -p1 -b .moc_macros
-
+%patch -P53 -p1 -b .qt5gui_cmake_isystem_includes
-%patch50 -p1 -b .QT_VERSION_CHECK
+%patch -P54 -p1 -b .qmake_LFLAGS
-# FIXME/TODO : rebase or drop -- rdieter
+%patch -P55 -p1 -b .no_relocatable
-#patch51 -p1 -b .hidpi_scale_at_192
+%patch -P56 -p1 -b .libglvnd
-%patch52 -p1 -b .moc_macros
+%patch -P61 -p1 -b .qt5-qtbase-cxxflag
-%patch53 -p1 -b .qt5gui_cmake_isystem_includes
-%patch54 -p1 -b .qmake_LFLAGS
-%patch55 -p1 -b .no_relocatable
-%patch56 -p1 -b .libglvnd
-%patch61 -p1 -b .qt5-qtbase-cxxflag
 %if 0%{?fedora} < 35
-%patch63 -p1 -b .firebird
+%patch -P63 -p1 -b .firebird
 %else
-%patch64 -p1 -b .firebird
+%patch -P64 -p1 -b .firebird
 %endif
 %if 0%{?fedora} > 27
-%patch65 -p1 -b .mysql
+%patch -P65 -p1 -b .mysql
 %endif
-%patch68 -p1
 
 %if 0%{?fedora} > 30 || 0%{?rhel} > 9
-%patch80 -p1 -b .use-wayland-on-gnome.patch
+%patch -P80 -p1 -b .use-wayland-on-gnome.patch
 %endif
 
-%patch90 -p1 -b .gcc11
+%patch -P90 -p1 -b .gcc11
 
 ## upstream patches
-%patch100 -p1
+%patch -P100 -p1
+%patch -P101 -p1
 
 # move some bundled libs to ensure they're not accidentally used
 pushd src/3rdparty
@@ -497,16 +493,17 @@ export MAKEFLAGS="%{?_smp_mflags}"
   -release \
   -shared \
   -accessibility \
-  %{?dbus}%{!?dbus:-dbus-runtime} \
+  -dbus-linked \
   %{?egl:-egl -eglfs} \
   -fontconfig \
   -glib \
   -gtk \
   %{?ibase} \
   -icu \
-  %{?journald} \
+  -journald \
   -optimized-qmake \
-  %{?openssl} \
+  -openssl-linked \
+  -libproxy \
   %{!?examples:-nomake examples} \
   %{!?build_tests:-nomake tests} \
   -no-pch \
@@ -535,7 +532,11 @@ export MAKEFLAGS="%{?_smp_mflags}"
   QMAKE_LFLAGS_RELEASE="${LDFLAGS:-$RPM_LD_FLAGS}"
 
 # Validate config results
+%if "%{?ibase}" != "-no-sql-ibase"
+for config_test in egl-x11 ibase ; do
+%else
 for config_test in egl-x11 ; do
+%endif
 config_result="$(grep ^cache.${config_test}.result config.cache | cut -d= -f2 | tr -d ' ')"
 if [ "${config_result}" != "true" ]; then
   echo "${config_test} detection failed"
@@ -597,7 +598,7 @@ translationdir=%{_qt5_translationdir}
 
 Name: Qt5
 Description: Qt5 Configuration
-Version: 5.15.3
+Version: 5.15.9
 EOF
 
 # rpm macros
@@ -1117,6 +1118,10 @@ fi
 
 
 %changelog
+* Mon Apr 17 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.9-1
+- 5.15.9 + sync with Fedora
+  Resolves: bz#2175727
+
 * Thu Mar 24 2022 Jan Grulich <jgrulich@redhat.com> - 5.15.3-1
 - 5.15.3 + sync with Fedora
   Resolves: bz#2061354

qtbase-ambiguous-python-shebang.patch

@@ -1,30 +0,0 @@
-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.

qtbase-everywhere-src-5.15.6-private_api_warning.patch

@@ -0,0 +1,12 @@
+diff -up qtbase-everywhere-src-5.15.6/src/corelib/kernel/qobject_p.h.private_api_warning qtbase-everywhere-src-5.15.6/src/corelib/kernel/qobject_p.h
+--- qtbase-everywhere-src-5.15.6/src/corelib/kernel/qobject_p.h.private_api_warning	2022-10-11 09:08:33.712070523 -0500
++++ qtbase-everywhere-src-5.15.6/src/corelib/kernel/qobject_p.h	2022-10-11 09:10:58.647038619 -0500
+@@ -435,7 +435,7 @@ inline void QObjectPrivate::checkForInco
+     Q_UNUSED(version);
+ #else
+     if (Q_UNLIKELY(version != QObjectPrivateVersion)) {
+-        qFatal("Cannot mix incompatible Qt library (%d.%d.%d) with this library (%d.%d.%d)",
++        qWarning("Cannot mix incompatible Qt library (%d.%d.%d) with this library (%d.%d.%d)",
+                 (version >> 16) & 0xff, (version >> 8) & 0xff, version & 0xff,
+                 (QObjectPrivateVersion >> 16) & 0xff, (QObjectPrivateVersion >> 8) & 0xff, QObjectPrivateVersion & 0xff);
+     }

sources

@@ -1,2 +1,2 @@
-SHA512 (qtbase-everywhere-opensource-src-5.15.3.tar.xz) = 01723eff5116a1d7d136fa32d2aee2691b227a241dbc160953ee72a8c0f3bc7ab771c17434629cabef419983ef43bb38aa6956ddcc09c9a82e116a50073b0079
+SHA512 (qtbase-everywhere-opensource-src-5.15.9.tar.xz) = 2da78ea043c03fa4ff7c6a39c41a5d1b30af06248764e6f5eef3fe4aeb3f3d20e302fa7c5827112c89b6bc7c5c0c292454d127f9d7bb0d2031175f0f2c937ed3
-SHA512 (kde-5.15-rollup-20220324.patch.gz) = bb0cf7d9ec5a922c6d83ce062c4d8d315a1dfbb4d55bfd7aa9504288ed64a8cf0f558d18f02ecb5a38b6a52b80c4ad97613950efeca2516ef000627b3958c506
+SHA512 (kde-5.15-rollup-20230411.patch.gz) = 4bf88acb6d0005ae691f9b3c677610d1dc055040486c0f3654abcd6df04638c909cc18401ea4ca4da7b14065458172ad0df931e909ad9a22223439eb2fefbfd9

tell-the-truth-about-private-api.patch

@@ -1,16 +0,0 @@
-diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
-index e6a0d97..cf93041 100644
---- a/mkspecs/features/qt_module.prf
-+++ b/mkspecs/features/qt_module.prf
-@@ -216,9 +216,9 @@ android: CONFIG += qt_android_deps no_linker_version_script
-     QMAKE_LFLAGS += $${QMAKE_LFLAGS_VERSION_SCRIPT}$$verscript
-
-     internal_module {
--        verscript_content = "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API { *; };"
-+        verscript_content = "Qt_$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}_PRIVATE_API { *; };"
-     } else {
--        verscript_content = "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API {" \
-+        verscript_content = "Qt_$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}_PRIVATE_API {" \
-                             "    qt_private_api_tag*;"
-
-         private_api_headers = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.QPA_HEADER_FILES