[gentoo-commits] gentoo-x86 commit in sci-visualization/qtiplot/files: qtiplot-0.9.7.10-gl2ps.patch qtiplot-0.9.7.10-gcc44.patch qtiplot-0.9.7.10-build.conf.patch qtiplot-0.9.7.10-docbuild.patch qtiplot-0.9.7.10-sip2.patch qtiplot-0.9.7.10-sip.patch qtiplot-0.9.7.10-dont-install-qwt.patch qtiplot-0.9.7.10-qtiplot.pro.patch qtiplot-0.9.7.10-syslibs.patch qtiplot-0.9.7.7-sip.patch qtiplot-0.9.7.7-gcc44.patch qtiplot-0.9.7.7-docbuild.patch qtiplot-0.9.7.7-syslibs.patch

[Samuli Suominen (ssuominen)]

ssuominen    10/01/01 10:46:52

  Added:                qtiplot-0.9.7.10-gl2ps.patch
                        qtiplot-0.9.7.10-gcc44.patch
                        qtiplot-0.9.7.10-build.conf.patch
                        qtiplot-0.9.7.10-docbuild.patch
                        qtiplot-0.9.7.10-sip2.patch
                        qtiplot-0.9.7.10-sip.patch
                        qtiplot-0.9.7.10-dont-install-qwt.patch
                        qtiplot-0.9.7.10-qtiplot.pro.patch
                        qtiplot-0.9.7.10-syslibs.patch
  Removed:              qtiplot-0.9.7.7-sip.patch
                        qtiplot-0.9.7.7-gcc44.patch
                        qtiplot-0.9.7.7-docbuild.patch
                        qtiplot-0.9.7.7-syslibs.patch
  Log:
  Version bump by jlec
  (Portage version: 2.2_rc61/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sci-visualization/qtiplot/files/qtiplot-0.9.7.10-gl2ps.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-gl2ps.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-gl2ps.patch?rev=1.1&content-type=text/plain

Index: qtiplot-0.9.7.10-gl2ps.patch
===================================================================
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();
-}



1.1                  sci-visualization/qtiplot/files/qtiplot-0.9.7.10-gcc44.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-gcc44.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-gcc44.patch?rev=1.1&content-type=text/plain

Index: qtiplot-0.9.7.10-gcc44.patch
===================================================================
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"
 



1.1                  sci-visualization/qtiplot/files/qtiplot-0.9.7.10-build.conf.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-build.conf.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-build.conf.patch?rev=1.1&content-type=text/plain

Index: qtiplot-0.9.7.10-build.conf.patch
===================================================================
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



1.1                  sci-visualization/qtiplot/files/qtiplot-0.9.7.10-docbuild.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-docbuild.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-docbuild.patch?rev=1.1&content-type=text/plain

Index: qtiplot-0.9.7.10-docbuild.patch
===================================================================
--- manual/docbook-en/index.docbook.orig	2009-04-14 11:03:31.000000000 +0100
+++ manual/docbook-en/index.docbook	2009-04-14 10:58:41.000000000 +0100
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "/usr/share/xml/docbook/schema/dtd/4.4/docbookx.dtd" [
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "/usr/share/sgml/docbook/xml-dtd-4.2/docbookx.dtd" [
 
   <!ENTITY appname "QtiPlot">
   <!ENTITY kappname "&appname;">
--- manual/Makefile.orig	2009-04-14 11:03:31.000000000 +0100
+++ manual/Makefile	2009-04-14 10:44:59.000000000 +0100
@@ -1,3 +1,2 @@
-html-pdf:
-	docbook2html -d qtiplot.dsl docbook-en/index.docbook -e no-valid
-	dblatex -o qtiplot-manual-en.pdf -c dblatex.conf -p dblatex-param.xsl docbook-en/index.docbook
+all:
+	docbook2html -d qtiplot.dsl docbook-en/index.docbook -e no-valid -l /usr/share/sgml/xml.dcl
--- manual/qtiplot.dsl.orig	2009-04-14 11:03:31.000000000 +0100
+++ manual/qtiplot.dsl	2009-04-14 10:50:29.000000000 +0100
@@ -6,7 +6,7 @@
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 
 <!-- Path to main Docbook->html stylesheet. You have to adapt this to your installation. -->
-<!ENTITY docbook-html-stylesheet SYSTEM "/usr/share/sgml/docbook/stylesheet/dsssl/modular/html/docbook.dsl" CDATA DSSSL>
+<!ENTITY docbook-html-stylesheet SYSTEM "/usr/share/sgml/stylesheets/dsssl/docbook/html/docbook.dsl" CDATA DSSSL>
 
 <!-- Stylesheet function library for creating Windows HTML help and Qt Assistant profiles. -->
 <!ENTITY docbook-help-stylesheet SYSTEM "./help.dsl" CDATA DSSSL>
diff -Nur manual.orig/qtiplot_html.xsl manual/qtiplot_html.xsl
--- manual/qtiplot_html.xsl.orig	2009-04-14 11:03:31.000000000 +0100
+++ manual/qtiplot_html.xsl	2009-04-14 10:51:53.000000000 +0100
@@ -1,5 +1,5 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'>
-<xsl:import href="file:////usr/share/xml/docbook/stylesheet/nwalsh/html/chunk.xsl"/>
+<xsl:import href="file:////usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl"/>
 
 	<!-- html.stylesheet
 	The html.stylesheet parameter is either empty, indicating that no 



1.1                  sci-visualization/qtiplot/files/qtiplot-0.9.7.10-sip2.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-sip2.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-sip2.patch?rev=1.1&content-type=text/plain

Index: qtiplot-0.9.7.10-sip2.patch
===================================================================
--- 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\
+}
 }



1.1                  sci-visualization/qtiplot/files/qtiplot-0.9.7.10-sip.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-sip.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-sip.patch?rev=1.1&content-type=text/plain

Index: qtiplot-0.9.7.10-sip.patch
===================================================================
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\
+}
 }



1.1                  sci-visualization/qtiplot/files/qtiplot-0.9.7.10-dont-install-qwt.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-dont-install-qwt.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-dont-install-qwt.patch?rev=1.1&content-type=text/plain

Index: qtiplot-0.9.7.10-dont-install-qwt.patch
===================================================================
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



1.1                  sci-visualization/qtiplot/files/qtiplot-0.9.7.10-qtiplot.pro.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-qtiplot.pro.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-qtiplot.pro.patch?rev=1.1&content-type=text/plain

Index: qtiplot-0.9.7.10-qtiplot.pro.patch
===================================================================
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 ##########



1.1                  sci-visualization/qtiplot/files/qtiplot-0.9.7.10-syslibs.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-syslibs.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-visualization/qtiplot/files/qtiplot-0.9.7.10-syslibs.patch?rev=1.1&content-type=text/plain

Index: qtiplot-0.9.7.10-syslibs.patch
===================================================================
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