[arch-commits] Commit in qt5ct/repos/community-x86_64 (3 files)

[Antonio Rojas]

    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
===================================================================
--- PKGBUILD	2018-12-14 10:25:04 UTC (rev 416247)
+++ PKGBUILD	2018-12-14 10:25:27 UTC (rev 416248)
@@ -1,29 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: FadeMind <fademind at gmail.com>
-# Contributor: Zatherz <zatherz at linux dot pl>
-
-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)
+++ PKGBUILD	2018-12-14 10:25:27 UTC (rev 416248)
@@ -0,0 +1,36 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: FadeMind <fademind at gmail.com>
+# Contributor: Zatherz <zatherz at linux dot pl>
+
+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 = 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 = palette(); //load fallback palette
+--- a/trunk/qt5ct/src/qt5ct/paletteeditdialog.cpp
++++ b/trunk/qt5ct/src/qt5ct/paletteeditdialog.cpp
+@@ -92,6 +92,9 @@
+            << tr("Normal text") << tr("Bright text") << tr("Button text") << tr("Normal background") << tr("Window") << tr("Shadow")
+            << tr("Highlight") << tr("Highlighted text")  << tr("Link")  << tr("Visited link")
+            << tr("Alternate background") << tr("Default") << tr("Tooltip background")  << tr("Tooltip text");
++#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
++    labels << tr("Placeholder text");
++#endif
+     m_ui->tableWidget->setVerticalHeaderLabels(labels);
+ }
+