3 files changed, 64 insertions, 35 deletions
diff --git a/pcr-testing/qt5-styleplugins/PKGBUILD b/pcr-testing/qt5-styleplugins/PKGBUILD
index da35be853..51aab90e6 100644
--- a/pcr-testing/qt5-styleplugins/PKGBUILD
+++ b/pcr-testing/qt5-styleplugins/PKGBUILD
@@ -1,31 +1,41 @@
 # Maintainer: bill-auger <bill-auger@programmer.net>
 # Contributor: Felix Yan <felixonmars@archlinux.org>
-# shellcheck disable=SC2034,SC2154,SC2164
+# Contributor: Eli Schwartz <eschwartz@archlinux.org>
 
-pkgname=('qt5-styleplugins')
+pkgname=(qt5-styleplugins)
 pkgver=5.0.0.20170311
 _commit=335dbece103e2cbf6c7cf819ab6672c2956b17b3
 pkgdesc='Additional style plugins for Qt5'
-pkgrel=11
-pkgrel+=par2
-arch=('i686')
-url="https://code.qt.io/cgit/qt/qtstyleplugins"
+pkgrel=22
+arch=(armv7h i686 x86_64)
+url=https://github.com/qt/qtstyleplugins
 license=('LGPL')
 depends=('qt5-base' 'gtk2')
-source=("$pkgname-$_commit.tar.gz::https://github.com/qt/qtstyleplugins/archive/$_commit.tar.gz")
-sha512sums=('e8c2d0e9c6b0a47cab04ffd2e9384606638905b63a7c1580f9b629bbcc84ebff19743363ffee3dbd31c3de1dcda684211ad3052932b5aa0081e529afd9cbb14d')
+source=(${pkgname}-${_commit}.tar.gz::${url}/archive/${_commit}.tar.gz
+        qt-5.15-fix.patch)
+sha512sums=('e8c2d0e9c6b0a47cab04ffd2e9384606638905b63a7c1580f9b629bbcc84ebff19743363ffee3dbd31c3de1dcda684211ad3052932b5aa0081e529afd9cbb14d'
+            '5295895bed83dc1a7756282b3e1d7ad34ea368dd51695c4da4a1ba857083c374e968378b3fb00216b8afce77dd0ba0659ff4b342bd313e67d446b7fbdfb60913')
 install='install.sh'
 
+
+prepare() {
+    cd qtstyleplugins-${_commit}
+
+    patch -p1 < "${srcdir}"/qt-5.15-fix.patch
+}
+
 build() {
-  cd qtstyleplugins-$_commit
-  qmake PREFIX='/usr' \
-        LIBDIR='/usr/lib' \
-        QMAKE_CFLAGS_RELEASE="$CFLAGS" \
-        QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS"
-  make
+    cd qtstyleplugins-${_commit}
+
+    qmake PREFIX='/usr' \
+          CONFIG+='nostrip' \
+          QMAKE_CFLAGS_RELEASE="$CFLAGS" \
+          QMAKE_CXXFLAGS_RELEASE="$CXXFLAGS"
+    make
 }
 
 package() {
-  cd qtstyleplugins-$_commit
-  make INSTALL_ROOT="$pkgdir" install
+    cd qtstyleplugins-${_commit}
+
+    make INSTALL_ROOT="${pkgdir}" install
 }
diff --git a/pcr-testing/qt5-styleplugins/install.sh b/pcr-testing/qt5-styleplugins/install.sh
index dc88cad41..30913d155 100644
--- a/pcr-testing/qt5-styleplugins/install.sh
+++ b/pcr-testing/qt5-styleplugins/install.sh
@@ -1,20 +1,9 @@
-_5_0_0_2_changes() {
-    echo ':: Upstream added a gtk2 platform theme'
-    # shellcheck disable=SC2016
-    echo '   unexport `QT_STYLE_OVERRIDE`'
-    # shellcheck disable=SC2016
-    echo '   export `QT_QPA_PLATFORMTHEME=gtk2`'
-}
-
-post_upgrade() {
-    local versions=(
-        '5.0.0-2'
-    )
-    local version
-    for version in "${versions[@]}"; do
-        if [[ "$( vercmp "${version}" "${2}" )" -eq 1 ]]; then
-            # shellcheck disable=SC2091
-            "$( printf '_%s_changes' "${version}" | perl -p -e 's/\.|-/_/g' )"
-        fi
-    done
+post_install()
+{
+  echo "Remember to set QT_QPA_PLATFORMTHEME:"
+  echo "  $ export QT_QPA_PLATFORMTHEME=gtk2"
+  echo "... or to make this selectable with qt5ct:"
+  echo "  $ export QT_QPA_PLATFORMTHEME=qt5ct"
+  echo "and ensure that QT_STYLE_OVERRIDE is not set:"
+  echo "  $ unexport QT_STYLE_OVERRIDE"
 }
diff --git a/pcr-testing/qt5-styleplugins/qt-5.15-fix.patch b/pcr-testing/qt5-styleplugins/qt-5.15-fix.patch
new file mode 100644
index 000000000..eff5a3e88
--- /dev/null
+++ b/pcr-testing/qt5-styleplugins/qt-5.15-fix.patch
@@ -0,0 +1,30 @@
+diff --git a/src/plugins/styles/gtk2/qgtkstyle.cpp b/src/plugins/styles/gtk2/qgtkstyle.cpp
+index 36169c9..6138bd2 100644
+--- a/src/plugins/styles/gtk2/qgtkstyle.cpp
++++ b/src/plugins/styles/gtk2/qgtkstyle.cpp
+@@ -440,7 +440,11 @@ 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());
++#else
++        QApplication::setPalette(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();