diff options
author | Pino Toscano <pino@kde.org> | 2010-01-31 01:32:48 +0100 |
---|---|---|
committer | Pino Toscano <pino@kde.org> | 2010-01-31 01:32:48 +0100 |
commit | 3110610c15ccc13bc0d54e9c45cb84ac97ff4423 (patch) | |
tree | d556f228f11b5e09597ebe2047bc8748ab24aebf /debian/patches | |
parent | 1b361c993480642345ef0b7595c38d56783d2776 (diff) | |
download | qt4-x11-3110610c15ccc13bc0d54e9c45cb84ac97ff4423.tar.gz |
add 82_hurd_SA_SIGINFO.diff to fix FTBFS on GNU/Hurd causes by unconditional usage of SA_SIGINFO
Diffstat (limited to 'debian/patches')
-rw-r--r-- | debian/patches/82_hurd_SA_SIGINFO.diff | 19 | ||||
-rw-r--r-- | debian/patches/series | 1 |
2 files changed, 20 insertions, 0 deletions
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@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 |