Date: Thursday, June 14, 2012 @ 03:09:35 Author: andrea Revision: 161782
upgpkg: kdelibs 4.8.4-2 Fix applications crashes (FS#30190) Added: kdelibs/trunk/fix-application-crashes.patch Modified: kdelibs/trunk/PKGBUILD -------------------------------+ PKGBUILD | 11 ++++++-- fix-application-crashes.patch | 49 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-06-13 23:17:07 UTC (rev 161781) +++ PKGBUILD 2012-06-14 07:09:35 UTC (rev 161782) @@ -4,7 +4,7 @@ pkgname=kdelibs pkgver=4.8.4 -pkgrel=1 +pkgrel=2 pkgdesc="KDE Core Libraries" arch=('i686' 'x86_64') url='http://www.kde.org' @@ -18,11 +18,13 @@ install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz" 'kde-applications-menu.patch' 'archlinux-menu.patch' - 'use-pythondontwritebytecode.patch') + 'use-pythondontwritebytecode.patch' + 'fix-application-crashes.patch') sha1sums=('35cd199a30d84eb37b2b213fed5ee3adf810ea49' '86ee8c8660f19de8141ac99cd6943964d97a1ed7' '63a850ab4196b9d06934f2b4a13acd9f7739bc67' - 'bbacbbe2194f3961cd7557d98a9ddef158ca11aa') + 'bbacbbe2194f3961cd7557d98a9ddef158ca11aa' + 'c271c712bf202f517015b597d61cfe1aed0db82b') build() { cd "${srcdir}"/${pkgname}-${pkgver} @@ -35,6 +37,9 @@ # Set PYTHONDONTWRITEBYTECODE (KDEBUG#276151) patch -p0 -i "${srcdir}"/use-pythondontwritebytecode.patch + # KDEBUG 301453 + patch -p1 -i "${srcdir}"/fix-application-crashes.patch + cd "${srcdir}" mkdir build cd build Added: fix-application-crashes.patch =================================================================== --- fix-application-crashes.patch (rev 0) +++ fix-application-crashes.patch 2012-06-14 07:09:35 UTC (rev 161782) @@ -0,0 +1,49 @@ +From: Vishesh Handa <m...@vhanda.in> +Date: Wed, 13 Jun 2012 21:26:31 +0000 +Subject: Revert "Always rec-connect if forced (ie. when Nepomuk server restarts)" +X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=bde5aad1e9f7bfb6f8d5c60197797de4a315158d +--- +Revert "Always rec-connect if forced (ie. when Nepomuk server restarts)" + +This reverts commit a43824a200ed76cef48a90bd3aee8547698b7c91. + +This is done so that 4.8.x works with Soprano 2.7.6 +--- + + +--- a/nepomuk/core/nepomukmainmodel.cpp ++++ b/nepomuk/core/nepomukmainmodel.cpp +@@ -94,7 +94,7 @@ public: + + // we may get disconnected from the server but we don't want to try + // to connect every time the model is requested +- if ( forced || (!m_socketConnectFailed && !localSocketClient.isConnected()) ) { ++ if ( !m_socketConnectFailed && !localSocketClient.isConnected() ) { + delete localSocketModel; + localSocketModel = 0; + QString socketName = KGlobal::dirs()->locateLocal( "socket", "nepomuk-socket" ); + +From: Vishesh Handa <m...@vhanda.in> +Date: Wed, 13 Jun 2012 21:25:32 +0000 +Subject: Revert "Disconnect before re-connecting. Soprano does not do that for us." +X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=76e0376d7582cfe5b898c56bf3779ca2279dace8 +--- +Revert "Disconnect before re-connecting. Soprano does not do that for us." + +This reverts commit 3708be2d09700b21f934c2129218e1c7ea44efdf. + +This is being done so that KDE 4.8.x works with Soprano 2.7.6 +--- + + +--- a/nepomuk/core/nepomukmainmodel.cpp ++++ b/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 ) ) { +