diff options
Diffstat (limited to 'community/kmymoney')
| -rw-r--r-- | community/kmymoney/PKGBUILD | 18 | ||||
| -rw-r--r-- | community/kmymoney/git-fixes.diff | 43 | ||||
| -rw-r--r-- | community/kmymoney/kmymoney.changelog | 3 |
3 files changed, 8 insertions, 56 deletions
diff --git a/community/kmymoney/PKGBUILD b/community/kmymoney/PKGBUILD index 09b2154fa..1bcf25742 100644 --- a/community/kmymoney/PKGBUILD +++ b/community/kmymoney/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94028 2013-07-13 12:33:04Z svenstaro $ +# $Id: PKGBUILD 98121 2013-10-06 08:45:27Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Maintainer: Laurent Carlier <lordheavym@gmail.com> # Contributor: Vamp898 <vamp898@web.de> @@ -7,8 +7,8 @@ # Contributor: Todd Maynard <arch@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,16 +19,8 @@ replaces=('kmymoney2') 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') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np1 -i ../git-fixes.diff -} +source=(http://downloads.sourceforge.net/project/kmymoney2/KMyMoney-KDE4/$pkgver/$pkgname-$pkgver.tar.xz) +sha256sums=('89522fadb4a9f06f3f20e2d6ac47a147f70b4265abad2fdf3aa6672fe2a3c012') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/kmymoney/git-fixes.diff b/community/kmymoney/git-fixes.diff deleted file mode 100644 index 21b0e2330..000000000 --- a/community/kmymoney/git-fixes.diff +++ /dev/null @@ -1,43 +0,0 @@ -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> - diff --git a/community/kmymoney/kmymoney.changelog b/community/kmymoney/kmymoney.changelog index 30290a6f8..c57d5a2c0 100644 --- a/community/kmymoney/kmymoney.changelog +++ b/community/kmymoney/kmymoney.changelog @@ -1,3 +1,6 @@ +2013-10-06 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * kmymoney 4.6.4-1 + 2012-09-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * kmymoney 4.6.3-1 |