Add patch to build with gcc-4.3 and immqt-bc USE flag enabled. Thanks to Matsuu for linking the Debian patch in bug #218447.

Package-Manager: portage-2.1.5_rc10

4 files changed, 37 insertions, 9 deletions

diff --git a/x11-libs/qt/ChangeLog b/x11-libs/qt/ChangeLog
index 1148180bc319..90e702e6c34b 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.535 2008/04/18 22:52:42 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/ChangeLog,v 1.536 2008/05/11 18:43:21 flameeyes Exp $
+
+  11 May 2008; Diego Pettenò <flameeyes@gentoo.org>
+  +files/qt-3.3.8-immqt+gcc-4.3.patch, qt-3.3.8-r4.ebuild:
+  Add patch to build with gcc-4.3 and immqt-bc USE flag enabled. Thanks to
+  Matsuu for linking the Debian patch in bug #218447.
 
   18 Apr 2008; Markus Meier <maekke@gentoo.org> qt-4.3.3.ebuild:
   amd64 stable, bug #217529
diff --git a/x11-libs/qt/Manifest b/x11-libs/qt/Manifest
index f862b45c30e6..9cb18a4141a6 100644
--- a/x11-libs/qt/Manifest
+++ b/x11-libs/qt/Manifest
@@ -17,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-immqt+gcc-4.3.patch 756 RMD160 b4379b8c66b2708301f9883ecc1be55ae916a20f SHA1 179825f382fab2cadd097f7597292a69ef71d575 SHA256 d281c1e1f20cdc4f3351eede25287ba3b6bd80cbb0e6f5a9f997394521feb6bd
 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
@@ -38,17 +39,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 11694 RMD160 054ca74177797a4020e7d80b9277c26d300a1d11 SHA1 bd75957fed753ff00fc01b7659da14c48e3afdcb SHA256 64a69625317e726095a44c108cae5c2b3ae947a310747cf934490a6e40f52da9
+EBUILD qt-3.3.8-r4.ebuild 11740 RMD160 6018fbeae68e3cfae49d34434ed7505aea82812a SHA1 614a6cf5970cbac8152c18b6951694d09ade672e SHA256 d93cf3910014b6e4c1f925fa567e7ee6337b83d2213dc0cd9a02510aad1a62fd
 EBUILD qt-4.3.2-r1.ebuild 8936 RMD160 5f162263374ec07294422e3e815ca07015bd20c9 SHA1 97e0a8db5dbdc8c17fde814719db202bce8c6d09 SHA256 187eef7e3ae5945e323989ed75be0b757d9e5669c690dcc15222037b0b621205
 EBUILD qt-4.3.3.ebuild 8722 RMD160 8d59a9f2890967ea9be9694c29126838cc81a90f SHA1 6a5b63b02a21d6228041215bf26d1c2094b955cd SHA256 d66c9c6c6af21001a7ad4064284ff6ce818d356cf90adc1878e14beddfb0226a
 EBUILD qt-4.3.4-r1.ebuild 9035 RMD160 aca5b0dd0d5bd77389322dd43b6112ed62cb2f8c SHA1 c8d41d3bf1e4834302c1a57dbba28816dae64626 SHA256 d4fda94ccfd8b5587daeefdd6e9217383ff99aaa6898860876822a531e843b7f
 EBUILD qt-4.4.0_rc1.ebuild 749 RMD160 d18335c3ce71e4387724d813e6c60c472be6e1cd SHA1 a91aa254e3f5db3f6875fa636e648a96655da3ee SHA256 35a52352b6b54a15a355a32995e0b19707fa2f6a9f2d9e31f478ff16ae965bf2
