6.2.0 - beta3

4 years ago · ccaa9197e5
parent c7b939f45f
commit ccaa9197e5
5 changed files with 73 additions and 70 deletions
--- a/.gitignore
+++ b/.gitignore
@ -4,3 +4,4 @@
 /qtbase-everywhere-src-6.1.0.tar.xz
 /qtbase-everywhere-src-6.1.1.tar.xz
 /qtbase-everywhere-src-6.1.2.tar.xz
+/qtbase-everywhere-src-6.2.0-beta3.tar.xz
--- a/qt6-qtbase.spec
+++ b/qt6-qtbase.spec
@ -33,16 +33,27 @@ BuildRequires: pkgconfig(libsystemd)
 ## skip for now, until we're better at it --rex
 #global tests 1

+%global unstable 1
+%if 0%{unstable}
+%global prerelease beta3
+%endif
+
 Name:    qt6-qtbase
 Summary: Qt6 - QtBase components
-Version: 6.1.2
+Version: 6.2.0%{?unstable:~%{prerelease}}
 Release: 1%{?dist}

 # 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)
+
+%if 0%{unstable}
+Source0: https://download.qt.io/development_releases/qt/%{majmin}/%{qt_version}/submodules/%{qt_module}-everywhere-src-%{qt_version}-%{prerelease}.tar.xz
+%else
 Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz
+%endif

 # https://bugzilla.redhat.com/show_bug.cgi?id=1227295
 Source1: qtlogging.ini
@ -74,9 +85,6 @@ Patch50: qtbase-version-check.patch
 # 2. Workaround sysmacros.h (pre)defining major/minor a breaking stuff
 Patch51: qtbase-moc-macros.patch

-# don't use relocatable heuristics to guess prefix when using -no-feature-relocatable
-Patch53: qtbase-no-relocatable.patch
-
 # drop -O3 and make -O2 by default
 Patch54: qtbase-cxxflag.patch

@ -151,8 +159,12 @@ BuildRequires: pkgconfig(xkeyboard-config)
 %global vulkan 1
 BuildRequires: pkgconfig(vulkan)
 %global egl 1
-BuildRequires: libEGL-devel
+BuildRequires: mesa-libEGL-devel
+BuildRequires: pkgconfig(egl)
 BuildRequires: pkgconfig(gbm)
+BuildRequires: pkgconfig(libglvnd)
+BuildRequires: pkgconfig(x11)
+
 %global sqlite 1
 BuildRequires: pkgconfig(sqlite3) >= 3.7
 BuildRequires: pkgconfig(harfbuzz) >= 0.9.42
@ -308,7 +320,7 @@ Qt6 libraries used for drawing widgets and OpenGL items.


 %prep
-%autosetup -n %{qt_module}-everywhere-src-%{version} -p1
+%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1

 # move some bundled libs to ensure they're not accidentally used
 pushd src/3rdparty
@ -393,10 +405,6 @@ export MAKEFLAGS="%{?_smp_mflags}"

 install -m644 -p -D %{SOURCE1} %{buildroot}%{_qt6_datadir}/qtlogging.ini

-# Thanks OpenSuse
-# Static library created by an example
-rm %{buildroot}%{_prefix}/lib/libpnp_basictools.a
-
 # Qt6.pc
 mkdir -p %{buildroot}%{_libdir}/pkgconfig
 cat << EOF > %{buildroot}%{_libdir}/pkgconfig/Qt6.pc
@ -420,7 +428,7 @@ translationdir=%{_qt6_translationdir}

 Name: Qt6
 Description: Qt6 Configuration
-Version: 6.1.2
+Version: 6.2.0~beta3
 EOF

 # rpm macros
@ -483,6 +491,9 @@ 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

+# Remove useless files
+rm -rf %{buildroot}/%{_qt6_libdir}/cmake/Qt6/config.tests/static_link_order
+
 %check
 # verify Qt6.pc
 export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig
