diff options
| author | Matteo Bernardini <ponce@slackbuilds.org> | 2017-06-22 15:27:26 +0200 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2021-04-17 23:34:22 -0500 |
| commit | ed8fc297a570169bd9a444a345f49737c4af3b67 (patch) | |
| tree | 8a87ad10dc75797e11630735726435c276fa9c58 | |
| parent | 310cfb2724e005262acf7600f47cfceacd817c71 (diff) | |
| download | slackbuilds-ed8fc297a570169bd9a444a345f49737c4af3b67.tar.gz | |
graphics/k3d: Patch for gcc >= 7.x.
Move graphviz between the mandatory dependencies
or docs aren't built correctly (and compilation breaks)
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
| -rw-r--r-- | graphics/k3d/README | 1 | ||||
| -rw-r--r-- | graphics/k3d/gcc7.patch | 23 | ||||
| -rw-r--r-- | graphics/k3d/k3d.SlackBuild | 3 | ||||
| -rw-r--r-- | graphics/k3d/k3d.info | 2 |
4 files changed, 27 insertions, 2 deletions
diff --git a/graphics/k3d/README b/graphics/k3d/README index b156272092..73741ac528 100644 --- a/graphics/k3d/README +++ b/graphics/k3d/README @@ -7,7 +7,6 @@ patches, curves and animation. Optional dependencies: -graphviz gtksourceview libgnome OpenCASCADE diff --git a/graphics/k3d/gcc7.patch b/graphics/k3d/gcc7.patch new file mode 100644 index 0000000000..887eeb8bd3 --- /dev/null +++ b/graphics/k3d/gcc7.patch @@ -0,0 +1,23 @@ +From d9786540a205bec0b381f339497d7c2cce00376b Mon Sep 17 00:00:00 2001 +From: Jonathan Wakely <jwakely@redhat.com> +Date: Wed, 1 Feb 2017 02:07:28 +0000 +Subject: [PATCH] Add required header for ostream operations + +This file uses std::ostream::operator<<(double) without including +<ostream> and so fails to compile using GCC 7. +--- + k3dsdk/measurement.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/k3dsdk/measurement.h b/k3dsdk/measurement.h +index 9edf7aef..67df5aa0 100644 +--- a/k3dsdk/measurement.h ++++ b/k3dsdk/measurement.h +@@ -27,6 +27,7 @@ + + #include <cassert> + #include <iosfwd> ++#include <ostream> + #include <map> + #include <string> + #include <typeinfo> diff --git a/graphics/k3d/k3d.SlackBuild b/graphics/k3d/k3d.SlackBuild index 7b6cea7db5..1dc959a907 100644 --- a/graphics/k3d/k3d.SlackBuild +++ b/graphics/k3d/k3d.SlackBuild @@ -73,6 +73,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# From upstream +patch -p1 < $CWD/gcc7.patch + # Fix man install directory. sed -i "s|share/man|man|" share/man/CMakeLists.txt diff --git a/graphics/k3d/k3d.info b/graphics/k3d/k3d.info index 598878a4fa..9fe29db7ef 100644 --- a/graphics/k3d/k3d.info +++ b/graphics/k3d/k3d.info @@ -5,6 +5,6 @@ DOWNLOAD="https://github.com/K-3D/k3d/archive/k3d-0.8.0.6/k3d-k3d-0.8.0.6.tar.gz MD5SUM="129e051a1e724c14139808c25cd170f0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="gtkglext ftgl" +REQUIRES="graphviz gtkglext ftgl" MAINTAINER="David Spencer" EMAIL="baildon.research@googlemail.com" |