tags 672000 + pending thanks Dear maintainer,
I've uploaded Sebastian Ramacher's NMU to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: The Who: I Can See For Miles
diff -Nru structure-synth-1.5.0/debian/changelog structure-synth-1.5.0/debian/changelog
--- structure-synth-1.5.0/debian/changelog 2010-11-26 00:01:50.000000000 +0100
+++ structure-synth-1.5.0/debian/changelog 2012-05-14 11:15:18.000000000 +0200
@@ -1,3 +1,11 @@
+structure-synth (1.5.0-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/patches/gcc4.7.patch: Fix FTBFS with g++ 4.7. (Closes: #672000)
+ * debian/rules: Link against GLU to fix build failure.
+
+ -- Sebastian Ramacher <s.ramac...@gmx.at> Mon, 14 May 2012 11:15:14 +0200
+
structure-synth (1.5.0-1) unstable; urgency=low
* New upstream release
diff -Nru structure-synth-1.5.0/debian/patches/gcc4.7.patch structure-synth-1.5.0/debian/patches/gcc4.7.patch
--- structure-synth-1.5.0/debian/patches/gcc4.7.patch 1970-01-01 01:00:00.000000000 +0100
+++ structure-synth-1.5.0/debian/patches/gcc4.7.patch 2012-05-13 10:50:38.000000000 +0200
@@ -0,0 +1,28 @@
+Description: Fix build failures with g++ 4.7.
+Author: Sebastian Ramacher <s.ramac...@gmx.at>
+Last-Update: 2012-05-13
+
+Index: structure-synth-1.5.0/SyntopiaCore/GLEngine/Sphere.h
+===================================================================
+--- structure-synth-1.5.0.orig/SyntopiaCore/GLEngine/Sphere.h 2012-05-13 01:16:32.000000000 +0200
++++ structure-synth-1.5.0/SyntopiaCore/GLEngine/Sphere.h 2012-05-13 01:16:33.000000000 +0200
+@@ -2,6 +2,7 @@
+
+ #include "SyntopiaCore/Math/Vector3.h"
+ #include "Object3D.h"
++#include <GL/glu.h>
+
+ namespace SyntopiaCore {
+ namespace GLEngine {
+Index: structure-synth-1.5.0/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp
+===================================================================
+--- structure-synth-1.5.0.orig/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp 2012-05-13 01:16:32.000000000 +0200
++++ structure-synth-1.5.0/SyntopiaCore/GLEngine/Raytracer/RayTracer.cpp 2012-05-13 01:16:33.000000000 +0200
+@@ -1,5 +1,5 @@
+ #include <QThread>
+-
++#include <GL/glu.h>
+
+ #include "RayTracer.h"
+
+
diff -Nru structure-synth-1.5.0/debian/patches/series structure-synth-1.5.0/debian/patches/series
--- structure-synth-1.5.0/debian/patches/series 2010-11-25 23:59:08.000000000 +0100
+++ structure-synth-1.5.0/debian/patches/series 2012-05-13 01:13:09.000000000 +0200
@@ -1,3 +1,4 @@
abs_data_path.patch
sunflow.patch
fix_help.patch
+gcc4.7.patch
diff -Nru structure-synth-1.5.0/debian/rules structure-synth-1.5.0/debian/rules
--- structure-synth-1.5.0/debian/rules 2010-11-25 21:53:52.000000000 +0100
+++ structure-synth-1.5.0/debian/rules 2012-05-13 01:23:26.000000000 +0200
@@ -13,7 +13,7 @@
build-stamp: config-stamp
dh_testdir
qmake-qt4 -project \
- -after "CONFIG+=opengl" -after "QT+=xml opengl script"
+ -after "CONFIG+=opengl" -after "QT+=xml opengl script" -after "unix:LIBS+=-lGLU"
qmake-qt4
$(MAKE) \
CFLAGS="$(CFLAGS) -DDATADIR=\\\"/usr/share/structure-synth\\\"" \
signature.asc
Description: Digital signature
