diff options
| author | lofi <lofi@FreeBSD.org> | 2006-01-09 03:32:36 +0800 |
|---|---|---|
| committer | lofi <lofi@FreeBSD.org> | 2006-01-09 03:32:36 +0800 |
| commit | 45ac8c84561611e230ff77f0da69b703896dbe60 (patch) | |
| tree | c42c2360158e278de50b6b936586613abfb09f6a /x11/kdelibs4/files | |
| parent | c249b791479123e2a078f1edd661a02e2be364e5 (diff) | |
| download | freebsd-ports-gnome-45ac8c84561611e230ff77f0da69b703896dbe60.tar.gz freebsd-ports-gnome-45ac8c84561611e230ff77f0da69b703896dbe60.tar.zst freebsd-ports-gnome-45ac8c84561611e230ff77f0da69b703896dbe60.zip | |
Update to KDE 3.5.0
Diffstat (limited to 'x11/kdelibs4/files')
| -rw-r--r-- | x11/kdelibs4/files/patch-khtml_ecma-kjs_window.cpp | 36 | ||||
| -rw-r--r-- | x11/kdelibs4/files/patch-kio_kioexec-main.cpp | 17 |
2 files changed, 36 insertions, 17 deletions
diff --git a/x11/kdelibs4/files/patch-khtml_ecma-kjs_window.cpp b/x11/kdelibs4/files/patch-khtml_ecma-kjs_window.cpp new file mode 100644 index 000000000000..564ca63085d8 --- /dev/null +++ b/x11/kdelibs4/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/kdelibs4/files/patch-kio_kioexec-main.cpp b/x11/kdelibs4/files/patch-kio_kioexec-main.cpp deleted file mode 100644 index 134d8d1660eb..000000000000 --- a/x11/kdelibs4/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 ) |