Updated patch

This commit is contained in:
TheCynicalLiger 2020-05-28 15:11:48 +01:00
parent 3cbb384861
commit 9bb5f88cd6
3 changed files with 62 additions and 4 deletions

View File

@ -1,14 +1,16 @@
pkgbase = qt5-styleplugins pkgbase = qt5-styleplugins
pkgdesc = Additional style plugins for Qt5 pkgdesc = Additional style plugins for Qt5
pkgver = 5.0.0.20170311 pkgver = 5.0.0.20170311
pkgrel = 20 pkgrel = 21
url = https://github.com/qt/qtstyleplugins url = https://github.com/qt/qtstyleplugins
arch = x86_64 arch = x86_64
license = LGPL license = LGPL
depends = qt5-base depends = qt5-base
depends = gtk2 depends = gtk2
source = qt5-styleplugins-335dbece103e2cbf6c7cf819ab6672c2956b17b3.tar.gz::https://github.com/qt/qtstyleplugins/archive/335dbece103e2cbf6c7cf819ab6672c2956b17b3.tar.gz source = qt5-styleplugins-335dbece103e2cbf6c7cf819ab6672c2956b17b3.tar.gz::https://github.com/qt/qtstyleplugins/archive/335dbece103e2cbf6c7cf819ab6672c2956b17b3.tar.gz
source = fix-build-against-Qt-5.15.patch
sha512sums = e8c2d0e9c6b0a47cab04ffd2e9384606638905b63a7c1580f9b629bbcc84ebff19743363ffee3dbd31c3de1dcda684211ad3052932b5aa0081e529afd9cbb14d sha512sums = e8c2d0e9c6b0a47cab04ffd2e9384606638905b63a7c1580f9b629bbcc84ebff19743363ffee3dbd31c3de1dcda684211ad3052932b5aa0081e529afd9cbb14d
sha512sums = f5cedadceb7c4243ba69b5041c6c524223ce742ec9c2c483e706f31e32e9e03e4efb6ed54fa2aada867a7c0145a8f3ec1193377d177c6c77066b5f3ec191e9ce
pkgname = qt5-styleplugins pkgname = qt5-styleplugins

View File

@ -4,13 +4,25 @@ pkgname=qt5-styleplugins
pkgver=5.0.0.20170311 pkgver=5.0.0.20170311
_commit=335dbece103e2cbf6c7cf819ab6672c2956b17b3 _commit=335dbece103e2cbf6c7cf819ab6672c2956b17b3
pkgdesc='Additional style plugins for Qt5' pkgdesc='Additional style plugins for Qt5'
pkgrel=20 pkgrel=21
arch=('x86_64') arch=('x86_64')
url="https://github.com/qt/qtstyleplugins" url="https://github.com/qt/qtstyleplugins"
license=('LGPL') license=('LGPL')
depends=('qt5-base' 'gtk2') depends=('qt5-base' 'gtk2')
source=("${pkgname}-${_commit}.tar.gz::${url}/archive/${_commit}.tar.gz") source=(
sha512sums=('e8c2d0e9c6b0a47cab04ffd2e9384606638905b63a7c1580f9b629bbcc84ebff19743363ffee3dbd31c3de1dcda684211ad3052932b5aa0081e529afd9cbb14d') "${pkgname}-${_commit}.tar.gz::${url}/archive/${_commit}.tar.gz"
"fix-build-against-Qt-5.15.patch"
)
sha512sums=(
'e8c2d0e9c6b0a47cab04ffd2e9384606638905b63a7c1580f9b629bbcc84ebff19743363ffee3dbd31c3de1dcda684211ad3052932b5aa0081e529afd9cbb14d'
'f5cedadceb7c4243ba69b5041c6c524223ce742ec9c2c483e706f31e32e9e03e4efb6ed54fa2aada867a7c0145a8f3ec1193377d177c6c77066b5f3ec191e9ce'
)
prepare() {
cd qtstyleplugins-${_commit}
patch -p1 < "$srcdir/fix-build-against-Qt-5.15.patch"
}
build() { build() {
cd qtstyleplugins-${_commit} cd qtstyleplugins-${_commit}

View File

@ -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