diff options
Diffstat (limited to 'kde-base')
-rw-r--r-- | kde-base/plasma/ChangeLog | 14 | ||||
-rw-r--r-- | kde-base/plasma/files/plasma-4.0.1-linkage.patch | 74 | ||||
-rw-r--r-- | kde-base/plasma/plasma-4.0.1.ebuild | 50 |
3 files changed, 13 insertions, 125 deletions
diff --git a/kde-base/plasma/ChangeLog b/kde-base/plasma/ChangeLog index cad61bb999cd..a2ddbb954660 100644 --- a/kde-base/plasma/ChangeLog +++ b/kde-base/plasma/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for kde-base/plasma # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma/ChangeLog,v 1.6 2008/03/11 00:03:59 philantrop Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma/ChangeLog,v 1.7 2008/03/20 18:24:08 ingmar Exp $ + + 20 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org> + -files/plasma-4.0.1-linkage.patch, -plasma-4.0.1.ebuild: + Old. + + 20 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org> + -files/plasma-4.0.1-linkage.patch, -plasma-4.0.1.ebuild: + Old. + + 20 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org> + -files/plasma-4.0.1-linkage.patch, -plasma-4.0.1.ebuild: + Old. *plasma-4.0.2 (10 Mar 2008) diff --git a/kde-base/plasma/files/plasma-4.0.1-linkage.patch b/kde-base/plasma/files/plasma-4.0.1-linkage.patch deleted file mode 100644 index 63b5593676b1..000000000000 --- a/kde-base/plasma/files/plasma-4.0.1-linkage.patch +++ /dev/null @@ -1,74 +0,0 @@ -Because we compile libplasma & plasma in seperate packages, -need to list the libraries we link to explicitly. -diff -ur kdebase-workspace-3.97.0.orig/plasma/animators/default/CMakeLists.txt kdebase-workspace-3.97.0/plasma/animators/default/CMakeLists.txt ---- kdebase-workspace-3.97.0.orig/plasma/animators/default/CMakeLists.txt 2007-12-09 06:57:13.000000000 +0100 -+++ kdebase-workspace-3.97.0/plasma/animators/default/CMakeLists.txt 2007-12-09 08:46:53.000000000 +0100 -@@ -3,7 +3,7 @@ - ) - - kde4_add_plugin(plasma_animator_default ${default_animator_SRCS}) --target_link_libraries(plasma_animator_default ${KDE4_KDECORE_LIBS} plasma) -+target_link_libraries(plasma_animator_default ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} plasma) - - install(TARGETS plasma_animator_default DESTINATION ${PLUGIN_INSTALL_DIR}) - install(FILES plasma-animator-default.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -diff -ur kdebase-workspace-3.97.0.orig/plasma/dataengines/filebrowser/CMakeLists.txt kdebase-workspace-3.97.0/plasma/dataengines/filebrowser/CMakeLists.txt ---- kdebase-workspace-3.97.0.orig/plasma/dataengines/filebrowser/CMakeLists.txt 2007-12-09 06:57:14.000000000 +0100 -+++ kdebase-workspace-3.97.0/plasma/dataengines/filebrowser/CMakeLists.txt 2007-12-09 08:46:53.000000000 +0100 -@@ -3,7 +3,7 @@ - ) - - kde4_add_plugin(plasma_engine_filebrowser ${filebrowser_engine_SRCS}) --target_link_libraries(plasma_engine_filebrowser ${KDE4_KDECORE_LIBS} plasma) -+target_link_libraries(plasma_engine_filebrowser ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} plasma) - - install(TARGETS plasma_engine_filebrowser DESTINATION ${PLUGIN_INSTALL_DIR}) - install(FILES plasma-dataengine-filebrowser.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -diff -ur kdebase-workspace-3.97.0.orig/plasma/runners/calculator/CMakeLists.txt kdebase-workspace-3.97.0/plasma/runners/calculator/CMakeLists.txt ---- kdebase-workspace-3.97.0.orig/plasma/runners/calculator/CMakeLists.txt 2007-12-09 06:57:13.000000000 +0100 -+++ kdebase-workspace-3.97.0/plasma/runners/calculator/CMakeLists.txt 2007-12-09 08:46:53.000000000 +0100 -@@ -6,7 +6,7 @@ - ) - - kde4_add_plugin(krunner_calculatorrunner ${krunner_calculatorrunner_SRCS}) --target_link_libraries(krunner_calculatorrunner ${KDE4_KDECORE_LIBS} ${QT_QTSCRIPT_LIBRARY} plasma) -+target_link_libraries(krunner_calculatorrunner ${KDE4_KDECORE_LIBS} ${QT_QTSCRIPT_LIBRARY} ${KDE4_KDEUI_LIBS} plasma) - - install(TARGETS krunner_calculatorrunner DESTINATION ${PLUGIN_INSTALL_DIR} ) - -diff -ur kdebase-workspace-3.97.0.orig/plasma/scriptengines/qscript/CMakeLists.txt kdebase-workspace-3.97.0/plasma/scriptengines/qscript/CMakeLists.txt ---- kdebase-workspace-3.97.0.orig/plasma/scriptengines/qscript/CMakeLists.txt 2007-12-09 06:57:13.000000000 +0100 -+++ kdebase-workspace-3.97.0/plasma/scriptengines/qscript/CMakeLists.txt 2007-12-09 08:46:53.000000000 +0100 -@@ -10,7 +10,7 @@ - ) - - kde4_add_plugin(plasma_scriptengine_qscript ${qscript_engine_SRCS}) --target_link_libraries(plasma_scriptengine_qscript ${KDE4_KDECORE_LIBS} plasma ${QT_QTSCRIPT_LIBRARY} ${QT_QTUITOOLS_LIBRARY}) -+target_link_libraries(plasma_scriptengine_qscript ${KDE4_KDECORE_LIBS} plasma ${QT_QTSCRIPT_LIBRARY} ${QT_QTUITOOLS_LIBRARY} ${QT_QTGUI_LIBRARY}) - - install(TARGETS plasma_scriptengine_qscript DESTINATION ${PLUGIN_INSTALL_DIR}) - install(FILES plasma-scriptengine-qscript.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -diff -ur kdebase-workspace-3.97.0.orig/plasma/runners/bookmarks/CMakeLists.txt kdebase-workspace-3.97.0/plasma/runners/bookmarks/CMakeLists.txt ---- kdebase-workspace-3.97.0.orig/plasma/runners/bookmarks/CMakeLists.txt 2007-12-09 06:57:13.000000000 +0100 -+++ kdebase-workspace-3.97.0/plasma/runners/bookmarks/CMakeLists.txt 2007-12-09 08:46:53.000000000 +0100 -@@ -6,7 +6,7 @@ - ) - - kde4_add_plugin(krunner_bookmarksrunner ${krunner_bookmarksrunner_SRCS}) --target_link_libraries(krunner_bookmarksrunner ${KDE4_KDECORE_LIBS} ${QT_QTSCRIPT_LIBRARY} plasma) -+target_link_libraries(krunner_bookmarksrunner ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${QT_QTSCRIPT_LIBRARY} plasma) - - install(TARGETS krunner_bookmarksrunner DESTINATION ${PLUGIN_INSTALL_DIR} ) - -diff -ur kdebase-workspace-3.97.0.orig/plasma/tools/plasmoidviewer/CMakeLists.txt kdebase-workspace-3.97.0/plasma/tools/plasmoidviewer/CMakeLists.txt ---- kdebase-workspace-3.97.0.orig/plasma/tools/plasmoidviewer/CMakeLists.txt 2007-12-09 06:57:15.000000000 +0100 -+++ kdebase-workspace-3.97.0/plasma/tools/plasmoidviewer/CMakeLists.txt 2007-12-09 08:47:08.000000000 +0100 -@@ -5,7 +5,7 @@ - - kde4_add_executable(plasmoidviewer ${plasmoidviewer_SRCS}) - --target_link_libraries(plasmoidviewer plasma) -+target_link_libraries(plasmoidviewer ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} plasma) - - install(TARGETS plasmoidviewer DESTINATION ${BIN_INSTALL_DIR}) - install(FILES checker.png DESTINATION ${DATA_INSTALL_DIR}/plasmoidviewer) diff --git a/kde-base/plasma/plasma-4.0.1.ebuild b/kde-base/plasma/plasma-4.0.1.ebuild deleted file mode 100644 index fbdd4a567968..000000000000 --- a/kde-base/plasma/plasma-4.0.1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/plasma/plasma-4.0.1.ebuild,v 1.2 2008/02/23 17:46:29 ingmar Exp $ - -EAPI="1" - -KMNAME=kdebase-workspace -inherit kde4-meta - -DESCRIPTION="Plasma: KDE desktop framework" -KEYWORDS="~amd64 ~x86" -IUSE="debug htmlhandbook xcomposite xinerama" - -COMMONDEPEND=" - >=app-misc/strigi-0.5.7 - >=kde-base/libkworkspace-${PV}:${SLOT} - >=kde-base/libtaskmanager-${PV}:${SLOT} - >=kde-base/libplasma-${PV}:${SLOT} - x11-libs/libXau - x11-libs/libXfixes - x11-libs/libXrender - x11-libs/libXtst - xcomposite? ( x11-libs/libXcomposite ) - xinerama? ( x11-libs/libXinerama )" -DEPEND="${COMMONDEPEND} - xcomposite? ( x11-proto/compositeproto ) - xinerama? ( x11-proto/xineramaproto )" -RDEPEND="${COMMONDEPEND} - >=kde-base/kde-menu-icons-${PV}:${SLOT}" -PDEPEND=" - kde-base/kdeartwork-iconthemes:${SLOT}" - -KMEXTRACTONLY=" - ksmserver/org.kde.KSMServerInterface.xml - krunner/org.freedesktop.ScreenSaver.xml - krunner/org.kde.krunner.Interface.xml - libs/workspace/ - libs/taskmanager/" - -PATCHES="${FILESDIR}/${P}-linkage.patch" - -KDE4_BUILT_WITH_USE_CHECK="app-misc/strigi dbus qt4" - -src_compile() { - mycmakeargs="${mycmakeargs} - $(cmake-utils_use_with xcomposite X11_Xcomposite) - $(cmake-utils_use_with xinerama X11_Xinerama)" - - kde4-meta_src_compile -} |