Author: pabs Date: 2012-06-21 03:07:40 +0000 (Thu, 21 Jun 2012) New Revision: 13730
Added: packages/trunk/warzone2100/debian/patches/fix-FTBFS-on-non-x86-platforms.patch Modified: packages/trunk/warzone2100/debian/changelog packages/trunk/warzone2100/debian/patches/series Log: Fix FTBFS on non-x86 platforms using upstream patch Modified: packages/trunk/warzone2100/debian/changelog =================================================================== --- packages/trunk/warzone2100/debian/changelog 2012-06-20 13:48:11 UTC (rev 13729) +++ packages/trunk/warzone2100/debian/changelog 2012-06-21 03:07:40 UTC (rev 13730) @@ -1,3 +1,9 @@ +warzone2100 (3.1~beta11-2) UNRELEASED; urgency=low + + * Fix FTBFS on non-x86 platforms using upstream patch + + -- Paul Wise <[email protected]> Thu, 21 Jun 2012 11:05:02 +0800 + warzone2100 (3.1~beta11-1) unstable; urgency=low * New upstream beta release (LP: #886492) Added: packages/trunk/warzone2100/debian/patches/fix-FTBFS-on-non-x86-platforms.patch =================================================================== --- packages/trunk/warzone2100/debian/patches/fix-FTBFS-on-non-x86-platforms.patch (rev 0) +++ packages/trunk/warzone2100/debian/patches/fix-FTBFS-on-non-x86-platforms.patch 2012-06-21 03:07:40 UTC (rev 13730) @@ -0,0 +1,40 @@ +From 3d0263e08eeba9d41da90fb712c83b014f0f783c Mon Sep 17 00:00:00 2001 +From: safety0ff <[email protected]> +Date: Wed, 20 Jun 2012 22:43:11 -0400 +Subject: [PATCH] Attempt to fix exception handler ifdefs for non-x86 platforms. +Origin: http://developer.wz2100.net/raw-attachment/ticket/3558/0001-Attempt-to-fix-exception-handler-ifdefs-for-non-x86-.patch +--- + lib/exceptionhandler/exceptionhandler.cpp | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/lib/exceptionhandler/exceptionhandler.cpp b/lib/exceptionhandler/exceptionhandler.cpp +index cee9cb7..eb2ec2c 100644 +--- a/lib/exceptionhandler/exceptionhandler.cpp ++++ b/lib/exceptionhandler/exceptionhandler.cpp +@@ -494,9 +494,9 @@ static bool gdbExtendedBacktrace(int const dumpFile) + * additions to the frame-pointer register's content. + */ + void const * const frame = +-#if defined(SA_SIGINFO) && __WORDSIZE == 64 ++#if defined(SA_SIGINFO) && defined(REG_RBP) + sigcontext ? (void*)(sigcontext->uc_mcontext.gregs[REG_RBP] + sizeof(greg_t) + sizeof(void (*)(void))) : NULL; +-#elif defined(SA_SIGINFO) && __WORDSIZE == 32 ++#elif defined(SA_SIGINFO) && defined(REG_EBP) && __WORDSIZE == 32 + sigcontext ? (void*)(sigcontext->uc_mcontext.gregs[REG_EBP] + sizeof(greg_t) + sizeof(void (*)(void))) : NULL; + #else + NULL; +@@ -506,9 +506,9 @@ static bool gdbExtendedBacktrace(int const dumpFile) + * Faulting instruction. + */ + void (*instruction)(void) = +-#if defined(SA_SIGINFO) && __WORDSIZE == 64 ++#if defined(SA_SIGINFO) && defined(REG_RIP) + sigcontext ? (void (*)(void))sigcontext->uc_mcontext.gregs[REG_RIP] : NULL; +-#elif defined(SA_SIGINFO) && __WORDSIZE == 32 ++#elif defined(SA_SIGINFO) && defined(REG_EIP) && __WORDSIZE == 32 + sigcontext ? (void (*)(void))sigcontext->uc_mcontext.gregs[REG_EIP] : NULL; + #else + NULL; +-- +1.7.8.6 + Modified: packages/trunk/warzone2100/debian/patches/series =================================================================== --- packages/trunk/warzone2100/debian/patches/series 2012-06-20 13:48:11 UTC (rev 13729) +++ packages/trunk/warzone2100/debian/patches/series 2012-06-21 03:07:40 UTC (rev 13730) @@ -1 +1,2 @@ use-system-libraries.patch +fix-FTBFS-on-non-x86-platforms.patch _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
