Hello community,
here is the log from the commit of package kdelibs4 for openSUSE:Factory
checked in at 2012-06-28 15:29:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdelibs4 (Old)
and /work/SRC/openSUSE:Factory/.kdelibs4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdelibs4", Maintainer is "kde-maintain...@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdelibs4/kdelibs4-apidocs.changes
2012-06-12 21:43:05.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs4-apidocs.changes
2012-06-28 15:30:09.000000000 +0200
@@ -1,0 +2,5 @@
+Tue Jun 26 09:56:49 UTC 2012 - idon...@suse.com
+
+- Add patches to fix Soprano crashes
+
+-------------------------------------------------------------------
kdelibs4.changes: same change
New:
----
76e0376d-kdelibs-soprano-276-1.diff
bde5aad1-kdelibs-soprano-276-2.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdelibs4.spec ++++++
--- /var/tmp/diff_new_pack.Cb8IoV/_old 2012-06-28 15:30:13.000000000 +0200
+++ /var/tmp/diff_new_pack.Cb8IoV/_new 2012-06-28 15:30:13.000000000 +0200
@@ -112,6 +112,8 @@
Patch25: fix_kcalc_shortcut.diff
Patch26: fix_kdeclarative_install_location.diff
Patch28: solid_udisks_upower_fix_properties.diff
+Patch29: 76e0376d-kdelibs-soprano-276-1.diff
+Patch30: bde5aad1-kdelibs-soprano-276-2.diff
PreReq: permissions
Requires: soprano >= %( echo `rpm -q --queryformat '%{VERSION}'
libsoprano-devel`)
Recommends: strigi >= %( echo `rpm -q --queryformat '%{VERSION}'
strigi-devel`)
@@ -180,6 +182,8 @@
%patch25
%patch26 -p1
%patch28 -p1
+%patch29 -p1
+%patch30 -p1
#
# define KDE version exactly
++++++ 76e0376d-kdelibs-soprano-276-1.diff ++++++
commit 76e0376d7582cfe5b898c56bf3779ca2279dace8
Author: Vishesh Handa <m...@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 ) ) {
++++++ bde5aad1-kdelibs-soprano-276-2.diff ++++++
commit bde5aad1e9f7bfb6f8d5c60197797de4a315158d
Author: Vishesh Handa <m...@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" );
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
