Update to KDE 3.4

6 files changed, 15 insertions, 122 deletions

diff --git a/x11/kdelibs4/files/patch-dcop_dcopidlng_dcopidlng b/x11/kdelibs4/files/patch-dcop_dcopidlng_dcopidlng
deleted file mode 100644
index 41fb398..0000000
--- a/x11/kdelibs4/files/patch-dcop_dcopidlng_dcopidlng
+++ /dev/null
@@ -1,16 +0,0 @@
---- dcop/dcopidlng/dcopidlng	Sat May 22 22:55:01 2004
-+++ dcop/dcopidlng/dcopidlng	Sun Feb 20 21:49:47 2005
-@@ -1,9 +1,12 @@
- #!/bin/sh
-+
-+trap "rm -f dcopidlng.stderr.$$" 
-+
- if test -z "$KDECONFIG"; then
-     KDECONFIG=kde-config
- fi
- LIBDIR="`$KDECONFIG --install data --expandvars`/dcopidlng"
--perl -I"$LIBDIR" "$LIBDIR/kalyptus" --allow_k_dcop_accessors -f dcopidl $1 2>/tmp/dcopidlng.stderr.$$
-+perl -I"$LIBDIR" "$LIBDIR/kalyptus" --allow_k_dcop_accessors -f dcopidl $1 2> dcopidlng.stderr.$$
- RET=$?
- if [ $RET -ne 0 ]
- then
diff --git a/x11/kdelibs4/files/patch-dnssd_publicservice.cpp b/x11/kdelibs4/files/patch-dnssd_publicservice.cpp
new file mode 100644
index 0000000..e65eb52
--- /dev/null
+++ b/x11/kdelibs4/files/patch-dnssd_publicservice.cpp
@@ -0,0 +1,15 @@
+--- dnssd/publicservice.cpp.orig	Sat Mar 19 09:36:15 2005
++++ dnssd/publicservice.cpp	Sat Mar 19 09:41:46 2005
+@@ -18,7 +18,12 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ 
++#include "config.h"
++
+ #include "publicservice.h"
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
+ #include <netinet/in.h>
+ #include <qapplication.h>
+ #include "sdevent.h"
diff --git a/x11/kdelibs4/files/patch-khtml_html_htmltokenizer.cpp b/x11/kdelibs4/files/patch-khtml_html_htmltokenizer.cpp
deleted file mode 100644
index df651b7..0000000
--- a/x11/kdelibs4/files/patch-khtml_html_htmltokenizer.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
---- khtml/html/htmltokenizer.cpp.orig	2005-01-14 18:34:45.783473376 -0800
-+++ khtml/html/htmltokenizer.cpp	2005-01-14 18:13:22.200607632 -0800
-@@ -1693,3 +1693,7 @@
-     onHold = _onHold;
- }
- 
-+bool HTMLTokenizer::isRunningScriptFromTokenizer() const
-+{
-+    return isExecutingScript();
-+}
---- khtml/html/htmltokenizer.h.orig	2005-01-14 18:36:55.359774784 -0800
-+++ khtml/html/htmltokenizer.h	2005-01-14 18:12:54.872762096 -0800
-@@ -171,6 +171,7 @@
- 
-     virtual bool isWaitingForScripts() const;
-     virtual bool isExecutingScript() const;
-+    virtual bool isRunningScriptFromTokenizer() const;
- protected:
-     // Internal buffers
-     ///////////////////
---- khtml/xml/dom_docimpl.cpp.orig	2005-01-14 18:37:53.073001040 -0800
-+++ khtml/xml/dom_docimpl.cpp	2005-01-14 18:18:34.716098056 -0800
-@@ -1181,7 +1181,7 @@
-     // on an explicit document.close(), the tokenizer might still be waiting on scripts,
-     // and in that case we don't want to destroy it because that will prevent the
-     // scripts from getting processed.
--    if (m_tokenizer && !m_tokenizer->isWaitingForScripts()) {
-+    if (m_tokenizer && !m_tokenizer->isWaitingForScripts() && !m_tokenizer->isRunningScriptFromTokenizer()) {
-         delete m_tokenizer;
-         m_tokenizer = 0;
-     }
---- khtml/xml/xml_tokenizer.h.orig	2005-01-14 18:38:27.401782272 -0800
-+++ khtml/xml/xml_tokenizer.h	2005-01-14 18:10:57.609588808 -0800
-@@ -122,6 +122,7 @@
-     virtual void finish() = 0;
-     virtual void setOnHold(bool /*_onHold*/) {}
-     virtual bool isWaitingForScripts() const = 0;
-+    virtual bool isRunningScriptFromTokenizer() const { return false; }
- 
- signals:
-     void finishedParsing();
diff --git a/x11/kdelibs4/files/patch-post-3.3.2-kdelibs-htmlframes2 b/x11/kdelibs4/files/patch-post-3.3.2-kdelibs-htmlframes2
deleted file mode 100644
index 0ff5af8..0000000
--- a/x11/kdelibs4/files/patch-post-3.3.2-kdelibs-htmlframes2
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: khtml_part.cpp
-===================================================================
-RCS file: /home/kde/kdelibs/khtml/khtml_part.cpp,v
-retrieving revision 1.1015.2.12
-diff -u -p -r1.1015.2.12 khtml_part.cpp
---- khtml/khtml_part.cpp	17 Nov 2004 13:46:56 -0000	1.1015.2.12
-+++ khtml/khtml_part.cpp	12 Dec 2004 15:55:30 -0000
-@@ -4758,7 +4758,7 @@ KHTMLPart *
- KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const QString &f, khtml::ChildFrame **childFrame )
- {
- #ifdef DEBUG_FINDFRAME
--  kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " findFrameParent( " << f << " )" << endl;
-+  kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " name = " << name() << " findFrameParent( " << f << " )" << endl;
- #endif
-   // Check access
-   KHTMLPart* const callingHtmlPart = dynamic_cast<KHTMLPart *>(callingPart);
-@@ -4766,6 +4766,9 @@ KHTMLPart::findFrameParent( KParts::Read
-   if (!checkFrameAccess(callingHtmlPart))
-      return 0;
- 
-+  if (!childFrame && !parentPart() && (name() == f))
-+     return this;
-+
-   FrameIt it = d->m_frames.find( f );
-   const FrameIt end = d->m_frames.end();
-   if ( it != end )
diff --git a/x11/kdelibs4/files/patch-post-3.3.2-kdelibs-kio.diff b/x11/kdelibs4/files/patch-post-3.3.2-kdelibs-kio.diff
deleted file mode 100644
index 674ba00..0000000
--- a/x11/kdelibs4/files/patch-post-3.3.2-kdelibs-kio.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- kio/kio/job.cpp	9 Nov 2004 00:50:35 -0000	1.397.2.5
-+++ kio/kio/job.cpp	8 Dec 2004 01:08:15 -0000	1.397.2.8
-@@ -3119,14 +3119,14 @@ void CopyJob::copyNextFile()
-                        if ( f.open( IO_ReadWrite ) )
-                        {
-                            f.close();
-                            KSimpleConfig config( path );
-                            config.setDesktopGroup();
--                           config.writePathEntry( QString::fromLatin1("URL"), (*it).uSource.url() );
--                           KURL urlName = (*it).uSource;
--                           urlName.setPass( "" );
--                           config.writeEntry( QString::fromLatin1("Name"), urlName.url() );
-+                           KURL url = (*it).uSource;
-+                           url.setPass( "" );
-+                           config.writePathEntry( QString::fromLatin1("URL"), url.url() );
-+                           config.writeEntry( QString::fromLatin1("Name"), url.url() );
-                            config.writeEntry( QString::fromLatin1("Type"), QString::fromLatin1("Link") );
-                            QString protocol = (*it).uSource.protocol();
-                            if ( protocol == QString::fromLatin1("ftp") )
-                                config.writeEntry( QString::fromLatin1("Icon"), QString::fromLatin1("ftp") );
-                            else if ( protocol == QString::fromLatin1("http") )
diff --git a/x11/kdelibs4/files/patch-post-3.3.2-kdelibs-kioslave b/x11/kdelibs4/files/patch-post-3.3.2-kdelibs-kioslave
deleted file mode 100644
index 18dc66b..0000000
--- a/x11/kdelibs4/files/patch-post-3.3.2-kdelibs-kioslave
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -b -p -u -r1.213.2.1 -r1.213.2.2
---- kioslave/ftp/ftp.cc	21 Sep 2004 16:17:56 -0000	1.213.2.1
-+++ kioslave/ftp/ftp.cc	26 Dec 2004 00:29:54 -0000	1.213.2.2
-@@ -751,6 +751,14 @@ bool Ftp::ftpSendCmd( const QCString& cm
- {
-   assert(m_control != NULL);    // must have control connection socket
- 
-+  if ( cmd.find( '\r' ) != -1 || cmd.find( '\n' ) != -1)
-+  {
-+    kdWarning(7102) << "Invalid command received (contains CR or LF): "
-+                    << cmd.data() << endl;
-+    error( ERR_UNSUPPORTED_ACTION, m_host );
-+    return false;
-+  }
-+
-   // Don't print out the password...
-   bool isPassCmd = (cmd.left(4).lower() == "pass");
-   if ( !isPassCmd )