Hello community,

here is the log from the commit of package kdeutils4 for openSUSE:Factory
checked in at Mon Jul 11 15:51:09 CEST 2011.



--------
--- KDE/kdeutils4/kdeutils4.changes     2011-07-09 11:17:17.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdeutils4/kdeutils4.changes    2011-07-11 
13:25:54.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Jul 11 11:20:23 UTC 2011 - [email protected]
+
+- Apply ark-fix-append.patch: fix Ark crash when adding a file
+  to 7z, zip or rar archives, upstream r1240908 
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  ark-fix-append.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdeutils4.spec ++++++
--- /var/tmp/diff_new_pack.nUOHgG/_old  2011-07-11 15:48:35.000000000 +0200
+++ /var/tmp/diff_new_pack.nUOHgG/_new  2011-07-11 15:48:35.000000000 +0200
@@ -31,7 +31,7 @@
 Summary:        Base Package of KDE Utility Programs
 Url:            http://www.kde.org
 Version:        4.6.5
-Release:        3
+Release:        5
 BuildRequires:  gmp-devel kdebase4-workspace-devel >= %version 
libqimageblitz-devel net-snmp-devel pcsc-lite python-devel
 BuildRequires:  libkdepimlibs4-devel libkonq-devel libqca2-devel libzip-devel 
oxygen-icon-theme-large
 BuildRequires:  libarchive-devel libknotificationitem-devel libqjson-devel 
xz-devel
@@ -40,6 +40,7 @@
 Patch1:         desktop-files.diff
 Patch2:         kgpg-autostart.diff
 Patch3:         kcalc-numeric-input.patch
+Patch4:         ark-fix-append.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %kde4_runtime_requires
 Suggests:       ark
@@ -75,6 +76,7 @@
 %patch1
 %patch2
 %patch3 -p3
+%patch4 -p4
 
 %build
   %cmake_kde4 -d build

++++++ ark-fix-append.patch ++++++
--- branches/KDE/4.6/kdeutils/ark/kerfuffle/cliinterface.cpp    2011/06/01 
20:35:06     1234597
+++ branches/KDE/4.6/kdeutils/ark/kerfuffle/cliinterface.cpp    2011/07/11 
03:23:39     1240908
@@ -325,10 +325,13 @@
         return false;
     }
 
-    Q_ASSERT(!m_process);
-
     kDebug() << "Executing" << programPath << arguments;
 
+    if (m_process) {
+        m_process->waitForFinished();
+        delete m_process;
+    }
+
 #ifdef Q_OS_WIN
     m_process = new KProcess();
 #else

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to