diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-12-27 12:23:55 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-12-27 12:23:55 +0000 |
| commit | f3ec8181399f9667de8b615f1f4f76f0da6d8290 (patch) | |
| tree | 10c50cf497ea31351aa1d246265aeff215757140 /kde-base | |
| parent | Version bump. Use upstream patch for XF86WWW and XF86Mail keyboard shortcuts. (diff) | |
| download | gentoo-2-f3ec8181399f9667de8b615f1f4f76f0da6d8290.tar.gz gentoo-2-f3ec8181399f9667de8b615f1f4f76f0da6d8290.tar.bz2 gentoo-2-f3ec8181399f9667de8b615f1f4f76f0da6d8290.zip | |
Fix test build problem, bug 393099
(Portage version: 2.1.10.41/cvs/Linux x86_64)
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/kscd/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kscd/files/kscd-4.7.3-underlinking.patch | 18 | ||||
| -rw-r--r-- | kde-base/kscd/kscd-4.7.3.ebuild | 5 | ||||
| -rw-r--r-- | kde-base/kscd/kscd-4.7.4.ebuild | 5 |
4 files changed, 27 insertions, 7 deletions
diff --git a/kde-base/kscd/ChangeLog b/kde-base/kscd/ChangeLog index 97662a03fa81..c14612072deb 100644 --- a/kde-base/kscd/ChangeLog +++ b/kde-base/kscd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kscd # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/ChangeLog,v 1.198 2011/12/18 19:46:32 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/ChangeLog,v 1.199 2011/12/27 12:23:55 dilfridge Exp $ + + 27 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org> kscd-4.7.3.ebuild, + +files/kscd-4.7.3-underlinking.patch, kscd-4.7.4.ebuild: + Fix test build problem, bug 393099 18 Dec 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kscd-4.6.5.ebuild: Drop KDE 4.6.5 diff --git a/kde-base/kscd/files/kscd-4.7.3-underlinking.patch b/kde-base/kscd/files/kscd-4.7.3-underlinking.patch new file mode 100644 index 000000000000..0b0baf5404a8 --- /dev/null +++ b/kde-base/kscd/files/kscd-4.7.3-underlinking.patch @@ -0,0 +1,18 @@ +--- kscd/tests/CMakeLists.txt ++++ kscd/tests/CMakeLists.txt +@@ -16,6 +16,7 @@ + + # libraries needed for HWControler tests + target_link_libraries(HWControler_test ++ ${KDE4_KDECORE_LIBS} + ${KDE4_SOLID_LIBS} + ${KDE4_PHONON_LIBS} + ${QT_QTTEST_LIBRARY} +@@ -26,6 +27,7 @@ + + # libraries needed for AudioCD tests + target_link_libraries(AudioCD_test ++ ${KDE4_KDECORE_LIBS} + ${KDE4_SOLID_LIBS} + ${KDE4_PHONON_LIBS} + ${QT_QTTEST_LIBRARY} diff --git a/kde-base/kscd/kscd-4.7.3.ebuild b/kde-base/kscd/kscd-4.7.3.ebuild index 7f7d92bfa9dc..b8e9cb8b86e9 100644 --- a/kde-base/kscd/kscd-4.7.3.ebuild +++ b/kde-base/kscd/kscd-4.7.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/kde-base/kscd/kscd-4.7.3.ebuild,v 1.4 2011/12/07 22:13:55 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/kscd-4.7.3.ebuild,v 1.5 2011/12/27 12:23:55 dilfridge Exp $ EAPI=4 @@ -19,8 +19,7 @@ DEPEND=" " RDEPEND="${DEPEND}" -RESTRICT="test" -# bug 393099 +PATCHES=( "${FILESDIR}/${PN}-4.7.3-underlinking.patch" ) KMEXTRACTONLY=" libkcompactdisc/ diff --git a/kde-base/kscd/kscd-4.7.4.ebuild b/kde-base/kscd/kscd-4.7.4.ebuild index d6904a1906b7..17a41ad40852 100644 --- a/kde-base/kscd/kscd-4.7.4.ebuild +++ b/kde-base/kscd/kscd-4.7.4.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/kde-base/kscd/kscd-4.7.4.ebuild,v 1.1 2011/12/11 18:52:16 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kscd/kscd-4.7.4.ebuild,v 1.2 2011/12/27 12:23:55 dilfridge Exp $ EAPI=4 @@ -19,8 +19,7 @@ DEPEND=" " RDEPEND="${DEPEND}" -RESTRICT="test" -# bug 393099 +PATCHES=( "${FILESDIR}/${PN}-4.7.3-underlinking.patch" ) KMEXTRACTONLY=" libkcompactdisc/ |