Add upstream patch to fix compile on arm spotted by Michael Palimaka <kensington@gentoo.org>, bug #492940.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

4 files changed, 89 insertions, 19 deletions

diff --git a/kde-base/analitza/ChangeLog b/kde-base/analitza/ChangeLog
index af67c1284b1e..fbdf860962da 100644
--- a/kde-base/analitza/ChangeLog
+++ b/kde-base/analitza/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/analitza
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/analitza/ChangeLog,v 1.77 2013/11/05 22:22:46 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/analitza/ChangeLog,v 1.78 2013/11/30 20:33:37 johu Exp $
+
+  30 Nov 2013; Johannes Huber <johu@gentoo.org>
+  +files/analitza-4.11.3-arm.patch, analitza-4.11.3.ebuild:
+  Add upstream patch to fix compile on arm spotted by Michael Palimaka
+  <kensington@gentoo.org>, bug #492940.
 
 *analitza-4.11.3 (05 Nov 2013)
 
diff --git a/kde-base/analitza/Manifest b/kde-base/analitza/Manifest
index 2074ace94bef..7a4641d647ef 100644
--- a/kde-base/analitza/Manifest
+++ b/kde-base/analitza/Manifest
@@ -1,30 +1,29 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX analitza-4.11.3-arm.patch 2009 SHA256 1e5e216ebc5d95d9222d78967d0489d1a572408b8ffd814592907c76b3f443c8 SHA512 50f7f820fc8c87b9b0d7646af489138e4be9d973d19ddc0a9b05254e040edf40c115120731a793dddae08561d046c6fb4c6a87b969fcccc6eb19df234d75da97 WHIRLPOOL a6bdcca8f09f5fb0e3452c9e3a53400b15fc0baf9c60f55aca0ebcb9d88ce1478c267bff8aa31f0a19e19c79c2a9acfc5b7d67ac658d1954b4ca0093fb76e952
 DIST analitza-4.10.5.tar.xz 179084 SHA256 d9167aaabb9d505b38f3524be4d306bb93063572141a012f8dc6b4abea1e8851 SHA512 e9c0fb8c4cdc7fc905dc042030101a380e2f7a26eb6e4187a96506022d97947d62620860a5c5abe5c11ca83a02bf954c0a769bd00024a80ef5254264b064c940 WHIRLPOOL 03ddfcc27f9f7e9b98f4fd9cada83fab3f7053c0c88a964def66815f2e621f258730a7992a0144e10b21ef669ccb9d20f2dfb44efdf24ea812c3276d53b74fd3
 DIST analitza-4.11.2.tar.xz 186296 SHA256 f3f7670b1a7fcba2fc890e18c8f29d58a256bd4a6b1c9a698c3900a8b0f37c85 SHA512 5ca5548d5e8a00e65cf14113f9b17c2dd950cca942b3537341bc52c5d128cade6e518defe1a3778e6970dfcea9396ce8838333628b4258266ae6ffb0fcab46da WHIRLPOOL bf06ec50780eefd73f2dd7111493177c99c0999440a6758b8c0ea3522738fe2a42e8eb8796f4ac765385f67cdee62a4776fa14cc880591952b1541db0f37faa9
 DIST analitza-4.11.3.tar.xz 186672 SHA256 b525b3e0819af9f28deb839d5e150844033f30393e0e38af6c886c89a1ec444d SHA512 92ee36ca41684019c4f9705b086f5502701d7508a1a8211279d16c06b56c4f0ffea349fbc4d7fc442aed8a7a0644229ee8672bc8e9f5e76f8cc1e566805a1998 WHIRLPOOL bbbfb4106d0fa88e9b9f99fc8ad4077f444d862d4b9bad9e37f4774185c26bfba1202d7626613334b742ada0167a3bf4e5f03862a051014fd30033a46302cfb1
 EBUILD analitza-4.10.5.ebuild 624 SHA256 76656746e264ee8a84e4afc4a8c74114f02aa3ebab6bda859cb44fb3d0e9d5d8 SHA512 4f8739ee96db8c768570340a6f637b43e94170d59c0e9452e58f4f4c6666ef2bfdf779e7c22cb6c41e48cc350299e9659b17295c4a15287393ec07854a4b6787 WHIRLPOOL 81295bccef6e60ee813be25b842ec8cbe19160fa6173b71ba73d9c2cb14d65caa71df7a38a310343f69cee19d68cd07a55215af26e0893fe0ed436309c89cd70
 EBUILD analitza-4.11.2.ebuild 675 SHA256 a8089b5a64f6c041d83a29d086e0ab4219a5421e88989ebb5c67cca1f245f824 SHA512 3484ac51c371297bf907360940b52cc88347fdd051668a622e39c28cc96f72ef0ee12daf6e673fd913c77b6f6093f3e6aebff7bab758daeec0c84741b455609f WHIRLPOOL 4d28a995b51ab05cd59afad43eecb31b751c03147a4a31cd6686d50ca539d5be4362f64b6bac0c5b0539a2c0788eb2f06022efb7ff7a444a567d41fb856ba0ed
