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

[Antonio Rojas]

    Date: Sunday, May 12, 2019 @ 14:04:43
  Author: arojas
Revision: 353037

archrelease: copy trunk to extra-x86_64

Added:
  kpatience/repos/extra-x86_64/PKGBUILD
    (from rev 353036, kpatience/trunk/PKGBUILD)
Deleted:
  kpatience/repos/extra-x86_64/PKGBUILD
  kpatience/repos/extra-x86_64/kpatience-bhs-0.20.patch

--------------------------+
 PKGBUILD                 |   81 +++++++++++++++++++++------------------------
 kpatience-bhs-0.20.patch |   52 ----------------------------
 2 files changed, 38 insertions(+), 95 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-05-12 14:04:33 UTC (rev 353036)
+++ PKGBUILD	2019-05-12 14:04:43 UTC (rev 353037)
@@ -1,43 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=kpatience
-pkgver=19.04.0
-pkgrel=2
-pkgdesc="Offers a selection of solitaire card games"
-url="https://kde.org/applications/games/kpatience/"
-arch=(x86_64)
-license=(GPL LGPL FDL)
-groups=(kde-applications kdegames)
-depends=(libkdegames freecell-solver black-hole-solver hicolor-icon-theme)
-makedepends=(extra-cmake-modules kdoctools)
-source=("https://download.kde.org/stable/applications/$pkgver/src/kpat-$pkgver.tar.xz"{,.sig}
-        kpatience-bhs-0.20.patch)
-sha256sums=('bcd295a3df422b5cfa8258bb3cd0be7e4405f44604681d98589f2982c44414a1'
-            'SKIP'
-            'd99035dc97d7480060cd466e966f1db48ff6e6c45a6aa0ad7076ebda57a107ba')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
-              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck at kde.org>
-
-prepare() {
-  mkdir -p build
-
-  cd kpat-$pkgver
-  patch -p1 -i ../kpatience-bhs-0.20.patch # Fix build with black-hole-solver 0.20
-}
-
-build() {
-  cd build
-  cmake ../kpat-$pkgver \
-    -DBUILD_TESTING=OFF \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
-    -DWITH_BH_SOLVER=ON
-  make
-}
-
-package() {
-  cd build
-  make DESTDIR="$pkgdir" install
-}

Copied: kpatience/repos/extra-x86_64/PKGBUILD (from rev 353036, kpatience/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-05-12 14:04:43 UTC (rev 353037)
@@ -0,0 +1,38 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=kpatience
+pkgver=19.04.1
+pkgrel=1
+pkgdesc="Offers a selection of solitaire card games"
+url="https://kde.org/applications/games/kpatience/"
+arch=(x86_64)
+license=(GPL LGPL FDL)
+groups=(kde-applications kdegames)
+depends=(libkdegames freecell-solver black-hole-solver hicolor-icon-theme)
+makedepends=(extra-cmake-modules kdoctools)
+source=("https://download.kde.org/stable/applications/$pkgver/src/kpat-$pkgver.tar.xz"{,.sig})
+sha256sums=('2c0b29e5d372d55d77ceced098b8262b11a431518e818eec052d867c21ad6896'
+            'SKIP')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
+              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck at kde.org>
+
+prepare() {
+  mkdir -p build
+}
+
+build() {
+  cd build
+  cmake ../kpat-$pkgver \
+    -DBUILD_TESTING=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DWITH_BH_SOLVER=ON
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Deleted: kpatience-bhs-0.20.patch
===================================================================
--- kpatience-bhs-0.20.patch	2019-05-12 14:04:33 UTC (rev 353036)
+++ kpatience-bhs-0.20.patch	2019-05-12 14:04:43 UTC (rev 353037)
@@ -1,52 +0,0 @@
-diff --git a/patsolve/golfsolver.h b/patsolve/golfsolver.h
---- a/patsolve/golfsolver.h
-+++ b/patsolve/golfsolver.h
-@@ -21,7 +21,6 @@
- class Golf;
- #include "patsolve.h"
- #ifdef WITH_BH_SOLVER
--#include <black-hole-solver/bool.h>
- #include <black-hole-solver/black_hole_solver.h>
- #endif
- 
-diff --git a/patsolve/golfsolver.cpp b/patsolve/golfsolver.cpp
---- a/patsolve/golfsolver.cpp
-+++ b/patsolve/golfsolver.cpp
-@@ -244,10 +244,13 @@
-         exit(-1);
-     }
-     black_hole_solver_enable_rank_reachability_prune(
--        solver_instance, TRUE);
--    black_hole_solver_enable_wrap_ranks(solver_instance, FALSE);
-+        solver_instance, true);
-+    black_hole_solver_enable_wrap_ranks(solver_instance, false);
-     black_hole_solver_enable_place_queens_on_kings(
--        solver_instance, TRUE);
-+        solver_instance, true);
-+#ifdef BLACK_HOLE_SOLVER__API__REQUIRES_SETUP_CALL
-+black_hole_solver_config_setup(solver_instance);
-+#endif
- 
-     int error_line_num;
-     int num_columns = BHS__GOLF__NUM_COLUMNS;
-@@ -261,6 +264,9 @@
-             error_line_num);
-         exit(-1);
-     }
-+#ifdef BLACK_HOLE_SOLVER__API__REQUIRES_SETUP_CALL
-+black_hole_solver_setup(solver_instance);
-+#endif
-     solver_ret = BLACK_HOLE_SOLVER__OUT_OF_ITERS;
- 
-     if (solver_instance)
-@@ -299,6 +305,9 @@
-                     m_winMoves.clear();
-                     int col_idx, card_rank, card_suit;
-                     int next_move_ret_code;
-+#ifdef BLACK_HOLE_SOLVER__API__REQUIRES_SETUP_CALL
-+                    black_hole_solver_init_solution_moves(solver_instance);
-+#endif
-                     while ((next_move_ret_code = black_hole_solver_get_next_move(
-                                 solver_instance, &col_idx, &card_rank, &card_suit)) ==
-                         BLACK_HOLE_SOLVER__SUCCESS)
-