[arch-commits] Commit in qt5ct/repos (6 files)

Antonio Rojas arojas at archlinux.org
Sat Jan 28 10:21:57 UTC 2017


    Date: Saturday, January 28, 2017 @ 10:21:54
  Author: arojas
Revision: 209277

archrelease: copy trunk to community-testing-i686, community-testing-x86_64

Added:
  qt5ct/repos/community-testing-i686/PKGBUILD
    (from rev 209276, qt5ct/trunk/PKGBUILD)
  qt5ct/repos/community-testing-i686/qt5ct-fix-color-scheme.patch
    (from rev 209276, qt5ct/trunk/qt5ct-fix-color-scheme.patch)
  qt5ct/repos/community-testing-x86_64/PKGBUILD
    (from rev 209276, qt5ct/trunk/PKGBUILD)
  qt5ct/repos/community-testing-x86_64/qt5ct-fix-color-scheme.patch
    (from rev 209276, qt5ct/trunk/qt5ct-fix-color-scheme.patch)
Deleted:
  qt5ct/repos/community-testing-i686/PKGBUILD
  qt5ct/repos/community-testing-x86_64/PKGBUILD

-------------------------------------------------------+
 /PKGBUILD                                             |   74 ++++++++++++++++
 community-testing-i686/PKGBUILD                       |   30 ------
 community-testing-i686/qt5ct-fix-color-scheme.patch   |   14 +++
 community-testing-x86_64/PKGBUILD                     |   30 ------
 community-testing-x86_64/qt5ct-fix-color-scheme.patch |   14 +++
 5 files changed, 102 insertions(+), 60 deletions(-)

Deleted: community-testing-i686/PKGBUILD
===================================================================
--- community-testing-i686/PKGBUILD	2017-01-28 10:21:26 UTC (rev 209276)
+++ community-testing-i686/PKGBUILD	2017-01-28 10:21:54 UTC (rev 209277)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: FadeMind <fademind at gmail.com>
-# Contributor: Zatherz <zatherz at linux dot pl>
-
-pkgname=qt5ct
-pkgver=0.29
-pkgrel=2
-pkgdesc="Qt5 Configuration Utility"
-arch=(i686 x86_64)
-url="http://qt5ct.sourceforge.net"
-license=(BSD)
-depends=(qt5-svg)
-makedepends=(qt5-tools)
-source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.bz2")
-sha256sums=('a016142a04a5edfbdda627fc203622f512fae9e84bcf89ce63a7107f01721adc')
-
-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-testing-i686/PKGBUILD (from rev 209276, qt5ct/trunk/PKGBUILD)
===================================================================
--- community-testing-i686/PKGBUILD	                        (rev 0)
+++ community-testing-i686/PKGBUILD	2017-01-28 10:21:54 UTC (rev 209277)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: FadeMind <fademind at gmail.com>
+# Contributor: Zatherz <zatherz at linux dot pl>
+
+pkgname=qt5ct
+pkgver=0.29
+pkgrel=4
+pkgdesc="Qt5 Configuration Utility"
+arch=(i686 x86_64)
+url="http://qt5ct.sourceforge.net"
+license=(BSD)
+depends=(qt5-svg)
+makedepends=(qt5-tools)
+source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.bz2" qt5ct-fix-color-scheme.patch)
+sha256sums=('a016142a04a5edfbdda627fc203622f512fae9e84bcf89ce63a7107f01721adc'
+            '171c5802dc77a63aa7fff806b5f63b8f4fe7e1f52653f4c11d8597ae910a4af7')
+
+prepare() {
+  cd $pkgname-$pkgver
+# Fix color scheme https://sourceforge.net/p/qt5ct/tickets/32/
+  patch -p3 -i ../qt5ct-fix-color-scheme.patch
+}
+
+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-testing-i686/qt5ct-fix-color-scheme.patch (from rev 209276, qt5ct/trunk/qt5ct-fix-color-scheme.patch)
===================================================================
--- community-testing-i686/qt5ct-fix-color-scheme.patch	                        (rev 0)
+++ community-testing-i686/qt5ct-fix-color-scheme.patch	2017-01-28 10:21:54 UTC (rev 209277)
@@ -0,0 +1,14 @@
+--- a/trunk/qt5ct/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp
++++ b/trunk/qt5ct/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp
+@@ -101,9 +101,8 @@
+ 
+ const QPalette *Qt5CTPlatformTheme::palette(QPlatformTheme::Palette type) const
+ {
+-    if(m_customPalette && m_usePalette)
+-        return m_customPalette;
+-    return QPlatformTheme::palette(type);
++    Q_UNUSED(type);
++    return (m_usePalette ? m_customPalette : 0);
+ }
+ 
+ const QFont *Qt5CTPlatformTheme::font(QPlatformTheme::Font type) const

