diff options
Diffstat (limited to 'x11/kdelibs4/patches')
-rw-r--r-- | x11/kdelibs4/patches/patch-ConfigureChecks.cmake | 14 | ||||
-rw-r--r-- | x11/kdelibs4/patches/patch-kjs_wtf_HashSet.h | 31 | ||||
-rw-r--r-- | x11/kdelibs4/patches/patch-kpty_kpty.cpp | 26 | ||||
-rw-r--r-- | x11/kdelibs4/patches/patch-nepomuk_core_nepomukmainmodel.cpp | 15 | ||||
-rw-r--r-- | x11/kdelibs4/patches/patch-nepomuk_core_resourcemanager.cpp | 16 |
5 files changed, 71 insertions, 31 deletions
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; + } + + |