Merge branch 'f35' into f34

Resolves: bz#1982699

.gitignore

@@ -12,11 +12,3 @@
 /qtbase-everywhere-src-6.2.1.tar.xz
 /qtbase-everywhere-src-6.2.2.tar.xz
 /qtbase-everywhere-src-6.2.3.tar.xz
-/qtbase-everywhere-src-6.3.0.tar.xz
-/qtbase-everywhere-src-6.3.1.tar.xz
-/qtbase-everywhere-src-6.4.0.tar.xz
-/qtbase-everywhere-src-6.4.1.tar.xz
-/qtbase-everywhere-src-6.4.2.tar.xz
-/qtbase-everywhere-src-6.4.3.tar.xz
-/qtbase-everywhere-src-6.5.0.tar.xz
-/qtbase-everywhere-src-6.5.1.tar.xz

qt6-qtbase.spec

@@ -1,3 +1,4 @@
+
 # See http://bugzilla.redhat.com/223663
 %global multilib_archs x86_64 %{ix86} %{?mips} ppc64 ppc s390x s390 sparc64 sparcv9
 %global multilib_basearchs x86_64 %{?mips64} ppc64 s390x sparc64
@@ -37,10 +38,11 @@ BuildRequires: pkgconfig(libsystemd)
 
 Name:    qt6-qtbase
 Summary: Qt6 - QtBase components
-Version: 6.5.1
-Release: 1%{?dist}
+Version: 6.2.3
+Release: 2%{?dist}
 
-License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+# 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)
 %global  qt_version %(echo %{version} | cut -d~ -f1)
@@ -65,8 +67,11 @@ Source6: 10-qt6-check-opengl2.sh
 # macros
 Source10: macros.qt6-qtbase
 
-Patch1: qtbase-tell-the-truth-about-private-API.patch
-Patch2: qtbase-use-qgnomeplatform-as-default-platform-theme-on-gnome.patch
+# borrowed from opensuse
+# track private api via properly versioned symbols
+# downside: binaries produced with these differently-versioned symbols are no longer
+# compatible with qt-project.org's Qt binary releases.
+Patch1: qtbase-tell-truth-about-private-api.patch
 
 # upstreamable patches
 # namespace QT_VERSION_CHECK to workaround major/minor being pre-defined (#1396755)
@@ -81,9 +86,15 @@ Patch51: qtbase-moc-macros.patch
 # drop -O3 and make -O2 by default
 Patch54: qtbase-cxxflag.patch
 
+# support firebird version 3.x
+Patch55: qtbase-firebird.patch
+
 # fix for new mariadb
 Patch56: qtbase-mysql.patch
 
+# python3
+Patch57: qtbase-python3.patch
+
 # fix FTBFS against libglvnd-1.3.4+
 Patch58: qtbase-libglvnd.patch
 
@@ -92,6 +103,7 @@ Patch90: qtbase-gcc11.patch
 
 ## upstream patches
 
+
 # Do not check any files in %%{_qt6_plugindir}/platformthemes/ for requires.
 # Those themes are there for platform integration. If the required libraries are
 # not there, the platform to integrate with isn't either. Then Qt will just
@@ -116,8 +128,6 @@ BuildRequires: libb2-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libmng-devel
 BuildRequires: libtiff-devel
-BuildRequires: libzstd-devel
-BuildRequires: mtdev-devel
 BuildRequires: tslib-devel
 BuildRequires: pkgconfig(alsa)
 # required for -accessibility
@@ -131,7 +141,6 @@ BuildRequires: pkgconfig(gl)
 BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(gtk+-3.0)
 BuildRequires: pkgconfig(libproxy-1.0)
-BuildRequires: pkgconfig(libsctp)
 # xcb-sm
 BuildRequires: pkgconfig(ice) pkgconfig(sm)
 BuildRequires: pkgconfig(libpng)
@@ -152,8 +161,6 @@ BuildRequires: pkgconfig(egl)
 BuildRequires: pkgconfig(gbm)
 BuildRequires: pkgconfig(libglvnd)
 BuildRequires: pkgconfig(x11)
