mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
Code Issues Releases Activity

Fix build with upcoming Qt 4.8

Browse Source
This commit is contained in:
Max Brazhnikov 2012-04-16 22:34:11 +00:00
parent d6d1fbb4b3
commit ca2d76ff83
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=294931
7 changed files with 44 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
math/qtiplot/Makefile
View File

@ -24,6 +24,7 @@ USE_GMAKE= yes
USE_QT_VER= 4
QT_COMPONENTS= gui opengl svg qt3support network assistantclient \
moc_build qmake_build rcc_build
USE_GL= glu
HAS_CONFIGURE= yes
QMAKE_ARGS+= -recursive PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} \
PYTHON_CMD=${PYTHON_CMD}

2
math/qtiplot/files/build.conf
View File

@ -3,7 +3,7 @@ isEmpty( QTI_ROOT ) {
}
SYS_INCLUDEPATH = $$LOCALBASE/include
SYS_LIBS = -L$$LOCALBASE/lib
SYS_LIBS = -L$$LOCALBASE/lib -lGLU
MUPARSER_INCLUDEPATH =
MUPARSER_LIBS = -lmuparser

10
math/qtiplot/files/patch-3rdparty__qwtplot3d__include__qwt3d_openglhelper.h Normal file
View File

@ -0,0 +1,10 @@
--- ./3rdparty/qwtplot3d/include/qwt3d_openglhelper.h.orig 2011-08-24 10:25:09.000000000 +0000
+++ ./3rdparty/qwtplot3d/include/qwt3d_openglhelper.h 2012-04-16 20:17:06.461052631 +0000
@@ -6,6 +6,7 @@
#include <qgl.h>
#else
#include <QtOpenGL/qgl.h>
+#include <GL/glu.h>
#endif
namespace Qwt3D

10
math/qtiplot/files/patch-qtiplot__src__plot3D__Cone3D.cpp Normal file
View File

@ -0,0 +1,10 @@
--- ./qtiplot/src/plot3D/Cone3D.cpp.orig 2010-09-27 07:12:48.000000000 +0000
+++ ./qtiplot/src/plot3D/Cone3D.cpp 2012-04-16 21:30:38.879058155 +0000
@@ -31,6 +31,7 @@
#include "qwt3d_plot.h"
#include <qwt3d_curve.h>
#include "Cone3D.h"
+#include "GL/glu.h"
using namespace Qwt3D;

1
math/qwtplot3d-qt4/Makefile
View File

@ -18,6 +18,7 @@ COMMENT= 3D plotting widgets for scientific data and math expressions
USE_QT_VER= 4
QT_COMPONENTS= gui moc_build qmake_build opengl
USE_GL= glu
USE_LDCONFIG= yes
HAS_CONFIGURE= yes
USE_DOS2UNIX= yes

10
math/qwtplot3d-qt4/files/patch-include__qwt3d_openglhelper.h Normal file
View File

@ -0,0 +1,10 @@
--- ./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

14
math/qwtplot3d-qt4/files/patch-qwtplot3d.pro
View File

@ -1,5 +1,5 @@
--- ./qwtplot3d.pro.orig Tue Jun 26 18:34:05 2007
+++ ./qwtplot3d.pro Tue Jun 26 18:34:57 2007
--- ./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
#
@ -12,7 +12,15 @@
MOC_DIR = tmp
OBJECTS_DIR = tmp
INCLUDEPATH = include
@@ -21,7 +21,7 @@
@@ -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