summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Matteo Bernardini2020-06-17 15:17:22 +0200
committer Matteo Bernardini2021-03-06 10:48:23 +0100
commitdf70520033c871f8935f78beb6cd3c35e9015544 (patch)
treeae62ecb7ba20fcf36ccb3d138971c94e6e544ba7
parent3c59cb22425adf5d8a0d1a79baf00e6d9334c620 (diff)
downloadslackbuilds-qt5-styleplugins.tar.gz
libraries/qt5-styleplugins: Patch for qt-5.15.x.qt5-styleplugins
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
-rw-r--r--libraries/qt5-styleplugins/patches/0001-fix-build-against-Qt-5.15.patch44
-rw-r--r--libraries/qt5-styleplugins/patches/0002-fix-gtk2-background.patch25
-rw-r--r--libraries/qt5-styleplugins/qt5-styleplugins.SlackBuild3
3 files changed, 72 insertions, 0 deletions
diff --git a/libraries/qt5-styleplugins/patches/0001-fix-build-against-Qt-5.15.patch b/libraries/qt5-styleplugins/patches/0001-fix-build-against-Qt-5.15.patch
new file mode 100644
index 0000000000..7eb7441582
--- /dev/null
+++ b/libraries/qt5-styleplugins/patches/0001-fix-build-against-Qt-5.15.patch
@@ -0,0 +1,44 @@
+From 335dbece103e2cbf6c7cf819ab6672c2956b17b3 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fvogt@suse.de>
+Date: Thu, 28 May 2020 12:35:42 +0200
+Subject: [PATCH] fix build against Qt 5.15
+
+With 0a93db4d82c051164923a10e4382b12de9049b45 ("Unify application
+palette handling between QGuiApplication and QApplication")
+QApplicationPrivate::setSystemPalette is no longer used and necessary.
+---
+ src/plugins/styles/gtk2/qgtkstyle.cpp | 2 ++
+ src/plugins/styles/gtk2/qgtkstyle_p.cpp | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/src/plugins/styles/gtk2/qgtkstyle.cpp b/src/plugins/styles/gtk2/qgtkstyle.cpp
+index 36169c9..2544593 100644
+--- a/src/plugins/styles/gtk2/qgtkstyle.cpp
++++ b/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())
+diff --git a/src/plugins/styles/gtk2/qgtkstyle_p.cpp b/src/plugins/styles/gtk2/qgtkstyle_p.cpp
+index e57b3d8..e71beb0 100644
+--- a/src/plugins/styles/gtk2/qgtkstyle_p.cpp
++++ b/src/plugins/styles/gtk2/qgtkstyle_p.cpp
+@@ -508,7 +508,9 @@ void QGtkStyleUpdateScheduler::updateTheme()
+ 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();
+--
+2.26.2
+
diff --git a/libraries/qt5-styleplugins/patches/0002-fix-gtk2-background.patch b/libraries/qt5-styleplugins/patches/0002-fix-gtk2-background.patch
new file mode 100644
index 0000000000..888ec0bb4b
--- /dev/null
+++ b/libraries/qt5-styleplugins/patches/0002-fix-gtk2-background.patch
@@ -0,0 +1,25 @@
+From 20b0985a77df913585628d49a3b541fb957ae366 Mon Sep 17 00:00:00 2001
+From: gamezelda
+Date: Thu, 4 Jun 2020 00:06:50 +0200
+Subject: [PATCH] fix setting background palette
+
+---
+ src/plugins/styles/gtk2/qgtkstyle.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/plugins/styles/gtk2/qgtkstyle.cpp b/src/plugins/styles/gtk2/qgtkstyle.cpp
+index 2544593..6138bd2 100644
+--- a/src/plugins/styles/gtk2/qgtkstyle.cpp
++++ b/src/plugins/styles/gtk2/qgtkstyle.cpp
+@@ -442,6 +442,8 @@ void QGtkStyle::polish(QApplication *app)
+ if (app->desktopSettingsAware() && d->isThemeAvailable()) {
+ #if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
+ QApplicationPrivate::setSystemPalette(standardPalette());
++#else
++ QApplication::setPalette(standardPalette());
+ #endif
+ QApplicationPrivate::setSystemFont(d->getThemeFont());
+ d->applyCustomPaletteHash();
+--
+2.27.0
+
diff --git a/libraries/qt5-styleplugins/qt5-styleplugins.SlackBuild b/libraries/qt5-styleplugins/qt5-styleplugins.SlackBuild
index cd15a4d5a3..acc2eb3f95 100644
--- a/libraries/qt5-styleplugins/qt5-styleplugins.SlackBuild
+++ b/libraries/qt5-styleplugins/qt5-styleplugins.SlackBuild
@@ -72,6 +72,9 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+# Apply patches from Archlinux for qt-5.15.x
+for i in $CWD/patches/* ; do patch -p1 < $i ; done
+
# Force linking against Qt5DBus or build will fail
sed -i "s|2.0$|2.0 Qt5DBus|" src/plugins/platformthemes/gtk2/gtk2.pro