Add a patch to compile on alpha wrt #318975

Package-Manager: portage-2.1.8.3/cvs/Linux ia64

4 files changed, 72 insertions, 4 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/Manifest b/x11-libs/qt-core/Manifest
index 09bd0fd72b21..7049a1a1e09d 100644
--- a/x11-libs/qt-core/Manifest
+++ b/x11-libs/qt-core/Manifest
@@ -3,6 +3,7 @@ AUX qt-4.5-nolibx11.diff 1167 RMD160 da983a70bd436d35e325203dfe9390b2aee925ae SH
 AUX qt-4.5.3-glib-event-loop.patch 770 RMD160 0b854962f1b46958e8b969f949fe5e0d6e66b5ff SHA1 26543a05f894678fd1357d7b0fca217dac6b1a0c SHA256 83f010690d3a7220f5bd559b2aa82d9135d31a2c04bf9d6b12ed78a2dd3da6bb
 AUX qt-4.6-nolibx11.patch 1037 RMD160 a32338fa24ca2f99b0f3b679b1fabb88ac9b0ec1 SHA1 b7b2a430147a746a6a52f05a495be6262f2925ef SHA256 2b1d4e7df4918cafa50476e911f4c8e3e79e09fa702d756236ad2308e1c9bc69
 AUX qt-4.6-nox11r6.patch 5191 RMD160 60bac3e843addd91427ada9e4e4d7a94dc8f0430 SHA1 7534d6838426b86101ac8fc5ced829c5d5035a04 SHA256 b6db19c5b1de5e86628d37ca467f293b3ab3cf48272df93dae7ad5755ffa79cd
+AUX qt-4.6.2-alpha.patch 2913 RMD160 52ca59388d88c8e0ea2a40fd8d9d6721d324664e SHA1 bb08627e018184d4023c9fabc03adba79a67bcf0 SHA256 042c29d938339dacfb66278f62ce38c8bc597dbc2017e6d5df9397a79ac27dd3
 AUX rcc.pro 3440 RMD160 42e65efa8dc027f8a2b6c933243a91c1cac96092 SHA1 017ea0aea74a27012608f8be8f301d3cda3dd2b7 SHA256 b09c74046a97ec87b19a05abfe08d959040b737430e498269fb0d0c00bf0a38d
 AUX uic.pro 3671 RMD160 b6d3c392a67b66f6996134975e99db03a9987baf SHA1 f87fff37256b5c966e4d21b0fb6cb64b717f3d07 SHA256 904084b6d936fb9bab33d3592ec69dc9872708a74834f0cb498e8153f784c7fc
 DIST qt-everywhere-opensource-src-4.6.1.tar.gz 160197277 RMD160 7365dfe3c688df36002d2c9aaef6b79ba8175402 SHA1 d3b44ae6d9bc9c44fc57f32e545b92daf0b54775 SHA256 4c84b39b8a2546854ce9c0c9f761dd55da76dab2c33eeb876e3d17db1d2ea0c5
@@ -10,6 +11,6 @@ DIST qt-everywhere-opensource-src-4.6.2.tar.gz 160601949 RMD160 5f3fea120f2dba27
 DIST qt-x11-opensource-src-4.5.3.tar.gz 125384668 RMD160 93d765ecf89ed15668a4eedc7d77c2a2e41424a2 SHA1 78620ffd03c83c4d86f5039ccf7b09e5c709ed25 SHA256 0c87fc42825d3556970db4412257c6874e716ac3bc45e6f273924d5d6a089aa6
 EBUILD qt-core-4.5.3-r2.ebuild 6335 RMD160 01bd4db0a278e5d4c24d9cecf0f5f426ff2167d2 SHA1 ff1a6e61074859165f33153097c3c133fd1caec3 SHA256 bbe3fd373407e0616bc960f6ea277b044c1a0785a7401d7973292aa8b39ad4e4
 EBUILD qt-core-4.6.1-r1.ebuild 5014 RMD160 18d44d7063a1bef8081b1258e6ed992d4a384b94 SHA1 d12c4d30768fac2a51fb798f0836708350373d89 SHA256 95379ddfb20ad1aacae4af0fa049904d8ba6129a861528c56980fad3007990c5
-EBUILD qt-core-4.6.2-r1.ebuild 5013 RMD160 dda7beae34ea7d7581f3354f10716f1643a2e043 SHA1 8c4b2babcb4a71f19c7435d130694cdd6e7cb36e SHA256 e48553763ae75690114d407122a21152348367fb29990b6f4071cb371e6d134f
-MISC ChangeLog 13097 RMD160 79e3e523dbb9193bf20b92cdb010b0056f4a5816 SHA1 e0643e362a0e5e9c422df0dec3bba262d13502a3 SHA256 c844faa7bb19b27846018b6104ed3f567a6fd2263f31c14ab1388ee8864368e4
+EBUILD qt-core-4.6.2-r1.ebuild 5050 RMD160 c5523dbe98db4c80f9861ea5b81c2320884a463b SHA1 4069658f95c2ad2c61f53aafebcabdc57c8d78b1 SHA256 cefe51dd423476bb9e2bfad3911f9a3bec72976a79ca20884f5d53e320d94746
+MISC ChangeLog 13250 RMD160 16542797e7ff156453ba66af8c0ce42ea83327de SHA1 dfa68da1bc8ae4d074b826956567634ccafab1ec SHA256 058344c8a832506e6254b93a8a2db6ed2f0c1c97104b4201b7d6ec2e3b8d6ea7
 MISC metadata.xml 592 RMD160 1abeb1c56686d23b3f6935303aa40efe6946dd61 SHA1 ed92160594449e2607addd6f90e33d98cb1ce11e SHA256 6ce0551ba99f011c46552a13f145fc0176c45ca39dc4053650745a519e36e145
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() {