Deleted: community-testing-x86_64/PKGBUILD
===================================================================
--- community-testing-x86_64/PKGBUILD	2017-01-28 10:21:26 UTC (rev 209276)
+++ community-testing-x86_64/PKGBUILD	2017-01-28 10:21:54 UTC (rev 209277)
@@ -1,30 +0,0 @@
-# $Id$
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: FadeMind <fademind at gmail.com>
-# Contributor: Zatherz <zatherz at linux dot pl>
-
-pkgname=qt5ct
-pkgver=0.29
-pkgrel=2
-pkgdesc="Qt5 Configuration Utility"
-arch=(i686 x86_64)
-url="http://qt5ct.sourceforge.net"
-license=(BSD)
-depends=(qt5-svg)
-makedepends=(qt5-tools)
-source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.bz2")
-sha256sums=('a016142a04a5edfbdda627fc203622f512fae9e84bcf89ce63a7107f01721adc')
-
-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-testing-x86_64/PKGBUILD (from rev 209276, qt5ct/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD	                        (rev 0)
+++ community-testing-x86_64/PKGBUILD	2017-01-28 10:21:54 UTC (rev 209277)
@@ -0,0 +1,37 @@
+# $Id$
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: FadeMind <fademind at gmail.com>
+# Contributor: Zatherz <zatherz at linux dot pl>
+
+pkgname=qt5ct
+pkgver=0.29
+pkgrel=4
+pkgdesc="Qt5 Configuration Utility"
+arch=(i686 x86_64)
+url="http://qt5ct.sourceforge.net"
+license=(BSD)
+depends=(qt5-svg)
+makedepends=(qt5-tools)
+source=("http://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver.tar.bz2" qt5ct-fix-color-scheme.patch)
+sha256sums=('a016142a04a5edfbdda627fc203622f512fae9e84bcf89ce63a7107f01721adc'
+            '171c5802dc77a63aa7fff806b5f63b8f4fe7e1f52653f4c11d8597ae910a4af7')
+
+prepare() {
+  cd $pkgname-$pkgver
+# Fix color scheme https://sourceforge.net/p/qt5ct/tickets/32/
+  patch -p3 -i ../qt5ct-fix-color-scheme.patch
+}
+
+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-testing-x86_64/qt5ct-fix-color-scheme.patch (from rev 209276, qt5ct/trunk/qt5ct-fix-color-scheme.patch)
===================================================================
--- community-testing-x86_64/qt5ct-fix-color-scheme.patch	                        (rev 0)
+++ community-testing-x86_64/qt5ct-fix-color-scheme.patch	2017-01-28 10:21:54 UTC (rev 209277)
@@ -0,0 +1,14 @@
+--- a/trunk/qt5ct/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp
++++ b/trunk/qt5ct/src/qt5ct-qtplugin/qt5ctplatformtheme.cpp
+@@ -101,9 +101,8 @@
+ 
+ const QPalette *Qt5CTPlatformTheme::palette(QPlatformTheme::Palette type) const
+ {
+-    if(m_customPalette && m_usePalette)
+-        return m_customPalette;
+-    return QPlatformTheme::palette(type);
++    Q_UNUSED(type);
++    return (m_usePalette ? m_customPalette : 0);
+ }
+ 
+ const QFont *Qt5CTPlatformTheme::font(QPlatformTheme::Font type) const



More information about the arch-commits mailing list