diff options
| author |   Jonathan Callen <abcd@gentoo.org> | 2009-12-22 22:57:55 +0000 |
|---|---|---|
| committer | Jonathan Callen <abcd@gentoo.org> | 2009-12-22 22:57:55 +0000 |
| commit | 6cb7cb993f1e6212b536ebb0c6f6313f242fc745 (patch) | |
| tree | 080ba61d6dfdd6511d7ead0488159be207f97d66 /kde-base | |
| parent | Sync from kde-testing. Use NOCOLOR variable instead of some local one. (diff) | |
| download | gentoo-2-6cb7cb993f1e6212b536ebb0c6f6313f242fc745.tar.gz gentoo-2-6cb7cb993f1e6212b536ebb0c6f6313f242fc745.tar.bz2 gentoo-2-6cb7cb993f1e6212b536ebb0c6f6313f242fc745.zip | |
Pull in changes from overlay and patch for prefix support (Solaris)
(Portage version: -svn/cvs/Linux i686)
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/kalgebra/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kalgebra/files/kalgebra-4.3.2-solaris-graph2d.patch | 22 | ||||
| -rw-r--r-- | kde-base/kalgebra/kalgebra-4.3.4.ebuild | 11 |
3 files changed, 35 insertions, 4 deletions
diff --git a/kde-base/kalgebra/ChangeLog b/kde-base/kalgebra/ChangeLog index 4d35317ba146..19c7934138a1 100644 --- a/kde-base/kalgebra/ChangeLog +++ b/kde-base/kalgebra/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kalgebra # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kalgebra/ChangeLog,v 1.49 2009/12/10 19:12:34 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kalgebra/ChangeLog,v 1.50 2009/12/22 22:57:55 abcd Exp $ + + 22 Dec 2009; Jonathan Callen <abcd@gentoo.org> + +files/kalgebra-4.3.2-solaris-graph2d.patch, kalgebra-4.3.4.ebuild: + Pull in changes from overlay and patch for prefix support (Solaris) 10 Dec 2009; Tomáš Chvátal <scarabeus@gentoo.org> -kalgebra-4.3.1.ebuild: diff --git a/kde-base/kalgebra/files/kalgebra-4.3.2-solaris-graph2d.patch b/kde-base/kalgebra/files/kalgebra-4.3.2-solaris-graph2d.patch new file mode 100644 index 000000000000..41056d6da5c1 --- /dev/null +++ b/kde-base/kalgebra/files/kalgebra-4.3.2-solaris-graph2d.patch @@ -0,0 +1,22 @@ +Desc: Fix missing isinf() for Solaris (same way as for kcalc). +Author: Heiko Przybyl <zuxez@cs.tu-berlin.de> +--- kalgebra-4.3.2/kalgebra/src/graph2d.cpp.orig 2009-10-16 15:31:29.804959916 +0200 ++++ kalgebra-4.3.2/kalgebra/src/graph2d.cpp 2009-10-16 15:35:36.879338408 +0200 +@@ -38,6 +38,17 @@ + #include "analitza.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 ++ + // #define DEBUG_GRAPH + + using namespace std; diff --git a/kde-base/kalgebra/kalgebra-4.3.4.ebuild b/kde-base/kalgebra/kalgebra-4.3.4.ebuild index 314678fb0c87..9ef2fea786c0 100644 --- a/kde-base/kalgebra/kalgebra-4.3.4.ebuild +++ b/kde-base/kalgebra/kalgebra-4.3.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kalgebra/kalgebra-4.3.4.ebuild,v 1.1 2009/12/01 10:01:04 wired Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kalgebra/kalgebra-4.3.4.ebuild,v 1.2 2009/12/22 22:57:55 abcd Exp $ EAPI="2" @@ -19,11 +19,16 @@ RDEPEND="${DEPEND}" KMEXTRACTONLY="libkdeedu/kdeeduui" +PATCHES=( + "${FILESDIR}"/${PN}-4.3.2-solaris-graph2d.patch +) + src_configure() { - mycmakeargs="${mycmakeargs} + mycmakeargs=( $(cmake-utils_use_with readline) $(cmake-utils_use_with plasma) - $(cmake-utils_use_with opengl OpenGL)" + $(cmake-utils_use_with opengl OpenGL) + ) kde4-meta_src_configure } |