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

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

[Michael Palimaka]

commit:     c5bab3c0589fb46a10c8dc1fa22b0b35fd1a8118
Author:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
AuthorDate: Thu Apr 12 18:48:50 2012 +0000
Commit:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Thu Apr 12 18:48:50 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c5bab3c0

[kde-base/analitza] Add solaris patch that used to be applied via kalgebra before KDEEDU moved to split repos.

(Portage version: 2.1.10.56/git/Linux x86_64, unsigned Manifest commit)

---
 kde-base/analitza/analitza-4.8.49.9999.ebuild      |    2 +
 kde-base/analitza/analitza-9999.ebuild             |    2 +
 .../analitza/files/analitza-solaris-graph2d.patch  |   21 ++++++++++++++++++++
 3 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/kde-base/analitza/analitza-4.8.49.9999.ebuild b/kde-base/analitza/analitza-4.8.49.9999.ebuild
index 78627d5..dd5b5c2 100644
--- a/kde-base/analitza/analitza-4.8.49.9999.ebuild
+++ b/kde-base/analitza/analitza-4.8.49.9999.ebuild
@@ -22,6 +22,8 @@ add_blocker kalgebra 4.7.50
 RESTRICT=test
 # bug 397705
 
+PATCHES=( "${FILESDIR}/${PN}-solaris-graph2d.patch" )
+
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_with readline)

diff --git a/kde-base/analitza/analitza-9999.ebuild b/kde-base/analitza/analitza-9999.ebuild
index 78627d5..dd5b5c2 100644
--- a/kde-base/analitza/analitza-9999.ebuild
+++ b/kde-base/analitza/analitza-9999.ebuild
@@ -22,6 +22,8 @@ add_blocker kalgebra 4.7.50
 RESTRICT=test
 # bug 397705
 
+PATCHES=( "${FILESDIR}/${PN}-solaris-graph2d.patch" )
+
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_with readline)

diff --git a/kde-base/analitza/files/analitza-solaris-graph2d.patch b/kde-base/analitza/files/analitza-solaris-graph2d.patch
new file mode 100644
index 0000000..5bbf380
--- /dev/null
+++ b/kde-base/analitza/files/analitza-solaris-graph2d.patch
@@ -0,0 +1,21 @@
+--- analiyzagui/graph2d.cpp
++++ analitzagui/graph2d.cpp
+@@ -33,6 +33,18 @@
+ 
+ #include <analitza/analyzer.h>
+ #include "functionsmodel.h"
++
++// Stolen from kcalc.
++#if defined(Q_OS_SOLARIS)
++// Strictly by the standard, ininf() is a c99-ism which
++// is unavailable in C++. The IEEE FP headers provide
++// a function with similar functionality, so use that instead.
++// However, !finite(a) == isinf(a) || isnan(a), so it's
++// not 100% correct.
++#include <ieeefp.h>
++#define isinf(a) !finite(a)
++#endif
++
+ #include "functionutils.h"
+ #include "functionspainter.h"
+ #include <cmath>

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

[Michael Palimaka]

commit:     682284e0a80b656abc73a3918a878ae84bb24a69
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 17 15:42:22 2012 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Aug 17 15:42:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=682284e0

[kde-base/analitza] Remove solaris patch as per meeting.

(Portage version: 2.1.11.10/git/Linux x86_64, unsigned Manifest commit)

---
 kde-base/analitza/analitza-4.9.49.9999.ebuild      |    2 -
 kde-base/analitza/analitza-9999.ebuild             |    2 -
 .../analitza/files/analitza-solaris-graph2d.patch  |   21 --------------------
 3 files changed, 0 insertions(+), 25 deletions(-)

diff --git a/kde-base/analitza/analitza-4.9.49.9999.ebuild b/kde-base/analitza/analitza-4.9.49.9999.ebuild
index c111991..433599b 100644
--- a/kde-base/analitza/analitza-4.9.49.9999.ebuild
+++ b/kde-base/analitza/analitza-4.9.49.9999.ebuild
@@ -19,8 +19,6 @@ RDEPEND="${DEPEND}"
 
 add_blocker kalgebra 4.7.50
 
