Update to KDE SC 4.11.3

bugfixes, many new features, improved stability and performance.

6 files changed, 25 insertions, 37 deletions

diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 661deef346a..f7ab2f6e49d 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.61 2013/07/05 13:29:44 ryoon Exp $
+# $NetBSD: Makefile,v 1.62 2013/11/07 13:35:56 markd Exp $
 
 DISTNAME=	kdelibs-${_KDE_VERSION}
 PKGNAME=	${DISTNAME:S/-4/4-4/}
-PKGREVISION=	4
 CATEGORIES=	x11
 COMMENT=	Support libraries for the KDE integrated X11 desktop
 
@@ -91,6 +90,7 @@ BUILDLINK_API_DEPENDS.shared-desktop-ontologies+=	shared-desktop-ontologies>=0.1
 .include "../../sysutils/strigi/buildlink3.mk"
 .include "../../textproc/soprano/buildlink3.mk"
 .include "../../databases/shared-mime-info/buildlink3.mk"
+.include "../../devel/grantlee/buildlink3.mk"
 .include "../../devel/libdbusmenu-qt/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/x11/kdelibs4/PLIST b/x11/kdelibs4/PLIST
index 2f6ea1e620c..14233c17a32 100644
--- a/x11/kdelibs4/PLIST
+++ b/x11/kdelibs4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2013/05/21 12:49:37 markd Exp $
+@comment $NetBSD: PLIST,v 1.15 2013/11/07 13:35:56 markd Exp $
 bin/checkXML
 bin/kbuildsycoca4
 bin/kconfig_compiler
@@ -1216,6 +1216,7 @@ include/kdatetime.h
 include/kdatetimeedit.h
 include/kdatetimewidget.h
 include/kdatewidget.h
+include/kdbusconnectionpool.h
 include/kdbusservicestarter.h
 include/kde3support_export.h
 include/kde_file.h
@@ -1636,6 +1637,7 @@ include/ktexteditor/highlightinterface.h
 include/ktexteditor/ktexteditor_export.h
 include/ktexteditor/loadsavefiltercheckplugin.h
 include/ktexteditor/markinterface.h
+include/ktexteditor/messageinterface.h
 include/ktexteditor/modeinterface.h
 include/ktexteditor/modificationinterface.h
 include/ktexteditor/movingcursor.h
@@ -2011,13 +2013,13 @@ lib/libkde3support.so.4
 lib/libkde3support.so.${PKGVERSION}
 lib/libkdeclarative.so
 lib/libkdeclarative.so.5
-lib/libkdeclarative.so.5.10.3
+lib/libkdeclarative.so.5.11.3
 lib/libkdecore.so
 lib/libkdecore.so.5
-lib/libkdecore.so.5.10.3
+lib/libkdecore.so.5.11.3
 lib/libkdefakes.so
 lib/libkdefakes.so.5
-lib/libkdefakes.so.5.10.3
+lib/libkdefakes.so.5.11.3
 lib/libkdeinit4_kbuildsycoca4.so
 lib/libkdeinit4_kconf_update.so
 lib/libkdeinit4_kded4.so
@@ -2025,13 +2027,13 @@ lib/libkdeinit4_kio_http_cache_cleaner.so
 lib/libkdeinit4_klauncher.so
 lib/libkdesu.so
 lib/libkdesu.so.5
-lib/libkdesu.so.5.10.3
+lib/libkdesu.so.5.11.3
 lib/libkdeui.so
 lib/libkdeui.so.5
-lib/libkdeui.so.5.10.3
+lib/libkdeui.so.5.11.3
 lib/libkdewebkit.so
 lib/libkdewebkit.so.5
-lib/libkdewebkit.so.5.10.3
+lib/libkdewebkit.so.5.11.3
 lib/libkdnssd.so
 lib/libkdnssd.so.4
 lib/libkdnssd.so.${PKGVERSION}
@@ -2043,7 +2045,7 @@ lib/libkfile.so.4
 lib/libkfile.so.${PKGVERSION}
 lib/libkhtml.so
 lib/libkhtml.so.5
-lib/libkhtml.so.5.10.3
+lib/libkhtml.so.5.11.3
 lib/libkidletime.so
 lib/libkidletime.so.4
 lib/libkidletime.so.${PKGVERSION}
@@ -2052,7 +2054,7 @@ lib/libkimproxy.so.4
 lib/libkimproxy.so.${PKGVERSION}
 lib/libkio.so
 lib/libkio.so.5
-lib/libkio.so.5.10.3
+lib/libkio.so.5.11.3
 lib/libkjs.so
 lib/libkjs.so.4
 lib/libkjs.so.${PKGVERSION}
diff --git a/x11/kdelibs4/buildlink3.mk b/x11/kdelibs4/buildlink3.mk
index 69834698641..c2e80bd6108 100644
--- a/x11/kdelibs4/buildlink3.mk
+++ b/x11/kdelibs4/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.33 2013/07/05 13:29:44 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.34 2013/11/07 13:35:56 markd Exp $
 
 BUILDLINK_TREE+=	kdelibs
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	kdelibs
 KDELIBS_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.kdelibs+=	kdelibs4>=4.0.0
-BUILDLINK_ABI_DEPENDS.kdelibs+=	kdelibs4>=4.10.3nb4
+BUILDLINK_ABI_DEPENDS.kdelibs+=	kdelibs4>=4.11.3
 BUILDLINK_PKGSRCDIR.kdelibs?=	../../x11/kdelibs4
 
 .include "../../archivers/bzip2/buildlink3.mk"
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 5ccf2062a62..fbbae99cb5f 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.36 2013/05/21 12:49:37 markd Exp $
+$NetBSD: distinfo,v 1.37 2013/11/07 13:35:56 markd Exp $
 
