svn commit: r541466 - in head/x11-themes/qt5-style-plugins: . files
Tobias C. Berner
tcberner at FreeBSD.org
Wed Jul 8 07:08:08 UTC 2020
Author: tcberner
Date: Wed Jul 8 07:08:07 2020
New Revision: 541466
URL: https://svnweb.freebsd.org/changeset/ports/541466
Log:
x11-themes/qt5-style-plugins: fix build against Qt5.15
- patches obtained from Suse via arch
PR: 247841
Submitted by: rewest <rewestwork at gmail.com>
Added:
head/x11-themes/qt5-style-plugins/files/
head/x11-themes/qt5-style-plugins/files/patch-fix_build_against_qt5.15 (contents, props changed)
Modified:
head/x11-themes/qt5-style-plugins/Makefile
Modified: head/x11-themes/qt5-style-plugins/Makefile
==============================================================================
--- head/x11-themes/qt5-style-plugins/Makefile Wed Jul 8 06:38:52 2020 (r541465)
+++ head/x11-themes/qt5-style-plugins/Makefile Wed Jul 8 07:08:07 2020 (r541466)
@@ -14,8 +14,6 @@ COMMENT= Additional Styles for Qt 5 and KDE
LICENSE= LGPL21
-BROKEN= Not compatible with modern Qt
-
LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2
Added: head/x11-themes/qt5-style-plugins/files/patch-fix_build_against_qt5.15
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-themes/qt5-style-plugins/files/patch-fix_build_against_qt5.15 Wed Jul 8 07:08:07 2020 (r541466)
@@ -0,0 +1,43 @@
+From 335dbece103e2cbf6c7cf819ab6672c2956b17b3 Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fvogt at 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
+--- src/plugins/styles/gtk2/qgtkstyle.cpp
++++ 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
+--- src/plugins/styles/gtk2/qgtkstyle_p.cpp
++++ 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
More information about the svn-ports-head
mailing list