-# only needed for GLES2 and GLES3 builds
-#BuildRequires: pkgconfig(glesv2)
 
 %global sqlite 1
 BuildRequires: pkgconfig(sqlite3) >= 3.7
@@ -163,7 +170,7 @@ BuildRequires: pkgconfig(libpcre2-posix) >= 10.20
 BuildRequires: pkgconfig(libpcre) >= 8.0
 %global pcre 1
 BuildRequires: pkgconfig(xcb-xkb)
-BuildRequires: pkgconfig(xcb) pkgconfig(xcb-glx) pkgconfig(xcb-icccm) pkgconfig(xcb-image) pkgconfig(xcb-keysyms) pkgconfig(xcb-renderutil) pkgconfig(xcb-cursor)
+BuildRequires: pkgconfig(xcb) pkgconfig(xcb-glx) pkgconfig(xcb-icccm) pkgconfig(xcb-image) pkgconfig(xcb-keysyms) pkgconfig(xcb-renderutil)
 BuildRequires: pkgconfig(zlib)
 BuildRequires: perl
 BuildRequires: perl-generators
@@ -181,10 +188,18 @@ BuildRequires: xorg-x11-server-Xvfb
 Requires: %{name}-common = %{version}-%{release}
 
 ## Sql drivers
-%if 0%{?fedora} || 0%{?epel}
-%global ibase 1
-%endif
-	
+# FIXME: disable for now, they don't seem to be implemented in Qt 6.0.0
+# if rhel
+%global no_ibase 1
+%global no_tds 1
+# endif
+
+# workaround gold linker bug(s) by not using it
+# https://bugzilla.redhat.com/1458003
+# https://sourceware.org/bugzilla/show_bug.cgi?id=21074
+# reportedly fixed or worked-around, re-enable if there's evidence of problems -- rex
+# https://bugzilla.redhat.com/show_bug.cgi?id=1635973
+%global use_gold_linker 0
 
 %description
 Qt is a software toolkit for developing applications.
@@ -214,12 +229,6 @@ Requires: qt6-rpm-macros
 %if 0%{?use_clang}
 Requires: clang >= 3.7.0
 %endif
-%if 0%{?ibase}
-Requires: %{name}-ibase%{?_isa} = %{version}-%{release}
-%endif
-Requires: %{name}-mysql%{?_isa} = %{version}-%{release}
-Requires: %{name}-odbc%{?_isa} = %{version}-%{release}
-Requires: %{name}-postgresql%{?_isa} = %{version}-%{release}
 %description devel
 %{summary}.
 
@@ -250,7 +259,7 @@ Requires: pkgconfig(zlib)
 %description static
 %{summary}.
 
-%if 0%{?ibase}
+%if 0%{?no_ibase} == 0
 %package ibase
 Summary: IBase driver for Qt6's SQL classes
 BuildRequires: firebird-devel
@@ -280,15 +289,27 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %package postgresql
 Summary: PostgreSQL driver for Qt6's SQL classes
 BuildRequires: libpq-devel
+BuildRequires: postgresql-server-devel
 Requires: %{name}%{?_isa} = %{version}-%{release}
 %description postgresql
 %{summary}.
 
+%if 0%{?no_tds} == 0
+%package tds
+Summary: TDS driver for Qt6's SQL classes
+BuildRequires: freetds-devel
+Requires: %{name}%{?_isa} = %{version}-%{release}
+%description tds
+%{summary}.
+%endif
+
 # debating whether to do 1 subpkg per library or not -- rex
 %package gui
 Summary: Qt6 GUI-related libraries
 Requires: %{name}%{?_isa} = %{version}-%{release}
+%if 0%{?fedora} > 20
 Recommends: mesa-dri-drivers
+%endif
 # for Source6: 10-qt6-check-opengl2.sh:
 # glxinfo
 Requires: glx-utils
@@ -302,7 +323,7 @@ Qt6 libraries used for drawing widgets and OpenGL items.
 # move some bundled libs to ensure they're not accidentally used
 pushd src/3rdparty
 mkdir UNUSED
-mv harfbuzz-ng freetype libjpeg libpng sqlite zlib UNUSED/
+mv harfbuzz-ng freetype libjpeg libpng sqlite xcb zlib UNUSED/
 popd
 
 # builds failing mysteriously on f20
