[gentoo-commits] gentoo-x86 commit in sci-visualization/qtiplot/files: qtiplot-0.9.7.2-liborigin-gcc4.3.patch qtiplot-0.9.7.2-pro.patch

[gentoo-commits] gentoo-x86 commit in sci-visualization/qtiplot/files: qtiplot-0.9.7.2-liborigin-gcc4.3.patch qtiplot-0.9.7.2-pro.patch

[Markus Dittrich (markusle)]

markusle    08/09/25 14:29:37

  Added:                qtiplot-0.9.7.2-liborigin-gcc4.3.patch
                        qtiplot-0.9.7.2-pro.patch
  Log:
  Version bump. Fixes bug #238632.
  (Portage version: 2.2_rc9/cvs/Linux 2.6.26-SENTINEL-2 i686)

Revision  Changes    Path
1.1                  sci-visualization/qtiplot/files/qtiplot-0.9.7.2-liborigin-gcc4.3.patch

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

Index: qtiplot-0.9.7.2-liborigin-gcc4.3.patch
===================================================================
# fix gcc-4.3 missing headers 

diff -Naur qtiplot-0.9.7.2/3rdparty/liborigin/OriginObj.h qtiplot-0.9.7.2.new/3rdparty/liborigin/OriginObj.h
--- qtiplot-0.9.7.2/3rdparty/liborigin/OriginObj.h	2008-09-21 13:22:33.000000000 -0400
+++ qtiplot-0.9.7.2.new/3rdparty/liborigin/OriginObj.h	2008-09-25 10:07:27.000000000 -0400
@@ -33,6 +33,7 @@
 
 #include <string>
 #include <vector>
+#include <cstring>
 #include "boost/variant.hpp"
 #include "boost/date_time/posix_time/ptime.hpp"
 



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

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

Index: qtiplot-0.9.7.2-pro.patch
===================================================================
diff -Naur qtiplot-0.9.7.2/qtiplot/qtiplot.pro qtiplot-0.9.7.2.new/qtiplot/qtiplot.pro
--- qtiplot-0.9.7.2/qtiplot/qtiplot.pro	2008-09-22 08:15:41.000000000 -0400
+++ qtiplot-0.9.7.2.new/qtiplot/qtiplot.pro	2008-09-25 10:16:00.000000000 -0400
@@ -17,7 +17,7 @@
 # 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
@@ -27,13 +27,12 @@
 #!!! Warning: You must modify these paths according to your computer settings
 #############################################################################
 
-INCLUDEPATH       += ../3rdparty/muparser/include
-INCLUDEPATH       += ../3rdparty/qwtplot3d/include
-INCLUDEPATH       += ../3rdparty/qwt/src
-INCLUDEPATH       += ../3rdparty/liborigin
-INCLUDEPATH       += ../3rdparty/gsl/include
-INCLUDEPATH       += ../3rdparty/zlib123/include
-INCLUDEPATH       += ../3rdparty/boost_1_36_0
+INCLUDEPATH       += /usr/include/muparser
+INCLUDEPATH       += /usr/include/qwtplot3d
+INCLUDEPATH       += /usr/include/qwt5
+INCLUDEPATH       += ../3rdparty/liborigin
+INCLUDEPATH       += /usr/include/gsl
+INCLUDEPATH       += /usr/include/boost
 
 ##################### 3rd PARTY LIBRARIES SECTION ###########################
 #!!! Warning: You must modify these paths according to your computer settings
@@ -42,17 +41,19 @@
 ##################### Linux (Mac OS X) ######################################
 
 # statically link against libraries in 3rdparty
-unix:LIBS         += ../3rdparty/muparser/lib/libmuparser.a
-unix:LIBS         += ../3rdparty/qwtplot3d/lib/libqwtplot3d.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/muparser/lib/libmuparser.a
+#unix:LIBS         += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
+#unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a
+#unix:LIBS         += ../3rdparty/gsl/lib/libgsl.a
+#unix:LIBS         += ../3rdparty/gsl/lib/libgslcblas.a
 
 # dynamically link against dependencies if they are installed system-wide
-#unix:LIBS         += -lmuparser
-#unix:LIBS         += -lqwtplot3d
-#unix:LIBS         += -lqwt
-#unix:LIBS         += -lgsl -lgslcblas
+unix:LIBS         += -lmuparser
+unix:LIBS         += -lqwtplot3d
+unix:LIBS         += -lqwt
+unix:LIBS         += $$system(pkg-config --libs gsl)
+#unix:LIBS         += -lorigin
+unix:LIBS         += -lz
 
 ##################### Windows ###############################################