Date: Monday, July 8, 2013 @ 12:05:54 Author: lcarlier Revision: 93654
archrelease: copy trunk to community-staging-i686, community-staging-x86_64 Added: kmymoney/repos/community-staging-i686/ kmymoney/repos/community-staging-i686/PKGBUILD (from rev 93653, kmymoney/trunk/PKGBUILD) kmymoney/repos/community-staging-i686/git-fixes.diff (from rev 93653, kmymoney/trunk/git-fixes.diff) kmymoney/repos/community-staging-i686/kmymoney.changelog (from rev 93653, kmymoney/trunk/kmymoney.changelog) kmymoney/repos/community-staging-i686/kmymoney.install (from rev 93653, kmymoney/trunk/kmymoney.install) kmymoney/repos/community-staging-x86_64/ kmymoney/repos/community-staging-x86_64/PKGBUILD (from rev 93653, kmymoney/trunk/PKGBUILD) kmymoney/repos/community-staging-x86_64/git-fixes.diff (from rev 93653, kmymoney/trunk/git-fixes.diff) kmymoney/repos/community-staging-x86_64/kmymoney.changelog (from rev 93653, kmymoney/trunk/kmymoney.changelog) kmymoney/repos/community-staging-x86_64/kmymoney.install (from rev 93653, kmymoney/trunk/kmymoney.install) ---------------------------------------------+ community-staging-i686/PKGBUILD | 49 ++++++++++++++++++++++++++ community-staging-i686/git-fixes.diff | 43 ++++++++++++++++++++++ community-staging-i686/kmymoney.changelog | 32 ++++++++++++++++ community-staging-i686/kmymoney.install | 13 ++++++ community-staging-x86_64/PKGBUILD | 49 ++++++++++++++++++++++++++ community-staging-x86_64/git-fixes.diff | 43 ++++++++++++++++++++++ community-staging-x86_64/kmymoney.changelog | 32 ++++++++++++++++ community-staging-x86_64/kmymoney.install | 13 ++++++ 8 files changed, 274 insertions(+) Copied: kmymoney/repos/community-staging-i686/PKGBUILD (from rev 93653, kmymoney/trunk/PKGBUILD) =================================================================== --- community-staging-i686/PKGBUILD (rev 0) +++ community-staging-i686/PKGBUILD 2013-07-08 10:05:54 UTC (rev 93654) @@ -0,0 +1,49 @@ +# $Id$ +# Maintainer: Jaroslav Lichtblau <dragonl...@aur.archlinux.org> +# Maintainer: Laurent Carlier <lordhea...@gmail.com> +# Contributor: Vamp898 <vamp...@web.de> +# Contributor: Jaroslaw Swierczynski <swier...@aur.archlinux.org> +# Contributor: Eric Belanger <e...@archlinux.org> +# Contributor: Todd Maynard <a...@toddmaynard.com> + +pkgname=kmymoney +pkgver=4.6.3 +pkgrel=3 +pkgdesc="Personal finance manager for KDE which operates similarly to MS-Money or Quicken" +arch=('i686' 'x86_64') +url="http://kmymoney2.sourceforge.net/" +license=('GPL') +depends=('kdebase-workspace' 'shared-mime-info' 'aqbanking' 'libofx' 'libalkimia' 'boost-libs') +makedepends=('cmake' 'automoc4' 'docbook-xml' 'docbook-xsl' 'boost') +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 +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + mkdir build + cd build + + cmake ../ \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_SKIP_RPATH=YES + make VERBOSE=1 +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}/build" + + make DESTDIR="${pkgdir}" install +} Copied: kmymoney/repos/community-staging-i686/git-fixes.diff (from rev 93653, kmymoney/trunk/git-fixes.diff) =================================================================== --- community-staging-i686/git-fixes.diff (rev 0) +++ community-staging-i686/git-fixes.diff 2013-07-08 10:05:54 UTC (rev 93654) @@ -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> + Copied: kmymoney/repos/community-staging-i686/kmymoney.changelog (from rev 93653, kmymoney/trunk/kmymoney.changelog) =================================================================== --- community-staging-i686/kmymoney.changelog (rev 0) +++ community-staging-i686/kmymoney.changelog 2013-07-08 10:05:54 UTC (rev 93654) @@ -0,0 +1,32 @@ +2012-09-09 Jaroslav Lichtblau <dragonl...@aur.archlinux.org> + * kmymoney 4.6.3-1 + +2012-08-09 Eric Belanger <e...@archlinux.org> + * kmymoney 4.6.2-2 + * Rebuild against libofx 0.9.5 + +2011-02-19 Jaroslav Lichtblau <dragonl...@aur.archlinux.org> + * kmymoney 4.5.3 + +2010-12-27 Jaroslav Lichtblau <dragonl...@aur.archlinux.org> + * kmymoney 4.5.2 + +2010-10-20 Jaroslav Lichtblau <dragonl...@aur.archlinux.org> + * kmymoney 4.5.1 + * Added aqbanking dependency + +2010-08-22 Jaroslav Lichtblau <dragonl...@aur.archlinux.org> + * Update to major release 4.5 + * Package renamed to 'kmymoney' + +2010-05-20 Jaroslav Lichtblau <dragonl...@aur.archlinux.org> + * Update to major release 1.0.5 + +2010-04-09 Jaroslav Lichtblau <dragonl...@aur.archlinux.org> + * Update to major release 1.0.4 + +2010-04-09 Jaroslav Lichtblau <dragonl...@aur.archlinux.org> + * FS#18974 broken OFX imported fixed in 1.0.3-2 + +2010-03-27 Jaroslav Lichtblau <dragonl...@aur.archlinux.org> + * Update to major release 1.0.3 Copied: kmymoney/repos/community-staging-i686/kmymoney.install (from rev 93653, kmymoney/trunk/kmymoney.install) =================================================================== --- community-staging-i686/kmymoney.install (rev 0) +++ community-staging-i686/kmymoney.install 2013-07-08 10:05:54 UTC (rev 93654) @@ -0,0 +1,13 @@ +post_install() { + update-mime-database usr/share/mime &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: kmymoney/repos/community-staging-x86_64/PKGBUILD (from rev 93653, kmymoney/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2013-07-08 10:05:54 UTC (rev 93654) @@ -0,0 +1,49 @@ +# $Id$ +# Maintainer: Jaroslav Lichtblau <dragonl...@aur.archlinux.org> +# Maintainer: Laurent Carlier <lordhea...@gmail.com> +# Contributor: Vamp898 <vamp...@web.de> +# Contributor: Jaroslaw Swierczynski <swier...@aur.archlinux.org> +# Contributor: Eric Belanger <e...@archlinux.org> +# Contributor: Todd Maynard <a...@toddmaynard.com> + +pkgname=kmymoney +pkgver=4.6.3 +pkgrel=3 +pkgdesc="Personal finance manager for KDE which operates similarly to MS-Money or Quicken" +arch=('i686' 'x86_64') +url="http://kmymoney2.sourceforge.net/" +license=('GPL') +depends=('kdebase-workspace' 'shared-mime-info' 'aqbanking' 'libofx' 'libalkimia' 'boost-libs') +makedepends=('cmake' 'automoc4' 'docbook-xml' 'docbook-xsl' 'boost') +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 +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + + mkdir build + cd build + + cmake ../ \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_SKIP_RPATH=YES + make VERBOSE=1 +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}/build" + + make DESTDIR="${pkgdir}" install +} Copied: kmymoney/repos/community-staging-x86_64/git-fixes.diff (from rev 93653, kmymoney/trunk/git-fixes.diff) =================================================================== --- community-staging-x86_64/git-fixes.diff (rev 0) +++ community-staging-x86_64/git-fixes.diff 2013-07-08 10:05:54 UTC (rev 93654) @@ -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> + Copied: kmymoney/repos/community-staging-x86_64/kmymoney.changelog (from rev 93653, kmymoney/trunk/kmymoney.changelog) =================================================================== --- community-staging-x86_64/kmymoney.changelog (rev 0) +++ community-staging-x86_64/kmymoney.changelog 2013-07-08 10:05:54 UTC (rev 93654) @@ -0,0 +1,32 @@ +2012-09-09 Jaroslav Lichtblau <dragonl...@aur.archlinux.org> + * kmymoney 4.6.3-1 + +2012-08-09 Eric Belanger <e...@archlinux.org> + * kmymoney 4.6.2-2 + * Rebuild against libofx 0.9.5 + +2011-02-19 Jaroslav Lichtblau <dragonl...@aur.archlinux.org> + * kmymoney 4.5.3 + +2010-12-27 Jaroslav Lichtblau <dragonl...@aur.archlinux.org> + * kmymoney 4.5.2 + +2010-10-20 Jaroslav Lichtblau <dragonl...@aur.archlinux.org> + * kmymoney 4.5.1 + * Added aqbanking dependency + +2010-08-22 Jaroslav Lichtblau <dragonl...@aur.archlinux.org> + * Update to major release 4.5 + * Package renamed to 'kmymoney' + +2010-05-20 Jaroslav Lichtblau <dragonl...@aur.archlinux.org> + * Update to major release 1.0.5 + +2010-04-09 Jaroslav Lichtblau <dragonl...@aur.archlinux.org> + * Update to major release 1.0.4 + +2010-04-09 Jaroslav Lichtblau <dragonl...@aur.archlinux.org> + * FS#18974 broken OFX imported fixed in 1.0.3-2 + +2010-03-27 Jaroslav Lichtblau <dragonl...@aur.archlinux.org> + * Update to major release 1.0.3 Copied: kmymoney/repos/community-staging-x86_64/kmymoney.install (from rev 93653, kmymoney/trunk/kmymoney.install) =================================================================== --- community-staging-x86_64/kmymoney.install (rev 0) +++ community-staging-x86_64/kmymoney.install 2013-07-08 10:05:54 UTC (rev 93654) @@ -0,0 +1,13 @@ +post_install() { + update-mime-database usr/share/mime &> /dev/null + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +}