diff options
| author | David Spencer <idlemoor@slackbuilds.org> | 2016-12-24 19:19:52 +0000 |
|---|---|---|
| committer | David Spencer <idlemoor@slackbuilds.org> | 2016-12-24 20:38:51 +0000 |
| commit | e83b07353fba859c09d96cfe830620173bc68e1f (patch) | |
| tree | 5a6aa8501861d2222eef2d177fe769dc5a87dd76 /libraries | |
| parent | 57a1e85ad910173acd56fb5dd5615aac201627db (diff) | |
libraries/qwtplot3d: Fixed patch.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/qwtplot3d/qwtplot3d-qt-4.8.0.patch | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/libraries/qwtplot3d/qwtplot3d-qt-4.8.0.patch b/libraries/qwtplot3d/qwtplot3d-qt-4.8.0.patch index f675b9527529f..ae10f48f07073 100644 --- a/libraries/qwtplot3d/qwtplot3d-qt-4.8.0.patch +++ b/libraries/qwtplot3d/qwtplot3d-qt-4.8.0.patch @@ -2,33 +2,33 @@ diff -urbN qwtplot3d/include/qwt3d_io_gl2ps.h qwtplot3d.patched/include/qwt3d_io --- qwtplot3d/include/qwt3d_io_gl2ps.h 2005-07-10 16:54:52.000000000 +0300 +++ qwtplot3d.patched/include/qwt3d_io_gl2ps.h 2012-01-21 22:15:20.000000000 +0200 @@ -2,12 +2,7 @@ - #define qwt3d_io_gl2ps_h__2004_05_07_01_16_begin_guarded_code - - #include <time.h> -- --#if QT_VERSION < 0x040000 --#include <qgl.h> --#else --#include <QtOpenGL/qgl.h> --#endif -+#include <QtOpenGL> - - #include "qwt3d_types.h" - #include "qwt3d_io.h" + #define qwt3d_io_gl2ps_h__2004_05_07_01_16_begin_guarded_code
+
+ #include <time.h>
+-
+-#if QT_VERSION < 0x040000
+-#include <qgl.h>
+-#else
+-#include <QtOpenGL/qgl.h>
+-#endif
++#include <QtOpenGL>
+
+ #include "qwt3d_types.h"
+ #include "qwt3d_io.h"
diff -urbN qwtplot3d/include/qwt3d_openglhelper.h qwtplot3d.patched/include/qwt3d_openglhelper.h --- qwtplot3d/include/qwt3d_openglhelper.h 2005-07-19 17:40:28.000000000 +0300 +++ qwtplot3d.patched/include/qwt3d_openglhelper.h 2012-01-21 22:29:56.000000000 +0200 @@ -2,11 +2,8 @@ - #define __openglhelper_2003_06_06_15_49__ - - #include "qglobal.h" --#if QT_VERSION < 0x040000 --#include <qgl.h> --#else --#include <QtOpenGL/qgl.h> --#endif -+#include <QtOpenGL> -+#include <GL/glu.h> - - namespace Qwt3D - { + #define __openglhelper_2003_06_06_15_49__
+
+ #include "qglobal.h"
+-#if QT_VERSION < 0x040000
+-#include <qgl.h>
+-#else
+-#include <QtOpenGL/qgl.h>
+-#endif
++#include <QtOpenGL>
++#include <GL/glu.h>
+
+ namespace Qwt3D
+ {
|