-PATCHES=( "${FILESDIR}/${PN}-solaris-graph2d.patch" )
-
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_with readline)

diff --git a/kde-base/analitza/analitza-9999.ebuild b/kde-base/analitza/analitza-9999.ebuild
index c111991..433599b 100644
--- a/kde-base/analitza/analitza-9999.ebuild
+++ b/kde-base/analitza/analitza-9999.ebuild
@@ -19,8 +19,6 @@ RDEPEND="${DEPEND}"
 
 add_blocker kalgebra 4.7.50
 
-PATCHES=( "${FILESDIR}/${PN}-solaris-graph2d.patch" )
-
 src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use_with readline)

diff --git a/kde-base/analitza/files/analitza-solaris-graph2d.patch b/kde-base/analitza/files/analitza-solaris-graph2d.patch
deleted file mode 100644
index 5bbf380..0000000
--- a/kde-base/analitza/files/analitza-solaris-graph2d.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- analiyzagui/graph2d.cpp
-+++ analitzagui/graph2d.cpp
-@@ -33,6 +33,18 @@
- 
- #include <analitza/analyzer.h>
- #include "functionsmodel.h"
-+
-+// Stolen from kcalc.
-+#if defined(Q_OS_SOLARIS)
-+// Strictly by the standard, ininf() is a c99-ism which
-+// is unavailable in C++. The IEEE FP headers provide
-+// a function with similar functionality, so use that instead.
-+// However, !finite(a) == isinf(a) || isnan(a), so it's
-+// not 100% correct.
-+#include <ieeefp.h>
-+#define isinf(a) !finite(a)
-+#endif
-+
- #include "functionutils.h"
- #include "functionspainter.h"
- #include <cmath>

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

[Chris Reffett]

commit:     23ba5bbc09ed9a0fd3d1021efe89f0e9987b8a21
Author:     Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 23 17:38:27 2012 +0000
Commit:     Chris Reffett <geekboy72 <AT> gmail <DOT> com>
CommitDate: Fri Nov 23 17:38:27 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=23ba5bbc

[kde-base/analitza] Remove failing test, bug 443746

Package-Manager: portage-2.2.0_alpha142

---
 kde-base/analitza/analitza-4.9.80.ebuild           |    3 +--
 .../files/analitza-4.9.80-removetest.patch         |   10 ++++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/kde-base/analitza/analitza-4.9.80.ebuild b/kde-base/analitza/analitza-4.9.80.ebuild
index 20cbc9a..075dd1a 100644
--- a/kde-base/analitza/analitza-4.9.80.ebuild
+++ b/kde-base/analitza/analitza-4.9.80.ebuild
@@ -16,8 +16,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-RESTRICT=test
-# bug 443746
+PATCHES=( "${FILESDIR}/${PN}-4.9.80-removetest.patch" )
 
 add_blocker kalgebra 4.7.50
 

diff --git a/kde-base/analitza/files/analitza-4.9.80-removetest.patch b/kde-base/analitza/files/analitza-4.9.80-removetest.patch
new file mode 100644
index 0000000..9b9ceae
--- /dev/null
+++ b/kde-base/analitza/files/analitza-4.9.80-removetest.patch
@@ -0,0 +1,10 @@
+diff -ruN analitza-4.9.80/analitzaplot/tests/CMakeLists.txt analitza-4.9.80-tweaked/analitzaplot/tests/CMakeLists.txt
+--- analitza-4.9.80/analitzaplot/tests/CMakeLists.txt	2012-11-14 11:14:51.000000000 -0500
++++ analitza-4.9.80-tweaked/analitzaplot/tests/CMakeLists.txt	2012-11-23 12:34:21.961015833 -0500
+@@ -11,6 +11,3 @@
+ 
+ kde4_add_unit_test(plotsmodeltest plotsmodeltest.cpp)
+ target_link_libraries(plotsmodeltest ${testLibs})
+-
+-kde4_add_unit_test(plotsdictionarymodeltest plotsdictionarymodeltest.cpp)
+-target_link_libraries(plotsdictionarymodeltest ${testLibs})

[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@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);
+