diff options
Diffstat (limited to 'app-office/kmymoney')
-rw-r--r-- | app-office/kmymoney/ChangeLog | 10 | ||||
-rw-r--r-- | app-office/kmymoney/files/kmymoney-4.6.3-gmp-5.1.0.patch | 29 | ||||
-rw-r--r-- | app-office/kmymoney/kmymoney-4.6.3-r1.ebuild | 79 |
3 files changed, 116 insertions, 2 deletions
diff --git a/app-office/kmymoney/ChangeLog b/app-office/kmymoney/ChangeLog index 4c70e9a2b0af..dab988dc5be6 100644 --- a/app-office/kmymoney/ChangeLog +++ b/app-office/kmymoney/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-office/kmymoney -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/ChangeLog,v 1.43 2012/11/14 20:00:20 johu Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/ChangeLog,v 1.44 2013/02/02 15:53:25 kensington Exp $ + +*kmymoney-4.6.3-r1 (02 Feb 2013) + + 02 Feb 2013; Michael Palimaka <kensington@gentoo.org> + +files/kmymoney-4.6.3-gmp-5.1.0.patch, +kmymoney-4.6.3-r1.ebuild: + Backport patch from upstream to fix build with gmp-5.1.0 wrt bug #448842. 14 Nov 2012; Johannes Huber <johu@gentoo.org> -files/kmymoney-4.6.1-qt48.patch, diff --git a/app-office/kmymoney/files/kmymoney-4.6.3-gmp-5.1.0.patch b/app-office/kmymoney/files/kmymoney-4.6.3-gmp-5.1.0.patch new file mode 100644 index 000000000000..6e6752709352 --- /dev/null +++ b/app-office/kmymoney/files/kmymoney-4.6.3-gmp-5.1.0.patch @@ -0,0 +1,29 @@ +From 77209f84a85360e98d2e805d412956a8f2a77db3 Mon Sep 17 00:00:00 2001 +From: Alex Merry <kde@randomguy3.me.uk> +Date: Fri, 1 Feb 2013 15:31:54 +0000 +Subject: [PATCH] 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 +--- + kmymoney/mymoney/mymoneymoney.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +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; +-- +1.8.1.2 + diff --git a/app-office/kmymoney/kmymoney-4.6.3-r1.ebuild b/app-office/kmymoney/kmymoney-4.6.3-r1.ebuild new file mode 100644 index 000000000000..346e2a32ba42 --- /dev/null +++ b/app-office/kmymoney/kmymoney-4.6.3-r1.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/kmymoney-4.6.3-r1.ebuild,v 1.1 2013/02/02 15:53:25 kensington Exp $ + +EAPI=5 +KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et eu fi fr ga gl +hu it ja kk lt ms nds nl pl pt pt_BR ro ru sk sv tr ug uk zh_CN zh_TW" +KDE_DOC_DIRS="doc doc-translations/%lingua_${PN}" +KDE_HANDBOOK="optional" +CPPUNIT_REQUIRED="test" +VIRTUALX_REQUIRED="test" +VIRTUALDBUS_TEST="true" + +inherit kde4-base + +DESCRIPTION="Personal finance manager for KDE" +HOMEPAGE="http://kmymoney2.sourceforge.net/" +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://sourceforge/kmymoney2/${P}.tar.bz2" +fi + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +SLOT="4" +IUSE="debug calendar doc hbci ofx quotes" + +COMMON_DEPEND=" + app-crypt/gpgme + >=app-office/libalkimia-4.3.2 + dev-cpp/glibmm:2 + dev-cpp/libxmlpp:2.6 + dev-libs/boost + dev-libs/glib:2 + dev-libs/gmp + dev-libs/libgpg-error + dev-libs/libxml2 + $(add_kdebase_dep kdepimlibs) + x11-misc/shared-mime-info + calendar? ( dev-libs/libical ) + hbci? ( + >=net-libs/aqbanking-5.0.1 + >=sys-libs/gwenhywfar-4.0.1[qt4] + ) + ofx? ( >=dev-libs/libofx-0.9.4 ) +" +RDEPEND="${COMMON_DEPEND} + quotes? ( dev-perl/Finance-Quote ) +" +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" + +PATCHES=( + "${FILESDIR}/${PN}-4.6.2-gcc-4.7.patch" + "${FILESDIR}/${PN}-4.6.3-gmp-5.1.0.patch" +) + +src_configure() { + mycmakeargs=( + -DUSE_QT_DESIGNER=OFF + $(cmake-utils_use_enable calendar LIBICAL) + $(cmake-utils_use_use doc DEVELOPER_DOC) + $(cmake-utils_use_enable hbci KBANKING) + $(cmake-utils_use_enable ofx LIBOFX) + ) + kde4-base_src_configure +} + +src_compile() { + kde4-base_src_compile + + use doc && kde4-base_src_compile apidoc +} + +src_install() { + use doc && HTML_DOCS=("${CMAKE_BUILD_DIR}/apidocs/html/") + kde4-base_src_install +} |