Hello community, here is the log from the commit of package kmymoney for openSUSE:Factory checked in at 2013-03-21 10:38:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmymoney (Old) and /work/SRC/openSUSE:Factory/.kmymoney.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmymoney", Maintainer is "kde-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kmymoney/kmymoney.changes 2013-01-08 14:31:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kmymoney.new/kmymoney.changes 2013-03-21 10:38:54.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Mar 10 15:55:17 UTC 2013 - nico.kru...@gmail.com + +- fix build with gmp 5.1.0 (file fix-build-with-gmp-510.diff) + +------------------------------------------------------------------- New: ---- fix-build-with-gmp-510.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmymoney.spec ++++++ --- /var/tmp/diff_new_pack.VhUdNy/_old 2013-03-21 10:38:56.000000000 +0100 +++ /var/tmp/diff_new_pack.VhUdNy/_new 2013-03-21 10:38:56.000000000 +0100 @@ -24,6 +24,8 @@ Group: Productivity/Office/Finance Url: http://kmymoney2.sourceforge.net/ Source0: http://downloads.sourceforge.net/kmymoney2/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM fix-build-with-gmp-510.diff [bko#312481] -- fix build with gmp >= 5.1.0 +Patch0: fix-build-with-gmp-510.diff BuildRequires: aqbanking-devel BuildRequires: boost-devel BuildRequires: fdupes @@ -71,6 +73,7 @@ %prep %setup -q +%patch0 -p1 %build %cmake_kde4 -d build ++++++ fix-build-with-gmp-510.diff ++++++ commit 2ef6aa38ae87c7685c9f32c0cabd0241d3a7a306 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 (cherry picked from commit 77209f84a85360e98d2e805d412956a8f2a77db3) diff --git a/kmymoney/mymoney/mymoneymoney.cpp b/kmymoney/mymoney/mymoneymoney.cpp index 23620db..e3f90dc 100644 --- a/kmymoney/mymoney/mymoneymoney.cpp +++ b/kmymoney/mymoney/mymoneymoney.cpp @@ -164,7 +164,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; -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
