wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-07-29 08:52:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

simgear: update to 2020.1.3

Browse source
This commit is contained in:
Jürgen Buchmüller 2020-08-22 20:08:37 +02:00
parent 1dd783e693
commit 368b0ee18c
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
srcpkgs/simgear/patches/musl-strerror_r.patch
View file

@ -1,20 +1,20 @@
--- simgear/misc/strutils.cxx 2016-11-22 10:06:52.000000000 +0100 --- simgear/misc/strutils.cxx 2020-06-26 00:07:33.000000000 +0200
+++ simgear/misc/strutils.cxx 2016-11-25 05:16:59.264676966 +0100 +++ simgear/misc/strutils.cxx 2020-08-22 19:50:07.043076612 +0200
@@ -648,8 +648,12 @@ @@ -1137,7 +1137,13 @@
errno_t retcode;
// Always makes the string in 'buf' null-terminated // Always makes the string in 'buf' null-terminated
retcode = strerror_s(buf, sizeof(buf), errnum); retcode = strerror_s(buf, sizeof(buf), errnum);
-#elif defined(_GNU_SOURCE) #elif defined(_GNU_SOURCE)
+#elif defined(_GNU_SOURCE) && defined(__GLIBC__) +#if defined(__GLIBC__)
return std::string(strerror_r(errnum, buf, sizeof(buf))); return std::string(strerror_r(errnum, buf, sizeof(buf)));
+#elif defined(_GNU_SOURCE) +#else
+ int retcode; + int retcode;
+ // musl libc is posix compliant + // Musl libc support
+ retcode = strerror_r(errnum, buf, sizeof(buf)); + 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; int retcode;
// POSIX.1-2001 and POSIX.1-2008 // 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()." #error "Could not find a thread-safe alternative to strerror()."
#endif #endif

4
srcpkgs/simgear/template
View file

@ -1,6 +1,6 @@
# Template file for 'simgear' # Template file for 'simgear'
pkgname=simgear pkgname=simgear
version=2019.1.1 version=2020.1.3
revision=1 revision=1
# XXX: always keep in sync with flightgear version! # XXX: always keep in sync with flightgear version!
build_style=cmake build_style=cmake
@ -13,7 +13,7 @@ maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="GPL-2.0-or-later" license="GPL-2.0-or-later"
homepage="http://www.flightgear.org/" homepage="http://www.flightgear.org/"
distfiles="$SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/${pkgname}-${version}.tar.bz2" distfiles="$SOURCEFORGE_SITE/project/flightgear/release-${version%.*}/${pkgname}-${version}.tar.bz2"
checksum=201ed4cc841aa99e1c84acb3035a95fa36a77dd96c0dca290c46d21a290a548b checksum=66da2c4f68058f6854206f2dd9c03c9223851ade24a50216e88b4e50598c13d1
# Suppress warnings regarding auto_ptr # Suppress warnings regarding auto_ptr
CXXFLAGS="-Wno-deprecated-declarations" CXXFLAGS="-Wno-deprecated-declarations"