add backported patch to fix crash when closing window in kopete [release 4.14.15-2mamba;Tue Dec 29 2015]

kdelibs-4.14.15-upstream-backport-to-fix-kopete-crash.patch

@@ -0,0 +1,52 @@
+From: Alex Merry <alex.merry@kde.org>
+Date: Tue, 15 Dec 2015 19:26:47 +0000
+Subject: Revert "backport commit b72fc5e56579035bf987075e16324ef95ef8e3d4"
+X-Git-Url: http://quickgit.kde.org/?p=kdelibs.git&a=commitdiff&h=a02df05e4bd083f98147c86f88da2f818fc6c9f4
+---
+Revert "backport commit b72fc5e56579035bf987075e16324ef95ef8e3d4"
+
+This reverts commit 4f7ea2f770cf062ef22293fbb21a086f3e0cbfcb.
+
+This change seems to be causing more problems than it fixes - it's
+probably just too big of a behaviour change for kdelibs. Which means
+that akregator will probably keep randomly crashing, but the alternative
+seems to be various other applications consistently crashing at exit.
+
+If we can fix those applications (Kopete in particular), we can consider
+re-applying this afterwards.
+
+BUG: 355275
+---
+
+
+--- a/kparts/part.cpp
++++ b/kparts/part.cpp
+@@ -350,7 +350,7 @@
+     d->m_widget = 0;
+     if (d->m_autoDeletePart) {
+         kDebug(1000) << "deleting part" << objectName();
+-        this->deleteLater();
++        delete this; // ouch, this should probably be deleteLater()
+     }
+ }
+ 
+
+--- a/kparts/tests/parttest.cpp
++++ b/kparts/tests/parttest.cpp
+@@ -48,7 +48,6 @@
+     KParts::Part* part = new TestPart(0, 0);
+     QPointer<KParts::Part> partPointer(part);
+     delete part->widget();
+-    QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
+     QVERIFY(partPointer.isNull());
+ }
+ 
+@@ -58,7 +57,6 @@
+     QPointer<KParts::Part> partPointer(part);
+     QPointer<QWidget> widgetPointer(part->widget());
+     delete part;
+-    QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
+     QVERIFY(widgetPointer.isNull());
+ }
+ 
+

kdelibs.spec

@@ -34,7 +34,7 @@
 %endif
 Name:          kdelibs
 Version:       4.14.15
-Release:       1mamba
+Release:       2mamba
 Summary:       KDE Software Compilation - Core Libraries
 Group:         Graphical Desktop/Libraries/KDE
 Vendor:        openmamba
@@ -48,6 +48,7 @@ Patch1:        %{name}-4.7.0-openmamba_wallpaper.patch
 Patch2:        %{name}-4.6.1-no_kbookmark_write_error.patch
 Patch3:        %{name}-4.6.2-fix_kded_high_cpu_load.patch
 Patch4:        kdelibs-4.14.0-arm-offscreen-fix.patch
+Patch5:        kdelibs-4.14.15-upstream-backport-to-fix-kopete-crash.patch
 License:       LGPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
@@ -172,6 +173,7 @@ This package includes the KDE API documentation needed by the developers of KDE
 %ifarch arm
 %patch4 -p1
 %endif
+%patch5 -p1
 
 %build
 #:<< _EOF
@@ -427,6 +429,9 @@ exit 0
 %{_kde4_htmldir}/en/kioslave/
 
 %changelog
+* Tue Dec 29 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 4.14.15-2mamba
+- add backported patch to fix crash when closing window in kopete
+
 * Wed Dec 23 2015 Silvan Calarco <silvan.calarco@mambasoft.it> 4.14.15-1mamba
 - update to 4.14.15
 

kdelibs4-rpmmacros_kde4.in

@@ -11,7 +11,7 @@
 %_kde4_dbusservicesdir    %_datadir/dbus-1/services
 %_kde4_dbussystemservicesdir %_datadir/dbus-1/system-services
 %_kde4_htmldir            %_kde4_prefix/share/doc/HTML
-%_kde4_icondir            %_prefix/share/icons
+%_kde4_icondir            %_kde4_prefix/share/icons
 %_kde4_kcfgdir            %_kde4_prefix/share/config.kcfg
 %_kde4_kconfupdatedir     %_kde4_prefix/share/apps/kconf_update
 %_kde4_includedir         %_kde4_prefix/include