aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher (jlec) <jlec@j-schmitz.net>2009-11-22 15:20:25 +0100
committerJustin Lecher (jlec) <jlec@j-schmitz.net>2009-11-22 15:20:25 +0100
commitd34f3fe362f96c856d4aa2770593b3d09024719b (patch)
treec96ea159c3392b97022562ef76923386ab7ebef8 /sci-visualization
parentFix openib.conf for modprobe (diff)
downloadsci-d34f3fe362f96c856d4aa2770593b3d09024719b.tar.gz
sci-d34f3fe362f96c856d4aa2770593b3d09024719b.tar.bz2
sci-d34f3fe362f96c856d4aa2770593b3d09024719b.zip
sci-visualization/qtiplot -- Fixed sip patch to work with <sip-4.9
(Portage version: 2.2_rc51/git/Linux x86_64) (Signed Manifest commit)
Diffstat (limited to 'sci-visualization')
-rw-r--r--sci-visualization/qtiplot/ChangeLog4
-rw-r--r--sci-visualization/qtiplot/Manifest15
-rw-r--r--sci-visualization/qtiplot/files/qtiplot-0.9.7.10-sip.patch8
-rw-r--r--sci-visualization/qtiplot/files/qtiplot-0.9.7.10-sip2.patch27
4 files changed, 49 insertions, 5 deletions
diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog
index 8baf9ce35..51c592b75 100644
--- a/sci-visualization/qtiplot/ChangeLog
+++ b/sci-visualization/qtiplot/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.46 2009/09/18 18:40:01 bicatali Exp $
+ 22 Nov 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
+ files/qtiplot-0.9.7.10-sip.patch, +files/qtiplot-0.9.7.10-sip2.patch:
+ Fixed sip patch to work with <sip-4.9
+
21 Nov 2009; Justin Lecher (jlec) <jlec@j-schmitz.net>
qtiplot-0.9.7.10.ebuild, +files/qtiplot-0.9.7.10-build.conf.patch,
+files/qtiplot-0.9.7.10-dont-install-qwt.patch,
diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest
index 142911822..68437ae2f 100644
--- a/sci-visualization/qtiplot/Manifest
+++ b/sci-visualization/qtiplot/Manifest
@@ -1,12 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX qtiplot-0.9.7.10-build.conf.patch 5134 RMD160 22ce572f6c000fe5fcedb3bd4a291753e95e7a06 SHA1 0811284e08111cd1bdd070687078b4432e7f4d63 SHA256 0cdb2396d70cca2dacb358107033ffbe03aa42769f64f405d5e5c3df6f10cbad
AUX qtiplot-0.9.7.10-docbuild.patch 2179 RMD160 011a6f3c71f0c5993ddea8a0b679867f40fe6753 SHA1 aed721371c106d041eeabcac55b627eceaa84ae0 SHA256 f3b043e16d099edd45ad4f41af602627883859f91731efcac077e123189073b0
AUX qtiplot-0.9.7.10-dont-install-qwt.patch 605 RMD160 e68908d5ca887e64fe99bed21ea7d1d746f5409d SHA1 23089d7955cc15f6e56e3401266421cae24975c3 SHA256 161657d37de71ea58fc0e0af3495dc45082f5c398bd82c70e40968b23d0b898b
AUX qtiplot-0.9.7.10-gcc44.patch 323 RMD160 22568401bc90aaabb496432a811e71415b220abd SHA1 433cb64e84ed6d4cc555f5b508fc1f4911454703 SHA256 90a1a36aba8ea2230a09a0de7615cf8afd5255ddeb8b4827920833662ea66600
AUX qtiplot-0.9.7.10-gl2ps.patch 12521 RMD160 aab2dc538db2d128554b0723097b1f1fc6749d03 SHA1 64d1f3622b63b4cf7eb2fb2e7542f7f3425932ff SHA256 a915912913af3a6161c03d7b35d6680d2d1b2fbe70b34d95dcddb1a674723e87
AUX qtiplot-0.9.7.10-qtiplot.pro.patch 1684 RMD160 d01587b1cb8d8e43c3606f5132cfd5b28891eb25 SHA1 63489bedd24fd6380324ea38690894cbfaa9dd4c SHA256 3e86c2ec0a0a6322e80e58916669962d6addad5ae9556867192e8f198a7e7a55
-AUX qtiplot-0.9.7.10-sip.patch 1079 RMD160 449d689deed38f4cc2bea14cbebff68f143cba6a SHA1 83bee2e634c0cb35a28647c09e1eaae4e29a02d0 SHA256 1fd54c8427216d0cb2c42f333bc8abb139976c0f26821302a09eaf5a15bee99b
+AUX qtiplot-0.9.7.10-sip.patch 1113 RMD160 afd2089074108bb9ca8c4526bdd0b8c3a5c5d495 SHA1 52745c241f72e6ae2df77d2a54a2a3bd054babe0 SHA256 8195baadb206a13f583ccdb6f63ff457b8eaea0135ae20aea1afa988ef670fa5
+AUX qtiplot-0.9.7.10-sip2.patch 986 RMD160 c952187ddf284818439c52c129843a359f2fec9a SHA1 750b4fc08bdf14f3fa960d21145f34d470f05dc0 SHA256 ef4b63a77fe64fde6c15c89300ac705db690485d733facf63fe19c829ebb2278
AUX qtiplot-0.9.7.10-syslibs.patch 2111 RMD160 d052c2abbc46745f8cc069a666bf9650cfe368dc SHA1 4e82c2041dd9bd232337da679a8955206afd04c8 SHA256 1585bf2207739e7475e86c19178407addafc2d31ed89a84db67fa6f805f97177
DIST qtiplot-0.9.7.10.tar.bz2 7948018 RMD160 21e4ce18b1eab877fd89e97065daa246c637da67 SHA1 38558d9026113a728834536627efbc1bff9c66e1 SHA256 88f8c45f369fb0427720757983cbe033c6761f507f8efb68c63b8d67bcfbf099
EBUILD qtiplot-0.9.7.10.ebuild 3499 RMD160 11484362e59bb3b67577c6bddef09d8fe45d3903 SHA1 a97b8a4e4b17d99e8de8a2e19769ca8a756343a9 SHA256 40e5d9761f79db28f9a6a3300aa4ee125fd064c66175affba4b6e425517a8ba7
-MISC ChangeLog 12478 RMD160 8700391efc1c12d226a42b0b4c3665973c321cd6 SHA1 af5fb9484c6f3fd31ddf2aeacf3c4bdb3a74d952 SHA256 65d120c23bc6fcc47e793c747bfdb140799c0f639b1fc5ae178798b80bff90d0
+MISC ChangeLog 12648 RMD160 bf64b71aac0cde76f7ac1088a777b289f3a87c38 SHA1 75abfc2348f78949b44493e5eb952c6f9ca9393b SHA256 9194fcdcf2c8b01ccc6f5500c727599338db113bb3f7ce6dd9e637424e2b8fc2
MISC metadata.xml 604 RMD160 1e0ed48d48668781cafc44ef8a14c3fb1e41eb28 SHA1 0f1b65755c3b923539a54b7e05dfda9679c4d758 SHA256 094795782ea49d41a8c4106510bb80d360f1bdaae3ab89c23c369def31bab56c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAksJSKkACgkQgAnW8HDreRY25QCgmcE/IO8Y13YgViyX5tzXzLSj
+3VoAoM6+FE5i8OnNcNKm8Lau8W9iOado
+=2YIL
+-----END PGP SIGNATURE-----
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-sip.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-sip.patch
index f8b447f3c..fd8a124ce 100644
--- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-sip.patch
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-sip.patch
@@ -1,5 +1,5 @@
diff --git a/qtiplot/src/scripting/scripting.pri b/qtiplot/src/scripting/scripting.pri
-index b8667e3..2457fc8 100755
+index b8667e3..e4027da 100755
--- a/qtiplot/src/scripting/scripting.pri
+++ b/qtiplot/src/scripting/scripting.pri
@@ -80,7 +80,6 @@ contains(SCRIPTING_LANGS, Python) {
@@ -10,12 +10,14 @@ index b8667e3..2457fc8 100755
$${SIP_DIR}/sipqtiFit.cpp \
$${SIP_DIR}/sipqtiExponentialFit.cpp \
$${SIP_DIR}/sipqtiTwoExpFit.cpp \
-@@ -105,4 +104,14 @@ contains(SCRIPTING_LANGS, Python) {
+@@ -105,4 +104,16 @@ contains(SCRIPTING_LANGS, Python) {
$${SIP_DIR}/sipqtiCorrelation.cpp \
$${SIP_DIR}/sipqtiConvolution.cpp \
$${SIP_DIR}/sipqtiDeconvolution.cpp \
+
-+exists(../../$${SIP_DIR}/sipqtiQList.cpp) {
++SIPVERSION = $$system( sip -V | cut -b 1-3 )
++
++equals( SIPVERSION, 4.8 ) {
+ # SIP < 4.9
+ SOURCES += $${SIP_DIR}/sipqtiQList.cpp
+} else {
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-sip2.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-sip2.patch
new file mode 100644
index 000000000..6e5e1bda5
--- /dev/null
+++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-sip2.patch
@@ -0,0 +1,27 @@
+--- trunk/qtiplot/src/scripting/scripting.pri 2009/10/21 21:30:09 1434
++++ trunk/qtiplot/src/scripting/scripting.pri 2009/10/22 13:39:34 1435
+@@ -80,7 +80,6 @@
+ $${SIP_DIR}/sipqtiPythonScript.cpp\
+ $${SIP_DIR}/sipqtiPythonScripting.cpp\
+ $${SIP_DIR}/sipqtiFolder.cpp\
+- $${SIP_DIR}/sipqtiQList.cpp\
+ $${SIP_DIR}/sipqtiFit.cpp \
+ $${SIP_DIR}/sipqtiExponentialFit.cpp \
+ $${SIP_DIR}/sipqtiTwoExpFit.cpp \
+@@ -104,5 +103,15 @@
+ $${SIP_DIR}/sipqtiFFT.cpp \
+ $${SIP_DIR}/sipqtiCorrelation.cpp \
+ $${SIP_DIR}/sipqtiConvolution.cpp \
+- $${SIP_DIR}/sipqtiDeconvolution.cpp
++ $${SIP_DIR}/sipqtiDeconvolution.cpp \
++
++exists(../../$${SIP_DIR}/sipqtiQList.cpp) {
++ # SIP < 4.9
++ SOURCES += $${SIP_DIR}/sipqtiQList.cpp
++} else {
++ SOURCES += \
++ $${SIP_DIR}/sipqtiQList0101Folder.cpp\
++ $${SIP_DIR}/sipqtiQList0101Graph.cpp\
++ $${SIP_DIR}/sipqtiQList0101MdiSubWindow.cpp\
++}
+ }