Merge remote-tracking branch 'up/f38' into f38-riscv64

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
2023-05-16 11:21:06 +03:00 · 2023-05-16 11:21:06 +03:00 · 69bec8346d
commit 69bec8346d
parent d8efaba249 6a5e0a5ba5
5 changed files with 52 additions and 96 deletions
--- a/.gitignore
+++ b/.gitignore
@ -18,3 +18,4 @@
 /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
--- a/qt6-qtbase.spec
+++ b/qt6-qtbase.spec
@ -1,4 +1,3 @@
-
 # 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
@ -38,7 +37,7 @@ BuildRequires: pkgconfig(libsystemd)

 Name:    qt6-qtbase
 Summary: Qt6 - QtBase components
-Version: 6.4.3
+Version: 6.5.0
 Release: 2.0.riscv64%{?dist}

 License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
@ -66,11 +65,6 @@ Source6: 10-qt6-check-opengl2.sh
 # macros
 Source10: macros.qt6-qtbase

-# 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
 Patch2: qtbase-use-qgnomeplatform-as-default-platform-theme-on-gnome.patch

 # upstreamable patches
@ -86,9 +80,6 @@ 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

@ -125,6 +116,7 @@ BuildRequires: libjpeg-devel
 BuildRequires: libmng-devel
 BuildRequires: libtiff-devel
 BuildRequires: libzstd-devel
+BuildRequires: mtdev-devel
 BuildRequires: tslib-devel
 BuildRequires: pkgconfig(alsa)
 # required for -accessibility
@ -138,6 +130,7 @@ 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)
@ -158,6 +151,8 @@ 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
@ -167,7 +162,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)
+BuildRequires: pkgconfig(xcb) pkgconfig(xcb-glx) pkgconfig(xcb-icccm) pkgconfig(xcb-image) pkgconfig(xcb-keysyms) pkgconfig(xcb-renderutil) pkgconfig(xcb-cursor)
 BuildRequires: pkgconfig(zlib)
 BuildRequires: perl
 BuildRequires: perl-generators
@ -185,18 +180,10 @@ BuildRequires: xorg-x11-server-Xvfb
 Requires: %{name}-common = %{version}-%{release}

 ## Sql drivers
-# 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
+%if 0%{?fedora} || 0%{?epel}
+%global ibase 1
+%endif
+	

 %description
 Qt is a software toolkit for developing applications.
@ -226,15 +213,12 @@ Requires: qt6-rpm-macros
 %if 0%{?use_clang}
 Requires: clang >= 3.7.0
 %endif
-%if 0%{?no_ibase} == 0
+%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}
-%if 0%{?no_tds} == 0
-Requires: %{name}-tds%{?_isa} = %{version}-%{release}
-%endif
 %description devel
 %{summary}.

@ -265,7 +249,7 @@ Requires: pkgconfig(zlib)
 %description static
 %{summary}.

-%if 0%{?no_ibase} == 0
+%if 0%{?ibase}
 %package ibase
 Summary: IBase driver for Qt6's SQL classes
 BuildRequires: firebird-devel
@ -299,22 +283,11 @@ 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
@ -336,10 +309,6 @@ 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
@ -376,12 +345,15 @@ 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 \
@ -391,9 +363,6 @@ export MAKEFLAGS="%{?_smp_mflags}"
 %{?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} \
@ -433,7 +402,7 @@ translationdir=%{_qt6_translationdir}

 Name: Qt6
 Description: Qt6 Configuration
-Version: 6.4.3
+Version: 6.5.0
 EOF

 # rpm macros
@ -491,7 +460,7 @@ 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}/%{_bindir}/qt-cmake-private-install.cmake
+rm %{buildroot}/%{_qt6_libexecdir}/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
@ -563,8 +532,8 @@ make check -k ||:
 %{_rpmmacrodir}/macros.qt6-qtbase

 %files devel