@@ -310,6 +331,10 @@ popd
 # check to ensure that can't happen -- rex
 test -x configure || chmod +x configure
 
+# use proper perl interpretter so autodeps work as expected
+sed -i -e "s|^#!/usr/bin/env perl$|#!%{__perl}|" \
+ mkspecs/features/data/unix/findclasslist.pl
+
 
 %build
 # QT is known not to work properly with LTO at this point.  Some of the issues
@@ -346,24 +371,23 @@ export MAKEFLAGS="%{?_smp_mflags}"
  -DQT_FEATURE_enable_new_dtags=ON \
  -DQT_FEATURE_journald=%{?journald:ON}%{!?journald:OFF} \
  -DQT_FEATURE_openssl_linked=ON \
- -DQT_FEATURE_libproxy=ON \
- -DQT_FEATURE_sctp=ON \
  -DQT_FEATURE_separate_debug_info=OFF \
  -DQT_FEATURE_reduce_relocations=OFF \
  -DQT_FEATURE_relocatable=OFF \
  -DQT_FEATURE_system_jpeg=ON \
  -DQT_FEATURE_system_png=ON \
  -DQT_FEATURE_system_zlib=ON \
- %{?ibase:-DQT_FEATURE_sql_ibase=ON} \
  -DQT_FEATURE_sql_odbc=ON \
  -DQT_FEATURE_sql_mysql=ON \
  -DQT_FEATURE_sql_psql=ON \
  -DQT_FEATURE_sql_sqlite=ON \
  -DQT_FEATURE_rpath=OFF \
- -DQT_FEATURE_zstd=ON \
  %{?dbus_linked:-DQT_FEATURE_dbus_linked=ON} \
  %{?pcre:-DQT_FEATURE_system_pcre2=ON} \
  %{?sqlite:-DQT_FEATURE_system_sqlite=ON} \
+ %{?no_tds:-DQT_FEATURE_sql_tds=OFF}%{!?no_tds:-DQT_FEATURE_sql_tds=ON} \
+ %{?no_ibase:-DQT_FEATURE_sql_ibase=OFF}%{!?no_ibase:-DQT_FEATURE_sql_ibase=ON} \
+ %{?use_gold_linker:-DQT_FEATURE_use_gold_linker=OFF} \
  -DBUILD_SHARED_LIBS=ON \
  -DQT_BUILD_EXAMPLES=%{?examples:ON}%{!?examples:OFF} \
  -DQT_BUILD_TESTS=%{?tests:ON}%{!?tests:OFF} \
@@ -394,7 +418,7 @@ headerdir=%{_qt6_headerdir}
 importdir=%{_qt6_importdir}
 libdir=%{_qt6_libdir}
 libexecdir=%{_qt6_libexecdir}
-moc=%{_qt6_libexecdir}/moc
+moc=%{_qt6_bindir}/moc
 plugindir=%{_qt6_plugindir}
 qmake=%{_qt6_bindir}/qmake
 settingsdir=%{_qt6_settingsdir}
@@ -403,7 +427,7 @@ translationdir=%{_qt6_translationdir}
 
 Name: Qt6
 Description: Qt6 Configuration
-Version: 6.5.1
+Version: 6.2.3
 EOF
 
 # rpm macros
