diff options
author | Johannes Huber <johu@gentoo.org> | 2014-05-08 20:46:37 +0000 |
---|---|---|
committer | Johannes Huber <johu@gentoo.org> | 2014-05-08 20:46:37 +0000 |
commit | f00da836311ea3636e1e7961cadde03e2b94f6ad (patch) | |
tree | 487326e2fc897367d89daf167b8873d7593c6f8d /kde-base/analitza | |
parent | Update to latest codename. (diff) | |
download | gentoo-2-f00da836311ea3636e1e7961cadde03e2b94f6ad.tar.gz gentoo-2-f00da836311ea3636e1e7961cadde03e2b94f6ad.tar.bz2 gentoo-2-f00da836311ea3636e1e7961cadde03e2b94f6ad.zip |
Remove unused patch.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)
Diffstat (limited to 'kde-base/analitza')
-rw-r--r-- | kde-base/analitza/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/analitza/files/analitza-4.11.3-arm.patch | 64 |
2 files changed, 5 insertions, 65 deletions
diff --git a/kde-base/analitza/ChangeLog b/kde-base/analitza/ChangeLog index ed761b9c5680..215a419b6ac9 100644 --- a/kde-base/analitza/ChangeLog +++ b/kde-base/analitza/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/analitza # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/analitza/ChangeLog,v 1.112 2014/05/08 10:31:53 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/analitza/ChangeLog,v 1.113 2014/05/08 20:46:37 johu Exp $ + + 08 May 2014; Johannes Huber <johu@gentoo.org> + -files/analitza-4.11.3-arm.patch: + Remove unused patch. 08 May 2014; Agostino Sarubbo <ago@gentoo.org> -analitza-4.11.5.ebuild: Remove old diff --git a/kde-base/analitza/files/analitza-4.11.3-arm.patch b/kde-base/analitza/files/analitza-4.11.3-arm.patch deleted file mode 100644 index 9180f046bd39..000000000000 --- a/kde-base/analitza/files/analitza-4.11.3-arm.patch +++ /dev/null @@ -1,64 +0,0 @@ -commit 07dc31770db7a7d2e5273db0c2b32578a7e13c4e -Author: Maximiliano Curia <maxy@debian.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); - |