[SCM] Qt 4 packaging branch, experimental, updated. debian/4.7.4-1-31-gbe474c3

[Fathi Boudra]

The following commit has been merged in the experimental branch:
commit bf1ea266747aa4ecb95f00f512d3437bdc015b01
Author: Fathi Boudra <fabo at debian.org>
Date:   Tue Dec 27 18:09:21 2011 +0200

    Update 99_hppa_bug561203_decrease_failure_rate.diff:
    qt_fork() has been removed upstream. Adapt the patch to Qt 4.8.0 code.
---
 .../99_hppa_bug561203_decrease_failure_rate.diff   |   47 ++++++++++++++++----
 1 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/debian/patches/99_hppa_bug561203_decrease_failure_rate.diff b/debian/patches/99_hppa_bug561203_decrease_failure_rate.diff
index 05371c9..523b5b4 100644
--- a/debian/patches/99_hppa_bug561203_decrease_failure_rate.diff
+++ b/debian/patches/99_hppa_bug561203_decrease_failure_rate.diff
@@ -5,24 +5,53 @@ Description: decrease failure rate of QProcess (#561203) on hppa ~100+ times
  not to cause FTBFSes.
  Degradation in performance should not be very significant and is acceptable.
 Author: Modestas Vainius <modax at debian.org>
+Author: Fathi Boudra <fabo at debian.org>
 Forwarded: not-needed
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=561203
 Origin: vendor
-Last-Update: 2010-06-06
+Last-Update: 2011-12-26
 
 ---
- src/corelib/io/qprocess_unix.cpp |    3 +++
- 1 file changed, 3 insertions(+)
+ src/corelib/io/qprocess_unix.cpp |   10 ++++++++++
+ 1 file changed, 10 insertions(+)
 
 --- a/src/corelib/io/qprocess_unix.cpp
 +++ b/src/corelib/io/qprocess_unix.cpp
-@@ -505,6 +505,9 @@ static char **_q_dupEnvironment(const QH
- // under QNX RTOS we have to use vfork() when multithreading
- inline pid_t qt_fork()
- {
+@@ -525,6 +525,13 @@ static char **_q_dupEnvironment(const QP
+     return envp;
+ }
+ 
++inline debbug_561203()
++{
 +#if defined(__linux__) && defined(__hppa__)
-+    usleep(1000);
++        usleep(1000);
 +#endif
++}
++
+ #ifdef Q_OS_MAC
+ Q_GLOBAL_STATIC(QMutex, cfbundleMutex);
+ #endif
+@@ -650,6 +657,7 @@ void QProcessPrivate::startProcess()
  #if defined(Q_OS_QNX)
-     return vfork();
+     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
+     int pidPipe[2];
+     qt_safe_pipe(pidPipe);
+ 
++    debbug_561203();
+     pid_t childPid = fork();
+     if (childPid == 0) {
+         struct sigaction noaction;
+@@ -1364,6 +1373,7 @@ bool QProcessPrivate::startDetached(cons
+         qt_safe_close(startedPipe[0]);
+         qt_safe_close(pidPipe[0]);
+ 
++        debbug_561203();
+         pid_t doubleForkPid = fork();
+         if (doubleForkPid == 0) {
+             qt_safe_close(pidPipe[1]);

-- 
Qt 4 packaging