diff options
Diffstat (limited to 'kde-base/analitza')
| -rw-r--r-- | kde-base/analitza/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/analitza/Manifest | 29 | ||||
| -rw-r--r-- | kde-base/analitza/files/analitza-4.11.3-arm.patch | 64 |
3 files changed, 19 insertions, 80 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/Manifest b/kde-base/analitza/Manifest index 4abcd2a42140..221d7e4e27fe 100644 --- a/kde-base/analitza/Manifest +++ b/kde-base/analitza/Manifest @@ -1,27 +1,26 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX analitza-4.11.3-arm.patch 2009 SHA256 1e5e216ebc5d95d9222d78967d0489d1a572408b8ffd814592907c76b3f443c8 SHA512 50f7f820fc8c87b9b0d7646af489138e4be9d973d19ddc0a9b05254e040edf40c115120731a793dddae08561d046c6fb4c6a87b969fcccc6eb19df234d75da97 WHIRLPOOL a6bdcca8f09f5fb0e3452c9e3a53400b15fc0baf9c60f55aca0ebcb9d88ce1478c267bff8aa31f0a19e19c79c2a9acfc5b7d67ac658d1954b4ca0093fb76e952 DIST analitza-4.12.5.tar.xz 179856 SHA256 ae9dc37187293c35abd193315069ed8242e589bd862e8a05b24cc4c4a36f864c SHA512 3011359d15a1fefab0a9693acf35ebc0dc98c3cc05fdf2453c0adbffdef8d6e050d7a59f69cb383ec1e7bbf5910296db6c96e2daf266b8bc1d9c4f1d4aa19479 WHIRLPOOL 3b6e99a1de253431a7ee233564291096a2085643963730ff092cd95c031ca72d002fd0f914f55fc2900bed5e496c4f20a661baaab2dab146390ef0b5ea561a68 DIST analitza-4.13.0.tar.xz 184752 SHA256 37bb37190922d57f414b6ac4be3c5d752966f01d7ae4eeec38fcfc04f3832da5 SHA512 356f4308311ddf78de7310afff6f211159ce455e90d3c2cad6d120dc9cd214145b25163914a6088825218e55e5fcaa9916a55990ca1dd4ffa37c19e4c06f568f WHIRLPOOL 80e31bac23e9488290207bc67e39f75a8006f95de13d6ff5948ddad9bf859fc83296c04e699356ebe35289fac740ae413f6e0f93ab24f6d92469587a21a75a0a EBUILD analitza-4.12.5.ebuild 665 SHA256 2332541d3b384c68a1998bb1e387bd7e77ba00fbd5247f9ff1ce1f4ccf426c64 SHA512 5e11a337fb0cbbffadb55420de81777a1ad6fcc6ce58f1c42d6e3278e686a32f1ae7480f54a04b4a1010751a86e200cea5fbfd734043be0e3642eaf36458e223 WHIRLPOOL 8ed2dcb975870fcb989b922aeec3a3648cc80127ca84a29171910abf15141371b7a14d45a93b025ef7382e3fdb8d84d15974e00b8ba046eef1c5dd1355e77473 EBUILD analitza-4.13.0.ebuild 670 SHA256 9f1b3a38c31356a4c9fa79d2a74ea350a230cc8b94dc9de86c860e4432250150 SHA512 346387eed0956e5575d9da4dea972b73037bb997d6894f1b8ff82da5ebfec6f29f101accde893909cb49a7932bae7796b541f4958e3acb7ce4b903341ce39175 WHIRLPOOL d832dfb106c4bf9b452004fa819f44fad296593828eaaaa06cd11715f4de22904a1888a189f00d17e9b07597873730f1c5a92410f5a186f983d5950407d5e9aa -MISC ChangeLog 13091 SHA256 dac823f89b5d4bb0d34bf273a76da4b0b818db920ef46c76cff65b7f966ef1f5 SHA512 f852c616d08805d7ac6c437024a41d08680290c51fa312e720f4c432ed5bc866ecd962e9df73e0e9aab774eb35be9a97600fcb3260d867283ddec01d261161bc WHIRLPOOL 5e9fcd9fce0e20b9a665b4008eb1fd71e72da8fed1eb3045d6ad075a9681c5fae1c5c241183f35a26ff35aa220b72ac97bcf99a35c7048daaae56824eba5f89b +MISC ChangeLog 13200 SHA256 b79801b6010ed6ff442fe32044e5be5373d64f2a6b0b783880db8fdfaaac3802 SHA512 8689b74c68423f9792e832f01203805c1fd1a65390df4663551b35ea7c9ba6bffc37a1182d908cee5c8a354bbd55f82f4a4b18cbbcd8c0e806203ab3eaf1d206 WHIRLPOOL 51ca3a55b22ed30e1abbe5f8080f462677c57f7179f0c3bc8b2b7ca18ada0280aba7dbcd8efa19c9fa60af99c4bc16a10de52704edb0eb40e63bdfda2b38e88d MISC metadata.xml 156 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a SHA512 0dcd7cfb246c4518ed1653cb06f5d2c7220ea90160a4b1a1da43edf5124b76d7104fe35a545178b6b3df19f5f3a3eb3f31ac1b4d169e3ca90d78be3e20e58b05 WHIRLPOOL df162e3d521df7decdd84d980e4bc71531bb8e05486c07102c554b529c10a1fb3374dda79d56b13bc037a2d230b4b8ff25702c7a1b86d703a24e8bfe7fe57642 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCAAGBQJTa11kAAoJELp701BxlEWfCs4QAITeZdt8ryHcmKtu7SK7QSk/ -QBN30scz8G74mlk/ftyVyIMJHCq0Qs9L9L3/NjeQeNKmnm3WPyU+o8gqedlN5hzv -R9TirzSWoafFp1KNDTOEaEv26cs6WfSSaUpsxqqoU3N8MAcqsGaKT7wCak0GLBgP -XJqUaLyT2VCbFccAobOdfvfGrFPXfU8A8etlH6JutGGZy7ozdiaHWYlRGdFq1Hen -2J+cg5TVM0R9S0ONKsKeAtC4OJTti5llcFI1f24pjemrGSb7RsHys+PgfAgeaxPp -grL5E3r+xu0n0mUgknBgjixUS3iLLHIZ6YcWj7YbDfiDVzJrJ/5P4lT4QCcF28iB -XYnejW2MqgHlHAqyEe1kyNW2aKfhM4MnklS/R5mK+GtDLayeQVSdEHRlkbomFnQ/ -kIRSyznozywbkhJqbjqt13Z/VFyJakDHtvN+DZXjZGMluXSq799Hip6JzxugZm3q -FbqQDpvqnLgzX8euJ2709iJDioJjEglU//kyWU5WP9kyFVm5KD/uFxdQRMAIumvl -34rG1zf9rDXeIQsATc3n9ZayRyPTaAQ1wYhvo/ip7/dHgSW+38T33qRtK1xf2PXr -VLaz40QAij8XfVvobCOw6KNY3KkckQorPOniJ4H6FnAlXGNkoCMMXTU1N511eqqp -5yrBRRfmJwfdYyzUc4gn -=YLXz +iQIcBAEBCAAGBQJTa+0xAAoJEGVpnaTzz9K9PygP/jL5dH+iIZbA9muyIu+dWXl0 +w0lj0DwTma4dEc6ZxG3sDTtWZ67nLaQdR9bR0vH7rLWcmh+PIL+UMtvYa1q337ra +pB3tMa17/lq9mWvsJXvt+qtfoh5bGzDtrcIgDuJgEO+Xf9d67ew+oicB+6JTCfUL +/VKosxbqi1x50DpaqTGCx3f4ulhe4nUQilaDcqxziQHV9dZ4dHQrDZxWF2TWBtmi +YxnVjwmFpo3q2tPSP2uC6B7ZN7hJL6ZKtnuugZbDcXpuoshMWItkyu9mLpnpde5b +ucXA5zF9jtBJ+WJfq1KAghrGjnDG2WZR7Jb9Cqtl/qvYi0BwrF5kL0ERs6I2dBx2 +JUEis7deEitvqP8NgoJwhko8xJ/KGZruf2ovFa8vHLie8LLHWvjWkvalnqznU4E+ +1T9W1CGYwcK4aKiUkJSZXpJKROgfJy94qMDBotLaA7t2UCK3MNboaachi79DO1vb +15sB98OeybAUECgOYzW/iNKjX/QFqXNVFnO93v/JvzdW6TMKtHivkAtBJWFKLvYp +edubowx1JIv2aW5+NkELs1gv/m5zGk/539kdnE7Hob78tMiM74FOi/jH6faTx3I9 +//hEPbtZ7+9a7VQee90fynr6cODGTJzoW3PZGLWvj9ZVGCV2PH1vxOYfppAXuvnK +sM9D3J5vsFXgVuojFI+4 +=DSms -----END PGP SIGNATURE----- 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); - |