tags 672020 patch
thanks

Hi all,

The bug is not related to GCC-4.7. It is due to the fact that caret uses
functions from libGLU and while QtOpengl used to depend on it in the
past, it does not since recently. This results into missing header and
library includes, so the FTBS.

I have attached a patch to fix this. It is meant to be imported into the
master branch of the Git repository of the Debian package.

Cheers,

Nicolas
From fa9562c294d1084772c728d58856b75c5f5952f8 Mon Sep 17 00:00:00 2001
From: Nicolas Bourdaud <[email protected]>
Date: Thu, 17 May 2012 09:06:56 +0200
Subject: [PATCH] Compile/link against libGLU (Closes:#672020)

Add new patch (compile_against_libglu)
Add libglu1-mesa-dev to build-depends
---
 debian/control                        |    2 +-
 debian/patches/compile_against_libglu |   41 +++++++++++++++++++++++++++++++++
 debian/patches/series                 |    1 +
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/compile_against_libglu

diff --git a/debian/control b/debian/control
index dbbb3b1..61845a7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: science
 Priority: optional
 Maintainer: NeuroDebian Team <[email protected]>
 Uploaders: Michael Hanke <[email protected]>, Yaroslav Halchenko <[email protected]>
-Build-Depends: debhelper (>= 5), libqt4-dev (>= 4.3), libqt4-opengl-dev | libqt4-dev (<< 4.4.0), libqwt5-qt4-dev, libvtk5-dev, libminc-dev, libqtassistantclient-dev, libpng12-dev | libpng-dev
+Build-Depends: debhelper (>= 5), libqt4-dev (>= 4.3), libqt4-opengl-dev | libqt4-dev (<< 4.4.0), libqwt5-qt4-dev, libvtk5-dev, libminc-dev, libqtassistantclient-dev, libpng12-dev | libpng-dev, libglu1-mesa-dev
 Standards-Version: 3.9.3
 Homepage: http://brainvis.wustl.edu/wiki/index.php/Caret:About
 Vcs-Browser: http://git.debian.org/?p=pkg-exppsy/caret.git
diff --git a/debian/patches/compile_against_libglu b/debian/patches/compile_against_libglu
new file mode 100644
index 0000000..7ea897a
--- /dev/null
+++ b/debian/patches/compile_against_libglu
@@ -0,0 +1,41 @@
+Description: Include and link with libGLU library
+ Caret uses directly functions from libGLU without include GL/glu.h header
+ neither linking against libGLU.so. The build process used to work luckily
+ in the past because QtOpenGL depended it (not anymore).
+Author: Nicolas Bourdaud <[email protected]>
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672020
+Forwarded: no
+Last-Update: 2012-05-17
+--- a/caret_files/BorderFile.cxx
++++ b/caret_files/BorderFile.cxx
+@@ -34,6 +34,8 @@
+ #include <limits>
+ #include <sstream>
+ 
++#include <GL/glu.h>
++
+ #include "BorderFile.h"
+ #include "ColorFile.h"
+ #include "CoordinateFile.h"
+--- a/caret_brain_set/BrainModelOpenGL.h
++++ b/caret_brain_set/BrainModelOpenGL.h
+@@ -30,6 +30,7 @@
+ 
+ #include <QGLWidget>  // includes OpenGL includes ;)
+ #include <QMutex>
++#include <GL/glu.h>
+ 
+ #include "BorderFile.h"
+ #include "BrainModel.h"
+--- a/caret_qmake_include.pro
++++ b/caret_qmake_include.pro
+@@ -263,7 +263,7 @@
+             -lvtkCommon \
+             -lvtksys
+         
+-    LIBS += -lpng
++    LIBS += -lpng -lGLU
+     contains (DEFINES, HAVE_QWT) {
+        QWT_LIBS = -L$$(QWT_LIB_DIR) -lqwt-qt4
+     }
diff --git a/debian/patches/series b/debian/patches/series
index 9c35f73..599bc0e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ ifdef_fixes
 missing_header
 version_suffix
 nuisance2advice
+compile_against_libglu
-- 
1.7.10

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to