From ee4dda8030e73485ce191c636fbf85bbf917f7cb Mon Sep 17 00:00:00 2001 From: bill-auger Date: Sun, 13 Sep 2020 07:41:22 -0400 Subject: [qt5-styleplugins]: rebuild against latest qt5-base --- .../0001-fix-build-against-Qt-5.15.patch | 44 ++++++++++++++++++++++ .../0002-fix-gtk2-background.patch | 25 ++++++++++++ pcr-testing/qt5-styleplugins/PKGBUILD | 24 +++++++----- pcr-testing/qt5-styleplugins/install.sh | 21 +++++++++++ pcr-testing/qt5-styleplugins/qt-5.15-fix.patch | 30 --------------- 5 files changed, 105 insertions(+), 39 deletions(-) create mode 100644 pcr-testing/qt5-styleplugins/0001-fix-build-against-Qt-5.15.patch create mode 100644 pcr-testing/qt5-styleplugins/0002-fix-gtk2-background.patch delete mode 100644 pcr-testing/qt5-styleplugins/qt-5.15-fix.patch diff --git a/pcr-testing/qt5-styleplugins/0001-fix-build-against-Qt-5.15.patch b/pcr-testing/qt5-styleplugins/0001-fix-build-against-Qt-5.15.patch new file mode 100644 index 000000000..7eb744158 --- /dev/null +++ b/pcr-testing/qt5-styleplugins/0001-fix-build-against-Qt-5.15.patch @@ -0,0 +1,44 @@ +From 335dbece103e2cbf6c7cf819ab6672c2956b17b3 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +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/pcr-testing/qt5-styleplugins/0002-fix-gtk2-background.patch b/pcr-testing/qt5-styleplugins/0002-fix-gtk2-background.patch new file mode 100644 index 000000000..888ec0bb4 --- /dev/null +++ b/pcr-testing/qt5-styleplugins/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/pcr-testing/qt5-styleplugins/PKGBUILD b/pcr-testing/qt5-styleplugins/PKGBUILD index 51aab90e6..16adcd271 100644 --- a/pcr-testing/qt5-styleplugins/PKGBUILD +++ b/pcr-testing/qt5-styleplugins/PKGBUILD @@ -6,22 +6,28 @@ pkgname=(qt5-styleplugins) pkgver=5.0.0.20170311 _commit=335dbece103e2cbf6c7cf819ab6672c2956b17b3 pkgdesc='Additional style plugins for Qt5' -pkgrel=22 +pkgrel=23 arch=(armv7h i686 x86_64) -url=https://github.com/qt/qtstyleplugins +url="https://github.com/qt/qtstyleplugins" license=('LGPL') depends=('qt5-base' 'gtk2') -source=(${pkgname}-${_commit}.tar.gz::${url}/archive/${_commit}.tar.gz - qt-5.15-fix.patch) -sha512sums=('e8c2d0e9c6b0a47cab04ffd2e9384606638905b63a7c1580f9b629bbcc84ebff19743363ffee3dbd31c3de1dcda684211ad3052932b5aa0081e529afd9cbb14d' - '5295895bed83dc1a7756282b3e1d7ad34ea368dd51695c4da4a1ba857083c374e968378b3fb00216b8afce77dd0ba0659ff4b342bd313e67d446b7fbdfb60913') -install='install.sh' - +source=( + "${pkgname}-${_commit}.tar.gz::${url}/archive/${_commit}.tar.gz" + "0001-fix-build-against-Qt-5.15.patch" + "0002-fix-gtk2-background.patch" +) +sha512sums=( + 'e8c2d0e9c6b0a47cab04ffd2e9384606638905b63a7c1580f9b629bbcc84ebff19743363ffee3dbd31c3de1dcda684211ad3052932b5aa0081e529afd9cbb14d' + 'f5cedadceb7c4243ba69b5041c6c524223ce742ec9c2c483e706f31e32e9e03e4efb6ed54fa2aada867a7c0145a8f3ec1193377d177c6c77066b5f3ec191e9ce' + 'c39b468c93eaada7d49df9547627fbf91d50292523566ef93287ce0e958b29e6c3635f6e77ad42c4f449a062cc63b68e9f2a24c89524165649f776d205fb5382' +) prepare() { cd qtstyleplugins-${_commit} - patch -p1 < "${srcdir}"/qt-5.15-fix.patch + for p in "$srcdir"/*.patch; do + patch -p1 < "$p" + done } build() { diff --git a/pcr-testing/qt5-styleplugins/install.sh b/pcr-testing/qt5-styleplugins/install.sh index 30913d155..2951b24a4 100644 --- a/pcr-testing/qt5-styleplugins/install.sh +++ b/pcr-testing/qt5-styleplugins/install.sh @@ -1,3 +1,24 @@ +_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:" diff --git a/pcr-testing/qt5-styleplugins/qt-5.15-fix.patch b/pcr-testing/qt5-styleplugins/qt-5.15-fix.patch deleted file mode 100644 index eff5a3e88..000000000 --- a/pcr-testing/qt5-styleplugins/qt-5.15-fix.patch +++ /dev/null @@ -1,30 +0,0 @@ -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(); -- cgit v1.2.3