diff options
| -rw-r--r-- | academic/celestia/celestia-1.6.1-libpng15.patch | 14 | ||||
| -rw-r--r-- | academic/celestia/celestia-1.6.1-libpng16.patch | 25 | ||||
| -rw-r--r-- | academic/celestia/celestia.SlackBuild | 6 |
3 files changed, 44 insertions, 1 deletions
diff --git a/academic/celestia/celestia-1.6.1-libpng15.patch b/academic/celestia/celestia-1.6.1-libpng15.patch new file mode 100644 index 0000000000000..5dffbab246efc --- /dev/null +++ b/academic/celestia/celestia-1.6.1-libpng15.patch @@ -0,0 +1,14 @@ +imagecapture.cpp:184:40: error: ‘Z_BEST_COMPRESSION’ was not declared in this scope + +--- src/celestia/imagecapture.cpp ++++ src/celestia/imagecapture.cpp +@@ -31,6 +31,9 @@ + #include "png.h" + #endif + ++// Z_BEST_COMPRESSION ++#include <zlib.h> ++ + // Define png_jmpbuf() in case we are using a pre-1.0.6 version of libpng + #ifndef png_jmpbuf + #define png_jmpbuf(png_ptr) png_ptr->jmpbuf diff --git a/academic/celestia/celestia-1.6.1-libpng16.patch b/academic/celestia/celestia-1.6.1-libpng16.patch new file mode 100644 index 0000000000000..78911cb557551 --- /dev/null +++ b/academic/celestia/celestia-1.6.1-libpng16.patch @@ -0,0 +1,25 @@ +image.cpp:530:61: error: ‘memcpy’ was not declared in this scope + +https://bugs.gentoo.org/show_bug.cgi?id=464764 + +Patch written by Lars Wendler <polynomial-c@gentoo.org> +--- a/celestia/src/celengine/image.cpp ++++ b/celestia/src/celengine/image.cpp +@@ -42,6 +42,7 @@ extern "C" { + #include "jpeglib.h" + #else + #include <cstdio> ++#include <string.h> + #include <jpeglib.h> + #endif + } +--- a/celestia/src/celengine/texture.cpp ++++ b/celestia/src/celengine/texture.cpp +@@ -28,6 +28,7 @@ + #include <cstdlib> + #include <cstdio> + #include <cassert> ++#include <string.h> + + #ifndef _WIN32 + #ifndef TARGET_OS_MAC diff --git a/academic/celestia/celestia.SlackBuild b/academic/celestia/celestia.SlackBuild index 1802c08d6d71f..4faaed06ae7e3 100644 --- a/academic/celestia/celestia.SlackBuild +++ b/academic/celestia/celestia.SlackBuild @@ -72,9 +72,13 @@ find -L . \ # Note that the kde frontend will only build with kde3 FRONTEND=${FRONTEND:-gtk} -# Fix incomatibility with gcc 4.7 +# Fix incompatibility with gcc 4.7 patch -p1 -i $CWD/celestia-1.6.1-gcc47.patch +# Fix libpng incompatibilities (thanks to Arch Linux) +patch -p0 -i $CWD/celestia-1.6.1-libpng15.patch +patch -p2 -i $CWD/celestia-1.6.1-libpng16.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ |