[packages/xplanet] - missing patches
qboosh
qboosh at pld-linux.org
Mon Dec 24 15:12:33 CET 2018
commit 4cb31352e286bf9742e814cbde4e33d61c28fb44
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon Dec 24 15:17:13 2018 +0100
- missing patches
xplanet-c++.patch | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
xplanet-giflib.patch | 38 ++++++++++++++++++++++++++++++++++++++
2 files changed, 86 insertions(+)
---
diff --git a/xplanet-c++.patch b/xplanet-c++.patch
new file mode 100644
index 0000000..7cc7b3e
--- /dev/null
+++ b/xplanet-c++.patch
@@ -0,0 +1,48 @@
+--- xplanet-1.3.1/src/Satellite.h.orig 2013-02-16 20:37:47.000000000 +0100
++++ xplanet-1.3.1/src/Satellite.h 2018-12-24 10:42:29.805341195 +0100
+@@ -1,10 +1,7 @@
+ #ifndef SATELLITE_H
+ #define SATELLITE_H
+
+-namespace sgp4sdp4
+-{
+ #include "libsgp4sdp4/sgp4sdp4.h"
+-}
+
+ class Satellite
+ {
+--- xplanet-1.3.1/src/libsgp4sdp4/sgp4sdp4.h.orig 2013-02-16 20:37:45.000000000 +0100
++++ xplanet-1.3.1/src/libsgp4sdp4/sgp4sdp4.h 2018-12-24 11:33:25.481972969 +0100
+@@ -7,10 +7,6 @@
+ #ifndef KELSO_H
+ #define KELSO_H 1
+
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+ #include <math.h>
+ #include <stdio.h>
+ #include <string.h>
+@@ -23,6 +19,12 @@
+ #include <unistd.h>
+ #undef select
+
++#ifdef __cplusplus
++namespace sgp4sdp4 {
++
++extern "C" {
++#endif
++
+
+
+ /** Type definitions **/
+@@ -229,6 +231,8 @@
+
+ #ifdef __cplusplus
+ }
++
++}
+ #endif
+
+ #endif
diff --git a/xplanet-giflib.patch b/xplanet-giflib.patch
new file mode 100644
index 0000000..8cd3006
--- /dev/null
+++ b/xplanet-giflib.patch
@@ -0,0 +1,38 @@
+--- xplanet-1.3.1/src/libimage/gif.c.orig 2013-02-16 20:37:47.000000000 +0100
++++ xplanet-1.3.1/src/libimage/gif.c 2018-12-24 11:36:17.901970999 +0100
+@@ -179,7 +179,11 @@
+ }
+ }
+
++#if (GIFLIB_MAJOR > 5) || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1)
++ if (DGifCloseFile(GifFile, NULL) == GIF_ERROR) {
++#else
+ if (DGifCloseFile(GifFile) == GIF_ERROR) {
++#endif
+ return(0);
+ }
+
+@@ -493,7 +497,11 @@
+ static void QuitGifError(GifFileType *GifFile)
+ {
+ fprintf(stderr, "Error writing GIF file\n");
++#if (GIFLIB_MAJOR > 5) || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1)
++ if (GifFile != NULL) EGifCloseFile(GifFile, NULL);
++#else
+ if (GifFile != NULL) EGifCloseFile(GifFile);
++#endif
+ }
+
+ int
+@@ -589,7 +597,11 @@
+ Ptr += width;
+ }
+
++#if (GIFLIB_MAJOR > 5) || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1)
++ if (EGifCloseFile(GifFile, NULL) == GIF_ERROR)
++#else
+ if (EGifCloseFile(GifFile) == GIF_ERROR)
++#endif
+
+ {
+ QuitGifError(GifFile);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xplanet.git/commitdiff/4cb31352e286bf9742e814cbde4e33d61c28fb44
More information about the pld-cvs-commit
mailing list