[arch-commits] Commit in freecell-solver/trunk (2 files)

[Antonio Rojas]

    Date: Thursday, July 23, 2020 @ 13:42:14
  Author: arojas
Revision: 392423

Update to 6.0.1

Modified:
  freecell-solver/trunk/PKGBUILD
Deleted:
  freecell-solver/trunk/freecell-solver-fix-build.patch

---------------------------------+
 PKGBUILD                        |   12 ++---------
 freecell-solver-fix-build.patch |   41 --------------------------------------
 2 files changed, 3 insertions(+), 50 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-23 07:11:50 UTC (rev 392422)
+++ PKGBUILD	2020-07-23 13:42:14 UTC (rev 392423)
@@ -1,7 +1,7 @@
 # Maintainer: Antonio Rojas <arojas at archlinux.org>
 
 pkgname=freecell-solver
-pkgver=6.0.0
+pkgver=6.0.1
 pkgrel=1
 pkgdesc="A program that automatically solves layouts of Freecell and similar variants of Card Solitaire"
 arch=(x86_64)
@@ -11,15 +11,9 @@
 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')
+source=(https://fc-solve.shlomifish.org/downloads/fc-solve/$pkgname-$pkgver.tar.xz)
+sha256sums=('9f1a4c6d5c8ac54c6619b3b988efb5562d460cd048d33345e52a0c849fd0d9df')
 
-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 \

Deleted: freecell-solver-fix-build.patch
===================================================================
--- freecell-solver-fix-build.patch	2020-07-23 07:11:50 UTC (rev 392422)
+++ freecell-solver-fix-build.patch	2020-07-23 13:42:14 UTC (rev 392423)
@@ -1,41 +0,0 @@
-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 ()