diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-01-01 10:46:53 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-01-01 10:46:53 +0000 |
| commit | 090924f46fbd285c652f629636a3fcc74a14605b (patch) | |
| tree | ca14b60fde73af658223bc6abc3238400cf6c0da | |
| parent | Stable on amd64 wrt bug #299087 (diff) | |
| download | historical-090924f46fbd285c652f629636a3fcc74a14605b.tar.gz historical-090924f46fbd285c652f629636a3fcc74a14605b.tar.bz2 historical-090924f46fbd285c652f629636a3fcc74a14605b.zip | |
Version bump by jlec
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64
15 files changed, 823 insertions, 284 deletions
diff --git a/sci-visualization/qtiplot/ChangeLog b/sci-visualization/qtiplot/ChangeLog index df1af57b6a7f..1359ae73a4e6 100644 --- a/sci-visualization/qtiplot/ChangeLog +++ b/sci-visualization/qtiplot/ChangeLog @@ -1,6 +1,19 @@ # ChangeLog for sci-visualization/qtiplot -# 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 $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/ChangeLog,v 1.47 2010/01/01 10:46:53 ssuominen Exp $ + +*qtiplot-0.9.7.10 (01 Jan 2010) + + 01 Jan 2010; Samuli Suominen <ssuominen@gentoo.org> + +qtiplot-0.9.7.10.ebuild, +files/qtiplot-0.9.7.10-build.conf.patch, + +files/qtiplot-0.9.7.10-docbuild.patch, + +files/qtiplot-0.9.7.10-dont-install-qwt.patch, + +files/qtiplot-0.9.7.10-gcc44.patch, +files/qtiplot-0.9.7.10-gl2ps.patch, + +files/qtiplot-0.9.7.10-qtiplot.pro.patch, + +files/qtiplot-0.9.7.10-sip.patch, +files/qtiplot-0.9.7.10-sip2.patch, + +files/qtiplot-0.9.7.10-syslibs.patch: + Version bump wrt #275167, #292884 and 293095. Thanks to Justin Lecher for + ebuild. *qtiplot-0.9.7.7-r1 (18 Sep 2009) diff --git a/sci-visualization/qtiplot/Manifest b/sci-visualization/qtiplot/Manifest index b89eefbfbe63..d94c587da42e 100644 --- a/sci-visualization/qtiplot/Manifest +++ b/sci-visualization/qtiplot/Manifest @@ -1,21 +1,16 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX qtiplot-0.7.7-qmake.patch 11384 RMD160 fa0491bd504d3445645817871fa831d0b70b4602 SHA1 5cd18e99d39664ef48e0d18069d89cb4b417a175 SHA256 2d89427ab1304b1ec8165d6ceaedf474a48ba59d55dafbb4977b5ddaab8509ca -AUX qtiplot-0.9.7.7-docbuild.patch 2179 RMD160 011a6f3c71f0c5993ddea8a0b679867f40fe6753 SHA1 aed721371c106d041eeabcac55b627eceaa84ae0 SHA256 f3b043e16d099edd45ad4f41af602627883859f91731efcac077e123189073b0 -AUX qtiplot-0.9.7.7-gcc44.patch 663 RMD160 6ba315028c09767d9bb5f7f31ae8c6a17d4a8a3b SHA1 47cad99fe3fcace29c0b11fd005ce2e75542fc00 SHA256 f282fc735a546eed42ab30c38215ff1d32d413c415a6575a7702f8445f392292 -AUX qtiplot-0.9.7.7-sip.patch 2575 RMD160 68e5dff2be6f15a5518db7a26dfcda4e7e20b6b0 SHA1 cbc797c2b9b033c496bcd1e702862a5f9ce0c829 SHA256 6d1005beb7067d76525191198e19bb18d629bcd894fee6c0912e0a2a75fb16c0 -AUX qtiplot-0.9.7.7-syslibs.patch 8389 RMD160 f8a8535892bca48862353edd72ec6001683bf10e SHA1 168b2af1336a0c81878614b1d9ba0d1f8d5a6877 SHA256 5094f599056f5516dd30e61f7de7807fe4778d49fbf3c63bb8b2df8e265182b6 +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 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.7.7.zip 812738 RMD160 6f62b32059eec57bf931b5bae9f524672d436ee9 SHA1 b201e600ec057ff0f7b4b4572850b0b072a0e0fb SHA256 937849c42cc3047df3975d1cb7a26a2503a499d548066937589340f55bd1ab01 -DIST qtiplot-0.9.7.7.tar.bz2 6908502 RMD160 2843c6a614d62613bc383f9d7b678f6fb5df0e01 SHA1 52d93c01013925b43d1f8dc2b372b83c7b84f848 SHA256 6c1cf9425de5609eec98b0e29bd0b7a316ca8d513ea44a462cffacf8695f43b1 +DIST qtiplot-0.9.7.10.tar.bz2 7948018 RMD160 21e4ce18b1eab877fd89e97065daa246c637da67 SHA1 38558d9026113a728834536627efbc1bff9c66e1 SHA256 88f8c45f369fb0427720757983cbe033c6761f507f8efb68c63b8d67bcfbf099 EBUILD qtiplot-0.7.7.ebuild 1095 RMD160 a5ccfad6cdadadf0f11600f9b8114f9c7fb8ae2b SHA1 e6008083cbd394f979d675035c6c11fb6771fc26 SHA256 b4019c8262709376fc6d2d6fc34150da0d1079db79718d3c50adc06ed3f95c03 -EBUILD qtiplot-0.9.7.7-r1.ebuild 3051 RMD160 1e26e9d0d2722b388f1e1b1fea1dd9f058b8f34d SHA1 cd6337ded02ba4fbf1c6317d4b9649d358bbba51 SHA256 74c24604e35e4444c964239e00d797a304c7db0099add48ac491094cb8dea4cc -MISC ChangeLog 11972 RMD160 a63e508d2111a6f0054019ad446bb7eae240feb9 SHA1 c90579ecf861488ef6e15ea076910b93253bed55 SHA256 58f2ea40e8ee97e2c6878dd8ca3ebc020933a43e0b1fdc434527ee22138d7195 +EBUILD qtiplot-0.9.7.10.ebuild 3498 RMD160 8294c2628e355f8b1fdc5af32a82d708b136775c SHA1 34452f46739d75ed2d8a7047b72fcbe135279d23 SHA256 418debe276c06939d828d5a9e446a4088a7b730077f281e34454325002243e5e +MISC ChangeLog 12544 RMD160 54f6c1b344503b398039039ff13ff9d1111d617f SHA1 37b16e8bb1509d03a00141e8a29bc2ad058ae962 SHA256 dfc30f6ac93c646759ca68175c191a7411f0fff41a04ac55dc01d9d8893d2275 MISC metadata.xml 604 RMD160 1e0ed48d48668781cafc44ef8a14c3fb1e41eb28 SHA1 0f1b65755c3b923539a54b7e05dfda9679c4d758 SHA256 094795782ea49d41a8c4106510bb80d360f1bdaae3ab89c23c369def31bab56c ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.11 (GNU/Linux) - -iEYEARECAAYFAkqz1AsACgkQ1ycZbhPLE2D2hQCaAuioSnTNHzDcCeCtnqdcrBJz -Jg8An2bMFxdKRdVXsX4O9WBObXTB3C1I -=pSBf ------END PGP SIGNATURE----- diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-build.conf.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-build.conf.patch new file mode 100644 index 000000000000..9d0591c90fa2 --- /dev/null +++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-build.conf.patch @@ -0,0 +1,117 @@ +diff --git a/build.conf.example b/build.conf.example +index 9e0c532..4f8906f 100755 +--- a/build.conf.example ++++ b/build.conf.example +@@ -7,30 +7,29 @@ isEmpty( QTI_ROOT ) { + ########################################################## + + # Global include path which is always added at the end of the INCLUDEPATH +-SYS_INCLUDEPATH = /opt/local/include ++SYS_INCLUDEPATH = /usr/include + # Global lib path and libs which is ls always added at the end of LIBS +-SYS_LIBS = -L/opt/local/lib ++SYS_LIBS = -L/usr/GENTOOLIB + + ########################################################## + ## muParser (http://muparser.sourceforge.net/) + ########################################################## + + # include path. leave it blank to use SYS_INCLUDE +-MUPARSER_INCLUDEPATH = $$QTI_ROOT/3rdparty/muparser/include ++MUPARSER_INCLUDEPATH = $$system(pkg-config --cflags muparser) + # link statically against a copy in 3rdparty/ +-MUPARSER_LIBS = $$QTI_ROOT/3rdparty/muparser/lib/libmuparser.a ++#MUPARSER_LIBS = $$QTI_ROOT/3rdparty/muparser/lib/libmuparser.a + # or dynamically against a system-wide installation +-#MUPARSER_LIBS = -lmuparser ++MUPARSER_LIBS = $$system(pkg-config --libs muparser) + + ########################################################## + ## GNU Sientific Library (http://www.gnu.org/software/gsl/) + ########################################################## + + # include path. leave it blank to use SYS_INCLUDE +-GSL_INCLUDEPATH = $$QTI_ROOT/3rdparty/gsl/include ++GSL_INCLUDEPATH = $$system(pkg-config --cflags gsl) + # link statically against a copy in 3rdparty/ +-GSL_LIBS = $$QTI_ROOT/3rdparty/gsl/lib/libgsl.a \ +- $$QTI_ROOT/3rdparty/gsl/lib/libgslcblas.a ++GSL_LIBS = $$system(pkg-config --libs gsl) + # or dynamically against a system-wide installation + #GSL_LIBS = -lgsl -lgslcblas + +@@ -39,14 +38,14 @@ GSL_LIBS = $$QTI_ROOT/3rdparty/gsl/lib/libgsl.a \ + ########################################################## + + # include path. leave it blank to use SYS_INCLUDE +-BOOST_INCLUDEPATH = $$QTI_ROOT/3rdparty/boost ++BOOST_INCLUDEPATH = /usr/include/boost + # link statically against a copy in 3rdparty/ +-unix: BOOST_LIBS = $$QTI_ROOT/3rdparty/boost/lib/libboost_date_time-gcc43-mt-1_38.a \ +- $$QTI_ROOT/3rdparty/boost/lib/libboost_thread-gcc43-mt-1_38.a +-win32:BOOST_LIBS = $$QTI_ROOT/3rdparty/boost/lib/libboost_date_time-mgw34-mt.lib \ +- $$QTI_ROOT/3rdparty/boost/lib/libboost_thread-mgw34-mt.lib ++#unix: BOOST_LIBS = $$QTI_ROOT/3rdparty/boost/lib/libboost_date_time-gcc43-mt-1_38.a \ ++# $$QTI_ROOT/3rdparty/boost/lib/libboost_thread-gcc43-mt-1_38.a ++#win32:BOOST_LIBS = $$QTI_ROOT/3rdparty/boost/lib/libboost_date_time-mgw34-mt.lib \ ++# $$QTI_ROOT/3rdparty/boost/lib/libboost_thread-mgw34-mt.lib + # or dynamically against a system-wide installation +-#BOOST_LIBS = -lboost_date_time-mt -lboost_thread-mt ++BOOST_LIBS = -lboost_date_time-mt -lboost_thread-mt + + ########################################################## + ## QWT - use local copy till upstream catches up +@@ -55,19 +54,21 @@ win32:BOOST_LIBS = $$QTI_ROOT/3rdparty/boost/lib/libboost_date_time-mgw34-mt.lib + + # include path. + QWT_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwt/src ++#QWT_INCLUDEPATH = /usr/include/qwt5 + # link locally against a copy in 3rdparty/ + QWT_LIBS = $$QTI_ROOT/3rdparty/qwt/lib/libqwt.a ++#QWT_LIBS = -lqwt + + ########################################################## + ## libpng - optional. you don't have to set these variables + ########################################################## + + # include path. leave it blank to use SYS_INCLUDE +-LIBPNG_INCLUDEPATH = $$QTI_ROOT/3rdparty/libpng/ ++LIBPNG_INCLUDEPATH = /usr/libpng/ + # link statically against a copy in 3rdparty/ +-LIBPNG_LIBS = $$QTI_ROOT/3rdparty/libpng/libpng.a ++#LIBPNG_LIBS = $$QTI_ROOT/3rdparty/libpng/libpng.a + # or dynamically against a system-wide installation +-#LIBPNG_LIBS = -lpng ++LIBPNG_LIBS = $$system(pkg-config --libs libpng) + + ########################################################## + ## EmfEngine - optional. you don't have to set these variables +@@ -75,9 +76,17 @@ LIBPNG_LIBS = $$QTI_ROOT/3rdparty/libpng/libpng.a + ########################################################## + + # include path. +-EMF_ENGINE_INCLUDEPATH = $$QTI_ROOT/3rdparty/EmfEngine/src ++EMF_ENGINE_INCLUDEPATH = /usr/include/libEMF + # link locally against a copy in 3rdparty/ +-EMF_ENGINE_LIBS = $$QTI_ROOT/3rdparty/EmfEngine/libEmfEngine.a ++EMF_ENGINE_LIBS = -lEMF ++ ++############################################################ ++## liborigin ++############################################################ ++ ++LIB_ORIGIN_INCLUDEPATH = /usr/include/liborigin2 ++ ++LIB_ORIGIN_LIBS = -lorigin2 + + ############################################################ + ## Target specific configuration: configure Qtiplot itself +@@ -101,7 +110,7 @@ contains( TARGET, qtiplot ) { + #DEFINES += QTIPLOT_SUPPORT + + # Uncomment the following line if you want to perform a custom installation using the *.path variables defined in ./qtiplot.pro. +- #CONFIG += CustomInstall ++ CONFIG += CustomInstall + + CONFIG += release + #CONFIG += debug diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.7-docbuild.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-docbuild.patch index 58779fd3fd20..58779fd3fd20 100644 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.7-docbuild.patch +++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-docbuild.patch diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-dont-install-qwt.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-dont-install-qwt.patch new file mode 100644 index 000000000000..86e4d4c6a9c1 --- /dev/null +++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-dont-install-qwt.patch @@ -0,0 +1,22 @@ +diff --git a/3rdparty/qwt/qwtconfig.pri b/3rdparty/qwt/qwtconfig.pri +index b7d0d0e..e36f131 100755 +--- a/3rdparty/qwt/qwtconfig.pri ++++ b/3rdparty/qwt/qwtconfig.pri +@@ -7,17 +7,6 @@ VER_MIN = 2 + VER_PAT = 0
+ VERSION = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
+
+-unix {
+- INSTALLBASE = /usr/local/qwt-5.2.0
+-}
+-
+-win32 {
+- INSTALLBASE = C:/Qwt-5.2.0
+-}
+-
+-target.path = $$INSTALLBASE/lib
+-headers.path = $$INSTALLBASE/include
+-doc.path = $$INSTALLBASE/doc
+
+ ######################################################################
+ # qmake internal options
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-gcc44.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-gcc44.patch new file mode 100644 index 000000000000..92316599ae21 --- /dev/null +++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-gcc44.patch @@ -0,0 +1,9 @@ +diff --git a/3rdparty/qwtplot3d/src/qwt3d_function.cpp b/3rdparty/qwtplot3d/src/qwt3d_function.cpp +index 3271aea..559127b 100755 +--- a/3rdparty/qwtplot3d/src/qwt3d_function.cpp ++++ b/3rdparty/qwtplot3d/src/qwt3d_function.cpp +@@ -1,3 +1,4 @@ ++#include <cstdio> + #include "qwt3d_surfaceplot.h" + #include "qwt3d_function.h" + diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-gl2ps.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-gl2ps.patch new file mode 100644 index 000000000000..51810b673cf5 --- /dev/null +++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-gl2ps.patch @@ -0,0 +1,458 @@ +diff --git a/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp b/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp +index dd1b7e4..8ce3c8c 100755 +--- a/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp ++++ b/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp +@@ -6,12 +6,12 @@ + #include <locale.h> + + #include "qwt3d_openglhelper.h" +-#include "../3rdparty/gl2ps/gl2ps.h" ++#include <gl2ps.h> + #include "qwt3d_io_gl2ps.h" + #include "qwt3d_plot.h" +-
+-#include <QFileInfo>
+-#include <QMessageBox>
++ ++#include <QFileInfo> ++#include <QMessageBox> + + using namespace Qwt3D; + +@@ -32,7 +32,7 @@ VectorWriter::VectorWriter() + sortmode_(SIMPLESORT), + landscape_(VectorWriter::AUTO), + textmode_(VectorWriter::PIXEL), +- texfname_(""),
++ texfname_(""), + export_size_(QSize()) + {} + +@@ -132,10 +132,10 @@ bool VectorWriter::operator()(Plot3D* plot, QString const& fname) + + char* tmploc = setlocale(LC_ALL, "C"); + +- plot->makeCurrent();
+-
+- QSize size = plot->size();
+- if (export_size_.isValid())
++ plot->makeCurrent(); ++ ++ QSize size = plot->size(); ++ if (export_size_.isValid()) + plot->resize(export_size_); + + GLint bufsize = 0, state = GL2PS_OVERFLOW; +@@ -220,7 +220,7 @@ bool VectorWriter::operator()(Plot3D* plot, QString const& fname) + return false; + } + +- plot->setExportingVector(true, gl2ps_format_);
++ plot->setExportingVector(true, gl2ps_format_); + + while( state == GL2PS_OVERFLOW ){ + bufsize += 2*1024*1024; +@@ -236,9 +236,9 @@ bool VectorWriter::operator()(Plot3D* plot, QString const& fname) + + // extra TeX file + if (textmode_ == TEX) +- {
+- QFileInfo fi(fname);
+- QString fn = fname;
++ { ++ QFileInfo fi(fname); ++ QString fn = fname; + fn = fn.remove(fi.suffix()) + "tex"; + + fp = fopen(QWT3DLOCAL8BIT(fn), "wb"); +@@ -268,9 +268,9 @@ bool VectorWriter::operator()(Plot3D* plot, QString const& fname) + + Label::useDeviceFonts(false); + +- setlocale(LC_ALL, tmploc);
+- if (export_size_.isValid())
+- plot->resize(size);// restore original plot size
++ setlocale(LC_ALL, tmploc); ++ if (export_size_.isValid()) ++ plot->resize(size);// restore original plot size + + return true; + } +@@ -324,20 +324,20 @@ GLint Qwt3D::drawDevicePixels(GLsizei width, GLsizei height, + + if(format != GL_RGBA || type != GL_UNSIGNED_BYTE) + return GL2PS_ERROR; +-
+- GLfloat* convertedpixel = (GLfloat*)malloc(4 * width * height * sizeof(GLfloat));
+- if (!convertedpixel)
+- return GL2PS_ERROR;
+-
+- GLubyte* px = (GLubyte*)pixels;
+- for (int i = 0; i != 4*width*height; i += 4){
+- convertedpixel[i] = px[i] / 255.0;
+- convertedpixel[i+1] = px[i+1] / 255.0;
+- convertedpixel[i+2] = px[i+2] / 255.0;
+- convertedpixel[i+3] = px[i+3] / 255.0;
+- }
+- GLint ret = gl2psDrawPixels(width, height, 0, 0, GL_RGBA, GL_FLOAT, convertedpixel);
+- free(convertedpixel);
++ ++ GLfloat* convertedpixel = (GLfloat*)malloc(4 * width * height * sizeof(GLfloat)); ++ if (!convertedpixel) ++ return GL2PS_ERROR; ++ ++ GLubyte* px = (GLubyte*)pixels; ++ for (int i = 0; i != 4*width*height; i += 4){ ++ convertedpixel[i] = px[i] / 255.0; ++ convertedpixel[i+1] = px[i+1] / 255.0; ++ convertedpixel[i+2] = px[i+2] / 255.0; ++ convertedpixel[i+3] = px[i+3] / 255.0; ++ } ++ GLint ret = gl2psDrawPixels(width, height, 0, 0, GL_RGBA, GL_FLOAT, convertedpixel); ++ free(convertedpixel); + return ret; + } + +diff --git a/3rdparty/qwtplot3d/src/qwt3d_label.cpp b/3rdparty/qwtplot3d/src/qwt3d_label.cpp +index c495a0f..2107cf8 100755 +--- a/3rdparty/qwtplot3d/src/qwt3d_label.cpp ++++ b/3rdparty/qwtplot3d/src/qwt3d_label.cpp +@@ -1,7 +1,7 @@ + #include <qbitmap.h> + #include "qwt3d_label.h" +-#include "qwt3d_plot.h"
+-#include "../3rdparty/gl2ps/gl2ps.h"
++#include "qwt3d_plot.h" ++#include <gl2ps.h> + + using namespace Qwt3D; + +@@ -32,9 +32,9 @@ void Label::init() + setColor(0,0,0); + font_ = QFont(); + anchor_ = BottomLeft; +- gap_ = 0;
+- width_ = 0.0;
+- height_ = 0.0;
++ gap_ = 0; ++ width_ = 0.0; ++ height_ = 0.0; + } + + void Label::useDeviceFonts(bool val) +@@ -88,66 +88,66 @@ void Label::setRelPosition(Tuple rpos, ANCHOR a) + getMatrices(modelMatrix, projMatrix, viewport); + beg_ = relativePosition(Triple(rpos.x, rpos.y, ot)); + setPosition(beg_, a); +-}
+-
+-QImage Label::createImage(double angle)
+-{
+- QRect r = QRect(QPoint(0, 0), QFontMetrics(font_).size(Qwt3D::SingleLine, text_));
+- int textWidth = r.width();
+- int textHeight = r.height();
+-
+- double aux_a = angle;
+- if (aux_a > 270)
+- aux_a -= 270;
+- if (aux_a >= 180)
+- aux_a -= 180;
+- if (aux_a > 90)
+- aux_a -= 90;
+-
+- double rad = aux_a*M_PI/180.0;
+-
+- int w = 0, h = 0;
+- if ((angle >= 0 && angle <= 90) || (angle >= 180 && angle <= 270)){
+- w = qRound(fabs(textWidth*cos(rad) + textHeight*sin(rad)));
+- h = qRound(fabs(textWidth*sin(rad) + textHeight*cos(rad)));
+- } else {
+- w = qRound(fabs(textWidth*sin(rad) + textHeight*cos(rad)));
+- h = qRound(fabs(textWidth*cos(rad) + textHeight*sin(rad)));
+- }
+-
+- width_ = w;
+- height_ = h;
+-
+- QPixmap pm_ = QPixmap(w, h);
+-
+- if (plot() && plot()->isExportingVector() && plot()->vectorExportFormat() != GL2PS_PDF){
+- Qwt3D::RGBA rgba = plot()->backgroundRGBAColor();
+- pm_.fill(GL2Qt(rgba.r, rgba.g, rgba.b));
+- } else
+- pm_.fill(Qt::transparent);
+-
+- QPainter p(&pm_);
+-
+- if (angle >= 270)
+- p.translate(textHeight*cos(rad), 0.0);
+- else if (angle >= 180)
+- p.translate(w, textHeight*cos(rad));
+- else if (angle > 90)
+- p.translate(textWidth*sin(rad), h);
+- else
+- p.translate(0.0, textWidth*sin(rad));
+-
+- p.rotate(-angle);
+- p.translate(0.0, textHeight - QFontMetrics(font_).descent());
+-
+- p.setFont( font_ );
+- p.setPen(Qt::SolidLine);
+- p.setPen(GL2Qt(color.r, color.g, color.b));
+- p.drawText(0, 0, text_);
+- p.end();
+-
+- return QGLWidget::convertToGLFormat(pm_.toImage());
+-}
++} ++ ++QImage Label::createImage(double angle) ++{ ++ QRect r = QRect(QPoint(0, 0), QFontMetrics(font_).size(Qwt3D::SingleLine, text_)); ++ int textWidth = r.width(); ++ int textHeight = r.height(); ++ ++ double aux_a = angle; ++ if (aux_a > 270) ++ aux_a -= 270; ++ if (aux_a >= 180) ++ aux_a -= 180; ++ if (aux_a > 90) ++ aux_a -= 90; ++ ++ double rad = aux_a*M_PI/180.0; ++ ++ int w = 0, h = 0; ++ if ((angle >= 0 && angle <= 90) || (angle >= 180 && angle <= 270)){ ++ w = qRound(fabs(textWidth*cos(rad) + textHeight*sin(rad))); ++ h = qRound(fabs(textWidth*sin(rad) + textHeight*cos(rad))); ++ } else { ++ w = qRound(fabs(textWidth*sin(rad) + textHeight*cos(rad))); ++ h = qRound(fabs(textWidth*cos(rad) + textHeight*sin(rad))); ++ } ++ ++ width_ = w; ++ height_ = h; ++ ++ QPixmap pm_ = QPixmap(w, h); ++ ++ if (plot() && plot()->isExportingVector() && plot()->vectorExportFormat() != GL2PS_PDF){ ++ Qwt3D::RGBA rgba = plot()->backgroundRGBAColor(); ++ pm_.fill(GL2Qt(rgba.r, rgba.g, rgba.b)); ++ } else ++ pm_.fill(Qt::transparent); ++ ++ QPainter p(&pm_); ++ ++ if (angle >= 270) ++ p.translate(textHeight*cos(rad), 0.0); ++ else if (angle >= 180) ++ p.translate(w, textHeight*cos(rad)); ++ else if (angle > 90) ++ p.translate(textWidth*sin(rad), h); ++ else ++ p.translate(0.0, textWidth*sin(rad)); ++ ++ p.rotate(-angle); ++ p.translate(0.0, textHeight - QFontMetrics(font_).descent()); ++ ++ p.setFont( font_ ); ++ p.setPen(Qt::SolidLine); ++ p.setPen(GL2Qt(color.r, color.g, color.b)); ++ p.drawText(0, 0, text_); ++ p.end(); ++ ++ return QGLWidget::convertToGLFormat(pm_.toImage()); ++} + + /** + Adds an additional shift to the anchor point. This happens in a more or less intelligent manner +@@ -205,100 +205,100 @@ void Label::convert2screen() + } + start = World2ViewPort(beg_); + end_ = ViewPort2World(start + Triple(width(), height(), 0)); +-}
+-
+-const char * Label::fontname()
+-{
+- char *name = "Helvetica";
+- if (font_.family() == "Times New Roman"){
+- name = "Times";
+- if (font_.bold() && font_.italic ())
+- name = "Times-BoldItalic";
+- else if (font_.italic())
+- name = "Times-Italic";
+- else if (font_.bold())
+- name = "Times-Bold";
+- } else if (font_.family() == "Courier" || font_.family() == "Courier New"){
+- name = "Courier";
+- if (font_.bold() && font_.italic ())
+- name = "Courier-BoldOblique";
+- else if (font_.italic())
+- name = "Courier-Oblique";
+- else if (font_.bold())
+- name = "Courier-Bold";
+- } else {
+- if (font_.bold() && font_.italic ())
+- name = "Helvetica-BoldOblique";
+- else if (font_.italic())
+- name = "Helvetica-Oblique";
+- else if (font_.bold())
+- name = "Helvetica-Bold";
+- }
+-
+- return (const char*) name;
+-}
+-
+-void Label::draw(double angle)
+-{
+- if (!plot() || !plot()->isVisible())
+- return;
+-
+- if (text_.isEmpty())
+- return;
+-
+- GLboolean b;
+- GLint func;
+- GLdouble v;
+- glGetBooleanv(GL_ALPHA_TEST, &b);
+- glGetIntegerv(GL_ALPHA_TEST_FUNC, &func);
+- glGetDoublev(GL_ALPHA_TEST_REF, &v);
+-
+- glEnable (GL_ALPHA_TEST);
+- glAlphaFunc (GL_NOTEQUAL, 0.0);
+-
+- convert2screen();
+- glRasterPos3d(beg_.x, beg_.y, beg_.z);
+-
+- if (plot()->isExportingVector()){
+- if (devicefonts_)
+- drawDeviceText(QWT3DLOCAL8BIT(text_), fontname(), font_.pointSize(), pos_, color, anchor_, gap_, angle);
+- else {
+- QImage tex_ = createImage(angle);
+- drawDevicePixels(tex_.width(), tex_.height(), GL_RGBA, GL_UNSIGNED_BYTE, tex_.bits());
+- }
+- } else {
+- if (!angle){
+- Triple start = World2ViewPort(beg_);
+- start = ViewPort2World(start + Triple(0, QFontMetrics(font_).descent(), 0));
+- plot()->qglColor(GL2Qt(color.r, color.g, color.b));
+- plot()->renderText(start.x, start.y, start.z, text_, font_);
+- } else {
+- QImage tex_ = createImage(angle);
+- drawDevicePixels(tex_.width(), tex_.height(), GL_RGBA, GL_UNSIGNED_BYTE, tex_.bits());
+- }
+- }
+-
+- glAlphaFunc(func,v);
+- Enable(GL_ALPHA_TEST, b);
+-}
++} ++ ++const char * Label::fontname() ++{ ++ char *name = "Helvetica"; ++ if (font_.family() == "Times New Roman"){ ++ name = "Times"; ++ if (font_.bold() && font_.italic ()) ++ name = "Times-BoldItalic"; ++ else if (font_.italic()) ++ name = "Times-Italic"; ++ else if (font_.bold()) ++ name = "Times-Bold"; ++ } else if (font_.family() == "Courier" || font_.family() == "Courier New"){ ++ name = "Courier"; ++ if (font_.bold() && font_.italic ()) ++ name = "Courier-BoldOblique"; ++ else if (font_.italic()) ++ name = "Courier-Oblique"; ++ else if (font_.bold()) ++ name = "Courier-Bold"; ++ } else { ++ if (font_.bold() && font_.italic ()) ++ name = "Helvetica-BoldOblique"; ++ else if (font_.italic()) ++ name = "Helvetica-Oblique"; ++ else if (font_.bold()) ++ name = "Helvetica-Bold"; ++ } ++ ++ return (const char*) name; ++} ++ ++void Label::draw(double angle) ++{ ++ if (!plot() || !plot()->isVisible()) ++ return; ++ ++ if (text_.isEmpty()) ++ return; ++ ++ GLboolean b; ++ GLint func; ++ GLdouble v; ++ glGetBooleanv(GL_ALPHA_TEST, &b); ++ glGetIntegerv(GL_ALPHA_TEST_FUNC, &func); ++ glGetDoublev(GL_ALPHA_TEST_REF, &v); ++ ++ glEnable (GL_ALPHA_TEST); ++ glAlphaFunc (GL_NOTEQUAL, 0.0); ++ ++ convert2screen(); ++ glRasterPos3d(beg_.x, beg_.y, beg_.z); ++ ++ if (plot()->isExportingVector()){ ++ if (devicefonts_) ++ drawDeviceText(QWT3DLOCAL8BIT(text_), fontname(), font_.pointSize(), pos_, color, anchor_, gap_, angle); ++ else { ++ QImage tex_ = createImage(angle); ++ drawDevicePixels(tex_.width(), tex_.height(), GL_RGBA, GL_UNSIGNED_BYTE, tex_.bits()); ++ } ++ } else { ++ if (!angle){ ++ Triple start = World2ViewPort(beg_); ++ start = ViewPort2World(start + Triple(0, QFontMetrics(font_).descent(), 0)); ++ plot()->qglColor(GL2Qt(color.r, color.g, color.b)); ++ plot()->renderText(start.x, start.y, start.z, text_, font_); ++ } else { ++ QImage tex_ = createImage(angle); ++ drawDevicePixels(tex_.width(), tex_.height(), GL_RGBA, GL_UNSIGNED_BYTE, tex_.bits()); ++ } ++ } ++ ++ glAlphaFunc(func,v); ++ Enable(GL_ALPHA_TEST, b); ++} + + double Label::width() const +-{
+- if (width_ > 0.0 && height_ > 0.0)
+- return width_;
+-
++{ ++ if (width_ > 0.0 && height_ > 0.0) ++ return width_; ++ + return QRect(QPoint(0, 0), QFontMetrics(font_).size(Qwt3D::SingleLine, text_)).width(); + } + + double Label::height() const +-{
++{ + if (width_ > 0.0 && height_ > 0.0) +- return height_;
+-
++ return height_; ++ ++ return QRect(QPoint(0, 0), QFontMetrics(font_).size(Qwt3D::SingleLine, text_)).height(); ++} ++ ++double Label::textHeight() const ++{ + return QRect(QPoint(0, 0), QFontMetrics(font_).size(Qwt3D::SingleLine, text_)).height(); + } +-
+-double Label::textHeight() const
+-{
+- return QRect(QPoint(0, 0), QFontMetrics(font_).size(Qwt3D::SingleLine, text_)).height();
+-}
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-qtiplot.pro.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-qtiplot.pro.patch new file mode 100644 index 000000000000..a61b7296d464 --- /dev/null +++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-qtiplot.pro.patch @@ -0,0 +1,44 @@ +diff --git a/qtiplot/qtiplot.pro b/qtiplot/qtiplot.pro +index 1021776..37ed5de 100755 +--- a/qtiplot/qtiplot.pro ++++ b/qtiplot/qtiplot.pro +@@ -10,21 +10,24 @@ QTI_ROOT = .. +
+ # local copy included
+ INCLUDEPATH += ../3rdparty/qwtplot3d/include
+-INCLUDEPATH += ../3rdparty/liborigin
+ INCLUDEPATH += ../3rdparty/zlib
+-INCLUDEPATH += ../3rdparty/QTeXEngine/src
++INCLUDEPATH += /usr/include
+
+ # configurable
+ INCLUDEPATH += $$MUPARSER_INCLUDEPATH
+ INCLUDEPATH += $$QWT_INCLUDEPATH
+ INCLUDEPATH += $$GSL_INCLUDEPATH
+ INCLUDEPATH += $$BOOST_INCLUDEPATH
++INCLUDEPATH += $$LIB_ORIGIN_INCLUDEPATH
+
+ # configurable libs
+ LIBS += $$MUPARSER_LIBS
+ LIBS += $$QWT_LIBS
+ LIBS += $$GSL_LIBS
+ LIBS += $$BOOST_LIBS
++LIBS += $$LIB_ORIGIN_LIBS
++LIBS += -lQTeXEngine
++LIBS += -lgl2ps
+
+ #############################################################################
+ ###################### BASIC PROJECT PROPERTIES #############################
+@@ -140,10 +143,8 @@ include(src/scripting/scripting.pri) + ##################### TeX export: QTeXEngine ##################
+ ###############################################################
+
+-INCLUDEPATH += ../3rdparty/QTeXEngine/src
+-HEADERS += ../3rdparty/QTeXEngine/src/QTeXEngine.h
+-SOURCES += ../3rdparty/QTeXEngine/src/QTeXPaintEngine.cpp
+-SOURCES += ../3rdparty/QTeXEngine/src/QTeXPaintDevice.cpp
++INCLUDEPATH += /usr/include
++HEADERS += /usr/include/QTeXEngine.h
+
+ ###############################################################
+ ##################### Scripting: PYTHON + SIP + PyQT ##########
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 new file mode 100644 index 000000000000..fd8a124ce1b0 --- /dev/null +++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-sip.patch @@ -0,0 +1,29 @@ +diff --git a/qtiplot/src/scripting/scripting.pri b/qtiplot/src/scripting/scripting.pri +index b8667e3..e4027da 100755 +--- a/qtiplot/src/scripting/scripting.pri ++++ b/qtiplot/src/scripting/scripting.pri +@@ -80,7 +80,6 @@ contains(SCRIPTING_LANGS, Python) { + $${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 \
+@@ -105,4 +104,16 @@ contains(SCRIPTING_LANGS, Python) { + $${SIP_DIR}/sipqtiCorrelation.cpp \
+ $${SIP_DIR}/sipqtiConvolution.cpp \
+ $${SIP_DIR}/sipqtiDeconvolution.cpp \
++
++SIPVERSION = $$system( sip -V | cut -b 1-3 )
++
++equals( SIPVERSION, 4.8 ) {
++ # SIP < 4.9
++ SOURCES += $${SIP_DIR}/sipqtiQList.cpp
++} else {
++ SOURCES += \
++ $${SIP_DIR}/sipqtiQList0101Folder.cpp\
++ $${SIP_DIR}/sipqtiQList0101Graph.cpp\
++ $${SIP_DIR}/sipqtiQList0101MdiSubWindow.cpp\
++}
+ }
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 000000000000..6e5e1bda5883 --- /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\ ++} + } diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-syslibs.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-syslibs.patch new file mode 100644 index 000000000000..7c65f304e30a --- /dev/null +++ b/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-syslibs.patch @@ -0,0 +1,59 @@ +diff --git a/3rdparty/qwtplot3d/qwtplot3d.pri b/3rdparty/qwtplot3d/qwtplot3d.pri +index 1b41edd..0f04abc 100755 +--- a/3rdparty/qwtplot3d/qwtplot3d.pri ++++ b/3rdparty/qwtplot3d/qwtplot3d.pri +@@ -57,11 +57,11 @@ HEADERS += ../3rdparty/qwtplot3d/include/qwt3d_color.h \ + ../3rdparty/qwtplot3d/include/qwt3d_multiplot.h
+
+ # gl2ps support
+-HEADERS += ../3rdparty/qwtplot3d/3rdparty/gl2ps/gl2ps.h \
+- ../3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h
++HEADERS += ../3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h
+
+-SOURCES += ../3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp \
+- ../3rdparty/qwtplot3d/3rdparty/gl2ps/gl2ps.c
++SOURCES += ../3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp
++
++LIBS+=-lgl2ps
+
+ # zlib support for gl2ps
+ zlib {
+diff --git a/3rdparty/qwtplot3d/qwtplot3d.pro b/3rdparty/qwtplot3d/qwtplot3d.pro +index 7153400..f3e2fa2 100755 +--- a/3rdparty/qwtplot3d/qwtplot3d.pro ++++ b/3rdparty/qwtplot3d/qwtplot3d.pro +@@ -82,11 +82,11 @@ HEADERS += include/qwt3d_surfaceplot.h \ + include/qwt3d_multiplot.h + + # gl2ps support +-HEADERS+=3rdparty/gl2ps/gl2ps.h \ +- include/qwt3d_io_gl2ps.h ++HEADERS+=include/qwt3d_io_gl2ps.h + +-SOURCES+=src/qwt3d_io_gl2ps.cpp \ +- 3rdparty/gl2ps/gl2ps.c ++SOURCES+=src/qwt3d_io_gl2ps.cpp ++ ++LIBS+=-lgl2ps + + # zlib support for gl2ps + zlib { +diff --git a/qtiplot/src/origin/origin.pri b/qtiplot/src/origin/origin.pri +index 0747c29..2d9c822 100755 +--- a/qtiplot/src/origin/origin.pri ++++ b/qtiplot/src/origin/origin.pri +@@ -4,14 +4,5 @@ + INCLUDEPATH += src/origin/
+
+ HEADERS += src/origin/importOPJ.h
+-HEADERS += ../3rdparty/liborigin/OriginObj.h
+-HEADERS += ../3rdparty/liborigin/OriginFile.h
+-HEADERS += ../3rdparty/liborigin/OriginParser.h
+-HEADERS += ../3rdparty/liborigin/OriginDefaultParser.h
+-HEADERS += ../3rdparty/liborigin/Origin750Parser.h
+
+ SOURCES += src/origin/importOPJ.cpp
+-SOURCES += ../3rdparty/liborigin/OriginFile.cpp
+-SOURCES += ../3rdparty/liborigin/OriginParser.cpp
+-SOURCES += ../3rdparty/liborigin/OriginDefaultParser.cpp
+-SOURCES += ../3rdparty/liborigin/Origin750Parser.cpp diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.7-gcc44.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.7-gcc44.patch deleted file mode 100644 index 1dc99343476e..000000000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.7-gcc44.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- qtiplot-0.9.7.7-orig/3rdparty/qwtplot3d/src/qwt3d_function.cpp -+++ qtiplot-0.9.7.7/3rdparty/qwtplot3d/src/qwt3d_function.cpp -@@ -1,3 +1,4 @@ -+#include <cstdio> - #include "qwt3d_surfaceplot.h" - #include "qwt3d_function.h" - ---- qtiplot-0.9.7.7-orig/qtiplot/src/scripting/ScriptEdit.cpp -+++ qtiplot-0.9.7.7/qtiplot/src/scripting/ScriptEdit.cpp -@@ -291,7 +291,7 @@ void ScriptEdit::insertErrorMsg(const QS - console->setPlainText(err);
- if (!console->isVisible())
- ((QDockWidget *)console->parent())->show();
--#elif
-+#else
- int start = printCursor.position();
- printCursor.insertText(err);
- printCursor.setPosition(start, QTextCursor::KeepAnchor);
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.7-sip.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.7-sip.patch deleted file mode 100644 index bef7966972f9..000000000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.7-sip.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -Nur qtiplot-0.9.7.7.orig/qtiplot/src/matrix/Matrix.h qtiplot-0.9.7.7/qtiplot/src/matrix/Matrix.h ---- qtiplot-0.9.7.7.orig/qtiplot/src/matrix/Matrix.h 2009-09-18 18:16:33.000000000 +0100 -+++ qtiplot-0.9.7.7/qtiplot/src/matrix/Matrix.h 2009-09-18 18:39:50.000000000 +0100 -@@ -137,6 +137,7 @@ - void setColorMapType(ColorMapType mapType); - - QwtLinearColorMap colorMap(){return d_color_map;}; -+ QwtLinearColorMap *colorMapPointer(){return &d_color_map;}; - void setColorMap(const QwtLinearColorMap& map); - //! Used when restoring from project files - void setColorMap(const QStringList& lst); -diff -Nur qtiplot-0.9.7.7.orig/qtiplot/src/plot2D/Spectrogram.h qtiplot-0.9.7.7/qtiplot/src/plot2D/Spectrogram.h ---- qtiplot-0.9.7.7.orig/qtiplot/src/plot2D/Spectrogram.h 2009-09-18 18:16:33.000000000 +0100 -+++ qtiplot-0.9.7.7/qtiplot/src/plot2D/Spectrogram.h 2009-09-18 18:40:14.000000000 +0100 -@@ -62,6 +62,7 @@ - void setDefaultColorMap(); - - QwtLinearColorMap colorMap(){return color_map;}; -+ QwtLinearColorMap *colorMapPointer(){return &color_map;}; - void setCustomColorMap(const QwtLinearColorMap& map); - void updateData(Matrix *m); - -diff -Nur qtiplot-0.9.7.7.orig/qtiplot/src/plot3D/Graph3D.h qtiplot-0.9.7.7/qtiplot/src/plot3D/Graph3D.h ---- qtiplot-0.9.7.7.orig/qtiplot/src/plot3D/Graph3D.h 2009-09-18 18:16:33.000000000 +0100 -+++ qtiplot-0.9.7.7/qtiplot/src/plot3D/Graph3D.h 2009-09-18 18:40:37.000000000 +0100 -@@ -274,6 +274,8 @@ - - QString colorMapFile(){return d_color_map_file;}; - QwtLinearColorMap colorMap(){return d_color_map;}; -+ QwtLinearColorMap *colorMapPointer(){return &d_color_map;}; -+ - - static bool openColorMapFile(ColorVector& cv, QString fname); - -diff -Nur qtiplot-0.9.7.7.orig/qtiplot/src/scripting/qti.sip qtiplot-0.9.7.7/qtiplot/src/scripting/qti.sip ---- qtiplot-0.9.7.7.orig/qtiplot/src/scripting/qti.sip 2009-09-18 18:16:33.000000000 +0100 -+++ qtiplot-0.9.7.7/qtiplot/src/scripting/qti.sip 2009-09-18 18:19:15.000000000 +0100 -@@ -505,7 +505,7 @@ - void setDefaultColorMap(); - void setGrayScale(); - void setRainbowColorMap(); -- QwtLinearColorMap colorMap(); -+ QwtLinearColorMap *colorMapPointer()/PyName=colorMap/; - void setColorMap(const QwtLinearColorMap&); - - void resetView(); -@@ -993,7 +993,7 @@ - void setDataColors(const QColor&, const QColor&); - QString colorMapFile(); - void setDataColorMap(const QString& fileName); -- QwtLinearColorMap colorMap(); -+ QwtLinearColorMap *colorMapPointer()/PyName=colorMap/; - void setDataColorMap(const QwtLinearColorMap&); - - void changeTransparency(double) /PyName=setOpacity/; diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.7.7-syslibs.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.7.7-syslibs.patch deleted file mode 100644 index e6162192ed5f..000000000000 --- a/sci-visualization/qtiplot/files/qtiplot-0.9.7.7-syslibs.patch +++ /dev/null @@ -1,183 +0,0 @@ -diff -Nur qtiplot-0.9.7.7.orig/3rdparty/qwtplot3d/qwtplot3d.pri qtiplot-0.9.7.7/3rdparty/qwtplot3d/qwtplot3d.pri ---- qtiplot-0.9.7.7.orig/3rdparty/qwtplot3d/qwtplot3d.pri 2009-09-18 18:16:33.000000000 +0100 -+++ qtiplot-0.9.7.7/3rdparty/qwtplot3d/qwtplot3d.pri 2009-09-18 19:29:12.000000000 +0100 -@@ -57,11 +57,11 @@ - ../3rdparty/qwtplot3d/include/qwt3d_multiplot.h
-
- # gl2ps support
--HEADERS += ../3rdparty/qwtplot3d/3rdparty/gl2ps/gl2ps.h \
-- ../3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h
-+HEADERS += ../3rdparty/qwtplot3d/include/qwt3d_io_gl2ps.h
-
--SOURCES += ../3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp \
-- ../3rdparty/qwtplot3d/3rdparty/gl2ps/gl2ps.c
-+SOURCES += ../3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp
-+
-+unix:LIBS+=-lgl2ps
-
- # zlib support for gl2ps
- zlib {
-diff -Nur qtiplot-0.9.7.7.orig/3rdparty/qwtplot3d/qwtplot3d.pro qtiplot-0.9.7.7/3rdparty/qwtplot3d/qwtplot3d.pro ---- qtiplot-0.9.7.7.orig/3rdparty/qwtplot3d/qwtplot3d.pro 2009-09-18 18:16:33.000000000 +0100 -+++ qtiplot-0.9.7.7/3rdparty/qwtplot3d/qwtplot3d.pro 2009-09-18 19:29:12.000000000 +0100 -@@ -82,11 +82,10 @@ - include/qwt3d_multiplot.h - - # gl2ps support --HEADERS+=3rdparty/gl2ps/gl2ps.h \ -- include/qwt3d_io_gl2ps.h -+HEADERS+=include/qwt3d_io_gl2ps.h - --SOURCES+=src/qwt3d_io_gl2ps.cpp \ -- 3rdparty/gl2ps/gl2ps.c -+SOURCES+=src/qwt3d_io_gl2ps.cpp -+unix:LIBS+=-lgl2ps - - # zlib support for gl2ps - zlib { -diff -Nur qtiplot-0.9.7.7.orig/fitPlugins/explin/explin.pro qtiplot-0.9.7.7/fitPlugins/explin/explin.pro ---- qtiplot-0.9.7.7.orig/fitPlugins/explin/explin.pro 2009-09-18 18:16:33.000000000 +0100 -+++ qtiplot-0.9.7.7/fitPlugins/explin/explin.pro 2009-09-18 19:29:12.000000000 +0100 -@@ -12,9 +12,8 @@ - DESTDIR = ../
-
- # statically link against GSL in 3rdparty
--INCLUDEPATH += ../../3rdparty/gsl/include/
--LIBS += ../../3rdparty/gsl/lib/libgsl.a
--LIBS += ../../3rdparty/gsl/lib/libgslcblas.a
-+INCLUDEPATH += $$system(pkg-config --cflags gsl)
-+LIBS += $$system(pkg-config --libs gsl)
-
- #dynamically link against GSL installed system-wide
- #unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
-diff -Nur qtiplot-0.9.7.7.orig/fitPlugins/exp_saturation/exp_saturation.pro qtiplot-0.9.7.7/fitPlugins/exp_saturation/exp_saturation.pro ---- qtiplot-0.9.7.7.orig/fitPlugins/exp_saturation/exp_saturation.pro 2009-09-18 18:16:33.000000000 +0100 -+++ qtiplot-0.9.7.7/fitPlugins/exp_saturation/exp_saturation.pro 2009-09-18 19:29:12.000000000 +0100 -@@ -12,9 +12,9 @@ - DESTDIR = ../
-
- # statically link against GSL in 3rdparty
--INCLUDEPATH += ../../3rdparty/gsl/include/
--LIBS += ../../3rdparty/gsl/lib/libgsl.a
--LIBS += ../../3rdparty/gsl/lib/libgslcblas.a
-+INCLUDEPATH += $$system(pkg-config --cflags gsl)
-+LIBS += $$system(pkg-config --libs gsl)
-+
-
- #dynamically link against GSL installed system-wide
- #unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
-diff -Nur qtiplot-0.9.7.7.orig/fitPlugins/fitPlugins.pro qtiplot-0.9.7.7/fitPlugins/fitPlugins.pro ---- qtiplot-0.9.7.7.orig/fitPlugins/fitPlugins.pro 2009-09-18 18:16:33.000000000 +0100 -+++ qtiplot-0.9.7.7/fitPlugins/fitPlugins.pro 2009-09-18 19:29:12.000000000 +0100 -@@ -4,3 +4,4 @@ - exp_saturation \
- fitRational0 \
- fitRational1
-+
-diff -Nur qtiplot-0.9.7.7.orig/fitPlugins/fitRational0/fitRational0.pro qtiplot-0.9.7.7/fitPlugins/fitRational0/fitRational0.pro ---- qtiplot-0.9.7.7.orig/fitPlugins/fitRational0/fitRational0.pro 2009-09-18 18:16:33.000000000 +0100 -+++ qtiplot-0.9.7.7/fitPlugins/fitRational0/fitRational0.pro 2009-09-18 19:29:12.000000000 +0100 -@@ -12,9 +12,9 @@ - DESTDIR = ../
-
- # statically link against GSL in 3rdparty
--INCLUDEPATH += ../../3rdparty/gsl/include/
--LIBS += ../../3rdparty/gsl/lib/libgsl.a
--LIBS += ../../3rdparty/gsl/lib/libgslcblas.a
-+INCLUDEPATH += $$system(pkg-config --cflags gsl) -+LIBS += $$system(pkg-config --libs gsl) -+ -
- #dynamically link against GSL installed system-wide
- #unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
-diff -Nur qtiplot-0.9.7.7.orig/fitPlugins/fitRational1/fitRational1.pro qtiplot-0.9.7.7/fitPlugins/fitRational1/fitRational1.pro ---- qtiplot-0.9.7.7.orig/fitPlugins/fitRational1/fitRational1.pro 2009-09-18 18:16:33.000000000 +0100 -+++ qtiplot-0.9.7.7/fitPlugins/fitRational1/fitRational1.pro 2009-09-18 19:29:12.000000000 +0100 -@@ -12,9 +12,8 @@ - DESTDIR = ../
-
- # statically link against GSL in 3rdparty
--INCLUDEPATH += ../../3rdparty/gsl/include/
--LIBS += ../../3rdparty/gsl/lib/libgsl.a
--LIBS += ../../3rdparty/gsl/lib/libgslcblas.a
-+INCLUDEPATH += $$system(pkg-config --cflags gsl)
-+LIBS += $$system(pkg-config --libs gsl)
-
- #dynamically link against GSL installed system-wide
- #unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
-diff -Nur qtiplot-0.9.7.7.orig/qtiplot/qtiplot.pro qtiplot-0.9.7.7/qtiplot/qtiplot.pro ---- qtiplot-0.9.7.7.orig/qtiplot/qtiplot.pro 2009-09-18 18:16:33.000000000 +0100 -+++ qtiplot-0.9.7.7/qtiplot/qtiplot.pro 2009-09-18 19:31:47.000000000 +0100 -@@ -21,7 +21,7 @@ - #CONFIG += HAVE_EMF
-
- # Uncomment the following line if you want to perform a custom installation using the *.path variables defined bellow.
--#CONFIG += CustomInstall
-+CONFIG += CustomInstall
-
- CONFIG += release
- #CONFIG += debug
-@@ -31,13 +31,13 @@ - #!!! Warning: You must modify these paths according to your computer settings
- #############################################################################
-
--INCLUDEPATH += ../3rdparty/muparser/include
-+INCLUDEPATH += $$system(pkg-config --cflags muparser)
- INCLUDEPATH += ../3rdparty/qwtplot3d/include
--INCLUDEPATH += ../3rdparty/qwt/src
--INCLUDEPATH += ../3rdparty/liborigin
--INCLUDEPATH += ../3rdparty/gsl/include
- INCLUDEPATH += ../3rdparty/zlib
--INCLUDEPATH += ../3rdparty/boost_1_36_0
-+INCLUDEPATH += /usr/include/qwt5
-+INCLUDEPATH += /usr/include/liborigin2
-+INCLUDEPATH += $$system(pkg-config --cflags gsl)
-+INCLUDEPATH += /usr/include/boost
-
- ##################### 3rd PARTY LIBRARIES SECTION ###########################
- #!!! Warning: You must modify these paths according to your computer settings
-@@ -46,12 +46,10 @@ - ##################### Linux (Mac OS X) ######################################
-
- # statically link against libraries in 3rdparty
--unix:LIBS += ../3rdparty/muparser/lib/libmuparser.a
--unix:LIBS += ../3rdparty/qwt/lib/libqwt.a
--unix:LIBS += ../3rdparty/gsl/lib/libgsl.a
--unix:LIBS += ../3rdparty/gsl/lib/libgslcblas.a
--unix:LIBS += ../3rdparty/boost_1_36_0/lib/libboost_date_time-gcc43-mt-1_36.a
--unix:LIBS += ../3rdparty/boost_1_36_0/lib/libboost_thread-gcc43-mt-1_36.a
-+unix:LIBS += $$system(pkg-config --libs muparser)
-+unix:LIBS += $$system(pkg-config --libs gsl)
-+unix:LIBS += -lqwt -lz -lorigin2
-+unix:LIBS += -lboost_date_time -lboost_thread
-
- # dynamically link against dependencies if they are installed system-wide
- #unix:LIBS += -lmuparser
-@@ -213,8 +211,6 @@ -
- contains(CONFIG, HAVE_LIBPNG){
- DEFINES += GL2PS_HAVE_LIBPNG
-- INCLUDEPATH += ../3rdparty/libpng/
-- LIBS += ../3rdparty/libpng/libpng.a
- }
-
- ###############################################################
-diff -Nur qtiplot-0.9.7.7.orig/qtiplot/src/origin/origin.pri qtiplot-0.9.7.7/qtiplot/src/origin/origin.pri ---- qtiplot-0.9.7.7.orig/qtiplot/src/origin/origin.pri 2009-09-18 18:16:33.000000000 +0100 -+++ qtiplot-0.9.7.7/qtiplot/src/origin/origin.pri 2009-09-18 19:29:12.000000000 +0100 -@@ -4,14 +4,6 @@ - INCLUDEPATH += src/origin/
-
- HEADERS += src/origin/importOPJ.h
--HEADERS += ../3rdparty/liborigin/OriginObj.h
--HEADERS += ../3rdparty/liborigin/OriginFile.h
--HEADERS += ../3rdparty/liborigin/OriginParser.h
--HEADERS += ../3rdparty/liborigin/OriginDefaultParser.h
--HEADERS += ../3rdparty/liborigin/Origin750Parser.h
-
- SOURCES += src/origin/importOPJ.cpp
--SOURCES += ../3rdparty/liborigin/OriginFile.cpp
--SOURCES += ../3rdparty/liborigin/OriginParser.cpp
--SOURCES += ../3rdparty/liborigin/OriginDefaultParser.cpp
--SOURCES += ../3rdparty/liborigin/Origin750Parser.cpp -+ diff --git a/sci-visualization/qtiplot/qtiplot-0.9.7.7-r1.ebuild b/sci-visualization/qtiplot/qtiplot-0.9.7.10.ebuild index ef02e7d1f3b5..385849e7adbf 100644 --- a/sci-visualization/qtiplot/qtiplot-0.9.7.7-r1.ebuild +++ b/sci-visualization/qtiplot/qtiplot-0.9.7.10.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 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.7-r1.ebuild,v 1.1 2009/09/18 18:40:01 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/qtiplot/qtiplot-0.9.7.10.ebuild,v 1.1 2010/01/01 10:46:53 ssuominen Exp $ EAPI=2 inherit eutils qt4 fdo-mime python @@ -20,17 +20,23 @@ for l in ${LANGS}; do done # qwtplot3d much modified from original upstream -CDEPEND=">=x11-libs/qwt-5.2 +# >=x11-libs/qwt-5.3 they are using trunk checkouts +CDEPEND=" x11-libs/qt-opengl:4 x11-libs/qt-qt3support:4 x11-libs/qt-assistant:4 x11-libs/qt-svg:4 - x11-libs/gl2ps + >=x11-libs/gl2ps-1.3.5 >=dev-cpp/muParser-1.30 >=dev-libs/boost-1.35.0 >=sci-libs/liborigin-20090406:2 !bindist? ( sci-libs/gsl ) - bindist? ( <sci-libs/gsl-1.10 )" + bindist? ( <sci-libs/gsl-1.10 ) + dev-libs/boost + dev-tex/qtexengine" +# Still not working +# media-libs/libemf +# media-libs/emfengine" DEPEND="${CDEPEND} dev-util/pkgconfig @@ -44,13 +50,24 @@ RDEPEND="${CDEPEND} dev-python/pygsl sci-libs/scipy )" +PATCHES=( + "${FILESDIR}/${P}-syslibs.patch" + "${FILESDIR}/${P}-docbuild.patch" + "${FILESDIR}/${P}-gcc44.patch" + "${FILESDIR}/${P}-build.conf.patch" + "${FILESDIR}/${P}-sip.patch" + "${FILESDIR}/${P}-gl2ps.patch" + "${FILESDIR}/${P}-dont-install-qwt.patch" + "${FILESDIR}/${P}-qtiplot.pro.patch" + ) + src_prepare() { - epatch "${FILESDIR}"/${P}-syslibs.patch - epatch "${FILESDIR}"/${P}-docbuild.patch - epatch "${FILESDIR}"/${P}-gcc44.patch - has_version ">=dev-python/sip-4.8" && epatch "${FILESDIR}"/${P}-sip.patch + qt4_src_prepare + + rm -rf 3rdparty/{liborigin,QTeXEngine} 3rdparty/qwtplot3d/3rdparty/gl2ps/ python_version + sed -i \ -e "s:doc/${PN}/manual:doc/${PF}/html:" \ -e "s:local/${PN}:$(get_libdir)/python${PYVER}/site-packages:" \ @@ -82,6 +99,11 @@ src_prepare() { fi done chmod -x qtiplot/qti_wordlist.txt + + sed \ + -e "s:GENTOOLIB:$(get_libdir):g" \ + -e "/^EMF_ENGINE_LIBS/s:^:#:g" \ + build.conf.example > build.conf } src_configure() { |