[SCM] ark packaging branch, master, updated. debian/4.14.2-1-10-g10fd665
Maximiliano Curia
maxy at moszumanska.debian.org
Mon Dec 8 20:58:18 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/ark.git;a=commitdiff;h=d626a86
The following commit has been merged in the master branch:
commit d626a86f4168ae0aaad4d69d473358733a5ed925
Author: Maximiliano Curia <maxy at debian.org>
Date: Tue Nov 11 15:36:37 2014 +0100
New upstream patch: upstream_remove_part_from_KXMLGUIFactory_on_exit
---
debian/changelog | 2 +-
debian/patches/series | 1 +
...pstream_remove_part_from_KXMLGUIFactory_on_exit | 31 ++++++++++++++++++++++
3 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index f691ce0..c9a486b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
ark (4:4.14.2-2~) UNRELEASED; urgency=medium
- *
+ * New upstream patch: upstream_remove_part_from_KXMLGUIFactory_on_exit
-- Maximiliano Curia <maxy at debian.org> Tue, 11 Nov 2014 15:34:34 +0100
diff --git a/debian/patches/series b/debian/patches/series
index 3a9a3d1..f3d27d5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
use_libarchive_for_zip_files
+upstream_remove_part_from_KXMLGUIFactory_on_exit
diff --git a/debian/patches/upstream_remove_part_from_KXMLGUIFactory_on_exit b/debian/patches/upstream_remove_part_from_KXMLGUIFactory_on_exit
new file mode 100644
index 0000000..ada2db5
--- /dev/null
+++ b/debian/patches/upstream_remove_part_from_KXMLGUIFactory_on_exit
@@ -0,0 +1,31 @@
+commit 3b981ca95d8ec10f12102e4432912d12be8233a6
+Author: Elvis Angelaccio <elvis.angelaccio at kdemail.net>
+Date: Sat Oct 25 14:53:24 2014 +0200
+
+ Remove Part from KXMLGUIFactory on exit.
+
+ This commit fixes a KXMLGUIClient warning about a possible crash due to leaks.
+
+ REVIEW: 120783
+
+diff --git a/part/part.cpp b/part/part.cpp
+index 09fe1cb..bae4882 100644
+--- a/part/part.cpp
++++ b/part/part.cpp
+@@ -53,6 +53,7 @@
+ #include <KStandardGuiItem>
+ #include <KTempDir>
+ #include <KToggleAction>
++#include <KXMLGUIFactory>
+
+ #include <QAction>
+ #include <QCursor>
+@@ -137,6 +138,8 @@ Part::Part(QWidget *parentWidget, QObject *parent, const QVariantList& args)
+
+ Part::~Part()
+ {
++ factory()->removeClient(this);
++
+ saveSplitterSizes();
+
+ m_extractFilesAction->menu()->deleteLater();
--
ark packaging
More information about the pkg-kde-commits
mailing list