[minetest-v04x] 06/12: Update useless-depends.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 69f566f44dd507e7c65edc6712e127466feed2c7
Author: Markus Koschany <apo at gambaru.de>
Date:   Sun Jan 4 22:13:37 2015 +0100

    Update useless-depends.patch.
    
    Readd X11 library otherwise the build will fail due to missing symbols.
---
 debian/patches/dynamic-link.patch    |  8 ++++----
 debian/patches/rawlua.patch          |  4 ++--
 debian/patches/useless-depends.patch | 13 ++++++-------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/debian/patches/dynamic-link.patch b/debian/patches/dynamic-link.patch
index 0df19f2..7444963 100644
--- a/debian/patches/dynamic-link.patch
+++ b/debian/patches/dynamic-link.patch
@@ -44,10 +44,10 @@ index a9178a2..1c0fe50 100644
 +	MESSAGE(FAIL "Cannot find system-wide jsoncpp library")
 +ENDIF(JSON_FOUND)
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 63b73a6..b308ad2 100644
+index b647f43..4981f6d 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -264,7 +264,6 @@ if(NOT USE_LUAJIT)
+@@ -265,7 +265,6 @@ if(NOT USE_LUAJIT)
  	message (STATUS "LuaJIT not found, using bundled Lua.")
  	set(LUA_INCLUDE_DIR "${PROJECT_SOURCE_DIR}/lua/src")
  	set(LUA_LIBRARY "lua")
@@ -55,7 +55,7 @@ index 63b73a6..b308ad2 100644
  endif(NOT USE_LUAJIT)
  
  mark_as_advanced(LUA_LIBRARY)
-@@ -770,7 +769,6 @@ endif(USE_GETTEXT)
+@@ -771,7 +770,6 @@ endif(USE_GETTEXT)
  
  if (SQLITE3_FOUND)
  else (SQLITE3_FOUND)
@@ -63,7 +63,7 @@ index 63b73a6..b308ad2 100644
  endif (SQLITE3_FOUND)
  
  if (BUILD_CLIENT AND USE_FREETYPE)
-@@ -779,7 +777,6 @@ endif (BUILD_CLIENT AND USE_FREETYPE)
+@@ -780,7 +778,6 @@ endif (BUILD_CLIENT AND USE_FREETYPE)
  
  if (JSON_FOUND)
  else (JSON_FOUND)
diff --git a/debian/patches/rawlua.patch b/debian/patches/rawlua.patch
index fe3f787..099dbd6 100644
--- a/debian/patches/rawlua.patch
+++ b/debian/patches/rawlua.patch
@@ -16,10 +16,10 @@ Forwarded: not-needed
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index b308ad2..37dd3f9 100644
+index 4981f6d..c88299e 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -261,9 +261,9 @@ if(LUA_LIBRARY AND LUA_INCLUDE_DIR)
+@@ -262,9 +262,9 @@ if(LUA_LIBRARY AND LUA_INCLUDE_DIR)
  endif (LUA_LIBRARY AND LUA_INCLUDE_DIR)
  
  if(NOT USE_LUAJIT)
diff --git a/debian/patches/useless-depends.patch b/debian/patches/useless-depends.patch
index 5f92e1f..6f80317 100644
--- a/debian/patches/useless-depends.patch
+++ b/debian/patches/useless-depends.patch
@@ -8,18 +8,17 @@ no symbol were used.
 
 Forwarded: no
 ---
- src/CMakeLists.txt | 6 ------
- 1 file changed, 6 deletions(-)
+ src/CMakeLists.txt | 5 -----
+ 1 file changed, 5 deletions(-)
 
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 47fa5e2..63b73a6 100644
+index 47fa5e2..b647f43 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -143,11 +143,6 @@ if(WIN32)
- else()
+@@ -144,10 +144,6 @@ else()
  	# Unix probably
  	if(BUILD_CLIENT)
--		find_package(X11 REQUIRED)
+ 		find_package(X11 REQUIRED)
 -		find_package(OpenGL REQUIRED)
 -		find_package(JPEG REQUIRED)
 -		find_package(BZip2 REQUIRED)
@@ -27,7 +26,7 @@ index 47fa5e2..63b73a6 100644
  		if(APPLE)
  			FIND_LIBRARY(CARBON_LIB Carbon)
  			FIND_LIBRARY(COCOA_LIB Cocoa)
-@@ -169,7 +164,6 @@ else()
+@@ -169,7 +165,6 @@ else()
  	endif(APPLE)
  	#set(CLIENT_PLATFORM_LIBS -lXxf86vm)
  	# This way Xxf86vm is found on OpenBSD too

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