Fix repeated printing in help system, bug #30115, patch by bartron

<bartron@gmx.net>.

4 files changed, 27 insertions, 6 deletions

diff --git a/dev-util/ddd/ChangeLog b/dev-util/ddd/ChangeLog
index 5a8a62451efa..dd897e7f689c 100644
--- a/dev-util/ddd/ChangeLog
+++ b/dev-util/ddd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/ddd
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ddd/ChangeLog,v 1.10 2003/10/12 17:06:36 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ddd/ChangeLog,v 1.11 2003/10/30 19:00:43 azarah Exp $
+
+  30 Oct 2003; Martin Schlemmer <azarah@gentoo.org> ddd-3.3.1-r3.ebuild,
+  files/ddd-3.3.1-help-window-fix.patch:
+  Fix repeated printing in help system, bug #30115, patch by bartron
+  <bartron@gmx.net>.
 
   13 Oct 2003; Martin Holzer <mholzer@gentoo.org> ddd-3.3.7.ebuild:
   added gcc3 depend. Closes #30844.
diff --git a/dev-util/ddd/Manifest b/dev-util/ddd/Manifest
index c0ea28332dba..09f235c751da 100644
--- a/dev-util/ddd/Manifest
+++ b/dev-util/ddd/Manifest
@@ -1,12 +1,13 @@
 MD5 8acdc8903cf36ccf613d1e98166789ed ddd-3.3.7.ebuild 1216
-MD5 067417c75c88e421419643978a3488b3 ChangeLog 2062
-MD5 337c35c06510ab51fdd787784a81bf4d ddd-3.3.1-r1.ebuild 851
+MD5 8fa04772bf16ba7346b5b6968171210f ChangeLog 2266
 MD5 7af8788205ef72340dbaccbbabfc12bb ddd-3.3.1-r2.ebuild 998
-MD5 c29081c93f6e9223a1bf050f11ccbc5b ddd-3.3.1-r3.ebuild 1581
+MD5 337c35c06510ab51fdd787784a81bf4d ddd-3.3.1-r1.ebuild 851
+MD5 4aad7ba932164bd7faf53991288aed0f ddd-3.3.1-r3.ebuild 1680
 MD5 2d3cff085de702c9683408841f0516ed files/ddd-3.3.1-detect-hipot.patch 809
-MD5 fe741077721e30a864d2d61e530340cd files/ddd-3.3.1-gcc3-gentoo.patch 271
 MD5 3a74694a9dd751f507344456d8ec48c4 files/ddd-3.3.1-link-libstdc++.patch 797
 MD5 d4dd3754f854ec6c8f64101f66656cf6 files/digest-ddd-3.3.1-r1 136
+MD5 fe741077721e30a864d2d61e530340cd files/ddd-3.3.1-gcc3-gentoo.patch 271
 MD5 d4dd3754f854ec6c8f64101f66656cf6 files/digest-ddd-3.3.1-r2 136
 MD5 d4dd3754f854ec6c8f64101f66656cf6 files/digest-ddd-3.3.1-r3 136
+MD5 d202dc6d8a53bb3c226007ee3a73ad66 files/ddd-3.3.1-help-window-fix.patch 411
 MD5 cce61fcc7e8624cc8f3519dc93be9d59 files/digest-ddd-3.3.7 63
diff --git a/dev-util/ddd/ddd-3.3.1-r3.ebuild b/dev-util/ddd/ddd-3.3.1-r3.ebuild
index adbbdf29afde..91448033393b 100644
--- a/dev-util/ddd/ddd-3.3.1-r3.ebuild
+++ b/dev-util/ddd/ddd-3.3.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/ddd/ddd-3.3.1-r3.ebuild,v 1.8 2003/09/06 08:39:20 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/ddd/ddd-3.3.1-r3.ebuild,v 1.9 2003/10/30 19:00:43 azarah Exp $
 
 inherit eutils
 
@@ -29,6 +29,9 @@ src_unpack() {
 	# Fix not linking to libstdc++
 	# <azarah@gentoo.org> 05 Dec 2002
 	epatch ${FILESDIR}/ddd-3.3.1-link-libstdc++.patch
+
+	# Fix repeated printing in help system, bug #30115.
+	epatch ${FILESDIR}/${P}-help-window-fix.patch
 }
 
 src_compile() {
diff --git a/dev-util/ddd/files/ddd-3.3.1-help-window-fix.patch b/dev-util/ddd/files/ddd-3.3.1-help-window-fix.patch
new file mode 100644
index 000000000000..45ee8d3f696e
--- /dev/null
+++ b/dev-util/ddd/files/ddd-3.3.1-help-window-fix.patch
@@ -0,0 +1,12 @@
+--- ddd-3.3.1/ddd/converters.C.orig	2001-04-26 13:08:07.000000000 +0200
++++ ddd-3.3.1/ddd/converters.C	2003-10-05 15:58:14.000000000 +0200
+@@ -549,7 +549,8 @@
+ 
+ 	while (segment.contains('\n'))
+ 	{
+-	    buf += MString(segment.before('\n').chars(), charset) + cr();
++	    string _segment = segment.before('\n');
++	    buf += MString(_segment.chars(), charset) + cr();
+ 	    segment = segment.after('\n');
+ 	}
+