[minetest-v04x] 07/11: Add FindJson.cmake.patch.

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository minetest-v04x.

commit cbda547ac0e86d596c8e8f9f2c423975166aca0b
Author: Markus Koschany <apo at gambaru.de>
Date:   Fri Feb 20 20:21:51 2015 +0100

    Add FindJson.cmake.patch.
---
 debian/patches/FindJson.cmake.patch | 42 +++++++++++++++++++++++++++++++++++++
 debian/patches/i18n.patch           |  4 ++--
 debian/patches/series               |  1 +
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/debian/patches/FindJson.cmake.patch b/debian/patches/FindJson.cmake.patch
new file mode 100644
index 0000000..a456f2f
--- /dev/null
+++ b/debian/patches/FindJson.cmake.patch
@@ -0,0 +1,42 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Fri, 20 Feb 2015 20:21:30 +0100
+Subject: FindJson.cmake
+
+---
+ cmake/Modules/FindJson.cmake | 24 +++++++++++-------------
+ 1 file changed, 11 insertions(+), 13 deletions(-)
+
+diff --git a/cmake/Modules/FindJson.cmake b/cmake/Modules/FindJson.cmake
+index a9178a2..1c0fe50 100644
+--- a/cmake/Modules/FindJson.cmake
++++ b/cmake/Modules/FindJson.cmake
+@@ -1,18 +1,16 @@
+ # Look for json, use our own if not found
+ 
+-#FIND_PATH(JSON_INCLUDE_DIR json.h)
++FIND_PATH(JSON_INCLUDE_DIR json/json.h /usr/include/jsoncpp)
+ 
+-#FIND_LIBRARY(JSON_LIBRARY NAMES jsoncpp)
++FIND_LIBRARY(JSON_LIBRARY NAMES jsoncpp)
+ 
+-#IF(JSON_LIBRARY AND JSON_INCLUDE_DIR)
+-#	SET( JSON_FOUND TRUE )
+-#ENDIF(JSON_LIBRARY AND JSON_INCLUDE_DIR)
++IF(JSON_LIBRARY AND JSON_INCLUDE_DIR)
++	SET( JSON_FOUND TRUE )
++ENDIF(JSON_LIBRARY AND JSON_INCLUDE_DIR)
+ 
+-#IF(JSON_FOUND)
+-#	MESSAGE(STATUS "Found system jsoncpp header file in ${JSON_INCLUDE_DIR}")
+-#	MESSAGE(STATUS "Found system jsoncpp library ${JSON_LIBRARY}")
+-#ELSE(JSON_FOUND)
+-	SET(JSON_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/json)
+-	SET(JSON_LIBRARY jsoncpp)
+-	MESSAGE(STATUS "Using project jsoncpp library")
+-#ENDIF(JSON_FOUND)
++IF(JSON_FOUND)
++	MESSAGE(STATUS "Found system jsoncpp header file in ${JSON_INCLUDE_DIR}")
++	MESSAGE(STATUS "Found system jsoncpp library ${JSON_LIBRARY}")
++ELSE(JSON_FOUND)
++	MESSAGE(FAIL "Cannot find system-wide jsoncpp library")
++ENDIF(JSON_FOUND)
diff --git a/debian/patches/i18n.patch b/debian/patches/i18n.patch
index 1659041..70a1d8f 100644
--- a/debian/patches/i18n.patch
+++ b/debian/patches/i18n.patch
@@ -9,10 +9,10 @@ Forwarded: not-needed
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/main.cpp b/src/main.cpp
-index 0c5f73b..120c23b 100644
+index bbf88e8..b2b37b1 100644
 --- a/src/main.cpp
 +++ b/src/main.cpp
-@@ -1109,7 +1109,7 @@ static bool init_common(int *log_level, const Settings &cmd_args, int argc, char
+@@ -1111,7 +1111,7 @@ static bool init_common(int *log_level, const Settings &cmd_args, int argc, char
  	init_gettext((porting::path_share + DIR_DELIM + "locale").c_str(),
  		g_settings->get("language"), argc, argv);
  #else
diff --git a/debian/patches/series b/debian/patches/series
index e2a3bc7..31c786a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ kfreebsd-gettext.patch
 i18n.patch
 mapper.patch
 shared_mods.patch
+FindJson.cmake.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/minetest-v04x.git