[arch-commits] Commit in qt5ct/trunk (PKGBUILD qt5ct-qt5.12.patch)

[Antonio Rojas]

    Date: Wednesday, December 19, 2018 @ 16:23:27
  Author: arojas
Revision: 416767

Update to 0.37

Modified:
  qt5ct/trunk/PKGBUILD
Deleted:
  qt5ct/trunk/qt5ct-qt5.12.patch

--------------------+
 PKGBUILD           |   15 ++--------
 qt5ct-qt5.12.patch |   70 ---------------------------------------------------
 2 files changed, 4 insertions(+), 81 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-19 16:11:09 UTC (rev 416766)
+++ PKGBUILD	2018-12-19 16:23:27 UTC (rev 416767)
@@ -3,8 +3,8 @@
 # Contributor: Zatherz <zatherz at linux dot pl>
 
 pkgname=qt5ct
-pkgver=0.36
-pkgrel=3
+pkgver=0.37
+pkgrel=1
 pkgdesc="Qt5 Configuration Utility"
 arch=(x86_64)
 url="https://qt5ct.sourceforge.net"
@@ -11,16 +11,9 @@
 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')
+source=("https://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.bz2")
+sha256sums=('dee6df2eaae41f6e34ffc233ea27b178114c54c928f6a045969dea78d7d60c59')
 
-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 

Deleted: qt5ct-qt5.12.patch
===================================================================
--- qt5ct-qt5.12.patch	2018-12-19 16:11:09 UTC (rev 416766)
+++ qt5ct-qt5.12.patch	2018-12-19 16:23:27 UTC (rev 416767)
@@ -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);
-+            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);
- }
-