From b89e87bdebaa64ebd2f3ea48933000313563884c Mon Sep 17 00:00:00 2001 From: Juan RP Date: Wed, 27 Jan 2016 07:58:52 +0100 Subject: [PATCH] warzone2100: update to 3.1.3. --- srcpkgs/warzone2100/patches/musl.patch | 40 ++++++++++++++++++++++++++ srcpkgs/warzone2100/template | 8 +++--- 2 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/warzone2100/patches/musl.patch diff --git a/srcpkgs/warzone2100/patches/musl.patch b/srcpkgs/warzone2100/patches/musl.patch new file mode 100644 index 00000000000..d600e29525c --- /dev/null +++ b/srcpkgs/warzone2100/patches/musl.patch @@ -0,0 +1,40 @@ +--- lib/framework/debug.cpp.orig 2016-01-27 07:52:07.414728274 +0100 ++++ lib/framework/debug.cpp 2016-01-27 07:52:41.381052522 +0100 +@@ -36,7 +36,7 @@ + #include + #include "src/warzoneconfig.h" // for checking FS or not + +-#ifdef WZ_OS_LINUX ++#if defined(WZ_OS_LINUX) && defined(__GLIBC__) + #include // Nonfatal runtime backtraces. + #endif //WZ_OS_LINUX + +@@ -541,7 +541,7 @@ void _debug(int line, code_part part, co + + void _debugBacktrace(code_part part) + { +-#ifdef WZ_OS_LINUX ++#if defined(WZ_OS_LINUX) && defined(__GLIBC__) + void *btv[20]; + unsigned num = backtrace(btv, sizeof(btv) / sizeof(*btv)); + char **btc = backtrace_symbols(btv, num); +--- lib/netplay/netplay.cpp.orig 2016-01-27 07:56:42.982098373 +0100 ++++ lib/netplay/netplay.cpp 2016-01-27 07:57:18.302393414 +0100 +@@ -54,7 +54,7 @@ + #include "src/version.h" + #include "src/loadsave.h" + +-#ifdef WZ_OS_LINUX ++#if defined(WZ_OS_LINUX) && defined(__GLIBC__) + #include // Nonfatal runtime backtraces. + #endif //WZ_OS_LINUX + +@@ -3540,7 +3540,7 @@ void _syncDebugBacktrace(const char *fun + + uint32_t backupCrc = syncDebugLog[syncDebugNext].getCrc(); // Ignore CRC changes from _syncDebug(), since identical backtraces can be printed differently. + +-#ifdef WZ_OS_LINUX ++#if defined(WZ_OS_LINUX) && defined(__GLIBC__) + void *btv[20]; + unsigned num = backtrace(btv, sizeof(btv) / sizeof(*btv)); + char **btc = backtrace_symbols(btv, num); diff --git a/srcpkgs/warzone2100/template b/srcpkgs/warzone2100/template index 7a9cf8dab1d..663cb065497 100644 --- a/srcpkgs/warzone2100/template +++ b/srcpkgs/warzone2100/template @@ -1,16 +1,16 @@ # Template file for 'warzone2100' pkgname=warzone2100 -version=3.1.2 -revision=2 +version=3.1.3 +revision=1 build_style=gnu-configure configure_args="--with-distributor=void" hostmakedepends="zip unzip asciidoc pkg-config" makedepends="libpng-devel fribidi-devel fontconfig-devel SDL-devel libvorbis-devel - libtheora-devel libopenal-devel glew19-devel physfs-devel qt-devel" + libtheora-devel libopenal-devel glew-devel physfs-devel qt-devel" depends="desktop-file-utils" short_desc="3D realtime strategy game on a future Earth" maintainer="Juan RP " license="GPL-2" homepage="http://wz2100.net/" distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.xz" -checksum=e33b0c89b981acda4ca2b473e105510caaecd0a0c6648ae22262f4b561566f1b +checksum=b8389036070eb7eb15b4649ba7dc6b7c27ded46323115b07d987815e8d33ffb2