From 1cbfb3e399dddb451f12696ede69a50201546fdd Mon Sep 17 00:00:00 2001
From: "Aaron J. Seigo" <aseigo@kde.org>
Date: Tue, 4 Nov 2008 02:20:46 +0000
Subject: [PATCH] one more step towards building!

svn path=/trunk/KDE/kdelibs/; revision=879797
---
 CMakeLists.txt | 22 +++++++++++++++++++++-
 package.cpp    |  5 ++---
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c667a3bd..c9db344f4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,27 @@ find_package(Nepomuk REQUIRED)
 include (KDE4Defaults)
 include(NepomukMacros)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${KDEBASE_WORKSPACE_SOURCE_DIR}/libs ${CMAKE_CURRENT_SOURCE_DIR}/.. ${KDE4_INCLUDES})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}
+                    ${CMAKE_BINARY_DIR}/kdecore/
+                    ${CMAKE_SOURCE_DIR}/kdecore/
+                    ${CMAKE_SOURCE_DIR}/kdecore/config
+                    ${CMAKE_SOURCE_DIR}/kdecore/jobs
+                    ${CMAKE_SOURCE_DIR}/kdecore/kernel
+                    ${CMAKE_SOURCE_DIR}/kdecore/localization
+                    ${CMAKE_SOURCE_DIR}/kdecore/io
+                    ${CMAKE_SOURCE_DIR}/kdecore/services
+                    ${CMAKE_SOURCE_DIR}/kdecore/sycoca
+                    ${CMAKE_SOURCE_DIR}/kdecore/util
+                    ${CMAKE_BINARY_DIR}/kdeui/
+                    ${CMAKE_SOURCE_DIR}/kdeui/about
+                    ${CMAKE_SOURCE_DIR}/kdeui/config
+                    ${CMAKE_SOURCE_DIR}/kdeui/icons
+                    ${CMAKE_SOURCE_DIR}/kdeui/shortcuts
+                    ${CMAKE_SOURCE_DIR}/kio/kio
+                    ${CMAKE_SOURCE_DIR}/kio
+                    ${CMAKE_SOURCE_DIR}/kdeui/
+                    ${CMAKE_SOURCE_DIR}/kdeui/
+                    ${KDE4_INCLUDES})
 if(QT_QTOPENGL_FOUND AND OPENGL_FOUND)
     include_directories(${OPENGL_INCLUDE_DIR})
 endif(QT_QTOPENGL_FOUND AND OPENGL_FOUND)
diff --git a/package.cpp b/package.cpp
index 3eab0fb39..13ee59870 100644
--- a/package.cpp
+++ b/package.cpp
@@ -24,13 +24,12 @@
 #include <QFile>
 #include <QRegExp>
 
-#include <karchivedirectory.h>
-#include <karchiveentry.h>
+#include <karchive.h>
 #include <kcomponentdata.h>
 #include <kdesktopfile.h>
 #include <kio/copyjob.h>
 #include <kio/deletejob.h>
-#include <kio/filecopyjob.h>
+#include <kio/jobclasses.h>
 #include <kio/job.h>
 #include <kplugininfo.h>
 #include <kstandarddirs.h>