diff options
| author | Modestas Vainius <modestas@vainius.eu> | 2010-04-10 00:59:08 +0300 |
|---|---|---|
| committer | Modestas Vainius <modestas@vainius.eu> | 2010-04-10 01:03:41 +0300 |
| commit | 0c6739f408eeaf1188ef64bc6890d1bfd42d0cdc (patch) | |
| tree | 7346f9ecbf8e03be0cff174fb3f2368bb68d0cf5 | |
| parent | 387996610c90f75544b495e0837a5758afdecc7b (diff) | |
| download | qt4-x11-0c6739f408eeaf1188ef64bc6890d1bfd42d0cdc.tar.gz | |
Fix FTBFS on alpha caused by invalid type conversions in qatomic_alpha.h.
Patch 97_alpha_ftbfs_qatomic_alpha_h_types.diff.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches/97_alpha_ftbfs_qatomic_alpha_h_types.diff | 62 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 65 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 846efb4..2bdea66 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ qt4-x11 (4:4.6.2-3) UNRELEASED; urgency=low [ Modestas Vainius ] * Clean target: limit application/x-executable lookup to executable files. This should speed up clean target a lot. + * Add 97_alpha_ftbfs_qatomic_alpha_h_types.diff patch to fix FTBFS on alpha + caused by invalid type conversions in qatomic_alpha.h. -- Sune Vuorela <debian@pusling.com> Fri, 09 Apr 2010 01:37:15 +0200 diff --git a/debian/patches/97_alpha_ftbfs_qatomic_alpha_h_types.diff b/debian/patches/97_alpha_ftbfs_qatomic_alpha_h_types.diff new file mode 100644 index 0000000..1ef5fb3 --- /dev/null +++ b/debian/patches/97_alpha_ftbfs_qatomic_alpha_h_types.diff @@ -0,0 +1,62 @@ +Author: Modestas Vainius <modax@debian.org> +Description: fix FTBFS on alpha due to invalid type conversions + ../../include/QtCore/../../src/corelib/arch/qatomic_alpha.h: In member function 'T* QBasicAtomicPointer<T>::fetchAndStoreAcquire(T*) [with T = QMutexPool]': + kernel/qobject.cpp:123: instantiated from here + ../../include/QtCore/../../src/corelib/arch/qatomic_alpha.h:401: error: invalid conversion from 'void*' to 'QMutexPool*' + +--- a/src/corelib/arch/qatomic_alpha.h ++++ b/src/corelib/arch/qatomic_alpha.h +@@ -367,7 +367,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPoint + template <typename T> + Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelaxed(T *newValue) + { +- register void *old, *tmp; ++ register T *old, *tmp; + asm volatile("1:\n" + "ldq_l %0,%2\n" /* old=*ptr; */ + "mov %3,%1\n" /* tmp=newval; */ +@@ -385,7 +385,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer + template <typename T> + Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreAcquire(T *newValue) + { +- register void *old, *tmp; ++ register T *old, *tmp; + asm volatile("1:\n" + "ldq_l %0,%2\n" /* old=*ptr; */ + "mov %3,%1\n" /* tmp=newval; */ +@@ -404,7 +404,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer + template <typename T> + Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelease(T *newValue) + { +- register void *old, *tmp; ++ register T *old, *tmp; + asm volatile("mb\n" + "1:\n" + "ldq_l %0,%2\n" /* old=*ptr; */ +@@ -423,7 +423,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer + template <typename T> + Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelaxed(qptrdiff valueToAdd) + { +- register void *old, *tmp; ++ register T *old, *tmp; + asm volatile("1:\n" + "ldq_l %0,%2\n" /* old=*ptr; */ + "addq %0,%3,%1\n"/* tmp=old+value; */ +@@ -441,7 +441,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer + template <typename T> + Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddAcquire(qptrdiff valueToAdd) + { +- register void *old, *tmp; ++ register T *old, *tmp; + asm volatile("1:\n" + "ldq_l %0,%2\n" /* old=*ptr; */ + "addq %0,%3,%1\n"/* tmp=old+value; */ +@@ -460,7 +460,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer + template <typename T> + Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelease(qptrdiff valueToAdd) + { +- register void *old, *tmp; ++ register T *old, *tmp; + asm volatile("mb\n" + "1:\n" + "ldq_l %0,%2\n" /* old=*ptr; */ diff --git a/debian/patches/series b/debian/patches/series index c59d016..f94270a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -42,3 +42,4 @@ 92_armel_gcc43_valist_compat.diff 95_sparc_platform_definition.diff 96_powerpc_no_gc_sections.diff +97_alpha_ftbfs_qatomic_alpha_h_types.diff |