[arch-commits] Commit in freecell-solver/repos/extra-x86_64 (3 files)

[Antonio Rojas]

    Date: Wednesday, July 22, 2020 @ 20:24:01
  Author: arojas
Revision: 392386

archrelease: copy trunk to extra-x86_64

Added:
  freecell-solver/repos/extra-x86_64/PKGBUILD
    (from rev 392385, freecell-solver/trunk/PKGBUILD)
  freecell-solver/repos/extra-x86_64/freecell-solver-fix-build.patch
    (from rev 392385, freecell-solver/trunk/freecell-solver-fix-build.patch)
Deleted:
  freecell-solver/repos/extra-x86_64/PKGBUILD

---------------------------------+
 PKGBUILD                        |   70 +++++++++++++++++++-------------------
 freecell-solver-fix-build.patch |   41 ++++++++++++++++++++++
 2 files changed, 76 insertions(+), 35 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-22 20:23:47 UTC (rev 392385)
+++ PKGBUILD	2020-07-22 20:24:01 UTC (rev 392386)
@@ -1,35 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-
-pkgname=freecell-solver
-pkgver=5.24.0
-pkgrel=1
-pkgdesc="A program that automatically solves layouts of Freecell and similar variants of Card Solitaire"
-arch=(x86_64)
-url="https://fc-solve.shlomifish.org"
-license=(MIT)
-depends=(bash)
-makedepends=(cmake gperf perl-path-tiny perl-template-toolkit python-random2 python-six python-pysol_cards rinutils)
-optdepends=('python-random2: for the Python interface' 'python-six: for the Python interface'
-            'python-pysol_cards: for the Python interface')
-source=(https://fc-solve.shlomifish.org/downloads/fc-solve/$pkgname-$pkgver.tar.xz)
-sha256sums=('34b924e2774ef167d673055c32a829edb1fc9b44112544e99834272a8119af76')
-
-prepare() {
-  mkdir -p build
-}
-
-build() {
-  cd build
-  cmake ../$pkgname-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DFCS_WITH_TEST_SUITE=OFF \
-    -DBUILD_STATIC_LIBRARY=OFF
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-  install -Dm644 "$srcdir"/$pkgname-$pkgver/COPYING.html "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.html
-}
-

Copied: freecell-solver/repos/extra-x86_64/PKGBUILD (from rev 392385, freecell-solver/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-07-22 20:24:01 UTC (rev 392386)
@@ -0,0 +1,35 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+
+pkgname=freecell-solver
+pkgver=6.0.0
+pkgrel=1
+pkgdesc="A program that automatically solves layouts of Freecell and similar variants of Card Solitaire"
+arch=(x86_64)
+url="https://fc-solve.shlomifish.org"
+license=(MIT)
+depends=(bash)
+makedepends=(cmake gperf perl-moo perl-path-tiny perl-template-toolkit python-random2 python-six python-pysol_cards rinutils)
+optdepends=('python-random2: for the Python interface' 'python-six: for the Python interface'
+            'python-pysol_cards: for the Python interface')
+source=(https://fc-solve.shlomifish.org/downloads/fc-solve/$pkgname-$pkgver.tar.xz
+        freecell-solver-fix-build.patch)
+sha256sums=('fcbf7d2bed6840cb340b035fe9ac8cdcdb30ab84fea72c864bec5ac748af3199'
+            '6d5975823b55c8eb63fb96a6e06ff0346d86c9c1d3ec2989bc1947bd5f092134')
+
+prepare() {
+  patch -d $pkgname-$pkgver -p1 -i ../freecell-solver-fix-build.patch # Fix out of tree build
+}
+
+build() {
+  cmake -B build -S $pkgname-$pkgver \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DFCS_WITH_TEST_SUITE=OFF \
+    -DBUILD_STATIC_LIBRARY=OFF
+  cmake --build build
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --install build
+  install -Dm644 $pkgname-$pkgver/COPYING.html "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.html
+}
+

Copied: freecell-solver/repos/extra-x86_64/freecell-solver-fix-build.patch (from rev 392385, freecell-solver/trunk/freecell-solver-fix-build.patch)
===================================================================
--- freecell-solver-fix-build.patch	                        (rev 0)
+++ freecell-solver-fix-build.patch	2020-07-22 20:24:01 UTC (rev 392386)
@@ -0,0 +1,41 @@
+diff --git a/fc-solve/source/CMakeLists.txt b/fc-solve/source/CMakeLists.txt
+index 94a3f3fc0..fb37caecd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -273,7 +273,7 @@ ADD_CUSTOM_COMMAND(
+     DEPENDS "${is_parent_gen}"
+ )
+ # Execute it right away to avoid missing files/includes
+-EXECUTE_PROCESS(COMMAND "${PERL_EXECUTABLE}" ${is_parent_args} RESULT_VARIABLE _retcode)
++EXECUTE_PROCESS(COMMAND "${PERL_EXECUTABLE}" ${is_parent_args} WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" RESULT_VARIABLE _retcode)
+ 
+ IF (NOT ("${_retcode}" STREQUAL "0"))
+     MESSAGE(FATAL_ERROR "${PERL_EXECUTABLE} ${is_parent_args} failed!")
+@@ -308,6 +308,7 @@ ADD_CUSTOM_COMMAND(
+         "${cl_enum_h}"
+     COMMAND ${_cmd}
+     DEPENDS "${CL_INC_SCRIPT}"
++    WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+ )
+ 
+ # Execute it right away to avoid missing files/includes
+@@ -329,6 +330,7 @@ ADD_CUSTOM_COMMAND(
+         "${CMAKE_CURRENT_BINARY_DIR}/${MOVE_FUNCS_H}"
+     COMMAND "${PERL_EXECUTABLE}" "${MOVE_FUNCS_GEN}"
+     DEPENDS "${MOVE_FUNCS_GEN}" "${MOVE_FUNCS_GEN_MOD}"
++    WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+ )
+ 
+ ADD_CUSTOM_TARGET(
+@@ -374,7 +376,10 @@ ENDIF ()
+ IF (NOT "${FCS_DISABLE_PATSOLVE}")
+     SET (pp_dir "${CMAKE_CURRENT_SOURCE_DIR}/${p_dir}")
+     SET (cmd "python3" "${pp_dir}/param.py" "${pp_dir}/param.dat")
+-    EXECUTE_PROCESS(COMMAND ${cmd} RESULT_VARIABLE _retcode)
++    EXECUTE_PROCESS(
++        COMMAND ${cmd} RESULT_VARIABLE _retcode
++        WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
++    )
+     IF (NOT ("${_retcode}" STREQUAL "0"))
+         MESSAGE(FATAL_ERROR "${cmd} failed!")
+     ENDIF ()