[SCM] analitza packaging branch, master, updated. debian/4.10.5-1-2-g8ac31f8

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/analitza.git;a=commitdiff;h=8ac31f8

The following commit has been merged in the master branch:
commit 8ac31f8f7d95d36f98e0e498e4cd83b35ca35cdd
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sun Jul 14 12:22:22 2013 +0200

    New patch: analitzaplot-armhf.patch, to fix build problems in armhf.
---
 debian/changelog                        |    1 +
 debian/patches/analitzaplot-armhf.patch |   48 +++++++++++++++++++++++++++++++
 debian/patches/series                   |    1 +
 3 files changed, 50 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index fa32641..2ab6833 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 analitza (4:4.10.5-2) UNRELEASED; urgency=low
 
   * 
+  * New patch: analitzaplot-armhf.patch, to fix build problems in armhf.
 
  -- Maximiliano Curia <maxy at debian.org>  Sun, 14 Jul 2013 12:08:59 +0200
 
diff --git a/debian/patches/analitzaplot-armhf.patch b/debian/patches/analitzaplot-armhf.patch
new file mode 100644
index 0000000..1d91cf0
--- /dev/null
+++ b/debian/patches/analitzaplot-armhf.patch
@@ -0,0 +1,48 @@
+Index: analitza/analitzaplot/plotter3d.cpp
+===================================================================
+--- analitza.orig/analitzaplot/plotter3d.cpp	2013-07-14 12:51:10.799543998 +0200
++++ analitza/analitzaplot/plotter3d.cpp	2013-07-14 12:52:46.291730057 +0200
+@@ -142,6 +142,12 @@
+     renderGL();
+ }
+ 
++// add overloaded functions which call the underlying OpenGL function
++inline void glMultMatrix(const GLfloat  *m) { glMultMatrixf(m); }
++inline void glMultMatrix(const GLdouble *m) { glMultMatrixd(m); }
++
++inline void glMultMatrix(const QMatrix4x4 &m) { glMultMatrix(m.constData()); }
++
+ void Plotter3D::drawPlots()
+ {
+     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+@@ -152,7 +158,7 @@
+ 
+     glMatrixMode(GL_MODELVIEW);
+     glLoadIdentity();
+-    glMultMatrixd(m_rot.data());
++    glMultMatrix(m_rot);
+ 
+     // Object Drawing :
+     glCallList(m_sceneObjects.value(Axes));
+@@ -396,6 +402,9 @@
+     renderGL();
+ }
+ 
++inline void glGetModelMatrix(float *matrix) { glGetFloatv(GL_MODELVIEW_MATRIX, matrix); }
++inline void glGetModelMatrix(double *matrix) { glGetDoublev(GL_MODELVIEW_MATRIX, matrix); }
++
+ void Plotter3D::rotate(int dx, int dy)
+ {
+     GLdouble ax = -dy;
+@@ -410,9 +419,9 @@
+         m_rot.rotate(angle, m_rotFixed.normalized());
+         renderGL();
+     } else {
+-        GLdouble matrix[16] = {0}; // model view matrix from current OpenGL state
++        qreal matrix[16] = {0}; // model view matrix from current OpenGL state
+ 
+-        glGetDoublev(GL_MODELVIEW_MATRIX, matrix);
++        glGetModelMatrix(matrix);
+ 
+         QMatrix4x4 matrix4(matrix);
+         bool couldInvert;
diff --git a/debian/patches/series b/debian/patches/series
index ba161c0..4b0e4d1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+analitzaplot-armhf.patch
 enable_debianabimanager.diff

-- 
analitza packaging