-%dir %{_qt6_datadir}/modules
-%dir %{_qt6_libdir}/metatypes
+%dir %{_qt6_libdir}/qt6/modules
+%dir %{_qt6_libdir}/qt6/metatypes
 %dir %{_qt6_libdir}/cmake/Qt6
 %dir %{_qt6_libdir}/cmake/Qt6/platforms
 %dir %{_qt6_libdir}/cmake/Qt6/platforms/Platform
@ -586,14 +555,12 @@ make check -k ||:
 %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
@ -602,40 +569,40 @@ 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}/syncqt.pl
+%{_qt6_libexecdir}/sanitizer-testrunner.py
+%{_qt6_libexecdir}/syncqt
 %{_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_datadir}/modules/*.json
+%{_qt6_libdir}/qt6/modules/*.json
 %if "%{_qt6_headerdir}" != "%{_includedir}"
 %dir %{_qt6_headerdir}
 %endif
@ -680,7 +647,7 @@ 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
@ -695,8 +662,10 @@ make check -k ||:
 %{_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
@ -729,14 +698,14 @@ make check -k ||:
 %{_qt6_libdir}/cmake/Qt6OpenGL/*.cmake
 %{_qt6_libdir}/cmake/Qt6OpenGLWidgets/*.cmake
 %{_qt6_libdir}/cmake/Qt6PrintSupport/*.cmake
-%{_qt6_libdir}/cmake/Qt6Sql/*.cmake
+%{_qt6_libdir}/cmake/Qt6Sql/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}/metatypes/*.json
+%{_qt6_libdir}/qt6/metatypes/*.json
 %{_qt6_libdir}/pkgconfig/*.pc

 %if 0%{?egl}
@ -766,10 +735,10 @@ make check -k ||:
 %{_qt6_examplesdir}/
 %endif

-%if 0%{?no_ibase} == 0
+%if 0%{?ibase}
 %files ibase
 %{_qt6_plugindir}/sqldrivers/libqsqlibase.so
-
+%{_qt6_libdir}/cmake/Qt6Sql/Qt6QIBaseDriverPlugin*.cmake
 %endif

 %files mysql
@ -784,11 +753,6 @@ 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
@ -845,9 +809,16 @@ make check -k ||:


 %changelog
-* Wed Apr 12 2023 David Abdurachmanov <davidlt@rivosinc.com> - 6.4.3-2.0.riscv64
+* Tue May 16 2023 David Abdurachmanov <davidlt@rivosinc.com> - 6.5.0-2.0.riscv64
 - Disable SSE2 on riscv64

+* 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

--- a/qtbase-tell-truth-about-private-api.patch
+++ b/qtbase-tell-truth-about-private-api.patch
@ -1,16 +0,0 @@
-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
--- a/qtbase-version-check.patch
+++ b/qtbase-version-check.patch
@ -1,13 +1,13 @@
-diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
-index 6e83b78f..6a18cc19 100644
--- a/src/corelib/global/qglobal.h
-+++ b/src/corelib/global/qglobal.h
-@@ -59,7 +59,7 @@
+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 @@
 /*
    can be used like #if (QT_VERSION >= QT_VERSION_CHECK(6, 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))
- 
- #ifdef QT_BOOTSTRAPPED
- #include <QtCore/qconfig-bootstrapped.h>
+
+ /*
+    Helper macros to make some simple code active in Qt 6 or Qt 7 only,
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (qtbase-everywhere-src-6.4.3.tar.xz) = a2d0779ba7ee8b8b78f5dc8db06177d04d50463fea7cad0b7785721acfc33dbbbaa1a7bfc052edb90ba1d11b488c30004daa43b6924a97126b9b8f82ad1a7f43
+SHA512 (qtbase-everywhere-src-6.5.0.tar.xz) = 29f70b9a9650afdd8e34703a7a8191feab4c3a25d0bc3a41010ea842389335b24e2685721fdb4a03653475ebd9bf8a8e4f4a77bf5d64b1289590b5ca0e4623f3