fix bz#830178, regression in 4.8.4

This commit is contained in:
Than Ngo 2012-06-14 13:15:49 +02:00
parent 441e6b81c3
commit dadd747f5a
2 changed files with 24 additions and 1 deletions

View File

@ -0,0 +1,15 @@
diff -up kdelibs-4.8.4/nepomuk/core/nepomukmainmodel.cpp.me kdelibs-4.8.4/nepomuk/core/nepomukmainmodel.cpp
--- kdelibs-4.8.4/nepomuk/core/nepomukmainmodel.cpp.me 2012-06-14 13:10:17.239843879 +0200
+++ kdelibs-4.8.4/nepomuk/core/nepomukmainmodel.cpp 2012-06-14 13:11:00.724779658 +0200
@@ -94,10 +94,9 @@ 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;
- localSocketClient.disconnect();
QString socketName = KGlobal::dirs()->locateLocal( "socket", "nepomuk-socket" );
kDebug() << "Connecting to local socket" << socketName;
if ( localSocketClient.connect( socketName ) ) {

View File

@ -25,7 +25,7 @@
Summary: KDE Libraries
Version: 4.8.4
Release: 3%{?dist}
Release: 4%{?dist}
Name: kdelibs
Epoch: 6
@ -145,6 +145,10 @@ Patch53: kdelibs-4.7.2-kjs-s390.patch
## upstream
# fix kdeclarative install location (by wstephenson as found in kde-packager list)
Patch100: kdelibs-4.8.3-kdeclarative-install-location.patch
# bz#830178
# http://commits.kde.org/kdelibs/76e0376d7582cfe5b898c56bf3779ca2279dace8
# http://commits.kde.org/kdelibs/bde5aad1e9f7bfb6f8d5c60197797de4a315158d
Patch101: kdelibs-4.8.4-nepomuk-regression.patch
## security fix
# Not Upstreamed? why not ? -- Rex
@ -355,6 +359,7 @@ popd
# upstream patches
%patch100 -p1 -b .kdeclarative-install-location
%patch101 -p1 -b .nepomuk-regression
# security fixes
%patch200 -p1 -b .CVE-2009-2702
@ -610,6 +615,9 @@ rm -rf %{buildroot}
%changelog
* Thu Jun 14 2012 Than Ngo <than@redhat.com> - 5:4.8.4-4
- fix bz#830178, regression in 4.8.4
* Thu Jun 07 2012 Lukáš Tinkl <ltinkl@redhat.com> - 6:4.8.4-3
- another respin