-MISC ChangeLog 40783 RMD160 a3a6c4af8c227676d16e845c7c1afb1d0ea164c1 SHA1 032eeaa10661b14e403e1a02c7a3d39b7cf57209 SHA256 d30a978f392c1e1f50c5deea8daa7c39f660abef384a32cf91c953fea830f4cf
+MISC ChangeLog 41028 RMD160 6217fc642f14143f64fd10427eb11fb1de980c2a SHA1 999cde87defe6556c4fe9eda090f0dfa7dc69812 SHA256 e067c0b23302e9942117c85bfc8166ea7e64d40b000d184cceb4d135a6ac8467
 MISC metadata.xml 156 RMD160 d76590850d56864c8d99e6877ed15841b55ef1fc SHA1 e872bab086832a9db3f0fa9b1897c70577d3af21 SHA256 94c4f580c1a55f8a5e1a1dcdd6dedfea0b8bd78c1d7137c354938d73c49e4448
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgJJnIACgkQkKaRLQcq0GKOOQCfX+2Lt0JKWIg9/dXhOlQi0P4Y
-0xIAoKh3Pt/ZWVXf8prHmRPTwXHmFLti
-=kayN
+iEYEARECAAYFAkgnPlQACgkQAiZjviIA2Xjn6ACfXrvpQKVMhQEDOqe3oLGmifYr
+RQAAniaqw8N3neaKJ7f31StoMPigHwWn
+=EhPt
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qt/files/qt-3.3.8-immqt+gcc-4.3.patch b/x11-libs/qt/files/qt-3.3.8-immqt+gcc-4.3.patch
new file mode 100644
index 000000000000..65610e37276f
--- /dev/null
+++ b/x11-libs/qt/files/qt-3.3.8-immqt+gcc-4.3.patch
@@ -0,0 +1,20 @@
+--- plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp~	2007-04-05 09:47:44.000000000 +0000
++++ plugins/src/inputmethods/imsw-none/qnoneinputcontextplugin.cpp	2007-04-05 09:48:08.000000000 +0000
+@@ -44,6 +44,7 @@
+ #include "qnoneinputcontextplugin.h"
+ #include <qinputcontextfactory.h>
+ #include <qsettings.h>
++#include <cstdlib>
+ 
+ 
+ QNoneInputContextPlugin::QNoneInputContextPlugin()
+--- plugins/src/inputmethods/simple/qsimpleinputcontext.cpp~	2007-04-05 09:48:46.000000000 +0000
++++ plugins/src/inputmethods/simple/qsimpleinputcontext.cpp	2007-04-05 09:48:54.000000000 +0000
+@@ -45,6 +45,7 @@
+ #include <qnamespace.h>
+ #include <qevent.h>
+ #include <qglobal.h>
++#include <algorithm>
+ 
+ static const int ignoreKeys[] = {
+     Qt::Key_Shift,
diff --git a/x11-libs/qt/qt-3.3.8-r4.ebuild b/x11-libs/qt/qt-3.3.8-r4.ebuild
index 1fc761679e5e..3ab2057e1a1d 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.6 2008/03/03 20:24:38 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qt/qt-3.3.8-r4.ebuild,v 1.7 2008/05/11 18:43:21 flameeyes Exp $
 
 # *** Please remember to update qt3.eclass when revbumping this ***
 
@@ -142,6 +142,8 @@ src_unpack() {
 	if use immqt || use immqt-bc ; then
 		epatch ../${IMMQT_P}.diff
 		sh make-symlinks.sh || die "make symlinks failed"
+
+		epatch "${FILESDIR}/${P}-immqt+gcc-4.3.patch"
 	fi
 
 	if use mips; then
@@ -160,8 +162,8 @@ src_unpack() {
 	fi
 
 	sed -i -e "s:QMAKE_CFLAGS_RELEASE.*=.*:QMAKE_CFLAGS_RELEASE=${CFLAGS}:" \
-	       -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
-	       -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
+		   -e "s:QMAKE_CXXFLAGS_RELEASE.*=.*:QMAKE_CXXFLAGS_RELEASE=${CXXFLAGS}:" \
+		   -e "s:QMAKE_LFLAGS_RELEASE.*=.*:QMAKE_LFLAGS_RELEASE=${LDFLAGS}:" \
 		   -e "s:\<QMAKE_CC\>.*=.*:QMAKE_CC=$(tc-getCC):" \
 		   -e "s:\<QMAKE_CXX\>.*=.*:QMAKE_CXX=$(tc-getCXX):" \
 		   -e "s:\<QMAKE_LINK\>.*=.*:QMAKE_LINK=$(tc-getCXX):" \