[minetest-v04x] 01/04: Add luajit-2.1.patch and patch the FindLuaJIT cmake module to detect version

[Markus Koschany]

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

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

commit e4edc09518eecfeb9d8d0a426b64bb92db4c5a20
Author: Markus Koschany <apo at debian.org>
Date:   Sat Aug 26 23:48:43 2017 +0200

    Add luajit-2.1.patch and patch the FindLuaJIT cmake module to detect version
    
    2.1.
    
    Closes: #873324
---
 debian/patches/kfreebsd-gettext.patch |  8 ++++----
 debian/patches/luajit-2.1.patch       | 21 +++++++++++++++++++++
 debian/patches/series                 |  1 +
 debian/patches/shared_mods.patch      |  8 ++++----
 4 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/debian/patches/kfreebsd-gettext.patch b/debian/patches/kfreebsd-gettext.patch
index 1bd6379..ded7377 100644
--- a/debian/patches/kfreebsd-gettext.patch
+++ b/debian/patches/kfreebsd-gettext.patch
@@ -4,14 +4,14 @@ Subject: kfreebsd-gettext
 
 Fix the build on kFreeBSD as it uses glibc
 ---
- cmake/Modules/FindGettextLib.cmake |    7 ++++---
+ cmake/Modules/FindGettextLib.cmake | 7 ++++---
  1 file changed, 4 insertions(+), 3 deletions(-)
 
-Index: b/cmake/Modules/FindGettextLib.cmake
-===================================================================
+diff --git a/cmake/Modules/FindGettextLib.cmake b/cmake/Modules/FindGettextLib.cmake
+index cb1ce7b..7d479e8 100644
 --- a/cmake/Modules/FindGettextLib.cmake
 +++ b/cmake/Modules/FindGettextLib.cmake
-@@ -60,9 +60,10 @@ find_package_handle_standard_args(GetTex
+@@ -60,9 +60,10 @@ find_package_handle_standard_args(GetText DEFAULT_MSG ${GETTEXT_REQUIRED_VARS})
  
  if(GETTEXT_FOUND)
  	# BSD variants require special linkage as they don't use glibc
diff --git a/debian/patches/luajit-2.1.patch b/debian/patches/luajit-2.1.patch
new file mode 100644
index 0000000..9be6cc5
--- /dev/null
+++ b/debian/patches/luajit-2.1.patch
@@ -0,0 +1,21 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sat, 26 Aug 2017 23:48:05 +0200
+Subject: luajit 2.1
+
+---
+ cmake/Modules/FindLuaJIT.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/Modules/FindLuaJIT.cmake b/cmake/Modules/FindLuaJIT.cmake
+index e4335d8..dd6fd04 100644
+--- a/cmake/Modules/FindLuaJIT.cmake
++++ b/cmake/Modules/FindLuaJIT.cmake
+@@ -9,7 +9,7 @@
+ FIND_PATH(LUA_INCLUDE_DIR luajit.h
+ 	HINTS
+ 	$ENV{LUA_DIR}
+-	PATH_SUFFIXES include/luajit-2.0 include/luajit-5_1-2.0 include
++	PATH_SUFFIXES include/luajit-2.1 include/luajit-5_1-2.0 include
+ 	PATHS
+ 	~/Library/Frameworks
+ 	/Library/Frameworks
diff --git a/debian/patches/series b/debian/patches/series
index a7a312e..cec546b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ kfreebsd-gettext.patch
 mapper.patch
 shared_mods.patch
 rawlua.patch
+luajit-2.1.patch
diff --git a/debian/patches/shared_mods.patch b/debian/patches/shared_mods.patch
index fc0887a..faac09e 100644
--- a/debian/patches/shared_mods.patch
+++ b/debian/patches/shared_mods.patch
@@ -4,14 +4,14 @@ Subject: shared_mods
 
 Also look under /usr/share/games/minetest for mods, so that minetest-mod-* packages actually work
 ---
- builtin/mainmenu/modmgr.lua |    1 +
+ builtin/mainmenu/modmgr.lua | 1 +
  1 file changed, 1 insertion(+)
 
-Index: b/builtin/mainmenu/modmgr.lua
-===================================================================
+diff --git a/builtin/mainmenu/modmgr.lua b/builtin/mainmenu/modmgr.lua
+index dee0489..9b71331 100644
 --- a/builtin/mainmenu/modmgr.lua
 +++ b/builtin/mainmenu/modmgr.lua
-@@ -409,6 +409,7 @@ function modmgr.preparemodlist(data)
+@@ -403,6 +403,7 @@ function modmgr.preparemodlist(data)
  		modpath ~= "" then
  		get_mods(modpath,global_mods)
  	end

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