[minetest-v04x] 02/04: Adapt the patch for non-LuaJIT platforms.

[Martin Quinson]

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

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

commit 94c198a94fbe0ef098b65963574308feca4c1f19
Author: Martin Quinson <martin.quinson at loria.fr>
Date:   Wed May 18 07:54:51 2016 +0200

    Adapt the patch for non-LuaJIT platforms.
---
 debian/changelog            |  4 +++-
 debian/patches/rawlua.patch | 13 +++++++------
 debian/patches/series       |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 61fe56f..28b3016 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 minetest (0.4.14+repack-2) UNRELEASED; urgency=medium
 
-  * FTBFS: sometimes, the fonts are not generated, so don't erase them.
+  * FTBFS: sometimes, the fonts are not generated. Don't erase then.
+  * Adapt the patch for non-LuaJIT platforms. I dropped it before
+    because it seemed integrated upstream, but was not.
 
  -- Martin Quinson <mquinson at debian.org>  Wed, 18 May 2016 07:49:54 +0200
 
diff --git a/debian/patches/rawlua.patch b/debian/patches/rawlua.patch
index 79d3a34..e648074 100644
--- a/debian/patches/rawlua.patch
+++ b/debian/patches/rawlua.patch
@@ -3,16 +3,16 @@ Date: Fri, 20 Feb 2015 22:46:25 +0100
 Subject: rawlua
 
 ---
- cmake/Modules/FindLua.cmake |    7 +++----
+ src/CMakeLists.txt |    7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)
 
-Index: b/cmake/Modules/FindLua.cmake
+Index: b/src/CMakeLists.txt
 ===================================================================
---- a/cmake/Modules/FindLua.cmake
-+++ b/cmake/Modules/FindLua.cmake
-@@ -17,9 +17,8 @@ else()
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -167,10 +167,9 @@ else()
+ 	message (STATUS "LuaJIT detection disabled! (ENABLE_LUAJIT=0)")
  endif()
- 
  if(NOT USE_LUAJIT)
 -	message(STATUS "LuaJIT not found, using bundled Lua.")
 -	set(LUA_LIBRARY "lua")
@@ -23,3 +23,4 @@ Index: b/cmake/Modules/FindLua.cmake
 +	set(LUA_LIBRARY "lua5.1")
  endif()
  
+ find_package(GMP REQUIRED)
diff --git a/debian/patches/series b/debian/patches/series
index 981c6ed..55015c8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,4 @@ kfreebsd-gettext.patch
 i18n.patch
 mapper.patch
 shared_mods.patch
-# rawlua.patch
+rawlua.patch

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