Hello community,

here is the log from the commit of package libqt5-qtstyleplugins for 
openSUSE:Factory checked in at 2020-03-05 23:25:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtstyleplugins (Old)
 and      /work/SRC/openSUSE:Factory/.libqt5-qtstyleplugins.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libqt5-qtstyleplugins"

Thu Mar  5 23:25:37 2020 rev:11 rq:781891 version:5.0.0+git20170311

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/libqt5-qtstyleplugins/libqt5-qtstyleplugins.changes  
    2018-07-12 09:21:45.994636862 +0200
+++ 
/work/SRC/openSUSE:Factory/.libqt5-qtstyleplugins.new.26092/libqt5-qtstyleplugins.changes
   2020-03-05 23:25:52.837429648 +0100
@@ -1,0 +2,6 @@
+Thu Mar  5 14:51:02 UTC 2020 - Fabian Vogt <[email protected]>
+
+- Add patch to fix build against Qt 5.15:
+  * fix-build-qt5.15.patch
+
+-------------------------------------------------------------------

New:
----
  fix-build-qt5.15.patch

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

Other differences:
------------------
++++++ libqt5-qtstyleplugins.spec ++++++
--- /var/tmp/diff_new_pack.5DifIY/_old  2020-03-05 23:25:55.317431012 +0100
+++ /var/tmp/diff_new_pack.5DifIY/_new  2020-03-05 23:25:55.349431029 +0100
@@ -28,6 +28,8 @@
 Group:          Development/Libraries/X11
 Url:            https://qt.io/
 Source:         %{_name}-opensource-src-%{version}.tar.xz
+# PATCH-FIX-OPENSUSE (for now)
+Patch1:         fix-build-qt5.15.patch
 BuildRequires:  fdupes
 BuildRequires:  libQt5Core-private-headers-devel >= %{qt_version}
 BuildRequires:  libQt5Gui-private-headers-devel >= %{qt_version}
@@ -70,7 +72,7 @@
 You need this package, if you want to compile programs with qtstyleplugins.
 
 %prep
-%setup -q -n %{_name}-opensource-src-%{version}
+%autosetup -p1 -n %{_name}-opensource-src-%{version}
 
 %build
 %qmake5

++++++ fix-build-qt5.15.patch ++++++
From: Fabian Vogt <[email protected]>
Subject: Fix build against Qt 5.15

With 0a93db4d82c051164923a10e4382b12de9049b45
("Unify application palette handling between QGuiApplication and QApplication")
QApplicationPrivate::setSystemPalette is no longer used and necessary.

Index: 
qtstyleplugins-opensource-src-5.0.0+git20170311/src/plugins/styles/gtk2/qgtkstyle.cpp
===================================================================
--- 
qtstyleplugins-opensource-src-5.0.0+git20170311.orig/src/plugins/styles/gtk2/qgtkstyle.cpp
+++ 
qtstyleplugins-opensource-src-5.0.0+git20170311/src/plugins/styles/gtk2/qgtkstyle.cpp
@@ -440,7 +440,9 @@ void QGtkStyle::polish(QApplication *app
     // not supported as these should be entirely determined by
     // current Gtk settings
     if (app->desktopSettingsAware() && d->isThemeAvailable()) {
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
         QApplicationPrivate::setSystemPalette(standardPalette());
+#endif
         QApplicationPrivate::setSystemFont(d->getThemeFont());
         d->applyCustomPaletteHash();
         if (!d->isKDE4Session())
Index: 
qtstyleplugins-opensource-src-5.0.0+git20170311/src/plugins/styles/gtk2/qgtkstyle_p.cpp
===================================================================
--- 
qtstyleplugins-opensource-src-5.0.0+git20170311.orig/src/plugins/styles/gtk2/qgtkstyle_p.cpp
+++ 
qtstyleplugins-opensource-src-5.0.0+git20170311/src/plugins/styles/gtk2/qgtkstyle_p.cpp
@@ -508,7 +508,9 @@ void QGtkStyleUpdateScheduler::updateThe
       if (oldTheme != QGtkStylePrivate::getThemeName()) {
           oldTheme = QGtkStylePrivate::getThemeName();
           QPalette newPalette = qApp->style()->standardPalette();
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
           QApplicationPrivate::setSystemPalette(newPalette);
+#endif
           QApplication::setPalette(newPalette);
           if (!QGtkStylePrivate::instances.isEmpty()) {
               QGtkStylePrivate::instances.last()->initGtkWidgets();

Reply via email to