[gentoo-commits] proj/kde:master commit in: kde-base/analitza/, kde-base/analitza/files/

[Johannes Huber]

commit:     93bd53c9b09aa8ca7ce323c16f99ddfc4a831b0c
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 30 19:31:59 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Nov 30 19:31:59 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=93bd53c9

[kde-base/analitza] Add upstream patch to fix compile on arm spotted by Michael Palimaka <kensington <AT> gentoo.org>, bug #492940.

Package-Manager: portage-2.2.7

---
 kde-base/analitza/analitza-4.11.49.9999.ebuild    |  2 +
 kde-base/analitza/files/analitza-4.11.3-arm.patch | 64 +++++++++++++++++++++++
 2 files changed, 66 insertions(+)

diff --git a/kde-base/analitza/analitza-4.11.49.9999.ebuild b/kde-base/analitza/analitza-4.11.49.9999.ebuild
index 0dffdd1..3c555ba 100644
--- a/kde-base/analitza/analitza-4.11.49.9999.ebuild
+++ b/kde-base/analitza/analitza-4.11.49.9999.ebuild
@@ -18,6 +18,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${PN}-4.11.3-arm.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_with opengl OpenGL)

diff --git a/kde-base/analitza/files/analitza-4.11.3-arm.patch b/kde-base/analitza/files/analitza-4.11.3-arm.patch
new file mode 100644
index 0000000..9180f04
--- /dev/null
+++ b/kde-base/analitza/files/analitza-4.11.3-arm.patch
@@ -0,0 +1,64 @@
+commit 07dc31770db7a7d2e5273db0c2b32578a7e13c4e
+Author: Maximiliano Curia <maxy@××××××.org>
+Date:   Wed Oct 30 23:53:19 2013 +0100
+
+    Fix compile in armhf
+    
+    Acked by Aleix
+    REVIEW: 111121
+    BUGS: 321244
+
+diff --git a/analitzaplot/plotter3d.cpp b/analitzaplot/plotter3d.cpp
+index accac1a..476b31a 100644
+--- a/analitzaplot/plotter3d.cpp
++++ b/analitzaplot/plotter3d.cpp
+@@ -143,6 +143,10 @@ void Plotter3D::setViewport(const QRectF& vp)
+     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); }
++
+ void Plotter3D::drawPlots()
+ {
+     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+@@ -153,7 +157,7 @@ void Plotter3D::drawPlots()
+ 
+     glMatrixMode(GL_MODELVIEW);
+     glLoadIdentity();
+-    glMultMatrixd(m_rot.data());
++    glMultMatrix(m_rot.constData());
+ 
+     // Object Drawing :
+     glCallList(m_sceneObjects.value(Axes));
+@@ -398,6 +402,14 @@ void Plotter3D::scale(GLdouble factor)
+     renderGL();
+ }
+ 
++inline QMatrix4x4 get_matrix(GLfloat *m)
++{
++    return QMatrix4x4(m[0],  m[1],  m[2],  m[3],
++                      m[4],  m[5],  m[6],  m[7],
++                      m[8],  m[9],  m[10], m[11],
++                      m[12], m[13], m[14], m[15]);
++}
++
+ void Plotter3D::rotate(int dx, int dy)
+ {
+     GLdouble ax = -dy;
+@@ -412,11 +424,11 @@ void Plotter3D::rotate(int dx, int dy)
+         m_rot.rotate(angle, m_rotFixed.normalized());
+         renderGL();
+     } else {
+-        GLdouble matrix[16] = {0}; // model view matrix from current OpenGL state
++        GLfloat matrix[16] = {0}; // model view matrix from current OpenGL state
+ 
+-        glGetDoublev(GL_MODELVIEW_MATRIX, matrix);
++        glGetFloatv(GL_MODELVIEW_MATRIX, matrix);
+ 
+-        QMatrix4x4 matrix4(matrix);
++        QMatrix4x4 matrix4(get_matrix(matrix));
+         bool couldInvert;
+         matrix4 = matrix4.inverted(&couldInvert);
+