diff --git a/.SRCINFO b/.SRCINFO index 2a7503e..4adc328 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,16 +1,18 @@ pkgbase = qt5-styleplugins pkgdesc = Additional style plugins for Qt5 pkgver = 5.0.0.20170311 - pkgrel = 21 + pkgrel = 22 url = https://github.com/qt/qtstyleplugins arch = x86_64 license = LGPL depends = qt5-base depends = gtk2 source = qt5-styleplugins-335dbece103e2cbf6c7cf819ab6672c2956b17b3.tar.gz::https://github.com/qt/qtstyleplugins/archive/335dbece103e2cbf6c7cf819ab6672c2956b17b3.tar.gz - source = fix-build-against-Qt-5.15.patch + source = 0001-fix-build-against-Qt-5.15.patch + source = 0002-fix-gtk2-background.patch sha512sums = e8c2d0e9c6b0a47cab04ffd2e9384606638905b63a7c1580f9b629bbcc84ebff19743363ffee3dbd31c3de1dcda684211ad3052932b5aa0081e529afd9cbb14d sha512sums = f5cedadceb7c4243ba69b5041c6c524223ce742ec9c2c483e706f31e32e9e03e4efb6ed54fa2aada867a7c0145a8f3ec1193377d177c6c77066b5f3ec191e9ce + sha512sums = c39b468c93eaada7d49df9547627fbf91d50292523566ef93287ce0e958b29e6c3635f6e77ad42c4f449a062cc63b68e9f2a24c89524165649f776d205fb5382 pkgname = qt5-styleplugins diff --git a/fix-build-against-Qt-5.15.patch b/0001-fix-build-against-Qt-5.15.patch similarity index 100% rename from fix-build-against-Qt-5.15.patch rename to 0001-fix-build-against-Qt-5.15.patch diff --git a/0002-fix-gtk2-background.patch b/0002-fix-gtk2-background.patch new file mode 100644 index 0000000..888ec0b --- /dev/null +++ b/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/PKGBUILD b/PKGBUILD index 71034a2..825807d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,24 +4,28 @@ pkgname=qt5-styleplugins pkgver=5.0.0.20170311 _commit=335dbece103e2cbf6c7cf819ab6672c2956b17b3 pkgdesc='Additional style plugins for Qt5' -pkgrel=21 +pkgrel=22 arch=('x86_64') url="https://github.com/qt/qtstyleplugins" license=('LGPL') depends=('qt5-base' 'gtk2') source=( "${pkgname}-${_commit}.tar.gz::${url}/archive/${_commit}.tar.gz" - "fix-build-against-Qt-5.15.patch" + "0001-fix-build-against-Qt-5.15.patch" + "0002-fix-gtk2-background.patch" ) sha512sums=( 'e8c2d0e9c6b0a47cab04ffd2e9384606638905b63a7c1580f9b629bbcc84ebff19743363ffee3dbd31c3de1dcda684211ad3052932b5aa0081e529afd9cbb14d' 'f5cedadceb7c4243ba69b5041c6c524223ce742ec9c2c483e706f31e32e9e03e4efb6ed54fa2aada867a7c0145a8f3ec1193377d177c6c77066b5f3ec191e9ce' + 'c39b468c93eaada7d49df9547627fbf91d50292523566ef93287ce0e958b29e6c3635f6e77ad42c4f449a062cc63b68e9f2a24c89524165649f776d205fb5382' ) prepare() { cd qtstyleplugins-${_commit} - patch -p1 < "$srcdir/fix-build-against-Qt-5.15.patch" + for p in "$srcdir"/*.patch; do + patch -p1 < "$p" + done } build() {