saundersp/saundersp-overlay
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated gui-apps/qt6ct-kde-0.11-r4 to 0.11-r5

Browse Source
This commit is contained in:
saundersp
2025-11-01 15:22:19 +01:00
parent e7eba06f23
commit 2df3c1e869
4 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gui-apps/qt6ct-kde/Manifest
View File

@@ -1,4 +1,4 @@
AUX qt6ct-kde-0.11-r4.patch 32303 BLAKE2B f9b3fa88e77582f9c3e98e6c043a9f2cce21c7444a1e87a024c976445b1cc48464d17cf5f5670e5be86583be51cdfc6652d505c734a8d39d44ad3404f1b6adda SHA512 bdab42b50d56ddc56a5f6b77ec7527e9fa252b409ca5de668d40c55a0e9e02c02f976fbe497667fbfd8e468ae1e53d7a2d8fb7ea1b612241aec4e6380c1c7f02 AUX qt6ct-kde-0.11-r5.patch 32478 BLAKE2B 429205534124bbcfb631fc86e2706f97d1e85497bc303af32414abdf6e8e0949a95997a7f75dcde60e869a34e430bd853ad14342f2e0aa1197ac3987be476bd7 SHA512 1452865e8b0b899ab6ad2729a73aa8c3aea54ffdff5b4c449d8d04d8056d42b118987c7532a127224ddf2dc7627f14eb97162c4f0cd04aee628d7e4559f49150
DIST qt6ct-kde-0.11.tar.gz 154383 BLAKE2B 0baa02ae6b2a0bc6681e9f65a7c09ebc0ba267a72e0bb40294907f8c33adea005bef912660eda7e7108d5e0afc3a399184480121bde158cdb840c1427ed6ebdc SHA512 58d00f658360e7a7dd8d09a6a873bd9b21f112e596a72ce3ca9caeaba2a4336fbba18c93a8bdb1560f2875f40de1991d9500c5c52a8d8621c060f3bcc8d5545f DIST qt6ct-kde-0.11.tar.gz 154383 BLAKE2B 0baa02ae6b2a0bc6681e9f65a7c09ebc0ba267a72e0bb40294907f8c33adea005bef912660eda7e7108d5e0afc3a399184480121bde158cdb840c1427ed6ebdc SHA512 58d00f658360e7a7dd8d09a6a873bd9b21f112e596a72ce3ca9caeaba2a4336fbba18c93a8bdb1560f2875f40de1991d9500c5c52a8d8621c060f3bcc8d5545f
EBUILD qt6ct-kde-0.11-r4.ebuild 1400 BLAKE2B 11667bd56272d724a36035185373d88d5b796ebb5dd2004a987e129534af61d06827ec14128eec5747f8024f85eb6633a6defd1dd91d648599d7ce2006fb9498 SHA512 9e7a57c1e4e22d186aabdcf7f34fc5c7c931fcb8b3b4ff552ccc4eb1c6ae872171bd7fb97f9775443f80c2c87582d36c4b7f8839b4431e177632755454331223 EBUILD qt6ct-kde-0.11-r5.ebuild 1400 BLAKE2B 11667bd56272d724a36035185373d88d5b796ebb5dd2004a987e129534af61d06827ec14128eec5747f8024f85eb6633a6defd1dd91d648599d7ce2006fb9498 SHA512 9e7a57c1e4e22d186aabdcf7f34fc5c7c931fcb8b3b4ff552ccc4eb1c6ae872171bd7fb97f9775443f80c2c87582d36c4b7f8839b4431e177632755454331223
MISC metadata.xml 471 BLAKE2B a2021714574ce0ac3cf571ed8038d5fcbc0e5fdba8575396ef9220d870672da076b1b18ddc6a44f553304aa683208f284f9afd0db9effe387d810284d70a883c SHA512 24ab0e19b9d3c0f202d44f94cff971c4dac2331c927e52af5fda5b44826d0ba4d8d13b20470cd2b0952f3a192708321a867fa9197f62992f066b11b121e295eb MISC metadata.xml 471 BLAKE2B a2021714574ce0ac3cf571ed8038d5fcbc0e5fdba8575396ef9220d870672da076b1b18ddc6a44f553304aa683208f284f9afd0db9effe387d810284d70a883c SHA512 24ab0e19b9d3c0f202d44f94cff971c4dac2331c927e52af5fda5b44826d0ba4d8d13b20470cd2b0952f3a192708321a867fa9197f62992f066b11b121e295eb

47
gui-apps/qt6ct-kde/files/qt6ct-kde-0.11-r4.patch → gui-apps/qt6ct-kde/files/qt6ct-kde-0.11-r5.patch
View File

