summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2011-08-06 20:20:58 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2011-08-06 20:20:58 +0000
commit8dcc8656145df4cc16b5ab1b031cd299c2d4fb4c (patch)
tree8c23a2a8a3612e3d96f4d1f81fadee31a7f88222 /app-office/kmymoney
parentVersion bump (diff)
downloadgentoo-2-8dcc8656145df4cc16b5ab1b031cd299c2d4fb4c.tar.gz
gentoo-2-8dcc8656145df4cc16b5ab1b031cd299c2d4fb4c.tar.bz2
gentoo-2-8dcc8656145df4cc16b5ab1b031cd299c2d4fb4c.zip
Fix underlinking, bug 369443
(Portage version: 2.1.10.10/cvs/Linux x86_64)
Diffstat (limited to 'app-office/kmymoney')
-rw-r--r--app-office/kmymoney/ChangeLog6
-rw-r--r--app-office/kmymoney/files/kmymoney-4.5.3-underlinking.patch13
-rw-r--r--app-office/kmymoney/kmymoney-4.5.3.ebuild4
3 files changed, 21 insertions, 2 deletions
diff --git a/app-office/kmymoney/ChangeLog b/app-office/kmymoney/ChangeLog
index 86050b9154ac..56f62197b391 100644
--- a/app-office/kmymoney/ChangeLog
+++ b/app-office/kmymoney/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/kmymoney
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/ChangeLog,v 1.19 2011/03/13 16:04:31 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/ChangeLog,v 1.20 2011/08/06 20:20:58 dilfridge Exp $
+
+ 06 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> kmymoney-4.5.3.ebuild,
+ +files/kmymoney-4.5.3-underlinking.patch:
+ Fix underlinking, bug 369443
13 Mar 2011; Markos Chandras <hwoarang@gentoo.org> kmymoney-4.5.3.ebuild:
Stable on amd64 wrt bug #358517
diff --git a/app-office/kmymoney/files/kmymoney-4.5.3-underlinking.patch b/app-office/kmymoney/files/kmymoney-4.5.3-underlinking.patch
new file mode 100644
index 000000000000..77c2d2f6225f
--- /dev/null
+++ b/app-office/kmymoney/files/kmymoney-4.5.3-underlinking.patch
@@ -0,0 +1,13 @@
+diff -urN kmymoney-4.5.3.orig/kmymoney/mymoney/storage/CMakeLists.txt kmymoney-4.5.3/kmymoney/mymoney/storage/CMakeLists.txt
+--- kmymoney-4.5.3.orig/kmymoney/mymoney/storage/CMakeLists.txt 2011-02-12 10:05:48.000000000 +0100
++++ kmymoney-4.5.3/kmymoney/mymoney/storage/CMakeLists.txt 2011-08-06 22:12:57.501609127 +0200
+@@ -33,7 +33,8 @@
+ kde4_add_unit_test( mymoneydatabasemgrtest TESTNAME kmymoney-mymoneydatabasemgrtest ${mymoneydatabasemgrtest_SRCS} )
+ ADD_DEPENDENCIES( mymoneydatabasemgrtest kmymoney_base kmymoney_common kmm_storage )
+
+- target_link_libraries( mymoneydatabasemgrtest kmymoney_base kmymoney_common kmm_storage ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTSQL_LIBRARY} ${QT_QTTEST_LIBRARY} )
++ target_link_libraries( mymoneydatabasemgrtest kmymoney_base kmymoney_common kmm_storage ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTSQL_LIBRARY}
++ ${QT_QTXML_LIBRARY} ${QT_QTTEST_LIBRARY} )
+ ENDIF(NOT WIN32)
+
+ # MyMoneyMap
diff --git a/app-office/kmymoney/kmymoney-4.5.3.ebuild b/app-office/kmymoney/kmymoney-4.5.3.ebuild
index da05891d44fb..9e752a531689 100644
--- a/app-office/kmymoney/kmymoney-4.5.3.ebuild
+++ b/app-office/kmymoney/kmymoney-4.5.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/kmymoney-4.5.3.ebuild,v 1.4 2011/03/27 22:45:50 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/kmymoney/kmymoney-4.5.3.ebuild,v 1.5 2011/08/06 20:20:58 dilfridge Exp $
EAPI=3
@@ -45,6 +45,8 @@ DEPEND="${COMMON_DEPEND}
test? ( dev-util/cppunit )
"
+PATCHES=( "${FILESDIR}/${P}-underlinking.patch" )
+
src_configure() {
mycmakeargs=(
-DUSE_QT_DESIGNER=OFF