diff --git a/srcpkgs/simgear/patches/musl-strerror_r.patch b/srcpkgs/simgear/patches/musl-strerror_r.patch index 67f5aa68334..ee4393d09c1 100644 --- a/srcpkgs/simgear/patches/musl-strerror_r.patch +++ b/srcpkgs/simgear/patches/musl-strerror_r.patch @@ -1,6 +1,6 @@ ---- simgear/misc/strutils.cxx 2016-05-17 10:36:36.000000000 +0200 -+++ simgear/misc/strutils.cxx 2016-06-18 14:47:46.858731232 +0200 -@@ -613,8 +613,12 @@ +--- simgear/misc/strutils.cxx 2016-11-22 10:06:52.000000000 +0100 ++++ simgear/misc/strutils.cxx 2016-11-25 05:16:59.264676966 +0100 +@@ -648,8 +648,12 @@ errno_t retcode; // Always makes the string in 'buf' null-terminated retcode = strerror_s(buf, sizeof(buf), errnum); @@ -11,10 +11,10 @@ + int retcode; + // musl libc is posix compliant + retcode = strerror_r(errnum, buf, sizeof(buf)); - #elif (_POSIX_C_SOURCE >= 200112L) || defined(SG_MAC) + #elif (_POSIX_C_SOURCE >= 200112L) || defined(SG_MAC) || defined(__FreeBSD__) int retcode; // POSIX.1-2001 and POSIX.1-2008 -@@ -623,7 +627,7 @@ +@@ -658,7 +662,7 @@ #error "Could not find a thread-safe alternative to strerror()." #endif diff --git a/srcpkgs/simgear/template b/srcpkgs/simgear/template index 9cbf8800575..17265e2e458 100644 --- a/srcpkgs/simgear/template +++ b/srcpkgs/simgear/template @@ -1,7 +1,7 @@ # Template file for 'simgear' pkgname=simgear -version=2016.2.1 -revision=2 +version=2016.4.2 +revision=1 # XXX: always keep in sync with flightgear version! build_style=cmake configure_args="-DENABLE_TESTS=OFF" @@ -13,4 +13,4 @@ maintainer="Jürgen Buchmüller " license="GPL-2" homepage="http://www.flightgear.org/" distfiles="$SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/${pkgname}-${version}.tar.bz2" -checksum=601d4ef75a7f9e7012f85d6f63219f3e2ef90f98249eaa5d16cc6b1a3c737a0a +checksum=d0a1c7b1f56c15868000805ab501db0540d09692dc5eba34e508e1ee04ed1c11