From owner-svn-ports-head@FreeBSD.ORG  Thu Mar  7 16:13:36 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 66081885;
 Thu,  7 Mar 2013 16:13:36 +0000 (UTC) (envelope-from dbn@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 413AD31B;
 Thu,  7 Mar 2013 16:13:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r27GDamd018890;
 Thu, 7 Mar 2013 16:13:36 GMT (envelope-from dbn@svn.freebsd.org)
Received: (from dbn@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r27GDaPf018889;
 Thu, 7 Mar 2013 16:13:36 GMT (envelope-from dbn@svn.freebsd.org)
Message-Id: <201303071613.r27GDaPf018889@svn.freebsd.org>
From: David Naylor <dbn@FreeBSD.org>
Date: Thu, 7 Mar 2013 16:13:36 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r313598 - head/finance/kmymoney-kde4/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Mar 2013 16:13:36 -0000

Author: dbn
Date: Thu Mar  7 16:13:35 2013
New Revision: 313598
URL: http://svnweb.freebsd.org/changeset/ports/313598

Log:
  Back-port commit 77209f84: Fix build (of finance/kmymoney-kde4) 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.
  """
  
  Approved by:	bdrewery (mentor), jhale (maintainer timeout: 2 weeks)

Added:
  head/finance/kmymoney-kde4/files/patch-kmymoney_mymoney_mymoneymoney.cpp   (contents, props changed)

Added: head/finance/kmymoney-kde4/files/patch-kmymoney_mymoney_mymoneymoney.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/finance/kmymoney-kde4/files/patch-kmymoney_mymoney_mymoneymoney.cpp	Thu Mar  7 16:13:35 2013	(r313598)
@@ -0,0 +1,24 @@
+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
+--- kmymoney/mymoney/mymoneymoney.cpp
++++ 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;