[minetest-v04x] 03/12: Rebase hurd.patch. Add *.patch extension to all files.
Markus Koschany
apo-guest at moszumanska.debian.org
Sun Jan 4 22:23:30 UTC 2015
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 ede3ab66267864bc01a550d08febcca0a979187c
Author: Markus Koschany <apo at gambaru.de>
Date: Sun Jan 4 21:04:09 2015 +0100
Rebase hurd.patch. Add *.patch extension to all files.
---
debian/patches/debianization.patch | 14 +-
...p-file-fix-icon => desktop-file-fix-icon.patch} | 10 +-
debian/patches/dynamic-link.patch | 69 +++----
debian/patches/gcc47.patch | 16 +-
debian/patches/hurd.patch | 215 +++++++++++++++++++++
debian/patches/i18n.patch | 14 +-
debian/patches/jthread-changed.patch | 73 -------
debian/patches/kfreebsd-gettext.patch | 13 +-
debian/patches/mapper.patch | 12 +-
debian/patches/rawlua | 34 ----
debian/patches/rawlua.patch | 25 +++
debian/patches/series | 10 +-
debian/patches/{shared_mods => shared_mods.patch} | 13 +-
debian/patches/useless-depends.patch | 20 +-
14 files changed, 339 insertions(+), 199 deletions(-)
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index 3057d6e..a94e9ec 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -1,14 +1,16 @@
-Description: install binaries to /usr/games and don't install changelog twice
-Author: Michael Gilbert <michael.s.gilbert at gmail.com>
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Sun, 4 Jan 2015 20:49:22 +0100
+Subject: debianization
+
---
- cmake/Modules/FindIrrlicht.cmake | 2 +-
+ cmake/Modules/FindIrrlicht.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-Index: b/cmake/Modules/FindIrrlicht.cmake
-===================================================================
+diff --git a/cmake/Modules/FindIrrlicht.cmake b/cmake/Modules/FindIrrlicht.cmake
+index bd00422..f94159a 100644
--- a/cmake/Modules/FindIrrlicht.cmake
+++ b/cmake/Modules/FindIrrlicht.cmake
-@@ -50,7 +50,7 @@
+@@ -50,7 +50,7 @@ else()
/usr/include/irrlicht
)
diff --git a/debian/patches/desktop-file-fix-icon b/debian/patches/desktop-file-fix-icon.patch
similarity index 61%
rename from debian/patches/desktop-file-fix-icon
rename to debian/patches/desktop-file-fix-icon.patch
index 8d9aeef..7e8026e 100644
--- a/debian/patches/desktop-file-fix-icon
+++ b/debian/patches/desktop-file-fix-icon.patch
@@ -1,10 +1,14 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Sun, 4 Jan 2015 20:49:22 +0100
+Subject: desktop-file-fix-icon
+
In the upstream desktop file, use the icon name of what we install (Closes: #713808).
---
- misc/minetest.desktop | 2 +-
+ misc/minetest.desktop | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-Index: b/misc/minetest.desktop
-===================================================================
+diff --git a/misc/minetest.desktop b/misc/minetest.desktop
+index 486a8e0..3f5b9c4 100644
--- a/misc/minetest.desktop
+++ b/misc/minetest.desktop
@@ -3,7 +3,7 @@ Name=Minetest
diff --git a/debian/patches/dynamic-link.patch b/debian/patches/dynamic-link.patch
index f0f26da..56a72e4 100644
--- a/debian/patches/dynamic-link.patch
+++ b/debian/patches/dynamic-link.patch
@@ -1,41 +1,14 @@
-Description: Changes the static linking of external libraries to dynamic link
-Author: Matthew Bekkema <mat8913ftw at gmail.com>
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Sun, 4 Jan 2015 20:49:22 +0100
+Subject: dynamic-link
---
- cmake/Modules/FindJson.cmake | 24 +++++++++++-------------
- src/CMakeLists.txt | 3 ---
+ cmake/Modules/FindJson.cmake | 24 +++++++++++-------------
+ src/CMakeLists.txt | 3 ---
2 files changed, 11 insertions(+), 16 deletions(-)
-Index: b/src/CMakeLists.txt
-===================================================================
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -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")
-- add_subdirectory(lua)
- endif(NOT USE_LUAJIT)
-
- mark_as_advanced(LUA_LIBRARY)
-@@ -751,7 +750,6 @@ endif(USE_GETTEXT)
-
- if (SQLITE3_FOUND)
- else (SQLITE3_FOUND)
-- add_subdirectory(sqlite)
- endif (SQLITE3_FOUND)
-
- if (BUILD_CLIENT AND USE_FREETYPE)
-@@ -760,7 +758,6 @@ endif (BUILD_CLIENT AND USE_FREETYPE)
-
- if (JSON_FOUND)
- else (JSON_FOUND)
-- add_subdirectory(json)
- endif (JSON_FOUND)
-
- #end
-Index: b/cmake/Modules/FindJson.cmake
-===================================================================
+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 @@
@@ -68,3 +41,31 @@ Index: b/cmake/Modules/FindJson.cmake
+ELSE(JSON_FOUND)
+ 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
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -264,7 +264,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")
+- add_subdirectory(lua)
+ endif(NOT USE_LUAJIT)
+
+ mark_as_advanced(LUA_LIBRARY)
+@@ -770,7 +769,6 @@ endif(USE_GETTEXT)
+
+ if (SQLITE3_FOUND)
+ else (SQLITE3_FOUND)
+- add_subdirectory(sqlite)
+ endif (SQLITE3_FOUND)
+
+ if (BUILD_CLIENT AND USE_FREETYPE)
+@@ -779,7 +777,6 @@ endif (BUILD_CLIENT AND USE_FREETYPE)
+
+ if (JSON_FOUND)
+ else (JSON_FOUND)
+- add_subdirectory(json)
+ endif (JSON_FOUND)
+
+ #end
diff --git a/debian/patches/gcc47.patch b/debian/patches/gcc47.patch
index ba4db71..07ebbff 100644
--- a/debian/patches/gcc47.patch
+++ b/debian/patches/gcc47.patch
@@ -1,18 +1,16 @@
-Description: Fix FTBFS with gcc-4.7
- Fix missing inclusion of <unistd.h> in src/filesys.cpp.
-Author: "P. J. McDermott" <pjm at nac.net>
-Bug-Debian: http://bugs.debian.org/667280
-Last-Update: 2012-04-19
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Sun, 4 Jan 2015 20:49:22 +0100
+Subject: gcc47
---
- src/filesys.cpp | 1 +
+ src/filesys.cpp | 1 +
1 file changed, 1 insertion(+)
-Index: b/src/filesys.cpp
-===================================================================
+diff --git a/src/filesys.cpp b/src/filesys.cpp
+index 7847156..e5fec32 100644
--- a/src/filesys.cpp
+++ b/src/filesys.cpp
-@@ -232,6 +232,7 @@ std::string TempPath()
+@@ -193,6 +193,7 @@ std::string TempPath()
#else // POSIX
diff --git a/debian/patches/hurd.patch b/debian/patches/hurd.patch
new file mode 100644
index 0000000..64d3f78
--- /dev/null
+++ b/debian/patches/hurd.patch
@@ -0,0 +1,215 @@
+From: Markus Koschany <apo at gambaru.de>
+Date: Sun, 4 Jan 2015 21:03:07 +0100
+Subject: hurd
+
+---
+ src/cguittfont/irrUString.h | 2 +-
+ src/jthread/jevent.h | 4 ++--
+ src/jthread/jsemaphore.h | 4 ++--
+ src/jthread/pthread/jevent.cpp | 2 +-
+ src/jthread/pthread/jsemaphore.cpp | 20 ++++++++++----------
+ src/porting.h | 9 ++++++---
+ 6 files changed, 22 insertions(+), 19 deletions(-)
+
+diff --git a/src/cguittfont/irrUString.h b/src/cguittfont/irrUString.h
+index 32efaa6..fc04187 100644
+--- a/src/cguittfont/irrUString.h
++++ b/src/cguittfont/irrUString.h
+@@ -45,7 +45,7 @@
+ #define __BYTE_ORDER 0
+ #define __LITTLE_ENDIAN 0
+ #define __BIG_ENDIAN 1
+-#elif __MACH__
++#elif defined(__MACH__) && defined(__APPLE__)
+ #include <machine/endian.h>
+ #else
+ #include <endian.h>
+diff --git a/src/jthread/jevent.h b/src/jthread/jevent.h
+index f97e09c..9ea7ebd 100644
+--- a/src/jthread/jevent.h
++++ b/src/jthread/jevent.h
+@@ -30,7 +30,7 @@
+
+ #ifdef _WIN32
+ #include <windows.h>
+-#elif __MACH__
++#elif defined(__MACH__) && defined(__APPLE__)
+ #include <mach/mach.h>
+ #include <mach/task.h>
+ #include <mach/semaphore.h>
+@@ -43,7 +43,7 @@
+ class Event {
+ #ifdef _WIN32
+ HANDLE hEvent;
+-#elif __MACH__
++#elif defined(__MACH__) && defined(__APPLE__)
+ semaphore_t sem;
+ #else
+ sem_t sem;
+diff --git a/src/jthread/jsemaphore.h b/src/jthread/jsemaphore.h
+index 4ab006a..32e9bc2 100644
+--- a/src/jthread/jsemaphore.h
++++ b/src/jthread/jsemaphore.h
+@@ -24,7 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
+ #include <windows.h>
+ #include <assert.h>
+ #define MAX_SEMAPHORE_COUNT 1024
+-#elif __MACH__
++#elif defined(__MACH__) && defined(__APPLE__)
+ #include <pthread.h>
+ #include <mach/mach.h>
+ #include <mach/task.h>
+@@ -52,7 +52,7 @@ public:
+ private:
+ #if defined(WIN32)
+ HANDLE m_hSemaphore;
+-#elif __MACH__
++#elif defined(__MACH__) && defined(__APPLE__)
+ semaphore_t m_semaphore;
+ int semcount;
+ #else
+diff --git a/src/jthread/pthread/jevent.cpp b/src/jthread/pthread/jevent.cpp
+index 6a45a37..e1d40f4 100644
+--- a/src/jthread/pthread/jevent.cpp
++++ b/src/jthread/pthread/jevent.cpp
+@@ -29,7 +29,7 @@
+
+ #define UNUSED(expr) do { (void)(expr); } while (0)
+
+-#ifdef __MACH__
++#if defined(__MACH__) && defined(__APPLE__)
+ #undef sem_t
+ #define sem_t semaphore_t
+ #undef sem_init
+diff --git a/src/jthread/pthread/jsemaphore.cpp b/src/jthread/pthread/jsemaphore.cpp
+index 16e001e..15281ba 100644
+--- a/src/jthread/pthread/jsemaphore.cpp
++++ b/src/jthread/pthread/jsemaphore.cpp
+@@ -20,13 +20,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
+ #include <errno.h>
+ #include <sys/time.h>
+ #include "jthread/jsemaphore.h"
+-#ifdef __MACH__
++#if defined(__MACH__) && defined(__APPLE__)
+ #include <unistd.h>
+ #endif
+
+ #define UNUSED(expr) do { (void)(expr); } while (0)
+
+-#ifdef __MACH__
++#if defined(__MACH__) && defined(__APPLE__)
+ #undef sem_t
+ #undef sem_init
+ #undef sem_wait
+@@ -44,7 +44,7 @@ JSemaphore::JSemaphore() {
+ int sem_init_retval = sem_init(&m_semaphore,0,0);
+ assert(sem_init_retval == 0);
+ UNUSED(sem_init_retval);
+-#ifdef __MACH__
++#if defined(__MACH__) && defined(__APPLE__)
+ semcount = 0;
+ #endif
+ }
+@@ -73,7 +73,7 @@ void JSemaphore::Post() {
+ int sem_post_retval = sem_post(&m_semaphore);
+ assert(sem_post_retval == 0);
+ UNUSED(sem_post_retval);
+-#ifdef __MACH__
++#if defined(__MACH__) && defined(__APPLE__)
+ pthread_mutex_lock(&semcount_mutex);
+ semcount++;
+ pthread_mutex_unlock(&semcount_mutex);
+@@ -84,7 +84,7 @@ void JSemaphore::Wait() {
+ int sem_wait_retval = sem_wait(&m_semaphore);
+ assert(sem_wait_retval == 0);
+ UNUSED(sem_wait_retval);
+-#ifdef __MACH__
++#if defined(__MACH__) && defined(__APPLE__)
+ pthread_mutex_lock(&semcount_mutex);
+ semcount--;
+ pthread_mutex_unlock(&semcount_mutex);
+@@ -92,7 +92,7 @@ void JSemaphore::Wait() {
+ }
+
+ bool JSemaphore::Wait(unsigned int time_ms) {
+-#ifdef __MACH__
++#if defined(__MACH__) && defined(__APPLE__)
+ mach_timespec_t waittime;
+ waittime.tv_sec = time_ms / 1000;
+ waittime.tv_nsec = 1000000 * (time_ms % 1000);
+@@ -106,14 +106,14 @@ bool JSemaphore::Wait(unsigned int time_ms) {
+ return false;
+ }
+
+-#ifndef __MACH__
++#if !(defined(__MACH__) && defined(__APPLE__))
+ waittime.tv_nsec = ((time_ms % 1000) * 1000 * 1000) + (now.tv_usec * 1000);
+ waittime.tv_sec = (time_ms / 1000) + (waittime.tv_nsec / (1000*1000*1000)) + now.tv_sec;
+ waittime.tv_nsec %= 1000*1000*1000;
+ #endif
+
+ errno = 0;
+-#ifdef __MACH__
++#if defined(__MACH__) && defined(__APPLE__)
+ int sem_wait_retval = semaphore_timedwait(m_semaphore, waittime);
+ if (sem_wait_retval == KERN_OPERATION_TIMED_OUT) {
+ errno = ETIMEDOUT;
+@@ -128,7 +128,7 @@ bool JSemaphore::Wait(unsigned int time_ms) {
+
+ if (sem_wait_retval == 0)
+ {
+-#ifdef __MACH__
++#if defined(__MACH__) && defined(__APPLE__)
+ pthread_mutex_lock(&semcount_mutex);
+ semcount--;
+ pthread_mutex_unlock(&semcount_mutex);
+@@ -144,7 +144,7 @@ bool JSemaphore::Wait(unsigned int time_ms) {
+
+ int JSemaphore::GetValue() {
+ int retval = 0;
+-#ifdef __MACH__
++#if defined(__MACH__) && defined(__APPLE__)
+ pthread_mutex_lock(&semcount_mutex);
+ retval = semcount;
+ pthread_mutex_unlock(&semcount_mutex);
+diff --git a/src/porting.h b/src/porting.h
+index a184af8..a579968 100644
+--- a/src/porting.h
++++ b/src/porting.h
+@@ -59,7 +59,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
+ #include <unistd.h>
+ #include <stdint.h> //for uintptr_t
+
+- #if (defined(linux) || defined(__linux)) && !defined(_GNU_SOURCE)
++#if (defined(linux) || defined(__linux) || defined(__GNU__)) && !defined(_GNU_SOURCE)
+ #define _GNU_SOURCE
+ #endif
+
+@@ -227,7 +227,7 @@ void initIrrlicht(irr::IrrlichtDevice * );
+ #else // Posix
+ #include <sys/time.h>
+ #include <time.h>
+-#ifdef __MACH__
++#if defined(__MACH__) && defined(__APPLE__)
+ #include <mach/clock.h>
+ #include <mach/mach.h>
+ #endif
+@@ -257,7 +257,7 @@ void initIrrlicht(irr::IrrlichtDevice * );
+ {
+ struct timespec ts;
+ // from http://stackoverflow.com/questions/5167269/clock-gettime-alternative-in-mac-os-x
+-#ifdef __MACH__ // OS X does not have clock_gettime, use clock_get_time
++#if defined(__MACH__) && defined(__APPLE__) // OS X does not have clock_gettime, use clock_get_time
+ clock_serv_t cclock;
+ mach_timespec_t mts;
+ host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
+@@ -359,6 +359,9 @@ inline u32 getDeltaMs(u32 old_time_ms, u32 new_time_ms)
+ }
+ #elif defined(_WIN32)
+ inline void setThreadName(const char* name) {}
++#elif defined(__GNU__)
++//#warning "GNU/Hurd platform, pthread_setname_np not yet supported"
++inline void setThreadName(const char* name) {}
+ #else
+ #warning "Unrecognized platform, thread names will not be available."
+ inline void setThreadName(const char* name) {}
diff --git a/debian/patches/i18n.patch b/debian/patches/i18n.patch
index 8877fd4..23e28ea 100644
--- a/debian/patches/i18n.patch
+++ b/debian/patches/i18n.patch
@@ -1,16 +1,16 @@
-Description: Search for translation in the default path
-Author: Martin Quinson
-Forwarded: upstream won't take it as they install to non-standard paths
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Sun, 4 Jan 2015 20:49:22 +0100
+Subject: i18n
---
- src/main.cpp | 2 +-
+ src/main.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-Index: b/src/main.cpp
-===================================================================
+diff --git a/src/main.cpp b/src/main.cpp
+index 0c5f73b..120c23b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
-@@ -1034,7 +1034,7 @@ int main(int argc, char *argv[])
+@@ -1109,7 +1109,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/jthread-changed.patch b/debian/patches/jthread-changed.patch
deleted file mode 100644
index e7ad6a3..0000000
--- a/debian/patches/jthread-changed.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Description: Adapt to upstream modification of jmutex.h
- Upstream modified their dependency jthread, in a way that we cannot
- fix when using a system-wide jthread.
-
- SO THIS PATCH IS DISABLED FOR NOW
-
- mutex so we need to re-add these things another way.
- Two changes so far:
- .
- - They added a class "Event" to their jmutex.h, so we add it to event.h
- instead.
- - They added a method IsSameThread()
-
-Author: Matthew Bekkema <mat8913ftw at gmail.com>
-Date: Sun Mar 24 19:15:54 2013 +1100
-
-
----
- src/emerge.h | 1 +
- src/event.h | 22 ++++++++++++++++++++++
- 2 files changed, 23 insertions(+)
-
-Index: b/src/emerge.h
-===================================================================
---- a/src/emerge.h
-+++ b/src/emerge.h
-@@ -24,6 +24,7 @@
- #include "irr_v3d.h"
- #include "util/container.h"
- #include "map.h" // for ManualMapVoxelManipulator
-+#include "event.h"
-
- #define MGPARAMS_SET_MGNAME 1
- #define MGPARAMS_SET_SEED 2
-Index: b/src/event.h
-===================================================================
---- a/src/event.h
-+++ b/src/event.h
-@@ -19,6 +19,7 @@
-
- #ifndef EVENT_HEADER
- #define EVENT_HEADER
-+#include <semaphore.h>
-
- class MtEvent
- {
-@@ -68,5 +69,26 @@
- virtual void dereg(MtEventReceiver *r, const char *type) = 0;
- };
-
-+class Event {
-+ sem_t sem;
-+
-+public:
-+ Event() {
-+ sem_init(&sem, 0, 0);
-+ }
-+
-+ ~Event() {
-+ sem_destroy(&sem);
-+ }
-+
-+ void wait() {
-+ sem_wait(&sem);
-+ }
-+
-+ void signal() {
-+ sem_post(&sem);
-+ }
-+};
-+
- #endif
-
diff --git a/debian/patches/kfreebsd-gettext.patch b/debian/patches/kfreebsd-gettext.patch
index 194ecb8..52fc044 100644
--- a/debian/patches/kfreebsd-gettext.patch
+++ b/debian/patches/kfreebsd-gettext.patch
@@ -1,15 +1,16 @@
-Description: Fix the build on kFreeBSD as it uses glibc
-Author: Matthew Bekkema <mat8913ftw at gmail.com>
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Sun, 4 Jan 2015 20:49:22 +0100
+Subject: kfreebsd-gettext
---
- cmake/Modules/FindGettextLib.cmake | 2 +-
+ cmake/Modules/FindGettextLib.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-Index: b/cmake/Modules/FindGettextLib.cmake
-===================================================================
+diff --git a/cmake/Modules/FindGettextLib.cmake b/cmake/Modules/FindGettextLib.cmake
+index c6f731e..6ed74e4 100644
--- a/cmake/Modules/FindGettextLib.cmake
+++ b/cmake/Modules/FindGettextLib.cmake
-@@ -61,8 +61,8 @@ IF(GETTEXT_INCLUDE_DIR AND GETTEXT_MSGFM
+@@ -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
diff --git a/debian/patches/mapper.patch b/debian/patches/mapper.patch
index a88ea9a..92ae83c 100644
--- a/debian/patches/mapper.patch
+++ b/debian/patches/mapper.patch
@@ -1,9 +1,13 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Sun, 4 Jan 2015 20:49:23 +0100
+Subject: mapper
+
---
- util/minetestmapper.py | 4 ++--
+ util/minetestmapper.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-Index: b/util/minetestmapper.py
-===================================================================
+diff --git a/util/minetestmapper.py b/util/minetestmapper.py
+index 9d364e1..d10f8e7 100755
--- a/util/minetestmapper.py
+++ b/util/minetestmapper.py
@@ -1,4 +1,4 @@
@@ -12,7 +16,7 @@ Index: b/util/minetestmapper.py
# -*- coding: utf-8 -*-
# This program is free software. It comes without any warranty, to
-@@ -203,7 +203,7 @@ if path[-1:] != "/" and path[-1:] != "\\
+@@ -203,7 +203,7 @@ if path[-1:] != "/" and path[-1:] != "\\":
# Load color information for the blocks.
colors = {}
try:
diff --git a/debian/patches/rawlua b/debian/patches/rawlua
deleted file mode 100644
index bc06645..0000000
--- a/debian/patches/rawlua
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: use the right version of lua when not using luajit
- When available, we use the luajit for performance. But when this is
- not available (as on hurd mipsel and other architecture), we fallback
- to the raw lua implementation.
- .
- Upstream embeeds its own copy of lua implementation for that case,
- but we prune it and prefer the system version of lua.
- .
- This patch is here to use the correct name of the lua library in that
- case.
-Author: Martin Quinson
-Upstream-status: not appliable
-
----
- src/CMakeLists.txt | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-Index: b/src/CMakeLists.txt
-===================================================================
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -262,9 +262,9 @@ if(LUA_LIBRARY AND LUA_INCLUDE_DIR)
- endif (LUA_LIBRARY AND LUA_INCLUDE_DIR)
-
- 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")
-+ 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)
-
- mark_as_advanced(LUA_LIBRARY)
diff --git a/debian/patches/rawlua.patch b/debian/patches/rawlua.patch
new file mode 100644
index 0000000..777937a
--- /dev/null
+++ b/debian/patches/rawlua.patch
@@ -0,0 +1,25 @@
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Sun, 4 Jan 2015 20:49:23 +0100
+Subject: rawlua
+
+---
+ src/CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index b308ad2..37dd3f9 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -261,9 +261,9 @@ if(LUA_LIBRARY AND LUA_INCLUDE_DIR)
+ endif (LUA_LIBRARY AND LUA_INCLUDE_DIR)
+
+ 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")
++ 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)
+
+ mark_as_advanced(LUA_LIBRARY)
diff --git a/debian/patches/series b/debian/patches/series
index 852cf02..f1b14e1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
-desktop-file-fix-icon
+desktop-file-fix-icon.patch
kfreebsd-gettext.patch
i18n.patch
useless-depends.patch
@@ -6,8 +6,6 @@ dynamic-link.patch
debianization.patch
gcc47.patch
mapper.patch
-shared_mods
-rawlua
-#hurd.patch
-#jthread-changed.patch
-
+shared_mods.patch
+rawlua.patch
+hurd.patch
diff --git a/debian/patches/shared_mods b/debian/patches/shared_mods.patch
similarity index 55%
rename from debian/patches/shared_mods
rename to debian/patches/shared_mods.patch
index b567f41..e4aa20a 100644
--- a/debian/patches/shared_mods
+++ b/debian/patches/shared_mods.patch
@@ -1,14 +1,17 @@
-Also look under /usr/share/games/minetest for mods, so that minetest-mod-* packages actually work
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Sun, 4 Jan 2015 20:49:23 +0100
+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 f293868..ea33941 100644
--- a/builtin/mainmenu/modmgr.lua
+++ b/builtin/mainmenu/modmgr.lua
-@@ -405,6 +405,7 @@ function modmgr.preparemodlist(data)
+@@ -407,6 +407,7 @@ function modmgr.preparemodlist(data)
modpath ~= "" then
get_mods(modpath,global_mods)
end
diff --git a/debian/patches/useless-depends.patch b/debian/patches/useless-depends.patch
index 749927d..bfba067 100644
--- a/debian/patches/useless-depends.patch
+++ b/debian/patches/useless-depends.patch
@@ -1,20 +1,16 @@
-Description: Removes the useless dependancies
- This was reported by dpkg-shlibs, that warned that our binary was
- marked as depending on various libs without any reason as no symbol
- were used.
-Author: Matthew Bekkema <mat8913ftw at gmail.com>
-Forwarded: no (we should do it)
-
+From: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
+Date: Sun, 4 Jan 2015 20:49:22 +0100
+Subject: useless-depends
---
- src/CMakeLists.txt | 6 ------
+ src/CMakeLists.txt | 6 ------
1 file changed, 6 deletions(-)
-Index: b/src/CMakeLists.txt
-===================================================================
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 47fa5e2..63b73a6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
-@@ -144,11 +144,6 @@ if(WIN32)
+@@ -143,11 +143,6 @@ if(WIN32)
else()
# Unix probably
if(BUILD_CLIENT)
@@ -26,7 +22,7 @@ Index: b/src/CMakeLists.txt
if(APPLE)
FIND_LIBRARY(CARBON_LIB Carbon)
FIND_LIBRARY(COCOA_LIB Cocoa)
-@@ -170,7 +165,6 @@ else()
+@@ -169,7 +164,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
More information about the Pkg-games-commits
mailing list