[SCM] ark packaging branch, master, updated. debian/4.14.2-1-30-gfda9e84

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ark.git;a=commitdiff;h=bee7db8

The following commit has been merged in the master branch:
commit bee7db8795f8c91497e58418ff5d13d46fdafb09
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Feb 23 16:41:19 2015 +0100

    Remove upstream patches.
---
 debian/changelog                                   |  3 ++
 debian/patches/series                              |  2 -
 ...pstream_remove_part_from_KXMLGUIFactory_on_exit | 31 -----------
 debian/patches/upstream_stop_crashing_on_exit      | 61 ----------------------
 4 files changed, 3 insertions(+), 94 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ab72ae4..906b858 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ ark (4:14.12.2-1~) UNRELEASED; urgency=medium
   * New upstream release (4.14.3).
   * New upstream release (14.12.2).
   * Bump Standards-Version to 3.9.6, no changes needed.
+  * Remove upstream patch:
+    upstream_remove_part_from_KXMLGUIFactory_on_exit
+  * Remove upstream patch: upstream_stop_crashing_on_exit
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 23 Feb 2015 14:32:31 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 8e78926..3a9a3d1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 use_libarchive_for_zip_files
-upstream_remove_part_from_KXMLGUIFactory_on_exit
-upstream_stop_crashing_on_exit
diff --git a/debian/patches/upstream_remove_part_from_KXMLGUIFactory_on_exit b/debian/patches/upstream_remove_part_from_KXMLGUIFactory_on_exit
deleted file mode 100644
index ada2db5..0000000
--- a/debian/patches/upstream_remove_part_from_KXMLGUIFactory_on_exit
+++ /dev/null
@@ -1,31 +0,0 @@
-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();
diff --git a/debian/patches/upstream_stop_crashing_on_exit b/debian/patches/upstream_stop_crashing_on_exit
deleted file mode 100644
index e47b099..0000000
--- a/debian/patches/upstream_stop_crashing_on_exit
+++ /dev/null
@@ -1,61 +0,0 @@
-commit 9c30f30b38c36a31e6fcb3aa047a0247ac5a22fb
-Author: Raphael Kubo da Costa <rakuco at FreeBSD.org>
-Date:   Mon Nov 24 01:37:06 2014 +0200
-
-    Stop crashing on exit when being used solely as a KPart.
-    
-    This change fixes a crash introduced by commit 3b981ca ("Remove Part
-    from KXMLGUIFactory on exit").
-    
-    Part::~Part() is the wrong place to call KXMLGUIFactory::removeClient(),
-    as it assumes addClient() had been called in the first place.
-    
-    This is only true if Ark is called as a standalone program, since that
-    is done in MainWindow::loadPart()'s call to KXMLGuiWindow::createGUI().
-    
-    Conversely, if the Ark KPart is being used as an embedded viewer in,
-    say, Konqueror or to preview an archive inside an archive (ie. Ark
-    inside Ark) that does not hold true and we try to access a
-    KXMLGUIFactory that does not exist.
-    
-    Instead, call KXMLGuiWindow::removeClient() in MainWindow's destructor,
-    since in this case we are certain that addClient() was been called
-    before.
-    
-    BUG:      341187
-    FIXED-IN: 14.12
-
-diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
-index aee8231..181fe76 100644
---- a/app/mainwindow.cpp
-+++ b/app/mainwindow.cpp
-@@ -38,6 +38,7 @@
- #include <KDebug>
- #include <KEditToolBar>
- #include <KShortcutsDialog>
-+#include <KXMLGUIFactory>
- 
- #include <QDragEnterEvent>
- #include <QDragMoveEvent>
-@@ -69,6 +70,8 @@ MainWindow::~MainWindow()
-     if (m_recentFilesAction) {
-         m_recentFilesAction->saveEntries(KGlobal::config()->group("Recent Files"));
-     }
-+
-+    guiFactory()->removeClient(m_part);
-     delete m_part;
-     m_part = 0;
- }
-diff --git a/part/part.cpp b/part/part.cpp
-index 88f7057..4d5b42f 100644
---- a/part/part.cpp
-+++ b/part/part.cpp
-@@ -139,8 +139,6 @@ Part::Part(QWidget *parentWidget, QObject *parent, const QVariantList& args)
- 
- Part::~Part()
- {
--    factory()->removeClient(this);
--
-     qDeleteAll(m_previewDirList);
- 
-     saveSplitterSizes();

-- 
ark packaging