Fix building with gcc-4.3. Bug #251487. Thanks to Gene Seto for the patch.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 213 insertions, 7 deletions

diff --git a/net-misc/kwebget/ChangeLog b/net-misc/kwebget/ChangeLog
index dff4f22192a6..47f6fd07d083 100644
--- a/net-misc/kwebget/ChangeLog
+++ b/net-misc/kwebget/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/kwebget
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/kwebget/ChangeLog,v 1.5 2007/02/04 00:11:30 flameeyes Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kwebget/ChangeLog,v 1.6 2009/02/15 20:26:38 dirtyepic Exp $
+
+  15 Feb 2009; Ryan Hill <dirtyepic@gentoo.org>
+  +files/kwebget-0.8.1-gcc43.patch, kwebget-0.8.1.ebuild:
+  Fix building with gcc-4.3. Bug #251487. Thanks to Gene Seto for the patch.
 
   04 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/net-misc/kwebget/Manifest b/net-misc/kwebget/Manifest
index 1c1c4d80d3ae..79898e35e191 100644
--- a/net-misc/kwebget/Manifest
+++ b/net-misc/kwebget/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX kwebget-0.8.1-configure.patch 3504 RMD160 8e86d6746c262ce89163cd1acc4e5a2a5a57e7cd SHA1 545f5d4767837c57ea082d7cdd84619752d478a6 SHA256 92a9dabeb1d5e44b1c6f6633e6925ae33c764131bb43eb72817b82c14cf9d449
+AUX kwebget-0.8.1-gcc43.patch 4297 RMD160 f331c955ac99d433119a4124e844d3d727626ec2 SHA1 9eef7e6ad3a1481d4fd5846ee8ab942bc35ac511 SHA256 c70c06ccc10c3043b22ed94778117b81a13ebfd4a05644a1429f613935663fcd
 DIST kwebget-0.8.1.tar.bz2 990308 RMD160 940bad31bea9e56a2a2e8d0cc5c6e103f9536f2c SHA1 cea0a3dc814471acadddc23da83a434b3c5879d5 SHA256 8446c73715ddd6da0ac1a8d63c2a18e723115be3c39c8551914870f962a6b301
