Added a patch for ~x11-libs/qt-3.3.8 to fix compilation on ~mips, thanks to Ryan Hill in bug 210551.

Package-Manager: portage-2.1.4.4

4 files changed, 63 insertions, 4 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 82d4fe5190af..ba2d5367446c 100644
--- a/x11-libs/qt/ChangeLog
+++ b/x11-libs/qt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/qt
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.515 2008/02/25 14:27:08 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.516 2008/03/03 20:17:51 ingmar Exp $
+
+  03 Mar 2008; Ingmar Vanhassel <ingmar@gentoo.org>
+  +files/qt-3.3.8-mips.patch, qt-3.3.8-r4.ebuild:
+  Added a patch for ~x11-libs/qt-3.3.8 to fix compilation on ~mips, thanks to
+  Ryan Hill in bug 210551.
 
   25 Feb 2008; Caleb Tennis <caleb@gentoo.org>
   -files/qt-4.3.1-powerpc64.patch, -qt-4.3.1-r1.ebuild, -qt-4.3.2.ebuild:
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index 60ccabaca5a2..9bb93bf2f20a 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 0001-dnd_optimization.patch 5623 RMD160 b62b5868086b4d352be66989cc23cd3bb963e283 SHA1 4f3416c3a7e44d52c1088c52256decb384e4b1bc SHA256 8e138a2fdd053ec81522df19ce30f7e4c05838dfd8e0c8069ffb793ba45d7439
 AUX 0002-dnd_active_window_fix.patch 7289 RMD160 b355f5fd028d35d88ca15bf9ce8da41bd365f12d SHA1 5b16995f072cbde80f000967aa11d8a88ed34e23 SHA256 e36383b43a53b815f3958608275c60299a0638b6b3201c3a3d9318ee2ead26d1
 AUX 0037-dnd-timestamp-fix.patch 2138 RMD160 c11fffd7801fb357beb2d489e6e7cc4edefc3030 SHA1 cda25e150541c3a2ba56ec6974e2771b8aaad0de SHA256 490eb5c21dc30e0beac0aac8a4b6159d56a5e3e7fe40daad39f0c0823648917d
@@ -14,6 +17,7 @@ AUX qt-3.3.4-gcc4-volatile.patch 2480 RMD160 ac21760168e86067e7d438cd071eabe1e22
 AUX qt-3.3.4-gcc4.patch 1002 RMD160 fa263a5c095069f4f90746f0e6f29e49ad999bea SHA1 e1628b465c1d65940c691581323604f7cdcb6e8f SHA256 1fb0c47495566ab556b4d2cae0db277a3f701ff408d4a8615839d70fa5df6fc1
 AUX qt-3.3.4-immodule-focus.patch 877 RMD160 64adf25a67c0eedad839925380c8fe77fb887b9d SHA1 811a26738f286e0b8e5f9495ab4e97277d52c525 SHA256 4185c82a1fed2a8a69f95ab975582d33db4b542c96cc82e090d30e3a01297bdf
 AUX qt-3.3.4-qclipboard-hack.patch 1662 RMD160 ebfba0d27c03dcceeac7ad64650d5f6d7039ecdb SHA1 5c174acaf3b148f8d70345f68c7f22352450d582 SHA256 e47a1af0272e952cefacd30d466861b40d9bc969f6e5bc5cb32b878140af1d3c
