Date: Sunday, October 6, 2013 @ 10:45:14 Author: jlichtblau Revision: 98120
upgpkg: kmymoney 4.6.4-1 Modified: kmymoney/trunk/PKGBUILD kmymoney/trunk/kmymoney.changelog Deleted: kmymoney/trunk/git-fixes.diff --------------------+ PKGBUILD | 16 ++++------------ git-fixes.diff | 43 ------------------------------------------- kmymoney.changelog | 3 +++ 3 files changed, 7 insertions(+), 55 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-10-06 08:35:43 UTC (rev 98119) +++ PKGBUILD 2013-10-06 08:45:14 UTC (rev 98120) @@ -7,8 +7,8 @@ # Contributor: Todd Maynard <a...@toddmaynard.com> pkgname=kmymoney -pkgver=4.6.3 -pkgrel=3 +pkgver=4.6.4 +pkgrel=1 pkgdesc="Personal finance manager for KDE which operates similarly to MS-Money or Quicken" arch=('i686' 'x86_64') url="http://kmymoney2.sourceforge.net/" @@ -19,17 +19,9 @@ install=$pkgname.install changelog=$pkgname.changelog options=('!makeflags') -source=(http://downloads.sourceforge.net/project/kmymoney2/KMyMoney-KDE4/$pkgver/$pkgname-$pkgver.tar.bz2 - git-fixes.diff) -sha256sums=('94e109992b7e9ebb066b608d56c168216b8a944d62538c95176bc36ea4db542e' - 'e618cc5531f00c14171c5cae837d8b5fb58bccaac363a5b09eed863355c242d3') +source=(http://downloads.sourceforge.net/project/kmymoney2/KMyMoney-KDE4/$pkgver/$pkgname-$pkgver.tar.xz) +sha256sums=('89522fadb4a9f06f3f20e2d6ac47a147f70b4265abad2fdf3aa6672fe2a3c012') -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np1 -i ../git-fixes.diff -} - build() { cd "${srcdir}/${pkgname}-${pkgver}" Deleted: git-fixes.diff =================================================================== --- git-fixes.diff 2013-10-06 08:35:43 UTC (rev 98119) +++ git-fixes.diff 2013-10-06 08:45:14 UTC (rev 98120) @@ -1,43 +0,0 @@ -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> - Modified: kmymoney.changelog =================================================================== --- kmymoney.changelog 2013-10-06 08:35:43 UTC (rev 98119) +++ kmymoney.changelog 2013-10-06 08:45:14 UTC (rev 98120) @@ -1,3 +1,6 @@ +2013-10-06 Jaroslav Lichtblau <dragonl...@aur.archlinux.org> + * kmymoney 4.6.4-1 + 2012-09-09 Jaroslav Lichtblau <dragonl...@aur.archlinux.org> * kmymoney 4.6.3-1