From 368b0ee18cd5bf5745af27f6d2334975c71d2e32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= Date: Sat, 22 Aug 2020 20:08:37 +0200 Subject: [PATCH] simgear: update to 2020.1.3 --- srcpkgs/simgear/patches/musl-strerror_r.patch | 20 +++++++++---------- srcpkgs/simgear/template | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/srcpkgs/simgear/patches/musl-strerror_r.patch b/srcpkgs/simgear/patches/musl-strerror_r.patch index ee4393d09c1..7a6d10a8e77 100644 --- a/srcpkgs/simgear/patches/musl-strerror_r.patch +++ b/srcpkgs/simgear/patches/musl-strerror_r.patch @@ -1,20 +1,20 @@ ---- 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; +--- simgear/misc/strutils.cxx 2020-06-26 00:07:33.000000000 +0200 ++++ simgear/misc/strutils.cxx 2020-08-22 19:50:07.043076612 +0200 +@@ -1137,7 +1137,13 @@ // Always makes the string in 'buf' null-terminated retcode = strerror_s(buf, sizeof(buf), errnum); --#elif defined(_GNU_SOURCE) -+#elif defined(_GNU_SOURCE) && defined(__GLIBC__) + #elif defined(_GNU_SOURCE) ++#if defined(__GLIBC__) return std::string(strerror_r(errnum, buf, sizeof(buf))); -+#elif defined(_GNU_SOURCE) ++#else + int retcode; -+ // musl libc is posix compliant ++ // Musl libc support + retcode = strerror_r(errnum, buf, sizeof(buf)); - #elif (_POSIX_C_SOURCE >= 200112L) || defined(SG_MAC) || defined(__FreeBSD__) ++#endif + #elif (_POSIX_C_SOURCE >= 200112L) || defined(SG_MAC) || defined(__FreeBSD__) || defined(__OpenBSD__) int retcode; // POSIX.1-2001 and POSIX.1-2008 -@@ -658,7 +662,7 @@ +@@ -1146,7 +1152,7 @@ #error "Could not find a thread-safe alternative to strerror()." #endif diff --git a/srcpkgs/simgear/template b/srcpkgs/simgear/template index c586dcb3dc3..eb9e1437efe 100644 --- a/srcpkgs/simgear/template +++ b/srcpkgs/simgear/template @@ -1,6 +1,6 @@ # Template file for 'simgear' pkgname=simgear -version=2019.1.1 +version=2020.1.3 revision=1 # XXX: always keep in sync with flightgear version! build_style=cmake @@ -13,7 +13,7 @@ maintainer="Jürgen Buchmüller " license="GPL-2.0-or-later" homepage="http://www.flightgear.org/" distfiles="$SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/${pkgname}-${version}.tar.bz2" -checksum=201ed4cc841aa99e1c84acb3035a95fa36a77dd96c0dca290c46d21a290a548b +checksum=66da2c4f68058f6854206f2dd9c03c9223851ade24a50216e88b4e50598c13d1 # Suppress warnings regarding auto_ptr CXXFLAGS="-Wno-deprecated-declarations"