Date: Monday, May 13, 2013 @ 22:24:59 Author: lcarlier Revision: 90777
upgpkg: kmymoney 4.6.3-2 libical rebuild Added: kmymoney/trunk/git-fixes.diff Modified: kmymoney/trunk/PKGBUILD ----------------+ PKGBUILD | 14 +++++++++++--- git-fixes.diff | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-05-13 19:24:25 UTC (rev 90776) +++ PKGBUILD 2013-05-13 20:24:59 UTC (rev 90777) @@ -8,7 +8,7 @@ pkgname=kmymoney pkgver=4.6.3 -pkgrel=1 +pkgrel=2 pkgdesc="Personal finance manager for KDE which operates similarly to MS-Money or Quicken" arch=('i686' 'x86_64') url="http://kmymoney2.sourceforge.net/" @@ -19,9 +19,17 @@ install=$pkgname.install changelog=$pkgname.changelog options=('!makeflags') -source=(http://downloads.sourceforge.net/project/kmymoney2/KMyMoney-KDE4/$pkgver/$pkgname-$pkgver.tar.bz2) -sha256sums=('94e109992b7e9ebb066b608d56c168216b8a944d62538c95176bc36ea4db542e') +source=(http://downloads.sourceforge.net/project/kmymoney2/KMyMoney-KDE4/$pkgver/$pkgname-$pkgver.tar.bz2 + git-fixes.diff) +sha256sums=('94e109992b7e9ebb066b608d56c168216b8a944d62538c95176bc36ea4db542e' + 'e618cc5531f00c14171c5cae837d8b5fb58bccaac363a5b09eed863355c242d3') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np1 -i ../git-fixes.diff +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" Added: git-fixes.diff =================================================================== --- git-fixes.diff (rev 0) +++ git-fixes.diff 2013-05-13 20:24:59 UTC (rev 90777) @@ -0,0 +1,43 @@ +commit 77209f84a85360e98d2e805d412956a8f2a77db3 +Author: Alex Merry <k...@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 <christ...@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> +