The package rpms/qt6-qtbase.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/qt6-qtbase.git/commit/?id=4d550dc675....
Change: +ExcludeArch: s390x
Thanks.
Full change: ============
commit 938b33188affa82a5f55e59700a4f8465ecda954 Merge: a5ce979 b69f5ea Author: Jan Grulich jgrulich@redhat.com Date: Mon Oct 4 10:14:44 2021 +0200
Merge branch 'f35' into f34
commit b69f5eadfe87c2ce989d56c63e269ded050f763b Merge: b990a1d cd8c559 Author: Jan Grulich jgrulich@redhat.com Date: Fri Oct 1 09:54:26 2021 +0200
Merge branch 'rawhide' into f35
commit cd8c559cea17dbd077e9baee1a8723c8c7d566eb Author: Jan Grulich jgrulich@redhat.com Date: Thu Sep 30 13:29:28 2021 +0200
Fix build
diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec index 587c74f..f6a57a2 100644 --- a/qt6-qtbase.spec +++ b/qt6-qtbase.spec @@ -36,12 +36,12 @@ BuildRequires: pkgconfig(libsystemd) ## skip for now, until we're better at it --rex #global tests 1
-%global unstable 0 +#global unstable 0 %global prerelease rc2
Name: qt6-qtbase Summary: Qt6 - QtBase components -Version: 6.2.0 +Version: 6.2.0%{?unstable:~%{prerelease}} Release: 1%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details @@ -50,7 +50,7 @@ Url: http://qt-project.org/ %global majmin %(echo %{version} | cut -d. -f1-2) %global qt_version %(echo %{version} | cut -d~ -f1)
-%if 0%{unstable} +%if 0%{?unstable} Source0: https://download.qt.io/development_releases/qt/%%7Bmajmin%7D/%%7Bqt_version%... %else Source0: https://download.qt.io/official_releases/qt/%%7Bmajmin%7D/%%7Bversion%7D/sub...
commit be551b8abbb8542c98878e3ec3cb89b3b3b7b36a Author: Jan Grulich jgrulich@redhat.com Date: Thu Sep 30 13:13:13 2021 +0200
6.2.0
diff --git a/.gitignore b/.gitignore index 2369ab2..858a6cb 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /qtbase-everywhere-src-6.2.0-beta4.tar.xz /qtbase-everywhere-src-6.2.0-rc.tar.xz /qtbase-everywhere-src-6.2.0-rc2.tar.xz +/qtbase-everywhere-src-6.2.0.tar.xz diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec index 220b274..587c74f 100644 --- a/qt6-qtbase.spec +++ b/qt6-qtbase.spec @@ -36,14 +36,12 @@ BuildRequires: pkgconfig(libsystemd) ## skip for now, until we're better at it --rex #global tests 1
-%global unstable 1 -%if 0%{unstable} +%global unstable 0 %global prerelease rc2 -%endif
Name: qt6-qtbase Summary: Qt6 - QtBase components -Version: 6.2.0%{?unstable:~%{prerelease}} +Version: 6.2.0 Release: 1%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details @@ -836,6 +834,9 @@ make check -k ||:
%changelog +* Thu Sep 30 2021 Jan Grulich jgrulich@redhat.com - 6.2.0-1 +- 6.2.0 + * Mon Sep 27 2021 Jan Grulich jgrulich@redhat.com - 6.2.0~rc2-1 - 6.2.0 - rc2
diff --git a/sources b/sources index 055fdcb..2c4ee68 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtbase-everywhere-src-6.2.0-rc2.tar.xz) = d5c5b759115d3caa41412e6d99a30036d89469e92db2495d9cf49f6cf70696881f54da6f8c577ff35a83db4e503def76510af5962d6ed2a4dbda0d06d365b9ca +SHA512 (qtbase-everywhere-src-6.2.0.tar.xz) = 3ed301a531633e1e72da7833d1eea47edaf7e5474678a16ec29080e34de1d0def7000b68aa96fa18779880e3aa7b1a9b7c0cf699de2b4cba2c7de84442722fda
commit ae8453ab492e1c0a3c5c7bc87b44580a7dbd1e84 Author: Jan Grulich jgrulich@redhat.com Date: Mon Sep 27 14:14:34 2021 +0200
6.2.0 - rc2
diff --git a/.gitignore b/.gitignore index 032d4c6..2369ab2 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /qtbase-everywhere-src-6.2.0-beta3.tar.xz /qtbase-everywhere-src-6.2.0-beta4.tar.xz /qtbase-everywhere-src-6.2.0-rc.tar.xz +/qtbase-everywhere-src-6.2.0-rc2.tar.xz diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec index 6e72d0c..220b274 100644 --- a/qt6-qtbase.spec +++ b/qt6-qtbase.spec @@ -38,7 +38,7 @@ BuildRequires: pkgconfig(libsystemd)
%global unstable 1 %if 0%{unstable} -%global prerelease rc +%global prerelease rc2 %endif
Name: qt6-qtbase @@ -836,6 +836,9 @@ make check -k ||:
%changelog +* Mon Sep 27 2021 Jan Grulich jgrulich@redhat.com - 6.2.0~rc2-1 +- 6.2.0 - rc2 + * Sat Sep 18 2021 Jan Grulich jgrulich@redhat.com - 6.2.0~rc-1 - 6.2.0 - rc
diff --git a/sources b/sources index 63f79f6..055fdcb 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (qtbase-everywhere-src-6.2.0-beta4.tar.xz) = 505bc408682a6004fdc63705d431018c44f4e696f9f7a58a182d6151de29deefbb18e8e8f18973eccc1d863321a2819dc18a9080051216bbe812acb910e43462 -SHA512 (qtbase-everywhere-src-6.2.0-rc.tar.xz) = ff2a14c026db6ca34c09a0e3b29c13796ccf412bece4a81401bb2948bd60369613c2758632065f13cf95f535bc39bf1dbefd912700b3f49b24b5dbcb02f3252d +SHA512 (qtbase-everywhere-src-6.2.0-rc2.tar.xz) = d5c5b759115d3caa41412e6d99a30036d89469e92db2495d9cf49f6cf70696881f54da6f8c577ff35a83db4e503def76510af5962d6ed2a4dbda0d06d365b9ca
commit 42df854915d6b7a5c6ffa0aecd07d8aa01930d20 Author: Jan Grulich jgrulich@redhat.com Date: Sat Sep 18 21:46:39 2021 +0200
6.2.0 - rc
diff --git a/.gitignore b/.gitignore index 9feda82..032d4c6 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /qtbase-everywhere-src-6.1.2.tar.xz /qtbase-everywhere-src-6.2.0-beta3.tar.xz /qtbase-everywhere-src-6.2.0-beta4.tar.xz +/qtbase-everywhere-src-6.2.0-rc.tar.xz diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec index eee2a68..6e72d0c 100644 --- a/qt6-qtbase.spec +++ b/qt6-qtbase.spec @@ -38,13 +38,13 @@ BuildRequires: pkgconfig(libsystemd)
%global unstable 1 %if 0%{unstable} -%global prerelease beta4 +%global prerelease rc %endif
Name: qt6-qtbase Summary: Qt6 - QtBase components Version: 6.2.0%{?unstable:~%{prerelease}} -Release: 3%{?dist} +Release: 1%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -836,6 +836,9 @@ make check -k ||:
%changelog +* Sat Sep 18 2021 Jan Grulich jgrulich@redhat.com - 6.2.0~rc-1 +- 6.2.0 - rc + * Tue Sep 14 2021 Sahana Prasad sahana@redhat.com - 6.2.0~beta4-3 - Rebuilt with OpenSSL 3.0.0
diff --git a/sources b/sources index 53ccfa3..63f79f6 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (qtbase-everywhere-src-6.2.0-beta4.tar.xz) = 505bc408682a6004fdc63705d431018c44f4e696f9f7a58a182d6151de29deefbb18e8e8f18973eccc1d863321a2819dc18a9080051216bbe812acb910e43462 +SHA512 (qtbase-everywhere-src-6.2.0-rc.tar.xz) = ff2a14c026db6ca34c09a0e3b29c13796ccf412bece4a81401bb2948bd60369613c2758632065f13cf95f535bc39bf1dbefd912700b3f49b24b5dbcb02f3252d
commit 558c4aaf9a7d1f6c6a5df49a6a6deae7ffda751c Author: Sahana Prasad sahana@redhat.com Date: Tue Sep 14 19:13:11 2021 +0200
Rebuilt with OpenSSL 3.0.0
diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec index 0c87d7a..eee2a68 100644 --- a/qt6-qtbase.spec +++ b/qt6-qtbase.spec @@ -44,7 +44,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt6-qtbase Summary: Qt6 - QtBase components Version: 6.2.0%{?unstable:~%{prerelease}} -Release: 2%{?dist} +Release: 3%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -836,6 +836,9 @@ make check -k ||:
%changelog +* Tue Sep 14 2021 Sahana Prasad sahana@redhat.com - 6.2.0~beta4-3 +- Rebuilt with OpenSSL 3.0.0 + * Mon Sep 13 2021 Jan Grulich jgrulich@redhat.com - 6.2.0~beta4-2 - Skip s390x for qtdeclarative issue
commit 4d550dc675b1b517f785328705d26ddc15b47f03 Author: Jan Grulich jgrulich@redhat.com Date: Mon Sep 13 12:20:05 2021 +0200
Skip s390x for qtdeclarative issue
diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec index 0500149..0c87d7a 100644 --- a/qt6-qtbase.spec +++ b/qt6-qtbase.spec @@ -1,3 +1,6 @@ +# FIXME: qt6-qtdeclarative doesn't build on S390x +# BUG: https://bugreports.qt.io/browse/QTBUG-93101 +ExcludeArch: s390x
# See http://bugzilla.redhat.com/223663 %global multilib_archs x86_64 %{ix86} %{?mips} ppc64 ppc s390x s390 sparc64 sparcv9 @@ -41,7 +44,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt6-qtbase Summary: Qt6 - QtBase components Version: 6.2.0%{?unstable:~%{prerelease}} -Release: 1%{?dist} +Release: 2%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -833,6 +836,9 @@ make check -k ||:
%changelog +* Mon Sep 13 2021 Jan Grulich jgrulich@redhat.com - 6.2.0~beta4-2 +- Skip s390x for qtdeclarative issue + * Fri Sep 10 2021 Jan Grulich jgrulich@redhat.com - 6.2.0~beta4-1 - 6.2.0 - beta4
commit ffea66615eea10cdb66e638d284c2f4723e99918 Author: Jan Grulich jgrulich@redhat.com Date: Fri Sep 10 12:01:55 2021 +0200
6.2.0 - beta4
diff --git a/.gitignore b/.gitignore index 0a0fe6e..9feda82 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /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 +/qtbase-everywhere-src-6.2.0-beta4.tar.xz diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec index 56154b8..0500149 100644 --- a/qt6-qtbase.spec +++ b/qt6-qtbase.spec @@ -35,13 +35,13 @@ BuildRequires: pkgconfig(libsystemd)
%global unstable 1 %if 0%{unstable} -%global prerelease beta3 +%global prerelease beta4 %endif
Name: qt6-qtbase Summary: Qt6 - QtBase components Version: 6.2.0%{?unstable:~%{prerelease}} -Release: 4%{?dist} +Release: 1%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -429,7 +429,7 @@ translationdir=%{_qt6_translationdir}
Name: Qt6 Description: Qt6 Configuration -Version: 6.2.0~beta3 +Version: 6.2.0 EOF
# rpm macros @@ -495,7 +495,7 @@ mv %{buildroot}/%{_qt6_libexecdir}/ensure_pro_file.cmake %{buildroot}/%{_qt6_lib %check # verify Qt6.pc export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig -test "$(pkg-config --modversion Qt6)" = "%{version}" +test "$(pkg-config --modversion Qt6)" = "%{qt_version}" %if 0%{?tests} ## see tests/README for expected environment (running a plasma session essentially) ## we are not quite there yet @@ -549,10 +549,10 @@ make check -k ||: %dir %{_qt6_plugindir}/script/ %dir %{_qt6_plugindir}/sqldrivers/ %dir %{_qt6_plugindir}/styles/ -%{_qt6_plugindir}/networkinformation/libnetworkmanager.so +%{_qt6_plugindir}/networkinformation/libqnetworkmanager.so %{_qt6_plugindir}/sqldrivers/libqsqlite.so -%{_qt6_plugindir}/tls/libcertonlybackend.so -%{_qt6_plugindir}/tls/libopensslbackend.so +%{_qt6_plugindir}/tls/libqcertonlybackend.so +%{_qt6_plugindir}/tls/libqopensslbackend.so
%files common # mostly empty for now, consider: filesystem/dir ownership, licenses @@ -833,6 +833,9 @@ make check -k ||:
%changelog +* Fri Sep 10 2021 Jan Grulich jgrulich@redhat.com - 6.2.0~beta4-1 +- 6.2.0 - beta4 + * Wed Sep 08 2021 Rex Dieter rdieter@fedoraproject.org - 6.2.0~beta3-4 - rebuild
diff --git a/sources b/sources index f1dd538..53ccfa3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtbase-everywhere-src-6.2.0-beta3.tar.xz) = b1b671763a626c6c12894576c82cf2a6846cee9a68b78d465b757fcc4dc6ff33d57496e1ab0db548514381d5b328e2a60fd6d424cbcb5f8b42964cf9084fe29d +SHA512 (qtbase-everywhere-src-6.2.0-beta4.tar.xz) = 505bc408682a6004fdc63705d431018c44f4e696f9f7a58a182d6151de29deefbb18e8e8f18973eccc1d863321a2819dc18a9080051216bbe812acb910e43462
commit 37cc28ec23b430b60f2aa4b231051549dfb83e7e Author: Rex Dieter rdieter@gmail.com Date: Wed Sep 8 13:30:41 2021 -0500
rebuild
diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec index 75aa640..56154b8 100644 --- a/qt6-qtbase.spec +++ b/qt6-qtbase.spec @@ -41,7 +41,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt6-qtbase Summary: Qt6 - QtBase components Version: 6.2.0%{?unstable:~%{prerelease}} -Release: 3%{?dist} +Release: 4%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -833,6 +833,9 @@ make check -k ||:
%changelog +* Wed Sep 08 2021 Rex Dieter rdieter@fedoraproject.org - 6.2.0~beta3-4 +- rebuild + * Tue Sep 07 2021 Jan Grulich jgrulich@redhat.com - 6.2.0~beta3-3 - Disable rpath Resolves: bz#1982699
commit 0317c6fabc11b3053ea3d20e47fc59772dff16c5 Author: Jan Grulich jgrulich@redhat.com Date: Tue Sep 7 16:58:28 2021 +0200
Add new files
diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec index f954859..75aa640 100644 --- a/qt6-qtbase.spec +++ b/qt6-qtbase.spec @@ -562,6 +562,7 @@ make check -k ||: %dir %{_qt6_datadir}/modules %dir %{_qt6_libdir}/metatypes %dir %{_qt6_libdir}/cmake/Qt6 +%dir %{_qt6_libdir}/cmake/Qt6/config.tests/ %dir %{_qt6_libdir}/cmake/Qt6/3rdparty/extra-cmake-modules %dir %{_qt6_libdir}/cmake/Qt6/3rdparty/kwin %dir %{_qt6_libdir}/cmake/Qt6BuildInternals @@ -680,6 +681,7 @@ make check -k ||: %{_qt6_libdir}/libQt6EglFsKmsGbmSupport.so %{_qt6_libdir}/cmake/Qt6/*.cmake %{_qt6_libdir}/cmake/Qt6/*.cmake.in +%{_qt6_libdir}/cmake/Qt6/config.tests/* %{_qt6_libdir}/cmake/Qt6/ModuleDescription.json.in %{_qt6_libdir}/cmake/Qt6/QtFileConfigure.txt.in %{_qt6_libdir}/cmake/Qt6/QtSeparateDebugInfo.Info.plist.in
commit 883f4b7410c4416a24b47039523daa6398e33776 Author: Jan Grulich jgrulich@redhat.com Date: Tue Sep 7 15:12:00 2021 +0200
Disable rpath Resolves: bz#1982699
diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec index 1908558..f954859 100644 --- a/qt6-qtbase.spec +++ b/qt6-qtbase.spec @@ -41,7 +41,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt6-qtbase Summary: Qt6 - QtBase components Version: 6.2.0%{?unstable:~%{prerelease}} -Release: 2%{?dist} +Release: 3%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -383,6 +383,7 @@ export MAKEFLAGS="%{?_smp_mflags}" -DQT_FEATURE_sql_mysql=ON \ -DQT_FEATURE_sql_psql=ON \ -DQT_FEATURE_sql_sqlite=ON \ + -DQT_FEATURE_rpath=OFF \ %{?dbus_linked:-DQT_FEATURE_dbus_linked=ON} \ %{?pcre:-DQT_FEATURE_system_pcre2=ON} \ %{?sqlite:-DQT_FEATURE_system_sqlite=ON} \ @@ -491,9 +492,6 @@ 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 @@ -833,6 +831,10 @@ make check -k ||:
%changelog +* Tue Sep 07 2021 Jan Grulich jgrulich@redhat.com - 6.2.0~beta3-3 +- Disable rpath + Resolves: bz#1982699 + * Tue Aug 31 2021 Jan Grulich jgrulich@redhat.com - 6.2.0~beta3-2 - Fix file conflict with qt5-qttools - Rebuild against older libglvnd
commit f4d634ab1867a9d1e1502efffc97d35b2e8193a0 Author: Jan Grulich jgrulich@redhat.com Date: Tue Aug 31 19:18:26 2021 +0200
Fix file conflict with qt5-qttools and rebuild against older libglvnd
diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec index 828ce82..1908558 100644 --- a/qt6-qtbase.spec +++ b/qt6-qtbase.spec @@ -41,7 +41,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt6-qtbase Summary: Qt6 - QtBase components Version: 6.2.0%{?unstable:~%{prerelease}} -Release: 1%{?dist} +Release: 2%{?dist}
# See LGPL_EXCEPTIONS.txt, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -450,7 +450,7 @@ mkdir %{buildroot}%{_bindir} pushd %{buildroot}%{_qt6_bindir} for i in * ; do case "${i}" in - qdbuscpp2xml|qdbusxml2cpp) + qdbuscpp2xml|qdbusxml2cpp|qtpaths) ln -v ${i} %{buildroot}%{_bindir}/${i}-qt6 ;; *) @@ -813,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}/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 +%{_qt6_plugindir}/xcbglintegrations/libqxcb-egl-integration.so %endif # Platforms %{_qt6_plugindir}/platforms/libqlinuxfb.so @@ -833,6 +833,10 @@ make check -k ||:
%changelog +* Tue Aug 31 2021 Jan Grulich jgrulich@redhat.com - 6.2.0~beta3-2 +- Fix file conflict with qt5-qttools +- Rebuild against older libglvnd + * Mon Aug 30 2021 Jan Grulich jgrulich@redhat.com - 6.2.0~beta3-1 - 6.2.0 - beta3
commit ccaa9197e5f1fff342b98a9123dcf1cfe323152b Author: Jan Grulich jgrulich@redhat.com Date: Mon Aug 30 14:26:52 2021 +0200
6.2.0 - beta3
diff --git a/.gitignore b/.gitignore index 86dd337..0a0fe6e 100644 --- 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 diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec index daaaf26..828ce82 100644 --- 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/%%7Bmajmin%7D/%%7Bqt_version%... +%else Source0: https://download.qt.io/official_releases/qt/%%7Bmajmin%7D/%%7Bversion%7D/sub... +%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
diff --git a/qtbase-firebird.patch b/qtbase-firebird.patch index 9f5c7d6..c794304 100644 --- 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 diff --git a/qtbase-no-relocatable.patch b/qtbase-no-relocatable.patch deleted file mode 100644 index c3d555d..0000000 --- a/qtbase-no-relocatable.patch +++ /dev/null @@ -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 diff --git a/sources b/sources index f55dd1a..f1dd538 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtbase-everywhere-src-6.1.2.tar.xz) = 0f9bf5680268c6dc95c10c28297908c9113a7e3e498ba80ed3ba73cc98b809b38fa610ee3b15f367b6ace2f593842db8d27dc7ec2142737574cfa32cdf57ea91 +SHA512 (qtbase-everywhere-src-6.2.0-beta3.tar.xz) = b1b671763a626c6c12894576c82cf2a6846cee9a68b78d465b757fcc4dc6ff33d57496e1ab0db548514381d5b328e2a60fd6d424cbcb5f8b42964cf9084fe29d
arch-excludes@lists.fedoraproject.org
-
githook-noreply＠fedoraproject.org