rpms/kdelibs/F-10 kdelibs-4.3.2-kde#207173.patch, NONE, 1.1 kde4.csh, 1.4, 1.5 kde4.sh, 1.4, 1.5 kdelibs.spec, 1.442, 1.443

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kde4.csh kde4.sh kdelibs.spec 
Added Files:
	kdelibs-4.3.2-kde#207173.patch 
Log Message:
sync w/devel (new khtml patch)


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: kde4.csh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kde4.csh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- kde4.csh	12 May 2009 17:04:16 -0000	1.4
+++ kde4.csh	8 Oct 2009 18:29:53 -0000	1.5
@@ -12,4 +12,3 @@ if ( -f /etc/sysconfig/prelink ) then
    endif
    unset PRELINKING
 endif
-


Index: kde4.sh
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kde4.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- kde4.sh	12 May 2009 17:04:16 -0000	1.4
+++ kde4.sh	8 Oct 2009 18:29:53 -0000	1.5
@@ -9,4 +9,3 @@ if [ -z "$KDE_IS_PRELINKED" ] ; then
   grep -qs '^PRELINKING=yes' /etc/sysconfig/prelink && \
   KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
 fi
-


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-10/kdelibs.spec,v
retrieving revision 1.442
retrieving revision 1.443
diff -u -p -r1.442 -r1.443
--- kdelibs.spec	7 Oct 2009 10:49:19 -0000	1.442
+++ kdelibs.spec	8 Oct 2009 18:29:53 -0000	1.443
@@ -4,7 +4,7 @@
 
 Summary: K Desktop Environment 4 - Libraries
 Version: 4.3.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -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