rpms/kdebase-workspace/F-9 kdebase-workspace-4.2.4-kde#165726-klipper-crash.patch, NONE, 1.1 kdebase-workspace.spec, 1.153, 1.154

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-workspace/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22717/F-9

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.2.4-kde#165726-klipper-crash.patch 
Log Message:
* Fri Jun 05 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.4-3
- fix Klipper crashes when destroying the popup (#497740, kde#165726)

(Note: This is already fixed in 4.3 as part of a larger commit, so the patch is not needed in devel.)

kdebase-workspace-4.2.4-kde#165726-klipper-crash.patch:

--- NEW FILE kdebase-workspace-4.2.4-kde#165726-klipper-crash.patch ---
diff -ur kdebase-workspace-4.2.4/klipper/urlgrabber.cpp kdebase-workspace-4.2.4-kde#165726-klipper-crash/klipper/urlgrabber.cpp
--- kdebase-workspace-4.2.4/klipper/urlgrabber.cpp	2008-11-04 18:12:28.000000000 +0100
+++ kdebase-workspace-4.2.4-kde#165726-klipper-crash/klipper/urlgrabber.cpp	2009-06-05 01:56:23.000000000 +0200
@@ -153,7 +153,8 @@
     if ( m_myClipData.isEmpty() )
         return;
 
-    ActionListIterator it( matchingActions( m_myClipData ) );
+    ActionList matchingActionsList = matchingActions( m_myClipData );
+    ActionListIterator it( matchingActionsList );
     ClipAction *action = 0L;
     ClipCommand *command = 0L;
 


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-workspace/F-9/kdebase-workspace.spec,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -p -r1.153 -r1.154
--- kdebase-workspace.spec	2 Jun 2009 10:28:28 -0000	1.153
+++ kdebase-workspace.spec	5 Jun 2009 00:03:09 -0000	1.154
@@ -8,7 +8,7 @@ Summary: K Desktop Environment - Workspa
 Name: kdebase-workspace
 Version: 4.2.4
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -30,6 +30,12 @@ Patch12: kdebase-workspace-4.2.0-default
 Patch13: kdebase-workspace-4.2.0-pykde4.patch
 Patch14: kdebase-workspace-4.2.0-klipper-arora.patch
 Patch15: kdebase-workspace-4.2.0-kio_sysinfo.patch
+# This one should fix:
+# * kde#165726: klipper crashed when opening link with external application
+# * #497740: Klipper segfaults on disabling actions from popup window
+# which appear to have the same root cause. It's already fixed in 4.3 as part of
+# a larger commit, but the fix never got backported to 4.2.
+Patch16: kdebase-workspace-4.2.4-kde#165726-klipper-crash.patch
 
 # upstream patches:
 # trunk
@@ -233,6 +239,7 @@ popd
 %patch14 -p1 -b .klipper-arora
 # kio_sysinfo based on OpenSUSE's patch
 %patch15 -p1 -b .kio_sysinfo
+%patch16 -p1 -b .kde#165726
 
 # upstream patches
 %patch100 -p1 -b .AllowExternalPaths
@@ -518,8 +525,11 @@ fi
 
 
 %changelog
+* Fri Jun 05 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.4-3
+- fix Klipper crashes when destroying the popup (#497740, kde#165726)
+
 * Sun May 31 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.4-2
-- make default_leonidas.png the default face icon on F11
+- make default_leonidas.png the default face icon on F11 (#503347)
 
 * Sat May 30 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.4-1
 - KDE 4.2.4