[SCM] Maintenance of the freemat package branch, master, updated. debian/4.0-2-17-ga5a76c8

Anton Gladky gladky.anton at gmail.com
Thu Apr 19 19:07:31 UTC 2012


The following commit has been merged in the master branch:
commit a1ed7bfef0e7c3933a54543a6ece03372c5c0f34
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Thu Apr 19 21:00:03 2012 +0200

    Fix FTBFS against Qt 4.8. (Closes: #662708)

diff --git a/debian/patches/11_ftbfs_qt48.patch b/debian/patches/11_ftbfs_qt48.patch
new file mode 100644
index 0000000..74420dd
--- /dev/null
+++ b/debian/patches/11_ftbfs_qt48.patch
@@ -0,0 +1,14 @@
+Description: Include glu.h to fix build with qt4.8
+Author: Andreas Moog <amoog at ubuntu.com>
+Bug-Ubuntu: https://launchpad.net/bugs/935092
+
+--- freemat-4.0.orig/libs/libGraphics/GLRenderEngine.cpp
++++ freemat-4.0/libs/libGraphics/GLRenderEngine.cpp
+@@ -22,6 +22,7 @@
+ #include <QtOpenGL>
+ #include <math.h>
+ #include "IEEEFP.hpp"
++#include <GL/glu.h>
+ 
+ GLRenderEngine::GLRenderEngine(QGLWidget *widget, double x1, double y1,
+ 			       double width, double height) {
diff --git a/debian/patches/series b/debian/patches/series
index 4a9f14f..d30e4ff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 09_warning.patch
 10_llvm.patch
 gcc4.5.patch
+11_ftbfs_qt48.patch

-- 
Maintenance of the freemat package



More information about the debian-science-commits mailing list