[SCM] Qt 4 Debian packaging branch, master, updated. debian/4.6.0-1-37-gac34295

[Pino Toscano]

The following commit has been merged in the master branch:
commit 3110610c15ccc13bc0d54e9c45cb84ac97ff4423
Author: Pino Toscano <pino at kde.org>
Date:   Sun Jan 31 01:32:48 2010 +0100

    add 82_hurd_SA_SIGINFO.diff to fix FTBFS on GNU/Hurd causes by unconditional usage of SA_SIGINFO
---
 debian/changelog                       |    4 +++-
 debian/patches/82_hurd_SA_SIGINFO.diff |   19 +++++++++++++++++++
 debian/patches/series                  |    1 +
 3 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3dd1109..826e030 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -45,8 +45,10 @@ qt4-x11 (4:4.6.1-1) UNRELEASED; urgency=low
     GNU/kFreeBSD and GNU/Hurd architectures.
   * Add 81_hurd_architecture.diff: recognize the proper architecture on
     GNU/Hurd. This will make Qt BIC there, but we can live with that.
+  * Add 82_hurd_SA_SIGINFO.diff: fix FTBFS on GNU/Hurd causes by unconditional
+    usage of SA_SIGINFO.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 31 Jan 2010 01:28:35 +0100
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 31 Jan 2010 01:31:47 +0100
 
 qt4-x11 (4:4.6.0-1) experimental; urgency=low
 
diff --git a/debian/patches/82_hurd_SA_SIGINFO.diff b/debian/patches/82_hurd_SA_SIGINFO.diff
new file mode 100644
index 0000000..8f789dd
--- /dev/null
+++ b/debian/patches/82_hurd_SA_SIGINFO.diff
@@ -0,0 +1,19 @@
+Description: fix SA_SIGINFO usage to build on GNU/Hurd
+ There is not SA_SIGINFO on GNU/Hurd, so do not try to use it.
+Author: Pino Toscano <pino at kde.org>
+Forwarded: no
+--- a/src/testlib/qtestcase.cpp
++++ b/src/testlib/qtestcase.cpp
+@@ -1521,7 +1521,11 @@
+ #ifndef Q_WS_QWS
+         // Don't overwrite any non-default handlers
+         // however, we need to replace the default QWS handlers
+-        if (oldact.sa_flags & SA_SIGINFO || oldact.sa_handler != SIG_DFL) {
++        if (
++#ifdef SA_SIGINFO
++            oldact.sa_flags & SA_SIGINFO ||
++#endif
++            oldact.sa_handler != SIG_DFL) {
+             sigaction(fatalSignals[i], &oldact, 0);
+         } else
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index 477c32d..2b09b66 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -32,6 +32,7 @@
 71_hppa_unaligned_access_fix_458133.diff
 80_hurd_max_path.diff
 81_hurd_architecture.diff
+82_hurd_SA_SIGINFO.diff
 89_powerpc_opts.diff
 91_s390_-gstabs.diff
 92_armel_gcc43_valist_compat.diff

-- 
Qt 4 Debian packaging