[arch-commits] Commit in kcolorchooser/repos (4 files)

[Antonio Rojas]

    Date: Thursday, October 13, 2016 @ 16:09:46
  Author: arojas
Revision: 278725

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  kcolorchooser/repos/extra-i686/PKGBUILD
    (from rev 278724, kcolorchooser/trunk/PKGBUILD)
  kcolorchooser/repos/extra-x86_64/PKGBUILD
    (from rev 278724, kcolorchooser/trunk/PKGBUILD)
Deleted:
  kcolorchooser/repos/extra-i686/PKGBUILD
  kcolorchooser/repos/extra-x86_64/PKGBUILD

-----------------------+
 /PKGBUILD             |   86 ++++++++++++++++++++++++++++++++++++++++++++++++
 extra-i686/PKGBUILD   |   37 --------------------
 extra-x86_64/PKGBUILD |   37 --------------------
 3 files changed, 86 insertions(+), 74 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2016-10-13 16:09:40 UTC (rev 278724)
+++ extra-i686/PKGBUILD	2016-10-13 16:09:46 UTC (rev 278725)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kcolorchooser
-pkgver=16.08.1
-pkgrel=1
-pkgdesc="Color Chooser"
-url="http://kde.org/applications/graphics/kcolorchooser/"
-arch=(i686 x86_64)
-license=(GPL LGPL FDL)
-groups=(kde-applications kdegraphics)
-depends=(kxmlgui hicolor-icon-theme)
-makedepends=(extra-cmake-modules python)
-conflicts=(kdegraphics-kcolorchooser)
-replaces=(kdegraphics-kcolorchooser)
-source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz")
-sha1sums=('ed629c571491ef28f15f85c16d1077e045b538bd')
-
-prepare() {
-  mkdir -p build
-}
-
-build() {
-  cd build
-  cmake ../$pkgname-$pkgver \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DBUILD_TESTING=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-}

Copied: kcolorchooser/repos/extra-i686/PKGBUILD (from rev 278724, kcolorchooser/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2016-10-13 16:09:46 UTC (rev 278725)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kcolorchooser
+pkgver=16.08.2
+pkgrel=1
+pkgdesc="Color Chooser"
+url="http://kde.org/applications/graphics/kcolorchooser/"
+arch=(i686 x86_64)
+license=(GPL LGPL FDL)
+groups=(kde-applications kdegraphics)
+depends=(kxmlgui hicolor-icon-theme)
+makedepends=(extra-cmake-modules python)
+conflicts=(kdegraphics-kcolorchooser)
+replaces=(kdegraphics-kcolorchooser)
+source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"
+        no-native-color-picker.patch::"https://quickgit.kde.org/?p=kcolorchooser.git&a=commitdiff&h=1f35c6d3&o=plain")
+sha1sums=('a4f3e15d1c9a1925cb1a8f427ab8e493a8fb331f'
+          'e649287a430bd8c96fa92c5c9d875ea76507acc5')
+
+prepare() {
+  mkdir -p build
+
+# Fix running in GTK desktops
+  cd $pkgname-$pkgver
+  patch -p1 -i ../no-native-color-picker.patch
+}
+
+build() {
+  cd build
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_TESTING=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2016-10-13 16:09:40 UTC (rev 278724)
+++ extra-x86_64/PKGBUILD	2016-10-13 16:09:46 UTC (rev 278725)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kcolorchooser
-pkgver=16.08.1
-pkgrel=1
-pkgdesc="Color Chooser"
-url="http://kde.org/applications/graphics/kcolorchooser/"
-arch=(i686 x86_64)
-license=(GPL LGPL FDL)
-groups=(kde-applications kdegraphics)
-depends=(kxmlgui hicolor-icon-theme)
-makedepends=(extra-cmake-modules python)
-conflicts=(kdegraphics-kcolorchooser)
-replaces=(kdegraphics-kcolorchooser)
-source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz")
-sha1sums=('ed629c571491ef28f15f85c16d1077e045b538bd')
-
-prepare() {
-  mkdir -p build
-}
-
-build() {
-  cd build
-  cmake ../$pkgname-$pkgver \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DBUILD_TESTING=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-}

Copied: kcolorchooser/repos/extra-x86_64/PKGBUILD (from rev 278724, kcolorchooser/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2016-10-13 16:09:46 UTC (rev 278725)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kcolorchooser
+pkgver=16.08.2
+pkgrel=1
+pkgdesc="Color Chooser"
+url="http://kde.org/applications/graphics/kcolorchooser/"
+arch=(i686 x86_64)
+license=(GPL LGPL FDL)
+groups=(kde-applications kdegraphics)
+depends=(kxmlgui hicolor-icon-theme)
+makedepends=(extra-cmake-modules python)
+conflicts=(kdegraphics-kcolorchooser)
+replaces=(kdegraphics-kcolorchooser)
+source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"
+        no-native-color-picker.patch::"https://quickgit.kde.org/?p=kcolorchooser.git&a=commitdiff&h=1f35c6d3&o=plain")
+sha1sums=('a4f3e15d1c9a1925cb1a8f427ab8e493a8fb331f'
+          'e649287a430bd8c96fa92c5c9d875ea76507acc5')
+
+prepare() {
+  mkdir -p build
+
+# Fix running in GTK desktops
+  cd $pkgname-$pkgver
+  patch -p1 -i ../no-native-color-picker.patch
+}
+
+build() {
+  cd build
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DBUILD_TESTING=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}