rpms/kdenetwork/devel kdenetwork-4.3.4-webkitkde.patch, NONE, 1.1 kdenetwork.spec, 1.206, 1.207

[Lukas Tinkl]

Author: ltinkl

Update of /cvs/extras/rpms/kdenetwork/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10411/devel

Modified Files:
	kdenetwork.spec 
Added Files:
	kdenetwork-4.3.4-webkitkde.patch 
Log Message:
KDE 4.3.3


kdenetwork-4.3.4-webkitkde.patch:
 CMakeLists.txt   |    2 --
 kget_plug_in.cpp |    6 +-----
 2 files changed, 1 insertion(+), 7 deletions(-)

--- NEW FILE kdenetwork-4.3.4-webkitkde.patch ---
Index: kget/extensions/konqueror/kget_plug_in.cpp
===================================================================
--- kget/extensions/konqueror/kget_plug_in.cpp	(revision 1046122)
+++ kget/extensions/konqueror/kget_plug_in.cpp	(revision 1046123)
@@ -33,11 +33,7 @@
 
 #ifdef HAVE_WEBKITKDE
 #include <webkitpart.h>
-#ifdef HAVE_WEBVIEW
-#include <webview.h>
-#else
-#include <webkitview.h>
-#endif
+#include <QWebView>
 #include <QWebFrame>
 #endif
 
Index: kget/extensions/konqueror/CMakeLists.txt
===================================================================
--- kget/extensions/konqueror/CMakeLists.txt	(revision 1046122)
+++ kget/extensions/konqueror/CMakeLists.txt	(revision 1046123)
@@ -18,8 +18,6 @@
     add_definitions(-DHAVE_WEBKITKDE)
     include_directories(${KDEWEBKIT_INCLUDE_DIR})
     include_directories(${WEBKITPART_INCLUDE_DIR})
-    FIND_PATH(WEBVIEW_PATH webkitkde/webview.h PATH ${KDEWEBKIT_INCLUDE_DIR})
-    macro_bool_to_01(WEBVIEW_PATH HAVE_WEBVIEW )
     set(WEBKITKDE_FOUND true)
 endif( KDEWEBKIT_FOUND AND WEBKITPART_FOUND )
 


Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/devel/kdenetwork.spec,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -p -r1.206 -r1.207
--- kdenetwork.spec	3 Nov 2009 09:16:52 -0000	1.206
+++ kdenetwork.spec	9 Nov 2009 14:08:35 -0000	1.207
@@ -3,7 +3,7 @@ Summary: K Desktop Environment - Network
 Name: kdenetwork
 Epoch: 7
 Version: 4.3.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group: Applications/Internet
@@ -15,6 +15,7 @@ Source1: krdc-icons.tar.bz2
 Patch1: kdenetwork-4.2.98-kdrc-icon.patch
 
 # upstream patches (4.3 branch):
+Patch100: kdenetwork-4.3.4-webkitkde.patch
 
 # upstream patches (4.4 branch):
 Patch200: kdenetwork-4.3.0-jabber-kde#111537.patch
@@ -102,6 +103,7 @@ Requires: kdelibs4-devel
 
 # 4.3 upstream patches
 chmod +x kopete/kopete/kconf_update/kopete-update_yahoo_server.pl
+%patch100 -p0 -b .webkitkde
 
 # 4.4 upstream patches
 %patch200 -p0 -b .bz#515586-kopete
@@ -194,6 +196,9 @@ fi
 
 
 %changelog
+* Mon Nov  9 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.3.3-3
+- Compile with latest WebKitKDE
+
 * Tue Nov 03 2009 Than Ngo <than at redhat.com> - 4.3.3-2
 - respin