rpms/kdelibs/F-10 kdelibs-4.2.2-bidi-kde#189161.patch, NONE, 1.1 kdelibs-4.2.2-kjob.patch, NONE, 1.1 kdelibs.spec, 1.413, 1.414

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15627/F-10

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-4.2.2-bidi-kde#189161.patch kdelibs-4.2.2-kjob.patch 
Log Message:
Sync from devel:

* Fri Apr 10 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-5
- fix bidi-related hangs in khtml (kde#189161)

* Wed Apr 08 2009 Than Ngo <than at redhat.com> - 4.2.2-4
- upstream patch fix ReadOnlyPart crash for non-local file

kdelibs-4.2.2-bidi-kde#189161.patch:

--- NEW FILE kdelibs-4.2.2-bidi-kde#189161.patch ---
--- branches/KDE/4.2/kdelibs/khtml/rendering/bidi.cpp	2009/04/02 20:19:16	948353
+++ branches/KDE/4.2/kdelibs/khtml/rendering/bidi.cpp	2009/04/08 23:48:02	951343
@@ -297,6 +297,7 @@
                 && next->isInlineFlow()))
             break;
         current = next;
+        next    = 0;
     }
     return next;
 }

kdelibs-4.2.2-kjob.patch:

--- NEW FILE kdelibs-4.2.2-kjob.patch ---
Index: kdeui/jobs/kuiserverjobtracker.cpp
===================================================================
--- kdeui/jobs/kuiserverjobtracker.cpp	(Revision 950982)
+++ kdeui/jobs/kuiserverjobtracker.cpp	(Revision 950983)
@@ -35,13 +35,32 @@
 class KUiServerJobTracker::Private
 {
 public:
-    Private() { }
+    Private(KUiServerJobTracker *parent)
+        : q(parent)
+    {
+    }
 
+    KUiServerJobTracker *const q;
+
+    void _k_killJob();
+
     QHash<KJob*, org::kde::JobView*> progressJobView;
 };
 
+void KUiServerJobTracker::Private::_k_killJob()
+{
+    org::kde::JobView *jobView = qobject_cast<org::kde::JobView*>(q->sender());
+
+    if (jobView) {
+        KJob *job = progressJobView.key(jobView);
+
+        if (job)
+            job->kill(KJob::EmitResult);
+    }
+}
+
 KUiServerJobTracker::KUiServerJobTracker(QObject *parent)
-    : KJobTrackerInterface(parent), d(new Private)
+    : KJobTrackerInterface(parent), d(new Private(this))
 {
 
 }
@@ -81,8 +100,8 @@
                                                            reply.value().path(),
                                                            QDBusConnection::sessionBus());
 
-        QObject::connect(jobView, SIGNAL(cancelRequested()), job,
-                         SLOT(kill()));
+        QObject::connect(jobView, SIGNAL(cancelRequested()), this,
+                         SLOT(_k_killJob()));
         QObject::connect(jobView, SIGNAL(suspendRequested()), job,
                          SLOT(suspend()));
         QObject::connect(jobView, SIGNAL(resumeRequested()), job,
Index: kdeui/jobs/kuiserverjobtracker.h
===================================================================
--- kdeui/jobs/kuiserverjobtracker.h	(Revision 950982)
+++ kdeui/jobs/kuiserverjobtracker.h	(Revision 950983)
@@ -78,6 +78,8 @@
 private:
     class Private;
     Private *const d;
+
+    Q_PRIVATE_SLOT(d, void _k_killJob())
 };
 
 #endif


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -r1.413 -r1.414
--- kdelibs.spec	7 Apr 2009 16:10:05 -0000	1.413
+++ kdelibs.spec	10 Apr 2009 22:26:18 -0000	1.414
@@ -1,6 +1,6 @@
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.2.2
-Release: 3%{?dist}
+Release: 5%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -88,6 +88,8 @@
 # upstream
 # 4.2 branch
 Patch100: kdelibs-4.2.2-kio_http.patch
+Patch101: kdelibs-4.2.2-kjob.patch
+Patch102: kdelibs-4.2.2-bidi-kde#189161.patch
 
 # 4.3 branch
 Patch200: kdelibs-4.1.96-AllowExternalPaths.patch
@@ -229,6 +231,8 @@
 # upstream patches
 # 4.2
 %patch100 -p0 -b .kio_http
+%patch101 -p0 -b .kjob
+%patch102 -p4 -b .bidi-kde#189161
 
 # 4.3
 %patch200 -p1 -b .AllowExternalPaths
@@ -413,6 +417,12 @@
 
 
 %changelog
+* Fri Apr 10 2009 Rex Dieter <rdieter at fedoraproject.org> 4.2.2-5
+- fix bidi-related hangs in khtml (kde#189161)
+
+* Wed Apr 08 2009 Than Ngo <than at redhat.com> - 4.2.2-4
+- upstream patch fix ReadOnlyPart crash for non-local file
+
 * Tue Apr 07 2009 Than Ngo <than at redhat.com> - 4.2.2-3
 - fix kickoff focus issue