diff --git a/.gitignore b/.gitignore index ef57410..b90940e 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,7 @@ /qtbase-everywhere-src-6.2.3.tar.xz /qtbase-everywhere-src-6.3.0.tar.xz /qtbase-everywhere-src-6.3.1.tar.xz +/qtbase-everywhere-src-6.4.0.tar.xz +/qtbase-everywhere-src-6.4.1.tar.xz +/qtbase-everywhere-src-6.4.2.tar.xz +/qtbase-everywhere-src-6.4.3.tar.xz diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec index 3ed8430..51ac929 100644 --- a/qt6-qtbase.spec +++ b/qt6-qtbase.spec @@ -38,11 +38,10 @@ BuildRequires: pkgconfig(libsystemd) Name: qt6-qtbase Summary: Qt6 - QtBase components -Version: 6.3.1 -Release: 3%{?dist} +Version: 6.4.3 +Release: 2%{?dist} -# See LGPL_EXCEPTIONS.txt, for exception details -License: LGPLv2 with exceptions or GPLv3 with exceptions +License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 Url: http://qt-project.org/ %global majmin %(echo %{version} | cut -d. -f1-2) %global qt_version %(echo %{version} | cut -d~ -f1) @@ -72,6 +71,7 @@ Source10: macros.qt6-qtbase # 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 # namespace QT_VERSION_CHECK to workaround major/minor being pre-defined (#1396755) @@ -100,7 +100,6 @@ Patch90: qtbase-gcc11.patch ## upstream patches - # Do not check any files in %%{_qt6_plugindir}/platformthemes/ for requires. # Those themes are there for platform integration. If the required libraries are # not there, the platform to integrate with isn't either. Then Qt will just @@ -125,6 +124,7 @@ BuildRequires: libb2-devel BuildRequires: libjpeg-devel BuildRequires: libmng-devel BuildRequires: libtiff-devel +BuildRequires: libzstd-devel BuildRequires: tslib-devel BuildRequires: pkgconfig(alsa) # required for -accessibility @@ -226,6 +226,15 @@ Requires: qt6-rpm-macros %if 0%{?use_clang} Requires: clang >= 3.7.0 %endif +%if 0%{?no_ibase} == 0 +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}. @@ -285,7 +294,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %package postgresql Summary: PostgreSQL driver for Qt6's SQL classes -BuildRequires: postgresql-server-devel +BuildRequires: libpq-devel Requires: %{name}%{?_isa} = %{version}-%{release} %description postgresql %{summary}. @@ -378,6 +387,7 @@ export MAKEFLAGS="%{?_smp_mflags}" -DQT_FEATURE_sql_psql=ON \ -DQT_FEATURE_sql_sqlite=ON \ -DQT_FEATURE_rpath=OFF \ + -DQT_FEATURE_zstd=ON \ %{?dbus_linked:-DQT_FEATURE_dbus_linked=ON} \ %{?pcre:-DQT_FEATURE_system_pcre2=ON} \ %{?sqlite:-DQT_FEATURE_system_sqlite=ON} \ @@ -423,7 +433,7 @@ translationdir=%{_qt6_translationdir} Name: Qt6 Description: Qt6 Configuration -Version: 6.3.1 +Version: 6.4.3 EOF # rpm macros @@ -508,9 +518,8 @@ make check -k ||: %ldconfig_scriptlets %files -%license LICENSE.FDL -%license LICENSE.GPL* -%license LICENSE.LGPL* +%license LICENSES/GPL* +%license LICENSES/LGPL* %dir %{_sysconfdir}/xdg/QtProject/ %{_qt6_libdir}/libQt6Concurrent.so.6* %{_qt6_libdir}/libQt6Core.so.6* @@ -836,6 +845,47 @@ make check -k ||: %changelog +* Mon Apr 03 2023 Jan Grulich - 6.4.3-2 +- Enable zstd support + +* Thu Mar 23 2023 Jan Grulich - 6.4.3-1 +- 6.4.3 + +* Sun Mar 05 2023 Jan grulich - 6.4.2-5 +- Use QGnomePlatform as default platform theme on GNOME + Resolves: bz#2174905 + +* Wed Feb 08 2023 Jan Grulich - 6.4.2-4 +- Fix possible DOS involving the Qt SQL ODBC driver plugin + CVE-2023-24607 + +* Tue Jan 31 2023 Jan Grulich - 6.4.2-3 +- migrated to SPDX license + +* Fri Jan 20 2023 Fedora Release Engineering - 6.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Jan 16 2023 Jan Grulich - 6.4.2-1 +- 6.4.2 + +* Mon Jan 02 2023 Jan Grulich - 6.4.1-4 +- Make -devel package to require database plugins + +* Sat Dec 31 2022 Pete Walter - 6.4.1-3 +- Rebuild for ICU 72 + +* Wed Nov 30 2022 Pavel Raiskup - 6.4.1-2 +- rebuild for the new PostgreSQL 15 + +* Wed Nov 23 2022 Jan Grulich - 6.4.1-1 +- 6.4.1 + +* Mon Oct 31 2022 Jan Grulich - 6.4.0-1 +- 6.4.0 + +* Mon Aug 01 2022 Frantisek Zatloukal - 6.3.1-4 +- Rebuilt for ICU 71.1 + * Fri Jul 29 2022 Jan Grulich - 6.3.1-3 - Fix moc location in pkgconfig file Resolves: bz#2112029 diff --git a/qtbase-use-qgnomeplatform-as-default-platform-theme-on-gnome.patch b/qtbase-use-qgnomeplatform-as-default-platform-theme-on-gnome.patch new file mode 100644 index 0000000..82461d5 --- /dev/null +++ b/qtbase-use-qgnomeplatform-as-default-platform-theme-on-gnome.patch @@ -0,0 +1,12 @@ +diff --git a/src/gui/platform/unix/qgenericunixthemes.cpp b/src/gui/platform/unix/qgenericunixthemes.cpp +index 1efd759b..d0129f73 100644 +--- a/src/gui/platform/unix/qgenericunixthemes.cpp ++++ b/src/gui/platform/unix/qgenericunixthemes.cpp +@@ -977,6 +977,7 @@ QStringList QGenericUnixTheme::themeNames() + result.push_back(QLatin1StringView(QKdeTheme::name)); + #endif + } else if (gtkBasedEnvironments.contains(desktopName)) { ++ result.push_back(QStringLiteral("qgnomeplatform")); + // prefer the GTK3 theme implementation with native dialogs etc. + result.push_back(QStringLiteral("gtk3")); + // fallback to the generic Gnome theme if loading the GTK3 theme fails diff --git a/sources b/sources index 75caf03..4888dc5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtbase-everywhere-src-6.3.1.tar.xz) = 5c4304dc1f5fa80201b61c9c8dbf4c3449506a243ea1f87e336dc3641a37b9d40c2aa4a93190cc69ddde0f349c74e327c35de5f46de888ddfd49616903e8a7b5 +SHA512 (qtbase-everywhere-src-6.4.3.tar.xz) = a2d0779ba7ee8b8b78f5dc8db06177d04d50463fea7cad0b7785721acfc33dbbbaa1a7bfc052edb90ba1d11b488c30004daa43b6924a97126b9b8f82ad1a7f43