From a43e12f075f13bdd7355a47de10f57be49da66cc Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 8 Oct 2009 18:26:18 +0000 Subject: [PATCH] * Thu Oct 08 2009 Rex Dieter - 4.3.2-3 - khtml kpart crasher (kde #207173/209876) --- kdelibs-4.3.2-kde#207173.patch | 31 +++++++++++++++++++++++++++++++ kdelibs.spec | 5 +++++ 2 files changed, 36 insertions(+) create mode 100644 kdelibs-4.3.2-kde#207173.patch diff --git a/kdelibs-4.3.2-kde#207173.patch b/kdelibs-4.3.2-kde#207173.patch new file mode 100644 index 0000000..6b66f46 --- /dev/null +++ b/kdelibs-4.3.2-kde#207173.patch @@ -0,0 +1,31 @@ +Subject: branches/KDE/4.3/kdelibs/khtml +Date: Thursday 08 October 2009 +From: David Faure +To: kde-commits@kde.org +Cc: khtml-cvs@kde.org + +SVN commit 1032787 by dfaure: + +Backport fix for 207173/209876: Hide the whole widget, not just the view and +the +viewport. Otherwise the findbar stays around, receives focus, and this makes +the +partmanager activate the part that we're currently deleting... +Forgot to do this before 4.3.2, so the fix will be in 4.3.3 :( +CCBUG: 207173 + + + M +1 -2 khtml_part.cpp + + +--- branches/KDE/4.3/kdelibs/khtml/khtml_part.cpp #1032786:1032787 +@@ -609,8 +609,7 @@ + + if ( d->m_view ) + { +- d->m_view->hide(); +- d->m_view->viewport()->hide(); ++ widget()->hide(); + d->m_view->m_part = 0; + } + diff --git a/kdelibs.spec b/kdelibs.spec index b5a1e00..9793357 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -80,6 +80,7 @@ Patch24: kdelibs-4.3.1-drkonq.patch # upstream # 4.3 branch Patch100: kdelibs-4.3.2-kde#209712.patch +Patch101: kdelibs-4.3.2-kde#207173.patch # security fix Patch200: kdelibs-4.3.1-CVE-2009-2702.patch @@ -203,6 +204,7 @@ format for easy browsing. # upstream patches # 4.3 %patch100 -p0 -b .kde#209712 +%patch101 -p4 -b .kde#207173.patch # security fix %patch200 -p1 -b .CVE-2009-2702 @@ -395,6 +397,9 @@ rm -rf %{buildroot} %changelog +* Thu Oct 08 2009 Rex Dieter - 4.3.2-3 +- khtml kpart crasher (kde #207173/209876) + * Wed Oct 07 2009 Than Ngo - 4.3.2-2 - fix a deadlock in KLocale