rpms/kdebase/F-8 kdebase-3.5-khotkeys-crash.patch, 1.1, 1.2 kdebase.spec, 1.290, 1.291

Than Ngo (than) fedora-extras-commits at redhat.com
Mon Mar 3 16:35:32 UTC 2008


Author: than

Update of /cvs/extras/rpms/kdebase/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24446

Modified Files:
	kdebase-3.5-khotkeys-crash.patch kdebase.spec 
Log Message:
apply upstream patch to fix crash in khotkey


kdebase-3.5-khotkeys-crash.patch:

Index: kdebase-3.5-khotkeys-crash.patch
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-8/kdebase-3.5-khotkeys-crash.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdebase-3.5-khotkeys-crash.patch	3 Mar 2008 13:50:55 -0000	1.1
+++ kdebase-3.5-khotkeys-crash.patch	3 Mar 2008 16:35:24 -0000	1.2
@@ -19,3 +19,15 @@
  
  void Condition_list_widget::modify_pressed()
      {
+Index: khotkeys/kcontrol/actions_listview_widget.cpp
+===================================================================
+--- khotkeys/kcontrol/actions_listview_widget.cpp	(Revision 781557)
++++ khotkeys/kcontrol/actions_listview_widget.cpp	(Revision 781558)
+@@ -110,6 +110,7 @@
+ //    if( nw == NULL )
+ //        nw = current_action()->itemBelow();
+     delete saved_current_item;
++    saved_current_item = NULL;
+     recent_item = NULL;
+ //    if( nw != NULL )
+ //        {


Index: kdebase.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase/F-8/kdebase.spec,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -r1.290 -r1.291
--- kdebase.spec	3 Mar 2008 13:50:55 -0000	1.290
+++ kdebase.spec	3 Mar 2008 16:35:24 -0000	1.291
@@ -12,7 +12,7 @@
 %define _with_samba --with-samba
 
 Version: 3.5.9
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdebase3
@@ -795,9 +795,11 @@
 
 
 %changelog
+* Mon Mar 03 2008 Than Ngo <than at redhat.com> 3.5.9-4
+- apply upstream patch to fix crash in khotkey
+
 * Thu Feb 28 2008 Than Ngo <than at redhat.com> 3.5.9-3
 - apply upstream patch to unbreak lmsensors support again
-- apply upstream patch to fix crash in khotkey
 
 * Wed Feb 27 2008 Rex Dieter <rdieter at fedoraproject.org> - 3.5.9-2
 - f9+: don't omit all of khelpcenter, some is needed for kde3 apps' help




More information about the fedora-extras-commits mailing list