rpms/kdesdk/devel kdesdk-4.2.0-kompare-qt45-crash.patch, NONE, 1.1 kdesdk.spec, 1.133, 1.134

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdesdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4639/devel

Modified Files:
	kdesdk.spec 
Added Files:
	kdesdk-4.2.0-kompare-qt45-crash.patch 
Log Message:
* Thu Feb 19 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.0-2
- fix Kompare crash with Qt 4.5 (kde#182792)

kdesdk-4.2.0-kompare-qt45-crash.patch:

--- NEW FILE kdesdk-4.2.0-kompare-qt45-crash.patch ---
Index: kompare/libdiff2/komparemodellist.cpp
===================================================================
--- kompare/libdiff2/komparemodellist.cpp	(Revision 924538)
+++ kompare/libdiff2/komparemodellist.cpp	(Revision 924539)
@@ -468,7 +468,7 @@
 		emit error( m_diffProcess->stdErr() );
 	}
 
-	delete m_diffProcess;
+	m_diffProcess->deleteLater();
 	m_diffProcess = 0;
 }
 


Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/devel/kdesdk.spec,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- kdesdk.spec	22 Jan 2009 12:21:02 -0000	1.133
+++ kdesdk.spec	19 Feb 2009 02:35:54 -0000	1.134
@@ -1,6 +1,6 @@
 Name:           kdesdk
 Version:        4.2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The KDE Software Development Kit (SDK)
 
 Group:          User Interface/Desktops
@@ -9,6 +9,10 @@
 URL:            http://www.kde.org/
 Source0:        ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
 # upstream patches
+# fix Kompare crash with Qt 4.5 (kde#182792)
+# http://websvn.kde.org/?view=rev&revision=924539
+# part of 4.2.1 mass backport: http://websvn.kde.org/?view=rev&revision=928150
+Patch100:       kdesdk-4.2.0-kompare-qt45-crash.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdepimlibs-devel >= %{version}
@@ -82,6 +86,7 @@
 %setup -q
 
 # upstream patches
+%patch100 -p0 -b .kompare-qt45-crash
 
 %build
 mkdir -p %{_target_platform}
@@ -215,6 +220,9 @@
 
 
 %changelog
+* Thu Feb 19 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.2.0-2
+- fix Kompare crash with Qt 4.5 (kde#182792)
+
 * Thu Jan 22 2009 Than Ngo <than at redhat.com> - 4.2.0-1
 - 4.2.0