summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2011-08-06 17:27:50 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2011-08-06 17:27:50 +0000
commitadd5833dc4dbe51c4b1e6ccbd946232c34bed3be (patch)
treeed405ef0ce2100d773d8268744c3353eee103647 /app-office/libalkimia
parentFix underlinking, bug 369307 (diff)
downloadgentoo-2-add5833dc4dbe51c4b1e6ccbd946232c34bed3be.tar.gz
gentoo-2-add5833dc4dbe51c4b1e6ccbd946232c34bed3be.tar.bz2
gentoo-2-add5833dc4dbe51c4b1e6ccbd946232c34bed3be.zip
Fix underlinking of tests, bug 372063
(Portage version: 2.1.10.10/cvs/Linux x86_64)
Diffstat (limited to 'app-office/libalkimia')
-rw-r--r--app-office/libalkimia/ChangeLog6
-rw-r--r--app-office/libalkimia/files/libalkimia-4.3.1-underlinking.patch13
-rw-r--r--app-office/libalkimia/libalkimia-4.3.1.ebuild7
3 files changed, 23 insertions, 3 deletions
diff --git a/app-office/libalkimia/ChangeLog b/app-office/libalkimia/ChangeLog
index 0203d48826de..a085383cda3c 100644
--- a/app-office/libalkimia/ChangeLog
+++ b/app-office/libalkimia/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/libalkimia
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libalkimia/ChangeLog,v 1.2 2011/08/01 21:06:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libalkimia/ChangeLog,v 1.3 2011/08/06 17:27:50 dilfridge Exp $
+
+ 06 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ libalkimia-4.3.1.ebuild, +files/libalkimia-4.3.1-underlinking.patch:
+ Fix underlinking of tests, bug 372063
*libalkimia-4.3.1 (01 Aug 2011)
diff --git a/app-office/libalkimia/files/libalkimia-4.3.1-underlinking.patch b/app-office/libalkimia/files/libalkimia-4.3.1-underlinking.patch
new file mode 100644
index 000000000000..8a8f3fdb1297
--- /dev/null
+++ b/app-office/libalkimia/files/libalkimia-4.3.1-underlinking.patch
@@ -0,0 +1,13 @@
+diff -ruN libalkimia-4.3.1.orig/CMakeLists.txt libalkimia-4.3.1/CMakeLists.txt
+--- libalkimia-4.3.1.orig/CMakeLists.txt 2011-08-01 12:14:46.000000000 +0200
++++ libalkimia-4.3.1/CMakeLists.txt 2011-08-06 19:25:21.979577122 +0200
+@@ -106,7 +106,7 @@
+ kde4_add_unit_test( alkvaluetest TESTNAME alkimia-alkvalue ${alkvaluetest_SRCS} )
+ kde4_add_unit_test( alkquoteitemtest TESTNAME alkimia-alkquoteitem ${alkquoteitemtest_SRCS} )
+ kde4_add_unit_test( alkcompanytest TESTNAME alkimia-alkcompany ${alkcompanytest_SRCS} )
+-target_link_libraries( alkvaluetest alkimia ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} )
+-target_link_libraries( alkquoteitemtest alkimia ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} )
++target_link_libraries( alkvaluetest alkimia ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${GMP_LIBRARIES})
++target_link_libraries( alkquoteitemtest alkimia ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTTEST_LIBRARY} )
+ target_link_libraries( alkcompanytest alkimia ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} )
+
diff --git a/app-office/libalkimia/libalkimia-4.3.1.ebuild b/app-office/libalkimia/libalkimia-4.3.1.ebuild
index 35e99ccb3e6d..2ab6f1359479 100644
--- a/app-office/libalkimia/libalkimia-4.3.1.ebuild
+++ b/app-office/libalkimia/libalkimia-4.3.1.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/libalkimia/libalkimia-4.3.1.ebuild,v 1.1 2011/08/01 21:06:56 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libalkimia/libalkimia-4.3.1.ebuild,v 1.2 2011/08/06 17:27:50 dilfridge Exp $
EAPI=4
@@ -20,7 +20,10 @@ DEPEND="${RDEPEND}
dev-util/pkgconfig
doc? ( app-doc/doxygen )"
-PATCHES=( "${FILESDIR}/${PN}-4.3.1-doc.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-4.3.1-doc.patch"
+ "${FILESDIR}/${PN}-4.3.1-underlinking.patch"
+)
src_configure() {
mycmakeargs=( $(cmake-utils_use_build doc) )