Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bird/PKGBUILD
	community/drbd/PKGBUILD
	community/etherape/PKGBUILD
	community/ext4magic/PKGBUILD
	community/fcron/PKGBUILD
	community/fcron/systab.orig
	community/gnome-panel/PKGBUILD
	community/libident/PKGBUILD
	community/libtorrent/PKGBUILD
	community/linux-tools/PKGBUILD
	community/linux-tools/usbipd.service
	community/makedev/PKGBUILD
	community/minbif/PKGBUILD
	community/noip/PKGBUILD
	community/notmuch/PKGBUILD
	community/pam_pwcheck/PKGBUILD
	community/pound/PKGBUILD
	community/preload/PKGBUILD
	community/python-cchardet/PKGBUILD
	community/rtorrent/PKGBUILD
	community/tor/PKGBUILD
	community/ude/PKGBUILD
	core/openldap/PKGBUILD
	core/sysvinit/PKGBUILD
	extra/cd-discid/PKGBUILD
	extra/cvs/PKGBUILD
	extra/epiphany-extensions/PKGBUILD
	extra/fbset/PKGBUILD
	extra/fluidsynth/PKGBUILD
	extra/gtkmm/PKGBUILD
	extra/gvfs/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/libical/PKGBUILD
	extra/mutt/PKGBUILD
	extra/netkit-bsd-finger/PKGBUILD
	extra/ossp/PKGBUILD
	extra/php/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/rtkit/PKGBUILD
	extra/samba/PKGBUILD
	extra/totem/PKGBUILD
	extra/webkitgtk/PKGBUILD
	libre/liferea-libre/PKGBUILD
	libre/mplayer-vaapi-libre/PKGBUILD

2 files changed, 55 insertions, 4 deletions

diff --git a/community/kmymoney/PKGBUILD b/community/kmymoney/PKGBUILD
index ae0c29e01..c452c7218 100644
--- a/community/kmymoney/PKGBUILD
+++ b/community/kmymoney/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 76043 2012-09-09 20:57:42Z jlichtblau $
+# $Id: PKGBUILD 90852 2013-05-14 21:40:38Z andrea $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Vamp898 <vamp898@web.de>
@@ -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' 'mips64el')
 url="http://kmymoney2.sourceforge.net/"
@@ -19,8 +19,16 @@ replaces=('kmymoney2')
 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}"
diff --git a/community/kmymoney/git-fixes.diff b/community/kmymoney/git-fixes.diff
new file mode 100644
index 000000000..21b0e2330
--- /dev/null
+++ b/community/kmymoney/git-fixes.diff
@@ -0,0 +1,43 @@
+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>
+