From c5922a3b72ac1651605ca32355e753e16f3aa241 Mon Sep 17 00:00:00 2001
From: "B. Watson" <yalhcru@gmail.com>
Date: Mon, 17 Oct 2016 15:46:28 -0400
Subject: system/sdl-jstest: Updated for version 20160824git.

---
 system/sdl-jstest/no_sdl2.diff          | 16 +++++++++-------
 system/sdl-jstest/sdl-jstest.SlackBuild |  6 +++++-
 system/sdl-jstest/sdl-jstest.info       |  6 +++---
 3 files changed, 17 insertions(+), 11 deletions(-)

(limited to 'system')

diff --git a/system/sdl-jstest/no_sdl2.diff b/system/sdl-jstest/no_sdl2.diff
index 51738bfc40..5a008d15fa 100644
--- a/system/sdl-jstest/no_sdl2.diff
+++ b/system/sdl-jstest/no_sdl2.diff
@@ -1,7 +1,7 @@
-diff -Naur sdl-jstest-20150806git/CMakeLists.txt sdl-jstest-20150806git.patched/CMakeLists.txt
---- sdl-jstest-20150806git/CMakeLists.txt	2015-09-15 02:46:06.000000000 -0400
-+++ sdl-jstest-20150806git.patched/CMakeLists.txt	2015-09-15 02:55:53.000000000 -0400
-@@ -22,7 +22,6 @@
+diff -Naur sdl-jstest-20160824git/CMakeLists.txt sdl-jstest-20160824git.patched/CMakeLists.txt
+--- sdl-jstest-20160824git/CMakeLists.txt	2016-10-17 15:36:01.184523186 -0400
++++ sdl-jstest-20160824git.patched/CMakeLists.txt	2016-10-17 15:44:48.393556770 -0400
+@@ -23,7 +23,6 @@
  find_package(SDL REQUIRED)
  
  find_package(PkgConfig REQUIRED)
@@ -9,10 +9,11 @@ diff -Naur sdl-jstest-20150806git/CMakeLists.txt sdl-jstest-20150806git.patched/
  
  find_program(DOCBOOK2XMAN docbook2x-man)
  if(DOCBOOK2XMAN)
-@@ -43,11 +42,6 @@
+@@ -44,12 +43,6 @@
    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
  endif()
  
+-link_directories(${SDL2_LIBRARY_DIRS})
 -add_executable(sdl2-jstest sdl2-jstest.c)
 -target_link_libraries(sdl2-jstest ${SDL2_LIBRARIES} ${CURSES_LIBRARIES})
 -target_include_directories(sdl2-jstest PUBLIC ${SDL2_INCLUDE_DIRS} ${CURSES_INCLUDE_DIR})
@@ -21,10 +22,11 @@ diff -Naur sdl-jstest-20150806git/CMakeLists.txt sdl-jstest-20150806git.patched/
  add_executable(sdl-jstest sdl-jstest.c)
  target_link_libraries(sdl-jstest ${SDL_LIBRARY} ${CURSES_LIBRARIES})
  target_include_directories(sdl-jstest PUBLIC ${SDL_INCLUDE_DIR} ${CURSES_INCLUDE_DIR})
-@@ -59,22 +53,17 @@
+@@ -60,23 +53,17 @@
+     COMMAND ${DOCBOOK2XMAN} ${CMAKE_CURRENT_SOURCE_DIR}/sdl-jstest.xml
      DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/sdl-jstest.xml
      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
- 
+-
 -  add_custom_command(
 -    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/sdl2-jstest.1
 -    COMMAND ${DOCBOOK2XMAN} ${CMAKE_CURRENT_SOURCE_DIR}/sdl2-jstest.xml
diff --git a/system/sdl-jstest/sdl-jstest.SlackBuild b/system/sdl-jstest/sdl-jstest.SlackBuild
index 76f3b83dfe..80840f5df1 100644
--- a/system/sdl-jstest/sdl-jstest.SlackBuild
+++ b/system/sdl-jstest/sdl-jstest.SlackBuild
@@ -22,6 +22,10 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20161017 bkw:
+# - updated for latest git
+# - redo no_sdl2.diff for new version
+
 # 20150915 bkw:
 # - updated for *almost* the latest git: ceef74 is "Allow building with
 #   old CMake 2.8". The next commit after that, 7b7923, reverts it so
@@ -34,7 +38,7 @@
 #   if installed
 
 PRGNAM=sdl-jstest
-VERSION=${VERSION:-20150806git}
+VERSION=${VERSION:-20160824git}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
diff --git a/system/sdl-jstest/sdl-jstest.info b/system/sdl-jstest/sdl-jstest.info
index 07b4ba8195..22ae0d7dad 100644
--- a/system/sdl-jstest/sdl-jstest.info
+++ b/system/sdl-jstest/sdl-jstest.info
@@ -1,8 +1,8 @@
 PRGNAM="sdl-jstest"
-VERSION="20150806git"
+VERSION="20160824git"
 HOMEPAGE="https://github.com/Grumbel/sdl-jstest"
-DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/sdl-jstest-20150806git.tar.gz"
-MD5SUM="d15b2a51e02daa8cfe042f659054199f"
+DOWNLOAD="http://urchlay.naptime.net/~urchlay/src/sdl-jstest-20160824git.tar.gz"
+MD5SUM="a4f960c86567d4b1258d43a200c4550f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3