rpms/kdelibs
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Thu Oct 08 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.2-3

Browse Source 
- khtml kpart crasher (kde #207173/209876)
This commit is contained in:
Rex Dieter 2009-10-08 18:26:19 +00:00
parent 297b45d498
commit b056ba112f
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
kdelibs-4.3.2-kde#207173.patch Normal file
View File

@ -0,0 +1,31 @@
Subject: branches/KDE/4.3/kdelibs/khtml
Date: Thursday 08 October 2009
From: David Faure <faure@kde.org>
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;
}

5
kdelibs.spec
View File

@ -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 <rdieter@fedoraproject.org> - 4.3.2-3
- khtml kpart crasher (kde #207173/209876)
* Wed Oct 07 2009 Than Ngo <than@redhat.com> - 4.3.2-2
- fix a deadlock in KLocale