@@ -194,10 +194,10 @@ index f3e9ef6..a05a9b7 100644
OTHER_FILES += qt6ct.json OTHER_FILES += qt6ct.json
diff --git a/src/qt6ct-qtplugin/qt6ctplatformtheme.cpp b/src/qt6ct-qtplugin/qt6ctplatformtheme.cpp diff --git a/src/qt6ct-qtplugin/qt6ctplatformtheme.cpp b/src/qt6ct-qtplugin/qt6ctplatformtheme.cpp
index 569b13f..0380ea6 100644 index 569b13f..721e7c8 100644
--- a/src/qt6ct-qtplugin/qt6ctplatformtheme.cpp --- a/src/qt6ct-qtplugin/qt6ctplatformtheme.cpp
+++ b/src/qt6ct-qtplugin/qt6ctplatformtheme.cpp +++ b/src/qt6ct-qtplugin/qt6ctplatformtheme.cpp
@@ -41,38 +41,65 @@ @@ -41,38 +41,74 @@
#include <QStyleFactory> #include <QStyleFactory>
#include <QApplication> #include <QApplication>
#include <QWidget> #include <QWidget>
@@ -235,17 +235,26 @@ index 569b13f..0380ea6 100644
+ m_fixedFont(*QGenericUnixTheme::font(QPlatformTheme::FixedFont)) + m_fixedFont(*QGenericUnixTheme::font(QPlatformTheme::FixedFont))
{ {
Qt6CT::initConfig(); Qt6CT::initConfig();
+#ifdef QT_WIDGETS_LIB
+ if(hasWidgets())
+ {
+ //styles such as Kvantum could use default QFont constructor
+ //which results in QGuiApplicationPrivate::app_font initializing
+ //into the wrong font as we haven't finished constructor yet
+ const bool hadFont = QGuiApplicationPrivate::app_font;
+ m_style.reset(QStyleFactory::create(u"qt6ct-style"_s));
+ if(!hadFont && QGuiApplicationPrivate::app_font)
+ {
+ delete QGuiApplicationPrivate::app_font;
+ QGuiApplicationPrivate::app_font = nullptr;
+ }
+ }
+#endif
if(QGuiApplication::desktopSettingsAware()) if(QGuiApplication::desktopSettingsAware())
{ {
readSettings(); readSettings();
- QMetaObject::invokeMethod(this, &Qt6CTPlatformTheme::applySettings, Qt::QueuedConnection); QMetaObject::invokeMethod(this, &Qt6CTPlatformTheme::applySettings, Qt::QueuedConnection);
#ifdef QT_WIDGETS_LIB -#ifdef QT_WIDGETS_LIB
+ if(hasWidgets())
+ QMetaObject::invokeMethod(this, [=] {
+ m_style.reset(QStyleFactory::create(u"qt6ct-style"_s));
+ }, Qt::QueuedConnection);
+#endif
+ QMetaObject::invokeMethod(this, &Qt6CTPlatformTheme::applySettings, Qt::QueuedConnection);
QMetaObject::invokeMethod(this, &Qt6CTPlatformTheme::createFSWatcher, Qt::QueuedConnection); QMetaObject::invokeMethod(this, &Qt6CTPlatformTheme::createFSWatcher, Qt::QueuedConnection);
+ //must be applied before Q_COREAPP_STARTUP_FUNCTION execution + //must be applied before Q_COREAPP_STARTUP_FUNCTION execution
+ if(Qt6CT::isKColorScheme(m_schemePath)) + if(Qt6CT::isKColorScheme(m_schemePath))
@@ -267,7 +276,7 @@ index 569b13f..0380ea6 100644
} }
Qt6CTPlatformTheme::~Qt6CTPlatformTheme() Qt6CTPlatformTheme::~Qt6CTPlatformTheme()
@@ -90,10 +117,41 @@ QPlatformDialogHelper *Qt6CTPlatformTheme::createPlatformDialogHelper(DialogType @@ -90,10 +126,41 @@ QPlatformDialogHelper *Qt6CTPlatformTheme::createPlatformDialogHelper(DialogType
QGenericUnixTheme::createPlatformDialogHelper(type); QGenericUnixTheme::createPlatformDialogHelper(type);
} }
@@ -311,7 +320,7 @@ index 569b13f..0380ea6 100644
return QGenericUnixTheme::palette(type); return QGenericUnixTheme::palette(type);
} }
@@ -148,6 +206,13 @@ QIcon Qt6CTPlatformTheme::fileIcon(const QFileInfo &fileInfo, QPlatformTheme::Ic @@ -148,6 +215,13 @@ QIcon Qt6CTPlatformTheme::fileIcon(const QFileInfo &fileInfo, QPlatformTheme::Ic
return QIcon::fromTheme(type.iconName()); return QIcon::fromTheme(type.iconName());
} }
@@ -325,7 +334,7 @@ index 569b13f..0380ea6 100644
void Qt6CTPlatformTheme::applySettings() void Qt6CTPlatformTheme::applySettings()
{ {
if(!QGuiApplication::desktopSettingsAware() || m_isIgnored) if(!QGuiApplication::desktopSettingsAware() || m_isIgnored)
@@ -156,18 +221,18 @@ void Qt6CTPlatformTheme::applySettings() @@ -156,18 +230,18 @@ void Qt6CTPlatformTheme::applySettings()
return; return;
} }
@@ -350,7 +359,7 @@ index 569b13f..0380ea6 100644
Qt6CT::reloadStyleInstanceSettings(); Qt6CT::reloadStyleInstanceSettings();
} }
@@ -193,25 +258,28 @@ void Qt6CTPlatformTheme::applySettings() @@ -193,25 +267,26 @@ void Qt6CTPlatformTheme::applySettings()
if(m_update) if(m_update)
{ {
@@ -359,8 +368,6 @@ index 569b13f..0380ea6 100644
+ QWindowSystemInterface::handleThemeChange(); + QWindowSystemInterface::handleThemeChange();
+ QCoreApplication::postEvent(qGuiApp, new QEvent(QEvent::ApplicationFontChange)); + QCoreApplication::postEvent(qGuiApp, new QEvent(QEvent::ApplicationFontChange));
} }
+ else if(hasWidgets()) //update color scheme after m_style has created
+ QWindowSystemInterface::handleThemeChange();
#ifdef QT_WIDGETS_LIB #ifdef QT_WIDGETS_LIB
if(hasWidgets() && m_update) if(hasWidgets() && m_update)
@@ -387,7 +394,7 @@ index 569b13f..0380ea6 100644
void Qt6CTPlatformTheme::createFSWatcher() void Qt6CTPlatformTheme::createFSWatcher()
{ {
QFileSystemWatcher *watcher = new QFileSystemWatcher(this); QFileSystemWatcher *watcher = new QFileSystemWatcher(this);
@@ -230,21 +298,16 @@ void Qt6CTPlatformTheme::updateSettings() @@ -230,21 +305,16 @@ void Qt6CTPlatformTheme::updateSettings()
readSettings(); readSettings();
applySettings(); applySettings();
} }
@@ -413,7 +420,7 @@ index 569b13f..0380ea6 100644
m_iconTheme = settings.value("icon_theme"_L1).toString(); m_iconTheme = settings.value("icon_theme"_L1).toString();
//load dialogs //load dialogs
if(!m_update) if(!m_update)
@@ -252,8 +315,9 @@ void Qt6CTPlatformTheme::readSettings() @@ -252,8 +322,9 @@ void Qt6CTPlatformTheme::readSettings()
//do not mix gtk2 style and gtk3 dialogs //do not mix gtk2 style and gtk3 dialogs
QStringList keys = QPlatformThemeFactory::keys(); QStringList keys = QPlatformThemeFactory::keys();
QString dialogs = settings.value("standard_dialogs"_L1, u"default"_s).toString(); QString dialogs = settings.value("standard_dialogs"_L1, u"default"_s).toString();
@@ -424,7 +431,7 @@ index 569b13f..0380ea6 100644
dialogs = u"gtk2"_s; dialogs = u"gtk2"_s;
if(keys.contains(dialogs)) if(keys.contains(dialogs))
m_theme.reset(QPlatformThemeFactory::create(dialogs)); m_theme.reset(QPlatformThemeFactory::create(dialogs));
@@ -262,10 +326,10 @@ void Qt6CTPlatformTheme::readSettings() @@ -262,10 +333,10 @@ void Qt6CTPlatformTheme::readSettings()
settings.endGroup(); settings.endGroup();
settings.beginGroup("Fonts"_L1); settings.beginGroup("Fonts"_L1);
@@ -439,7 +446,7 @@ index 569b13f..0380ea6 100644
settings.endGroup(); settings.endGroup();
settings.beginGroup("Interface"_L1); settings.beginGroup("Interface"_L1);
@@ -354,3 +418,17 @@ QString Qt6CTPlatformTheme::loadStyleSheets(const QStringList &paths) @@ -354,3 +425,17 @@ QString Qt6CTPlatformTheme::loadStyleSheets(const QStringList &paths)
content.replace(regExp, u"\n"_s); content.replace(regExp, u"\n"_s);
return content; return content;
} }

0
gui-apps/qt6ct-kde/qt6ct-kde-0.11-r4.ebuild → gui-apps/qt6ct-kde/qt6ct-kde-0.11-r5.ebuild
View File

0
metadata/md5-cache/gui-apps/qt6ct-kde-0.11-r4 → metadata/md5-cache/gui-apps/qt6ct-kde-0.11-r5
View File