Update to KDE SC 4.8.4

Bug fixes.

8 files changed, 86 insertions, 39 deletions

diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index c51c8ebd8f3..3a1394494d0 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.42 2012/06/14 07:43:17 sbd Exp $
+# $NetBSD: Makefile,v 1.43 2012/06/16 04:45:39 markd Exp $
 
 DISTNAME=	kdelibs-${_KDE_VERSION}
 PKGNAME=	${DISTNAME:S/-4/4-4/}
-PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Support libraries for the KDE integrated X11 desktop
 
diff --git a/x11/kdelibs4/PLIST b/x11/kdelibs4/PLIST
index b5b62928401..f16292925d5 100644
--- a/x11/kdelibs4/PLIST
+++ b/x11/kdelibs4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2012/04/15 05:54:53 markd Exp $
+@comment $NetBSD: PLIST,v 1.12 2012/06/16 04:45:39 markd Exp $
 bin/checkXML
 bin/kbuildsycoca4
 bin/kconfig_compiler
@@ -603,6 +603,7 @@ include/KDE/KRandomSequence
 include/KDE/KRatingWidget
 include/KDE/KRecentDocument
 include/KDE/KRecentFilesAction
+include/KDE/KRecursiveFilterProxyModel
 include/KDE/KRemoteEncoding
 include/KDE/KReplace
 include/KDE/KReplaceDialog
@@ -1905,6 +1906,10 @@ include/threadweaver/ThreadWeaver.h
 include/threadweaver/WeaverInterface.h
 include/threadweaver/WeaverObserver.h
 include/threadweaver/threadweaver_export.h
+lib/cmake/KDeclarative/KDeclarativeConfig.cmake
+lib/cmake/KDeclarative/KDeclarativeConfigVersion.cmake
+lib/cmake/KDeclarative/KDeclarativeLibraryTargets-relwithdebinfo.cmake
+lib/cmake/KDeclarative/KDeclarativeLibraryTargets.cmake
 lib/kde4/emoticonstheme_adium.so
 lib/kde4/emoticonstheme_kde.so
 lib/kde4/emoticonstheme_pidgin.so
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 5a5a898e0c2..982686a2b6b 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.28 2012/04/19 21:10:59 joerg Exp $
+$NetBSD: distinfo,v 1.29 2012/06/16 04:45:39 markd Exp $
 
-SHA1 (kdelibs-4.8.2.tar.xz) = f844ae0877880563361144d9577706064c3483e7
-RMD160 (kdelibs-4.8.2.tar.xz) = 9c52ef42274f4ed5fd82a749ed7cf78f482c9c67
-Size (kdelibs-4.8.2.tar.xz) = 11966308 bytes
+SHA1 (kdelibs-4.8.4.tar.xz) = 35cd199a30d84eb37b2b213fed5ee3adf810ea49
+RMD160 (kdelibs-4.8.4.tar.xz) = dba94c16eb0df9d6a4fccefc8097f39f4b63e9ec
+Size (kdelibs-4.8.4.tar.xz) = 12182912 bytes
+SHA1 (patch-ConfigureChecks.cmake) = b03b38108d68d940782fbbb876affd011a39acf4
 SHA1 (patch-aa) = c3044205a964797a7718b7a7bd03bb99dd3ca37d
 SHA1 (patch-ab) = 3f89ddfa9a6101a016128d82dbbd0e985e396cae
 SHA1 (patch-ac) = 200391c0cf0a89ef43f0cb57e39d56eee51da505
@@ -17,4 +18,6 @@ SHA1 (patch-cmake_modules_FindTaglib.cmake) = be38479966da542343dd962c57f7e9d1be
 SHA1 (patch-kdecore_localization_klocale_kde.cpp) = b8a513a0c51e65d7e604a88c1d0e3325be6ad688
 SHA1 (patch-kdecore_util_kshareddatacache_p.h) = 6d064fe75fbecd489b0343960333864c717c0805
 SHA1 (patch-kjs_JSImmediate.h) = ecc761c7c82f711f41cf47d706c1c22d22c2980a
