From f01551cb0fea354272dc1916f1d80a1dc1cbeea8 Mon Sep 17 00:00:00 2001 From: Helmut Pozimski Date: Mon, 20 Jul 2020 20:05:12 +0200 Subject: [PATCH] warzone2100: update to 3.4.1. --- srcpkgs/warzone2100/patches/musl.patch | 40 -------------------------- srcpkgs/warzone2100/template | 4 +-- 2 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 srcpkgs/warzone2100/patches/musl.patch diff --git a/srcpkgs/warzone2100/patches/musl.patch b/srcpkgs/warzone2100/patches/musl.patch deleted file mode 100644 index d600e29525c..00000000000 --- a/srcpkgs/warzone2100/patches/musl.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- 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 3c14216fab2..cc425c6072a 100644 --- a/srcpkgs/warzone2100/template +++ b/srcpkgs/warzone2100/template @@ -1,6 +1,6 @@ # Template file for 'warzone2100' pkgname=warzone2100 -version=3.4.0 +version=3.4.1 revision=1 wrksrc="warzone2100" build_style=cmake @@ -15,7 +15,7 @@ maintainer="Helmut Pozimski " license="GPL-2.0-or-later" homepage="http://wz2100.net" distfiles="https://github.com/Warzone2100/${pkgname}/releases/download/${version}/${pkgname}_src.tar.xz" -checksum=fe0128b4fe590d29d6f03fc1bc72016448fdb282dd8d9f9fbb4403fe53e4983c +checksum=ea2cd7f016118a89244ebef8ce9424f71c060bcd5895b791d3e1cec02b555b69 nocross="fails to detect SDL2 when cross-compiling" warzone2100-data_package() {