diff --git a/kdesdk-4.2.0-kompare-qt45-crash.patch b/kdesdk-4.2.0-kompare-qt45-crash.patch new file mode 100644 index 0000000..e02a2ed --- /dev/null +++ b/kdesdk-4.2.0-kompare-qt45-crash.patch @@ -0,0 +1,13 @@ +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; + } + diff --git a/kdesdk.spec b/kdesdk.spec index 94fb586..3cfa583 100644 --- a/kdesdk.spec +++ b/kdesdk.spec @@ -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 @@ License: GPLv2 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 @@ xml2pot %setup -q # upstream patches +%patch100 -p0 -b .kompare-qt45-crash %build mkdir -p %{_target_platform} @@ -215,6 +220,9 @@ rm -rf %{buildroot} %changelog +* Thu Feb 19 2009 Kevin Kofler 4.2.0-2 +- fix Kompare crash with Qt 4.5 (kde#182792) + * Thu Jan 22 2009 Than Ngo - 4.2.0-1 - 4.2.0