diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2011-10-05 19:28:14 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2011-10-05 19:28:14 +0000 |
| commit | 0270e22c3f9aafb2dac162bac811b32e39aeffcc (patch) | |
| tree | 38cd19e94371f99c834eaf8cf05e2e47eca62dc6 /sci-visualization/qtiplot/files | |
| parent | remove ptex dep as it is going away (diff) | |
| download | gentoo-2-0270e22c3f9aafb2dac162bac811b32e39aeffcc.tar.gz gentoo-2-0270e22c3f9aafb2dac162bac811b32e39aeffcc.tar.bz2 gentoo-2-0270e22c3f9aafb2dac162bac811b32e39aeffcc.zip | |
Version Bump, including zlib compatibility, #385715
(Portage version: 2.2.0_alpha60/cvs/Linux x86_64)
Diffstat (limited to 'sci-visualization/qtiplot/files')
| -rw-r--r-- | sci-visualization/qtiplot/files/qtiplot-0.9.8.8-system-gl2ps.patch | 76 |
1 files changed, 76 insertions, 0 deletions
diff --git a/sci-visualization/qtiplot/files/qtiplot-0.9.8.8-system-gl2ps.patch b/sci-visualization/qtiplot/files/qtiplot-0.9.8.8-system-gl2ps.patch new file mode 100644 index 000000000000..d7b40c414b1d --- /dev/null +++ b/sci-visualization/qtiplot/files/qtiplot-0.9.8.8-system-gl2ps.patch @@ -0,0 +1,76 @@ + 3rdparty/qwtplot3d/qwtplot3d.pri | 8 ++++---- + 3rdparty/qwtplot3d/qwtplot3d.pro | 3 --- + 3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp | 2 +- + 3rdparty/qwtplot3d/src/qwt3d_label.cpp | 2 +- + 4 files changed, 6 insertions(+), 9 deletions(-) + +diff --git a/3rdparty/qwtplot3d/qwtplot3d.pri b/3rdparty/qwtplot3d/qwtplot3d.pri +index 45a0c3e..16bbe53 100755 +--- a/3rdparty/qwtplot3d/qwtplot3d.pri ++++ b/3rdparty/qwtplot3d/qwtplot3d.pri +@@ -8,6 +8,8 @@ DEPENDPATH += src \ + 3rdparty\gl2ps + INCLUDEPATH += . + ++LIBS+=-lgl2ps ++ + # Input + HEADERS += include/qwt3d_extglwidget.h \ + include/qwt3d_color.h \ +@@ -37,8 +39,7 @@ HEADERS += include/qwt3d_extglwidget.h \ + include/qwt3d_volumeplot.h \ + include/qwt3d_graphplot.h \ + include/qwt3d_multiplot.h \ +- include/qwt3d_io_gl2ps.h \ +- 3rdparty/gl2ps/gl2ps.h ++ include/qwt3d_io_gl2ps.h + SOURCES += src/qwt3d_extglwidget.cpp \ + src/qwt3d_axis.cpp \ + src/qwt3d_color.cpp \ +@@ -62,5 +63,4 @@ SOURCES += src/qwt3d_extglwidget.cpp \ + src/qwt3d_function.cpp \ + src/qwt3d_gridplot.cpp \ + src/qwt3d_meshplot.cpp \ +- src/qwt3d_io_gl2ps.cpp \ +- 3rdparty/gl2ps/gl2ps.c ++ src/qwt3d_io_gl2ps.cpp +diff --git a/3rdparty/qwtplot3d/qwtplot3d.pro b/3rdparty/qwtplot3d/qwtplot3d.pro +index 95c8e26..18d03e3 100755 +--- a/3rdparty/qwtplot3d/qwtplot3d.pro ++++ b/3rdparty/qwtplot3d/qwtplot3d.pro +@@ -31,9 +31,6 @@ RCC_DIR = $$DESTDIR/tmp + MOC_DIR = $$DESTDIR/tmp
+
+ DEFINES += GL2PS_HAVE_LIBPNG
+-INCLUDEPATH += ../zlib/
+-INCLUDEPATH += ../libpng/
+-LIBS += ../libpng/libpng.a
+
+ # install
+ target.path = lib
+diff --git a/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp b/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp +index bc7a9d8..589cfd2 100755 +--- a/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp ++++ b/3rdparty/qwtplot3d/src/qwt3d_io_gl2ps.cpp +@@ -6,7 +6,7 @@ + #include <locale.h> + + #include "qwt3d_openglhelper.h" +-#include "../3rdparty/gl2ps/gl2ps.h" ++#include "gl2ps.h" + #include "qwt3d_io_gl2ps.h" + #include "qwt3d_plot.h" + +diff --git a/3rdparty/qwtplot3d/src/qwt3d_label.cpp b/3rdparty/qwtplot3d/src/qwt3d_label.cpp +index 7e54ad9..cc8bd60 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 "gl2ps.h" + + using namespace Qwt3D; + |