summaryrefslogtreecommitdiff
path: root/sci-mathematics/geomview/files/geomview-1.9.5-zlib.patch
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2017-10-09 18:53:29 +0100
committerV3n3RiX <venerix@redcorelinux.org>2017-10-09 18:53:29 +0100
commit4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
treeba5f07bf3f9d22d82e54a462313f5d244036c768 /sci-mathematics/geomview/files/geomview-1.9.5-zlib.patch
reinit the tree, so we can have metadata
Diffstat (limited to 'sci-mathematics/geomview/files/geomview-1.9.5-zlib.patch')
-rw-r--r--sci-mathematics/geomview/files/geomview-1.9.5-zlib.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/sci-mathematics/geomview/files/geomview-1.9.5-zlib.patch b/sci-mathematics/geomview/files/geomview-1.9.5-zlib.patch
new file mode 100644
index 000000000000..5d4b16a0867a
--- /dev/null
+++ b/sci-mathematics/geomview/files/geomview-1.9.5-zlib.patch
@@ -0,0 +1,34 @@
+Upstream diff to fix missing declarations with --without-zlib:
+* image.c:1028:34: error: 'gzip_data_pipe' undeclared here (not in a function)
+* { decompressors+1, "gzip -dc", gzip_data_pipe, { "z", "gz", "gzip", NULL } },
+* ^~~~~~~~~~~~~~
+See also: https://bugs.gentoo.org/show_bug.cgi?id=596414
+
+--- a/src/lib/shade/image.c
++++ b/src/lib/shade/image.c
+@@ -36,6 +36,8 @@
+
+ #ifndef HAVE_LIBZ
+ # define HAVE_LIBZ 0
++#elif HAVE_LIBZ
++# define HAVE_LIBZ 1
+ #endif
+
+ #if HAVE_LIBZ
+@@ -1025,9 +1027,15 @@
+ };
+
+ static struct filter decompressors[] = {
++#if HAVE_LIBZ
+ { decompressors+1, "gzip -dc", gzip_data_pipe, { "z", "gz", "gzip", NULL } },
+- { decompressors+2, "bzip2 -dc", NULL, { "bz2", "bzip2", NULL } },
++#else
++ { decompressors+1, "gzip -dc", NULL, { "z", "gz", "gzip", NULL } },
++#endif
++ { HAVE_LIBZ ? decompressors+2 : NULL, "bzip2 -dc", NULL, { "bz2", "bzip2", NULL } },
++#if HAVE_LIBZ
+ { NULL, NULL, zlib_data_pipe, { "zlib", NULL } },
++#endif
+ };
+
+ static struct filter converters[] = {