Fixed sigsegv for bug 59246; added debug to IUSE for use_enable debug.

(Portage version: 2.0.51-r13)

4 files changed, 43 insertions, 11 deletions

diff --git a/x11-misc/bbappconf/ChangeLog b/x11-misc/bbappconf/ChangeLog
index fa195f5f82ca..c1d862ec7044 100644
--- a/x11-misc/bbappconf/ChangeLog
+++ b/x11-misc/bbappconf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/bbappconf
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbappconf/ChangeLog,v 1.7 2004/06/24 22:11:50 agriffis Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbappconf/ChangeLog,v 1.8 2005/01/19 15:34:25 ka0ttic Exp $
+
+  19 Jan 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/bbappconf-0.0.2-fix-sigsegv.diff, bbappconf-0.0.2.ebuild:
+  Fixed sigsegv for bug 59246; added debug to IUSE for use_enable debug.
 
 *bbappconf-0.0.2 (12 Dec 2002)
 
diff --git a/x11-misc/bbappconf/Manifest b/x11-misc/bbappconf/Manifest
index d6f6403b0591..86e3f93156ce 100644
--- a/x11-misc/bbappconf/Manifest
+++ b/x11-misc/bbappconf/Manifest
@@ -1,4 +1,5 @@
-MD5 f88f168cfbfac915f5e1056e1a5858fa bbappconf-0.0.2.ebuild 651
-MD5 a8c5e20082db032e2042855d73bee3b5 ChangeLog 1134
+MD5 8ba1fd9d21bd3209cc0bd326c21ee53c bbappconf-0.0.2.ebuild 829
+MD5 9f8b39979c0e299497d45993913e8b96 ChangeLog 1324
 MD5 035e70a253189f818aa3f8317376cd35 metadata.xml 291
+MD5 d6d095fbad88fb74892cf39b4db24f48 files/bbappconf-0.0.2-fix-sigsegv.diff 651
 MD5 43cacc45a353c364c3818a8229f42a54 files/digest-bbappconf-0.0.2 66
diff --git a/x11-misc/bbappconf/bbappconf-0.0.2.ebuild b/x11-misc/bbappconf/bbappconf-0.0.2.ebuild
index 5e5fca35bac9..f1d858da471d 100644
--- a/x11-misc/bbappconf/bbappconf-0.0.2.ebuild
+++ b/x11-misc/bbappconf/bbappconf-0.0.2.ebuild
@@ -1,23 +1,32 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbappconf/bbappconf-0.0.2.ebuild,v 1.6 2004/06/24 22:11:50 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbappconf/bbappconf-0.0.2.ebuild,v 1.7 2005/01/19 15:34:25 ka0ttic Exp $
+
+inherit eutils
 
 DESCRIPTION="utility that allows you to specify window properties in blackbox"
-SRC_URI="http://bbtools.windsofstorm.net/sources/${P}.tar.gz"
 HOMEPAGE="http://bbtools.windsofstorm.net/"
-IUSE=""
+SRC_URI="http://bbtools.windsofstorm.net/sources/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 sparc ppc"
+IUSE="debug"
 
 DEPEND="virtual/blackbox"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-fix-sigsegv.diff
+}
+
 src_compile() {
-	econf || die
-	emake || die
+	econf $(use_enable debug) || die "econf failed"
+	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc AUTHORS BUGS ChangeLog COPYING NEWS README TODO
 }
diff --git a/x11-misc/bbappconf/files/bbappconf-0.0.2-fix-sigsegv.diff b/x11-misc/bbappconf/files/bbappconf-0.0.2-fix-sigsegv.diff
new file mode 100644
index 000000000000..178677389faf
--- /dev/null
+++ b/x11-misc/bbappconf/files/bbappconf-0.0.2-fix-sigsegv.diff
@@ -0,0 +1,18 @@
+Files bbappconf-0.0.2.orig/.BaseDisplay.cc.swp and bbappconf-0.0.2/.BaseDisplay.cc.swp differ
+Files bbappconf-0.0.2.orig/.resource.cc.swp and bbappconf-0.0.2/.resource.cc.swp differ
+diff -urN bbappconf-0.0.2.orig/resource.cc bbappconf-0.0.2/resource.cc
+--- bbappconf-0.0.2.orig/resource.cc	2005-01-19 09:49:19.000000000 -0500
++++ bbappconf-0.0.2/resource.cc	2005-01-19 10:09:42.530236696 -0500
+@@ -19,10 +19,12 @@
+ // (See the included file COPYING / GPL-2.0)
+ //
+ 
++#include <cstdlib>
+ #include "resource.hh"
+ #include "blackboxstyle.hh"
+ 
+ Resource::Resource(ToolWindow *toolwindow): BaseResource(toolwindow) {
++  frame.font = NULL;
+   Load();
+ }
+