@@ -461,14 +485,11 @@ install -p -m755 -D %{SOURCE6} %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/10
 mkdir -p %{buildroot}%{_qt6_headerdir}/QtXcb
 install -m 644 src/plugins/platforms/xcb/*.h %{buildroot}%{_qt6_headerdir}/QtXcb/
 
-rm %{buildroot}/%{_qt6_libexecdir}/qt-cmake-private-install.cmake
+rm %{buildroot}/%{_bindir}/qt-cmake-private-install.cmake
 
 # Use better location for some new scripts in qtbase-6.0.1
 mv %{buildroot}/%{_qt6_libexecdir}/ensure_pro_file.cmake %{buildroot}/%{_qt6_libdir}/cmake/Qt6/ensure_pro_file.cmake
 
-# FIXME why is this being installed?
-rm %{buildroot}/%{_qt6_libdir}/objects-RelWithDebInfo/ExampleIconsPrivate_resources_1/.rcc/qrc_example_icons.cpp.o
-
 %check
 # verify Qt6.pc
 export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig
@@ -491,8 +512,9 @@ make check -k ||:
 %ldconfig_scriptlets
 
 %files
-%license LICENSES/GPL*
-%license LICENSES/LGPL*
+%license LICENSE.FDL
+%license LICENSE.GPL*
+%license LICENSE.LGPL*
 %dir %{_sysconfdir}/xdg/QtProject/
 %{_qt6_libdir}/libQt6Concurrent.so.6*
 %{_qt6_libdir}/libQt6Core.so.6*
@@ -525,7 +547,6 @@ make check -k ||:
 %dir %{_qt6_plugindir}/script/
 %dir %{_qt6_plugindir}/sqldrivers/
 %dir %{_qt6_plugindir}/styles/
-%{_qt6_plugindir}/networkinformation/libqglib.so
 %{_qt6_plugindir}/networkinformation/libqnetworkmanager.so
 %{_qt6_plugindir}/sqldrivers/libqsqlite.so
 %{_qt6_plugindir}/tls/libqcertonlybackend.so
@@ -536,8 +557,8 @@ make check -k ||:
 %{_rpmmacrodir}/macros.qt6-qtbase
 
 %files devel
-%dir %{_qt6_libdir}/qt6/modules
-%dir %{_qt6_libdir}/qt6/metatypes
+%dir %{_qt6_datadir}/modules
+%dir %{_qt6_libdir}/metatypes
 %dir %{_qt6_libdir}/cmake/Qt6
 %dir %{_qt6_libdir}/cmake/Qt6/platforms
 %dir %{_qt6_libdir}/cmake/Qt6/platforms/Platform
@@ -555,17 +576,18 @@ make check -k ||:
 %dir %{_qt6_libdir}/cmake/Qt6EglFSDeviceIntegrationPrivate
 %dir %{_qt6_libdir}/cmake/Qt6EglFsKmsGbmSupportPrivate
 %dir %{_qt6_libdir}/cmake/Qt6EglFsKmsSupportPrivate
-%dir %{_qt6_libdir}/cmake/Qt6ExampleIconsPrivate
 %dir %{_qt6_libdir}/cmake/Qt6FbSupportPrivate
 %dir %{_qt6_libdir}/cmake/Qt6Gui
 %dir %{_qt6_libdir}/cmake/Qt6GuiTools
 %dir %{_qt6_libdir}/cmake/Qt6HostInfo
+%dir %{_qt6_libdir}/cmake/Qt6FbSupportPrivate
 %dir %{_qt6_libdir}/cmake/Qt6KmsSupportPrivate
 %dir %{_qt6_libdir}/cmake/Qt6Network
 %dir %{_qt6_libdir}/cmake/Qt6OpenGL
 %dir %{_qt6_libdir}/cmake/Qt6OpenGLWidgets
 %dir %{_qt6_libdir}/cmake/Qt6PrintSupport
 %dir %{_qt6_libdir}/cmake/Qt6Sql
+%dir %{_qt6_libdir}/cmake/Qt6XcbQpaPrivate
 %dir %{_qt6_libdir}/cmake/Qt6Test
 %dir %{_qt6_libdir}/cmake/Qt6Widgets
 %dir %{_qt6_libdir}/cmake/Qt6WidgetsTools
@@ -574,40 +596,38 @@ make check -k ||:
 %dir %{_qt6_bindir}
 %endif
 %{_bindir}/androiddeployqt
-%{_bindir}/androiddeployqt6
 %{_bindir}/androidtestrunner
 %{_bindir}/qdbuscpp2xml*
 %{_bindir}/qdbusxml2cpp*
 %{_bindir}/qmake*
 %{_bindir}/qtpaths*
 %{_bindir}/qt-cmake
+%{_bindir}/qt-cmake-private
+%{_bindir}/qt-cmake-standalone-test
 %{_bindir}/qt-configure-module
 %{_libdir}/qt6/bin/qmake6
 %{_qt6_bindir}/androiddeployqt
-%{_qt6_bindir}/androiddeployqt6
 %{_qt6_bindir}/androidtestrunner
 %{_qt6_bindir}/qdbuscpp2xml
 %{_qt6_bindir}/qdbusxml2cpp
 %{_qt6_bindir}/qmake
 %{_qt6_bindir}/qtpaths*
 %{_qt6_bindir}/qt-cmake
+%{_qt6_bindir}/qt-cmake-private
+%{_qt6_bindir}/qt-cmake-private-install.cmake
+%{_qt6_bindir}/qt-cmake-standalone-test
 %{_qt6_bindir}/qt-configure-module
-%{_qt6_libexecdir}/qt-cmake-private
-%{_qt6_libexecdir}/qt-cmake-standalone-test
 %{_qt6_libexecdir}/cmake_automoc_parser
 %{_qt6_libexecdir}/qt-internal-configure-tests
-%{_qt6_libexecdir}/sanitizer-testrunner.py
-%{_qt6_libexecdir}/syncqt
+%{_qt6_libexecdir}/syncqt.pl
 %{_qt6_libexecdir}/android_emulator_launcher.sh
 %{_qt6_libexecdir}/moc
-%{_qt6_libexecdir}/tracegen
-%{_qt6_libexecdir}/tracepointgen
 %{_qt6_libexecdir}/qlalr
+%{_qt6_libexecdir}/qt-internal-configure-tests
 %{_qt6_libexecdir}/qvkgen
 %{_qt6_libexecdir}/rcc
 %{_qt6_libexecdir}/uic
-%{_qt6_libexecdir}/qt-testrunner.py
-%{_qt6_libdir}/qt6/modules/*.json
+%{_qt6_datadir}/modules/*.json
 %if "%{_qt6_headerdir}" != "%{_includedir}"
 %dir %{_qt6_headerdir}
 %endif
@@ -615,7 +635,6 @@ make check -k ||:
 %{_qt6_headerdir}/QtCore/
 %{_qt6_headerdir}/QtDBus/
 %{_qt6_headerdir}/QtInputSupport
-%{_qt6_headerdir}/QtExampleIcons
 %{_qt6_headerdir}/QtGui/
 %{_qt6_headerdir}/QtNetwork/
 %{_qt6_headerdir}/QtOpenGL/
@@ -653,25 +672,19 @@ make check -k ||:
 %{_qt6_libdir}/libQt6Widgets.prl
 %{_qt6_libdir}/libQt6Widgets.so
 %{_qt6_libdir}/libQt6XcbQpa.prl
-%{_qt6_libdir}/libQt6XcbQpa.so 
+%{_qt6_libdir}/libQt6XcbQpa.so
 %{_qt6_libdir}/libQt6Xml.prl
 %{_qt6_libdir}/libQt6Xml.so
 %{_qt6_libdir}/libQt6EglFSDeviceIntegration.prl
 %{_qt6_libdir}/libQt6EglFSDeviceIntegration.so
 %{_qt6_libdir}/libQt6EglFsKmsGbmSupport.prl
 %{_qt6_libdir}/libQt6EglFsKmsGbmSupport.so
-%{_qt6_libdir}/cmake/Qt6/*.h.in
 %{_qt6_libdir}/cmake/Qt6/*.cmake
 %{_qt6_libdir}/cmake/Qt6/*.cmake.in
-%{_qt6_libdir}/cmake/Qt6/PkgConfigLibrary.pc.in
 %{_qt6_libdir}/cmake/Qt6/config.tests/*
-%{_qt6_libdir}/cmake/Qt6/libexec/*
-%{_qt6_libdir}/cmake/Qt6/platforms/*.cmake
 %{_qt6_libdir}/cmake/Qt6/platforms/Platform/*.cmake
-%{_qt6_libdir}/cmake/Qt6/qbatchedtestrunner.in.cpp
 %{_qt6_libdir}/cmake/Qt6/ModuleDescription.json.in
 %{_qt6_libdir}/cmake/Qt6/QtFileConfigure.txt.in
-%{_qt6_libdir}/cmake/Qt6/QtConfigureTimeExecutableCMakeLists.txt.in
 %{_qt6_libdir}/cmake/Qt6/QtSeparateDebugInfo.Info.plist.in
 %{_qt6_libdir}/cmake/Qt6/3rdparty/extra-cmake-modules/COPYING-CMAKE-SCRIPTS
 %{_qt6_libdir}/cmake/Qt6/3rdparty/extra-cmake-modules/find-modules/*.cmake
@@ -694,7 +707,6 @@ make check -k ||:
 %{_qt6_libdir}/cmake/Qt6EglFSDeviceIntegrationPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6EglFsKmsGbmSupportPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6EglFsKmsSupportPrivate/*.cmake
-%{_qt6_libdir}/cmake/Qt6ExampleIconsPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6FbSupportPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6Gui/*.cmake
 %{_qt6_libdir}/cmake/Qt6GuiTools/*.cmake
@@ -705,20 +717,21 @@ make check -k ||:
 %{_qt6_libdir}/cmake/Qt6OpenGL/*.cmake
 %{_qt6_libdir}/cmake/Qt6OpenGLWidgets/*.cmake
 %{_qt6_libdir}/cmake/Qt6PrintSupport/*.cmake
-%{_qt6_libdir}/cmake/Qt6Sql/Qt6Sql*.cmake
+%{_qt6_libdir}/cmake/Qt6Sql/*.cmake
 %{_qt6_libdir}/cmake/Qt6Sql/Qt6QSQLiteDriverPlugin*.cmake
 %{_qt6_libdir}/cmake/Qt6Test/*.cmake
 %{_qt6_libdir}/cmake/Qt6Widgets/*.cmake
 %{_qt6_libdir}/cmake/Qt6WidgetsTools/*.cmake
 %{_qt6_libdir}/cmake/Qt6XcbQpaPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6Xml/*.cmake
-%{_qt6_libdir}/qt6/metatypes/*.json
-%{_qt6_libdir}/pkgconfig/*.pc
+%{_qt6_libdir}/metatypes/*.json
+%{_qt6_libdir}/pkgconfig/Qt6.pc
 
 %if 0%{?egl}
 %{_qt6_libdir}/libQt6EglFsKmsSupport.prl
 %{_qt6_libdir}/libQt6EglFsKmsSupport.so
 %endif
+%{_qt6_libexecdir}/tracegen
 ## private-devel globs
 %exclude %{_qt6_headerdir}/*/%{qt_version}/
 
