summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Dittrich <markusle@gentoo.org>2008-12-18 22:57:38 +0000
committerMarkus Dittrich <markusle@gentoo.org>2008-12-18 22:57:38 +0000
commitc890017c58917b4d1db9f4c7c8ad3540984e3c8d (patch)
treefaa1ff05be31ea6ead2cdef0948f3426784ce06c /sci-visualization/qtiplot
parentVersion bump, #249271. Fixes #145727, #193731, #204702, #211250, #226009 and ... (diff)
downloadhistorical-c890017c58917b4d1db9f4c7c8ad3540984e3c8d.tar.gz
historical-c890017c58917b4d1db9f4c7c8ad3540984e3c8d.tar.bz2
historical-c890017c58917b4d1db9f4c7c8ad3540984e3c8d.zip
Added patch to fix problem with sip-4.7.9 and qtiplot's sip file (see bug #250014).
Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27-gentoo-r5 x86_64
Diffstat (limited to 'sci-visualization/qtiplot')
-rw-r--r--sci-visualization/qtiplot/ChangeLog7
-rw-r--r--sci-visualization/qtiplot/Manifest5
-rw-r--r--sci-visualization/qtiplot/files/qtiplot-0.9.7.3-sip.patch30
-rw-r--r--sci-visualization/qtiplot/qtiplot-0.9.7.3.ebuild3
4 files changed, 41 insertions, 4 deletions
diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog
index 19bcc6cce651..d3f6aaf46fa7 100644
--- a/sci-visualization/qtiplot/ChangeLog
+++ b/sci-visualization/qtiplot/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sci-visualization/qtiplot
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.37 2008/11/14 14:04:46 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.38 2008/12/18 22:57:38 markusle Exp $
+
+ 18 Dec 2008; Markus Dittrich <markusle@gentoo.org>
+ +files/qtiplot-0.9.7.3-sip.patch, qtiplot-0.9.7.3.ebuild:
+ Added patch to fix problem with sip-4.7.9 and qtiplot's sip files
+ (see bug #250014).
13 Nov 2008; Markus Dittrich <markusle@gentoo.org>
+files/qtiplot-0.9.7.3-no-python.patch, qtiplot-0.9.7.3.ebuild:
diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest
index 4a22151a24b3..e73f1a4f9b17 100644
--- a/sci-visualization/qtiplot/Manifest
+++ b/sci-visualization/qtiplot/Manifest
@@ -8,6 +8,7 @@ AUX qtiplot-0.9.7.2-pro.patch 2801 RMD160 520d78a8fac28567b8edaf8195c0c34285e77f
AUX qtiplot-0.9.7.3-no-python.patch 1747 RMD160 03f86f741e84e0c2aedde9cc7915c7eaa5ec7608 SHA1 15869d3728c0456e5a2b2c26f606a1117a3e526d SHA256 7f579f499dca8afca404c700255ec2e8f4148ababd0f40dadcc7026f42bcfe25
AUX qtiplot-0.9.7.3-pro.patch 6899 RMD160 c1e0d832ff580ae0fe6ada3bbb6c12f57e495321 SHA1 badc6ee0613d40ebdbe78a9a74730e253d8824f0 SHA256 a1941673150536446cad5d8b45bb0665be8a3c06a8adb8530960dad9d59af35c
AUX qtiplot-0.9.7.3-qwt3d.patch 843 RMD160 02273d1f407a7c5901671ad5008860b0ad01d381 SHA1 0824134197bd971bdfd5f978bbfc0ee38a55e07e SHA256 7ff5823103bbd13b99cc5e5de0b34539cc2db24280cf95874303e9f60b686abe
+AUX qtiplot-0.9.7.3-sip.patch 1205 RMD160 0311a72e107c66adcdbf14ca97febdadf33e520c SHA1 253d87c47a74649d831f1bb1688cffa60e68cd70 SHA256 d7de2cdabba5b39ecb5b5fe002b45a946adf74a559433dc697d09bb7376165e8
DIST qtiplot-0.7.7.zip 812738 RMD160 6f62b32059eec57bf931b5bae9f524672d436ee9 SHA1 b201e600ec057ff0f7b4b4572850b0b072a0e0fb SHA256 937849c42cc3047df3975d1cb7a26a2503a499d548066937589340f55bd1ab01
DIST qtiplot-0.8.5.tar.bz2 530579 RMD160 72f4f60f1171c57e6c2614a1a5a7b6dfc3bda4f5 SHA1 d8142877bfc86fad8a43e64f6f3e0a16126e5f0a SHA256 81831d8dfaddbdf32d85a6e7eaf0e54e2321e2fba6ffaabfe6943bc326a6f874
DIST qtiplot-0.9.7-manual-en.tar.bz2 5890732 RMD160 fc6270d6333f229599e298b092d61a61c6f78287 SHA1 5242ea8ff10a2455c53a0f2bd5638a0bf09f09c7 SHA256 8475f8f9f57a06062c49ea7cad00582a158ef004c9ced898f4d7b181d8bf5e0a
@@ -16,6 +17,6 @@ DIST qtiplot-0.9.7.3.tar.bz2 6714565 RMD160 406bda2fb9c3c3de92e6e871cfece0d4613d
EBUILD qtiplot-0.7.7.ebuild 1095 RMD160 a5ccfad6cdadadf0f11600f9b8114f9c7fb8ae2b SHA1 e6008083cbd394f979d675035c6c11fb6771fc26 SHA256 b4019c8262709376fc6d2d6fc34150da0d1079db79718d3c50adc06ed3f95c03
EBUILD qtiplot-0.8.5.ebuild 1215 RMD160 e34d3e44ffcc28647798ef7619dfeaa1e4789adc SHA1 d3dae0497b8b4e2b5b5b889e8dc399a443dad549 SHA256 f98a4f12419637657977c68d340bd826ad6267ed61413e4015690437c693fa9b
EBUILD qtiplot-0.9.7.2.ebuild 3232 RMD160 8affd1f099b3a3ca9bb9de85ad17c1f82e4b1d1b SHA1 84d520b18a5afaf93c09c134bd3dd1d9d80e5eb3 SHA256 da1521c6a53b37ab4b82fa2a8ccf5a3caff1f9254efd2b20d95066f214dde29c
-EBUILD qtiplot-0.9.7.3.ebuild 3330 RMD160 c0f6a3b4dadd5d08f7aea2c2a5ef3de3ddf1bb7c SHA1 c97ca0d74cbcd293bc716a0fac2caa5288c799ce SHA256 9a176d2373d198291095bd85d715726a09339633fa00128effb4eae73a9bad21
-MISC ChangeLog 9917 RMD160 3df2e04294abf437abd64a65094ecb03b0db2718 SHA1 dbbbb008fc1d4cd71beeb426a89c1723fd3f83f6 SHA256 0ad6e53ad4c6c46aeb8aceebeab02230e972f2bda7541fab2b253b767e7ff37e
+EBUILD qtiplot-0.9.7.3.ebuild 3367 RMD160 44cb07f05e0a3d59541c3173fd843de0e675a8b3 SHA1 ceaf0513ebd36fbdfd6cc5122589588c3d47d1b4 SHA256 6f85749e83dc947d2e0d6373df3a9a63ab823f04bd5e28ead0da478c54471a27
+MISC ChangeLog 10121 RMD160 7b0fd457101bf2823a36c724d4117f432284c831 SHA1 dae3d1a9405e73621dc4f49c304e3cd03ab52841 SHA256 75735381a0e245e91b7beddbe32c6b5b719c631b9ba8fbacd0e11cdbec391b02
MISC metadata.xml 604 RMD160 1e0ed48d48668781cafc44ef8a14c3fb1e41eb28 SHA1 0f1b65755c3b923539a54b7e05dfda9679c4d758 SHA256 094795782ea49d41a8c4106510bb80d360f1bdaae3ab89c23c369def31bab56c
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-sip.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-sip.patch
new file mode 100644
index 000000000000..2182c14e673e
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.3-sip.patch
@@ -0,0 +1,30 @@
+diff -Naur qtiplot-0.9.7.3/qtiplot/src/scripting/qti.sip qtiplot-0.9.7.3.new/qtiplot/src/scripting/qti.sip
+--- qtiplot-0.9.7.3/qtiplot/src/scripting/qti.sip 2008-10-20 06:32:35.000000000 -0400
++++ qtiplot-0.9.7.3.new/qtiplot/src/scripting/qti.sip 2008-12-18 17:24:44.000000000 -0500
+@@ -74,8 +74,6 @@
+ MdiSubWindow(const MdiSubWindow&);
+ };
+
+-typedef QList<MdiSubWindow*> MDIWindowList;
+-
+ class Table: MdiSubWindow
+ {
+ %TypeHeaderCode
+@@ -1072,7 +1070,7 @@
+ Graph3D* plotParametricSurface(const QString&, const QString&, const QString&,
+ double, double, double, double, int=40, int=40, bool=true, bool=true) /PyName=plot3D/;
+
+- MDIWindowList windowsList() /PyName=windows/;
++ QList<MdiSubWindow*> windowsList() /PyName=windows/;
+
+ // folders
+ Folder *activeFolder() /NoDerived/;
+@@ -1867,7 +1865,7 @@
+ #include "src/core/Folder.h"
+ %End
+ public:
+- MDIWindowList windowsList() /PyName=windows/;
++ QList<MdiSubWindow*> windowsList() /PyName=windows/;
+ // TODO: implement signal Folder::nameChanged and make it update the project explorer; adjust renaming from GUI accordingly
+ // void setFolderName(const QString&) /PyName=setName/;
+ QString name();
diff --git a/sci-visualization/qtiplot/qtiplot-0.9.7.3.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.7.3.ebuild
index 706c7f0890aa..07e5a5bdb096 100644
--- a/sci-visualization/qtiplot/qtiplot-0.9.7.3.ebuild
+++ b/sci-visualization/qtiplot/qtiplot-0.9.7.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.7.3.ebuild,v 1.2 2008/11/14 14:04:46 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.7.3.ebuild,v 1.3 2008/12/18 22:57:38 markusle Exp $
EAPI="1"
inherit eutils multilib qt4 fdo-mime python
@@ -50,6 +50,7 @@ src_unpack() {
epatch "${FILESDIR}"/${PN}-0.9.7-gcc4.3.patch
epatch "${FILESDIR}"/${PN}-0.9.7.2-liborigin-gcc4.3.patch
epatch "${FILESDIR}"/${P}-no-python.patch
+ epatch "${FILESDIR}"/${P}-sip.patch
sed -i \
-e '/manual/d'\