@ -540,8 +551,10 @@ make check -k ||:
 %dir %{_qt6_plugindir}/script/
 %dir %{_qt6_plugindir}/sqldrivers/
 %dir %{_qt6_plugindir}/styles/
+%{_qt6_plugindir}/networkinformation/libnetworkmanager.so
 %{_qt6_plugindir}/sqldrivers/libqsqlite.so
-%{_qt6_libdir}/cmake/Qt6Sql/Qt6QSQLiteDriverPlugin*.cmake
+%{_qt6_plugindir}/tls/libcertonlybackend.so
+%{_qt6_plugindir}/tls/libopensslbackend.so

 %files common
 # mostly empty for now, consider: filesystem/dir ownership, licenses
@ -560,25 +573,25 @@ make check -k ||:
 %dir %{_qt6_libdir}/cmake/Qt6CoreTools
 %dir %{_qt6_libdir}/cmake/Qt6DBus
 %dir %{_qt6_libdir}/cmake/Qt6DBusTools
-%dir %{_qt6_libdir}/cmake/Qt6DeviceDiscoverySupport
-%dir %{_qt6_libdir}/cmake/Qt6EglFSDeviceIntegration
-%dir %{_qt6_libdir}/cmake/Qt6EglFsKmsGbmSupport
-%dir %{_qt6_libdir}/cmake/Qt6EglFsKmsSupport
-%dir %{_qt6_libdir}/cmake/Qt6FbSupport
+%dir %{_qt6_libdir}/cmake/Qt6DeviceDiscoverySupportPrivate
+%dir %{_qt6_libdir}/cmake/Qt6EglFSDeviceIntegrationPrivate
+%dir %{_qt6_libdir}/cmake/Qt6EglFsKmsGbmSupportPrivate
+%dir %{_qt6_libdir}/cmake/Qt6EglFsKmsSupportPrivate
+%dir %{_qt6_libdir}/cmake/Qt6FbSupportPrivate
 %dir %{_qt6_libdir}/cmake/Qt6Gui
 %dir %{_qt6_libdir}/cmake/Qt6GuiTools
 %dir %{_qt6_libdir}/cmake/Qt6HostInfo
-%dir %{_qt6_libdir}/cmake/Qt6InputSupport
-%dir %{_qt6_libdir}/cmake/Qt6KmsSupport
+%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
-%dir %{_qt6_libdir}/cmake/Qt6XcbQpa
 %dir %{_qt6_libdir}/cmake/Qt6Xml
 %if "%{_qt6_bindir}" != "%{_bindir}"
 %dir %{_qt6_bindir}
@ -588,6 +601,7 @@ make check -k ||:
 %{_bindir}/qdbuscpp2xml*
 %{_bindir}/qdbusxml2cpp*
 %{_bindir}/qmake*
+%{_bindir}/qtpaths*
 %{_bindir}/qt-cmake
 %{_bindir}/qt-cmake-private
 %{_bindir}/qt-cmake-standalone-test