@@ -729,8 +742,6 @@ make check -k ||:
 %{_qt6_headerdir}/QtDeviceDiscoverySupport
 %{_qt6_libdir}/libQt6DeviceDiscoverySupport.*a
 %{_qt6_libdir}/libQt6DeviceDiscoverySupport.prl
-%{_qt6_libdir}/libQt6ExampleIcons.a
-%{_qt6_libdir}/libQt6ExampleIcons.prl
 %{_qt6_headerdir}/QtFbSupport
 %{_qt6_libdir}/libQt6FbSupport.*a
 %{_qt6_libdir}/libQt6FbSupport.prl
@@ -744,10 +755,10 @@ make check -k ||:
 %{_qt6_examplesdir}/
 %endif
 
-%if 0%{?ibase}
+%if 0%{?no_ibase} == 0
 %files ibase
 %{_qt6_plugindir}/sqldrivers/libqsqlibase.so
-%{_qt6_libdir}/cmake/Qt6Sql/Qt6QIBaseDriverPlugin*.cmake
+
 %endif
 
 %files mysql
@@ -762,6 +773,11 @@ make check -k ||:
 %{_qt6_plugindir}/sqldrivers/libqsqlpsql.so
 %{_qt6_libdir}/cmake/Qt6Sql/Qt6QPSQLDriverPlugin*.cmake
 
