This is an automated email from the git hooks/post-receive script. mquinson pushed a commit to branch master in repository minetest-v04x.
commit 458957aba2b7cfd51bec36188c358c4894dcf012 Author: Martin Quinson <[email protected]> Date: Thu Aug 20 21:54:37 2015 +0200 Refresh patches --- debian/changelog | 3 +++ debian/patches/FindIrrlicht.cmake.patch | 22 ----------------- debian/patches/FindJson.cmake.patch | 42 --------------------------------- debian/patches/i18n.patch | 8 +++---- debian/patches/kfreebsd-gettext.patch | 32 ++++++++++++++----------- debian/patches/rawlua.patch | 21 ++++++++--------- debian/patches/series | 2 -- debian/patches/shared_mods.patch | 8 +++---- debian/rules | 2 ++ 9 files changed, 41 insertions(+), 99 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8190bae..2ea1d24 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ minetest (0.4.13+repack-1) UNRELEASED; urgency=medium * New upstream release. + * Drop the following patches. They were merged upstream. + - FindIrrlicht.cmake.patch, merged upstream. + - FindJson.cmake.patch, upstream added -DENABLE_SYSTEM_JSONCPP=1 * Fix freetype2 include dir variable name as per README.txt. Patch from Robert Bruce Park (Closes: #794823). diff --git a/debian/patches/FindIrrlicht.cmake.patch b/debian/patches/FindIrrlicht.cmake.patch deleted file mode 100644 index 42ec116..0000000 --- a/debian/patches/FindIrrlicht.cmake.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Sat, 21 Feb 2015 16:45:20 +0100 -Subject: FindIrrlicht.cmake - -Forwarded: https://github.com/minetest/minetest/pull/2371 ---- - cmake/Modules/FindIrrlicht.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/Modules/FindIrrlicht.cmake b/cmake/Modules/FindIrrlicht.cmake -index dce78fb..a84765d 100644 ---- a/cmake/Modules/FindIrrlicht.cmake -+++ b/cmake/Modules/FindIrrlicht.cmake -@@ -44,7 +44,7 @@ else() - /usr/include/irrlicht - ) - -- FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.a Irrlicht -+ FIND_LIBRARY(IRRLICHT_LIBRARY NAMES libIrrlicht.so libIrrlicht.a Irrlicht - PATHS - /usr/local/lib - /usr/lib diff --git a/debian/patches/FindJson.cmake.patch b/debian/patches/FindJson.cmake.patch deleted file mode 100644 index a456f2f..0000000 --- a/debian/patches/FindJson.cmake.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: Markus Koschany <[email protected]> -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 70a1d8f..569bb15 100644 --- a/debian/patches/i18n.patch +++ b/debian/patches/i18n.patch @@ -5,14 +5,14 @@ Subject: i18n Search for translation in the default path Forwarded: not-needed --- - src/main.cpp | 2 +- + src/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/main.cpp b/src/main.cpp -index bbf88e8..b2b37b1 100644 +Index: b/src/main.cpp +=================================================================== --- a/src/main.cpp +++ b/src/main.cpp -@@ -1111,7 +1111,7 @@ static bool init_common(int *log_level, const Settings &cmd_args, int argc, char +@@ -475,7 +475,7 @@ static bool init_common(int *log_level, init_gettext((porting::path_share + DIR_DELIM + "locale").c_str(), g_settings->get("language"), argc, argv); #else diff --git a/debian/patches/kfreebsd-gettext.patch b/debian/patches/kfreebsd-gettext.patch index 49c07d3..1bd6379 100644 --- a/debian/patches/kfreebsd-gettext.patch +++ b/debian/patches/kfreebsd-gettext.patch @@ -4,20 +4,24 @@ Subject: kfreebsd-gettext Fix the build on kFreeBSD as it uses glibc --- - cmake/Modules/FindGettextLib.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + cmake/Modules/FindGettextLib.cmake | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) -diff --git a/cmake/Modules/FindGettextLib.cmake b/cmake/Modules/FindGettextLib.cmake -index c6f731e..6ed74e4 100644 +Index: b/cmake/Modules/FindGettextLib.cmake +=================================================================== --- a/cmake/Modules/FindGettextLib.cmake +++ b/cmake/Modules/FindGettextLib.cmake -@@ -61,8 +61,8 @@ IF(GETTEXT_INCLUDE_DIR AND GETTEXT_MSGFMT) - ENDIF() - ELSE(WIN32) - # *BSD variants require special linkage as they don't use glibc -+ # DEBIAN CHANGE: kFreeBSD still uses glibc - IF(${CMAKE_SYSTEM_NAME} MATCHES "BSD") -- SET(GETTEXT_LIBRARY "intl") - ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "BSD") - SET(GETTEXT_FOUND TRUE) - ENDIF(WIN32) +@@ -60,9 +60,10 @@ find_package_handle_standard_args(GetTex + + if(GETTEXT_FOUND) + # BSD variants require special linkage as they don't use glibc +- if(${CMAKE_SYSTEM_NAME} MATCHES "BSD") +- set(GETTEXT_LIBRARY "intl") +- endif() ++ # DEBIAN CHANGE: kFreeBSD still uses glibc ++# if(${CMAKE_SYSTEM_NAME} MATCHES "BSD") ++# set(GETTEXT_LIBRARY "intl") ++# endif() + + set(GETTEXT_PO_PATH ${CMAKE_SOURCE_DIR}/po) + set(GETTEXT_MO_BUILD_PATH ${CMAKE_BINARY_DIR}/locale/<locale>/LC_MESSAGES) diff --git a/debian/patches/rawlua.patch b/debian/patches/rawlua.patch index ef57a65..2e56ee2 100644 --- a/debian/patches/rawlua.patch +++ b/debian/patches/rawlua.patch @@ -3,24 +3,23 @@ Date: Fri, 20 Feb 2015 22:46:25 +0100 Subject: rawlua --- - src/CMakeLists.txt | 7 +++---- + cmake/Modules/FindLua.cmake | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 93083f3..9bcab4e 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -284,10 +284,9 @@ if(LUA_LIBRARY AND LUA_INCLUDE_DIR) - endif (LUA_LIBRARY AND LUA_INCLUDE_DIR) +Index: b/cmake/Modules/FindLua.cmake +=================================================================== +--- a/cmake/Modules/FindLua.cmake ++++ b/cmake/Modules/FindLua.cmake +@@ -17,9 +17,8 @@ else() + endif() if(NOT USE_LUAJIT) -- message (STATUS "LuaJIT not found, using bundled Lua.") -- set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src") +- message(STATUS "LuaJIT not found, using bundled Lua.") - set(LUA_LIBRARY "lua") +- set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src") - add_subdirectory(lua) + message (STATUS "LuaJIT not found, using the version of Lua provided by the system.") + set(LUA_INCLUDE_DIR "/usr/include/lua5.1/") + set(LUA_LIBRARY "lua5.1") - endif(NOT USE_LUAJIT) + endif() - mark_as_advanced(LUA_LIBRARY) diff --git a/debian/patches/series b/debian/patches/series index db94311..55015c8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,6 +2,4 @@ kfreebsd-gettext.patch i18n.patch mapper.patch shared_mods.patch -FindJson.cmake.patch rawlua.patch -FindIrrlicht.cmake.patch diff --git a/debian/patches/shared_mods.patch b/debian/patches/shared_mods.patch index e4aa20a..fc0887a 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(+) -diff --git a/builtin/mainmenu/modmgr.lua b/builtin/mainmenu/modmgr.lua -index f293868..ea33941 100644 +Index: b/builtin/mainmenu/modmgr.lua +=================================================================== --- a/builtin/mainmenu/modmgr.lua +++ b/builtin/mainmenu/modmgr.lua -@@ -407,6 +407,7 @@ function modmgr.preparemodlist(data) +@@ -409,6 +409,7 @@ function modmgr.preparemodlist(data) modpath ~= "" then get_mods(modpath,global_mods) end diff --git a/debian/rules b/debian/rules index a094221..41bb050 100755 --- a/debian/rules +++ b/debian/rules @@ -57,6 +57,8 @@ override_dh_auto_configure: dh_auto_configure -- \ -DRUN_IN_PLACE=0 \ -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DENABLE_SYSTEM_JSONCPP=1 \ + -DJSON_INCLUDE_DIR=/usr/include/jsoncpp \ -DENABLE_GETTEXT=1 \ -DENABLE_FREETYPE=1 \ -DFREETYPE_INCLUDE_DIR_freetype2=/usr/include/freetype2 \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/minetest-v04x.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