@ -598,6 +612,7 @@ make check -k ||:
 %{_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
@ -687,25 +702,26 @@ make check -k ||:
 %{_qt6_libdir}/cmake/Qt6CoreTools/*.cmake
 %{_qt6_libdir}/cmake/Qt6DBus/*.cmake
 %{_qt6_libdir}/cmake/Qt6DBusTools/*.cmake
-%{_qt6_libdir}/cmake/Qt6DeviceDiscoverySupport/*.cmake
-%{_qt6_libdir}/cmake/Qt6EglFSDeviceIntegration/*.cmake
-%{_qt6_libdir}/cmake/Qt6EglFsKmsGbmSupport/*.cmake
-%{_qt6_libdir}/cmake/Qt6EglFsKmsSupport/*.cmake
-%{_qt6_libdir}/cmake/Qt6FbSupport/*.cmake
+%{_qt6_libdir}/cmake/Qt6DeviceDiscoverySupportPrivate/*.cmake
+%{_qt6_libdir}/cmake/Qt6EglFSDeviceIntegrationPrivate/*.cmake
+%{_qt6_libdir}/cmake/Qt6EglFsKmsGbmSupportPrivate/*.cmake
+%{_qt6_libdir}/cmake/Qt6EglFsKmsSupportPrivate/*.cmake
+%{_qt6_libdir}/cmake/Qt6FbSupportPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6Gui/*.cmake
 %{_qt6_libdir}/cmake/Qt6GuiTools/*.cmake
 %{_qt6_libdir}/cmake/Qt6HostInfo/*.cmake
-%{_qt6_libdir}/cmake/Qt6InputSupport/*.cmake
-%{_qt6_libdir}/cmake/Qt6KmsSupport/*.cmake
+%{_qt6_libdir}/cmake/Qt6InputSupportPrivate/*.cmake
+%{_qt6_libdir}/cmake/Qt6KmsSupportPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6Network/*.cmake
 %{_qt6_libdir}/cmake/Qt6OpenGL/*.cmake
 %{_qt6_libdir}/cmake/Qt6OpenGLWidgets/*.cmake
 %{_qt6_libdir}/cmake/Qt6PrintSupport/*.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/Qt6XcbQpa/*.cmake
+%{_qt6_libdir}/cmake/Qt6XcbQpaPrivate/*.cmake
 %{_qt6_libdir}/cmake/Qt6Xml/*.cmake
 %{_qt6_libdir}/metatypes/*.json
 %{_qt6_libdir}/pkgconfig/Qt6.pc
@ -716,10 +732,10 @@ make check -k ||:
 %endif
 %{_qt6_libexecdir}/tracegen
 ## private-devel globs
-%exclude %{_qt6_headerdir}/*/%{version}/
+%exclude %{_qt6_headerdir}/*/%{qt_version}/

 %files private-devel
-%{_qt6_headerdir}/*/%{version}/
+%{_qt6_headerdir}/*/%{qt_version}/

 %files static
 %{_qt6_headerdir}/QtDeviceDiscoverySupport
@ -797,10 +813,10 @@ make check -k ||:
 %{_qt6_plugindir}/platforms/libqminimalegl.so
 %dir %{_qt6_plugindir}/egldeviceintegrations/
 %{_qt6_plugindir}/egldeviceintegrations/libqeglfs-kms-integration.so
-%{_qt6_plugindir}/egldeviceintegrations/libqeglfs-x11-integration.so
-%{_qt6_plugindir}/xcbglintegrations/libqxcb-egl-integration.so
+# {_qt6_plugindir}/egldeviceintegrations/libqeglfs-x11-integration.so
 %{_qt6_plugindir}/egldeviceintegrations/libqeglfs-kms-egldevice-integration.so
 %{_qt6_plugindir}/egldeviceintegrations/libqeglfs-emu-integration.so
+# {_qt6_plugindir}/xcbglintegrations/libqxcb-egl-integration.so
 %endif
 # Platforms
 %{_qt6_plugindir}/platforms/libqlinuxfb.so
@ -808,15 +824,18 @@ make check -k ||:
 %{_qt6_plugindir}/platforms/libqoffscreen.so
 %{_qt6_plugindir}/platforms/libqxcb.so
 %{_qt6_plugindir}/platforms/libqvnc.so
+%{_qt6_plugindir}/platforms/libqvkkhrdisplay.so
 %{_qt6_plugindir}/xcbglintegrations/libqxcb-glx-integration.so
 # Platformthemes
 %{_qt6_plugindir}/platformthemes/libqxdgdesktopportal.so
 %{_qt6_plugindir}/platformthemes/libqgtk3.so
 %{_qt6_plugindir}/printsupport/libcupsprintersupport.so
-%{_qt6_plugindir}/networkinformationbackends/libnetworkmanagernetworkinformationbackend.so


 %changelog
+* Mon Aug 30 2021 Jan Grulich <jgrulich@redhat.com> - 6.2.0~beta3-1
+- 6.2.0 - beta3
+
 * Thu Aug 12 2021 Jan Grulich <jgrulich@redhat.com> - 6.1.2-1
 - 6.1.2

--- a/qtbase-firebird.patch
+++ b/qtbase-firebird.patch
@ -1,21 +1,22 @@
-diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
-index f738e58a..2cd61e9f 100644
--- a/src/plugins/sqldrivers/configure.json
-+++ b/src/plugins/sqldrivers/configure.json
-@@ -43,10 +43,11 @@
-         "ibase": {
-             "label": "InterBase",
-             "test": {},
-            "headers": "ibase.h",
-+            "headers": "firebird/ibase.h",
-             "sources": [
-                 { "libs": "-lgds32_ms", "condition": "config.win32" },
-                { "libs": "-lgds", "condition": "!config.win32" }
-+                { "libs": "-lgds", "condition": "!config.win32" },
-+                { "libs": "-lfbclient", "condition": "!config.win32" }
-             ]
-         },
-         "mysql": {
+diff --git a/cmake/FindInterbase.cmake b/cmake/FindInterbase.cmake
+index 22f866d8..4ef16e75 100644
+--- a/cmake/FindInterbase.cmake
+++ b/cmake/FindInterbase.cmake
+@@ -19,12 +19,12 @@
+ #     The Interbase client library
+
+ find_path(Interbase_INCLUDE_DIR
+-          NAMES ibase.h
+          NAMES firebird/ibase.h
+           HINTS ${Interbase_INCLUDEDIR}
+ )
+
+ find_library(Interbase_LIBRARY
+-             NAMES firebase_ms fbclient gds
+             NAMES firebase_ms fbclient gds fbclient
+              HINTS ${Interbase_LIBDIR}
+ )
+
 diff --git a/src/plugins/sqldrivers/ibase/qsql_ibase_p.h b/src/plugins/sqldrivers/ibase/qsql_ibase_p.h
 index 9109c2b4..7477d5ee 100644
 --- a/src/plugins/sqldrivers/ibase/qsql_ibase_p.h
--- a/qtbase-no-relocatable.patch
+++ b/qtbase-no-relocatable.patch
@ -1,18 +0,0 @@
-diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
-index 301c3ab8..bfb28380 100644
--- a/src/corelib/global/qlibraryinfo.cpp
-+++ b/src/corelib/global/qlibraryinfo.cpp
-@@ -624,10 +624,11 @@ static QString getPrefix(
- #  if QT_CONFIGURE_CROSSBUILD
-     if (group == QLibraryInfo::DevicePaths)
-         return QString::fromLocal8Bit(QT_CONFIGURE_PREFIX_PATH);
-+#  elif 0 //QT_CONFIG(relocatable)
-+    return getExtPrefixFromHostBinDir();
- #  else
-    Q_UNUSED(group);
-+    return QString::fromLocal8Bit(QT_CONFIGURE_PREFIX_PATH);
- #  endif
-    return getExtPrefixFromHostBinDir();
- #elif QT_CONFIG(relocatable)
-     return getRelocatablePrefix();
- #else
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (qtbase-everywhere-src-6.1.2.tar.xz) = 0f9bf5680268c6dc95c10c28297908c9113a7e3e498ba80ed3ba73cc98b809b38fa610ee3b15f367b6ace2f593842db8d27dc7ec2142737574cfa32cdf57ea91
+SHA512 (qtbase-everywhere-src-6.2.0-beta3.tar.xz) = b1b671763a626c6c12894576c82cf2a6846cee9a68b78d465b757fcc4dc6ff33d57496e1ab0db548514381d5b328e2a60fd6d424cbcb5f8b42964cf9084fe29d