-EBUILD analitza-4.11.3.ebuild 675 SHA256 f6fcf30fc7eca4cde22e6ec73df4fc5d39b73fddc8dff4e8fae406478ad534f3 SHA512 41b0e1b922c110eb4483df56470f7fd8fa6402ccf46558a182ce2756450be626abee2fa0a02a0cd98a79ae103c9de9b90ea1ef4835085ff0f7a764eb1d7ef894 WHIRLPOOL 2a94c89c787c4a68a4894aa6fb0366d3145a33d4cc7d8fca0c62677772635b563a838accb16869b7dbbe6809a9bfe0e531593a96e7a1c6028cd33acf4d39caad
-MISC ChangeLog 9005 SHA256 dd7de26aee83fe35303f6435da3f1819318419da94e6c5d27dd840d5cf4da07b SHA512 ab3c479bc8d2035f7a87d2370969a6a26007566beb273e29a7efb088797f45074073d9d05e98377ead232f576de84c20c81690b7c08a135a0c0328a52dec78ed WHIRLPOOL 19d36a0b81694181a1676825e928d736a6a4d60362f946c2263a91333d08166525a3e67a26d99428d2e788d25478d7c0514267868348a5f3d1c27806239e8ab5
+EBUILD analitza-4.11.3.ebuild 712 SHA256 38852d07ecfbcd57e06b88d2fe272fd0405cc894f0f32a88a2b822c2f2a8ceed SHA512 e3c1e52e82d2a6dc93078e8c9f0e71b1845844147e53ad4a49fdd257b32263139766382f6f453f62ea8572e683a24c789787049a9572e906c5b9b62225478e1d WHIRLPOOL b4decd0d1b57e62ec57dc3ddc3bcfefb7b926566ae9dd753f9a714ed93d8b55cf69688fa9fc29c6e2c6a12d86be5600300340e4bdc260967137cf17abea606fc
+MISC ChangeLog 9220 SHA256 47f5de2ada5d872f179d644285c7fddea27062ec38fb870072e9660e651fec2d SHA512 5d7bf1d2a987f1e46e72c646b9c577200cd5dcc4738f9a4bd6f68fa6eae07dad6bb71c0ba6f6cd8c78536718d968aafab1c712312ba97e98d53ea832dbf76444 WHIRLPOOL e6789c9bcf102af3e78b89ae8a6535e4467de418c5e931bf3299fb824a6b2b944619e10e8e03011326a12d32ea5b5fcce1d092ac104f0461973470a3b531f214
 MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJSeXA1XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcTvIP/RvVcFcDKVQlLo9ik43JMkBW
