[arch-commits] Commit in kmymoney/repos (10 files)

2016-10-27 Thread Antonio Rojas 
Date: Thursday, October 27, 2016 @ 22:24:27
  Author: arojas
Revision: 193819

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  kmymoney/repos/community-staging-i686/
  kmymoney/repos/community-staging-i686/4.8_build.patch
(from rev 193818, kmymoney/trunk/4.8_build.patch)
  kmymoney/repos/community-staging-i686/PKGBUILD
(from rev 193818, kmymoney/trunk/PKGBUILD)
  kmymoney/repos/community-staging-i686/kmymoney-gpgme-1.7.patch
(from rev 193818, kmymoney/trunk/kmymoney-gpgme-1.7.patch)
  kmymoney/repos/community-staging-i686/kmymoney.changelog
(from rev 193818, kmymoney/trunk/kmymoney.changelog)
  kmymoney/repos/community-staging-x86_64/
  kmymoney/repos/community-staging-x86_64/4.8_build.patch
(from rev 193818, kmymoney/trunk/4.8_build.patch)
  kmymoney/repos/community-staging-x86_64/PKGBUILD
(from rev 193818, kmymoney/trunk/PKGBUILD)
  kmymoney/repos/community-staging-x86_64/kmymoney-gpgme-1.7.patch
(from rev 193818, kmymoney/trunk/kmymoney-gpgme-1.7.patch)
  kmymoney/repos/community-staging-x86_64/kmymoney.changelog
(from rev 193818, kmymoney/trunk/kmymoney.changelog)

---+
 community-staging-i686/4.8_build.patch|  210 
 community-staging-i686/PKGBUILD   |   53 +
 community-staging-i686/kmymoney-gpgme-1.7.patch   |   38 +++
 community-staging-i686/kmymoney.changelog |   57 +
 community-staging-x86_64/4.8_build.patch  |  210 
 community-staging-x86_64/PKGBUILD |   53 +
 community-staging-x86_64/kmymoney-gpgme-1.7.patch |   38 +++
 community-staging-x86_64/kmymoney.changelog   |   57 +
 8 files changed, 716 insertions(+)

Copied: kmymoney/repos/community-staging-i686/4.8_build.patch (from rev 193818, 
kmymoney/trunk/4.8_build.patch)
===
--- community-staging-i686/4.8_build.patch  (rev 0)
+++ community-staging-i686/4.8_build.patch  2016-10-27 22:24:27 UTC (rev 
193819)
@@ -0,0 +1,210 @@
+From: Cristian Oneț 
+Date: Thu, 16 Jun 2016 07:06:32 +
+Subject: Fix the tests of the 4.8 build.
+X-Git-Url: 
http://quickgit.kde.org/?p=kmymoney.git=commitdiff=29ab40829f86f6bd32229ededcc09bf2736e67bd
+---
+Fix the tests of the 4.8 build.
+
+Do this by backporting the change that is already in frameworks in commit 
77085ff468336f26f6bcf5f2a1a08e16409172e6. Did not use cherry pick because the 
testfile was moved in frameworks.
+
+BUG: 364355
+---
+
+
+--- a/kmymoney/mymoney/storage/mymoneymap.h
 b/kmymoney/mymoney/storage/mymoneymap.h
