summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Hill <dirtyepic@gentoo.org>2006-11-05 21:54:11 +0000
committerRyan Hill <dirtyepic@gentoo.org>2006-11-05 21:54:11 +0000
commit0b2c4b414ae55fc72335dd6133a00ee2b79c813f (patch)
treec4be6628e2761d5f4c309ff8f7e9c701f6593697 /x11-misc/bbacpi
parentAdded ~ppc wrt bug #149793. (diff)
downloadgentoo-2-0b2c4b414ae55fc72335dd6133a00ee2b79c813f.tar.gz
gentoo-2-0b2c4b414ae55fc72335dd6133a00ee2b79c813f.tar.bz2
gentoo-2-0b2c4b414ae55fc72335dd6133a00ee2b79c813f.zip
Fix gcc 4.1 build error. Thanks to William Keaney in bug #141032.
(Portage version: 2.1.2_rc1-r3)
Diffstat (limited to 'x11-misc/bbacpi')
-rw-r--r--x11-misc/bbacpi/ChangeLog6
-rw-r--r--x11-misc/bbacpi/bbacpi-0.1.5.ebuild11
-rw-r--r--x11-misc/bbacpi/files/bbacpi-0.1.5-noextraquals.diff14
3 files changed, 29 insertions, 2 deletions
diff --git a/x11-misc/bbacpi/ChangeLog b/x11-misc/bbacpi/ChangeLog
index 5b24d674b20c..82c4798900d2 100644
--- a/x11-misc/bbacpi/ChangeLog
+++ b/x11-misc/bbacpi/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-misc/bbacpi
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbacpi/ChangeLog,v 1.6 2006/04/10 19:23:19 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbacpi/ChangeLog,v 1.7 2006/11/05 21:54:11 dirtyepic Exp $
+
+ 05 Nov 2006; <dirtyepic@gentoo.org> +files/bbacpi-0.1.5-noextraquals.diff,
+ bbacpi-0.1.5.ebuild:
+ Fix gcc 4.1 build error. Thanks to William Keaney in bug #141032.
10 Apr 2006; <smithj@gentoo.org> -bbacpi-0.1.3.ebuild,
bbacpi-0.1.5.ebuild:
diff --git a/x11-misc/bbacpi/bbacpi-0.1.5.ebuild b/x11-misc/bbacpi/bbacpi-0.1.5.ebuild
index 30d0cf7e05f5..8bccec28d622 100644
--- a/x11-misc/bbacpi/bbacpi-0.1.5.ebuild
+++ b/x11-misc/bbacpi/bbacpi-0.1.5.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbacpi/bbacpi-0.1.5.ebuild,v 1.2 2006/04/10 19:23:19 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbacpi/bbacpi-0.1.5.ebuild,v 1.3 2006/11/05 21:54:11 dirtyepic Exp $
+
+inherit eutils
DESCRIPTION="ACPI monitor for X11"
SRC_URI="mirror://sourceforge/bbacpi/${P}.tar.gz"
@@ -16,6 +18,13 @@ DEPEND="virtual/blackbox
sys-power/acpi
sys-power/acpid"
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ epatch "${FILESDIR}"/${P}-noextraquals.diff
+}
+
src_install () {
einstall || die "install failed"
dodoc README AUTHORS BUGS ChangeLog TODO
diff --git a/x11-misc/bbacpi/files/bbacpi-0.1.5-noextraquals.diff b/x11-misc/bbacpi/files/bbacpi-0.1.5-noextraquals.diff
new file mode 100644
index 000000000000..abf409b33c00
--- /dev/null
+++ b/x11-misc/bbacpi/files/bbacpi-0.1.5-noextraquals.diff
@@ -0,0 +1,14 @@
+diff -urN bbacpi-0.1.5/work/bbacpi-0.1.5/resource.hh bbacpi-0.1.5-r1/work/bbacpi-0.1.5/resource.hh
+--- bbacpi-0.1.5/work/bbacpi-0.1.5/resource.hh 2004-05-15 08:10:52.000000000 -0400
++++ bbacpi-0.1.5-r1/work/bbacpi-0.1.5/resource.hh 2006-07-19 09:29:28.000000000 -0400
+@@ -126,8 +126,8 @@
+ {
+
+ public:
+- Resource::Resource(ToolWindow *);
+- Resource::~Resource(void);
++ Resource(ToolWindow *);
++ ~Resource(void);
+
+ struct FRAME frame;
+ struct LABEL label;