Add patch to fix miscompilation with gcc4 (#102892).

Package-Manager: portage-2.0.51.22-r2

4 files changed, 106 insertions, 23 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 3be47390909f..ef58aafb0287 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/qt
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.240 2005/08/19 14:52:16 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.241 2005/08/22 13:13:47 greg_g Exp $
+
+  22 Aug 2005; Gregorio Guidi <greg_g@gentoo.org>
+  +files/qt-3.3.4-gcc4-volatile.patch, qt-3.3.4-r7.ebuild:
+  Add patch to fix miscompilation with gcc4 (#102892).
 
 *qt-4.0.1 (19 Aug 2005)
 
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index faf156026646..878aa236b85c 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,32 +1,33 @@
-MD5 05cdf5304052e0b6986764b2cbeaa718 qt-4.0.1.ebuild 5716
+MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
+MD5 8a3143b4c6b3ed6f9407e6dad3887482 qt-3.3.4-r6.ebuild 9052
 MD5 0b2185dc5083c6626071d26ef79383f5 qt-3.3.4-r3.ebuild 9050
+MD5 f931ba3260942ff74fd7fb79a064c3fc ChangeLog 40109
 MD5 cf386ea22e4be00ea893fecf5a6220ba qt-4.0.0.ebuild 5721
-MD5 c75a573026966cdbdc35a1462bf7cba6 qt-3.3.4-r7.ebuild 9917
 MD5 98c2c897d6bb5fd3f7c6af49cd8decb7 qt-3.3.4-r2.ebuild 8565
-MD5 768239ea5ee64f7485fd6e94ea067401 ChangeLog 39943
-MD5 512150b47a904b0240101e319856aab1 metadata.xml 156
-MD5 8a3143b4c6b3ed6f9407e6dad3887482 qt-3.3.4-r6.ebuild 9052
+MD5 29eb571b78b63bccc11984b19cd7153b qt-3.3.4-r7.ebuild 9966
+MD5 05cdf5304052e0b6986764b2cbeaa718 qt-4.0.1.ebuild 5716
+MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
+MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.4-flickerfree_qiconview_buffered.patch 3347
+MD5 33975d39870dca02e85664411a93eae1 files/qt-3.3.4-gcc4.patch 1002
+MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r3 166
 MD5 74acd4c098f2c4bd70bdea585f0cb096 files/qt-no-rpath.patch 352
+MD5 ee2de925bc2929fe4404483c0eca556b files/digest-qt-4.0.1 81
 MD5 8ffca1b1b7523339af04fd24b4595ce4 files/0001-dnd_optimization.patch 5623
-MD5 0cc401186f490faf55906cd458280db8 files/0037-dnd-timestamp-fix.patch 2138
-MD5 8b3da5dae8babfcbdee3be465579d6c2 files/0002-dnd_active_window_fix.patch 7289
+MD5 8f75ba0e151481962fcb239dc216cf39 files/qt-3.3.4-0051-qtoolbar_77047.patch 1278
 MD5 c7f65a0625242eccf159e2b8ee74976d files/45qt3 109
-MD5 7eae3f0a0cb9f3188a994c9f546c869e files/digest-qt-4.0.0 86
-MD5 ee2de925bc2929fe4404483c0eca556b files/digest-qt-4.0.1 81
-MD5 fff1c03b4a3ad38904a30d1b2de88a07 files/qt4-nomkdir.patch 866
-MD5 b9689fa9461944ba25ebf0acde5fb70b files/qt-3.3.4-flickerfree_qiconview_buffered.patch 3347
-MD5 4122542a37b787efb9476b0fb1fdafc0 files/qt-3.3.4-0047-fix-kmenu-widget.diff 992
-MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r2 166
-MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r3 166
 MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r6 166
-MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r7 166
 MD5 9f5e557d5ece29f236e21104925a66a3 files/qt-3.3.4-macos.patch 18793
-MD5 7dc4f78d52452c28ba797ffc7db34f23 files/50qtdir3 16
 MD5 2f121ac14a939da7f1958ffc866f8560 files/qt4-rpath.patch 353
+MD5 4122542a37b787efb9476b0fb1fdafc0 files/qt-3.3.4-0047-fix-kmenu-widget.diff 992
+MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294
+MD5 8b3da5dae8babfcbdee3be465579d6c2 files/0002-dnd_active_window_fix.patch 7289
+MD5 0cc401186f490faf55906cd458280db8 files/0037-dnd-timestamp-fix.patch 2138
+MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r2 166
+MD5 c115b4205c2a2eab0a547375e2f62460 files/digest-qt-3.3.4-r7 166
+MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.4-qclipboard-hack.patch 1662
+MD5 fff1c03b4a3ad38904a30d1b2de88a07 files/qt4-nomkdir.patch 866
+MD5 f23686dab01383c584bb16c69e36b68e files/qt-3.3.4-gcc4-volatile.patch 2480
 MD5 527200fe7fd34be19a63e56a09ad7f47 files/qt-3.3.4-immodule-focus.patch 877
 MD5 0221c85bc6f785b68812fc7f42110742 files/qt-3.3.4-flickerfree_qscrollview_fixwindowactivate.patch 1540
-MD5 3e5e045d0c1448839a8dc1c82aeef21b files/qt-3.3.4-qclipboard-hack.patch 1662
-MD5 da2eb517a4c29a58002e92864ff966e5 files/qt-no-rpath-uic.patch 294
-MD5 33975d39870dca02e85664411a93eae1 files/qt-3.3.4-gcc4.patch 1002
-MD5 8f75ba0e151481962fcb239dc216cf39 files/qt-3.3.4-0051-qtoolbar_77047.patch 1278
+MD5 7eae3f0a0cb9f3188a994c9f546c869e files/digest-qt-4.0.0 86
 MD5 eb6eb6b68c8f747b12a3a53efc4b6480 files/0038-dragobject-dont-prefer-unknown.patch 2551
diff --git a/x11-libs/qt/files/qt-3.3.4-gcc4-volatile.patch b/x11-libs/qt/files/qt-3.3.4-gcc4-volatile.patch
new file mode 100644
index 000000000000..b88792fd7be6
--- /dev/null
+++ b/x11-libs/qt/files/qt-3.3.4-gcc4-volatile.patch
@@ -0,0 +1,77 @@
+diff -Nur qt-x11-free-3.3.4.orig/src/tools/qlocale.cpp qt-x11-free-3.3.4/src/tools/qlocale.cpp
+--- qt-x11-free-3.3.4.orig/src/tools/qlocale.cpp	2005-01-21 18:16:05.000000000 +0100
++++ qt-x11-free-3.3.4/src/tools/qlocale.cpp	2005-08-20 16:05:53.000000000 +0200
+@@ -72,6 +72,12 @@
+ #   define NAN DBL_QNAN
+ #endif
+ 
++#if (defined(Q_CC_GNU) && defined(Q_OS_WIN)) || __GNUC__ == 4 || defined(QT_QLOCALE_NEEDS_VOLATILE)
++#   define NEEDS_VOLATILE volatile
++#else
++#   define NEEDS_VOLATILE
++#endif
++
+ enum {
+     LittleEndian,
+     BigEndian
+@@ -4068,9 +4074,9 @@
+ #error Exactly one of IEEE_BIG_OR_LITTLE_ENDIAN, VAX, or IBM should be defined.
+ #endif
+ 
+-inline ULong getWord0(double x)
++inline ULong getWord0(const NEEDS_VOLATILE double x)
+ {
+-    uchar *ptr = (uchar *)&x;
++    const NEEDS_VOLATILE uchar *ptr = reinterpret_cast<const NEEDS_VOLATILE uchar *>(&x);
+     if (ByteOrder == BigEndian) {
+         return (ptr[0]<<24) + (ptr[1]<<16) + (ptr[2]<<8) + ptr[3];
+     } else {
+@@ -4078,9 +4084,9 @@
+     }
+ }
+ 
+-inline void setWord0(double *x, ULong l)
++inline void setWord0(NEEDS_VOLATILE double *x, ULong l)
+ {
+-    uchar *ptr = (uchar *)x;
++    NEEDS_VOLATILE uchar *ptr = reinterpret_cast<NEEDS_VOLATILE uchar *>(x);
+     if (ByteOrder == BigEndian) {
+         ptr[0] = (uchar)(l>>24);
+         ptr[1] = (uchar)(l>>16);
+@@ -4094,18 +4100,18 @@
+     }
+ }
+ 
+-inline ULong getWord1(double x)
++inline ULong getWord1(const NEEDS_VOLATILE double x)
+ {
+-    uchar *ptr = (uchar *)&x;
++    const NEEDS_VOLATILE uchar *ptr = reinterpret_cast<const NEEDS_VOLATILE uchar *>(&x);
+     if (ByteOrder == BigEndian) {
+         return (ptr[4]<<24) + (ptr[5]<<16) + (ptr[6]<<8) + ptr[7];
+     } else {
+         return (ptr[3]<<24) + (ptr[2]<<16) + (ptr[1]<<8) + ptr[0];
+     }
+ }
+-inline void setWord1(double *x, ULong l)
++inline void setWord1(NEEDS_VOLATILE double *x, ULong l)
+ {
+-    uchar *ptr = (uchar *)x;
++    NEEDS_VOLATILE uchar *ptr = reinterpret_cast<uchar NEEDS_VOLATILE *>(x);
+     if (ByteOrder == BigEndian) {
+         ptr[4] = (uchar)(l>>24);
+         ptr[5] = (uchar)(l>>16);
+@@ -5679,11 +5685,11 @@
+ #ifdef Q_OS_LINUX
+     fesetenv(&envp);
+ #endif
+-    
++
+     return s;
+ }
+ 
+-static char *_qdtoa( double d, int mode, int ndigits, int *decpt, int *sign, char **rve, char **resultp)
++static char *_qdtoa( NEEDS_VOLATILE double d, int mode, int ndigits, int *decpt, int *sign, char **rve, char **resultp)
+ {
+     /*
+       Arguments ndigits, decpt, sign are similar to those
diff --git a/x11-libs/qt/qt-3.3.4-r7.ebuild b/x11-libs/qt/qt-3.3.4-r7.ebuild
index ec062c36e87f..7fb5d389e8b2 100644
--- a/x11-libs/qt/qt-3.3.4-r7.ebuild
+++ b/x11-libs/qt/qt-3.3.4-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.4-r7.ebuild,v 1.2 2005/08/08 10:55:51 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.4-r7.ebuild,v 1.3 2005/08/22 13:13:47 greg_g Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -99,8 +99,9 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-0051-qtoolbar_77047.patch
 	epatch ${FILESDIR}/${P}-0047-fix-kmenu-widget.diff
 
-	# patch for gcc4
+	# patches for gcc4
 	epatch "${FILESDIR}/${P}-gcc4.patch"
+	epatch "${FILESDIR}/${P}-gcc4-volatile.patch"
 
 	if use immqt || use immqt-bc ; then
 		epatch ../${IMMQT_P}.diff