Compile with GCC 4.3; patch from Debian modified by Peter Alfredsen. (bug #218956)

Package-Manager: portage-2.1.5_rc3

4 files changed, 158 insertions, 6 deletions

diff --git a/x11-wm/pekwm/ChangeLog b/x11-wm/pekwm/ChangeLog
index 024c2adf40c9..264b4d9280f8 100644
--- a/x11-wm/pekwm/ChangeLog
+++ b/x11-wm/pekwm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/pekwm
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/pekwm/ChangeLog,v 1.38 2007/09/09 17:58:31 coldwind Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/pekwm/ChangeLog,v 1.39 2008/04/24 07:29:44 omp Exp $
+
+  24 Apr 2008; David Shakaryan <omp@gentoo.org>
+  +files/pekwm-0.1.6-gcc-4.3.patch, pekwm-0.1.6.ebuild:
+  Compile with GCC 4.3; patch from Debian modified by Peter Alfredsen. (bug
+  #218956)
 
   09 Sep 2007; Santiago M. Mola <coldwind@gentoo.org> pekwm-0.1.5.ebuild,
   pekwm-0.1.6.ebuild:
diff --git a/x11-wm/pekwm/Manifest b/x11-wm/pekwm/Manifest
index 3edb6865a6d5..58b5ee3c45c7 100644
--- a/x11-wm/pekwm/Manifest
+++ b/x11-wm/pekwm/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX pekwm-0.1.6-gcc-4.3.patch 3076 RMD160 8de25dcbb0a7e336b10e63b92a5b47f0128ed94a SHA1 bee2386b1e8955ba391c0392db91415b8e34b304 SHA256 7494cee1a696e45069bae275572a36b74d37ecf9c075570727c8b7987339fff4
 DIST pekwm-0.1.5.tar.bz2 241913 RMD160 1195c7f5452b5e5b9fc6eab245df1d159e12c2f0 SHA1 e22b6c32efaffa2cc16c7965356db11893ecfab8 SHA256 e72a9d34894f0059ccbac28605a9b0a575bd805331d4b4cba841f5d4cb91d94b
 DIST pekwm-0.1.6.tar.bz2 275703 RMD160 9bbe5fe0f80fd5dcc24df2d6fd9e7d0885c33698 SHA1 f1be57d14d32d096a399b1b9409ee9c44820bb6e SHA256 2cf2f3a59c83273c022419d50e627b9e8f1f629cad89c1c91dffe7a4bc1b4c44
 DIST pekwm-themes.tar.bz2 138599 RMD160 b35a21e6d6123a6fde835cd8889e44d9e5b338b9 SHA1 3228024488dd7547b748e2448e4633ceae97ae4d SHA256 5a14f0c98381e0d5b36dcc2e56b30b0dd279e14b6dd61b199fedf807eccb4a13
 EBUILD pekwm-0.1.5.ebuild 1260 RMD160 a9b5607e78c173e999578854a116311df3f57de3 SHA1 e00f0f5f1adb17ee29d8df012cdc72351952c058 SHA256 77b8a59acbc4fbc42c3f802e6593b15438fa8388661e8d8455bd7b1dbebfbef4
-EBUILD pekwm-0.1.6.ebuild 1268 RMD160 e3be44ec25cd1b0620816e76bac7b9f03092211c SHA1 1a9920dee3fe41b6d527e1a656bd45854d81a3b3 SHA256 27b5ae41bed84eac07255ab73b1476ba1268b4be1c2816dcdd1ae6350a1fe868
-MISC ChangeLog 4986 RMD160 e256255337fd492e2129b4d9984f28fb4a0798af SHA1 1999b740cd8ee6094efa89367eadb82016c017b4 SHA256 29cf029a5f502119251abf3bc9a63d1b749ea8d88f304386800d742228b18791
+EBUILD pekwm-0.1.6.ebuild 1363 RMD160 0ad434ef9be2b5fefcf921e3dba9df608040f03d SHA1 69ad4bd8d6391ce189648bd37e9d4321712a471c SHA256 f40377c3b7e49b78ad50c8218848f69db1d63e158f08b7f77913428b692dc972
+MISC ChangeLog 5173 RMD160 75b911f13133118aeeab100be894678138dc2a2c SHA1 7ce041f908386f1075ac708e4ee6a4996d415940 SHA256 4b0b8a64a4e622f87ce424afd4f823b847fa1e519ac2377fff5a2cf1dfb5b391
 MISC metadata.xml 608 RMD160 131a9e8838999d01c01b54959931caba52dbec79 SHA1 976e6be95426c28630627143b3b5f8377156c622 SHA256 caf6a62591511df76c6e29ada6f8fca262c32aacdb60a359f699c23f1e2f11b8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgQNvUACgkQvSApE0uP4UuLSQCggP1PIA3XEQhM9Ijt6oru+AkO
+TQoAn2vIcNe8P26JUb1Sh8+pfOzTQrti
+=ie0B
+-----END PGP SIGNATURE-----
diff --git a/x11-wm/pekwm/files/pekwm-0.1.6-gcc-4.3.patch b/x11-wm/pekwm/files/pekwm-0.1.6-gcc-4.3.patch
new file mode 100644
index 000000000000..3d1e30aa7b7f
--- /dev/null
+++ b/x11-wm/pekwm/files/pekwm-0.1.6-gcc-4.3.patch
@@ -0,0 +1,127 @@
+--- pekwm-0.1.6.orig/src/CfgParser.cc	2007-05-08 10:10:13.000000000 +0200
++++ pekwm-0.1.6/src/CfgParser.cc	2008-04-22 22:41:21.000000000 +0200
+@@ -11,10 +11,11 @@
+ #include "Util.hh"
+ 
+ #include <iostream>
+ #include <memory>
+ #include <cassert>
++#include <cstring>
+ 
+ #ifdef HAVE_GETTEXT
+ #include <libintl.h>
+ #define _(S) gettext(S)
+ #else // !HAVE_GETTEXT
+--- pekwm-0.1.6.orig/src/CfgParser.hh	2007-05-08 10:10:13.000000000 +0200
++++ pekwm-0.1.6/src/CfgParser.hh	2008-04-22 22:41:21.000000000 +0200
+@@ -30,10 +30,11 @@
+ 
+ #include <list>
+ #include <map>
+ #include <set>
+ #include <string>
++#include <cstring>
+ #include <iostream>
+ #include <cstdlib>
+ 
+ //! @brief Configuration file parser.
+ class CfgParser {
+--- pekwm-0.1.6.orig/src/CfgParserSource.cc	2007-05-08 10:10:13.000000000 +0200
++++ pekwm-0.1.6/src/CfgParserSource.cc	2008-04-22 22:41:21.000000000 +0200
+@@ -11,10 +11,11 @@
+ //
+ 
+ #include "CfgParserSource.hh"
+ #include "Util.hh"
+ 
++#include <cstdlib>
+ #include <iostream>
+ 
+ extern "C" {
+ #include <unistd.h>
+ }
+--- pekwm-0.1.6.orig/src/ColorHandler.cc	2007-05-08 10:10:13.000000000 +0200
++++ pekwm-0.1.6/src/ColorHandler.cc	2008-04-22 22:41:21.000000000 +0200
+@@ -5,10 +5,11 @@
+ // See the LICENSE file for more information.
+ //
+ 
+ #include "ColorHandler.hh"
+ #include "PScreen.hh"
++#include <cstring>
+ 
+ #ifdef DEBUG
+ #include <iostream>
+ using std::cerr;
+ using std::endl;
+--- pekwm-0.1.6.orig/src/ColorHandler.hh	2007-05-08 10:10:13.000000000 +0200
++++ pekwm-0.1.6/src/ColorHandler.hh	2008-04-22 22:41:21.000000000 +0200
+@@ -13,10 +13,11 @@
+ 
+ #include "pekwm.hh"
+ 
+ #include <list>
+ #include <string>
++#include <cstring>
+ 
+ class ColorHandler {
+ public:
+     class Entry {
+     public:
+--- pekwm-0.1.6.orig/src/PImageNativeLoaderXpm.cc	2007-05-08 10:10:13.000000000 +0200
++++ pekwm-0.1.6/src/PImageNativeLoaderXpm.cc	2008-04-22 22:41:21.000000000 +0200
+@@ -11,10 +11,11 @@
+ #ifdef HAVE_IMAGE_XPM
+ 
+ #include "PImageNativeLoaderXpm.hh"
+ 
+ #include <iostream>
++#include <cstring>
+ 
+ using std::cerr;
+ using std::endl;
+ using std::string;
+ 
+--- pekwm-0.1.6.orig/src/RegexString.cc	2007-05-08 10:10:13.000000000 +0200
++++ pekwm-0.1.6/src/RegexString.cc	2008-04-22 22:41:21.000000000 +0200
+@@ -9,11 +9,11 @@
+ //
+ 
+ #include "../config.h"
+ 
+ #include "RegexString.hh"
+-
++#include <cstdlib>
+ #include <iostream>
+ 
+ #ifdef HAVE_GETTEXT
+ #include <libintl.h>
+ #define _(S) gettext(S)
+--- pekwm-0.1.6.orig/src/Util.cc	2007-05-08 10:10:13.000000000 +0200
++++ pekwm-0.1.6/src/Util.cc	2008-04-22 22:42:12.000000000 +0200
+@@ -11,10 +11,11 @@
+ //
+ 
+ #include "../config.h"
+ #include "Util.hh"
+ 
++#include <cstdlib>
+ #include <algorithm>
+ #include <iostream>
+ #include <sstream>
+ 
+ #include <unistd.h>
+--- pekwm-0.1.6.orig/src/Util.hh	2007-05-08 10:10:13.000000000 +0200
++++ pekwm-0.1.6/src/Util.hh	2008-04-22 22:41:21.000000000 +0200
+@@ -12,10 +12,11 @@
+ #define _UTIL_HH_
+ 
+ #include "Types.hh"
+ 
+ #include <string>
++#include <cstring>
+ #include <vector>
+ #include <functional>
+ #include <sstream>
+ 
+ //! @brief Namespace Util used for various small file/string tasks.
diff --git a/x11-wm/pekwm/pekwm-0.1.6.ebuild b/x11-wm/pekwm/pekwm-0.1.6.ebuild
index 44b10e0a80d7..3b7f4297dcd2 100644
--- a/x11-wm/pekwm/pekwm-0.1.6.ebuild
+++ b/x11-wm/pekwm/pekwm-0.1.6.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/pekwm/pekwm-0.1.6.ebuild,v 1.3 2007/09/09 17:58:31 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/pekwm/pekwm-0.1.6.ebuild,v 1.4 2008/04/24 07:29:44 omp Exp $
+
+inherit eutils
 
 DESCRIPTION="A small window mananger based on aewm++"
 HOMEPAGE="http://www.pekwm.org/"
@@ -23,6 +25,13 @@ DEPEND="media-libs/jpeg
 RDEPEND="${DEPEND}
 	x11-apps/xprop"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-gcc-4.3.patch"
+}
+
 src_compile() {
 	econf \
 		$(use_enable debug) \