From 75100dc7fd245b4363ad8b90d0170b7d4d13a1eb Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: May 06 2021 18:03:08 +0000 Subject: 5.1.0 --- diff --git a/.gitignore b/.gitignore index 2e966b0..19c66c0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /qtbase-everywhere-src-6.0.0.tar.xz /qtbase-everywhere-src-6.0.1.tar.xz /qtbase-everywhere-src-6.0.3.tar.xz +/qtbase-everywhere-src-6.1.0.tar.xz diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec index 5ed983a..cbdd6e8 100644 --- a/qt6-qtbase.spec +++ b/qt6-qtbase.spec @@ -35,7 +35,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt6-qtbase Summary: Qt6 - QtBase components -Version: 6.0.3 +Version: 6.1.0 Release: 1%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details @@ -74,9 +74,6 @@ Patch50: qtbase-version-check.patch # 2. Workaround sysmacros.h (pre)defining major/minor a breaking stuff Patch51: qtbase-moc-macros.patch -# respect QMAKE_LFLAGS_RELEASE when building qmake -Patch52: qtbase-qmake-lflags.patch - # don't use relocatable heuristics to guess prefix when using -no-feature-relocatable Patch53: qtbase-no-relocatable.patch @@ -329,8 +326,6 @@ test -x configure || chmod +x configure # use proper perl interpretter so autodeps work as expected sed -i -e "s|^#!/usr/bin/env perl$|#!%{__perl}|" \ - bin/fixqt4headers.pl \ - bin/syncqt.pl \ mkspecs/features/data/unix/findclasslist.pl @@ -428,7 +423,7 @@ translationdir=%{_qt6_translationdir} Name: Qt6 Description: Qt6 Configuration -Version: 6.0.3 +Version: 6.1.0 EOF # rpm macros @@ -450,7 +445,7 @@ mkdir %{buildroot}%{_bindir} pushd %{buildroot}%{_qt6_bindir} for i in * ; do case "${i}" in - moc|qdbuscpp2xml|qdbusxml2cpp|qlalr|qvkgen|qmake|rcc|tracegen|uic) + qdbuscpp2xml|qdbusxml2cpp) ln -v ${i} %{buildroot}%{_bindir}/${i}-qt6 ;; *) @@ -460,6 +455,17 @@ for i in * ; do done popd +# hardlink files to {_bindir}, add -qt6 postfix to not conflict +pushd %{buildroot}%{_qt6_libdir} +for i in * ; do + case "${i}" in + moc|qlalr|qvkgen|qmake|rcc|tracegen|uic) + ln -v ${i} %{buildroot}%{_libdir}/${i}-qt6 + ;; + esac +done +popd + %ifarch %{multilib_archs} # multilib: qconfig.h mv %{buildroot}%{_qt6_headerdir}/QtCore/qconfig.h %{buildroot}%{_qt6_headerdir}/QtCore/qconfig-%{__isa_bits}.h @@ -485,14 +491,6 @@ 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/ -# Taken from OpenSUSE -# syncqt is installed in both %%_qt6_bindir and %%_qt6_libdir -# QtSyncQtHelpers.cmake needs the libexec one...and qmake the other one. -# Creating a symlink is not necessary -rm %{buildroot}%{_bindir}/syncqt.pl -rm %{buildroot}%{_qt6_bindir}/syncqt.pl -ln -s %{_qt6_libdir}/syncqt.pl %{buildroot}%{_qt6_bindir}/syncqt.pl - rm %{buildroot}/%{_bindir}/qt-cmake-private-install.cmake # Use better location for some new scripts in qtbase-6.0.1 @@ -574,7 +572,6 @@ make check -k ||: %dir %{_qt6_libdir}/cmake/Qt6Concurrent %dir %{_qt6_libdir}/cmake/Qt6Core %dir %{_qt6_libdir}/cmake/Qt6CoreTools -%dir %{_qt6_libdir}/cmake/Qt6Core_qobject %dir %{_qt6_libdir}/cmake/Qt6DBus %dir %{_qt6_libdir}/cmake/Qt6DBusTools %dir %{_qt6_libdir}/cmake/Qt6DeviceDiscoverySupport @@ -602,40 +599,41 @@ make check -k ||: %endif %{_bindir}/androiddeployqt %{_bindir}/androidtestrunner -%{_bindir}/cmake_automoc_parser -%{_bindir}/moc* %{_bindir}/qdbuscpp2xml* %{_bindir}/qdbusxml2cpp* -%{_bindir}/qlalr* %{_bindir}/qmake* %{_bindir}/qt-cmake %{_bindir}/qt-cmake-private %{_bindir}/qt-cmake-standalone-test %{_bindir}/qt-configure-module -%{_bindir}/qt-internal-configure-tests -%{_bindir}/qvkgen* -%{_bindir}/rcc* -%{_bindir}/tracegen* -%{_bindir}/uic* +%{_libdir}/cmake_automoc_parser +%{_libdir}/moc* +%{_libdir}/qt-internal-configure-tests +%{_libdir}/qvkgen* +%{_libdir}/qlalr* +%{_libdir}/rcc* +%{_libdir}/tracegen* +%{_libdir}/uic* +%{_libdir}/syncqt.pl +%{_libdir}/qt6/bin/qmake6 %{_qt6_bindir}/android_emulator_launcher.sh %{_qt6_bindir}/androiddeployqt %{_qt6_bindir}/androidtestrunner -%{_qt6_bindir}/cmake_automoc_parser -%{_qt6_bindir}/moc %{_qt6_bindir}/qdbuscpp2xml %{_qt6_bindir}/qdbusxml2cpp -%{_qt6_bindir}/qlalr %{_qt6_bindir}/qmake %{_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_bindir}/qt-internal-configure-tests -%{_qt6_bindir}/qvkgen -%{_qt6_bindir}/rcc -%{_qt6_bindir}/syncqt.pl -%{_qt6_bindir}/uic +%{_qt6_libdir}/cmake_automoc_parser +%{_qt6_libdir}/moc +%{_qt6_libdir}/qlalr +%{_qt6_libdir}/qt-internal-configure-tests +%{_qt6_libdir}/qvkgen +%{_qt6_libdir}/rcc +%{_qt6_libdir}/uic %{_qt6_datadir}/modules/*.json %if "%{_qt6_headerdir}" != "%{_includedir}" %dir %{_qt6_headerdir} @@ -662,9 +660,6 @@ make check -k ||: %{_qt6_libdir}/libQt6Concurrent.so %{_qt6_libdir}/libQt6Core.prl %{_qt6_libdir}/libQt6Core.so -# FIXME: Jan: OpenSUSE removes these, do we really need them? -%{_qt6_libdir}/libQt6Core_qobject.a -%{_qt6_libdir}/libQt6Core_qobject.prl %{_qt6_libdir}/libQt6DBus.prl %{_qt6_libdir}/libQt6DBus.so %{_qt6_libdir}/libQt6Gui.prl @@ -710,7 +705,6 @@ make check -k ||: %{_qt6_libdir}/cmake/Qt6Core/*.cmake %{_qt6_libdir}/cmake/Qt6Core/Qt6CoreConfigureFileTemplate.in %{_qt6_libdir}/cmake/Qt6CoreTools/*.cmake -%{_qt6_libdir}/cmake/Qt6Core_qobject/*.cmake %{_qt6_libdir}/cmake/Qt6DBus/*.cmake %{_qt6_libdir}/cmake/Qt6DBusTools/*.cmake %{_qt6_libdir}/cmake/Qt6DeviceDiscoverySupport/*.cmake @@ -735,13 +729,12 @@ make check -k ||: %{_qt6_libdir}/cmake/Qt6Xml/*.cmake %{_qt6_libdir}/metatypes/*.json %{_qt6_libdir}/pkgconfig/Qt6.pc -%{_qt6_libdir}/syncqt.pl %if 0%{?egl} %{_qt6_libdir}/libQt6EglFsKmsSupport.prl %{_qt6_libdir}/libQt6EglFsKmsSupport.so %endif -%{_qt6_libdir}/qt6/bin/tracegen +#{_qt6_libdir}/qt6/bin/tracegen ## private-devel globs %exclude %{_qt6_headerdir}/*/%{version}/ @@ -840,9 +833,13 @@ make check -k ||: %{_qt6_plugindir}/platformthemes/libqxdgdesktopportal.so %{_qt6_plugindir}/platformthemes/libqgtk3.so %{_qt6_plugindir}/printsupport/libcupsprintersupport.so +%{_qt6_plugindir}/networkinformationbackends/libnetworkmanagernetworkinformationbackend.so %changelog +* Thu May 06 2021 Jan Grulich - 6.1.0-1 +- 6.1.0 + * Mon Apr 05 2021 Jan Grulich - 6.0.3-1 - 6.0.3 diff --git a/qtbase-qmake-lflags.patch b/qtbase-qmake-lflags.patch deleted file mode 100644 index 898c3ad..0000000 --- a/qtbase-qmake-lflags.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix -index ea792a7c..5401a5fe 100644 ---- a/qmake/Makefile.unix -+++ b/qmake/Makefile.unix -@@ -183,6 +183,7 @@ CPPFLAGS = -g $(EXTRA_CPPFLAGS) \ - CXXFLAGS = $(EXTRA_CXXFLAGS) $(CONFIG_CXXFLAGS) $(CPPFLAGS) - CFLAGS = $(CPPFLAGS) $(CONFIG_CFLAGS) - LFLAGS = $(EXTRA_LFLAGS) $(CONFIG_LFLAGS) -+LFLAGS = $(EXTRA_LFLAGS) $(CONFIG_LFLAGS) $(QMAKE_LFLAGS_RELEASE) - - first all: $(BUILD_PATH)/bin/qmake$(EXEEXT) - qmake: $(BUILD_PATH)/bin/qmake$(EXEEXT) diff --git a/qtbase-use-wayland-on-gnome.patch b/qtbase-use-wayland-on-gnome.patch index 6a23e84..5cbf336 100644 --- a/qtbase-use-wayland-on-gnome.patch +++ b/qtbase-use-wayland-on-gnome.patch @@ -1,21 +1,18 @@ diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp -index c10b95e2..476e3d3b 100644 +index 08a00d82..f555fb4f 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp -@@ -1412,16 +1412,7 @@ void QGuiApplicationPrivate::createPlatformIntegration() - const bool defaultIsWayland = !defaultIsXcb && platformPluginBase.startsWith("wayland"); +@@ -1411,13 +1411,7 @@ void QGuiApplicationPrivate::createPlatformIntegration() + bool isGnome = false; const QByteArray waylandPlatformName = defaultIsWayland ? platformName : "wayland"; if (hasWaylandDisplay || isWaylandSessionType) { - const QByteArray currentDesktop = qgetenv("XDG_CURRENT_DESKTOP").toLower(); - const QByteArray sessionDesktop = qgetenv("XDG_SESSION_DESKTOP").toLower(); -- const bool isGnome = currentDesktop.contains("gnome") || sessionDesktop.contains("gnome"); -- if (isGnome) { -- qInfo() << "Warning: Ignoring WAYLAND_DISPLAY on Gnome." -- << "Use QT_QPA_PLATFORM=wayland to run on Wayland anyway."; +- isGnome = currentDesktop.contains("gnome") || sessionDesktop.contains("gnome"); +- if (isGnome) - preferredPlatformOrder.append(waylandPlatformName); -- } else { +- else - preferredPlatformOrder.prepend(waylandPlatformName); -- } + preferredPlatformOrder.prepend(waylandPlatformName); if (defaultIsWayland) diff --git a/sources b/sources index a345c67..6a8ce51 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtbase-everywhere-src-6.0.3.tar.xz) = 412854daffdfc96c243265defebc12503880bd808d86c456583709925e061b523cef67b8fa18b884113eb9f14a2a3d48ae69b5f145a4a877eb204a3db1afeb30 +SHA512 (qtbase-everywhere-src-6.1.0.tar.xz) = 2926e66fd1de9c7e541671fbccb2127a2abd490562180a640fdda95ba15b2c8b1828c747ebfcb49190c5d01092c8194ad4d0f1fe6bbe350b62c438322a8eb7b8