6 files changed, 20 insertions, 89 deletions

diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 81055f3a36c5..5224784522b3 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	kdelibs
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index a717fb72cd59..26aac0e8f6ec 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdelibs-3.5.0.tar.bz2) = 2b11d654e2ea1a3cd16dcfdcbb7d1915
-SHA256 (KDE/kdelibs-3.5.0.tar.bz2) = 6a5387dbdf8ba7c18e7dd2ca477819daee70b8eeb89ca0d9732dedfd192c0224
-SIZE (KDE/kdelibs-3.5.0.tar.bz2) = 15379557
+MD5 (KDE/kdelibs-3.5.1.tar.bz2) = 2a22193ae7c23f3759b02723dab02d30
+SHA256 (KDE/kdelibs-3.5.1.tar.bz2) = 1798452314d36987898faa7de24cbebd6fed06487d45bbfac7146d87815ee981
+SIZE (KDE/kdelibs-3.5.1.tar.bz2) = 15459894
diff --git a/x11/kdelibs3/files/patch-khtml_ecma-kjs_window.cpp b/x11/kdelibs3/files/patch-khtml_ecma-kjs_window.cpp
deleted file mode 100644
index 564ca63085d8..000000000000
--- a/x11/kdelibs3/files/patch-khtml_ecma-kjs_window.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
---- 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-khtml_html-html_formimpl.cpp b/x11/kdelibs3/files/patch-khtml_html-html_formimpl.cpp
new file mode 100644
index 000000000000..2d6b721339f2
--- /dev/null
+++ b/x11/kdelibs3/files/patch-khtml_html-html_formimpl.cpp
@@ -0,0 +1,11 @@
+--- khtml/html/html_formimpl.cpp.orig	Sun Jan 29 01:15:24 2006
++++ khtml/html/html_formimpl.cpp	Sun Jan 29 01:43:42 2006
+@@ -2303,7 +2303,7 @@
+         NodeImpl* const parent = current->parentNode();
+         current = current->nextSibling();
+         if (!current) {
+-            if (parent != this)
++            if (static_cast<HTMLSelectElementImpl*>(parent) != this)
+                 current = parent->nextSibling();
+         }
+     }
diff --git a/x11/kdelibs3/files/patch-post-3.4.3-kdelibs-kjs b/x11/kdelibs3/files/patch-post-3.4.3-kdelibs-kjs
deleted file mode 100644
index 998f389edfb1..000000000000
--- a/x11/kdelibs3/files/patch-post-3.4.3-kdelibs-kjs
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: kjs/function.cpp
-===================================================================
---- kjs/function.cpp	(revision 495921)
-+++ kjs/function.cpp	(working copy)
-@@ -77,7 +77,8 @@ UString encodeURI(ExecState *exec, UStri
-       }
-       else if (C.uc >= 0xD800 && C.uc <= 0xDBFF) {
- 
--	if (k == string.size()) {
-+        // we need two chars
-+	if (k + 1 >= string.size()) {
- 	  Object err = Error::create(exec,URIError);
- 	  exec->setException(err);
- 	  free(encbuf);
-@@ -197,6 +198,10 @@ UString decodeURI(ExecState *exec, UStri
-     }
- 
-     k += 2;
-+
-+    if (decbufLen+2 >= decbufAlloc)
-+        decbuf = (UChar*)realloc(decbuf,(decbufAlloc *= 2)*sizeof(UChar));
-+
-     if ((B & 0x80) == 0) {
-       // Single-byte character
-       C = B;
-@@ -257,6 +262,12 @@ UString decodeURI(ExecState *exec, UStri
- 	assert(n == 4);
- 	unsigned long uuuuu = ((octets[0] & 0x07) << 2) | ((octets[1] >> 4) & 0x03);
- 	unsigned long vvvv = uuuuu-1;
-+	if (vvvv > 0x0F) {
-+          Object err = Error::create(exec,URIError);
-+	  exec->setException(err);
-+	  free(decbuf);
-+	  return UString();
-+	}        
- 	unsigned long wwww = octets[1] & 0x0F;
- 	unsigned long xx = (octets[2] >> 4) & 0x03;
- 	unsigned long yyyy = octets[2] & 0x0F;
-@@ -270,9 +281,7 @@ UString decodeURI(ExecState *exec, UStri
-     }
- 
-     if (reservedSet.find(C) < 0) {
--      if (decbufLen+1 >= decbufAlloc)
--	decbuf = (UChar*)realloc(decbuf,(decbufAlloc *= 2)*sizeof(UChar));
--      decbuf[decbufLen++] = C;
-+        decbuf[decbufLen++] = C;
-     }
-     else {
-       while (decbufLen+k-start >= decbufAlloc)
diff --git a/x11/kdelibs3/pkg-plist b/x11/kdelibs3/pkg-plist
index 6402b345124f..c1eba5281984 100644
--- a/x11/kdelibs3/pkg-plist
+++ b/x11/kdelibs3/pkg-plist
@@ -1499,6 +1499,7 @@ share/apps/ksgmltools2/customization/da/entities/underArtisticLicense.docbook
 share/apps/ksgmltools2/customization/da/entities/underBSDLicense.docbook
 share/apps/ksgmltools2/customization/da/entities/underFDL.docbook
 share/apps/ksgmltools2/customization/da/entities/underGPL.docbook
+share/apps/ksgmltools2/customization/da/entities/underLGPL.docbook
 share/apps/ksgmltools2/customization/da/entities/underX11License.docbook
 share/apps/ksgmltools2/customization/da/entities/update-doc.docbook
 share/apps/ksgmltools2/customization/da/lang.entities
@@ -4318,10 +4319,12 @@ share/icons/crystalsvg/48x48/actions/lock.png
 share/icons/crystalsvg/48x48/actions/mail_new.png
 share/icons/crystalsvg/48x48/actions/mail_post_to.png
 share/icons/crystalsvg/48x48/actions/misc.png
+share/icons/crystalsvg/48x48/actions/next.png
 share/icons/crystalsvg/48x48/actions/player_playlist.png
 share/icons/crystalsvg/48x48/actions/presence_away.png
 share/icons/crystalsvg/48x48/actions/presence_offline.png
 share/icons/crystalsvg/48x48/actions/presence_online.png
+share/icons/crystalsvg/48x48/actions/previous.png
 share/icons/crystalsvg/48x48/actions/reload.png
 share/icons/crystalsvg/48x48/actions/reload_all_tabs.png
 share/icons/crystalsvg/48x48/actions/reload_page.png
@@ -4941,6 +4944,7 @@ share/mimelnk/application/fits.desktop
 share/mimelnk/application/illustrator.desktop
 share/mimelnk/application/java.desktop
 share/mimelnk/application/mathml+xml.desktop
+share/mimelnk/application/mbox.desktop
 share/mimelnk/application/msexcel.desktop
 share/mimelnk/application/mspowerpoint.desktop
 share/mimelnk/application/msword.desktop
@@ -4961,6 +4965,7 @@ share/mimelnk/application/smil.desktop
 share/mimelnk/application/vnd.mozilla.xul+xml.desktop
 share/mimelnk/application/vnd.ms-asf.desktop
 share/mimelnk/application/vnd.ms-excel.desktop
+share/mimelnk/application/vnd.ms-powerpoint.desktop
 share/mimelnk/application/vnd.ms-word.desktop
 share/mimelnk/application/vnd.oasis.opendocument.chart.desktop
 share/mimelnk/application/vnd.oasis.opendocument.formula.desktop
@@ -5156,6 +5161,7 @@ share/mimelnk/image/tiff.desktop
 share/mimelnk/image/wmf.desktop
 share/mimelnk/image/x-bmp.desktop
 share/mimelnk/image/x-dds.desktop
+share/mimelnk/image/x-djvu-2.desktop
 share/mimelnk/image/x-djvu.desktop
 share/mimelnk/image/x-eps.desktop
 share/mimelnk/image/x-exr.desktop