summaryrefslogtreecommitdiff
path: root/x11-wm
diff options
context:
space:
mode:
authorKacper Kowalik <xarthisius@gentoo.org>2011-04-13 13:18:41 +0000
committerKacper Kowalik <xarthisius@gentoo.org>2011-04-13 13:18:41 +0000
commit2c2d8d873a4ca4e424b5be003a38bd4c1bb10c9f (patch)
treed94d2117d5b036d0e84351e87214f763fe3e00aa /x11-wm
parentMake akonadi and kdepimlibs optional (diff)
downloadgentoo-2-2c2d8d873a4ca4e424b5be003a38bd4c1bb10c9f.tar.gz
gentoo-2-2c2d8d873a4ca4e424b5be003a38bd4c1bb10c9f.tar.bz2
gentoo-2-2c2d8d873a4ca4e424b5be003a38bd4c1bb10c9f.zip
Cherrypick upstream patch to fix gcc-4.6 build failure wrt #363463 by Diego Elio Pettenò <flameeyes@gentoo.org>
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
Diffstat (limited to 'x11-wm')
-rw-r--r--x11-wm/fluxbox/ChangeLog7
-rw-r--r--x11-wm/fluxbox/files/fluxbox-1.3.1-gcc46.patch44
-rw-r--r--x11-wm/fluxbox/fluxbox-1.3.1.ebuild5
3 files changed, 53 insertions, 3 deletions
diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index fa6acce7e567..19034e91480b 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-wm/fluxbox
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.286 2011/02/28 00:32:30 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.287 2011/04/13 13:18:41 xarthisius Exp $
+
+ 13 Apr 2011; Kacper Kowalik <xarthisius@gentoo.org> fluxbox-1.3.1.ebuild,
+ +files/fluxbox-1.3.1-gcc46.patch:
+ Cherrypick upstream patch to fix gcc-4.6 build failure wrt #363463 by Diego
+ Elio Pettenò <flameeyes@gentoo.org>
*fluxbox-1.3.1 (28 Feb 2011)
diff --git a/x11-wm/fluxbox/files/fluxbox-1.3.1-gcc46.patch b/x11-wm/fluxbox/files/fluxbox-1.3.1-gcc46.patch
new file mode 100644
index 000000000000..90d268989dc7
--- /dev/null
+++ b/x11-wm/fluxbox/files/fluxbox-1.3.1-gcc46.patch
@@ -0,0 +1,44 @@
+From d28e105075e3ec46515c322ee5dca6967a4cc696 Mon Sep 17 00:00:00 2001
+From: Daniel Diaz<dydyam at gmail dot com>
+Date: Mon, 28 Mar 2011 07:06:01 +0000
+Subject: compile fix: added <cstdlib> to provide declaration for 'size_t' (gcc-4.6.x likes it that way)
+
+---
+diff --git a/src/FbTk/LayerItem.hh b/src/FbTk/LayerItem.hh
+index a4cdd49..ad33451 100644
+--- a/src/FbTk/LayerItem.hh
++++ b/src/FbTk/LayerItem.hh
+@@ -26,6 +26,7 @@
+ #include "Layer.hh"
+ #include "NotCopyable.hh"
+ #include <vector>
++#include <cstdlib> // size_t
+
+ namespace FbTk {
+
+diff --git a/src/FbTk/MacroCommand.hh b/src/FbTk/MacroCommand.hh
+index 932ecaf..bce2ce4 100644
+--- a/src/FbTk/MacroCommand.hh
++++ b/src/FbTk/MacroCommand.hh
+@@ -26,6 +26,7 @@
+ #include "RefCount.hh"
+
+ #include <vector>
++#include <cstdlib> // size_t
+
+ namespace FbTk {
+
+diff --git a/src/FbTk/MultLayers.hh b/src/FbTk/MultLayers.hh
+index 62c006f..3da25f6 100644
+--- a/src/FbTk/MultLayers.hh
++++ b/src/FbTk/MultLayers.hh
+@@ -24,6 +24,7 @@
+ #define FBTK_MULTLAYERS_HH
+
+ #include <vector>
++#include <cstdlib> // size_t
+
+ namespace FbTk {
+
+--
+cgit
diff --git a/x11-wm/fluxbox/fluxbox-1.3.1.ebuild b/x11-wm/fluxbox/fluxbox-1.3.1.ebuild
index e5be2bab322d..fe1dd4456633 100644
--- a/x11-wm/fluxbox/fluxbox-1.3.1.ebuild
+++ b/x11-wm/fluxbox/fluxbox-1.3.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.1.ebuild,v 1.1 2011/02/28 00:32:30 lack Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-1.3.1.ebuild,v 1.2 2011/04/13 13:18:41 xarthisius Exp $
EAPI=4
inherit eutils prefix
@@ -46,7 +46,8 @@ src_prepare() {
epatch "${FILESDIR}/gentoo_style_location-1.1.x.patch"
eprefixify util/fluxbox-generate_menu.in
- epatch "${FILESDIR}"/osx-has-otool.patch
+ epatch "${FILESDIR}"/osx-has-otool.patch \
+ "${FILESDIR}"/${P}-gcc46.patch
# Add in the Gentoo -r number to fluxbox -version output.
if [[ "${PR}" == "r0" ]] ; then