+AUX qt-3.3.8-mips.patch 1326 RMD160 0fd662a36c2fe0013e7204218ddfc8c604467269 SHA1 a8d1cf81f4b2c35c46b1d0efacd5e5ad7811ec49 SHA256 982a92c010df448cb83c2e6a8f46a4f8979d8b5708b2942485cca962621f0caf
 AUX qt-3.3.8-mysql-unload-crash.diff 1150 RMD160 02f9d2c720503ec851be2c5488b0153823ab8a62 SHA1 bb6aad81cce143c23ff7840b1d79f6b2007a0c04 SHA256 d494e386cab40f7f7a1803745c220c6104b56b73419981b20d49fc0750996076
 AUX qt-3.3.8-seli-xinerama.patch 1960 RMD160 ce0163c9a47f5417f957e1d1ad0c574357c01cc7 SHA1 60b9c0a323d598aacca089d677c4b1c9709e70db SHA256 ec72679b69148af1b687a9cf7992e20ee85f4a0f3a33f3c05c8d2174f6f43503
 AUX qt-3.3.8-uic-fix.patch 711 RMD160 19964cfc6714e2ad38659e268ef248501db606aa SHA1 38bd5da513a2c28f3d941ba5644024643d835676 SHA256 e6a4e789c6c0da5542cad71057d1817e1976d005a52e1e4ef9bcf9914c37fcf3
@@ -34,10 +38,17 @@ DIST qt-x11-opensource-src-4.3.2.tar.gz 43462686 RMD160 b73a3d7a1edd11987544291c
 DIST qt-x11-opensource-src-4.3.3.tar.gz 42341802 RMD160 410daca03b6802ba5cc6662219c2ba7a190bd292 SHA1 77d00e2438efa793f6c16c54b64c8ba440ee3228 SHA256 89934bacc5cee5cb35a231275b0f9948f29483faf9082bed0e7255ce41751570
 DIST qt-x11-opensource-src-4.3.4.tar.gz 43988710 RMD160 eb081e599e61bcaa126981aecbe2db480be35eca SHA1 639f6469d5aa07c51c2aa6795f8e3de3aab8cd25 SHA256 8864dd80f3456be70a3be60364502a0ca3f46125b2f156860ad880ff55fcabd2
 EBUILD qt-3.3.4-r8.ebuild 10576 RMD160 24e821e4e3c0afa1945e3846e73065c7ac2f5e98 SHA1 d45683c76591d3ee2507a001a2caaf51449ae00d SHA256 843f2eb691d9403f4953b81eda236b5e994b70494b70f622813dc17a9b1f2113
-EBUILD qt-3.3.8-r4.ebuild 11708 RMD160 6724bae8c4014075ff1a1ed7bbedbd381b1b00e7 SHA1 b9e14b41cbdd16afec4f16705fe2960a96541b68 SHA256 13f055f2f2aba0b4b7d97fdad5d0ad77fefa3998b9ffd508b40341c1887c3a14
+EBUILD qt-3.3.8-r4.ebuild 11771 RMD160 0b12ac949e47dc7ab9df7d41386ad602016a73ae SHA1 c8c3c59395ca4f15e881c3007ff42a95d0a315ee SHA256 1fbb896a0b6db4fe05c1ef1c54a2009eb5b8a39c2fcdf95779ce1f15b19b703e
 EBUILD qt-4.3.2-r1.ebuild 8764 RMD160 cb19ddd7a1899fa40ea7c94de2f57a807bbd00e5 SHA1 5d6a61498e9c943123a0a956737483094547b5c6 SHA256 48d72dea51fc12744d480b1bf898540bacc345fa7db4fb747d5875c790383532
 EBUILD qt-4.3.3.ebuild 8698 RMD160 c70d1135506a270c0b19028f6466fe8384b266ce SHA1 8ddb314a28b8f06a23ae2fc892d5849d62ba1337 SHA256 4ab24199d787868d0f271bf7625e1b69b26d68fbe3324f7356bae3fe35080c20
 EBUILD qt-4.3.4.ebuild 8704 RMD160 8649c9a38ede6be18de4bff94d9b04b96d9a6a4e SHA1 5f7e6d1eed994176b19e0e325e79aeb0b2e2adbb SHA256 82e95ab4a2d82b597138624c57c7fc24c9808156fb16ba1974ce78eedde9938e
 EBUILD qt-4.4.0_rc1.ebuild 725 RMD160 c8b939f143144a759c8d45a49ffc53567deda8a1 SHA1 094b42340e8aa448d26ad4cdcd4b6527aa079167 SHA256 5ac5dee55711c2ed4dfd91cae52fab9d6bf2b91d32add886b90a11f2a88f6c4f
