[yade] 04/06: Fix compilation against new libqglviewer.

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository yade.

commit 557b0e47154cf389984a1bafb32c43c54148420a
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Sun Mar 16 14:55:04 2014 +0100

    Fix compilation against new libqglviewer.
---
 debian/patches/04_fix_libqglviewer.patch | 37 ++++++++++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 debian/rules                             |  2 +-
 3 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/debian/patches/04_fix_libqglviewer.patch b/debian/patches/04_fix_libqglviewer.patch
new file mode 100644
index 0000000..1ebb7bf
--- /dev/null
+++ b/debian/patches/04_fix_libqglviewer.patch
@@ -0,0 +1,37 @@
+Description: Fix compilation with libqglviewer>=2.5.1 
+Author: Anton Gladky <gladk at debian.org>
+Origin: https://github.com/yade/trunk/commit/01a9bfcec29f429932a5f4b5143e577b193d3103
+Last-Update: 2014-03-14
+
+--- a/gui/qt4/GLViewer.hpp
++++ b/gui/qt4/GLViewer.hpp
+@@ -9,6 +9,7 @@
+ #include<boost/date_time/posix_time/posix_time.hpp>
+ #endif 
+ 
++#include<QGLViewer/manipulatedFrame.h>
+ #include<QGLViewer/qglviewer.h>
+ #include<QGLViewer/constraint.h>
+ #include<set>
+--- a/gui/qt4/GLViewerMouse.cpp
++++ b/gui/qt4/GLViewerMouse.cpp
+@@ -36,15 +36,17 @@
+ #endif
+ 
+ void GLViewer::mouseMovesCamera(){
+-  camera()->frame()->setWheelSensitivity(-1.0f);
+   
+   setWheelBinding(Qt::ShiftModifier , FRAME, ZOOM);
+   setWheelBinding(Qt::NoModifier, CAMERA, ZOOM);
+ 
+ #if QGLVIEWER_VERSION>=0x020500
++	if(manipulatedFrame()==0) setManipulatedFrame(new qglviewer::ManipulatedFrame());
++  manipulatedFrame()->setWheelSensitivity(-1.0f);
+   setMouseBinding(Qt::ShiftModifier, Qt::LeftButton, SELECT);
+   
+-  setMouseBinding(Qt::ShiftModifier, Qt::LeftButton | Qt::RightButton, FRAME, ZOOM);
++  setMouseBinding(Qt::ShiftModifier, Qt::LeftButton, FRAME, ZOOM);
++  setMouseBinding(Qt::ShiftModifier, Qt::RightButton, FRAME, ZOOM);
+   setMouseBinding(Qt::ShiftModifier, Qt::MidButton, FRAME, TRANSLATE);
+   setMouseBinding(Qt::ShiftModifier, Qt::RightButton, FRAME, ROTATE);
+     
diff --git a/debian/patches/series b/debian/patches/series
index 68cf40a..f23c43b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 01_fix_ipython_1.0.patch
 02_remove_google_analytics.patch
 03_increase_steps_in_test.patch 
+04_fix_libqglviewer.patch
diff --git a/debian/rules b/debian/rules
index 369f723..6eb0931 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ tmpInstall = $(CURDIR)/debian/tmp
 tmpDirMatplotLib = $(CURDIR)/debian/matplotlib
 
 %:
-	dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --with python2
+	dh $@ --builddirectory=$(BUILDDIR) --with python2 --parallel
 
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed,-no-keep-memory
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/yade.git