+%if 0%{?no_tds} == 0
+%files tds
+%{_qt6_plugindir}/sqldrivers/libqsqltds.so
+%endif
+
 %ldconfig_scriptlets gui
 
 %files gui
@@ -818,70 +834,6 @@ make check -k ||:
 
 
 %changelog
-* Mon May 22 2023 Jan Grulich <jgrulich@redhat.com> - 6.5.1-1
-- 6.5.1
-
-* Fri Apr 7 2023 Marie Loise Nolden <loise@kde.org> - 6.5.0-2
-- fix xcb plugin with new dependency xcb-cursor instead of Xcursor
-  introduction with qt 6.5, add firebird sql plugin cleanly, clean up spec file
-  
-* Mon Apr 03 2023 Jan Grulich <jgrulich@redhat.com> - 6.5.0-1
-- 6.5.0
-
-* Mon Apr 03 2023 Jan Grulich <jgrulich@redhat.com> - 6.4.3-2
-- Enable zstd support
-
-* Thu Mar 23 2023 Jan Grulich <jgrulich@redhat.com> - 6.4.3-1
-- 6.4.3
-
-* Sun Mar 05 2023 Jan grulich <jgrulich@redhat.com> - 6.4.2-5
-- Use QGnomePlatform as default platform theme on GNOME
-  Resolves: bz#2174905
-
-* Wed Feb 08 2023 Jan Grulich <jgrulich@redhat.com> - 6.4.2-4
-- Fix possible DOS involving the Qt SQL ODBC driver plugin
-  CVE-2023-24607
-
-* Tue Jan 31 2023 Jan Grulich <jgrulich@redhat.com> - 6.4.2-3
-- migrated to SPDX license
-
-* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 6.4.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Mon Jan 16 2023 Jan Grulich <jgrulich@redhat.com> - 6.4.2-1
-- 6.4.2
-
-* Mon Jan 02 2023 Jan Grulich <jgrulich@redhat.com> - 6.4.1-4
-- Make -devel package to require database plugins
-
-* Sat Dec 31 2022 Pete Walter <pwalter@fedoraproject.org> - 6.4.1-3
-- Rebuild for ICU 72
-
-* Wed Nov 30 2022 Pavel Raiskup <praiskup@redhat.com> - 6.4.1-2
-- rebuild for the new PostgreSQL 15
-
-* Wed Nov 23 2022 Jan Grulich <jgrulich@redhat.com> - 6.4.1-1
-- 6.4.1
-
-* Mon Oct 31 2022 Jan Grulich <jgrulich@redhat.com> - 6.4.0-1
-- 6.4.0
-
-* Mon Aug 01 2022 Frantisek Zatloukal <fzatlouk@redhat.com> - 6.3.1-4
-- Rebuilt for ICU 71.1
-
-* Fri Jul 29 2022 Jan Grulich <jgrulich@redhat.com> - 6.3.1-3
-- Fix moc location in pkgconfig file
-  Resolves: bz#2112029
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 6.3.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Wed Jul 13 2022 Jan Grulich <jgrulich@redhat.com> - 6.3.1-1
-- 6.3.1
-
-* Wed Apr 13 2022 Jan Grulich <jgrulich@redhat.com> - 6.3.0-1
-- 6.3.0
-
 * Fri Feb 25 2022 Jan Grulich <jgrulich@redhat.com> - 6.2.3-2
 - Enable s390x builds
 
