[arch-commits] Commit in qt5ct/repos/community-x86_64 (3 files)
Date: Wednesday, June 10, 2020 @ 17:45:49
Author: arojas
Revision: 641835
archrelease: copy trunk to community-x86_64
Added:
qt5ct/repos/community-x86_64/PKGBUILD
(from rev 641834, qt5ct/trunk/PKGBUILD)
Deleted:
qt5ct/repos/community-x86_64/PKGBUILD
qt5ct/repos/community-x86_64/qt5.15-palette.patch
--+
PKGBUILD | 65 +
qt5.15-palette.patch | 108 -
2 files changed, 29 insertions(+), 144 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2020-06-10 17:45:36 UTC (rev 641834)
+++ PKGBUILD2020-06-10 17:45:49 UTC (rev 641835)
@@ -1,36 +0,0 @@
-# Maintainer: Antonio Rojas
-# Contributor: FadeMind
-# Contributor: Zatherz
-
-pkgname=qt5ct
-pkgver=0.41
-pkgrel=5
-pkgdesc="Qt5 Configuration Utility"
-arch=(x86_64)
-url="https://qt5ct.sourceforge.io/;
-license=(BSD)
-depends=(qt5-svg)
-makedepends=(qt5-tools)
-source=("https://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.bz2;
- qt5.15-palette.patch)
-sha256sums=('f24030e90d8b923b60c320b2db5b4c0fcc47f9f35ac4c52060ab3c6e423057dc'
-'98e87d63bd3873decf7364fe1ba70c075eee94f561a0aad06e78bd66b61149e1')
-
-prepare() {
- cd $pkgname-$pkgver
- patch -p3 -i ../qt5.15-palette.patch # Fix QPalette use with Qt 5.15
-}
-
-build() {
- cd $pkgname-$pkgver
- qmake-qt5 $pkgname.pro
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make INSTALL_ROOT="$pkgdir" install
-
- install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-
Copied: qt5ct/repos/community-x86_64/PKGBUILD (from rev 641834,
qt5ct/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2020-06-10 17:45:49 UTC (rev 641835)
@@ -0,0 +1,29 @@
+# Maintainer: Antonio Rojas
+# Contributor: FadeMind
+# Contributor: Zatherz
+
+pkgname=qt5ct
+pkgver=1.0
+pkgrel=1
+pkgdesc="Qt5 Configuration Utility"
+arch=(x86_64)
+url="https://qt5ct.sourceforge.io/;
+license=(BSD)
+depends=(qt5-svg)
+makedepends=(qt5-tools)
+source=("https://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.bz2;)
+sha256sums=('a92c7bbdaf8182ce38c1a49e34d30f5b79ec75bd70a4bfabeb9b7cb0e0971a85')
+
+build() {
+ cd $pkgname-$pkgver
+ qmake-qt5 $pkgname.pro
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make INSTALL_ROOT="$pkgdir" install
+
+ install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
+
Deleted: qt5.15-palette.patch
===
--- qt5.15-palette.patch2020-06-10 17:45:36 UTC (rev 641834)
+++ qt5.15-palette.patch2020-06-10 17:45:49 UTC (rev 641835)
@@ -1,108 +0,0 @@
a/trunk/qt5ct/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp
-+++ b/trunk/qt5ct/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp
-@@ -84,8 +84,8 @@
-
- Qt5CTPlatformTheme::~Qt5CTPlatformTheme()
- {
--if(m_customPalette)
--delete m_customPalette;
-+if(m_palette)
-+delete m_palette;
-
- }
-
-@@ -134,7 +134,7 @@
- const QPalette *Qt5CTPlatformTheme::palette(QPlatformTheme::Palette type)
const
- {
- Q_UNUSED(type);
--return (m_usePalette ? m_customPalette : nullptr);
-+return (m_usePalette ? m_palette : nullptr);
- }
-
- const QFont *Qt5CTPlatformTheme::font(QPlatformTheme::Font type) const
-@@ -226,13 +226,12 @@
- if(m_update && qApp->style()->objectName() == "qt5ct-style") //ignore
application style
- qApp->setStyle("qt5ct-style"); //recreate style object
-
-+if(!m_palette)
-+m_palette = new QPalette(qApp->style()->standardPalette());
-+
- if(m_update && m_usePalette)
--{
--if(m_customPalette)
--qApp->setPalette(*m_customPalette);
--else
--qApp->setPalette(qApp->style()->standardPalette());
--}
-+qApp->setPalette(*m_palette);
-+
-
- //do not override application style
- if(m_prevStyleSheet == qApp->styleSheet())
-@@ -244,12 +243,12 @@
- #endif
- QGuiApplication::setFont(m_generalFont); //apply font
- QIcon::setThemeName(m_iconTheme); //apply icons
--if(m_customPalette && m_usePalette)
--QGuiApplication::setPalette(*m_customPalette); //apply palette
--
--#ifdef QT_WIDGETS_LIB
--if(m_customPalette && m_usePalette && !m_update)
--qApp->setPalette(*m_customPalette);
-+if(m_palette && m_usePalette)
-+QGuiApplication::setPalette(*m_palette); //apply palette
-+
-+#ifdef QT_WIDGETS_LIB
-+if(m_palette && m_usePalette && !m_update)
-+qApp->setPalette(*m_palette);
-
- if(hasWidgets())
- {
-@@ -288,10 +287,10 @@
-
- void Qt5CTPlatformTheme::readSettings()
- {
--if(m_customPalette)
--{
--delete m_customPalette;
--m_customPalette = nullptr;
-+if(m_palette)
-+{
-+
[arch-commits] Commit in qt5ct/repos/community-x86_64 (3 files)
Date: Wednesday, December 19, 2018 @ 16:23:48
Author: arojas
Revision: 416768
archrelease: copy trunk to community-x86_64
Added:
qt5ct/repos/community-x86_64/PKGBUILD
(from rev 416767, qt5ct/trunk/PKGBUILD)
Deleted:
qt5ct/repos/community-x86_64/PKGBUILD
qt5ct/repos/community-x86_64/qt5ct-qt5.12.patch
+
PKGBUILD | 65 +--
qt5ct-qt5.12.patch | 70 ---
2 files changed, 29 insertions(+), 106 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2018-12-19 16:23:27 UTC (rev 416767)
+++ PKGBUILD2018-12-19 16:23:48 UTC (rev 416768)
@@ -1,36 +0,0 @@
-# Maintainer: Antonio Rojas
-# Contributor: FadeMind
-# Contributor: Zatherz
-
-pkgname=qt5ct
-pkgver=0.36
-pkgrel=3
-pkgdesc="Qt5 Configuration Utility"
-arch=(x86_64)
-url="https://qt5ct.sourceforge.net;
-license=(BSD)
-depends=(qt5-svg)
-makedepends=(qt5-tools)
-source=("https://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.bz2;
-qt5ct-qt5.12.patch)
-sha256sums=('8fc3942f34d377af5533a0953cca633a7babc60c0476fd4318b617702183ee89'
-'ef2318d0003d33bf58e4bccfeed5d9697de68d752c0af9f7bedb70c031cb98ec')
-
-prepare() {
- cd $pkgname-$pkgver
- patch -p3 -i ../qt5ct-qt5.12.patch # Fix color palette support with Qt 5.12
-}
-
-build() {
- cd $pkgname-$pkgver
- qmake-qt5 $pkgname.pro
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make INSTALL_ROOT="$pkgdir" install
-
- install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-
Copied: qt5ct/repos/community-x86_64/PKGBUILD (from rev 416767,
qt5ct/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2018-12-19 16:23:48 UTC (rev 416768)
@@ -0,0 +1,29 @@
+# Maintainer: Antonio Rojas
+# Contributor: FadeMind
+# Contributor: Zatherz
+
+pkgname=qt5ct
+pkgver=0.37
+pkgrel=1
+pkgdesc="Qt5 Configuration Utility"
+arch=(x86_64)
+url="https://qt5ct.sourceforge.net;
+license=(BSD)
+depends=(qt5-svg)
+makedepends=(qt5-tools)
+source=("https://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.bz2;)
+sha256sums=('dee6df2eaae41f6e34ffc233ea27b178114c54c928f6a045969dea78d7d60c59')
+
+build() {
+ cd $pkgname-$pkgver
+ qmake-qt5 $pkgname.pro
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make INSTALL_ROOT="$pkgdir" install
+
+ install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
+
Deleted: qt5ct-qt5.12.patch
===
--- qt5ct-qt5.12.patch 2018-12-19 16:23:27 UTC (rev 416767)
+++ qt5ct-qt5.12.patch 2018-12-19 16:23:48 UTC (rev 416768)
@@ -1,70 +0,0 @@
a/trunk/qt5ct/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp
-+++ b/trunk/qt5ct/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp
-@@ -400,6 +400,26 @@
- customPalette.setColor(QPalette::Disabled, role,
QColor(disabledColors.at(i)));
- }
- }
-+#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
-+else if(activeColors.count() == QPalette::NColorRoles - 1 &&
-+inactiveColors.count() == QPalette::NColorRoles - 1 &&
-+disabledColors.count() == QPalette::NColorRoles - 1)
-+{
-+//old format compatibility
-+for (int i = 0; i < QPalette::NColorRoles - 1; i++)
-+{
-+QPalette::ColorRole role = QPalette::ColorRole(i);
-+customPalette.setColor(QPalette::Active, role,
QColor(activeColors.at(i)));
-+customPalette.setColor(QPalette::Inactive, role,
QColor(inactiveColors.at(i)));
-+customPalette.setColor(QPalette::Disabled, role,
QColor(disabledColors.at(i)));
-+}
-+QColor textColor = customPalette.text().color();
-+textColor.setAlpha(128);
-+customPalette.setColor(QPalette::Active, QPalette::PlaceholderText,
textColor);
-+customPalette.setColor(QPalette::Inactive, QPalette::PlaceholderText,
textColor);
-+customPalette.setColor(QPalette::Disabled, QPalette::PlaceholderText,
textColor);
-+}
-+#endif
- else
- {
- customPalette = *QPlatformTheme::palette(SystemPalette); //load
fallback palette
a/trunk/qt5ct/src/qt5ct/appearancepage.cpp
-+++ b/trunk/qt5ct/src/qt5ct/appearancepage.cpp
-@@ -425,6 +425,26 @@
- customPalette.setColor(QPalette::Disabled, role,
QColor(disabledColors.at(i)));
- }
- }
-+#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
-+else if(activeColors.count() == QPalette::NColorRoles - 1 &&
-+inactiveColors.count() == QPalette::NColorRoles - 1 &&
-+disabledColors.count() == QPalette::NColorRoles - 1)
-+{
-+//old format compatibility
-+for (int i = 0; i < QPalette::NColorRoles - 1; i++)
-+{
-+QPalette::ColorRole role = QPalette::ColorRole(i);
-+
[arch-commits] Commit in qt5ct/repos/community-x86_64 (3 files)
Date: Friday, December 14, 2018 @ 10:25:27
Author: arojas
Revision: 416248
archrelease: copy trunk to community-x86_64
Added:
qt5ct/repos/community-x86_64/PKGBUILD
(from rev 416247, qt5ct/trunk/PKGBUILD)
qt5ct/repos/community-x86_64/qt5ct-qt5.12.patch
(from rev 416247, qt5ct/trunk/qt5ct-qt5.12.patch)
Deleted:
qt5ct/repos/community-x86_64/PKGBUILD
+
PKGBUILD | 65 ++-
qt5ct-qt5.12.patch | 70 +++
2 files changed, 106 insertions(+), 29 deletions(-)
Deleted: PKGBUILD
===
--- PKGBUILD2018-12-14 10:25:04 UTC (rev 416247)
+++ PKGBUILD2018-12-14 10:25:27 UTC (rev 416248)
@@ -1,29 +0,0 @@
-# Maintainer: Antonio Rojas
-# Contributor: FadeMind
-# Contributor: Zatherz
-
-pkgname=qt5ct
-pkgver=0.36
-pkgrel=2
-pkgdesc="Qt5 Configuration Utility"
-arch=(x86_64)
-url="https://qt5ct.sourceforge.net;
-license=(BSD)
-depends=(qt5-svg)
-makedepends=(qt5-tools)
-source=("https://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.bz2;)
-sha256sums=('8fc3942f34d377af5533a0953cca633a7babc60c0476fd4318b617702183ee89')
-
-build() {
- cd $pkgname-$pkgver
- qmake-qt5 $pkgname.pro
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make INSTALL_ROOT="$pkgdir" install
-
- install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-
Copied: qt5ct/repos/community-x86_64/PKGBUILD (from rev 416247,
qt5ct/trunk/PKGBUILD)
===
--- PKGBUILD(rev 0)
+++ PKGBUILD2018-12-14 10:25:27 UTC (rev 416248)
@@ -0,0 +1,36 @@
+# Maintainer: Antonio Rojas
+# Contributor: FadeMind
+# Contributor: Zatherz
+
+pkgname=qt5ct
+pkgver=0.36
+pkgrel=3
+pkgdesc="Qt5 Configuration Utility"
+arch=(x86_64)
+url="https://qt5ct.sourceforge.net;
+license=(BSD)
+depends=(qt5-svg)
+makedepends=(qt5-tools)
+source=("https://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.bz2;
+qt5ct-qt5.12.patch)
+sha256sums=('8fc3942f34d377af5533a0953cca633a7babc60c0476fd4318b617702183ee89'
+'ef2318d0003d33bf58e4bccfeed5d9697de68d752c0af9f7bedb70c031cb98ec')
+
+prepare() {
+ cd $pkgname-$pkgver
+ patch -p3 -i ../qt5ct-qt5.12.patch # Fix color palette support with Qt 5.12
+}
+
+build() {
+ cd $pkgname-$pkgver
+ qmake-qt5 $pkgname.pro
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make INSTALL_ROOT="$pkgdir" install
+
+ install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
+
Copied: qt5ct/repos/community-x86_64/qt5ct-qt5.12.patch (from rev 416247,
qt5ct/trunk/qt5ct-qt5.12.patch)
===
--- qt5ct-qt5.12.patch (rev 0)
+++ qt5ct-qt5.12.patch 2018-12-14 10:25:27 UTC (rev 416248)
@@ -0,0 +1,70 @@
+--- a/trunk/qt5ct/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp
b/trunk/qt5ct/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp
+@@ -400,6 +400,26 @@
+ customPalette.setColor(QPalette::Disabled, role,
QColor(disabledColors.at(i)));
+ }
+ }
++#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
++else if(activeColors.count() == QPalette::NColorRoles - 1 &&
++inactiveColors.count() == QPalette::NColorRoles - 1 &&
++disabledColors.count() == QPalette::NColorRoles - 1)
++{
++//old format compatibility
++for (int i = 0; i < QPalette::NColorRoles - 1; i++)
++{
++QPalette::ColorRole role = QPalette::ColorRole(i);
++customPalette.setColor(QPalette::Active, role,
QColor(activeColors.at(i)));
++customPalette.setColor(QPalette::Inactive, role,
QColor(inactiveColors.at(i)));
++customPalette.setColor(QPalette::Disabled, role,
QColor(disabledColors.at(i)));
++}
++QColor textColor = customPalette.text().color();
++textColor.setAlpha(128);
++customPalette.setColor(QPalette::Active, QPalette::PlaceholderText,
textColor);
++customPalette.setColor(QPalette::Inactive, QPalette::PlaceholderText,
textColor);
++customPalette.setColor(QPalette::Disabled, QPalette::PlaceholderText,
textColor);
++}
++#endif
+ else
+ {
+ customPalette = *QPlatformTheme::palette(SystemPalette); //load
fallback palette
+--- a/trunk/qt5ct/src/qt5ct/appearancepage.cpp
b/trunk/qt5ct/src/qt5ct/appearancepage.cpp
+@@ -425,6 +425,26 @@
+ customPalette.setColor(QPalette::Disabled, role,
QColor(disabledColors.at(i)));
+ }
+ }
++#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
++else if(activeColors.count() == QPalette::NColorRoles - 1 &&
++inactiveColors.count() == QPalette::NColorRoles - 1 &&
++disabledColors.count() == QPalette::NColorRoles - 1)
++{
++//old format compatibility
++for (int i
