diff options
| author | Brian Nelson <pyro@debian.org> | 2006-01-10 17:16:51 +0000 |
|---|---|---|
| committer | Brian Nelson <pyro@debian.org> | 2006-01-10 17:16:51 +0000 |
| commit | 7b266cb2a696d793374c74b10a1199d8a136af7c (patch) | |
| tree | bedd6cde46813c8ec09f030a45215c53f5c687a5 | |
| parent | d4fde82892aa16ea40645d82d28adadde7a4e27d (diff) | |
| download | qt4-x11-7b266cb2a696d793374c74b10a1199d8a136af7c.tar.gz | |
* debian/patches/15_alpha_ftbfs_fix.dpatch: new patch to rename
q_atomic_test_and_set_release_ptr to q_atomic_test_and_set_ptr, as
suggested by Isaac Clerencia <isaac@debian.org>, to fix a FTBFS on
alpha. (Closes: #347353)
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/00list | 1 | ||||
| -rwxr-xr-x | debian/patches/15_alpha_ftbfs_fix.dpatch | 21 |
3 files changed, 28 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 1005fce..c564fdb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,7 +28,12 @@ qt4-x11 (4.1.0-2) UNRELEASED; urgency=low * Enabled sqlite2 support - -- Brian Nelson <pyro@debian.org> Mon, 9 Jan 2006 19:37:28 -0800 + * debian/patches/15_alpha_ftbfs_fix.dpatch: new patch to rename + q_atomic_test_and_set_release_ptr to q_atomic_test_and_set_ptr, as + suggested by Isaac Clerencia <isaac@debian.org>, to fix a FTBFS on + alpha. (Closes: #347353) + + -- Brian Nelson <pyro@debian.org> Tue, 10 Jan 2006 09:16:28 -0800 qt4-x11 (4.1.0-1) unstable; urgency=low diff --git a/debian/patches/00list b/debian/patches/00list index 611392e..0fcca4a 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -3,3 +3,4 @@ 12_mips_atomic_ops 13_arm_ftbfs_fixes 14_kfreebsd_build_fix +15_alpha_ftbfs_fix diff --git a/debian/patches/15_alpha_ftbfs_fix.dpatch b/debian/patches/15_alpha_ftbfs_fix.dpatch new file mode 100755 index 0000000..cf0778a --- /dev/null +++ b/debian/patches/15_alpha_ftbfs_fix.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 15_alpha_ftbfs_fix.dpatch by Brian Nelson <pyro@debian.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Rename q_atomic_test_and_set_release_ptr to +## DP: q_atomic_test_and_set_ptr, as suggested by Isaac Clerencia +## DP: <isaac@debian.org>, to fix a FTBFS on alpha. + +@DPATCH@ +diff -urNad qt4-x11-4.1.0~/src/corelib/arch/alpha/arch/qatomic.h qt4-x11-4.1.0/src/corelib/arch/alpha/arch/qatomic.h +--- qt4-x11-4.1.0~/src/corelib/arch/alpha/arch/qatomic.h 2005-12-16 03:52:24.000000000 -0800 ++++ qt4-x11-4.1.0/src/corelib/arch/alpha/arch/qatomic.h 2006-01-10 09:12:35.000000000 -0800 +@@ -87,7 +87,7 @@ + return ret; + } + +-inline int q_atomic_test_and_set_release_ptr(volatile void *ptr, void *expected, void *newval) ++inline int q_atomic_test_and_set_ptr(volatile void *ptr, void *expected, void *newval) + { + register void *ret; + asm volatile("1:\n" |