@@ -900,6 +852,9 @@ make check -k ||:
 * Fri Oct 29 2021 Jan Grulich <jgrulich@redhat.com> - 6.2.1-1
 - 6.2.1
 
+* Wed Oct 06 2021 Jan Grulich <jgrulich@redhat.com> - 6.2.0-2
+- Rebuild (possible qtmultimedia issue)
+
 * Thu Sep 30 2021 Jan Grulich <jgrulich@redhat.com> - 6.2.0-1
 - 6.2.0
 

qtbase-python3.patch

@@ -0,0 +1,9 @@
+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
+ 
+ #############################################################################
+ ##

qtbase-tell-the-truth-about-private-API.patch

@@ -1,28 +0,0 @@
-From 25e78cce15fdf737cc48ed5d7683ad1d01b55621 Mon Sep 17 00:00:00 2001
-From: Christophe Giboudeaux <christophe@krop.fr>
-Date: Sun, 20 Sep 2020 09:57:22 +0200
-Subject: [PATCH] Tell the truth about private API
-
-Mark private API with symbols only for the current patch release
-
-This change is a port of the libqt5-qtbase patch which was
-added during the Qt 5.6 cycle.
----
- cmake/QtFlagHandlingHelpers.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/cmake/QtFlagHandlingHelpers.cmake b/cmake/QtFlagHandlingHelpers.cmake
-index d8597326cc..f9da7b2171 100644
---- a/cmake/QtFlagHandlingHelpers.cmake
-+++ b/cmake/QtFlagHandlingHelpers.cmake
-@@ -23,7 +23,7 @@ function(qt_internal_add_linker_version_script target)
-     endif()
-
-     if(TEST_ld_version_script)
--        set(contents "Qt_${PROJECT_VERSION_MAJOR}_PRIVATE_API {\n    qt_private_api_tag*;\n")
-+        set(contents "Qt_${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}_PRIVATE_API {\n    qt_private_api_tag*;\n")
-         if(arg_PRIVATE_HEADERS)
-             foreach(ph ${arg_PRIVATE_HEADERS})
-                 string(APPEND contents "    @FILE:${ph}@\n")
---
-2.40.0

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

