diff options
Diffstat (limited to 'gnu/packages/patches')
| -rw-r--r-- | gnu/packages/patches/torcs-glibc-default-source.patch | 25 | ||||
| -rw-r--r-- | gnu/packages/patches/torcs-isnan.patch | 15 | ||||
| -rw-r--r-- | gnu/packages/patches/torcs-nullptr.patch | 14 |
3 files changed, 54 insertions, 0 deletions
diff --git a/gnu/packages/patches/torcs-glibc-default-source.patch b/gnu/packages/patches/torcs-glibc-default-source.patch new file mode 100644 index 0000000000..eb74cfd4ce --- /dev/null +++ b/gnu/packages/patches/torcs-glibc-default-source.patch @@ -0,0 +1,25 @@ +From: Aurelien Jarno <[email protected]> +Date: Mon, 1 May 2017 15:58:31 +0200 +Subject: glibc default source + +_SVID_SOURCE and _BSD_SOURCE are deprecated, using _DEFAULT_SOURCE +instead. + +Forwarded: https://sourceforge.net/p/torcs/mailman/message/35831161/ +--- + Make-config.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Make-config.in b/Make-config.in +index f0e0a12..8041327 100644 +--- a/Make-config.in ++++ b/Make-config.in +@@ -48,7 +48,7 @@ INSTALL_DATA = @INSTALL_DATA@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + +-CFLAGSD = -D_SVID_SOURCE -D_BSD_SOURCE -DSHM -DHAVE_CONFIG_H ++CFLAGSD = -D_DEFAULT_SOURCE -DSHM -DHAVE_CONFIG_H + CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@ ${CFLAGSD} + CFLAGS = @CFLAGS@ ${CFLAGSD} + diff --git a/gnu/packages/patches/torcs-isnan.patch b/gnu/packages/patches/torcs-isnan.patch new file mode 100644 index 0000000000..2ec0c4e1c1 --- /dev/null +++ b/gnu/packages/patches/torcs-isnan.patch @@ -0,0 +1,15 @@ +Source: https://src.fedoraproject.org/rpms/torcs/raw/rawhide/f/torcs-1.3.7-isnan.patch +Upstream-status: https://sourceforge.net/p/torcs/mailman/torcs-devel/thread/0bd466b7-e158-471b-13ad-504167587d01%40embecosm.com/#msg35836767 + +diff -up torcs-1.3.7/src/drivers/olethros/geometry.cpp.orig torcs-1.3.7/src/drivers/olethros/geometry.cpp +--- torcs-1.3.7/src/drivers/olethros/geometry.cpp.orig 2016-06-07 19:49:11.347896827 +0100 ++++ torcs-1.3.7/src/drivers/olethros/geometry.cpp 2016-06-07 19:49:46.532894257 +0100 +@@ -27,6 +27,8 @@ + #ifdef WIN32 + #include <float.h> + #define isnan _isnan ++#else ++#define isnan std::isnan + #endif + + diff --git a/gnu/packages/patches/torcs-nullptr.patch b/gnu/packages/patches/torcs-nullptr.patch new file mode 100644 index 0000000000..a002c48169 --- /dev/null +++ b/gnu/packages/patches/torcs-nullptr.patch @@ -0,0 +1,14 @@ +Source: https://src.fedoraproject.org/rpms/torcs/raw/rawhide/f/torcs-1.3.7-nullptr.patch +Upstream-status: https://sourceforge.net/p/torcs/mailman/message/36490328/ + +--- torcs-1.3.7/src/libs/musicplayer/OpenALMusicPlayer.cpp.orig 2014-02-05 10:54:43.000000000 +0100 ++++ torcs-1.3.7/src/libs/musicplayer/OpenALMusicPlayer.cpp 2018-07-09 20:56:42.521607205 +0100 +@@ -161,7 +161,7 @@ + { + char pcm[BUFFERSIZE]; + int size = 0; +- const char* error = '\0'; ++ const char* error = nullptr; + + if (!stream->read(pcm, BUFFERSIZE, &size, &error)) { + GfError("OpenALMusicPlayer: Stream read error: %s\n", error); |