-SHA1 (kdelibs-4.10.3.tar.xz) = aa154998e227121be82f5b04442e908e7dece01b
-RMD160 (kdelibs-4.10.3.tar.xz) = b308d9bc60dc7f31358f05dac02fa2e87ea5dead
-Size (kdelibs-4.10.3.tar.xz) = 11981656 bytes
+SHA1 (kdelibs-4.11.3.tar.xz) = 42bda7ca352b3f700af91262636380aa71d07519
+RMD160 (kdelibs-4.11.3.tar.xz) = 68d0b9fcb8f603015c65f39e150c64bcb2bfbff7
+Size (kdelibs-4.11.3.tar.xz) = 12075676 bytes
 SHA1 (patch-ConfigureChecks.cmake) = b03b38108d68d940782fbbb876affd011a39acf4
 SHA1 (patch-aa) = c3044205a964797a7718b7a7bd03bb99dd3ca37d
 SHA1 (patch-ab) = 3f89ddfa9a6101a016128d82dbbd0e985e396cae
@@ -18,10 +18,9 @@ SHA1 (patch-cmake_modules_FindKDE4Internal.cmake) = 4b1e7a68fe6f3766deca6d557e80
 SHA1 (patch-cmake_modules_FindTaglib.cmake) = be38479966da542343dd962c57f7e9d1be3e9ff4
 SHA1 (patch-kdecore_localization_klocale_kde.cpp) = b8a513a0c51e65d7e604a88c1d0e3325be6ad688
 SHA1 (patch-kdecore_network_ConfigureChecks.cmake) = 0ad9352974911ef78ec565f7b2a97c45ead2cf72
-SHA1 (patch-kdecore_tests_CMakeLists.txt) = b09d569127b3be95a6b9d51a0e02d0d1877a289f
+SHA1 (patch-kdecore_tests_CMakeLists.txt) = bbe806b078f54201528c86489d3ac200145a8d2f
 SHA1 (patch-kdecore_util_kshareddatacache_p.h) = 6d064fe75fbecd489b0343960333864c717c0805
 SHA1 (patch-kjs_JSImmediate.h) = ecc761c7c82f711f41cf47d706c1c22d22c2980a
 SHA1 (patch-kjs_interpreter.cpp) = 9d400daf7d96674b8d66e1cde46dcb3615635241
 SHA1 (patch-kjs_wtf_DisallowCType.h) = 6305dd274f1478ba0fe0a6f1717451ab8e3e50d2
-SHA1 (patch-kjs_wtf_HashTable.h) = ec37861cacbe5cf16d40e9895f9245796b7d437b
 SHA1 (patch-kpty_kpty.cpp) = e8fd2e7c88b8926cf5bf12deea9e6af08e0739d8
diff --git a/x11/kdelibs4/patches/patch-kdecore_tests_CMakeLists.txt b/x11/kdelibs4/patches/patch-kdecore_tests_CMakeLists.txt
index 31866799000..84cd626e10d 100644
--- a/x11/kdelibs4/patches/patch-kdecore_tests_CMakeLists.txt
+++ b/x11/kdelibs4/patches/patch-kdecore_tests_CMakeLists.txt
@@ -1,11 +1,11 @@
-$NetBSD: patch-kdecore_tests_CMakeLists.txt,v 1.1 2013/05/17 21:20:40 jperkin Exp $
+$NetBSD: patch-kdecore_tests_CMakeLists.txt,v 1.2 2013/11/07 13:35:56 markd Exp $
 
 Disable klockfiletest, it causes linker failures on SunOS.
 
 --- kdecore/tests/CMakeLists.txt.orig	2013-03-01 06:26:14.975769068 +0000
 +++ kdecore/tests/CMakeLists.txt
-@@ -45,7 +45,7 @@ KDECORE_UNIT_TESTS(
-  kentrymaptest
+@@ -44,7 +44,7 @@ KDECORE_UNIT_TESTS(
+  ktimezonestest
   kconfigtest
   kurlmimetest
 - klockfiletest
@@ -13,7 +13,7 @@ Disable klockfiletest, it causes linker failures on SunOS.
   ktempdirtest
   ksharedptrtest
   kshareddatacachetest
-@@ -98,7 +98,7 @@ KDECORE_EXECUTABLE_TESTS(
+@@ -97,7 +97,7 @@ KDECORE_EXECUTABLE_TESTS(
   dbuscalltest
   kmdcodectest
   startserviceby
@@ -21,4 +21,4 @@ Disable klockfiletest, it causes linker failures on SunOS.
 + #klockfile_testlock # helper for klockfiletest
  )
  
- ########### klocaletest ###############
+ ########### kentrymaptest ###############
diff --git a/x11/kdelibs4/patches/patch-kjs_wtf_HashTable.h b/x11/kdelibs4/patches/patch-kjs_wtf_HashTable.h
deleted file mode 100644
index 35b603e96d3..00000000000
--- a/x11/kdelibs4/patches/patch-kjs_wtf_HashTable.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-kjs_wtf_HashTable.h,v 1.1 2013/05/06 15:03:19 joerg Exp $
-
---- kjs/wtf/HashTable.h.orig	2013-05-03 23:46:27.000000000 +0000
-+++ kjs/wtf/HashTable.h
-@@ -245,7 +245,7 @@ namespace WTF {
- 
-     using std::swap;
- 
--#if !COMPILER(MSVC)
-+#if !COMPILER(MSVC) && !defined(_LIBCPP_VERSION)
-     // Visual C++ has a swap for pairs defined.
- 
-     // swap pairs by component, in case of pair members that specialize swap