Remove unused.

(Portage version: 2.2.0_alpha95/cvs/Linux i686)

2 files changed, 4 insertions, 63 deletions

diff --git a/x11-libs/qt-core/ChangeLog b/x11-libs/qt-core/ChangeLog
index fd0cfdea5b4b..2494dd4d8664 100644
--- a/x11-libs/qt-core/ChangeLog
+++ b/x11-libs/qt-core/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qt-core
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.152 2012/03/27 18:19:42 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt-core/ChangeLog,v 1.153 2012/03/27 18:48:28 johu Exp $
+
+  27 Mar 2012; Johannes Huber <johu@gentoo.org> -files/qt-4.6.2-alpha.patch:
+  Remove unused.
 
   27 Mar 2012; Johannes Huber <johu@gentoo.org> -qt-core-4.6.2-r1.ebuild:
   Drop Qt-4.6.2
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
deleted file mode 100644
index cf61d41772a4..000000000000
--- a/x11-libs/qt-core/files/qt-4.6.2-alpha.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-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