rpms/kdelibs/devel kdelibs-4.3.2-kde#207173.patch, NONE, 1.1 kdelibs.spec, 1.521, 1.522
Rex Dieter
rdieter at fedoraproject.org
Thu Oct 8 18:26:19 UTC 2009
Author: rdieter
Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26597/devel
Modified Files:
kdelibs.spec
Added Files:
kdelibs-4.3.2-kde#207173.patch
Log Message:
* Thu Oct 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.3.2-3
- khtml kpart crasher (kde #207173/209876)
kdelibs-4.3.2-kde#207173.patch:
khtml_part.cpp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE kdelibs-4.3.2-kde#207173.patch ---
Subject: branches/KDE/4.3/kdelibs/khtml
Date: Thursday 08 October 2009
From: David Faure <faure at kde.org>
To: kde-commits at kde.org
Cc: khtml-cvs at 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;
}
Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.521
retrieving revision 1.522
diff -u -p -r1.521 -r1.522
--- kdelibs.spec 7 Oct 2009 10:39:07 -0000 1.521
+++ kdelibs.spec 8 Oct 2009 18:26:19 -0000 1.522
@@ -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 at fedoraproject.org> - 4.3.2-3
+- khtml kpart crasher (kde #207173/209876)
+
* Wed Oct 07 2009 Than Ngo <than at redhat.com> - 4.3.2-2
- fix a deadlock in KLocale
More information about the fedora-extras-commits
mailing list