summaryrefslogtreecommitdiff
path: root/debian/patches/99_hppa_bug561203_decrease_failure_rate.diff
diff options
context:
space:
mode:
authorFelix Geyer <debfx-pkg@fobos.de>2012-04-03 18:00:10 +0200
committerFelix Geyer <debfx-pkg@fobos.de>2012-04-03 18:00:10 +0200
commit66aca5db6e49aa303131aee46ba3f551238fccc5 (patch)
treed7b5571a3620a83202121465fa7de6e5b2444c59 /debian/patches/99_hppa_bug561203_decrease_failure_rate.diff
parent8fc335c9149e2711c507eb65c36e882164f7f7f3 (diff)
downloadqt4-x11-66aca5db6e49aa303131aee46ba3f551238fccc5.tar.gz
Refresh patches for the new upstream version.
Diffstat (limited to 'debian/patches/99_hppa_bug561203_decrease_failure_rate.diff')
-rw-r--r--debian/patches/99_hppa_bug561203_decrease_failure_rate.diff10
1 files changed, 5 insertions, 5 deletions
diff --git a/debian/patches/99_hppa_bug561203_decrease_failure_rate.diff b/debian/patches/99_hppa_bug561203_decrease_failure_rate.diff
index fcd93e1..1c58001 100644
--- a/debian/patches/99_hppa_bug561203_decrease_failure_rate.diff
+++ b/debian/patches/99_hppa_bug561203_decrease_failure_rate.diff
@@ -17,7 +17,7 @@ Last-Update: 2011-12-26
--- a/src/corelib/io/qprocess_unix.cpp
+++ b/src/corelib/io/qprocess_unix.cpp
-@@ -525,6 +525,13 @@ static char **_q_dupEnvironment(const QP
+@@ -526,6 +526,13 @@ static char **_q_dupEnvironment(const QP
return envp;
}
@@ -31,15 +31,15 @@ Last-Update: 2011-12-26
#ifdef Q_OS_MAC
Q_GLOBAL_STATIC(QMutex, cfbundleMutex);
#endif
-@@ -650,6 +657,7 @@ void QProcessPrivate::startProcess()
+@@ -647,6 +654,7 @@ void QProcessPrivate::startProcess()
#if defined(Q_OS_QNX)
pid_t childPid = spawnChild(workingDirPtr, argv, envp);
#else
+ debbug_561203();
pid_t childPid = fork();
- #endif
int lastForkErrno = errno;
-@@ -1352,6 +1360,7 @@ bool QProcessPrivate::startDetached(cons
+ #endif
+@@ -1340,6 +1348,7 @@ bool QProcessPrivate::startDetached(cons
int pidPipe[2];
qt_safe_pipe(pidPipe);
@@ -47,7 +47,7 @@ Last-Update: 2011-12-26
pid_t childPid = fork();
if (childPid == 0) {
struct sigaction noaction;
-@@ -1364,6 +1373,7 @@ bool QProcessPrivate::startDetached(cons
+@@ -1352,6 +1361,7 @@ bool QProcessPrivate::startDetached(cons
qt_safe_close(startedPipe[0]);
qt_safe_close(pidPipe[0]);