Compile with GCC 4.3; patch from Fedora. (bug #217978)

Package-Manager: portage-2.1.5_rc3

4 files changed, 136 insertions, 6 deletions

diff --git a/x11-wm/blackbox/ChangeLog b/x11-wm/blackbox/ChangeLog
index 6e0b3a80df4b..704486c7d282 100644
--- a/x11-wm/blackbox/ChangeLog
+++ b/x11-wm/blackbox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-wm/blackbox
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/blackbox/ChangeLog,v 1.59 2007/07/22 04:11:16 omp Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/blackbox/ChangeLog,v 1.60 2008/04/24 08:57:32 omp Exp $
+
+  24 Apr 2008; David Shakaryan <omp@gentoo.org>
+  +files/blackbox-0.70.1-gcc-4.3.patch, blackbox-0.70.1.ebuild:
+  Compile with GCC 4.3; patch from Fedora. (bug #217978)
 
   22 Jul 2007; David Shakaryan <omp@gentoo.org> blackbox-0.70.0.ebuild:
   Remove virtual/x11 from dependencies.
diff --git a/x11-wm/blackbox/Manifest b/x11-wm/blackbox/Manifest
index 944d53b6c7dc..00c295d8f661 100644
--- a/x11-wm/blackbox/Manifest
+++ b/x11-wm/blackbox/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX blackbox-0.70.1-gcc-4.3.patch 3274 RMD160 db1f6eca21e3ffcc0ff2662f6701bb05d636d532 SHA1 e8db616f0c134575eaf096ec0aa72f47e355b86f SHA256 4b4f13650bed35666dd27bcd4744e4f9d28f794e6f3e6c5ba5daedf780f16a78
 AUX blackbox.desktop 143 RMD160 946479197e095569f74e0398ce5a511f7d8dcb5a SHA1 7df18e18bf5df68d920028a616eaeb36466e30f3 SHA256 ccf8efedd257b097f5f3c9b46354a4f2205fe655b5b66976fb11e47c040fe418
 DIST blackbox-0.70.0.tar.bz2 433858 RMD160 e0e2ba5b6090033fbe6930a7507e1fce7aa9b2e5 SHA1 ff0be1957429ee678b4dbc4333a613a437007a43 SHA256 188c1f8ac1439e042583c211dcd3b4e81025dc690c465e3e57f0a43d02e8e8ca
 DIST blackbox-0.70.1.tar.bz2 492399 RMD160 daa414d3d9093614ad7caa18c0fe3863ef3db707 SHA1 66455b8400d6659b5681c290a5ced3697d199955 SHA256 92c2be347253f29b10063d579b4267a21516cb322a41b5e83d770fa6d44afd21
 EBUILD blackbox-0.70.0.ebuild 1220 RMD160 7d9e9380cb673fe47702a0f5b3e090da00030e93 SHA1 fc00a83378bb81d0575a913e5ba45d9e976a55c4 SHA256 d15bc946e4a56a2b5e4966be28e38838c473e9de04049e0862c27b53e045cc5d
-EBUILD blackbox-0.70.1.ebuild 1226 RMD160 71e3ca208aac92e0c6d2baac32dce7e513958712 SHA1 6cc7d111a5159abc8e04356cd75ed00b23667317 SHA256 b63e2b7748cc53c8803a9fed60557ba370f475451b6803e82076741ccb65984f
-MISC ChangeLog 8337 RMD160 db3a194f5af79c6ee6f7c2b73919b0e395be752a SHA1 4f9d719956d515aa20661e7a182f133c50329a63 SHA256 f15fee92929e7e7c442712e1ec76746b2aacb43b8a3993c8907c93e1ec334b72
+EBUILD blackbox-0.70.1.ebuild 1319 RMD160 046c3d863822c9e062f3cf3b3c5cb86d4b0f861b SHA1 63df67355d93680c910892624aa5382dfa45ac3c SHA256 1dfa17fefc155eefa5d17f06660953ca5df597ab9cfdbbbd83ca759eeaedc783
+MISC ChangeLog 8507 RMD160 99dfac921e0b107ba5065b5291e540bf9b437963 SHA1 672390e1c8463052fd4b1054d61d0c6bb98dc6aa SHA256 9041c539c28f0ce0a708093c13b81fa0d4ca256df90c8bddd7ef6b3e2927593e
 MISC metadata.xml 409 RMD160 50754d372117d4bc0f47cb8225a6d65332b3e620 SHA1 bc97b3233bccfb0c24b03b6ae00b259296540fb1 SHA256 5e55d79e4503507d195b6cef8b22aacdd0475b4fce1efc18367456d479cdc342
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgQS4QACgkQvSApE0uP4Utq3wCghB+KPybt255sUQBub7U+/sqk
+dEoAn08PQU5XNrCdO/Rn4qHOBhz16dUL
+=mK8C
+-----END PGP SIGNATURE-----
diff --git a/x11-wm/blackbox/blackbox-0.70.1.ebuild b/x11-wm/blackbox/blackbox-0.70.1.ebuild
index abad7bda3b6f..511aacc4d97f 100644
--- a/x11-wm/blackbox/blackbox-0.70.1.ebuild
+++ b/x11-wm/blackbox/blackbox-0.70.1.ebuild
@@ -1,6 +1,8 @@
-# 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-wm/blackbox/blackbox-0.70.1.ebuild,v 1.7 2007/06/14 19:51:33 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/blackbox/blackbox-0.70.1.ebuild,v 1.8 2008/04/24 08:57:32 omp Exp $
+
+inherit eutils
 
 DESCRIPTION="A small, fast, full-featured window manager for X"
 HOMEPAGE="http://blackboxwm.sourceforge.net/"
@@ -22,6 +24,13 @@ DEPEND="${RDEPEND}
 
 PROVIDE="virtual/blackbox"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-gcc-4.3.patch"
+}
+
 src_compile() {
 	econf \
 		--sysconfdir=/etc/X11/${PN} \
diff --git a/x11-wm/blackbox/files/blackbox-0.70.1-gcc-4.3.patch b/x11-wm/blackbox/files/blackbox-0.70.1-gcc-4.3.patch
new file mode 100644
index 000000000000..1026bd5c80ee
--- /dev/null
+++ b/x11-wm/blackbox/files/blackbox-0.70.1-gcc-4.3.patch
@@ -0,0 +1,106 @@
+diff -Naupr blackbox-0.70.1.orig/lib/Image.cc blackbox-0.70.1/lib/Image.cc
+--- blackbox-0.70.1.orig/lib/Image.cc	2005-04-08 17:41:09.000000000 +0200
++++ blackbox-0.70.1/lib/Image.cc	2008-02-24 08:31:28.000000000 +0100
+@@ -42,8 +42,9 @@
+ 
+ #include <assert.h>
+ #include <math.h>
+-#include <stdio.h>
+-#include <stdlib.h>
++#include <cstdio>
++#include <cstdlib>
++#include <cstring>
+ 
+ // #define COLORTABLE_DEBUG
+ // #define MITSHM_DEBUG
+diff -Naupr blackbox-0.70.1.orig/lib/Resource.cc blackbox-0.70.1/lib/Resource.cc
+--- blackbox-0.70.1.orig/lib/Resource.cc	2005-04-06 23:16:50.000000000 +0200
++++ blackbox-0.70.1/lib/Resource.cc	2008-02-24 08:33:11.000000000 +0100
+@@ -28,7 +28,8 @@
+ #include <X11/Xlib.h>
+ #include <X11/Xresource.h>
+ 
+-#include <stdio.h>
++#include <cstdio>
++#include <cstring>
+ 
+ 
+ bt::Resource::Resource(void)
+diff -Naupr blackbox-0.70.1.orig/lib/XDG.cc blackbox-0.70.1/lib/XDG.cc
+--- blackbox-0.70.1.orig/lib/XDG.cc	2005-04-06 16:04:38.000000000 +0200
++++ blackbox-0.70.1/lib/XDG.cc	2008-02-24 08:34:11.000000000 +0100
+@@ -25,7 +25,8 @@
+ #include "Util.hh"
+ #include "XDG.hh"
+ 
+-#include <stdlib.h>
++#include <cstdlib>
++#include <algorithm>
+ 
+ 
+ // make sure directory names end with a slash
+diff -Naupr blackbox-0.70.1.orig/src/BlackboxResource.cc blackbox-0.70.1/src/BlackboxResource.cc
+--- blackbox-0.70.1.orig/src/BlackboxResource.cc	2005-10-18 09:34:46.000000000 +0200
++++ blackbox-0.70.1/src/BlackboxResource.cc	2008-02-24 08:34:49.000000000 +0100
+@@ -33,6 +33,8 @@
+ #include <X11/Xutil.h>
+ #include <X11/cursorfont.h>
+ 
++#include <cstring>
++
+ 
+ BlackboxResource::BlackboxResource(const std::string& rc): rc_file(rc) {
+   screen_resources = 0;
+diff -Naupr blackbox-0.70.1.orig/src/main.cc blackbox-0.70.1/src/main.cc
+--- blackbox-0.70.1.orig/src/main.cc	2005-01-03 10:42:57.000000000 +0100
++++ blackbox-0.70.1/src/main.cc	2008-02-24 08:37:16.000000000 +0100
+@@ -34,7 +34,8 @@
+ #include "blackbox.hh"
+ #include "../version.h"
+ 
+-#include <stdio.h>
++#include <cstdio>
++#include <cstring>
+ 
+ 
+ static void showHelp(int exitval) {
+diff -Naupr blackbox-0.70.1.orig/src/Screen.cc blackbox-0.70.1/src/Screen.cc
+--- blackbox-0.70.1.orig/src/Screen.cc	2005-10-18 10:07:22.000000000 +0200
++++ blackbox-0.70.1/src/Screen.cc	2008-02-24 08:35:46.000000000 +0100
+@@ -45,8 +45,9 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <assert.h>
+-#include <ctype.h>
+ #include <dirent.h>
++#include <cctype>
++#include <cstring>
+ 
+ 
+ static bool running = true;
+diff -Naupr blackbox-0.70.1.orig/src/ScreenResource.cc blackbox-0.70.1/src/ScreenResource.cc
+--- blackbox-0.70.1.orig/src/ScreenResource.cc	2005-04-13 07:54:08.000000000 +0200
++++ blackbox-0.70.1/src/ScreenResource.cc	2008-02-24 08:36:31.000000000 +0100
+@@ -33,6 +33,8 @@
+ 
+ #include <assert.h>
+ 
++#include <cstring>
++
+ 
+ static const int iconify_width  = 9;
+ static const int iconify_height = 9;
+diff -Naupr blackbox-0.70.1.orig/util/bsetroot.cc blackbox-0.70.1/util/bsetroot.cc
+--- blackbox-0.70.1.orig/util/bsetroot.cc	2005-03-15 08:01:37.000000000 +0100
++++ blackbox-0.70.1/util/bsetroot.cc	2008-02-24 08:38:41.000000000 +0100
+@@ -30,7 +30,9 @@
+ #include <cctype>
+ 
+ #include <X11/Xatom.h>
+-#include <stdio.h>
++#include <cstdio>
++#include <cstdlib>
++#include <cstring>
+ 
+ 
+ // ignore all X errors