Compile with GCC 4.3; patch by Peter Alfredsen. (bug #218336)

Package-Manager: portage-2.1.5_rc3

5 files changed, 187 insertions, 8 deletions

diff --git a/x11-misc/bbkeys/Manifest b/x11-misc/bbkeys/Manifest
index 5ee0698b2205..f5a872de06fc 100644
--- a/x11-misc/bbkeys/Manifest
+++ b/x11-misc/bbkeys/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX bbkeys-0.9.0-gcc-4.3.patch 2066 RMD160 a3731a99d5b25975faae54eab798400f83d01220 SHA1 9d64e459ce43295fc92c893ae4ee490bd4ca6323 SHA256 225694844ddefc38b9fff0d30cdc05711981b9a39808cc4cf61f7e6b15533be3
 DIST bbkeys-0.9.0.tar.gz 199146 RMD160 a42506693da977bed17d56ee0c1e5d0440464ac6 SHA1 b406f47f298fe83df6be89d2437dae2cee007439 SHA256 1ebf372e35b31e7bd63c9a28d2434cfc44588db08b653df64a396d2821dd9ff0
-EBUILD bbkeys-0.9.0-r1.ebuild 666 RMD160 de8a216c0be41b10a62fd5632c2ab8af740da0d5 SHA1 943c621625e49794dc07f60219f5206fd03c88e2 SHA256 befb04168a08aa48a0c4a9230e3f0c7ad37aaed7dffe86c57ebe11f7340039a9
-MISC ChangeLog 3041 RMD160 daa75e57bd628901e9e6977ec6afddcf0380714a SHA1 9045e2dd7e2a72d7127027027cc6fc52f80b6749 SHA256 c5a950d6c50f57c086c2621ce38b29b8d3718b98c5571aa0882a7c458a3a1188
+EBUILD bbkeys-0.9.0-r1.ebuild 759 RMD160 c990d063886b221c04a7807bd293f5fe5a393289 SHA1 683388ce85606de0ff89624547c68be45283cf96 SHA256 4dcd236cefe69c4b1964eecb39129495093e1590ea761d9aba9e941447a05231
+MISC ChangeLog 3206 RMD160 7df3fd05534d588ccf1999b363ef7d49eac1b63b SHA1 15fdc5bdebadf4383ed40d94a09a95d546b56304 SHA256 c2fa2e20c11f53484b312c80b760a0ddb866e2a32a8d8fb21a8388b45d13a18e
 MISC metadata.xml 234 RMD160 18a2a2da4270abb2e744dea8827732654e14f757 SHA1 7a6eaa8c3974230068683566363da1b3489146db SHA256 184ce900d710eceac495472391e1008660454310091e38c1c360d470bc49b6ce
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgQSvMACgkQvSApE0uP4UvqzQCfZIBDJuDcF7MgggJv2don3vUO
+fKwAn2dyH6wRnrO4hrD+mKu4M2ufGRaL
+=UtdL
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/fbdesk/ChangeLog b/x11-misc/fbdesk/ChangeLog
index 99c2519e5e82..815845e13f18 100644
--- a/x11-misc/fbdesk/ChangeLog
+++ b/x11-misc/fbdesk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/fbdesk
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbdesk/ChangeLog,v 1.24 2007/12/05 19:54:47 lack Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbdesk/ChangeLog,v 1.25 2008/04/24 08:50:34 omp Exp $
+
+  24 Apr 2008; David Shakaryan <omp@gentoo.org>
+  +files/fbdesk-1.4.1-gcc-4.3.patch, fbdesk-1.4.1.ebuild:
+  Compile with GCC 4.3; patch by Peter Alfredsen. (bug #218336)
 
   05 Dec 2007; Jim Ramsay <lack@gentoo.org> fbdesk-1.2.1.ebuild,
   fbdesk-1.4.1.ebuild:
diff --git a/x11-misc/fbdesk/Manifest b/x11-misc/fbdesk/Manifest
index f41056c0b90a..6e417420a20e 100644
--- a/x11-misc/fbdesk/Manifest
+++ b/x11-misc/fbdesk/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX fbdesk-1.2.1-gcc41.patch 608 RMD160 6d31030523151dbd2b9afc74851fc5650ffef8b5 SHA1 93989176a37ebc4fe472e2be0898537603d5fda4 SHA256 4ef23c4d5a7b00d918127a14c044cd0cc19b431450c10211907c6d3e7a769f04
+AUX fbdesk-1.4.1-gcc-4.3.patch 3506 RMD160 b095682cb6df9ea625eb452df3bf3fbcc3d7e5af SHA1 c676ea7b2d89d5a8e0c842a91b08e4e5e92271b1 SHA256 25f296b0079afd84a9e9fe4e5b057638ee79b5baaa869b70920008d1057a54e0
 DIST fbdesk-1.2.1.tar.gz 388679 RMD160 a3ae892c5c733351b1525e874875c09078ac5aa7 SHA1 d3095dc51f91aa919371b582a546fa3e018533e3 SHA256 64366e367c0bd8c29fc9a96eb095c15b4f839d2c83819e744d809127d6be5016
 DIST fbdesk-1.4.1.tar.gz 426550 RMD160 ce22936b73acd8273e9816f4c2a5458cc98cf45a SHA1 b5a2f446fa27406d9adb9a9608f1dc3c638d37ff SHA256 ca5620468ca8743c6bf536099ac6ddc2a0546e5d658bb88f27db8e429ff51c4c
 EBUILD fbdesk-1.2.1.ebuild 961 RMD160 dc04a19d3f702003b85d9d7e393fdd3285da7530 SHA1 9d79b00969c6d94476aa17dd3f55afc6a55e7977 SHA256 43a6e403c5832161ed49dee683a4b15de37a554ec3608a731707b1de0680117f
-EBUILD fbdesk-1.4.1.ebuild 912 RMD160 07b2862519954a70fafb407ae47544a9ef924a39 SHA1 828f2f8f41c2e8664b9051d09d6c8fa400efb49a SHA256 6a7e35b8a24aa7ed9f9f6b9b76e4c1a9a1edc736e2cde8dacf3fab16924552cb
-MISC ChangeLog 3261 RMD160 e60faec5bea386e108a25f09d1ec7c5f287e67b6 SHA1 86ed030d655eb8547bb459f03a8dd550708042db SHA256 c09cac0c66943fadb310092a1ef13c8bc9b327d84cd51aa98ead21131f8f9d69
+EBUILD fbdesk-1.4.1.ebuild 995 RMD160 3a62eea62eccd112b8a8f4fc2d10a22b3720911f SHA1 ef0319071d09db3d47f4aa993fb48fcac53fe690 SHA256 a1174cc83b1e9ea1858113df250bd378322711ffed58a3967596892b2ec82c6a
+MISC ChangeLog 3431 RMD160 bae1438aa5dc520d588cc0b7965c88eb62343cca SHA1 661479daf3b46f60ab3221a0761e424ed74746c4 SHA256 008bd4a2404ff01c26647b555c4cdd793ab12412285e29cb969a7b0b5faf0719
 MISC metadata.xml 162 RMD160 703446c6272f12116290b48cf1edb105392e19d5 SHA1 57738825f99b27d6f85e18693ccf1167206f79e9 SHA256 98f3695fbdfbde0e5c6c81ebc87af8db70d4a62eadaea2125cfa50956860266d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgQSeIACgkQvSApE0uP4UtGXACfQXn3Z8y2Sw5Dg2+iactPngb+
+Ww4AnjZOIegCw5r/sdQKyM2/MGo7MkNN
+=7xd7
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/fbdesk/fbdesk-1.4.1.ebuild b/x11-misc/fbdesk/fbdesk-1.4.1.ebuild
index 9879dfcff3db..04d6a884b3b1 100644
--- a/x11-misc/fbdesk/fbdesk-1.4.1.ebuild
+++ b/x11-misc/fbdesk/fbdesk-1.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbdesk/fbdesk-1.4.1.ebuild,v 1.2 2007/12/05 19:54:47 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fbdesk/fbdesk-1.4.1.ebuild,v 1.3 2008/04/24 08:50:34 omp Exp $
 
 inherit eutils
 
@@ -20,6 +20,13 @@ RDEPEND="png? ( media-libs/libpng )
 DEPEND="${RDEPEND}
 		x11-proto/xextproto"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-gcc-4.3.patch"
+}
+
 src_compile() {
 	econf \
 		$(use_enable imlib2) \
diff --git a/x11-misc/fbdesk/files/fbdesk-1.4.1-gcc-4.3.patch b/x11-misc/fbdesk/files/fbdesk-1.4.1-gcc-4.3.patch
new file mode 100644
index 000000000000..fba8bfe97176
--- /dev/null
+++ b/x11-misc/fbdesk/files/fbdesk-1.4.1-gcc-4.3.patch
@@ -0,0 +1,146 @@
+--- fbdesk-1.4.1.orig/src/FbDesk.cc	2008-04-18 22:42:17.000000000 +0200
++++ fbdesk-1.4.1/src/FbDesk.cc	2008-04-18 23:23:53.000000000 +0200
+@@ -37,10 +37,11 @@
+ #include <iostream>
+ #include <fstream>
+ #include <algorithm>
+ #include <unistd.h>
+ #include <cstdio>
++#include <cstring>
+ 
+ using namespace std;
+ using namespace FbTk;
+ 
+ 
+--- fbdesk-1.4.1.orig/src/FbTk/FbPixmap.cc	2008-04-18 22:42:17.000000000 +0200
++++ fbdesk-1.4.1/src/FbTk/FbPixmap.cc	2008-04-18 22:55:06.000000000 +0200
+@@ -28,10 +28,11 @@
+ 
+ #include <X11/Xutil.h>
+ #include <X11/Xatom.h>
+ #include <iostream>
+ #include <string>
++#include <cstring>
+ 
+ using namespace std;
+ 
+ namespace FbTk {
+ 
+--- fbdesk-1.4.1.orig/src/FbTk/KeyUtil.cc	2008-04-18 22:42:17.000000000 +0200
++++ fbdesk-1.4.1/src/FbTk/KeyUtil.cc	2008-04-18 22:56:17.000000000 +0200
+@@ -23,10 +23,11 @@
+ 
+ #include "KeyUtil.hh"
+ #include "App.hh"
+ 
+ #include <string>
++#include <cstring>
+ 
+ namespace {
+ 
+ struct t_modlist{
+     char *str;
+--- fbdesk-1.4.1.orig/src/FbTk/StringUtil.cc	2008-04-18 22:42:17.000000000 +0200
++++ fbdesk-1.4.1/src/FbTk/StringUtil.cc	2008-04-18 22:52:54.000000000 +0200
+@@ -47,10 +47,11 @@
+ 
+ 
+ #include <memory>
+ #include <algorithm>
+ #include <string>
++#include <cstring>
+ 
+ using std::string;
+ using std::transform;
+ 
+ namespace FbTk {
+--- fbdesk-1.4.1.orig/src/FbTk/TextBox.cc	2008-04-18 22:42:17.000000000 +0200
++++ fbdesk-1.4.1/src/FbTk/TextBox.cc	2008-04-18 22:58:22.000000000 +0200
+@@ -34,10 +34,11 @@
+ #endif
+ #include <X11/keysym.h>
+ #include <X11/Xutil.h>
+ 
+ #include <iostream>
++#include <cstdlib>
+ 
+ namespace FbTk {
+ 
+ TextBox::TextBox(int screen_num,
+                  const Font &font, const std::string &text):
+--- fbdesk-1.4.1.orig/src/FbTk/TextureRender.cc	2008-04-18 22:42:17.000000000 +0200
++++ fbdesk-1.4.1/src/FbTk/TextureRender.cc	2008-04-18 22:48:18.000000000 +0200
+@@ -31,10 +31,11 @@
+ #include "FbPixmap.hh"
+ #include "GContext.hh"
+ 
+ #include <iostream>
+ #include <string>
++#include <cstring>
+ #ifdef HAVE_CSTDIO
+   #include <cstdio>
+ #else
+   #include <stdio.h>
+ #endif
+--- fbdesk-1.4.1.orig/src/FbTk/Theme.cc	2008-04-18 22:42:17.000000000 +0200
++++ fbdesk-1.4.1/src/FbTk/Theme.cc	2008-04-18 22:49:14.000000000 +0200
+@@ -34,10 +34,11 @@
+ #else
+   #include <stdio.h>
+ #endif
+ #include <memory>
+ #include <iostream>
++#include <algorithm>
+ 
+ using namespace std;
+ 
+ namespace FbTk {
+ 
+--- fbdesk-1.4.1.orig/src/FbTk/ThemeItems.cc	2008-04-18 22:42:17.000000000 +0200
++++ fbdesk-1.4.1/src/FbTk/ThemeItems.cc	2008-04-18 23:22:03.000000000 +0200
+@@ -46,10 +46,12 @@
+   #include <stdio.h>
+ #endif
+ 
+ #include <iostream>
+ #include <memory>
++#include <cstdlib>
++#include <cstring>
+ 
+ namespace FbTk {
+ 
+ using std::string;
+ using std::cerr;
+--- fbdesk-1.4.1.orig/src/FbTk/XFontImp.cc	2008-04-18 22:42:17.000000000 +0200
++++ fbdesk-1.4.1/src/FbTk/XFontImp.cc	2008-04-18 22:45:31.000000000 +0200
+@@ -26,10 +26,11 @@
+ #include "GContext.hh"
+ #include "FbPixmap.hh"
+ 
+ #include <X11/Xutil.h>
+ 
++#include <cstdlib>
+ #include <iostream>
+ #include <new>
+ #ifdef HAVE_CSTDIO
+   #include <cstdio>
+ #else
+--- fbdesk-1.4.1.orig/src/main.cc	2008-04-18 22:42:17.000000000 +0200
++++ fbdesk-1.4.1/src/main.cc	2008-04-18 23:24:47.000000000 +0200
+@@ -21,14 +21,16 @@
+ 
+ #include "App.hh"
+ #include "FbDesk.hh"
+ #include "version.h"
+ 
++#include <cstdlib>
+ #include <iostream>
+ #include <stdexcept>
+ #include <signal.h>
+ #include <sys/wait.h>
++#include <cstring>
+ 
+ using namespace std;
+ 
+ ///  handles system signals
+ void signalhandler(int sig) {