[arch-commits] Commit in kdegames-kajongg/repos/extra-any (5 files)

[Andrea Scarpino]

    Date: Saturday, May 24, 2014 @ 09:17:36
  Author: andrea
Revision: 213538

archrelease: copy trunk to extra-any

Added:
  kdegames-kajongg/repos/extra-any/PKGBUILD
    (from rev 213537, kdegames-kajongg/trunk/PKGBUILD)
  kdegames-kajongg/repos/extra-any/fix-CMakeLists.txt
    (from rev 213537, kdegames-kajongg/trunk/fix-CMakeLists.txt)
  kdegames-kajongg/repos/extra-any/kdegames-kajongg.install
    (from rev 213537, kdegames-kajongg/trunk/kdegames-kajongg.install)
Deleted:
  kdegames-kajongg/repos/extra-any/PKGBUILD
  kdegames-kajongg/repos/extra-any/kdegames-kajongg.install

--------------------------+
 PKGBUILD                 |   81 +++++++++++++++++++++++----------------------
 fix-CMakeLists.txt       |   25 +++++++++++++
 kdegames-kajongg.install |   22 ++++++------
 3 files changed, 79 insertions(+), 49 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-24 07:17:30 UTC (rev 213537)
+++ PKGBUILD	2014-05-24 07:17:36 UTC (rev 213538)
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kdegames-kajongg
-pkgver=4.13.1
-pkgrel=1
-pkgdesc="The ancient Chinese board game for 4 players"
-url="http://kde.org/applications/games/kajongg/"
-arch=('any')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-depends=('kdebase-runtime' 'twisted' 'kdebindings-python2' 'libkmahjongg')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kajongg-${pkgver}.tar.xz")
-sha1sums=('e71c088908334d6e807934dc140fc44b189b56c8')
-
-prepare() {
-  mkdir build
-
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-    kajongg-${pkgver}/src/{deferredutil,kajongg,kajonggserver,server}.py
-}
-
-build() {
-  cd build
-  cmake ../kajongg-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DKDE4_BUILD_TESTS=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DPYTHON_EXECUTABLE=/usr/bin/python2
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="${pkgdir}" install
-}

Copied: kdegames-kajongg/repos/extra-any/PKGBUILD (from rev 213537, kdegames-kajongg/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2014-05-24 07:17:36 UTC (rev 213538)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kdegames-kajongg
+pkgver=4.13.1
+pkgrel=2
+pkgdesc="The ancient Chinese board game for 4 players"
+url="http://kde.org/applications/games/kajongg/"
+arch=('any')
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdegames')
+depends=('kdebase-runtime' 'twisted' 'kdebindings-python2' 'libkmahjongg')
+makedepends=('cmake' 'automoc4')
+install=${pkgname}.install
+source=("http://download.kde.org/stable/${pkgver}/src/kajongg-${pkgver}.tar.xz"
+        'fix-CMakeLists.txt')
+sha1sums=('e71c088908334d6e807934dc140fc44b189b56c8'
+          '37358177e44a818833ebaf607337d2133bb8ef8f')
+
+prepare() {
+  mkdir build
+
+  cd kajongg-${pkgver}
+  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
+    src/{deferredutil,kajongg,kajonggserver,server}.py
+
+  patch -p1 -i "${srcdir}"/fix-CMakeLists.txt
+}
+
+build() {
+  cd build
+  cmake ../kajongg-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DKDE4_BUILD_TESTS=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DPYTHON_EXECUTABLE=/usr/bin/python2
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="${pkgdir}" install
+}

Copied: kdegames-kajongg/repos/extra-any/fix-CMakeLists.txt (from rev 213537, kdegames-kajongg/trunk/fix-CMakeLists.txt)
===================================================================
--- fix-CMakeLists.txt	                        (rev 0)
+++ fix-CMakeLists.txt	2014-05-24 07:17:36 UTC (rev 213538)
@@ -0,0 +1,25 @@
+commit 985bf653088e53483722009f6277dd439423fbfa
+Author: Wolfgang Rohdewald <wolfgang at rohdewald.de>
+Date:   Wed May 21 08:06:33 2014 +0200
+
+    CMakeLists.txt: add missing .py files
+    
+    BUG: 335057
+    FIXED-IN: 4.13.2
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b241377..ea51da1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -74,6 +74,11 @@ src/wall.py
+ src/uiwall.py
+ src/visible.py
+ src/log.py
++src/qstring.py
++src/qt.py
++src/qt4.py
++src/qt5.py
++src/configdialog.py
+ src/util.py)
+ 
+ IF(NOT PYQT4_FOUND)

Deleted: kdegames-kajongg.install
===================================================================
--- kdegames-kajongg.install	2014-05-24 07:17:30 UTC (rev 213537)
+++ kdegames-kajongg.install	2014-05-24 07:17:36 UTC (rev 213538)
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Copied: kdegames-kajongg/repos/extra-any/kdegames-kajongg.install (from rev 213537, kdegames-kajongg/trunk/kdegames-kajongg.install)
===================================================================
--- kdegames-kajongg.install	                        (rev 0)
+++ kdegames-kajongg.install	2014-05-24 07:17:36 UTC (rev 213538)
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}