[kdelibs] inject kate part to kdelibs

[Jaroslav Reznik]

commit f97b5cf28599793481c32859f03149838f5e1973
Author: Jaroslav Reznik <jreznik at redhat.com>
Date:   Tue May 31 10:30:41 2011 +0200

    inject kate part to kdelibs

 .gitignore                |    3 +--
 kdelibs-4.6.80-kate.patch |   25 +++++++++++++++++++++++++
 kdelibs.spec              |   13 +++++++++++++
 sources                   |    1 +
 4 files changed, 40 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a5c5ce5..d05afd1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-/kdelibs-4.6.2.tar.bz2
-/kdelibs-4.6.3.tar.bz2
 /kdelibs-4.6.80.tar.bz2
+/kate-4.6.80.tar.bz2
diff --git a/kdelibs-4.6.80-kate.patch b/kdelibs-4.6.80-kate.patch
new file mode 100644
index 0000000..ad4e346
--- /dev/null
+++ b/kdelibs-4.6.80-kate.patch
@@ -0,0 +1,25 @@
+diff -up kdelibs-4.6.80/CMakeLists.txt.kate kdelibs-4.6.80/CMakeLists.txt
+--- kdelibs-4.6.80/CMakeLists.txt.kate	2011-05-21 09:43:22.000000000 +0200
++++ kdelibs-4.6.80/CMakeLists.txt	2011-05-30 17:16:02.660240856 +0200
+@@ -332,6 +332,7 @@ endif(NOT WINCE)
+ add_subdirectory( kunitconversion )
+ add_subdirectory( kdewebkit )
+ add_subdirectory( includes )
++add_subdirectory( kate )
+ 
+ macro_optional_add_subdirectory( experimental )
+ macro_optional_add_subdirectory( doc  )
+diff -up kdelibs-4.6.80/kate/script/katescriptconsole.cpp.kate kdelibs-4.6.80/kate/script/katescriptconsole.cpp
+--- kdelibs-4.6.80/kate/script/katescriptconsole.cpp.kate	2011-05-21 01:07:31.000000000 +0200
++++ kdelibs-4.6.80/kate/script/katescriptconsole.cpp	2011-05-30 19:33:32.131448941 +0200
+@@ -27,8 +27,8 @@
+ #include <QtGui/QTextEdit>
+ 
+ // KDE
+-#include <KStandardDirs>
+-#include <KLocale>
++#include <kstandarddirs.h>
++#include <klocale.h>
+ 
+ // Kate
+ #include "katescriptconsole.h"
diff --git a/kdelibs.spec b/kdelibs.spec
index c66a710..4190512 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -29,6 +29,7 @@ License: LGPLv2+
 URL:     http://www.kde.org/
 Group:   System Environment/Libraries
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdelibs-%{version}%{?alphatag}.tar.bz2
+Source1: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kate-%{version}%{?alphatag}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: kde4-macros(api) >= 2
@@ -105,6 +106,8 @@ Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
 # make forcefully hal-free build
 Patch300: kdelibs-4.6.80-halectomy.patch
 
+# katepart hack!
+Patch1000: kdelibs-4.6.80-kate.patch
 
 %if 0%{?fedora} && 0%{?fedora} < 13
 Conflicts: kdebase-workspace-libs < 4.3.80
@@ -262,6 +265,16 @@ format for use with the Qt 4 Assistant or KDevelop 4.
 %prep
 %setup -q -n kdelibs-%{version}%{?alphatag}
 
+# katepart hack!
+# unpack kate
+%setup -q -T -D -a 1
+# extract katepart
+mv kate-%{version}/part ./kate
+# get rid of the rest of kate
+rm -rf kate-%{version}
+# make katepart build within kdelibs
+%patch1000 -p1 -b .kate
+
 %patch0 -p1 -b .parallel_devel
 %patch2 -p1 -b .kde149705
 %patch8 -p1 -b .install_all_css
diff --git a/sources b/sources
index 3f54b03..f345533 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
+ae52cb8bfb9f24746621b62ca2ee24d1  kate-4.6.80.tar.bz2
 b998dea244b310759712241b319aa000  kdelibs-4.6.80.tar.bz2