From b459bc2531ad507b99e566dc78495d97478e3fca Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 8 May 2016 07:06:35 -0500 Subject: [PATCH] 4.14.20 (kde-apps-16.04.1) --- .gitignore | 2 +- ...eteLater-in-Part-slotWidgetDestroyed.patch | 51 ------------------- kdelibs.spec | 11 ++-- sources | 2 +- 4 files changed, 9 insertions(+), 57 deletions(-) delete mode 100644 Use-deleteLater-in-Part-slotWidgetDestroyed.patch diff --git a/.gitignore b/.gitignore index 183842f..ed22a1a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/kdelibs-4.14.19.tar.xz +/kdelibs-4.14.20.tar.xz diff --git a/Use-deleteLater-in-Part-slotWidgetDestroyed.patch b/Use-deleteLater-in-Part-slotWidgetDestroyed.patch deleted file mode 100644 index 838a5b1..0000000 --- a/Use-deleteLater-in-Part-slotWidgetDestroyed.patch +++ /dev/null @@ -1,51 +0,0 @@ -commit 4f7ea2f770cf062ef22293fbb21a086f3e0cbfcb -Author: Allen Winter -Date: Tue Oct 20 16:36:32 2015 -0400 - - backport commit b72fc5e56579035bf987075e16324ef95ef8e3d4 - Author: Alex Merry - Date: Mon Oct 19 20:54:13 2015 +0100 - - Use deleteLater in Part::slotWidgetDestroyed(). - - When a part's main widget is destroyed, we should not delete the part - immediately - both because deleting an object from inside one of its - signals is not safe generally, and because derived classes may well hold - QPointers to the widgets, expecting them to be cleared between the - widget being destroyed and the part being destroyed. - - MERGE: none - -diff --git a/kparts/part.cpp b/kparts/part.cpp -index 20089d4..2cfee81 100644 ---- a/kparts/part.cpp -+++ b/kparts/part.cpp -@@ -350,7 +350,7 @@ void Part::slotWidgetDestroyed() - d->m_widget = 0; - if (d->m_autoDeletePart) { - kDebug(1000) << "deleting part" << objectName(); -- delete this; // ouch, this should probably be deleteLater() -+ this->deleteLater(); - } - } - -diff --git a/kparts/tests/parttest.cpp b/kparts/tests/parttest.cpp -index e48b578..232aa07 100644 ---- a/kparts/tests/parttest.cpp -+++ b/kparts/tests/parttest.cpp -@@ -48,6 +48,7 @@ void PartTest::testAutoDeletePart() - KParts::Part* part = new TestPart(0, 0); - QPointer partPointer(part); - delete part->widget(); -+ QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); - QVERIFY(partPointer.isNull()); - } - -@@ -57,6 +58,7 @@ void PartTest::testAutoDeleteWidget() - QPointer partPointer(part); - QPointer widgetPointer(part->widget()); - delete part; -+ QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); - QVERIFY(widgetPointer.isNull()); - } - diff --git a/kdelibs.spec b/kdelibs.spec index c0c84f1..102c1d9 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -49,9 +49,9 @@ Summary: KDE Libraries # shipped with kde applications, version... -%global apps_version 16.04.0 -Version: 4.14.19 -Release: 4%{?dist} +%global apps_version 16.04.1 +Version: 4.14.20 +Release: 1%{?dist} Name: kdelibs Epoch: 6 @@ -868,6 +868,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Sun May 08 2016 Rex Dieter - 6:4.14.20-1 +- 4.14.20 (kde-apps-16.04.1) + * Fri May 06 2016 Rex Dieter - 6:4.14.19-4 - drop strigi support (f25+) @@ -878,7 +881,7 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : - rebuild (qt) * Fri Apr 15 2016 Rex Dieter - 6:4.14.19-1 -- 4.4.19 (kde-apps-16.04.0) +- 4.14.19 (kde-apps-16.04.0) * Mon Apr 11 2016 Rex Dieter - 6:4.14.18-3 - Recommends: kde-platform-plugin kde-style-breeze, moved soft dep here, workaround bug #1325471 diff --git a/sources b/sources index 6986726..515e17a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f4a8e9a726a8d2a0bbdc53feeed044a9 kdelibs-4.14.19.tar.xz +06f0642f4f97d51b5fe6ed8123dda330 kdelibs-4.14.20.tar.xz