[arch-commits] Commit in freecell-solver/trunk (PKGBUILD fc-solver-build.patch)

[Antonio Rojas]

    Date: Wednesday, July 25, 2018 @ 07:10:31
  Author: arojas
Revision: 329521

Update to 4.20.0

Added:
  freecell-solver/trunk/fc-solver-build.patch
Modified:
  freecell-solver/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |   17 +++++++++++------
 fc-solver-build.patch |   29 +++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-24 19:27:08 UTC (rev 329520)
+++ PKGBUILD	2018-07-25 07:10:31 UTC (rev 329521)
@@ -1,7 +1,7 @@
 # Maintainer: Antonio Rojas <arojas at archlinux.org>
 
 pkgname=freecell-solver
-pkgver=4.18.0
+pkgver=4.20.0
 pkgrel=1
 pkgdesc="A program that automatically solves layouts of Freecell and similar variants of Card Solitaire"
 arch=(x86_64)
@@ -8,13 +8,17 @@
 url="http://fc-solve.shlomifish.org"
 license=(MIT)
 depends=(bash)
-makedepends=(cmake gperf perl-path-tiny perl-template-toolkit)
+makedepends=(cmake gperf perl-path-tiny perl-template-toolkit python-random2 python-six)
 optdepends=('python: for the Python scripts')
-source=(http://fc-solve.shlomifish.org/downloads/fc-solve/$pkgname-$pkgver.tar.xz)
-sha1sums=('20c027b3b3ffd945397717035daa8aad008fc067')
+source=(http://fc-solve.shlomifish.org/downloads/fc-solve/$pkgname-$pkgver.tar.xz fc-solver-build.patch)
+sha256sums=('869c210e7b63b0e0dcfb1c4a2322c41cfa8fbf8db01e7722254a7425a1ab7f81'
+            '84ae4b9b253c82b8d28b5a39d8c76132c8a9f6ba996633a3df50ed819e755204')
 
 prepare() {
   mkdir -p build
+
+  cd $pkgname-$pkgver
+#  patch -p1 -i ../fc-solver-build.patch # Fix build
 }
 
 build() {
@@ -21,8 +25,9 @@
   cd build
   cmake ../$pkgname-$pkgver \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DFCS_WITH_TEST_SUITE=OFF
-  make
+    -DFCS_WITH_TEST_SUITE=OFF \
+    -DBUILD_STATIC_LIBRARY=OFF
+  make -j1
 }
 
 package() {

Added: fc-solver-build.patch
===================================================================
--- fc-solver-build.patch	                        (rev 0)
+++ fc-solver-build.patch	2018-07-25 07:10:31 UTC (rev 329521)
@@ -0,0 +1,29 @@
+--- freecell-solver-4.20.0/CMakeLists.txt.orig	2018-07-25 06:54:13.736780097 +0000
++++ freecell-solver-4.20.0/CMakeLists.txt	2018-07-25 06:55:31.873652725 +0000
+@@ -232,13 +232,6 @@
+ SET (patsolve_dir "${pats_dir}/patsolve")
+ SET (p_dir "${patsolve_dir}")
+ 
+-SET (patsolve_modules
+-    "param.c"
+-    "${p_dir}/pat.c"
+-    "${p_dir}/patsolve.c"
+-    "${p_dir}/tree.c"
+-    )
+-
+ FIND_PROGRAM(_GPERF "gperf")
+ 
+ IF ("${_GPERF}" STREQUAL "_GPERF-NOTFOUND")
+@@ -311,6 +304,12 @@
+ IF (NOT "${FCS_DISABLE_PATSOLVE}")
+     SET (pp_dir "${CMAKE_CURRENT_SOURCE_DIR}/${p_dir}")
+     EXECUTE_PROCESS(COMMAND "python3" "${pp_dir}/param.py" "${pp_dir}/param.dat")
++    SET (patsolve_modules
++    "param.c"
++    "${p_dir}/pat.c"
++    "${p_dir}/patsolve.c"
++    "${p_dir}/tree.c"
++    )
+     add_lib_mods(${patsolve_modules})
+ ENDIF ()
+ IF (NOT "${FCS_USE_PRECOMPILED_CMD_LINE_THEME}")