summaryrefslogtreecommitdiff
path: root/pcr-testing
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2020-11-23 22:52:53 -0500
committerbill-auger <mr.j.spam.me@gmail.com>2020-11-23 23:04:45 -0500
commitad36e765afec78a9a490432cd1fed9938dbf10a5 (patch)
treef4a4d0a6b7bd6db6cf3b15b47b03573bb81603d0 /pcr-testing
parentb0ef492015e7338079d1eeba8a78ae473aab40fd (diff)
[qt5-styleplugins]: move to libre - rebuild agianst latest QT5
Diffstat (limited to 'pcr-testing')
-rw-r--r--pcr-testing/qt5-styleplugins/0001-fix-build-against-Qt-5.15.patch44
-rw-r--r--pcr-testing/qt5-styleplugins/0002-fix-gtk2-background.patch25
-rw-r--r--pcr-testing/qt5-styleplugins/PKGBUILD47
-rw-r--r--pcr-testing/qt5-styleplugins/install.sh30
4 files changed, 0 insertions, 146 deletions
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
deleted file mode 100644
index 7eb744158..000000000
--- a/pcr-testing/qt5-styleplugins/0001-fix-build-against-Qt-5.15.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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
-
diff --git a/pcr-testing/qt5-styleplugins/0002-fix-gtk2-background.patch b/pcr-testing/qt5-styleplugins/0002-fix-gtk2-background.patch
deleted file mode 100644
index 888ec0bb4..000000000
--- a/pcr-testing/qt5-styleplugins/0002-fix-gtk2-background.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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
deleted file mode 100644
index 16adcd271..000000000
--- a/pcr-testing/qt5-styleplugins/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# Maintainer: bill-auger <bill-auger@programmer.net>
-# Contributor: Felix Yan <felixonmars@archlinux.org>
-# Contributor: Eli Schwartz <eschwartz@archlinux.org>
-
-pkgname=(qt5-styleplugins)
-pkgver=5.0.0.20170311
-_commit=335dbece103e2cbf6c7cf819ab6672c2956b17b3
-pkgdesc='Additional style plugins for Qt5'
-pkgrel=23
-arch=(armv7h i686 x86_64)
-url="https://github.com/qt/qtstyleplugins"
-license=('LGPL')
-depends=('qt5-base' 'gtk2')
-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}
-
- for p in "$srcdir"/*.patch; do
- patch -p1 < "$p"
- done
-}
-
-build() {
- 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
-}
diff --git a/pcr-testing/qt5-styleplugins/install.sh b/pcr-testing/qt5-styleplugins/install.sh
deleted file mode 100644
index 2951b24a4..000000000
--- a/pcr-testing/qt5-styleplugins/install.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-_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"
-}