diff options
| author |   Raúl Porcel <armin76@gentoo.org> | 2010-05-22 09:26:00 +0000 |
|---|---|---|
| committer | Raúl Porcel <armin76@gentoo.org> | 2010-05-22 09:26:00 +0000 |
| commit | 647d69c5cf4ebfd020eca88d78c8fd24381a4ef9 (patch) | |
| tree | 4aef289fd62cdfebcb5f629fd69eaafb5fd82033 /x11-libs | |
| parent | Add x11-libs/qt-sql to deps, #301684 (diff) | |
| download | gentoo-2-647d69c5cf4ebfd020eca88d78c8fd24381a4ef9.tar.gz gentoo-2-647d69c5cf4ebfd020eca88d78c8fd24381a4ef9.tar.bz2 gentoo-2-647d69c5cf4ebfd020eca88d78c8fd24381a4ef9.zip | |
Add a patch to compile on alpha wrt #318975
(Portage version: 2.1.8.3/cvs/Linux ia64)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/qt-core/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/qt-core/files/qt-4.6.2-alpha.patch | 62 | ||||
| -rw-r--r-- | x11-libs/qt-core/qt-core-4.6.2-r1.ebuild | 3 |
3 files changed, 69 insertions, 2 deletions
diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog index a7c10cb49aa9..3750bb2293a3 100644 --- a/x11-libs/qt-core/ChangeLog +++ b/x11-libs/qt-core/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-libs/qt-core # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.95 2010/04/18 13:06:56 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.96 2010/05/22 09:26:00 armin76 Exp $ + + 22 May 2010; Raúl Porcel <armin76@gentoo.org> qt-core-4.6.2-r1.ebuild, + +files/qt-4.6.2-alpha.patch: + Add a patch to compile on alpha wrt #318975 18 Apr 2010; <nixnut@gentoo.org> qt-core-4.6.2-r1.ebuild: ppc stable #297299 diff --git a/x11-libs/qt-core/files/qt-4.6.2-alpha.patch b/x11-libs/qt-core/files/qt-4.6.2-alpha.patch new file mode 100644 index 000000000000..cf61d41772a4 --- /dev/null +++ b/x11-libs/qt-core/files/qt-4.6.2-alpha.patch @@ -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; */
\ No newline at end of file diff --git a/x11-libs/qt-core/qt-core-4.6.2-r1.ebuild b/x11-libs/qt-core/qt-core-4.6.2-r1.ebuild index 5d2543847d87..b265e3722901 100644 --- a/x11-libs/qt-core/qt-core-4.6.2-r1.ebuild +++ b/x11-libs/qt-core/qt-core-4.6.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.6.2-r1.ebuild,v 1.4 2010/04/18 13:06:56 nixnut Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/qt-core-4.6.2-r1.ebuild,v 1.5 2010/05/22 09:26:00 armin76 Exp $ EAPI="2" inherit qt4-build @@ -21,6 +21,7 @@ PDEPEND="qt3support? ( ~x11-libs/qt-gui-${PV}[aqua=,qt3support] )" PATCHES=( "${FILESDIR}/qt-4.6-nolibx11.patch" "${FILESDIR}/qt-4.6-nox11r6.patch" + "${FILESDIR}/qt-4.6.2-alpha.patch" ) pkg_setup() { |