diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-06-20 15:25:33 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-06-20 15:25:33 -0300 |
commit | cebf33d7109e0157a80f34d6136e212f0a28d274 (patch) | |
tree | a6464302c970f72581105b50ff0896e1f56def3d /community/kmymoney/git-fixes.diff | |
parent | 1a65caeb80e2cc8c7b39262d72255124d0c8614e (diff) | |
parent | 5cb95ceee39e4691f768ea2fef60b8a106e92209 (diff) |
Merge branch 'master' of gparabola:abslibre-mips64el
Diffstat (limited to 'community/kmymoney/git-fixes.diff')
-rw-r--r-- | community/kmymoney/git-fixes.diff | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/community/kmymoney/git-fixes.diff b/community/kmymoney/git-fixes.diff new file mode 100644 index 000000000..21b0e2330 --- /dev/null +++ b/community/kmymoney/git-fixes.diff @@ -0,0 +1,43 @@ +commit 77209f84a85360e98d2e805d412956a8f2a77db3 +Author: Alex Merry <kde@randomguy3.me.uk> +Date: Fri Feb 1 15:31:54 2013 +0000 + + Fix build with GMP 5.1.0 + + GMP 5.1.0 no longer has implicit conversions to mpz_class from mpq_class + or mpf_class. So we have to have an explicit conversion. + + BUG: 312481 + +diff --git a/kmymoney/mymoney/mymoneymoney.cpp b/kmymoney/mymoney/mymoneymoney.cpp +index aeed135..5de7fa9 100644 +--- a/kmymoney/mymoney/mymoneymoney.cpp ++++ b/kmymoney/mymoney/mymoneymoney.cpp +@@ -158,7 +158,7 @@ QString MyMoneyMoney::formatMoney(const QString& currency, const int prec, bool + // be much better than using KGlobal::locale()->formatMoney. + bool bNegative = false; + mpz_class left = value / static_cast<MyMoneyMoney>(convertDenominator(d)).valueRef().get_den(); +- mpz_class right = (valueRef() - mpq_class(left)) * denom; ++ mpz_class right = mpz_class((valueRef() - mpq_class(left)) * denom); + + if (right < 0) { + right = -right; +commit 9b6f96a38b8c84cb87bb07165b503acbe5ea81ff +Author: Christoph Feck <christoph@maxiom.de> +Date: Fri Mar 23 23:05:19 2012 +0100 + + Fix includes + +diff --git a/kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp b/kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp +index ff217e3..d31bb02 100644 +--- a/kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp ++++ b/kmymoney/mymoney/storage/mymoneydatabasemgrtest.cpp +@@ -16,6 +16,7 @@ + + #include "mymoneydatabasemgrtest.h" + #include <pwd.h> ++#include <unistd.h> + #include <iostream> + + #include <QtTest/QtTest> + |