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

[Antonio Rojas]

    Date: Wednesday, July 22, 2020 @ 20:23:34
  Author: arojas
Revision: 392384

Update to 6.0.0

Modified:
  freecell-solver/trunk/PKGBUILD

----------+
 PKGBUILD |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-22 20:23:26 UTC (rev 392383)
+++ PKGBUILD	2020-07-22 20:23:34 UTC (rev 392384)
@@ -1,7 +1,7 @@
 # Maintainer: Antonio Rojas <arojas at archlinux.org>
 
 pkgname=freecell-solver
-pkgver=5.24.0
+pkgver=6.0.0
 pkgrel=1
 pkgdesc="A program that automatically solves layouts of Freecell and similar variants of Card Solitaire"
 arch=(x86_64)
@@ -8,28 +8,28 @@
 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)
+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)
-sha256sums=('34b924e2774ef167d673055c32a829edb1fc9b44112544e99834272a8119af76')
+source=(https://fc-solve.shlomifish.org/downloads/fc-solve/$pkgname-$pkgver.tar.xz
+        freecell-solver-fix-build.patch)
+sha256sums=('fcbf7d2bed6840cb340b035fe9ac8cdcdb30ab84fea72c864bec5ac748af3199'
+            '6d5975823b55c8eb63fb96a6e06ff0346d86c9c1d3ec2989bc1947bd5f092134')
 
 prepare() {
-  mkdir -p build
+  patch -d $pkgname-$pkgver -p1 -i ../freecell-solver-fix-build.patch # Fix out of tree build
 }
 
 build() {
-  cd build
-  cmake ../$pkgname-$pkgver \
+  cmake -B build -S $pkgname-$pkgver \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DFCS_WITH_TEST_SUITE=OFF \
     -DBUILD_STATIC_LIBRARY=OFF
-  make
+  cmake --build build
 }
 
 package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-  install -Dm644 "$srcdir"/$pkgname-$pkgver/COPYING.html "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.html
+  DESTDIR="$pkgdir" cmake --install build
+  install -Dm644 $pkgname-$pkgver/COPYING.html "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.html
 }