From 79aa07568bb3761a5e302f4cd8e5675199300cc0 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Aug 21 2023 08:56:32 +0000 Subject: 0.9.2 --- diff --git a/.gitignore b/.gitignore index 508830c..cec7f2e 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /QGnomePlatform-0.8.4.tar.gz /QGnomePlatform-0.9.0.tar.gz /QGnomePlatform-0.9.1.tar.gz +/QGnomePlatform-0.9.2.tar.gz diff --git a/qgnomeplatform-only-set-qqc2-style-on-qt5.patch b/qgnomeplatform-only-set-qqc2-style-on-qt5.patch deleted file mode 100644 index 50d04f0..0000000 --- a/qgnomeplatform-only-set-qqc2-style-on-qt5.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 1344b7f2db5d9158e94614bccc2298a15fac5ef4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jonah=20Br=C3=BCchert?= -Date: Fri, 12 May 2023 21:10:17 +0200 -Subject: [PATCH] Only set the QtQuick Controls Style on Qt5 (#140) - ---- - src/theme/qgnomeplatformtheme.cpp | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/src/theme/qgnomeplatformtheme.cpp b/src/theme/qgnomeplatformtheme.cpp -index ef395a1..99719a6 100644 ---- a/src/theme/qgnomeplatformtheme.cpp -+++ b/src/theme/qgnomeplatformtheme.cpp -@@ -102,18 +102,17 @@ QGnomePlatformTheme::QGnomePlatformTheme() - return; - } - -- // Unfortunately we only have a way to check this on Qt5 -- // On Qt6 this should just fall back to the Fusion style automatically. - #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) -+ // Unfortunately we only have a way to check this on Qt5 - if (!QQuickStyle::availableStyles().contains(QStringLiteral("org.kde.desktop"))) { - qCWarning(QGnomePlatformThemeLog) << "The desktop style for QtQuick Controls 2 applications" - << "is not available on the system (qqc2-desktop-style)." - << "The application may look broken."; - return; - } --#endif - - QQuickStyle::setStyle(QStringLiteral("org.kde.desktop")); -+#endif - } - - QGnomePlatformTheme::~QGnomePlatformTheme() diff --git a/qgnomeplatform.spec b/qgnomeplatform.spec index f431348..77646d1 100644 --- a/qgnomeplatform.spec +++ b/qgnomeplatform.spec @@ -1,8 +1,8 @@ %bcond qt5 %[%{undefined rhel} || 0%{?rhel} < 10] Name: qgnomeplatform -Version: 0.9.1 -Release: 8%{?dist} +Version: 0.9.2 +Release: 1%{?dist} Summary: Qt Platform Theme aimed to accommodate Gnome settings License: LGPL-2.0-or-later @@ -10,7 +10,6 @@ URL: https://github.com/FedoraQt/QGnomePlatform Source0: https://github.com/FedoraQt/QGnomePlatform/archive/%{version}/QGnomePlatform-%{version}.tar.gz # Upstream patches -Patch0: qgnomeplatform-only-set-qqc2-style-on-qt5.patch BuildRequires: make BuildRequires: pkgconfig(gio-2.0) @@ -46,8 +45,10 @@ Provides: %{name} = %{version}-%{release} Provides: %{name}%{?_isa} = %{version}-%{release} %endif +%if (0%{?fedora} && 0%{?fedora} <= 38) # When GNOME Shell and Qt 5 are installed, we want this by default Supplements: (qt5-qtbase and gnome-shell) +%endif %description qt5 QGnomePlatform is a Qt5 Platform Theme aimed to accommodate as much of @@ -68,8 +69,10 @@ BuildRequires: libadwaita-qt6-devel >= 1.4.1 %{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} Requires: adwaita-qt6%{?_isa} +%if (0%{?fedora} && 0%{?fedora} <= 38) # When GNOME Shell and Qt 6 are installed, we want this by default Supplements: (qt6-qtbase and gnome-shell) +%endif %description qt6 QGnomePlatform is a Qt6 Platform Theme aimed to accommodate as much of @@ -118,6 +121,9 @@ modifying them - making them fit into the environment as well as possible. %exclude %{_datadir}/color-schemes/*.colors %changelog +* Tue Aug 15 2023 Jan Grulich - 0.9.2-1 +- 0.9.2 + * Mon Jul 24 2023 Jan Grulich - 0.9.1-8 - Rebuild (qt6) diff --git a/sources b/sources index 03f9828..7444135 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (QGnomePlatform-0.9.1.tar.gz) = 1b8f5d3241bbaa830858dc256285f91023a6e9f664c9920ebfdaf8bdc759e3c958a22bc52eb3559a86d96007118b8ce5efa900167feb491a60232b365c00784c +SHA512 (QGnomePlatform-0.9.2.tar.gz) = a90caf521eca3d3213b10367b49226e594bd81c78be1198e4d590d44b2026e773319f6784cf1eb9528eee3214ed108ab49d1b85d263a26732873c859fa6e7bc6