summaryrefslogtreecommitdiff
path: root/math/qwtplot3d-qt4/files
diff options
context:
space:
mode:
Diffstat (limited to 'math/qwtplot3d-qt4/files')
-rw-r--r--math/qwtplot3d-qt4/files/patch-include__qwt3d_openglhelper.h10
-rw-r--r--math/qwtplot3d-qt4/files/patch-qwtplot3d.pro31
-rw-r--r--math/qwtplot3d-qt4/files/patch-src_qwt3d__lighting.cpp18
3 files changed, 0 insertions, 59 deletions
diff --git a/math/qwtplot3d-qt4/files/patch-include__qwt3d_openglhelper.h b/math/qwtplot3d-qt4/files/patch-include__qwt3d_openglhelper.h
deleted file mode 100644
index d24e1eca0ac4..000000000000
--- a/math/qwtplot3d-qt4/files/patch-include__qwt3d_openglhelper.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./include/qwt3d_openglhelper.h.orig 2012-04-16 21:57:23.639051666 +0000
-+++ ./include/qwt3d_openglhelper.h 2012-04-16 21:57:23.713053060 +0000
-@@ -6,6 +6,7 @@
- #include <qgl.h>
- #else
- #include <QtOpenGL/qgl.h>
-+#include <GL/glu.h>
- #endif
-
- namespace Qwt3D
diff --git a/math/qwtplot3d-qt4/files/patch-qwtplot3d.pro b/math/qwtplot3d-qt4/files/patch-qwtplot3d.pro
deleted file mode 100644
index 6c363a30330c..000000000000
--- a/math/qwtplot3d-qt4/files/patch-qwtplot3d.pro
+++ /dev/null
@@ -1,31 +0,0 @@
---- ./qwtplot3d.pro.orig 2012-04-16 21:57:23.562053805 +0000
-+++ ./qwtplot3d.pro 2012-04-16 21:58:00.311051941 +0000
-@@ -1,9 +1,9 @@
- # pro file for building the makefile for qwtplot3d
- #
-
--TARGET = qwtplot3d
-+TARGET = qwtplot3d-qt4
- TEMPLATE = lib
--CONFIG += qt warn_on opengl thread zlib debug
-+CONFIG += qt warn_on opengl thread zlib
- MOC_DIR = tmp
- OBJECTS_DIR = tmp
- INCLUDEPATH = include
-@@ -11,6 +11,7 @@
- DESTDIR = lib
- #DESTDIR = ../../../lib
- QT += opengl
-+unix:LIBS += -lGLU
-
- win32:TEMPLATE = vclib
- win32:CONFIG += dll exceptions
-@@ -21,7 +22,7 @@
- win32:CONFIG -= zlib
-
- linux-g++:TMAKE_CXXFLAGS += -fno-exceptions
--unix:VERSION = 0.2.6
-+unix:VERSION = 0.2.7
-
- # Input
- SOURCES += src/qwt3d_axis.cpp \
diff --git a/math/qwtplot3d-qt4/files/patch-src_qwt3d__lighting.cpp b/math/qwtplot3d-qt4/files/patch-src_qwt3d__lighting.cpp
deleted file mode 100644
index 475f4f97d6d4..000000000000
--- a/math/qwtplot3d-qt4/files/patch-src_qwt3d__lighting.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-src/qwt3d_lighting.cpp:178:27: error: non-constant-expression cannot be narrowed from type 'double' to
-'GLfloat' (aka 'float') in initializer list [-Wc++11-narrowing]
- GLfloat lightPos[4] = { lights_[light].shift.x, lights_[light].shift.y, lights_[light].shift.z, 1.0};
- ^~~~~~~~~~~~~~~~~~~~~~
-src/qwt3d_lighting.cpp:178:27: note: insert an explicit cast to silence this issue
-
-
---- src/qwt3d_lighting.cpp.orig 2018-02-17 23:11:11 UTC
-+++ src/qwt3d_lighting.cpp
-@@ -175,7 +175,7 @@ void Plot3D::applyLight(unsigned light)
- glRotatef( lights_[light].rot.x-90, 1.0, 0.0, 0.0 );
- glRotatef( lights_[light].rot.y , 0.0, 1.0, 0.0 );
- glRotatef( lights_[light].rot.z , 0.0, 0.0, 1.0 );
-- GLfloat lightPos[4] = { lights_[light].shift.x, lights_[light].shift.y, lights_[light].shift.z, 1.0};
-+ GLfloat lightPos[4] = { static_cast<GLfloat>(lights_[light].shift.x), static_cast<GLfloat>(lights_[light].shift.y), static_cast<GLfloat>(lights_[light].shift.z), 1.0};
- GLenum le = lightEnum(light);
- glLightfv(le, GL_POSITION, lightPos);
- }