| 1 |
commit: 1a181c4f6c61cb3bc1c11fa700add911613d2bd8 |
| 2 |
Author: Gerhard Bräunlich <wippbox <AT> gmx <DOT> net> |
| 3 |
AuthorDate: Mon Jan 30 22:01:25 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 6 19:30:13 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a181c4f |
| 7 |
|
| 8 |
sci-visualization/spyview: Fix 20150124 ebuild |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.3 |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/3731 |
| 12 |
|
| 13 |
.../spyview-20150124-gnuplot_interface_fix.patch | 10 ++++++++++ |
| 14 |
sci-visualization/spyview/spyview-20150124.ebuild | 19 ++++++++++--------- |
| 15 |
2 files changed, 20 insertions(+), 9 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sci-visualization/spyview/files/spyview-20150124-gnuplot_interface_fix.patch b/sci-visualization/spyview/files/spyview-20150124-gnuplot_interface_fix.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000..6f15296 |
| 20 |
--- /dev/null |
| 21 |
+++ b/sci-visualization/spyview/files/spyview-20150124-gnuplot_interface_fix.patch |
| 22 |
@@ -0,0 +1,10 @@ |
| 23 |
+--- a/spyview/Gnuplot_Interface.C |
| 24 |
++++ b/spyview/Gnuplot_Interface.C |
| 25 |
+@@ -13,6 +13,7 @@ |
| 26 |
+ #else |
| 27 |
+ #include <sys/stat.h> |
| 28 |
+ #include <sys/types.h> |
| 29 |
++#include <sys/wait.h> |
| 30 |
+ #endif |
| 31 |
+ using namespace boost; |
| 32 |
+ |
| 33 |
|
| 34 |
diff --git a/sci-visualization/spyview/spyview-20150124.ebuild b/sci-visualization/spyview/spyview-20150124.ebuild |
| 35 |
index fd110c3..2127793 100644 |
| 36 |
--- a/sci-visualization/spyview/spyview-20150124.ebuild |
| 37 |
+++ b/sci-visualization/spyview/spyview-20150124.ebuild |
| 38 |
@@ -1,10 +1,10 @@ |
| 39 |
-# Copyright 1999-2014 Gentoo Foundation |
| 40 |
+# Copyright 1999-2017 Gentoo Foundation |
| 41 |
# Distributed under the terms of the GNU General Public License v2 |
| 42 |
# $Id$ |
| 43 |
|
| 44 |
EAPI=6 |
| 45 |
|
| 46 |
-inherit autotools flag-o-matic eutils multilib |
| 47 |
+inherit autotools flag-o-matic |
| 48 |
|
| 49 |
DESCRIPTION="2D and 3D data visualization and analysis program" |
| 50 |
HOMEPAGE="http://nsweb.tn.tudelft.nl/~gsteele/spyview/" |
| 51 |
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/gsteele13/spyview/archive/966012afae2fbb77262bd96a7e |
| 52 |
|
| 53 |
LICENSE="GPL-3" |
| 54 |
SLOT="0" |
| 55 |
-KEYWORDS="" # no keywords since it doesnt build yet... |
| 56 |
+KEYWORDS="~amd64 ~x86" |
| 57 |
IUSE="" |
| 58 |
|
| 59 |
COMMON_DEPEND=" |
| 60 |
@@ -29,6 +29,8 @@ DEPEND="${COMMON_DEPEND} |
| 61 |
RDEPEND="${COMMON_DEPEND} |
| 62 |
sci-visualization/gnuplot" |
| 63 |
|
| 64 |
+PATCHES=( ${FILESDIR}/${P}-gnuplot_interface_fix.patch ) |
| 65 |
+ |
| 66 |
src_unpack() { |
| 67 |
default |
| 68 |
mv -v "${WORKDIR}"/spyview-*/source "${S}" || die |
| 69 |
@@ -36,18 +38,17 @@ src_unpack() { |
| 70 |
|
| 71 |
src_prepare() { |
| 72 |
append-cflags $(fltk-config --cflags) |
| 73 |
- append-cxxflags $(fltk-config --cxxflags) -I/usr/include/netpbm |
| 74 |
+ append-cxxflags $(fltk-config --cxxflags) |
| 75 |
+ append-cppflags -I"${EPREFIX}"/usr/include/netpbm |
| 76 |
|
| 77 |
# append-ldflags $(fltk-config --ldflags) |
| 78 |
# this one leads to an insane amount of warnings |
| 79 |
append-ldflags -L$(dirname $(fltk-config --libs)) |
| 80 |
|
| 81 |
- find "${S}" -name Makefile.am -exec sed -i -e 's:-mwindows -mconsole::g' {} + || die |
| 82 |
+ while IFS="" read -d $'\0' -r file; do |
| 83 |
+ sed -i -e 's:-mwindows -mconsole::g' "$file" || die |
| 84 |
+ done < <(find "${S}" -name Makefile.am -print0) |
| 85 |
|
| 86 |
default |
| 87 |
eautoreconf |
| 88 |
} |
| 89 |
- |
| 90 |
-src_configure() { |
| 91 |
- econf --datadir=/usr/share/spyview --docdir=/usr/share/doc/${PF} |
| 92 |
-} |
Archives