diff options
author | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-08-11 20:05:44 +0000 |
---|---|---|
committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-08-11 20:05:44 +0000 |
commit | 1a532ab5fff3113f89398811a1276f68152a60ca (patch) | |
tree | d112e2726328abcdb2d760e8c4cf47c110303a09 /kde-base/kalarm | |
parent | Remove old (diff) | |
download | gentoo-2-1a532ab5fff3113f89398811a1276f68152a60ca.tar.gz gentoo-2-1a532ab5fff3113f89398811a1276f68152a60ca.tar.bz2 gentoo-2-1a532ab5fff3113f89398811a1276f68152a60ca.zip |
Fix underlinking, bug 369641
(Portage version: 2.1.10.10/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/kalarm')
-rw-r--r-- | kde-base/kalarm/ChangeLog | 6 | ||||
-rw-r--r-- | kde-base/kalarm/files/kalarm-4.4.11.1-underlinking.patch | 14 | ||||
-rw-r--r-- | kde-base/kalarm/kalarm-4.4.11.1-r1.ebuild | 7 |
3 files changed, 24 insertions, 3 deletions
diff --git a/kde-base/kalarm/ChangeLog b/kde-base/kalarm/ChangeLog index 44738bd2af5a..c4d9e7ce7d61 100644 --- a/kde-base/kalarm/ChangeLog +++ b/kde-base/kalarm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kalarm # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/ChangeLog,v 1.184 2011/08/11 19:56:13 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/ChangeLog,v 1.185 2011/08/11 20:05:44 dilfridge Exp $ + + 11 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> + kalarm-4.4.11.1-r1.ebuild, +files/kalarm-4.4.11.1-underlinking.patch: + Fix underlinking, bug 369641 11 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kalarm-4.4.11.1.ebuild: diff --git a/kde-base/kalarm/files/kalarm-4.4.11.1-underlinking.patch b/kde-base/kalarm/files/kalarm-4.4.11.1-underlinking.patch new file mode 100644 index 000000000000..87eadc8a38b8 --- /dev/null +++ b/kde-base/kalarm/files/kalarm-4.4.11.1-underlinking.patch @@ -0,0 +1,14 @@ +diff -ruN kalarm-4.4.11.1.orig/kalarm/CMakeLists.txt kalarm-4.4.11.1/kalarm/CMakeLists.txt +--- kalarm-4.4.11.1.orig/kalarm/CMakeLists.txt 2011-04-20 22:03:31.000000000 +0200 ++++ kalarm-4.4.11.1/kalarm/CMakeLists.txt 2011-08-11 22:03:27.096295681 +0200 +@@ -130,7 +130,9 @@ + + set_target_properties(kalarm_bin PROPERTIES OUTPUT_NAME kalarm) + +-target_link_libraries(kalarm_bin ${KDE4_KUTILS_LIBS} kalarm_resources kalarm_calendar ${KDEPIMLIBS_KCAL_LIBS} ${KDE4_KABC_LIBRARY} ${KDE4_KMIME_LIBRARY} ${KDEPIMLIBS_KPIMIDENTITIES_LIBS} ${KDEPIMLIBS_MAILTRANSPORT_LIBS} ${KDEPIMLIBS_KHOLIDAYS_LIBS} ${KDE4_PHONON_LIBS} ${X11_X11_LIB} kdepim) ++target_link_libraries(kalarm_bin ${KDE4_KUTILS_LIBS} kalarm_resources kalarm_calendar ${KDEPIMLIBS_KCAL_LIBS} ${KDE4_KABC_LIBRARY} ++ ${KDE4_KMIME_LIBRARY} ${KDEPIMLIBS_KPIMIDENTITIES_LIBS} ${KDEPIMLIBS_MAILTRANSPORT_LIBS} ${KDEPIMLIBS_KHOLIDAYS_LIBS} ++ ${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_KPIMUTILS_LIBS} ${KDE4_PHONON_LIBS} ${X11_X11_LIB} kdepim) + + install(TARGETS kalarm_bin ${INSTALL_TARGETS_DEFAULT_ARGS} ) + #endif (UNIX) diff --git a/kde-base/kalarm/kalarm-4.4.11.1-r1.ebuild b/kde-base/kalarm/kalarm-4.4.11.1-r1.ebuild index d6e950db9feb..126af1c21180 100644 --- a/kde-base/kalarm/kalarm-4.4.11.1-r1.ebuild +++ b/kde-base/kalarm/kalarm-4.4.11.1-r1.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/kalarm/kalarm-4.4.11.1-r1.ebuild,v 1.4 2011/06/01 19:37:09 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kalarm/kalarm-4.4.11.1-r1.ebuild,v 1.5 2011/08/11 20:05:44 dilfridge Exp $ EAPI=4 @@ -24,7 +24,10 @@ KMEXTRACTONLY=" kmail/ " -PATCHES=( "${FILESDIR}/${PN}-4.4.11.1-crash.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-4.4.11.1-crash.patch" + "${FILESDIR}/${PN}-4.4.11.1-underlinking.patch" +) src_configure() { mycmakeargs=( |