@@ -0,0 +1,16 @@
+diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
+index 3cacc8df..469e6f50 100644
+--- a/mkspecs/features/qt_module.prf
++++ b/mkspecs/features/qt_module.prf
+@@ -218,9 +218,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

qtbase-use-qgnomeplatform-as-default-platform-theme-on-gnome.patch

@@ -1,12 +0,0 @@
-diff --git a/src/gui/platform/unix/qgenericunixthemes.cpp b/src/gui/platform/unix/qgenericunixthemes.cpp
-index 1efd759b..d0129f73 100644
---- a/src/gui/platform/unix/qgenericunixthemes.cpp
-+++ b/src/gui/platform/unix/qgenericunixthemes.cpp
-@@ -977,6 +977,7 @@ QStringList QGenericUnixTheme::themeNames()
-                 result.push_back(QLatin1StringView(QKdeTheme::name));
- #endif
-             } else if (gtkBasedEnvironments.contains(desktopName)) {
-+                result.push_back(QStringLiteral("qgnomeplatform"));
-                 // prefer the GTK3 theme implementation with native dialogs etc.
-                 result.push_back(QStringLiteral("gtk3"));
-                 // fallback to the generic Gnome theme if loading the GTK3 theme fails

qtbase-version-check.patch

@@ -1,13 +1,13 @@
-diff --git a/src/corelib/global/qtversionchecks.h b/src/corelib/global/qtversionchecks.h
-index d3b7a7b0..a8b9c6f3 100644
---- a/src/corelib/global/qtversionchecks.h
-+++ b/src/corelib/global/qtversionchecks.h
-@@ -26,7 +26,7 @@
+diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
+index c6b5c5a9..bb0076b3 100644
+--- a/src/corelib/global/qglobal.h
++++ b/src/corelib/global/qglobal.h
+@@ -58,7 +58,7 @@
  /*
-    can be used like #if (QT_VERSION >= QT_VERSION_CHECK(6, 4, 0))
+    can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0))
  */
 -#define QT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
 +#define QT_VERSION_CHECK(qt_version_check_major, qt_version_check_minor, qt_version_check_patch) ((qt_version_check_major<<16)|(qt_version_check_minor<<8)|(qt_version_check_patch))
-
- /*
-    Helper macros to make some simple code active in Qt 6 or Qt 7 only,
+ 
+ #ifdef QT_BOOTSTRAPPED
+ #include <QtCore/qconfig-bootstrapped.h>

sources

@@ -1 +1 @@
-SHA512 (qtbase-everywhere-src-6.5.1.tar.xz) = 7f7b20bbc25cda65266d6067cdd68e3e077636988d67dbf5783f79a61186135fb3a36d57ac72cfe4501012035b630ab1f5849148e4817726d4f459fa1937e91a
+SHA512 (qtbase-everywhere-src-6.2.3.tar.xz) = c1adfb971723213f193223de222e10414868cf091e79c1fedbcaaa495cce57976bb65ac5d20138bc7e5668b92bf88ef054783b55c59b3a8feffc837596764698