From cb15105d415737e8522c9be05310b72da3c83c3a Mon Sep 17 00:00:00 2001 From: Raphael Kubo da Costa Date: Sun, 20 May 2012 02:10:15 +0000 Subject: [PATCH] Make the port build with the upcoming Qt 4.8.x series. Since 4.8.0 [1], Qt itself does not automatically include GLU's headers and libraries with its OpenGL module, so applications which relied on Qt to get these need to be adjusted. PORTREVISION bumped since we now explicitly depend on GLU via USE_GL=glu. [1] http://qt.gitorious.org/qt/qt/commit/e7eed096a0c33607a7a37baaf06e5952dc9d556b --- graphics/autoq3d/Makefile | 2 ++ graphics/autoq3d/files/patch-AutoQ3D.pro | 10 ++++++++++ graphics/autoq3d/files/patch-src__fgui__glapparea.cpp | 11 +++++++++++ 3 files changed, 23 insertions(+) create mode 100644 graphics/autoq3d/files/patch-AutoQ3D.pro create mode 100644 graphics/autoq3d/files/patch-src__fgui__glapparea.cpp diff --git a/graphics/autoq3d/Makefile b/graphics/autoq3d/Makefile index b23271e3b3a2..6d6a255d3e85 100644 --- a/graphics/autoq3d/Makefile +++ b/graphics/autoq3d/Makefile @@ -7,6 +7,7 @@ PORTNAME= autoq3d DISTVERSION= 1.40 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/AutoQ3D%20${PORTVERSION} DISTNAME= AutoQ3DCommunity${PORTVERSION:C/\./-/}qt4source @@ -17,6 +18,7 @@ COMMENT= A complete QT quick 3d model editor program LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual +USE_GL= glu USE_ZIP= yes USE_QT_VER= 4 QT_COMPONENTS= corelib gui opengl \ diff --git a/graphics/autoq3d/files/patch-AutoQ3D.pro b/graphics/autoq3d/files/patch-AutoQ3D.pro new file mode 100644 index 000000000000..d2e6e510229d --- /dev/null +++ b/graphics/autoq3d/files/patch-AutoQ3D.pro @@ -0,0 +1,10 @@ +--- AutoQ3D.pro~ 2012-05-19 22:52:00.000000000 -0300 ++++ AutoQ3D.pro 2012-05-19 22:56:52.000000000 -0300 +@@ -8,6 +8,7 @@ + win32:LIBS+= -L$(QTDIR)/plugins/imageformats -lqjpeg4 + + QT += opengl ++LIBS += -lGLU + DEPENDPATH += . \ + src \ + src/cmds \ diff --git a/graphics/autoq3d/files/patch-src__fgui__glapparea.cpp b/graphics/autoq3d/files/patch-src__fgui__glapparea.cpp new file mode 100644 index 000000000000..50ca56b1787e --- /dev/null +++ b/graphics/autoq3d/files/patch-src__fgui__glapparea.cpp @@ -0,0 +1,11 @@ +--- src/fgui/glapparea.cpp~ 2012-05-19 22:54:35.000000000 -0300 ++++ src/fgui/glapparea.cpp 2012-05-19 22:54:50.000000000 -0300 +@@ -24,6 +24,8 @@ + #include + #include + ++#include ++ + + GLAppArea::GLAppArea( QWidget* parent,QStringList* strlista) + : QGLWidget( parent)