From b8733f9b045b93119a450111da98ad5b4663e65a Mon Sep 17 00:00:00 2001
From: Kevin Kofler <kkofler@fedoraproject.org>
Date: Fri, 10 Apr 2009 22:26:18 +0000
Subject: [PATCH] Sync from devel:

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

* Wed Apr 08 2009 Than Ngo <than@redhat.com> - 4.2.2-4
- upstream patch fix ReadOnlyPart crash for non-local file
---
 kdelibs-4.2.2-bidi-kde#189161.patch | 10 +++++
 kdelibs-4.2.2-kjob.patch            | 63 +++++++++++++++++++++++++++++
 kdelibs.spec                        | 12 +++++-
 3 files changed, 84 insertions(+), 1 deletion(-)
 create mode 100644 kdelibs-4.2.2-bidi-kde#189161.patch
 create mode 100644 kdelibs-4.2.2-kjob.patch

diff --git a/kdelibs-4.2.2-bidi-kde#189161.patch b/kdelibs-4.2.2-bidi-kde#189161.patch
new file mode 100644
index 0000000..21da024
--- /dev/null
+++ b/kdelibs-4.2.2-bidi-kde#189161.patch
@@ -0,0 +1,10 @@
+--- 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;
+ }
diff --git a/kdelibs-4.2.2-kjob.patch b/kdelibs-4.2.2-kjob.patch
new file mode 100644
index 0000000..86efa44
--- /dev/null
+++ b/kdelibs-4.2.2-kjob.patch
@@ -0,0 +1,63 @@
+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
diff --git a/kdelibs.spec b/kdelibs.spec
index 659cd6e..1276a23 100644
--- a/kdelibs.spec
+++ b/kdelibs.spec
@@ -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 @@ Patch26: kdelibs-4.2.2-plasma-focus.patch
 # 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 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 # 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 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Apr 10 2009 Rex Dieter <rdieter@fedoraproject.org> 4.2.2-5
+- fix bidi-related hangs in khtml (kde#189161)
+
+* Wed Apr 08 2009 Than Ngo <than@redhat.com> - 4.2.2-4
+- upstream patch fix ReadOnlyPart crash for non-local file
+
 * Tue Apr 07 2009 Than Ngo <than@redhat.com> - 4.2.2-3
 - fix kickoff focus issue