+@@ -195,7 +195,7 @@
+ that = *(dynamic_cast* >(const_cast* 
>(this)));
+   }
+ 
+-  inline size_t count(void) const {
++  inline int count(void) const {
+ return QMap::count();
+   }
+ 
+
+--- a/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp
 b/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp
+@@ -58,13 +58,13 @@
+   QCOMPARE(m->m_nextPayeeID, 0ul);
+   QCOMPARE(m->m_nextScheduleID, 0ul);
+   QCOMPARE(m->m_nextReportID, 0ul);
+-  QCOMPARE(m->m_institutionList.count(), 0ul);
+-  QCOMPARE(m->m_accountList.count(), 5ul);
+-  QCOMPARE(m->m_transactionList.count(), 0ul);
+-  QCOMPARE(m->m_transactionKeys.count(), 0ul);
+-  QCOMPARE(m->m_payeeList.count(), 0ul);
+-  QCOMPARE(m->m_tagList.count(), 0ul);
+-  QCOMPARE(m->m_scheduleList.count(), 0ul);
++  QCOMPARE(m->m_institutionList.count(), 0);
++  QCOMPARE(m->m_accountList.count(), 5);
++  QCOMPARE(m->m_transactionList.count(), 0);
++  QCOMPARE(m->m_transactionKeys.count(), 0);
++  QCOMPARE(m->m_payeeList.count(), 0);
++  QCOMPARE(m->m_tagList.count(), 0);
++  QCOMPARE(m->m_scheduleList.count(), 0);
+ 
+   QCOMPARE(m->m_dirty, false);
+   QCOMPARE(m->m_creationDate, QDate::currentDate());
+@@ -187,7 +187,7 @@
+ 
+   QCOMPARE(m->m_nextAccountID, 1ul);
+   QCOMPARE(m->dirty(), true);
+-  QCOMPARE(m->m_accountList.count(), static_cast(6));
++  QCOMPARE(m->m_accountList.count(), 6);
+   QCOMPARE(m->m_accountList["A01"].name(), QLatin1String("AccountName"));
+ }
+ 
+@@ -235,7 +235,7 @@
+   m->m_dirty = false;
+ 
+   QCOMPARE(m->m_nextAccountID, 2ul);
+-  QCOMPARE(m->m_accountList.count(), static_cast(7));
++  QCOMPARE(m->m_accountList.count(), 7);
+ 
+   // try to add account to undefined account
+   try {
+@@ -271,7 +271,7 @@
+   i.setName("Inst Name");
+ 
+   m->addInstitution(i);
+-  QCOMPARE(m->m_institutionList.count(), static_cast(1));
++  QCOMPARE(m->m_institutionList.count(), 1);
+   QCOMPARE(m->m_nextInstitutionID, 1ul);
+   QCOMPARE(m->m_institutionList["I01"].name(), QLatin1String("Inst 
Name"));
+ }
+@@ -950,11 +950,11 @@
+   // check that we can remove an unreferenced payee
+   MyMoneyPayee p = m->payee("P01");
+   try {
+-QCOMPARE(m->m_payeeList.count(), static_cast(1));
++

[arch-commits] Commit in kmymoney/repos (10 files)

2016-06-17 Thread Jaroslav Lichtblau 
Date: Saturday, June 18, 2016 @ 04:45:44
  Author: jlichtblau
Revision: 180411

archrelease: copy trunk to community-i686, community-x86_64

Added:
  kmymoney/repos/community-i686/4.8_build.patch
(from rev 180410, kmymoney/trunk/4.8_build.patch)
  kmymoney/repos/community-i686/PKGBUILD
(from rev 180410, kmymoney/trunk/PKGBUILD)
  kmymoney/repos/community-i686/kmymoney.changelog
(from rev 180410, kmymoney/trunk/kmymoney.changelog)
  kmymoney/repos/community-x86_64/4.8_build.patch
(from rev 180410, kmymoney/trunk/4.8_build.patch)
  kmymoney/repos/community-x86_64/PKGBUILD
(from rev 180410, kmymoney/trunk/PKGBUILD)
  kmymoney/repos/community-x86_64/kmymoney.changelog
(from rev 180410, kmymoney/trunk/kmymoney.changelog)
Deleted:
  kmymoney/repos/community-i686/PKGBUILD
  kmymoney/repos/community-i686/kmymoney.changelog
  kmymoney/repos/community-x86_64/PKGBUILD
  kmymoney/repos/community-x86_64/kmymoney.changelog

-+
 /PKGBUILD   |   98 +++
 /kmymoney.changelog |  108 +
 community-i686/4.8_build.patch  |  210 ++
 community-i686/PKGBUILD |   39 --
 community-i686/kmymoney.changelog   |   50 
 community-x86_64/4.8_build.patch|  210 ++
 community-x86_64/PKGBUILD   |   39 --
 community-x86_64/kmymoney.changelog |   54 
 8 files changed, 626 insertions(+), 182 deletions(-)

Copied: kmymoney/repos/community-i686/4.8_build.patch (from rev 180410, 
kmymoney/trunk/4.8_build.patch)
===
--- community-i686/4.8_build.patch  (rev 0)
+++ community-i686/4.8_build.patch  2016-06-18 04:45:44 UTC (rev 180411)
@@ -0,0 +1,210 @@
+From: Cristian Oneț 
+Date: Thu, 16 Jun 2016 07:06:32 +
+Subject: Fix the tests of the 4.8 build.
+X-Git-Url: 
http://quickgit.kde.org/?p=kmymoney.git=commitdiff=29ab40829f86f6bd32229ededcc09bf2736e67bd
+---
+Fix the tests of the 4.8 build.
+
+Do this by backporting the change that is already in frameworks in commit 
77085ff468336f26f6bcf5f2a1a08e16409172e6. Did not use cherry pick because the 
testfile was moved in frameworks.
+
+BUG: 364355
+---
+
+
+--- a/kmymoney/mymoney/storage/mymoneymap.h
 b/kmymoney/mymoney/storage/mymoneymap.h
+@@ -195,7 +195,7 @@
+ that = *(dynamic_cast* >(const_cast* 
>(this)));
+   }
+ 
+-  inline size_t count(void) const {
++  inline int count(void) const {
+ return QMap::count();
+   }
+ 
+
+--- a/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp
 b/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp
+@@ -58,13 +58,13 @@
+   QCOMPARE(m->m_nextPayeeID, 0ul);
+   QCOMPARE(m->m_nextScheduleID, 0ul);
+   QCOMPARE(m->m_nextReportID, 0ul);
+-  QCOMPARE(m->m_institutionList.count(), 0ul);
+-  QCOMPARE(m->m_accountList.count(), 5ul);
+-  QCOMPARE(m->m_transactionList.count(), 0ul);
+-  QCOMPARE(m->m_transactionKeys.count(), 0ul);
+-  QCOMPARE(m->m_payeeList.count(), 0ul);
+-  QCOMPARE(m->m_tagList.count(), 0ul);
+-  QCOMPARE(m->m_scheduleList.count(), 0ul);
++  QCOMPARE(m->m_institutionList.count(), 0);
++  QCOMPARE(m->m_accountList.count(), 5);
++  QCOMPARE(m->m_transactionList.count(), 0);
++  QCOMPARE(m->m_transactionKeys.count(), 0);
++  QCOMPARE(m->m_payeeList.count(), 0);
++  QCOMPARE(m->m_tagList.count(), 0);
++  QCOMPARE(m->m_scheduleList.count(), 0);
+ 
+   QCOMPARE(m->m_dirty, false);
+   QCOMPARE(m->m_creationDate, QDate::currentDate());
+@@ -187,7 +187,7 @@
+ 
+   QCOMPARE(m->m_nextAccountID, 1ul);
+   QCOMPARE(m->dirty(), true);
+-  QCOMPARE(m->m_accountList.count(), static_cast(6));
++  QCOMPARE(m->m_accountList.count(), 6);
+   QCOMPARE(m->m_accountList["A01"].name(), QLatin1String("AccountName"));
+ }
+ 
+@@ -235,7 +235,7 @@
+   m->m_dirty = false;
+ 
+   QCOMPARE(m->m_nextAccountID, 2ul);
+-  QCOMPARE(m->m_accountList.count(), static_cast(7));
++  QCOMPARE(m->m_accountList.count(), 7);
+ 
+   // try to add account to undefined account
+   try {
+@@ -271,7 +271,7 @@
+   i.setName("Inst Name");
+ 
+   m->addInstitution(i);
+-  QCOMPARE(m->m_institutionList.count(), static_cast(1));
++  QCOMPARE(m->m_institutionList.count(), 1);
+   QCOMPARE(m->m_nextInstitutionID, 1ul);
+   QCOMPARE(m->m_institutionList["I01"].name(), QLatin1String("Inst 
Name"));
+ }
+@@ -950,11 +950,11 @@
+   // check that we can remove an unreferenced payee
+   MyMoneyPayee p = m->payee("P01");
+   try {
+-QCOMPARE(m->m_payeeList.count(), static_cast(1));
++QCOMPARE(m->m_payeeList.count(), 1);
+ m->removePayee(p);
+ m->commitTransaction();
+ m->startTransaction();
+-QCOMPARE(m->m_payeeList.count(), static_cast(0));
++QCOMPARE(m->m_payeeList.count(), 0);
+ QCOMPARE(m->dirty(), true);
+   } catch (const MyMoneyException &) {
+

[arch-commits] Commit in kmymoney/repos (10 files)

2016-04-29 Thread Jaroslav Lichtblau 
Date: Friday, April 29, 2016 @ 21:12:21
  Author: jlichtblau
Revision: 172820

archrelease: copy trunk to community-i686, community-x86_64

Added:
  kmymoney/repos/community-i686/PKGBUILD
(from rev 172819, kmymoney/trunk/PKGBUILD)
  kmymoney/repos/community-i686/kmymoney.changelog
(from rev 172819, kmymoney/trunk/kmymoney.changelog)
  kmymoney/repos/community-x86_64/PKGBUILD
(from rev 172819, kmymoney/trunk/PKGBUILD)
  kmymoney/repos/community-x86_64/kmymoney.changelog
(from rev 172819, kmymoney/trunk/kmymoney.changelog)
Deleted:
  kmymoney/repos/community-i686/PKGBUILD
  kmymoney/repos/community-i686/kmymoney.changelog
  kmymoney/repos/community-i686/kmymoney.install
  kmymoney/repos/community-x86_64/PKGBUILD
  kmymoney/repos/community-x86_64/kmymoney.changelog
  kmymoney/repos/community-x86_64/kmymoney.install

-+
 /PKGBUILD   |   78 ++
 /kmymoney.changelog |  100 ++
 community-i686/PKGBUILD |   40 -
 community-i686/kmymoney.changelog   |   47 ---
 community-i686/kmymoney.install |   13 
 community-x86_64/PKGBUILD   |   40 -
 community-x86_64/kmymoney.changelog |   47 ---
 community-x86_64/kmymoney.install   |   13 
 8 files changed, 178 insertions(+), 200 deletions(-)

Deleted: community-i686/PKGBUILD
===
--- community-i686/PKGBUILD 2016-04-29 19:11:58 UTC (rev 172819)
+++ community-i686/PKGBUILD 2016-04-29 19:12:21 UTC (rev 172820)
@@ -1,40 +0,0 @@
-# $Id$
-# Maintainer: Jaroslav Lichtblau 
-# Maintainer: Laurent Carlier 
-# Contributor: Vamp898 
-# Contributor: Jaroslaw Swierczynski 
-# Contributor: Eric Belanger 
-# Contributor: Todd Maynard 
-
-pkgname=kmymoney
-pkgver=4.7.2
-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-runtime' 'shared-mime-info' 'aqbanking' 'libofx' 
'libalkimia' 'boost-libs' 'kdepimlibs4')
-makedepends=('cmake' 'automoc4' 'docbook-xml' 'docbook-xsl' 'boost' 'doxygen')
-replaces=('kmymoney2')
-install=$pkgname.install
-changelog=$pkgname.changelog
-source=(http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz)
-sha256sums=('bfb2c29ff30988f46324c2dae197a06b58d07336a1947adc22bcfed3e554393d')
-
-build() {
-  cd "${srcdir}"/$pkgname-$pkgver
-
-  mkdir build
-  cd build
-
-  cmake ../ \
--DCMAKE_INSTALL_PREFIX=/usr \
--DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_SKIP_RPATH=YES
-  make
-}
-
-package() {
-  cd "${srcdir}"/$pkgname-$pkgver/build
-
-  make DESTDIR="${pkgdir}" install
-}

Copied: kmymoney/repos/community-i686/PKGBUILD (from rev 172819, 
kmymoney/trunk/PKGBUILD)
===
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2016-04-29 19:12:21 UTC (rev 172820)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau 
+# Maintainer: Laurent Carlier 
+# Contributor: Vamp898 
+# Contributor: Jaroslaw Swierczynski 
+# Contributor: Eric Belanger 
+# Contributor: Todd Maynard 
+
+pkgname=kmymoney
+pkgver=4.7.2
+pkgrel=4
+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-runtime' 'shared-mime-info' 'aqbanking' 'libofx' 
'libalkimia' 'boost-libs' 'kdepimlibs4')
+makedepends=('cmake' 'automoc4' 'docbook-xml' 'docbook-xsl' 'boost' 'doxygen')
+replaces=('kmymoney2')
+changelog=$pkgname.changelog
+source=(http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz)
+sha256sums=('bfb2c29ff30988f46324c2dae197a06b58d07336a1947adc22bcfed3e554393d')
+
+build() {
+  cd "${srcdir}"/$pkgname-$pkgver
+
+  mkdir build
+  cd build
+
+  cmake ../ \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_SKIP_RPATH=YES
+  make
+}
+
+package() {
+  cd "${srcdir}"/$pkgname-$pkgver/build
+
+  make DESTDIR="${pkgdir}" install
+}

Deleted: community-i686/kmymoney.changelog
===
--- community-i686/kmymoney.changelog   2016-04-29 19:11:58 UTC (rev 172819)
+++ community-i686/kmymoney.changelog   2016-04-29 19:12:21 UTC (rev 172820)
@@ -1,47 +0,0 @@
-2016-01-09 Jaroslav Lichtblau 
-   * kmymoney 4.7.2-3 libical rebuild
-
-2015-04-28 Jaroslav Lichtblau 
-   * kmymoney

[arch-commits] Commit in kmymoney/repos (10 files)

2013-07-08 Thread Laurent Carlier 
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 +
+
+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_castMyMoneyMoney(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

[arch-commits] Commit in kmymoney/repos (10 files)

2013-05-13 Thread Laurent Carlier 
Date: Monday, May 13, 2013 @ 22:25:14
  Author: lcarlier
Revision: 90778

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 90777, kmymoney/trunk/PKGBUILD)
  kmymoney/repos/community-staging-i686/git-fixes.diff
(from rev 90777, kmymoney/trunk/git-fixes.diff)
  kmymoney/repos/community-staging-i686/kmymoney.changelog
(from rev 90777, kmymoney/trunk/kmymoney.changelog)
  kmymoney/repos/community-staging-i686/kmymoney.install
(from rev 90777, kmymoney/trunk/kmymoney.install)
  kmymoney/repos/community-staging-x86_64/
  kmymoney/repos/community-staging-x86_64/PKGBUILD
(from rev 90777, kmymoney/trunk/PKGBUILD)
  kmymoney/repos/community-staging-x86_64/git-fixes.diff
(from rev 90777, kmymoney/trunk/git-fixes.diff)
  kmymoney/repos/community-staging-x86_64/kmymoney.changelog
(from rev 90777, kmymoney/trunk/kmymoney.changelog)
  kmymoney/repos/community-staging-x86_64/kmymoney.install
(from rev 90777, 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 90777, 
kmymoney/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2013-05-13 20:25:14 UTC (rev 90778)
@@ -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=2
+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 90777, 
kmymoney/trunk/git-fixes.diff)
===
--- community-staging-i686/git-fixes.diff   (rev 0)
+++ community-staging-i686/git-fixes.diff   2013-05-13 20:25:14 UTC (rev 
90778)
@@ -0,0 +1,43 @@
+commit 77209f84a85360e98d2e805d412956a8f2a77db3
+Author: Alex Merry k...@randomguy3.me.uk
+Date:   Fri Feb 1 15:31:54 2013 +
+
+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_castMyMoneyMoney(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