-gnDVL0r4geDeB4bykwIwo2cX6QDD1sPMWSte7gg3ThU1G5yJbH082IdtcoafL3yL
-6dPcb5/s3HCA+tfd5ILXU+8TjywQhuvyRzA/TsY6Su6HMOcUABv/l/xzqlOtR0gY
-GYVh7cpnWm/gjnvGtLo6CqIIKgEfHNZex7/wgyhDtbnxOyEk/w1L9SIGbjOlGaQs
-c3+Ntlh0N9oiXJZLNRTifHu9jeoVkKe3Cp+i3sEYE4Q0v8T4nv0JpmB4Pp4OyY3P
-450HHXWg+p19vKjrH0pxt0vmrIZXNPKLu/ccNFvBIPFHOg8hrYGERpWpt21IFk8Y
-T12DLWQf36XKi3rzk8Nm0rgGm/WMUgIERILDh/aAHDI682dsO5z2dAt6fDajnI4s
-yZzy7Vq19mHYqZi+NEnjkQy7sZBvv9Y1RC84KkHGFigE0MtqTIXhSOTVI8Kbw/9p
-Bnga6rgkDpljBez6f0ZO+dgTyYsKCZTIYlb/hrioQploBD1GxlClC9XRV38aIv9t
-+r86sVjx5SMRa4byXyt9RRJFWTU9CTm8EL0aT+d715/lptAixV4CnLQ/vJ3WhynX
-vhrg/4IT6wM2vcKEbQx17SAlMAdfDdAoMxz5z7q88gddlTHC5i0hCyWPCSwlkWfu
-BD9L37Jj/vf7qvjB9XXt
-=Rm26
+iQIcBAEBCAAGBQJSmj2IAAoJEGVpnaTzz9K98DsP/3b+Ac9neW/srpWVHXRjH/5+
+HhPD+RkRhSeQ4veoK5wO0G6jKIMHSlUFHX6pC3CZn7KiFVCGBNIV/RT1AEta8jm/
+aaGoH60VYKnj8U8Z1O0P/LMdtO63OTmTfDnvyJ7iJvYmUnc7WpwmpPTFS106gnsM
+QcS3hNJ9fMZ3dWjDSueo7osLbhgO6b4Vqqb/P9p5LHyRXzJLgxMpcOitSuMGA4Qn
+XPZv2gO63mSLYrt60g8egvtDxhtxw1KahHksUrfcivPxVsNmnaYTMXmrLKAVuY5B
+5DBlO4NOHodXtcw94Hd7caKk/RTCNrCb0frTiZogCXvL4ccIIGKlZbI3wzADDbyJ
+ZWHWqrmYB2FcrPT2TYZZtrjk159c+lrguRzGJOZ3Lc3Fq+oiD/rQf+/fcY+eyGep
+CebsLR4GLdGqFCeNcKfm8y3Yq7nJvMqKvofXPmuC7gZi+dYWd6pXR2cGeDTn/SEt
+Ku7c4wiD9aURz0+fPPsQdgyqJdxpScQV5SpT5MGP88CnC9ZtVvTvspUi0ibFDa3V
+7q3cSNxPHIj6Wtyo9x3MjleOUO3MvFrkPKS9uze7u9Huh2uhxetS2nfY0H3MXIy7
+7Ol4cMenWEFPLxYIMOYOWl3uAwxJCh4YhnwBPMJTbeAn/Nf/cgj+vC6wwp8rCmuG
+Yo4wOys+w4dfahyixXSW
+=XR4O
 -----END PGP SIGNATURE-----
diff --git a/kde-base/analitza/analitza-4.11.3.ebuild b/kde-base/analitza/analitza-4.11.3.ebuild
index d2eff2f02d04..f0342c35fdba 100644
--- a/kde-base/analitza/analitza-4.11.3.ebuild
+++ b/kde-base/analitza/analitza-4.11.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/analitza/analitza-4.11.3.ebuild,v 1.1 2013/11/05 22:22:47 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/analitza/analitza-4.11.3.ebuild,v 1.2 2013/11/30 20:33:37 johu Exp $
 
 EAPI=5
 
@@ -18,6 +18,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-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 000000000000..9180f046bd39
--- /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);
+