From ffaf1adb7f12eafa9eb39c7876d18a33303d0514 Mon Sep 17 00:00:00 2001
From: Shlomi Fish <shlomif@shlomifish.org>
Date: Wed, 8 May 2019 23:42:00 +0300
Subject: [PATCH] - New version 0.24.0

---
 .gitignore             |  1 +
 bhs-xxhash.patch       | 21 ---------------------
 black-hole-solver.spec |  7 ++-----
 sources                |  2 +-
 4 files changed, 4 insertions(+), 27 deletions(-)
 delete mode 100644 bhs-xxhash.patch

diff --git a/.gitignore b/.gitignore
index b4039de..0d9d7ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /black-hole-solver-0.20.0.tar.xz
 /black-hole-solver-0.22.0.tar.xz
+/black-hole-solver-0.24.0.tar.xz
diff --git a/bhs-xxhash.patch b/bhs-xxhash.patch
deleted file mode 100644
index f4a2e8c..0000000
--- a/bhs-xxhash.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- black-hole-solver-0.20.0/xxHash-wrapper/wrap_xxhash.h.orig	2019-05-08 17:45:12.677537490 +0300
-+++ black-hole-solver-0.20.0/xxHash-wrapper/wrap_xxhash.h	2019-05-08 17:45:18.726498823 +0300
-@@ -10,7 +10,6 @@
- // wrap_xxhash.h
- #pragma once
- 
--#define XXH_PRIVATE_API
- #include "xxhash.h"
- 
- #if SIZEOF_VOID_P == 4
---- black-hole-solver-0.20.0/CMakeLists.txt.orig	2019-04-25 13:16:38.000222097 +0300
-+++ black-hole-solver-0.20.0/CMakeLists.txt	2019-04-25 13:17:14.864067712 +0300
-@@ -169,7 +169,7 @@
-     ARCHIVE DESTINATION "lib${LIB_SUFFIX}"
- )
- 
--TARGET_LINK_LIBRARIES("${LIB_BASE}" ${LIBTOKYO_CAB_LIBS})
-+TARGET_LINK_LIBRARIES("${LIB_BASE}" ${LIBTOKYO_CAB_LIBS} "xxhash")
- 
- LIST (APPEND BLACK_HOLE_SOLVER_LIBS "${LIB_BASE}")
- 
diff --git a/black-hole-solver.spec b/black-hole-solver.spec
index 0002ae7..9fefe3f 100644
--- a/black-hole-solver.spec
+++ b/black-hole-solver.spec
@@ -5,12 +5,11 @@
 %define develname lib%{basen}-devel
 
 Name: %{basen}
-Version: 0.22.0
+Version: 0.24.0
 Release: 1%{?dist}
 # The entire source code is MIT except xxHash-0.6.5/ which is BSD
 License: MIT and BSD
 Source0: https://fc-solve.shlomifish.org/downloads/fc-solve/%{basen}-%{version}.tar.xz
-Patch2: bhs-xxhash.patch
 URL: https://www.shlomifish.org/open-source/projects/black-hole-solitaire-solver/
 Requires: %{libname}%{?_isa} = %version-%release
 Summary: The Black Hole Solitaire Solver Executable
@@ -87,12 +86,10 @@ Development tools for the Black Hole Solitaire Solver.
 
 %prep
 %setup -q
-%autopatch -p1
-rm -fr xxHash*/xxHash*
 
 %build
 # The game limit flags are recommended by the PySolFC README.
-%cmake -DLOCALE_INSTALL_DIR=%{_datadir}/locale -DLIB_INSTALL_DIR=%{_libdir} -DBUILD_STATIC_LIBRARY= -DDISABLE_APPLYING_RPATH=TRUE
+%cmake -DLOCALE_INSTALL_DIR=%{_datadir}/locale -DLIB_INSTALL_DIR=%{_libdir} -DBUILD_STATIC_LIBRARY= -DDISABLE_APPLYING_RPATH=TRUE -DUSE_SYSTEM_XHASH=TRUE
 %make_build
 
 %check
diff --git a/sources b/sources
index 9913d79..530dff8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (black-hole-solver-0.22.0.tar.xz) = 0862de3d31d2779906151017397f49545f49cf634a8597601ee1ead952989d018ed3704259791584449fdeb3a876888bd090a79481bbe46f24af43eb123861ae
+SHA512 (black-hole-solver-0.24.0.tar.xz) = aedef1e97e1a55c11ba0952693bbf6312a97a9f3127ab1668c030769284751dc55a8010b273077f5d231c708997d4fc7a5b4438e2a161d7d55c86310e4a4f963