diff options
| author | Cyril Brulebois <kibi@debian.org> | 2011-05-30 11:32:13 +0200 |
|---|---|---|
| committer | Cyril Brulebois <kibi@debian.org> | 2011-05-30 11:32:13 +0200 |
| commit | 4c8fbd4a01ee7146ed2451a3a0d248a3b802e1d3 (patch) | |
| tree | ec9274f830cff453ec5023a71b6a75d5731e6f55 | |
| parent | 4b44aa8a9dca344ab61ee7e0d511a2d44124e65b (diff) | |
Add 20-workaround-36986.diff to avoid test failures on *i386.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/patches/20-workaround-36986.diff | 14 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 16 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index c062eee30..d1da2d084 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ xorg-server (2:1.10.2-1) UNRELEASED; urgency=low * New upstream release. + * Add 20-workaround-36986.diff to avoid test failures on *i386. -- Cyril Brulebois <kibi@debian.org> Mon, 30 May 2011 11:22:21 +0200 diff --git a/debian/patches/20-workaround-36986.diff b/debian/patches/20-workaround-36986.diff new file mode 100644 index 000000000..24b3cb9c4 --- /dev/null +++ b/debian/patches/20-workaround-36986.diff @@ -0,0 +1,14 @@ +Workaround fdo#36986 <http://bugs.freedesktop.org/show_bug.cgi?id=36986> +--- a/test/input.c ++++ b/test/input.c +@@ -1213,8 +1213,10 @@ + + g_assert(v); + g_assert(v->numAxes == num_axes); ++#if 0 + g_assert(((void*)v->axisVal - (void*)v) % sizeof(double) == 0); + g_assert(((void*)v->axes - (void*)v) % sizeof(double) == 0); ++#endif + num_axes ++; + } + diff --git a/debian/patches/series b/debian/patches/series index 2e0f947ba..a9c30f654 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ 07-xfree86-fix-build-with-xv-disabled.diff #13_debian_add_xkbpath_env_variable.diff 15-nouveau.diff +20-workaround-36986.diff |