[SCM] Qt 4 Debian packaging branch, master, updated. debian/4.6.2-4-13-g2926c0a

Fathi Boudra fabo at alioth.debian.org
Mon May 17 12:31:31 UTC 2010


The following commit has been merged in the master branch:
commit 7070374b120e3040a43a2354ae99b03393fd3d06
Author: Fathi Boudra <fabo at debian.org>
Date:   Mon May 17 15:26:03 2010 +0300

    Add QTBUG number.
---
 .../97_alpha_ftbfs_qatomic_alpha_h_types.diff      |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/debian/patches/97_alpha_ftbfs_qatomic_alpha_h_types.diff b/debian/patches/97_alpha_ftbfs_qatomic_alpha_h_types.diff
index 1ef5fb3..8706dd5 100644
--- a/debian/patches/97_alpha_ftbfs_qatomic_alpha_h_types.diff
+++ b/debian/patches/97_alpha_ftbfs_qatomic_alpha_h_types.diff
@@ -3,6 +3,7 @@ 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*'
+Forwarded: http://bugreports.qt.nokia.com/browse/QTBUG-5955
 
 --- a/src/corelib/arch/qatomic_alpha.h
 +++ b/src/corelib/arch/qatomic_alpha.h

-- 
Qt 4 Debian packaging



More information about the pkg-kde-commits mailing list