summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorIlya Fedin2024-10-02 07:16:00 +0400
committerIlya Fedin2024-10-02 07:16:00 +0400
commitb7df72a1283fd880c1722ba29705201bbac90a6a (patch)
treed87f596fae9264ab9320d3b38a1628295a6ec149
parent246e821fdf0557ed7ff01c63798111a681d59d54 (diff)
downloadaur-b7df72a1283fd880c1722ba29705201bbac90a6a.tar.gz
Update KColorScheme before QPalette
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rw-r--r--qt5ct-shenanigans.patch10
3 files changed, 9 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b15961850e4b..afcc7a7e7c06 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = qt5ct-kde
pkgdesc = Qt5 Configuration Utility, patched to work correctly with KDE applications
pkgver = 1.8
- pkgrel = 9
+ pkgrel = 10
url = https://qt5ct.sourceforge.io/
arch = x86_64
license = BSD
@@ -13,6 +13,6 @@ pkgbase = qt5ct-kde
source = https://downloads.sourceforge.net/project/qt5ct/qt5ct-1.8.tar.bz2
source = qt5ct-shenanigans.patch
sha256sums = 23b74054415ea4124328772ef9a6f95083a9b86569e128034a3ff75dfad808e9
- sha256sums = a9210ed2aa5d98c13033d3a670d4246dedb44b2ff7947c41c0d269278cc939ef
+ sha256sums = 7daba5f5c67bbb8f8e76ebb5b04eb791b2c899f3ad05ae5bd7815dc91cf729fd
pkgname = qt5ct-kde
diff --git a/PKGBUILD b/PKGBUILD
index 9ab6bbac77d5..34053d0d0138 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=qt5ct-kde
_pkgname=qt5ct
pkgver=1.8
-pkgrel=9
+pkgrel=10
pkgdesc='Qt5 Configuration Utility, patched to work correctly with KDE applications'
arch=(x86_64)
url='https://qt5ct.sourceforge.io/'
@@ -17,7 +17,7 @@ provides=($_pkgname)
source=(https://downloads.sourceforge.net/project/$_pkgname/$_pkgname-$pkgver.tar.bz2
$_pkgname-shenanigans.patch)
sha256sums=('23b74054415ea4124328772ef9a6f95083a9b86569e128034a3ff75dfad808e9'
- 'a9210ed2aa5d98c13033d3a670d4246dedb44b2ff7947c41c0d269278cc939ef')
+ '7daba5f5c67bbb8f8e76ebb5b04eb791b2c899f3ad05ae5bd7815dc91cf729fd')
prepare() {
patch -d $_pkgname-$pkgver -p1 < $_pkgname-shenanigans.patch # The magic
diff --git a/qt5ct-shenanigans.patch b/qt5ct-shenanigans.patch
index 85a223c07557..a4975c62bcb1 100644
--- a/qt5ct-shenanigans.patch
+++ b/qt5ct-shenanigans.patch
@@ -252,16 +252,16 @@ Index: qt5ct/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp
void Qt5CTPlatformTheme::applySettings()
{
if(!QGuiApplication::desktopSettingsAware() || m_isIgnored)
-@@ -245,6 +258,9 @@
- if(m_palette && m_usePalette)
- QGuiApplication::setPalette(*m_palette); //apply palette
+@@ -204,6 +217,9 @@
+ }
+ }
+ if(Qt5CT::isKColorScheme(m_schemePath))
+ qApp->setProperty("KDE_COLOR_SCHEME_PATH", m_schemePath);
+
#ifdef QT_WIDGETS_LIB
- if(m_palette && m_usePalette && !m_update)
- qApp->setPalette(*m_palette);
+ if(hasWidgets())
+ {
@@ -295,12 +311,11 @@
settings.beginGroup("Appearance");