diff --git a/Stop-crashing-on-exit-when-being-used-solely-as-a-KP.patch b/Stop-crashing-on-exit-when-being-used-solely-as-a-KP.patch new file mode 100644 index 0000000..550326c --- /dev/null +++ b/Stop-crashing-on-exit-when-being-used-solely-as-a-KP.patch @@ -0,0 +1,32 @@ +diff -up ark-4.14.3/app/mainwindow.cpp.0004 ark-4.14.3/app/mainwindow.cpp +--- ark-4.14.3/app/mainwindow.cpp.0004 2014-10-25 07:53:24.000000000 -0500 ++++ ark-4.14.3/app/mainwindow.cpp 2014-11-24 08:49:01.799233095 -0600 +@@ -38,6 +38,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -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 -up ark-4.14.3/part/part.cpp.0004 ark-4.14.3/part/part.cpp +--- ark-4.14.3/part/part.cpp.0004 2014-11-24 08:49:01.799233095 -0600 ++++ ark-4.14.3/part/part.cpp 2014-11-24 08:50:35.638688148 -0600 +@@ -138,7 +138,7 @@ Part::Part(QWidget *parentWidget, QObjec + + Part::~Part() + { +- factory()->removeClient(this); ++ //factory()->removeClient(this); + + saveSplitterSizes(); + diff --git a/ark.spec b/ark.spec index 794e1f9..3831637 100644 --- a/ark.spec +++ b/ark.spec @@ -5,7 +5,7 @@ Name: ark Summary: Archive manager Version: 4.14.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: http://utils.kde.org/projects/ark @@ -26,6 +26,9 @@ Patch53: ark-4.9.97-improve_subfolder_autodetection.patch Patch54: ark-unar-06.patch ## upstream patches +# Applications/14.12 branch +# https://bugs.kde.org/show_bug.cgi?id=341187 +Patch100: Stop-crashing-on-exit-when-being-used-solely-as-a-KP.patch BuildRequires: bzip2-devel BuildRequires: desktop-file-utils @@ -87,6 +90,8 @@ Provides: kdeutils-ark-libs = 6:%{version}-%{release} %patch53 -p1 -b .improve_subfolder_autodetection %patch54 -p1 -b .unar-06 +%patch100 -p1 -b .kde341187 + %build mkdir -p %{_target_platform} @@ -147,6 +152,9 @@ fi %changelog +* Mon Nov 24 2014 Rex Dieter 4.14.3-3 +- backport crash fix for nested archives (kde#341187) + * Tue Nov 18 2014 Rex Dieter 4.14.3-2 - omit KXMLGUIClient patch, it was fixed differently upstream (kde#340991)