-SHA1 (patch-kjs_wtf_HashSet.h) = 5ffa5db540a72c95e94c4c16cc0fe521d1f2516a
+SHA1 (patch-kpty_kpty.cpp) = e8fd2e7c88b8926cf5bf12deea9e6af08e0739d8
+SHA1 (patch-nepomuk_core_nepomukmainmodel.cpp) = bba701025aa1d33b9d6ce4b6d1fec2a92b4f5552
+SHA1 (patch-nepomuk_core_resourcemanager.cpp) = 99a1e6c319f4798e5c929e77bd6717ffb2e3f571
diff --git a/x11/kdelibs4/patches/patch-ConfigureChecks.cmake b/x11/kdelibs4/patches/patch-ConfigureChecks.cmake
new file mode 100644
index 00000000000..e5574f38d6d
--- /dev/null
+++ b/x11/kdelibs4/patches/patch-ConfigureChecks.cmake
@@ -0,0 +1,14 @@
+$NetBSD: patch-ConfigureChecks.cmake,v 1.1 2012/06/16 04:45:40 markd Exp $
+
+NetBSD loginx() complains if ut_type not set before calling
+
+--- ConfigureChecks.cmake.orig	2012-06-06 20:54:04.000000000 +0000
++++ ConfigureChecks.cmake
+@@ -163,6 +163,7 @@ if (UNIX)
+     endif (HAVE_UTMPX)
+     if (login_in_libc OR login_in_libutil)
+       set(HAVE_LOGIN 1)
++      check_struct_member("struct ${utmp}" "ut_type" "${utmp}.h" HAVE_STRUCT_UTMP_UT_TYPE)
+     else (login_in_libc OR login_in_libutil)
+       set(HAVE_LOGIN)
+       check_struct_member("struct ${utmp}" "ut_type" "${utmp}.h" HAVE_STRUCT_UTMP_UT_TYPE)
diff --git a/x11/kdelibs4/patches/patch-kjs_wtf_HashSet.h b/x11/kdelibs4/patches/patch-kjs_wtf_HashSet.h
deleted file mode 100644
index 9d40ce57c6c..00000000000
--- a/x11/kdelibs4/patches/patch-kjs_wtf_HashSet.h
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-kjs_wtf_HashSet.h,v 1.1 2012/04/19 21:10:59 joerg Exp $
-
---- kjs/wtf/HashSet.h.orig	2012-04-19 16:21:41.000000000 +0000
-+++ kjs/wtf/HashSet.h
-@@ -181,7 +181,7 @@ namespace WTF {
-     inline HashSet<Value, HashFunctions, Traits>::find(const T& value)
-     {
-         typedef HashSetTranslatorAdapter<ValueType, ValueTraits, T, Translator> Adapter;
--        return m_impl.find<T, Adapter>(value);
-+        return m_impl.template find<T, Adapter>(value);
-     }
- 
-     template<typename Value, typename HashFunctions, typename Traits>
-@@ -190,7 +190,7 @@ namespace WTF {
-     inline HashSet<Value, HashFunctions, Traits>::find(const T& value) const
-     {
-         typedef HashSetTranslatorAdapter<ValueType, ValueTraits, T, Translator> Adapter;
--        return m_impl.find<T, Adapter>(value);
-+        return m_impl.template find<T, Adapter>(value);
-     }
- 
-     template<typename Value, typename HashFunctions, typename Traits>
-@@ -198,7 +198,7 @@ namespace WTF {
-     inline bool HashSet<Value, HashFunctions, Traits>::contains(const T& value) const
-     {
-         typedef HashSetTranslatorAdapter<ValueType, ValueTraits, T, Translator> Adapter;
--        return m_impl.contains<T, Adapter>(value);
-+        return m_impl.template contains<T, Adapter>(value);
-     }
- 
-     template<typename T, typename U, typename V>
diff --git a/x11/kdelibs4/patches/patch-kpty_kpty.cpp b/x11/kdelibs4/patches/patch-kpty_kpty.cpp
new file mode 100644
index 00000000000..a285a54eb29
--- /dev/null
+++ b/x11/kdelibs4/patches/patch-kpty_kpty.cpp
@@ -0,0 +1,26 @@
+$NetBSD: patch-kpty_kpty.cpp,v 1.1 2012/06/16 04:45:40 markd Exp $
+
+NetBSD loginx() complains if ut_type not set before calling
+
+--- kpty/kpty.cpp.orig	2012-06-06 20:49:52.000000000 +0000
++++ kpty/kpty.cpp
+@@ -543,6 +543,9 @@ void KPty::login(const char *user, const
+     l_struct.ut_time = time(0);
+ # endif
+ 
++# ifdef HAVE_STRUCT_UTMP_UT_TYPE
++    l_struct.ut_type = USER_PROCESS;
++# endif
+ # ifdef HAVE_LOGIN
+ #  ifdef HAVE_LOGINX
+     ::loginx(&l_struct);
+@@ -550,9 +553,6 @@ void KPty::login(const char *user, const
+     ::login(&l_struct);
+ #  endif
+ # else
+-#  ifdef HAVE_STRUCT_UTMP_UT_TYPE
+-    l_struct.ut_type = USER_PROCESS;
+-#  endif
+ #  ifdef HAVE_STRUCT_UTMP_UT_PID
+     l_struct.ut_pid = getpid();
+ #   ifdef HAVE_STRUCT_UTMP_UT_SESSION
diff --git a/x11/kdelibs4/patches/patch-nepomuk_core_nepomukmainmodel.cpp b/x11/kdelibs4/patches/patch-nepomuk_core_nepomukmainmodel.cpp
new file mode 100644
index 00000000000..177635f110c
--- /dev/null
+++ b/x11/kdelibs4/patches/patch-nepomuk_core_nepomukmainmodel.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-nepomuk_core_nepomukmainmodel.cpp,v 1.1 2012/06/16 04:45:40 markd Exp $
+
+ID: 76e0376d7582cfe5b898c56bf3779ca2279dace8
+Revert "Disconnect before re-connecting. Soprano does not do that for us."
+
+--- nepomuk/core/nepomukmainmodel.cpp.orig	2012-06-06 20:49:52.000000000 +0000
++++ nepomuk/core/nepomukmainmodel.cpp
+@@ -97,7 +97,6 @@ public:
+         if ( forced || (!m_socketConnectFailed && !localSocketClient.isConnected()) ) {
+             delete localSocketModel;
+             localSocketModel = 0;
+-            localSocketClient.disconnect();
+             QString socketName = KGlobal::dirs()->locateLocal( "socket", "nepomuk-socket" );
+             kDebug() << "Connecting to local socket" << socketName;
+             if ( localSocketClient.connect( socketName ) ) {
diff --git a/x11/kdelibs4/patches/patch-nepomuk_core_resourcemanager.cpp b/x11/kdelibs4/patches/patch-nepomuk_core_resourcemanager.cpp
new file mode 100644
index 00000000000..e36e50c6bd8
--- /dev/null
+++ b/x11/kdelibs4/patches/patch-nepomuk_core_resourcemanager.cpp
@@ -0,0 +1,16 @@
+$NetBSD: patch-nepomuk_core_resourcemanager.cpp,v 1.1 2012/06/16 04:45:40 markd Exp $
+
+ID: 528144c444ea983470b1cff678d40b1967bce3d5
+Increase the ResourceManager cache size to 10000
+
+--- nepomuk/core/resourcemanager.cpp.orig	2012-06-06 20:49:52.000000000 +0000
++++ nepomuk/core/resourcemanager.cpp
+@@ -178,7 +178,7 @@ QList<Nepomuk::ResourceData*> Nepomuk::R
+ 
+ bool Nepomuk::ResourceManagerPrivate::dataCacheFull() const
+ {
+-    return dataCnt >= 1000;
++    return dataCnt >= 10000;
+ }
+ 
+