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 418ec3175c71455375cde073bfd64dc1e07fa90c Author: Markus Koschany <[email protected]> Date: Fri Feb 20 19:52:46 2015 +0100 Drop the following patches. They were merged upstream. - desktop-file.patch - hurd.patch - hyphen-used-as-minus.patch --- debian/patches/desktop-file.patch | 19 --- debian/patches/hurd.patch | 217 ------------------------------ debian/patches/hyphen-used-as-minus.patch | 22 --- debian/patches/series | 3 - 4 files changed, 261 deletions(-) diff --git a/debian/patches/desktop-file.patch b/debian/patches/desktop-file.patch deleted file mode 100644 index a39bb51..0000000 --- a/debian/patches/desktop-file.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Sun, 4 Jan 2015 22:57:24 +0100 -Subject: desktop file - -Forwarded: https://github.com/minetest/minetest/pull/2165 ---- - misc/minetest.desktop | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/misc/minetest.desktop b/misc/minetest.desktop -index 3f5b9c4..e5ce24a 100644 ---- a/misc/minetest.desktop -+++ b/misc/minetest.desktop -@@ -8,4 +8,5 @@ Terminal=false - Type=Application - Categories=Game; - StartupNotify=false -+Keywords=sandbox;world;mining;crafting;blocks;nodes;multiplayer;roleplaying; - diff --git a/debian/patches/hurd.patch b/debian/patches/hurd.patch deleted file mode 100644 index d5b14da..0000000 --- a/debian/patches/hurd.patch +++ /dev/null @@ -1,217 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Sun, 4 Jan 2015 21:03:07 +0100 -Subject: hurd - -Make Minetest compile on GNU/Hurd. -Forwarded: https://github.com/minetest/minetest/pull/2164 ---- - 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/hyphen-used-as-minus.patch b/debian/patches/hyphen-used-as-minus.patch deleted file mode 100644 index a6541c8..0000000 --- a/debian/patches/hyphen-used-as-minus.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Markus Koschany <[email protected]> -Date: Sun, 4 Jan 2015 22:48:24 +0100 -Subject: hyphen used as minus - -Forwarded: https://github.com/minetest/minetest/pull/2166 ---- - doc/minetest.6 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/doc/minetest.6 b/doc/minetest.6 -index ff54520..cd818e1 100644 ---- a/doc/minetest.6 -+++ b/doc/minetest.6 -@@ -81,7 +81,7 @@ Set world path - .TP - \-\-migrate <value> - Migrate from current map backend to another. Possible values are sqlite3 --and leveldb. Only works when using --server. -+and leveldb. Only works when using \-\-server. - - .SH ENVIRONMENT VARIABLES - diff --git a/debian/patches/series b/debian/patches/series index a6adc39..40f3aea 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,6 +4,3 @@ dynamic-link.patch mapper.patch shared_mods.patch rawlua.patch -hurd.patch -hyphen-used-as-minus.patch -desktop-file.patch -- 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
