summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Hüttel <dilfridge@gentoo.org>2010-01-05 22:35:05 +0000
committerAndreas Hüttel <dilfridge@gentoo.org>2010-01-05 22:35:05 +0000
commit4af690a04b0c4a7447b1ee10f6264bcf53b66b97 (patch)
tree1300e18975eb348c336194b568eed2af6cc9b95d /sci-visualization
parentnet-misc/tucan: Reverted back to doicon, my bad (diff)
downloadsunrise-reviewed-4af690a04b0c4a7447b1ee10f6264bcf53b66b97.tar.gz
sunrise-reviewed-4af690a04b0c4a7447b1ee10f6264bcf53b66b97.tar.bz2
sunrise-reviewed-4af690a04b0c4a7447b1ee10f6264bcf53b66b97.zip
Added patch for compilation with gcc-4.4
svn path=/sunrise/; revision=9815
Diffstat (limited to 'sci-visualization')
-rw-r--r--sci-visualization/spyview/ChangeLog6
-rw-r--r--sci-visualization/spyview/Manifest5
-rw-r--r--sci-visualization/spyview/files/spyview-20091214-includes.patch31
-rw-r--r--sci-visualization/spyview/spyview-20091214.ebuild6
4 files changed, 41 insertions, 7 deletions
diff --git a/sci-visualization/spyview/ChangeLog b/sci-visualization/spyview/ChangeLog
index 42fe4f587..7998a1c4e 100644
--- a/sci-visualization/spyview/ChangeLog
+++ b/sci-visualization/spyview/ChangeLog
@@ -1,7 +1,11 @@
# ChangeLog for sci-visualization/spyview
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 05 Jan 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
+ spyview-20091214.ebuild, +files/spyview-20091214-includes.patch:
+ Added patch for compilation with gcc-4.4
+
27 Dec 2009; Peter Volkov <pva@gentoo.org> spyview-20091214.ebuild:
virtual/ghostscript->app-text/ghostscript-gpl: ghostscript-gpl is the only
implementation left in the tree.
diff --git a/sci-visualization/spyview/Manifest b/sci-visualization/spyview/Manifest
index e16bd6747..0d510bdac 100644
--- a/sci-visualization/spyview/Manifest
+++ b/sci-visualization/spyview/Manifest
@@ -1,5 +1,6 @@
AUX spyview-20091214-datadir.patch 930 RMD160 ff32d4b3626aced7df6d12128fa8f26574156eaa SHA1 1bebbc70b3e49380c7ef8c7d361b28dc337d0070 SHA256 1e60a72f52149097df2f3de781933d61356116ebf14a414607de0a4ccd6b9c40
+AUX spyview-20091214-includes.patch 1289 RMD160 5633b65c311d1a88ce43e664215f7d21e323ba0f SHA1 e536774a25ea17303200cb60e5a65561e76c92f8 SHA256 41f6f26e9d89af2920cf78d3db7cfb9ec3c2fc778d1e8f74012bf037e1cb4a63
DIST spyview-20091214.tar.gz 4439280 RMD160 f0a2c0bd187d2737e0d3ead7570efe4675a7f37b SHA1 c17420bfcec358b64d21945339cdfc18786bb3ec SHA256 7fe7f305541945f8b21385297ddc6a6d258ef06ef1d03a5112fdd89c11da5a83
-EBUILD spyview-20091214.ebuild 1062 RMD160 df7dff21a7ddd38f5dad2caf652c2a0964c0de53 SHA1 1135781877a518f3bd2ecba80b1fdb8cbcc4f6cd SHA256 67aa9e7b6dd9c734e2fc176d07b1236dfc7cfc07445f49828312c764b9cc9fe5
-MISC ChangeLog 2743 RMD160 3a48c09856fbc9fabdb38b44e2c1ca611f77ee31 SHA1 1a55676f63b27bd1b0f1bb1f26fba04ef65950e7 SHA256 2af80026bb12aa36b96b10136cba27871ee54efee96c847f984faeefdbebfa21
+EBUILD spyview-20091214.ebuild 1050 RMD160 59b43b06a536ed6b55838057afc64ee3ba1c9740 SHA1 7f1920c2b35789ac50a80d6c94fa0ef7783dbcd0 SHA256 626226f202ba482669c9c9d5c201cf8ac934c2a0c955b5e0c881798b88c1c44c
+MISC ChangeLog 2920 RMD160 d6613edc912e3fd6a78b8dc0c8c70c6e36f6f544 SHA1 44e11207fd27f5fe19ee6efdf1b5d367634cf669 SHA256 b957eced7b6d8dcc266166b8d9dc53931911906e05a3c3cfcc799fcc580800a7
MISC metadata.xml 171 RMD160 ed284df01c230fc7990a6b5888b39166d23f29ba SHA1 f3d64a69044b710e23fb874b3ee4cd338858c8b4 SHA256 a7b30fbacd0e4c312c07a3efac112a3794c81d134442d8104325734d03425adf
diff --git a/sci-visualization/spyview/files/spyview-20091214-includes.patch b/sci-visualization/spyview/files/spyview-20091214-includes.patch
new file mode 100644
index 000000000..fa76d1b85
--- /dev/null
+++ b/sci-visualization/spyview/files/spyview-20091214-includes.patch
@@ -0,0 +1,31 @@
+diff -r -u spyview-2009-12-14-09_17.orig/spyview/Fl_Listbox.C spyview-2009-12-14-09_17/spyview/Fl_Listbox.C
+--- spyview-2009-12-14-09_17.orig/spyview/Fl_Listbox.C 2008-09-05 16:23:20.000000000 +0200
++++ spyview-2009-12-14-09_17/spyview/Fl_Listbox.C 2010-01-05 15:54:46.000000000 +0100
+@@ -1,4 +1,5 @@
+ #include "Fl_Listbox.H"
++#include <stdio.h>
+
+ Fl_Listbox::Fl_Listbox(int x, int y, int w, int h, const char *l) : Fl_Table(x,y,w,h,l)
+ {
+diff -r -u spyview-2009-12-14-09_17.orig/spyview/ImageData.H spyview-2009-12-14-09_17/spyview/ImageData.H
+--- spyview-2009-12-14-09_17.orig/spyview/ImageData.H 2009-12-14 09:15:33.000000000 +0100
++++ spyview-2009-12-14-09_17/spyview/ImageData.H 2010-01-04 22:59:38.000000000 +0100
+@@ -5,6 +5,7 @@
+ #include <FL/Fl_Output.H>
+
+ #include <string>
++#include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
+ #include <vector>
+diff -r -u spyview-2009-12-14-09_17.orig/spyview/gp_to_mat.C spyview-2009-12-14-09_17/spyview/gp_to_mat.C
+--- spyview-2009-12-14-09_17.orig/spyview/gp_to_mat.C 2009-08-28 23:46:45.000000000 +0200
++++ spyview-2009-12-14-09_17/spyview/gp_to_mat.C 2010-01-05 16:47:03.000000000 +0100
+@@ -5,6 +5,7 @@
+ #include <map>
+ #include <math.h>
+ #include <string.h>
++#include <stdio.h>
+ #include "../config.h"
+
+ using namespace std;
diff --git a/sci-visualization/spyview/spyview-20091214.ebuild b/sci-visualization/spyview/spyview-20091214.ebuild
index 6d43a3b70..b81daf2d0 100644
--- a/sci-visualization/spyview/spyview-20091214.ebuild
+++ b/sci-visualization/spyview/spyview-20091214.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header $
@@ -28,10 +28,8 @@ RDEPEND="${COMMON_DEPEND}
S=${WORKDIR}/spyview-2009-12-14-09_17
-PATCHES=( "${FILESDIR}"/${P}-datadir.patch )
-
src_prepare() {
- base_src_prepare
+ epatch "${FILESDIR}"/${P}-{datadir,includes}.patch
append-cflags $(fltk-config --cflags)
append-cxxflags $(fltk-config --cxxflags) -I/usr/include/netpbm