diff options
| author | Alberto Villa <avilla@FreeBSD.org> | 2011-10-17 00:03:42 +0000 |
|---|---|---|
| committer | Alberto Villa <avilla@FreeBSD.org> | 2011-10-17 00:03:42 +0000 |
| commit | a2d3b5a4bc5047210b788a128596ec34749ffa11 (patch) | |
| tree | c3c20b47c3435ddcaf02b8570db6aab5b70011af /comms/kremotecontrol/files/patch-ark-kerfuffle-cliiterface.cpp | |
| parent | - Add dependency on security/pam_kde. (diff) | |
The KDE/FreeBSD team is pleased to announce KDE Software Compilation
4.7.2. The official release notes can be found at:
http://kde.org/announcements/announce-4.7.2.php
This release ships with many improvements. Read more about them here:
http://FreeBSD.kde.org/news.php#itemKDESC472availableinports
We'd like to say thanks to all testers and contributors, especially to
lwhsu@ for his effort on hosting our test packages.
PR: 156293 [1]
159219 [2]
160164 [3]
Submitted by: Oleg Sidorkin <osidorkin@gmail.com> [1]
Alvaro Castillo <gobledb@gmail.com> [2]
dkeav04@gmail.com [3]
Tested by: exp-run via pav
Diffstat (limited to 'comms/kremotecontrol/files/patch-ark-kerfuffle-cliiterface.cpp')
| -rw-r--r-- | comms/kremotecontrol/files/patch-ark-kerfuffle-cliiterface.cpp | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/comms/kremotecontrol/files/patch-ark-kerfuffle-cliiterface.cpp b/comms/kremotecontrol/files/patch-ark-kerfuffle-cliiterface.cpp deleted file mode 100644 index f2298e0f4493..000000000000 --- a/comms/kremotecontrol/files/patch-ark-kerfuffle-cliiterface.cpp +++ /dev/null @@ -1,35 +0,0 @@ -SVN commit 1240907 by rkcosta: - -cliinterface: Do not assume a process does not exist in runProcess(). - -The Q_ASSERT(!m_process) in the beginning of runProcess() was wrong, as when -one is adding files to an archive (or creating an archive) processFinished() -calls list(), which in turn calls runProcess() as well, thus making the assert -fail. - -The best thing to do is just wait for the existing process to finish before -launching the new one. - -Backport of r1240907, in case the 4.6 ever gets packaged again. - -CCBUG: 277393 - -http://websvn.kde.org/?view=revision&revision=1240908 --- ark/kerfuffle/cliinterface.cpp 2011/06/01 20:35:06 1234597 -+++ 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 |