diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-08-06 17:14:38 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-08-06 17:14:38 +0000 |
| commit | 3ce7604def5c3d79e9d3a2a6477a13d07b1b9c41 (patch) | |
| tree | 3dcff9c834aea72be413c2a1adb4a221a8d8a055 /kde-base/kdepim-wizards | |
| parent | Version bump to be in sync with the rest; no code changes (diff) | |
| download | gentoo-2-3ce7604def5c3d79e9d3a2a6477a13d07b1b9c41.tar.gz gentoo-2-3ce7604def5c3d79e9d3a2a6477a13d07b1b9c41.tar.bz2 gentoo-2-3ce7604def5c3d79e9d3a2a6477a13d07b1b9c41.zip | |
Fix underlinking, bug 369307
(Portage version: 2.1.10.10/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/kdepim-wizards')
| -rw-r--r-- | kde-base/kdepim-wizards/ChangeLog | 7 | ||||
| -rw-r--r-- | kde-base/kdepim-wizards/files/kdepim-wizards-4.4.11.1-underlinking.patch | 40 | ||||
| -rw-r--r-- | kde-base/kdepim-wizards/kdepim-wizards-4.4.11.1.ebuild | 4 |
3 files changed, 49 insertions, 2 deletions
diff --git a/kde-base/kdepim-wizards/ChangeLog b/kde-base/kdepim-wizards/ChangeLog index ae1a14a52f48..817bd399f617 100644 --- a/kde-base/kdepim-wizards/ChangeLog +++ b/kde-base/kdepim-wizards/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for kde-base/kdepim-wizards # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/ChangeLog,v 1.177 2011/07/27 14:04:29 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/ChangeLog,v 1.178 2011/08/06 17:14:37 dilfridge Exp $ + + 06 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> + kdepim-wizards-4.4.11.1.ebuild, + +files/kdepim-wizards-4.4.11.1-underlinking.patch: + Fix underlinking, bug 369307 *kdepim-wizards-4.7.0 (27 Jul 2011) diff --git a/kde-base/kdepim-wizards/files/kdepim-wizards-4.4.11.1-underlinking.patch b/kde-base/kdepim-wizards/files/kdepim-wizards-4.4.11.1-underlinking.patch new file mode 100644 index 000000000000..780c5d6a5afa --- /dev/null +++ b/kde-base/kdepim-wizards/files/kdepim-wizards-4.4.11.1-underlinking.patch @@ -0,0 +1,40 @@ +diff -ruN kdepim-wizards-4.4.11.1.orig/wizards/CMakeLists.txt kdepim-wizards-4.4.11.1/wizards/CMakeLists.txt +--- kdepim-wizards-4.4.11.1.orig/wizards/CMakeLists.txt 2011-04-20 22:03:31.000000000 +0200 ++++ kdepim-wizards-4.4.11.1/wizards/CMakeLists.txt 2011-08-06 19:11:11.852576714 +0200 +@@ -22,7 +22,7 @@ + + kde4_add_executable(groupwarewizard ${groupwarewizard_SRCS}) + +- target_link_libraries(groupwarewizard ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS} ++ target_link_libraries(groupwarewizard ${QT_QTGUI_LIBRARY} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS} + kabcgroupwise kcalgroupwise + kcal_slox kabc_slox + kabckolab knoteskolab +@@ -44,7 +44,8 @@ + + kde4_add_executable(groupwisewizard ${groupwisewizard_SRCS}) + +- target_link_libraries(groupwisewizard ${KDEPIMLIBS_KPIMIDENTITIES_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KIDENTITIES_LIBS} kabcgroupwise kcalgroupwise ${KDEPIMLIBS_KCAL_LIBS} kdepim ) ++ target_link_libraries(groupwisewizard ${KDEPIMLIBS_KPIMIDENTITIES_LIBS} ${QT_QTGUI_LIBRARY} ++ ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KIDENTITIES_LIBS} kabcgroupwise kcalgroupwise ${KDEPIMLIBS_KCAL_LIBS} kdepim ) + + install(TARGETS groupwisewizard ${INSTALL_TARGETS_DEFAULT_ARGS}) + +@@ -60,7 +61,8 @@ + + kde4_add_executable(sloxwizard ${sloxwizard_SRCS}) + +- target_link_libraries(sloxwizard ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS} kcal_slox kabc_slox ${KDEPIMLIBS_KCAL_LIBS} ${KDEPIMLIBS_KABC_LIBS} kdepim ) ++ target_link_libraries(sloxwizard ${QT_QTGUI_LIBRARY} ${QT_QT3SUPPORT_LIBRARY} ${KDE4_KDECORE_LIBS} kcal_slox kabc_slox ${KDEPIMLIBS_KCAL_LIBS} ++ ${KDEPIMLIBS_KABC_LIBS} kdepim ) + + install(TARGETS sloxwizard ${INSTALL_TARGETS_DEFAULT_ARGS}) + +@@ -83,6 +85,7 @@ + kde4_add_executable(kolabwizard ${kolabwizard_SRCS}) + + target_link_libraries(kolabwizard ++ ${QT_QTGUI_LIBRARY} + ${QT_QT3SUPPORT_LIBRARY} + ${KDEPIMLIBS_KCAL_LIBS} + ${KDEPIMLIBS_KABC_LIBS} diff --git a/kde-base/kdepim-wizards/kdepim-wizards-4.4.11.1.ebuild b/kde-base/kdepim-wizards/kdepim-wizards-4.4.11.1.ebuild index 7f2c21674f59..010caed883aa 100644 --- a/kde-base/kdepim-wizards/kdepim-wizards-4.4.11.1.ebuild +++ b/kde-base/kdepim-wizards/kdepim-wizards-4.4.11.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/kde-base/kdepim-wizards/kdepim-wizards-4.4.11.1.ebuild,v 1.5 2011/06/01 19:39:56 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdepim-wizards/kdepim-wizards-4.4.11.1.ebuild,v 1.6 2011/08/06 17:14:37 dilfridge Exp $ EAPI=4 @@ -27,6 +27,8 @@ KMEXTRACTONLY=" kresources/slox/ " +PATCHES=( "${FILESDIR}/${P}-underlinking.patch" ) + src_prepare() { ln -s "${EKDEDIR}"/include/kdepim-kresources/{kabcsloxprefs.h,kcalsloxprefs.h} \ kresources/slox/ \ |