summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2011-08-08 21:44:02 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2011-08-08 21:44:02 +0000
commitab91d184d17672dd17441988da550d10e09d9b55 (patch)
tree5da9ba52c13a604aa4f67813fead03dd0e74e46b
parentHard-disable tests, as the required directories are not included in the tarba... (diff)
downloadgentoo-2-ab91d184d17672dd17441988da550d10e09d9b55.tar.gz
gentoo-2-ab91d184d17672dd17441988da550d10e09d9b55.tar.bz2
gentoo-2-ab91d184d17672dd17441988da550d10e09d9b55.zip
Fix tests, bug 376763
(Portage version: 2.1.10.10/cvs/Linux x86_64)
-rw-r--r--media-libs/libkgeomap/ChangeLog6
-rw-r--r--media-libs/libkgeomap/files/libkgeomap-2.0.0-tests.patch12
-rw-r--r--media-libs/libkgeomap/libkgeomap-2.0.0.ebuild6
3 files changed, 21 insertions, 3 deletions
diff --git a/media-libs/libkgeomap/ChangeLog b/media-libs/libkgeomap/ChangeLog
index 6c3bfc626874..df1a55f95a84 100644
--- a/media-libs/libkgeomap/ChangeLog
+++ b/media-libs/libkgeomap/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/libkgeomap
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libkgeomap/ChangeLog,v 1.1 2011/07/29 19:13:27 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libkgeomap/ChangeLog,v 1.2 2011/08/08 21:44:02 dilfridge Exp $
+
+ 08 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+ libkgeomap-2.0.0.ebuild, +files/libkgeomap-2.0.0-tests.patch:
+ Fix tests, bug 376763
*libkgeomap-2.0.0 (29 Jul 2011)
diff --git a/media-libs/libkgeomap/files/libkgeomap-2.0.0-tests.patch b/media-libs/libkgeomap/files/libkgeomap-2.0.0-tests.patch
new file mode 100644
index 000000000000..b06a624db03d
--- /dev/null
+++ b/media-libs/libkgeomap/files/libkgeomap-2.0.0-tests.patch
@@ -0,0 +1,12 @@
+diff -ruN digikam-2.0.0.orig/extra/libkgeomap/test/CMakeLists.txt digikam-2.0.0/extra/libkgeomap/test/CMakeLists.txt
+--- digikam-2.0.0.orig/extra/libkgeomap/test/CMakeLists.txt 2011-07-28 01:27:44.000000000 +0200
++++ digikam-2.0.0/extra/libkgeomap/test/CMakeLists.txt 2011-08-08 23:40:38.077189447 +0200
+@@ -59,7 +59,7 @@
+ test_tileindex.cpp
+ )
+ KDE4_ADD_EXECUTABLE(kgeomap_test_tileindex ${test_tileindex_sources})
+- TARGET_LINK_LIBRARIES(kgeomap_test_tileindex kgeomap ${QT_QTTEST_LIBRARY})
++ TARGET_LINK_LIBRARIES(kgeomap_test_tileindex kgeomap ${QT_QTTEST_LIBRARY} ${KDE4_KDECORE_LIBS})
+ ADD_TEST(kgeomap_test_tileindex ${EXECUTABLE_OUTPUT_PATH}/kgeomap_test_tileindex)
+
+ # test the LookupAltitudeGeonames class
diff --git a/media-libs/libkgeomap/libkgeomap-2.0.0.ebuild b/media-libs/libkgeomap/libkgeomap-2.0.0.ebuild
index c075dcd68317..3262aefa2f67 100644
--- a/media-libs/libkgeomap/libkgeomap-2.0.0.ebuild
+++ b/media-libs/libkgeomap/libkgeomap-2.0.0.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/media-libs/libkgeomap/libkgeomap-2.0.0.ebuild,v 1.1 2011/07/29 19:13:27 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libkgeomap/libkgeomap-2.0.0.ebuild,v 1.2 2011/08/08 21:44:02 dilfridge Exp $
EAPI=4
@@ -29,5 +29,7 @@ RDEPEND=${DEPEND}
S="${WORKDIR}/${MY_P}/extra/${PN}"
+PATCHES=( "${FILESDIR}/${P}-tests.patch" )
+
# bug 376763
-RESTRICT="test"
+#RESTRICT="test"