backport nepomuk fixes, push to unstabledebian/4.8.4-1

4 files changed, 51 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index d5eca86..6d7c13f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-kde4libs (4:4.8.4-0r1) UNRELEASED; urgency=low
+kde4libs (4:4.8.4-1) experimental; urgency=low
 
   * New upstream release.
 
@@ -13,6 +13,9 @@ kde4libs (4:4.8.4-0r1) UNRELEASED; urgency=low
   * Update symbols files.
   * Drop unused lintian override "dbg-package-missing-depends kdelibs5-dbg".
 
+  [ Sune Vuorela ]
+  * Pull patches from upstream to fix the nepomuk related crashes
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>  Sun, 27 May 2012 12:10:37 +0200
 
 kde4libs (4:4.8.3-2) unstable; urgency=low
diff --git a/debian/patches/01_upstream_nepomuk_fix_76e0376d7582cfe5b898c56bf3779ca2279dace8.diff b/debian/patches/01_upstream_nepomuk_fix_76e0376d7582cfe5b898c56bf3779ca2279dace8.diff
new file mode 100644
index 0000000..e943d0b
--- /dev/null
+++ b/debian/patches/01_upstream_nepomuk_fix_76e0376d7582cfe5b898c56bf3779ca2279dace8.diff
@@ -0,0 +1,22 @@
+commit 76e0376d7582cfe5b898c56bf3779ca2279dace8
+Author: Vishesh Handa <me@vhanda.in>
+Date:   Thu Jun 14 02:55:32 2012 +0530
+
+    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
+
+diff --git a/nepomuk/core/nepomukmainmodel.cpp b/nepomuk/core/nepomukmainmodel.cpp
+index 8dc0b1f..ff742d7 100644
+--- 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 ) ) {
diff --git a/debian/patches/02_upstream_nepomuk_fix_bde5aad1e9f7bfb6f8d5c60197797de4a315158d.diff b/debian/patches/02_upstream_nepomuk_fix_bde5aad1e9f7bfb6f8d5c60197797de4a315158d.diff
new file mode 100644
index 0000000..ae9aece
--- /dev/null
+++ b/debian/patches/02_upstream_nepomuk_fix_bde5aad1e9f7bfb6f8d5c60197797de4a315158d.diff
@@ -0,0 +1,23 @@
+commit bde5aad1e9f7bfb6f8d5c60197797de4a315158d
+Author: Vishesh Handa <me@vhanda.in>
+Date:   Thu Jun 14 02:56:31 2012 +0530
+
+    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
+
+diff --git a/nepomuk/core/nepomukmainmodel.cpp b/nepomuk/core/nepomukmainmodel.cpp
+index ff742d7..be23b38 100644
+--- 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" );
diff --git a/debian/patches/series b/debian/patches/series
index 18d67be..043d369 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
+01_upstream_nepomuk_fix_76e0376d7582cfe5b898c56bf3779ca2279dace8.diff
+02_upstream_nepomuk_fix_bde5aad1e9f7bfb6f8d5c60197797de4a315158d.diff
 kconf_update_migrate_from_kde3_icon_theme.diff
 add_debian_build_type.diff
 disable_usr_lib_install_rpath.diff