Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package QGnomePlatform for openSUSE:Factory 
checked in at 2023-04-07 18:16:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/QGnomePlatform (Old)
 and      /work/SRC/openSUSE:Factory/.QGnomePlatform.new.19717 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "QGnomePlatform"

Fri Apr  7 18:16:57 2023 rev:12 rq:1077790 version:0.9.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/QGnomePlatform/QGnomePlatform.changes    
2023-03-03 22:31:42.124106688 +0100
+++ /work/SRC/openSUSE:Factory/.QGnomePlatform.new.19717/QGnomePlatform.changes 
2023-04-07 18:17:01.256785508 +0200
@@ -1,0 +2,6 @@
+Thu Apr  6 17:53:47 UTC 2023 - Simon Vogl <simon.v...@gmx.net>
+
+- Add 0001-fix-qt-6.5-compilation.patch to fix a compilation
+  error with qt 6.5
+
+-------------------------------------------------------------------

New:
----
  0001-fix-qt-6.5-compilation.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ QGnomePlatform.spec ++++++
--- /var/tmp/diff_new_pack.6OStgW/_old  2023-04-07 18:17:01.796788618 +0200
+++ /var/tmp/diff_new_pack.6OStgW/_new  2023-04-07 18:17:01.800788641 +0200
@@ -73,6 +73,8 @@
 URL:            https://github.com/FedoraQt/QGnomePlatform/
 Source:         
%{url}/archive/%{version}.tar.gz#/QGnomePlatform-%{version}.tar.gz
 Patch0:         fix-XSetTransientForHint.patch
+# PATCH-FIX-UPSTREAM 0001-fix-qt-6.5-compilation.patch -- Fix build with qt-6.5
+Patch1:         0001-fix-qt-6.5-compilation.patch
 
 BuildRequires:  cmake
 BuildRequires:  gcc-c++

++++++ 0001-fix-qt-6.5-compilation.patch ++++++
>From c8000cb16705ac17717fd2b40a979ed5d9792df1 Mon Sep 17 00:00:00 2001
From: Jan Grulich <jgrul...@redhat.com>
Date: Tue, 4 Apr 2023 14:39:44 +0200
Subject: [PATCH] Fix build against Qt 6.5 (#133)

---
 src/theme/qgnomeplatformtheme.cpp | 13 +++++++++----
 src/theme/qgnomeplatformtheme.h   |  6 ++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/theme/qgnomeplatformtheme.cpp 
b/src/theme/qgnomeplatformtheme.cpp
index 4fa6003..ef395a1 100644
--- a/src/theme/qgnomeplatformtheme.cpp
+++ b/src/theme/qgnomeplatformtheme.cpp
@@ -87,7 +87,7 @@ QGnomePlatformTheme::QGnomePlatformTheme()
     g_type_ensure(PANGO_TYPE_FONT_FAMILY);
     g_type_ensure(PANGO_TYPE_FONT_FACE);
 
-#if QT_VERSION > 0x060000
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     // Load QGnomeTheme
     m_platformTheme = 
QGenericUnixTheme::createUnixTheme(QLatin1String("gnome"));
 #endif
@@ -175,7 +175,7 @@ QPlatformDialogHelper 
*QGnomePlatformTheme::createPlatformDialogHelper(QPlatform
     }
 }
 
-#if QT_VERSION < 0x060000
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #ifndef QT_NO_SYSTEMTRAYICON
 static bool isDBusTrayAvailable()
 {
@@ -196,7 +196,7 @@ static bool isDBusTrayAvailable()
 #ifndef QT_NO_SYSTEMTRAYICON
 QPlatformSystemTrayIcon *QGnomePlatformTheme::createPlatformSystemTrayIcon() 
const
 {
-#if QT_VERSION < 0x060000
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     if (isDBusTrayAvailable()) {
         return new QDBusTrayIcon();
     }
@@ -209,7 +209,12 @@ QPlatformSystemTrayIcon 
*QGnomePlatformTheme::createPlatformSystemTrayIcon() con
 }
 #endif
 
-#if QT_VERSION > 0x060300
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+Qt::ColorScheme QGnomePlatformTheme::colorScheme() const
+{
+    return GnomeSettings::getInstance().useGtkThemeDarkVariant() ? 
Qt::ColorScheme::Dark : Qt::ColorScheme::Light;
+}
+#elif QT_VERSION >= QT_VERSION_CHECK(6, 3, 0)
 QPlatformTheme::Appearance QGnomePlatformTheme::appearance() const
 {
     return GnomeSettings::getInstance().useGtkThemeDarkVariant() ? 
Appearance::Dark : Appearance::Light;
diff --git a/src/theme/qgnomeplatformtheme.h b/src/theme/qgnomeplatformtheme.h
index 342909f..a37475d 100644
--- a/src/theme/qgnomeplatformtheme.h
+++ b/src/theme/qgnomeplatformtheme.h
@@ -39,12 +39,14 @@ class QGnomePlatformTheme : public QPlatformTheme
 #ifndef QT_NO_SYSTEMTRAYICON
     QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const 
Q_DECL_OVERRIDE;
 #endif
-#if QT_VERSION > 0x060300
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
+    Qt::ColorScheme colorScheme() const Q_DECL_OVERRIDE;
+#elif QT_VERSION >= QT_VERSION_CHECK(6, 3, 0)
     QPlatformTheme::Appearance appearance() const Q_DECL_OVERRIDE;
 #endif
 
 private:
-#if QT_VERSION > 0x060000
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
     // Used to load Qt's internall platform theme to get access to
     // non-public stuff, like QDBusTrayIcon
     QPlatformTheme *m_platformTheme = nullptr;

Reply via email to