From 284e095fe026fa0846d48105c7f9b2238d57ee3a Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@lavabit.com>
Date: Tue, 19 Jun 2012 16:44:07 -0300
Subject: kdelibs-libre: updating pkgrel due attica dependencies

---
 libre/kdelibs-libre/PKGBUILD                      | 10 +++--
 libre/kdelibs-libre/fix-application-crashes.patch | 49 +++++++++++++++++++++++
 2 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 libre/kdelibs-libre/fix-application-crashes.patch

(limited to 'libre')

diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index 0ddf606ec..fed954896 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 160936 2012-06-07 06:38:07Z andrea $
+# $Id: PKGBUILD 162049 2012-06-19 08:17:58Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=kdelibs
 pkgname=kdelibs-libre
 pkgver=4.8.4
-pkgrel=1
+pkgrel=3
 pkgdesc="KDE Core Libraries"
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
@@ -24,10 +24,12 @@ install=${_pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
         'kde-applications-menu.patch'
         'use-pythondontwritebytecode.patch'
+        'fix-application-crashes.patch'
         'khtml-fsdg.diff')
 sha1sums=('35cd199a30d84eb37b2b213fed5ee3adf810ea49'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
           'bbacbbe2194f3961cd7557d98a9ddef158ca11aa'
+          'c271c712bf202f517015b597d61cfe1aed0db82b'
           'a1502a964081ad583a00cf90c56e74bf60121830')
 
 build() {
@@ -39,6 +41,8 @@ build() {
        # Set PYTHONDONTWRITEBYTECODE (KDEBUG#276151)
        patch -p0 -i "${srcdir}"/use-pythondontwritebytecode.patch
 
+       # KDEBUG 301453
+       patch -p1 -i "${srcdir}"/fix-application-crashes.patch
        # Don't ask the user to download a plugin, it's probably nonfree.
        patch -p1 -i "${srcdir}"/khtml-fsdg.diff
 
diff --git a/libre/kdelibs-libre/fix-application-crashes.patch b/libre/kdelibs-libre/fix-application-crashes.patch
new file mode 100644
index 000000000..8ac385483
--- /dev/null
+++ b/libre/kdelibs-libre/fix-application-crashes.patch
@@ -0,0 +1,49 @@
+From: Vishesh Handa <me@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&amp;a=commitdiff&amp;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 <me@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&amp;a=commitdiff&amp;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 ) ) {
+
-- 
cgit v1.2.3