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

[Antonio Rojas]

    Date: Thursday, March 5, 2020 @ 13:49:39
  Author: arojas
Revision: 376666

archrelease: copy trunk to extra-any

Added:
  kajongg/repos/extra-any/PKGBUILD
    (from rev 376665, kajongg/trunk/PKGBUILD)
  kajongg/repos/extra-any/kajongg-destdir.patch
    (from rev 376665, kajongg/trunk/kajongg-destdir.patch)
Deleted:
  kajongg/repos/extra-any/PKGBUILD

-----------------------+
 PKGBUILD              |   71 +++++++++++++++++++++++++++---------------------
 kajongg-destdir.patch |   23 +++++++++++++++
 2 files changed, 63 insertions(+), 31 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-05 13:49:28 UTC (rev 376665)
+++ PKGBUILD	2020-03-05 13:49:39 UTC (rev 376666)
@@ -1,31 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kajongg
-pkgver=19.12.2
-pkgrel=1
-pkgdesc="The ancient Chinese board game for 4 players"
-url="https://kde.org/applications/games/kajongg/"
-arch=(any)
-license=(GPL LGPL FDL)
-groups=(kde-applications kdegames)
-depends=(python-twisted python-pyqt5 libkmahjongg hicolor-icon-theme)
-makedepends=(extra-cmake-modules kdoctools)
-optdepends=('vorbis-tools: for playing sounds')
-source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig})
-sha256sums=('3aa4f18d43ae085425ed24706fb65bca11a4f08ec1ec6d975ac908f0d958742d'
-            'SKIP')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
-              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck at kde.org>
-
-prepare() {
-  mkdir -p build
-}
-
-package() {
-  cd build
-  export DESTDIR="$pkgdir"
-  cmake ../$pkgname-$pkgver
-  make install
-}

Copied: kajongg/repos/extra-any/PKGBUILD (from rev 376665, kajongg/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-03-05 13:49:39 UTC (rev 376666)
@@ -0,0 +1,40 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kajongg
+pkgver=19.12.3
+pkgrel=1
+pkgdesc="The ancient Chinese board game for 4 players"
+url="https://kde.org/applications/games/kajongg/"
+arch=(any)
+license=(GPL LGPL FDL)
+groups=(kde-applications kdegames)
+depends=(python-twisted python-pyqt5 libkmahjongg hicolor-icon-theme)
+makedepends=(extra-cmake-modules kdoctools)
+optdepends=('vorbis-tools: for playing sounds')
+source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}
+         kajongg-destdir.patch)
+sha256sums=('23e2b1be670b48bdd027e4e7a57e86a94b322afe6d37d8492c3d17689decfae5'
+            'SKIP'
+            '456282348c31c71e8e49dea26df9f47de992cdaf3306e60005c433bf4326d565')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
+              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck at kde.org>
+
+prepare() {
+  mkdir -p build
+
+  cd $pkgname-$pkgver
+  patch -p1 -i ../kajongg-destdir.patch
+}
+
+build() {
+  cd build
+  cmake ../$pkgname-$pkgver
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Copied: kajongg/repos/extra-any/kajongg-destdir.patch (from rev 376665, kajongg/trunk/kajongg-destdir.patch)
===================================================================
--- kajongg-destdir.patch	                        (rev 0)
+++ kajongg-destdir.patch	2020-03-05 13:49:39 UTC (rev 376666)
@@ -0,0 +1,23 @@
+diff --git a/cmake-modules/KDEPython.cmake b/cmake-modules/KDEPython.cmake
+index 8209c98c..b687a230 100644
+--- a/cmake-modules/KDEPython.cmake
++++ b/cmake-modules/KDEPython.cmake
+@@ -108,13 +108,13 @@ MACRO(KDE_ADD_PYTHON_EXECUTABLE _pyname _exename)
+     set(TARGET ${CMAKE_INSTALL_PREFIX}/${DATA_INSTALL_DIR}/${PROJECT_NAME}/${_pyname})
+     set(LINK_NAME ${CMAKE_INSTALL_PREFIX}/${BIN_INSTALL_DIR}/${_exename})
+ 
+-    GET_FILENAME_COMPONENT(abs_link_name $ENV{DESTDIR}/${LINK_NAME} ABSOLUTE)
+-    GET_FILENAME_COMPONENT(link_path $ENV{DESTDIR}/${LINK_NAME} PATH)
++    GET_FILENAME_COMPONENT(abs_link_name ${LINK_NAME} ABSOLUTE)
++    GET_FILENAME_COMPONENT(link_path ${LINK_NAME} PATH)
+     GET_FILENAME_COMPONENT(abs_link_path ${link_path} ABSOLUTE)
+-    FILE(MAKE_DIRECTORY ${abs_link_path})
+     GET_FILENAME_COMPONENT(abs_target ${TARGET} ABSOLUTE)
+ 
+-    INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${abs_target} ${abs_link_name})")
+-    INSTALL(CODE "EXECUTE_PROCESS(COMMAND chmod a+x $ENV{DESTDIR}/${abs_target})")
++    INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E make_directory \$ENV\{DESTDIR\}${abs_link_path})")
++    INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink ${abs_target} \$ENV\{DESTDIR\}${abs_link_name})")
++    INSTALL(CODE "EXECUTE_PROCESS(COMMAND chmod a+x \$ENV\{DESTDIR\}/${abs_target})")
+ 
+ ENDMACRO(KDE_ADD_PYTHON_EXECUTABLE)