rpms/kdebase/F-12 kdebase-4.3.5-webkitkde002.patch, NONE, 1.1 kdebase.spec, 1.404, 1.405

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23219/F-12

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-4.3.5-webkitkde002.patch 
Log Message:
* Tue Jan 26 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.5-2
- revert revision 1071180 to build with webkitkde 0.0.2

kdebase-4.3.5-webkitkde002.patch:
 CMakeLists.txt |    2 +-
 khtmlkttsd.cpp |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE kdebase-4.3.5-webkitkde002.patch ---
Index: apps/konqueror/kttsplugin/khtmlkttsd.cpp
===================================================================
--- apps/konqueror/kttsplugin/khtmlkttsd.cpp	(revision 1071180)
+++ apps/konqueror/kttsplugin/khtmlkttsd.cpp	(revision 1071179)
@@ -36,7 +36,7 @@
 #include <ktoolinvocation.h>
 
 #ifdef HAVE_WEBKITKDE
-#include <kwebkitpart.h>
+#include <webkitpart.h>
 #include <QWebFrame>
 #include <QWebView>
 #endif
@@ -113,7 +113,7 @@
 #ifdef HAVE_WEBKITKDE
     else
     {
-        KWebKitPart *webkitPart = dynamic_cast<KWebKitPart *>(part);
+        WebKitPart *webkitPart = dynamic_cast<WebKitPart *>(part);
         if ( webkitPart )
         {
             if (supportsXhtml)
Index: apps/konqueror/kttsplugin/CMakeLists.txt
===================================================================
--- apps/konqueror/kttsplugin/CMakeLists.txt	(revision 1071180)
+++ apps/konqueror/kttsplugin/CMakeLists.txt	(revision 1071179)
@@ -12,7 +12,7 @@
         set(KDEWEBKIT_FOUND FALSE)
 endif(DEPEND_PACKAGE_KdeWebKit)
 
-MACRO_OPTIONAL_DEPEND_PACKAGE(WebKitPart "kwebkitpart")
+MACRO_OPTIONAL_DEPEND_PACKAGE(WebKitPart "webkitpart")
 if(DEPEND_PACKAGE_WebKitPart)
         macro_optional_find_package(WebKitPart QUIET)
 else(DEPEND_PACKAGE_WebKitPart)


Index: kdebase.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase/F-12/kdebase.spec,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -p -r1.404 -r1.405
--- kdebase.spec	22 Jan 2010 19:31:19 -0000	1.404
+++ kdebase.spec	26 Jan 2010 14:38:25 -0000	1.405
@@ -2,7 +2,7 @@ Name: kdebase
 Summary: K Desktop Environment 4 - Core Files
 Epoch: 6
 Version: 4.3.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2
 Group: User Interface/Desktops
@@ -14,6 +14,8 @@ Source0: ftp://ftp.kde.org/pub/kde/stabl
 Patch0:   kdebase-4.1.80-nsplugins-paths.patch
 Patch1:   kdebase-4.1.70-konsole-session.patch
 Patch2:   kdebase-4.2.1-home-icon.patch
+# revert revision 1071180 to build with webkitkde 0.0.2
+Patch3:   kdebase-4.3.5-webkitkde002.patch
 
 # 4.4 (backported from trunk) upstream patches
 # Allow 'Open Folder in Tabs' in Konsole to support SSH bookmarks (kde#177637)
@@ -111,6 +113,7 @@ Requires: kdelibs4-devel kdepimlibs4-dev
 %patch0 -p1 -b .nsplugins-paths
 %patch1 -p1 -b .konsole-session
 %patch2 -p1 -b .home-icon
+%patch3 -p1 -b .webkitkde002
 
 # 4.4 (backported from trunk) upstream patches
 %patch100 -p0 -b .konsole-kde#177637
@@ -236,6 +239,9 @@ fi
 
 
 %changelog
+* Tue Jan 26 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.5-2
+- revert revision 1071180 to build with webkitkde 0.0.2
+
 * Fri Jan 22 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.3.5-1
 - 4.3.5