diff options
| -rw-r--r-- | kde-base/step/Manifest | 7 | ||||
| -rw-r--r-- | kde-base/step/files/step-4.3.2-solaris.patch | 69 | ||||
| -rw-r--r-- | kde-base/step/step-4.3.80.ebuild | 4 | ||||
| -rw-r--r-- | kde-base/step/step-4.3.9999.ebuild | 4 | ||||
| -rw-r--r-- | kde-base/step/step-9999.ebuild | 4 |
5 files changed, 85 insertions, 3 deletions
diff --git a/kde-base/step/Manifest b/kde-base/step/Manifest index 2046534a7d9..b507a394937 100644 --- a/kde-base/step/Manifest +++ b/kde-base/step/Manifest @@ -1,5 +1,6 @@ +AUX step-4.3.2-solaris.patch 2250 RMD160 efe2e4cc7b0e5893d730e1ad64a9f02e9427f3a0 SHA1 7cd2bf61258da9bffdb031629292330e8aab3894 SHA256 5ac2177f2775621b8cdbe672ece6dd274945f6d6d9007cf40a247377c4cd4921 DIST kdeedu-4.3.80.tar.bz2 64195008 RMD160 92dddffcf1099e4a2c2e3039974369fdcad0bb63 SHA1 2b8238fd7890d41b28de9b7ac24cf9d9e62ddc9e SHA256 389c07b0497c2c3cd72ec2e74e806455cf1d35df8b7cb03d88ead3cb5b7f6c94 -EBUILD step-4.3.80.ebuild 613 RMD160 e5d62a4e022c7ef7aebae54dcc8dce28a1e7069a SHA1 2f8389e6db0fd669f8549ff81b31786b15db3e6e SHA256 e6f1953dd914bb236e1d3f32bca6e17ff4437cf5b20278b0bf1bb5585c6005a9 -EBUILD step-4.3.9999.ebuild 564 RMD160 3dbc227aacd70d9733f01b1ac6d677220703097c SHA1 0f26ed741e1d9797f835816d37599c397d5665e8 SHA256 8a1e7a0bebd50f755bcb5046861b49359243027c8ef82dfc06380d0583f7d901 -EBUILD step-9999.ebuild 564 RMD160 3dbc227aacd70d9733f01b1ac6d677220703097c SHA1 0f26ed741e1d9797f835816d37599c397d5665e8 SHA256 8a1e7a0bebd50f755bcb5046861b49359243027c8ef82dfc06380d0583f7d901 +EBUILD step-4.3.80.ebuild 667 RMD160 5203670ca066431f1e733ed55de4d78928ee7003 SHA1 806ecdfa2c76a710c8e2b5d83d5093379c6aa49e SHA256 7aa83a2eeca2ba986311fced197729d4c09ce0ab702a290740404fade9413bf7 +EBUILD step-4.3.9999.ebuild 618 RMD160 7b9668a59a1f2ed9bed939387009cf7bc0ddc580 SHA1 03307178ed1f8455234a79070d6c063ea6747820 SHA256 e239a5efea882bb29875a9560b714554ad935366d86e53f204bfcf1a111127a1 +EBUILD step-9999.ebuild 618 RMD160 7b9668a59a1f2ed9bed939387009cf7bc0ddc580 SHA1 03307178ed1f8455234a79070d6c063ea6747820 SHA256 e239a5efea882bb29875a9560b714554ad935366d86e53f204bfcf1a111127a1 MISC metadata.xml 252 RMD160 46a2b08bff054e514bd75d804d76cd23dd5d2459 SHA1 bb30857ff823d3ac60a012fc9524a2365446d705 SHA256 c07f8290ffe01e4ece3d18151fb45ecb354e11bd2966e364d8c5c08d16369560 diff --git a/kde-base/step/files/step-4.3.2-solaris.patch b/kde-base/step/files/step-4.3.2-solaris.patch new file mode 100644 index 00000000000..000f36228f7 --- /dev/null +++ b/kde-base/step/files/step-4.3.2-solaris.patch @@ -0,0 +1,69 @@ +Desc: Fix compilation on Solaris. +Author: Heiko Przybyl <zuxez@cs.tu-berlin.de> +--- step-4.3.2/step/stepcore/constraintsolver.cc.orig 2009-10-16 18:42:52.562521176 +0200 ++++ step-4.3.2/step/stepcore/constraintsolver.cc 2009-10-16 18:44:15.447949305 +0200 +@@ -21,4 +21,18 @@ + #include <unsupported/Eigen/IterativeSolvers> + #include <cmath> ++ ++// 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> ++namespace std { ++ inline int isinf(double a) { return !finite(a); } ++ inline int isfinite(double a) { return finite(a); } ++} ++#endif + + using namespace Eigen; +--- step-4.3.2/step/stepcore/particle.cc.orig 2009-10-16 19:23:50.845435007 +0200 ++++ step-4.3.2/step/stepcore/particle.cc 2009-10-16 19:24:33.425319075 +0200 +@@ -22,6 +22,20 @@ + #include <cmath> + #include <QtGlobal> + ++// 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> ++namespace std { ++ inline int isinf(double a) { return !finite(a); } ++ inline int isfinite(double a) { return finite(a); } ++} ++#endif ++ + namespace StepCore + { + +--- step-4.3.2/step/stepcore/rigidbody.cc.orig 2009-10-16 19:24:57.664177635 +0200 ++++ step-4.3.2/step/stepcore/rigidbody.cc 2009-10-16 19:25:08.616915717 +0200 +@@ -21,6 +21,20 @@ + #include <cstring> + #include <cmath> + ++// 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> ++namespace std { ++ inline int isinf(double a) { return !finite(a); } ++ inline int isfinite(double a) { return finite(a); } ++} ++#endif ++ + namespace StepCore + { + diff --git a/kde-base/step/step-4.3.80.ebuild b/kde-base/step/step-4.3.80.ebuild index ba19a69da9f..36567ca2d9b 100644 --- a/kde-base/step/step-4.3.80.ebuild +++ b/kde-base/step/step-4.3.80.ebuild @@ -20,6 +20,10 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}"/${PN}-4.3.2-solaris.patch +) + src_configure() { mycmakeargs=( $(cmake-utils_use_with gsl) diff --git a/kde-base/step/step-4.3.9999.ebuild b/kde-base/step/step-4.3.9999.ebuild index 7d53aedf19c..3b7028ca055 100644 --- a/kde-base/step/step-4.3.9999.ebuild +++ b/kde-base/step/step-4.3.9999.ebuild @@ -20,6 +20,10 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}"/${PN}-4.3.2-solaris.patch +) + src_configure() { mycmakeargs=( $(cmake-utils_use_with gsl) diff --git a/kde-base/step/step-9999.ebuild b/kde-base/step/step-9999.ebuild index 7d53aedf19c..3b7028ca055 100644 --- a/kde-base/step/step-9999.ebuild +++ b/kde-base/step/step-9999.ebuild @@ -20,6 +20,10 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}"/${PN}-4.3.2-solaris.patch +) + src_configure() { mycmakeargs=( $(cmake-utils_use_with gsl) |