Update to KDE 3.5.0

2 files changed, 36 insertions, 17 deletions

diff --git a/x11/kdelibs3/files/patch-khtml_ecma-kjs_window.cpp b/x11/kdelibs3/files/patch-khtml_ecma-kjs_window.cpp
new file mode 100644
index 000000000000..564ca63085d8
--- /dev/null
+++ b/x11/kdelibs3/files/patch-khtml_ecma-kjs_window.cpp
@@ -0,0 +1,36 @@
+--- khtml/ecma/kjs_window.cpp	2005/11/11 21:07:48	479809
++++ khtml/ecma/kjs_window.cpp	2005/11/25 18:54:04	483261
+@@ -21,6 +21,16 @@
+  */
+ #include "config.h"
+ 
++#include "khtmlview.h"
++#include "khtml_part.h"
++#include "khtmlpart_p.h"
++#include "khtml_settings.h"
++#include "xml/dom2_eventsimpl.h"
++#include "xml/dom_docimpl.h"
++#include "misc/htmltags.h"
++#include "html/html_documentimpl.h"
++#include "rendering/render_frames.h"
++
+ #include <qstylesheet.h>
+ #include <qtimer.h>
+ #include <qpaintdevicemetrics.h>
+@@ -60,16 +70,6 @@
+ #include "xmlserializer.h"
+ #include "domparser.h"
+ 
+-#include "khtmlview.h"
+-#include "khtml_part.h"
+-#include "khtmlpart_p.h"
+-#include "khtml_settings.h"
+-#include "xml/dom2_eventsimpl.h"
+-#include "xml/dom_docimpl.h"
+-#include "misc/htmltags.h"
+-#include "html/html_documentimpl.h"
+-#include "rendering/render_frames.h"
+-
+ using namespace KJS;
+ 
+ namespace KJS {
diff --git a/x11/kdelibs3/files/patch-kio_kioexec-main.cpp b/x11/kdelibs3/files/patch-kio_kioexec-main.cpp
deleted file mode 100644
index 134d8d1660eb..000000000000
--- a/x11/kdelibs3/files/patch-kio_kioexec-main.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- kio/kioexec/main.cpp.orig	Sun Oct 23 18:39:26 2005
-+++ kio/kioexec/main.cpp	Sun Oct 23 18:40:10 2005
-@@ -124,8 +124,12 @@
-     }
-     args->clear();
- 
--    if ( tempfiles )
--        slotRunApp(); // does not return
-+    if ( tempfiles ) {
-+        // #113991
-+        QTimer::singleShot( 0, this, SLOT( slotRunApp() ) );
-+        //slotRunApp(); // does not return
-+        return;
-+    }
- 
-     counter = 0;
-     if ( counter == expectedCounter )