-EBUILD kwebget-0.8.1.ebuild 651 RMD160 de6c0dbf75d626befe16db54c90ebf94431e6060 SHA1 b7512e04459c1e003b47c3b2579ad886638e9baa SHA256 e4fff5dd490ab84af48dc344bd8fb5cb08eb2363aca240de80a321d4c952d8ae
-MISC ChangeLog 788 RMD160 9a184bbd65908f675b094689eff9e60c11127713 SHA1 6d7474dd9edc899283e400b9266d688bf2bd671f SHA256 5336f56f827446fc4bdb93e94607597ed2f06213035e395e2d84c29a931aea73
+EBUILD kwebget-0.8.1.ebuild 686 RMD160 75e3f3f12cd3570cb04459519b9a10314531ea9e SHA1 e097f4c43af21ddff1f75a93457d14f370ee1dd9 SHA256 9d95e539110080ac019a3825af682a9d98275c051c0c3420b58ee71e7a009df3
+MISC ChangeLog 972 RMD160 bba33f2f7bb1d3b21d0f6420bd4fc9479925c746 SHA1 4a15708d594a6b35bed7051a28ad3bf1ab15dbf1 SHA256 b192ac16385424c476c66481079d7ef6c011216736a13963034a350f8671f6f8
 MISC metadata.xml 157 RMD160 9258d9691830e58ee00ca89f0a6df9ce077f2439 SHA1 b2ca0d856f38a09bf6d2e58ee77b344552585862 SHA256 e0e268ca18fef286617fcfe97773d5df5b8fbdb5fbcb9a29adc5e8b0baea4292
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.10 (GNU/Linux)
+
+iEYEARECAAYFAkmYetUACgkQiqiDRvmkBmLzqgCfdefu7yQk68zjr0sAbmjAqEkN
+nXIAoIR9x5K+b60OdMY8ZDpwvgdxm0aZ
+=8EMB
+-----END PGP SIGNATURE-----
diff --git a/net-misc/kwebget/files/kwebget-0.8.1-gcc43.patch b/net-misc/kwebget/files/kwebget-0.8.1-gcc43.patch
new file mode 100644
index 000000000000..86cb81967231
--- /dev/null
+++ b/net-misc/kwebget/files/kwebget-0.8.1-gcc43.patch
@@ -0,0 +1,190 @@
+--- kwebget-orig/kwebget/kwebget.cpp
++++ kwebget/kwebget/kwebget.cpp
+@@ -15,6 +15,7 @@
+  *                                                                         *
+  ***************************************************************************/
+ 
++#include <cstdlib>
+ #include "kwebget.h"
+ 
+ #include "../pics/bg.xpm"
+--- kwebget-orig/pics/active.xpm
++++ kwebget/pics/active.xpm
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * active[] = {
++static const char * active[] = {
+ "16 16 52 1",
+ " 	c None",
+ ".	c #1BDB12",
+--- kwebget-orig/pics/bg2.xpm
++++ kwebget/pics/bg2.xpm
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * bg2[] = {
++static const char * bg2[] = {
+ "100 100 123 2",
+ "  	c None",
+ ". 	c #7F7F7F",
+--- kwebget-orig/pics/bg.xpm
++++ kwebget/pics/bg.xpm
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * bg[] = {
++static const char * bg[] = {
+ "100 100 70 1",
+ " 	c None",
+ ".	c #BBBBBB",
+--- kwebget-orig/pics/inactive.xpm
++++ kwebget/pics/inactive.xpm
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * inactive[] = {
++static const char * inactive[] = {
+ "16 16 33 1",
+ " 	c None",
+ ".	c #F9F504",
+--- kwebget-orig/pics/runpix0.xpm
++++ kwebget/pics/runpix0.xpm
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * runpix0[] = {
++static const char * runpix0[] = {
+ "120 20 18 1",
+ " 	c None",
+ ".	c #00FF00",
+--- kwebget-orig/pics/runpix10.xpm
++++ kwebget/pics/runpix10.xpm
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * runpix10[] = {
++static const char * runpix10[] = {
+ "120 20 27 1",
+ " 	c None",
+ ".	c #05FF00",
+--- kwebget-orig/pics/runpix11.xpm
++++ kwebget/pics/runpix11.xpm
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * runpix11[] = {
++static const char * runpix11[] = {
+ "120 20 18 1",
+ " 	c None",
+ ".	c #00FF00",
+--- kwebget-orig/pics/runpix1.xpm
++++ kwebget/pics/runpix1.xpm
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * runpix1[] = {
++static const char * runpix1[] = {
+ "120 20 34 1",
+ " 	c None",
+ ".	c #00FF00",
+--- kwebget-orig/pics/runpix2.xpm
++++ kwebget/pics/runpix2.xpm
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * runpix2[] = {
++static const char * runpix2[] = {
+ "120 20 45 1",
+ " 	c None",
+ ".	c #01FF00",
+--- kwebget-orig/pics/runpix3.xpm
++++ kwebget/pics/runpix3.xpm
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * runpix3[] = {
++static const char * runpix3[] = {
+ "120 20 47 1",
+ " 	c None",
+ ".	c #00FF00",
+--- kwebget-orig/pics/runpix4.xpm
++++ kwebget/pics/runpix4.xpm
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * runpix4[] = {
++static const char * runpix4[] = {
+ "120 20 41 1",
+ " 	c None",
+ ".	c #00FF00",
+--- kwebget-orig/pics/runpix5.xpm
++++ kwebget/pics/runpix5.xpm
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * runpix5[] = {
++static const char * runpix5[] = {
+ "120 20 33 1",
+ " 	c None",
+ ".	c #00FF00",
+--- kwebget-orig/pics/runpix6.xpm
++++ kwebget/pics/runpix6.xpm
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * runpix6[] = {
++static const char * runpix6[] = {
+ "120 20 56 1",
+ " 	c None",
+ ".	c #00FF00",
+--- kwebget-orig/pics/runpix7.xpm
++++ kwebget/pics/runpix7.xpm
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * runpix7[] = {
++static const char * runpix7[] = {
+ "120 20 29 1",
+ " 	c None",
+ ".	c #02FF00",
+--- kwebget-orig/pics/runpix8.xpm
++++ kwebget/pics/runpix8.xpm
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * runpix8[] = {
++static const char * runpix8[] = {
+ "120 20 39 1",
+ " 	c None",
+ ".	c #01FF00",
+--- kwebget-orig/pics/runpix9.xpm
++++ kwebget/pics/runpix9.xpm
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * runpix9[] = {
++static const char * runpix9[] = {
+ "120 20 33 1",
+ " 	c None",
+ ".	c #00FF00",
+--- kwebget-orig/pics/stoppix.xpm
++++ kwebget/pics/stoppix.xpm
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * stoppix[] = {
++static const char * stoppix[] = {
+ "540 20 256 2",
+ "  	c None",
+ ". 	c #020204",
+--- kwebget-orig/pics/welcome.xpm
++++ kwebget/pics/welcome.xpm
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * welcome[] = {
++static const char * welcome[] = {
+ "400 200 50485 3",
+ "   	c None",
+ ".  	c #090C09",
+--- kwebget-orig/pics/wizard.xpm
++++ kwebget/pics/wizard.xpm
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * wizard_xpm[] = {
++static const char * wizard_xpm[] = {
+ "30 30 256 2",
+ "  	c None",
+ ". 	c #36361C",
+--- kwebget-orig/pics/wizpic.xpm
++++ kwebget/pics/wizpic.xpm
+@@ -1,5 +1,5 @@
+ /* XPM */
+-static char * wizpic_xpm[] = {
++static const char * wizpic_xpm[] = {
+ "150 230 256 2",
+ "  	c None",
+ ". 	c #0D0D0D",
diff --git a/net-misc/kwebget/kwebget-0.8.1.ebuild b/net-misc/kwebget/kwebget-0.8.1.ebuild
index bbb9fb755c1b..031ff9d87551 100644
--- a/net-misc/kwebget/kwebget-0.8.1.ebuild
+++ b/net-misc/kwebget/kwebget-0.8.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/kwebget/kwebget-0.8.1.ebuild,v 1.6 2005/10/12 13:00:59 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/kwebget/kwebget-0.8.1.ebuild,v 1.7 2009/02/15 20:26:38 dirtyepic Exp $
 
 inherit kde eutils
 
@@ -23,5 +23,6 @@ src_unpack() {
 	kde_src_unpack
 
 	# respect the "arts" USE flag until it's fixed upstream
-	use arts || epatch ${FILESDIR}/kwebget-0.8.1-configure.patch
+	use arts || epatch "${FILESDIR}"/${P}-configure.patch
+	epatch "${FILESDIR}"/${P}-gcc43.patch
 }