From 3611d138a2119008c68a64a1e3005d4a99c43b55 Mon Sep 17 00:00:00 2001
From: Aaron Seigo <aseigo@kde.org>
Date: Tue, 5 Feb 2013 17:31:54 +0100
Subject: [PATCH] mv the knsrc file in with the plasmapkg binary

no knewstuff in the library anymore
---
 CMakeLists.txt                                             | 2 ++
 plasma/CMakeLists.txt                                      | 2 --
 tools/plasmapkg/CMakeLists.txt                             | 3 +++
 tools/plasmapkg/main.cpp                                   | 1 -
 {plasma/data/knewstuff => tools/plasmapkg}/plasmoids.knsrc | 0
 5 files changed, 5 insertions(+), 3 deletions(-)
 rename {plasma/data/knewstuff => tools/plasmapkg}/plasmoids.knsrc (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3606fc624..086fa1e4d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -208,5 +208,7 @@ add_subdirectory( desktoptheme )
 add_subdirectory( plasma )
 add_subdirectory( scriptengines )
 add_subdirectory( shell )
+#FIXME: port tools
+#add_subdirectory( tools )
 
 feature_summary(WHAT ALL   FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/plasma/CMakeLists.txt b/plasma/CMakeLists.txt
index 4c6ad4c9f..a00daa50c 100644
--- a/plasma/CMakeLists.txt
+++ b/plasma/CMakeLists.txt
@@ -276,8 +276,6 @@ install(FILES
    data/services/plasma.protocol
    DESTINATION ${SERVICES_INSTALL_DIR})
 
-install(FILES data/knewstuff/plasmoids.knsrc DESTINATION  ${CONFIG_INSTALL_DIR})
-
 install(FILES data/operations/dataengineservice.operations DESTINATION ${DATA_INSTALL_DIR}/plasma/services)
 install(FILES data/operations/plasmoidservice.operations DESTINATION ${DATA_INSTALL_DIR}/plasma/services)
 install(FILES data/operations/storage.operations DESTINATION ${DATA_INSTALL_DIR}/plasma/services)
diff --git a/tools/plasmapkg/CMakeLists.txt b/tools/plasmapkg/CMakeLists.txt
index 2e538415b..48d1189b5 100644
--- a/tools/plasmapkg/CMakeLists.txt
+++ b/tools/plasmapkg/CMakeLists.txt
@@ -2,9 +2,12 @@ set(plasmapkg_SRCS
     main.cpp
 )
 
+include_directories(${KDE4_INCLUDE_DIR}/KDE)
 kde4_add_executable(plasmapkg ${plasmapkg_SRCS})
 
 target_link_libraries(plasmapkg ${KDE4_KDEUI_LIBS} ${KDE4_PLASMA_LIBS})
 
 install(TARGETS plasmapkg ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(FILES data/knewstuff/plasmoids.knsrc DESTINATION  ${CONFIG_INSTALL_DIR})
+
 
diff --git a/tools/plasmapkg/main.cpp b/tools/plasmapkg/main.cpp
index 6a2982b29..163976249 100644
--- a/tools/plasmapkg/main.cpp
+++ b/tools/plasmapkg/main.cpp
@@ -37,7 +37,6 @@
 
 #include <Plasma/PackageStructure>
 #include <Plasma/Package>
-#include <Plasma/PackageMetadata>
 
 static const char description[] = I18N_NOOP("Install, list, remove Plasma packages");
 static const char version[] = "0.2";
diff --git a/plasma/data/knewstuff/plasmoids.knsrc b/tools/plasmapkg/plasmoids.knsrc
similarity index 100%
rename from plasma/data/knewstuff/plasmoids.knsrc
rename to tools/plasmapkg/plasmoids.knsrc