-MISC ChangeLog 38005 RMD160 8b70c7468b6850cd9e3e94e101d3cb70b5617a1c SHA1 013a6a6702cbe15842b9b6b956725b7e641e05a2 SHA256 a672bd4e932bea0aa45516e3a221ca33f16f975d1ab7fdb13ca0cf0a979ece70
+MISC ChangeLog 38214 RMD160 1131d72c139f1e5d8d436ee984005f398b1afd1b SHA1 9114a86b078ec06a3acbf48877fc1d27fe2ef38f SHA256 b97f78cd35a1bd79295ba698c5af4cb5bc0ce8d7b53db8d3c33c281fcb2ae887
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHzFy/B18eXLOpYdkRAuwZAJ4pQyGD2x8OLy07wRrLIOUhdp9ZkwCeICak
+AqwRxxde6NB3mMqsNs2+BEg=
+=yfkG
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/qt/files/qt-3.3.8-mips.patch b/x11-libs/qt/files/qt-3.3.8-mips.patch
new file mode 100644
index 000000000000..1f70900f7bf4
--- /dev/null
+++ b/x11-libs/qt/files/qt-3.3.8-mips.patch
@@ -0,0 +1,39 @@
+Bug 210551.
+Fix compilation on mips
+
+Original commit message by Christopher Martin, debian bug 342545.
+
+   * Add a patch, courtesy of Steve Langasek, that fixes
+     qt-x11-free's longstanding intermittent FTBFS on hppa, caused
+     by "the bogus assumption in src/tools/qlocale.cpp that a
+     char[] can be cast to a double *." (Closes: #342545)
+
+--- qt-x11-free-3.3.6.orig/src/tools/qlocale.cpp
++++ qt-x11-free-3.3.6/src/tools/qlocale.cpp
+@@ -122,13 +122,24 @@
+ #endif
+ 
+ // We can't rely on -NAN, since all operations on a NAN should return a NAN.
++static double be_neg_nan; 
++static double le_neg_nan;
+ static const unsigned char be_neg_nan_bytes[] = { 0xff, 0xf8, 0, 0, 0, 0, 0, 0 };
+ static const unsigned char le_neg_nan_bytes[] = { 0, 0, 0, 0, 0, 0, 0xf8, 0xff };
++static bool neg_nan_init = false;
++
+ static inline double negNan()
+ {
++    if (!neg_nan_init)
++    {
++        memcpy(&be_neg_nan,be_neg_nan_bytes,sizeof(be_neg_nan_bytes));
++        memcpy(&le_neg_nan,le_neg_nan_bytes,sizeof(le_neg_nan_bytes));
++        neg_nan_init = true;
++    }
+     return (ByteOrder == BigEndian ?
+-            *((const double *) be_neg_nan_bytes) :
+-            *((const double *) le_neg_nan_bytes));
++            be_neg_nan : 
++            le_neg_nan);
++            
+ }
+ 
+ // Sizes as defined by the ISO C99 standard - fallback
diff --git a/x11-libs/qt/qt-3.3.8-r4.ebuild b/x11-libs/qt/qt-3.3.8-r4.ebuild
index 22fe2457cd5a..ecca0f207038 100644
--- a/x11-libs/qt/qt-3.3.8-r4.ebuild
+++ b/x11-libs/qt/qt-3.3.8-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8-r4.ebuild,v 1.4 2008/02/23 15:42:39 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8-r4.ebuild,v 1.5 2008/03/03 20:17:51 ingmar Exp $
 
 # *** Please remember to update qt3.eclass when revbumping this ***
 
@@ -148,6 +148,10 @@ src_unpack() {
 		epatch "${FILESDIR}/${PN}-3.3.5-macos.patch"
 	fi
 
+	if use mips; then
+		epatch "${FILESDIR}"/${P}-mips.patch
+	fi
+
 	# known working flags wrt #77623
 	use sparc && export CFLAGS="-O1" && export CXXFLAGS="${CFLAGS}"
 	# set c/xxflags and ldflags