diff --git a/.gitignore b/.gitignore index 30c57eb..ef57410 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,5 @@ /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 diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec index ab7efae..3ed8430 100644 --- a/qt6-qtbase.spec +++ b/qt6-qtbase.spec @@ -38,8 +38,8 @@ BuildRequires: pkgconfig(libsystemd) Name: qt6-qtbase Summary: Qt6 - QtBase components -Version: 6.2.3 -Release: 2%{?dist} +Version: 6.3.1 +Release: 3%{?dist} # See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -92,9 +92,6 @@ 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 @@ -322,7 +319,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 xcb zlib UNUSED/ +mv harfbuzz-ng freetype libjpeg libpng sqlite zlib UNUSED/ popd # builds failing mysteriously on f20 @@ -417,7 +414,7 @@ headerdir=%{_qt6_headerdir} importdir=%{_qt6_importdir} libdir=%{_qt6_libdir} libexecdir=%{_qt6_libexecdir} -moc=%{_qt6_bindir}/moc +moc=%{_qt6_libexecdir}/moc plugindir=%{_qt6_plugindir} qmake=%{_qt6_bindir}/qmake settingsdir=%{_qt6_settingsdir} @@ -426,7 +423,7 @@ translationdir=%{_qt6_translationdir} Name: Qt6 Description: Qt6 Configuration -Version: 6.2.3 +Version: 6.3.1 EOF # rpm macros @@ -546,6 +543,7 @@ 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 @@ -621,11 +619,13 @@ make check -k ||: %{_qt6_libexecdir}/syncqt.pl %{_qt6_libexecdir}/android_emulator_launcher.sh %{_qt6_libexecdir}/moc +%{_qt6_libexecdir}/tracegen %{_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 %if "%{_qt6_headerdir}" != "%{_includedir}" %dir %{_qt6_headerdir} @@ -678,9 +678,13 @@ make check -k ||: %{_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/ModuleDescription.json.in %{_qt6_libdir}/cmake/Qt6/QtFileConfigure.txt.in @@ -724,13 +728,12 @@ make check -k ||: %{_qt6_libdir}/cmake/Qt6XcbQpaPrivate/*.cmake %{_qt6_libdir}/cmake/Qt6Xml/*.cmake %{_qt6_libdir}/metatypes/*.json -%{_qt6_libdir}/pkgconfig/Qt6.pc +%{_qt6_libdir}/pkgconfig/*.pc %if 0%{?egl} %{_qt6_libdir}/libQt6EglFsKmsSupport.prl %{_qt6_libdir}/libQt6EglFsKmsSupport.so %endif -%{_qt6_libexecdir}/tracegen ## private-devel globs %exclude %{_qt6_headerdir}/*/%{qt_version}/ @@ -833,6 +836,19 @@ make check -k ||: %changelog +* Fri Jul 29 2022 Jan Grulich - 6.3.1-3 +- Fix moc location in pkgconfig file + Resolves: bz#2112029 + +* Sat Jul 23 2022 Fedora Release Engineering - 6.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 13 2022 Jan Grulich - 6.3.1-1 +- 6.3.1 + +* Wed Apr 13 2022 Jan Grulich - 6.3.0-1 +- 6.3.0 + * Fri Feb 25 2022 Jan Grulich - 6.2.3-2 - Enable s390x builds diff --git a/qtbase-python3.patch b/qtbase-python3.patch deleted file mode 100644 index 40dfd47..0000000 --- a/qtbase-python3.patch +++ /dev/null @@ -1,9 +0,0 @@ -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 - - ############################################################################# - ## diff --git a/qtbase-version-check.patch b/qtbase-version-check.patch index a0f190f..d9c62b8 100644 --- a/qtbase-version-check.patch +++ b/qtbase-version-check.patch @@ -1,10 +1,10 @@ diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h -index c6b5c5a9..bb0076b3 100644 +index 6e83b78f..6a18cc19 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h -@@ -58,7 +58,7 @@ +@@ -59,7 +59,7 @@ /* - can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0)) + 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)) diff --git a/sources b/sources index 1b0eb63..75caf03 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtbase-everywhere-src-6.2.3.tar.xz) = c1adfb971723213f193223de222e10414868cf091e79c1fedbcaaa495cce57976bb65ac5d20138bc7e5668b92bf88ef054783b55c59b3a8feffc837596764698 +SHA512 (qtbase-everywhere-src-6.3.1.tar.xz) = 5c4304dc1f5fa80201b61c9c8dbf4c3449506a243ea1f87e336dc3641a37b9d40c2aa4a93190cc69ddde0f349c74e327c35de5f46de888ddfd49616903e8a7b5