summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2009-02-15 00:50:29 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2009-02-15 00:50:29 +0000
commit576a9b6d805165874290a186690bb781ffe27e52 (patch)
tree223406ece80a159e78266ca6c37bf27530c23b19 /x11-misc/bbconf
parentdont put (Demo) in full games name (diff)
downloadgentoo-2-576a9b6d805165874290a186690bb781ffe27e52.tar.gz
gentoo-2-576a9b6d805165874290a186690bb781ffe27e52.tar.bz2
gentoo-2-576a9b6d805165874290a186690bb781ffe27e52.zip
Add gcc-4.3 patch, bug 251773. Thanks to Gene Seto <geneseto@hotmail.com> for patch.
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'x11-misc/bbconf')
-rw-r--r--x11-misc/bbconf/ChangeLog9
-rw-r--r--x11-misc/bbconf/bbconf-1.10.ebuild14
-rw-r--r--x11-misc/bbconf/files/bbconf-1.10-gcc43.patch22
3 files changed, 40 insertions, 5 deletions
diff --git a/x11-misc/bbconf/ChangeLog b/x11-misc/bbconf/ChangeLog
index 446efa139236..e9a092cdd8db 100644
--- a/x11-misc/bbconf/ChangeLog
+++ b/x11-misc/bbconf/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-misc/bbconf
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbconf/ChangeLog,v 1.22 2008/09/22 12:46:38 omp Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbconf/ChangeLog,v 1.23 2009/02/15 00:50:29 loki_val Exp $
+
+ 15 Feb 2009; Peter Alfredsen <loki_val@gentoo.org>
+ +files/bbconf-1.10-gcc43.patch, bbconf-1.10.ebuild:
+ Add gcc-4.3 patch, bug 251773. Thanks to Gene Seto <geneseto@hotmail.com>
+ for patch.
22 Sep 2008; David Shakaryan <omp@gentoo.org> metadata.xml:
Change herd from commonbox to desktop-wm.
diff --git a/x11-misc/bbconf/bbconf-1.10.ebuild b/x11-misc/bbconf/bbconf-1.10.ebuild
index c4e4bb2340ad..d1a024c17930 100644
--- a/x11-misc/bbconf/bbconf-1.10.ebuild
+++ b/x11-misc/bbconf/bbconf-1.10.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbconf/bbconf-1.10.ebuild,v 1.10 2007/09/30 15:15:28 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbconf/bbconf-1.10.ebuild,v 1.11 2009/02/15 00:50:29 loki_val Exp $
+
+inherit eutils
DESCRIPTION="All-in-one blackbox configuration tool."
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
@@ -13,6 +15,12 @@ IUSE=""
DEPEND="=x11-libs/qt-3*"
+src_unpack () {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}/${P}-gcc43.patch"
+}
+
src_compile () {
# ./configure --prefix=/usr --host=${CHOST} --with-qt-dir=/usr/qt/3 || die
econf --with-qt-dir=/usr/qt/3 || die
@@ -20,5 +28,5 @@ src_compile () {
}
src_install () {
- make DESTDIR=${D} install || die
+ make DESTDIR="${D}" install || die
}
diff --git a/x11-misc/bbconf/files/bbconf-1.10-gcc43.patch b/x11-misc/bbconf/files/bbconf-1.10-gcc43.patch
new file mode 100644
index 000000000000..5b98bef59771
--- /dev/null
+++ b/x11-misc/bbconf/files/bbconf-1.10-gcc43.patch
@@ -0,0 +1,22 @@
+--- bbconf-1.10/bbconf/plugins/keybindings/my_kkeydialog.cpp 2009-01-18 00:36:12.000000000 -0400
++++ bbconf-1.10b/bbconf/plugins/keybindings/my_kkeydialog.cpp 2009-01-18 00:35:24.000000000 -0400
+@@ -36,7 +36,7 @@
+ #include <qdrawutil.h>
+
+ #include <qlabel.h>
+-#include <iostream.h>
++#include <iostream>
+
+ #include "my_kaccel.h"
+ #include "my_kkeybutton.h"
+--- bbconf-1.10/bbconf/plugins/keybindings/my_kaccel.cpp 2009-01-18 00:37:10.000000000 -0400
++++ bbconf-1.10b/bbconf/plugins/keybindings/my_kaccel.cpp 2009-01-18 00:35:24.000000000 -0400
+@@ -41,7 +41,7 @@
+ #include <X11/Xlib.h>
+ #include <X11/keysymdef.h>
+ #include <ctype.h>
+-#include <iostream.h>
++#include <iostream>
+
+ //-------------------------------------------------------------------
+