[CVS] OpenPKG: openpkg-src/ddd/ ddd.patch ddd.spec openpkg-web/ news.t...
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 09-Jan-2004 21:57:51
Branch: HEAD Handle: 2004010920574901
Added files:
openpkg-src/ddd ddd.patch
Modified files:
openpkg-src/ddd ddd.spec
openpkg-web news.txt
Log:
resurrect important and accidentally removed parts of old patch to get
rid of TTY warnings under FreeBSD again.
Summary:
RevisionChanges Path
1.11+131 -0 openpkg-src/ddd/ddd.patch
1.22+3 -7 openpkg-src/ddd/ddd.spec
1.8040 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/ddd/ddd.patch
$ cvs diff -u -r0 -r1.11 ddd.patch
--- /dev/null 2004-01-09 21:57:51.0 +0100
+++ ddd.patch 2004-01-09 21:57:51.0 +0100
@@ -0,0 +1,131 @@
+Index: ddd/LiterateA.C
+--- ddd/LiterateA.C.orig 2003-05-24 17:27:03.0 +0200
ddd/LiterateA.C 2004-01-09 21:33:33.0 +0100
+@@ -220,8 +220,12 @@
+ int flags = fcntl(fileno(fp), F_GETFL, 0);
+ if (flags == -1)
+ _raiseIOWarning("cannot get file descriptor status flags");
+-if (fcntl(fileno(fp), F_SETFL, flags | O_NONBLOCK) == -1)
+-_raiseIOWarning("cannot set file to non-blocking mode");
++if (fcntl(fileno(fp), F_SETFL, flags | O_NONBLOCK) == -1) {
++#if defined(__FreeBSD__)
++if(errno != EAGAIN)
++#endif
++_raiseIOWarning("cannot set file to non-blocking mode");
++}
+ #endif
+
+ // Read stuff
+@@ -255,8 +259,12 @@
+
+ #if HAVE_FCNTL && defined(F_SETFL)
+ // Reset file state
+-if (fcntl(fileno(fp), F_SETFL, flags) == -1)
+-_raiseIOWarning("cannot restore file mode");
++if (fcntl(fileno(fp), F_SETFL, flags) == -1) {
++#if defined(__FreeBSD__)
++if(errno != EAGAIN)
++#endif
++_raiseIOWarning("cannot restore file mode");
++}
+ #endif
+
+ return nitems;
+Index: ddd/TTYAgent.C
+--- ddd/TTYAgent.C.orig 2003-05-24 17:27:05.0 +0200
ddd/TTYAgent.C 2004-01-09 21:33:33.0 +0100
+@@ -719,8 +719,19 @@
+ }
+ else
+ {
++#if !defined(__FreeBSD__)
+ if (fcntl(master, F_SETFL, flags | O_NONBLOCK) == -1)
+ _raiseIOWarning("cannot set file to non-blocking mode");
++#else
++do {
++if (fcntl(master, F_SETFL, flags | O_NONBLOCK) != -1)
++break;
++else if(errno == EAGAIN)
++sleep(1);
++else
++_raiseIOWarning("cannot set file to non-blocking mode");
++ } while(errno == EAGAIN);
++#endif
+ }
+ #endif
+
+Index: ddd/ddd.C
+--- ddd/ddd.C.orig 2003-10-07 13:58:23.0 +0200
ddd/ddd.C2004-01-09 21:33:02.0 +0100
+@@ -883,7 +883,7 @@
+ //-
+
+ struct RecentItems {
+-enum RecentItem { R1, R2, R3, R4, R5, R6, R7, R8, R9 };
++enum RecentItem { Re1, R2, R3, R4, R5, R6, R7, R8, R9 };
+ };
+
+ #define RECENT_MENU \
+Index: libiberty/strerror.c
+--- libiberty/strerror.c.orig2003-10-22 20:46:55.0 +0200
libiberty/strerror.c 2004-01-09 21:33:33.0 +0100
+@@ -460,6 +460,7 @@
+same name, it differs from other implementations in that it is dynamically
+initialized rather than statically initialized. */
+
++#ifndef __FreeBSD__
+ #ifndef HAVE_SYS_ERRLIST
+
+ static int sys_nerr;
+@@ -470,7 +471,8 @@
+ extern int sys_nerr;
+ extern char *sys_errlist[];
+
+-#endif
++#endif /* #ifndef HAVE_SYS_ERRLIST */
++#endif /* #ifndef __FreeBSD__ */
+
+
+ /*
+Index: libiberty/strsignal.c
+--- libiberty/strsignal.c.orig 2003-10-22 20:46:55.0 +0200
libiberty/strsignal.c2004-01-09 21:33:33.0 +0100
+@@ -241,6 +241,7 @@
+same name, it differs from other implementations in that it is dynamically
+initialized rather than statically initialized. */
+
++#ifndef __FreeBSD__
+ #ifndef HAVE_SYS_SIGLIST
+
+ static int sys_nsig;
+@@ -257,7 +258,8 @@
+ #endif
+ extern const char * const sys_siglist[];
+
+-#endif
++#endif /* #ifndef HAVE_SYS_ERRLIST */
++#endif /* #ifndef __FreeBSD__ */
+
+
+ /*
+Index: termcap/termcap.h
+--- termcap/termcap.h.orig 1995-05-17 20:47:28.0 +0200
termcap/termcap.h2004-01-09 21:33:17.0 +0100
+@@ -26,7 +26,7 @@
+ extern int t
[CVS] OpenPKG: openpkg-src/ddd/ ddd.patch ddd.spec openpkg-web/ news.t...
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 08-Oct-2003 13:29:28
Branch: HEAD Handle: 2003100812292602
Modified files:
openpkg-src/ddd ddd.spec
openpkg-web news.txt
Removed files:
openpkg-src/ddd ddd.patch
Log:
Remove the now integrated patch changes and reduce the remaining patch
with a shtool replacement, and finally update to 3.3.7 which seems to
work with a new tarball off sourceforge
Summary:
RevisionChanges Path
1.10+0 -1186 openpkg-src/ddd/ddd.patch
1.20+8 -4 openpkg-src/ddd/ddd.spec
1.6922 +1 -0 openpkg-web/news.txt
rm -f openpkg-src/ddd/ddd.patch <<'@@ .'
Index: openpkg-src/ddd/ddd.patch
[NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ddd/ddd.spec
$ cvs diff -u -r1.19 -r1.20 ddd.spec
--- openpkg-src/ddd/ddd.spec 22 Aug 2003 09:07:45 - 1.19
+++ openpkg-src/ddd/ddd.spec 8 Oct 2003 11:29:28 - 1.20
@@ -32,12 +32,11 @@
Distribution: OpenPKG [EVAL]
Group:Development
License: GPL
-Version: 3.3.1
-Release: 20030822
+Version: 3.3.7
+Release: 20031008
# list of sources
Source0: ftp://ftp.gnu.org/gnu/ddd/ddd-%{version}.tar.gz
-Patch0: ddd.patch
# build information
Prefix: %{l_prefix}
@@ -56,7 +55,12 @@
%prep
%setup -q
-%patch -p1
+%{l_shtool} subst \
+-e 's; R\([0-9][, ]\); Re\1;' \
+ddd/ddd.C
+%{l_shtool} subst \
+-e 's;extern char PC\;;/*extern char PC\;*/;g' \
+termcap/termcap.h
%build
%{l_shtool} subst \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.6921 -r1.6922 news.txt
--- openpkg-web/news.txt 8 Oct 2003 11:20:09 - 1.6921
+++ openpkg-web/news.txt 8 Oct 2003 11:29:26 - 1.6922
@@ -1,3 +1,4 @@
+08-Oct-2003: Upgraded package: P
08-Oct-2003: Upgraded package: P
08-Oct-2003: New package: P
08-Oct-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/ddd/ ddd.patch ddd.spec openpkg-web/ news.t...
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 04-Aug-2003 14:27:29
Branch: HEAD Handle: 2003080413272207
Modified files:
openpkg-src/ddd ddd.patch ddd.spec
openpkg-web news.txt
Log:
Upgrade to older version, because unfortunately new does not work on
FreeBSD. Also, add more patch code to better handle poor block device
logic on FreeBSD.
Summary:
RevisionChanges Path
1.9 +1084 -70 openpkg-src/ddd/ddd.patch
1.18+1 -1 openpkg-src/ddd/ddd.spec
1.6023 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/ddd/ddd.patch
$ cvs diff -u -r1.8 -r1.9 ddd.patch
--- openpkg-src/ddd/ddd.patch 4 Aug 2003 11:32:36 - 1.8
+++ openpkg-src/ddd/ddd.patch 4 Aug 2003 12:27:28 - 1.9
@@ -1,31 +1,158 @@
-diff -Naur ddd-3.3.7.orig/ddd/Ddd.in ddd-3.3.7/ddd/Ddd.in
ddd-3.3.7.orig/ddd/Ddd.inSat May 24 21:00:35 2003
-+++ ddd-3.3.7/ddd/Ddd.in Mon Aug 4 12:46:23 2003
-@@ -649,9 +649,6 @@
- ! The Perl Debugger settings. Usually overridden in `~/[EMAIL PROTECTED]@/init'.
- @[EMAIL PROTECTED]:
-
[EMAIL PROTECTED]@*bashInitCommands: \
-- set prompt bashdb$_Dbg_less$_Dbg_greater$_Dbg_space\n\
--
- ! The Bash Debugger settings. Usually overridden in `~/[EMAIL PROTECTED]@/init'.
- @[EMAIL PROTECTED]:
-
-diff -Naur ddd-3.3.7.orig/ddd/DispBox.C ddd-3.3.7/ddd/DispBox.C
ddd-3.3.7.orig/ddd/DispBox.C Sat May 24 17:27:02 2003
-+++ ddd-3.3.7/ddd/DispBox.C Mon Aug 4 12:46:23 2003
-@@ -59,7 +59,9 @@
- #include "regexps.h"
- #include "resolveP.h"
+diff -Naur ddd-3.3.1.orig/ddd/Agent.h ddd-3.3.1/ddd/Agent.h
+--- ddd-3.3.1.orig/ddd/Agent.h 1999-08-19 13:27:01.0 +0200
ddd-3.3.1/ddd/Agent.h2003-07-03 12:54:26.0 +0200
+@@ -96,7 +96,7 @@
+ #include
+ #include
+ #include
+-#include
++#include
+ #include
+ #include
--#include
-+#include
+@@ -414,7 +414,7 @@
+
+ string name() const
+ {
+-ostrstream os;
++std::ostrstream os;
+ os << path();
+ if (pid() > 0)
+ os << " [" << pid() << "]";
+diff -Naur ddd-3.3.1.orig/ddd/ArgNode.C ddd-3.3.1/ddd/ArgNode.C
+--- ddd-3.3.1.orig/ddd/ArgNode.C 1999-08-19 13:27:03.0 +0200
ddd-3.3.1/ddd/ArgNode.C 2003-07-03 13:04:58.0 +0200
+@@ -34,7 +34,7 @@
+ #endif
+
+
+-#include
+#include
-+#include
+ #include "assert.h"
+ #include "VSLLib.h"
+ #include "ArgNode.h"
+@@ -61,7 +61,7 @@
+
+ if (box == 0)
+ {
+-ostrstream os;
++std::ostrstream os;
+ os << "arg" << _id << " cannot be isolated";
+ VSLLib::eval_error(os);
+ }
+@@ -70,13 +70,13 @@
+ }
+
+ // Dump ArgNode
+-void ArgNode::dump(ostream& s) const
++void ArgNode::dump(std::ostream& s) const
+ {
+ s << "arg" << _id;
+ }
+
+ // Dump as tree
+-void ArgNode::_dumpTree(ostream& s) const
++void ArgNode::_dumpTree(std::ostream& s) const
+ {
+ s << _id;
+ }
+diff -Naur ddd-3.3.1.orig/ddd/AsyncAgent.C ddd-3.3.1/ddd/AsyncAgent.C
+--- ddd-3.3.1.orig/ddd/AsyncAgent.C 1999-08-19 13:27:04.0 +0200
ddd-3.3.1/ddd/AsyncAgent.C 2003-07-03 12:58:43.0 +0200
+@@ -39,7 +39,7 @@
+ #include "misc.h"
+
+ #include
+-#include
++#include
+ #include
+ #include
+
+diff -Naur ddd-3.3.1.orig/ddd/DataDisp.C ddd-3.3.1/ddd/DataDisp.C
+--- ddd-3.3.1.orig/ddd/DataDisp.C2001-04-26 13:08:06.0 +0200
ddd-3.3.1/ddd/DataDisp.C 2003-07-03 13:16:46.0 +0200
+@@ -2851,7 +2851,7 @@
+ // Set selection.
+ // If the entire graph is selected, include position info, too.
+ bool include_position = (count.selected >= count.visible);
+-ostrstream os;
++std::ostrstream os;
+ get_selection(os, include_position);
+ string cmd(os);
+
+@@ -3742,7 +3742,7 @@
+
+ sort(clustered_displays);
+
+-ostrstream os;
++std::ostrstream os;
+ if (clustered_displays.size() == 0)
+ {
+ os << "No displays.\n";
+@@ -4892,7 +4892,7 @@
+ bool unclustered = false;
+
+ // Build undo command
+-ostrstream undo_commands;
++std::ostrstream undo_commands;
+ int i;
+ for (i = 0; i < display_nrs.size(); i++)
+ {
+diff -Naur ddd-3.3.1.orig/ddd/DefCallN.C ddd-3.3.1/ddd/DefCallN.C
+--- ddd-3.3.1.orig/ddd/DefCallN.C
[CVS] OpenPKG: openpkg-src/ddd/ ddd.patch ddd.spec openpkg-web/ news.t...
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 04-Aug-2003 13:32:37
Branch: HEAD Handle: 2003080412323501
Modified files:
openpkg-src/ddd ddd.patch ddd.spec
openpkg-web news.txt
Log:
Patch to try to repair ddd runtime, and remove initial unavailable
resources warnings from FreeBSD build
Summary:
RevisionChanges Path
1.8 +139 -41openpkg-src/ddd/ddd.patch
1.17+1 -1 openpkg-src/ddd/ddd.spec
1.6022 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/ddd/ddd.patch
$ cvs diff -u -r1.7 -r1.8 ddd.patch
--- openpkg-src/ddd/ddd.patch 1 Aug 2003 15:15:19 - 1.7
+++ openpkg-src/ddd/ddd.patch 4 Aug 2003 11:32:36 - 1.8
@@ -1,6 +1,75 @@
+diff -Naur ddd-3.3.7.orig/ddd/Ddd.in ddd-3.3.7/ddd/Ddd.in
+--- ddd-3.3.7.orig/ddd/Ddd.inSat May 24 21:00:35 2003
ddd-3.3.7/ddd/Ddd.in Mon Aug 4 12:46:23 2003
+@@ -649,9 +649,6 @@
+ ! The Perl Debugger settings. Usually overridden in `~/[EMAIL PROTECTED]@/init'.
+ @[EMAIL PROTECTED]:
+
[EMAIL PROTECTED]@*bashInitCommands: \
+- set prompt bashdb$_Dbg_less$_Dbg_greater$_Dbg_space\n\
+-
+ ! The Bash Debugger settings. Usually overridden in `~/[EMAIL PROTECTED]@/init'.
+ @[EMAIL PROTECTED]:
+
+diff -Naur ddd-3.3.7.orig/ddd/DispBox.C ddd-3.3.7/ddd/DispBox.C
+--- ddd-3.3.7.orig/ddd/DispBox.C Sat May 24 17:27:02 2003
ddd-3.3.7/ddd/DispBox.C Mon Aug 4 12:46:23 2003
+@@ -59,7 +59,9 @@
+ #include "regexps.h"
+ #include "resolveP.h"
+
+-#include
++#include
++#include
++#include
+
+ #define assert_ok(x) assert(x)
+
+@@ -152,7 +154,7 @@
+ "#line 1 \"" Ddd_NAME "*vslDefs\"\n" +
+ vsllib_defs;
+
+-istrstream is(defs.chars());
++std::istrstream is(defs.chars());
+ vsllib_ptr = new ThemedVSLLib(is, VSEFlags::optimize_mode());
+ #else
+ name = "vsllib/" ddd_NAME ".vsl";
+diff -Naur ddd-3.3.7.orig/ddd/LiterateA.C ddd-3.3.7/ddd/LiterateA.C
+--- ddd-3.3.7.orig/ddd/LiterateA.C Sat May 24 17:27:03 2003
ddd-3.3.7/ddd/LiterateA.CMon Aug 4 12:53:16 2003
+@@ -220,8 +220,12 @@
+ int flags = fcntl(fileno(fp), F_GETFL, 0);
+ if (flags == -1)
+ _raiseIOWarning("cannot get file descriptor status flags");
+-if (fcntl(fileno(fp), F_SETFL, flags | O_NONBLOCK) == -1)
+-_raiseIOWarning("cannot set file to non-blocking mode");
++if (fcntl(fileno(fp), F_SETFL, flags | O_NONBLOCK) == -1) {
++#if defined(__FreeBSD__)
++if(errno != EAGAIN)
++#endif
++_raiseIOWarning("cannot set file to non-blocking mode");
++}
+ #endif
+
+ // Read stuff
+@@ -255,8 +259,12 @@
+
+ #if HAVE_FCNTL && defined(F_SETFL)
+ // Reset file state
+-if (fcntl(fileno(fp), F_SETFL, flags) == -1)
+-_raiseIOWarning("cannot restore file mode");
++if (fcntl(fileno(fp), F_SETFL, flags) == -1) {
++#if defined(__FreeBSD__)
++if(errno != EAGAIN)
++#endif
++_raiseIOWarning("cannot restore file mode");
++}
+ #endif
+
+ return nitems;
diff -Naur ddd-3.3.7.orig/ddd/PannedGE.C ddd-3.3.7/ddd/PannedGE.C
--- ddd-3.3.7.orig/ddd/PannedGE.CSat May 24 17:27:04 2003
-+++ ddd-3.3.7/ddd/PannedGE.C Fri Aug 1 12:09:16 2003
ddd-3.3.7/ddd/PannedGE.C Mon Aug 4 12:46:23 2003
@@ -395,9 +395,9 @@
static bool warned = false;
if (!warned)
@@ -13,9 +82,32 @@
warned = true;
}
+diff -Naur ddd-3.3.7.orig/ddd/TTYAgent.C ddd-3.3.7/ddd/TTYAgent.C
+--- ddd-3.3.7.orig/ddd/TTYAgent.CSat May 24 17:27:05 2003
ddd-3.3.7/ddd/TTYAgent.C Mon Aug 4 12:55:45 2003
+@@ -719,8 +719,19 @@
+ }
+ else
+ {
++#if !defined(__FreeBSD__)
+ if (fcntl(master, F_SETFL, flags | O_NONBLOCK) == -1)
+ _raiseIOWarning("cannot set file to non-blocking mode");
++#else
++do {
++if (fcntl(master, F_SETFL, flags | O_NONBLOCK) != -1)
++break;
++else if(errno == EAGAIN)
++sleep(1);
++else
++_raiseIOWarning("cannot set file to non-blocking mode");
++ } while(errno == EAGAIN);
++#endif
+ }
+ #endif
+
diff -Naur ddd-3.3.7.orig/ddd/ddd.C ddd-3.3.7/ddd/ddd.C
ddd-3.3.7.orig/ddd/ddd.C 2003-05-24 17:27:06.0 +0200
-+++ ddd-3.3.7/ddd/ddd.C 2003-08-01 07:59:08.677245000 +0200
+--- ddd-3.3.7.orig/
[CVS] OpenPKG: openpkg-src/ddd/ ddd.patch ddd.spec openpkg-web/ news.t...
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 03-Jul-2003 13:49:06
Branch: HEAD Handle: 2003070312490401
Modified files:
openpkg-src/ddd ddd.patch ddd.spec
openpkg-web news.txt
Log:
Patch the crap out of this piece, because it is years behind current
ISO C++ standards
Summary:
RevisionChanges Path
1.5 +1034 -18 openpkg-src/ddd/ddd.patch
1.11+2 -2 openpkg-src/ddd/ddd.spec
1.5182 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/ddd/ddd.patch
$ cvs diff -u -r1.4 -r1.5 ddd.patch
--- openpkg-src/ddd/ddd.patch 7 Mar 2003 17:25:04 - 1.4
+++ openpkg-src/ddd/ddd.patch 3 Jul 2003 11:49:05 - 1.5
@@ -1,5 +1,740 @@
ddd/logplayer.C Wed Jan 29 17:55:33 2003
-+++ ddd/logplayer.C Wed Jan 29 17:55:51 2003
+diff -Naur ddd-3.3.1.orig/ddd/Agent.h ddd-3.3.1/ddd/Agent.h
+--- ddd-3.3.1.orig/ddd/Agent.h 1999-08-19 13:27:01.0 +0200
ddd-3.3.1/ddd/Agent.h2003-07-03 12:54:26.0 +0200
+@@ -96,7 +96,7 @@
+ #include
+ #include
+ #include
+-#include
++#include
+ #include
+ #include
+
+@@ -414,7 +414,7 @@
+
+ string name() const
+ {
+-ostrstream os;
++std::ostrstream os;
+ os << path();
+ if (pid() > 0)
+ os << " [" << pid() << "]";
+diff -Naur ddd-3.3.1.orig/ddd/ArgNode.C ddd-3.3.1/ddd/ArgNode.C
+--- ddd-3.3.1.orig/ddd/ArgNode.C 1999-08-19 13:27:03.0 +0200
ddd-3.3.1/ddd/ArgNode.C 2003-07-03 13:04:58.0 +0200
+@@ -34,7 +34,7 @@
+ #endif
+
+
+-#include
++#include
+ #include "assert.h"
+ #include "VSLLib.h"
+ #include "ArgNode.h"
+@@ -61,7 +61,7 @@
+
+ if (box == 0)
+ {
+-ostrstream os;
++std::ostrstream os;
+ os << "arg" << _id << " cannot be isolated";
+ VSLLib::eval_error(os);
+ }
+@@ -70,13 +70,13 @@
+ }
+
+ // Dump ArgNode
+-void ArgNode::dump(ostream& s) const
++void ArgNode::dump(std::ostream& s) const
+ {
+ s << "arg" << _id;
+ }
+
+ // Dump as tree
+-void ArgNode::_dumpTree(ostream& s) const
++void ArgNode::_dumpTree(std::ostream& s) const
+ {
+ s << _id;
+ }
+diff -Naur ddd-3.3.1.orig/ddd/AsyncAgent.C ddd-3.3.1/ddd/AsyncAgent.C
+--- ddd-3.3.1.orig/ddd/AsyncAgent.C 1999-08-19 13:27:04.0 +0200
ddd-3.3.1/ddd/AsyncAgent.C 2003-07-03 12:58:43.0 +0200
+@@ -39,7 +39,7 @@
+ #include "misc.h"
+
+ #include
+-#include
++#include
+ #include
+ #include
+
+diff -Naur ddd-3.3.1.orig/ddd/DataDisp.C ddd-3.3.1/ddd/DataDisp.C
+--- ddd-3.3.1.orig/ddd/DataDisp.C2001-04-26 13:08:06.0 +0200
ddd-3.3.1/ddd/DataDisp.C 2003-07-03 13:16:46.0 +0200
+@@ -2851,7 +2851,7 @@
+ // Set selection.
+ // If the entire graph is selected, include position info, too.
+ bool include_position = (count.selected >= count.visible);
+-ostrstream os;
++std::ostrstream os;
+ get_selection(os, include_position);
+ string cmd(os);
+
+@@ -3742,7 +3742,7 @@
+
+ sort(clustered_displays);
+
+-ostrstream os;
++std::ostrstream os;
+ if (clustered_displays.size() == 0)
+ {
+ os << "No displays.\n";
+@@ -4892,7 +4892,7 @@
+ bool unclustered = false;
+
+ // Build undo command
+-ostrstream undo_commands;
++std::ostrstream undo_commands;
+ int i;
+ for (i = 0; i < display_nrs.size(); i++)
+ {
+diff -Naur ddd-3.3.1.orig/ddd/DefCallN.C ddd-3.3.1/ddd/DefCallN.C
+--- ddd-3.3.1.orig/ddd/DefCallN.C2000-12-11 13:21:47.0 +0100
ddd-3.3.1/ddd/DefCallN.C 2003-07-03 13:05:28.0 +0200
+@@ -36,7 +36,7 @@
+
+ #include "assert.h"
+ #include
+-#include
++#include
+
+ #include "VSLLib.h"
+ #include "VSLDef.h"
+@@ -150,7 +150,7 @@
+ {
+ const int bufsize = 1000;
+ char buffer[bufsize];
+-ostrstream s(buffer, sizeof buffer);
++std::ostrstream s(buffer, sizeof buffer);
+ s << *this << '\0';
+
+ VSLLib::eval_warning("no suitable definition for " + string(buffer),
+@@ -302,7 +302,7 @@
+ for (i = 0; i < _def->nargs(); i++)
+ if (instances[i] > 0 && values[i] == 0)
+ {
+-ostrstream os;
++std::ostrstream os;
+ os << "cannot isolate arg " << i;
+ VSLLib::eval_warning(os, _
[CVS] OpenPKG: openpkg-src/ddd/ ddd.patch ddd.spec openpkg-web/ news.t...
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 07-Mar-2003 15:34:19
Branch: HEAD Handle: 2003030714341602
Modified files:
openpkg-src/ddd ddd.patch ddd.spec
openpkg-web news.txt
Log:
Patched to not conflict with the SVR4 R1 ia32 register identifier
Summary:
RevisionChanges Path
1.3 +11 -0 openpkg-src/ddd/ddd.patch
1.7 +1 -1 openpkg-src/ddd/ddd.spec
1.3605 +1 -0 openpkg-web/news.txt
patch -p0 <<'@@ .'
Index: openpkg-src/ddd/ddd.patch
$ cvs diff -u -r1.2 -r1.3 ddd.patch
--- openpkg-src/ddd/ddd.patch 31 Jan 2003 19:18:55 - 1.2
+++ openpkg-src/ddd/ddd.patch 7 Mar 2003 14:34:18 - 1.3
@@ -44,3 +44,14 @@
void string::error(const char* msg) const
{
+--- ddd/ddd.C2003-03-07 14:22:43.210793779 +0100
ddd/ddd.C2003-03-07 14:21:56.827359051 +0100
+@@ -872,7 +872,7 @@
+ //-
+
+ struct RecentItems {
+-enum RecentItem { R1, R2, R3, R4, R5, R6, R7, R8, R9 };
++enum RecentItem { Re1, Re2, Re3, Re4, Re5, Re6, Re7, Re8, Re9 };
+ };
+
+ #define RECENT_MENU \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ddd/ddd.spec
$ cvs diff -u -r1.6 -r1.7 ddd.spec
--- openpkg-src/ddd/ddd.spec 24 Feb 2003 14:22:39 - 1.6
+++ openpkg-src/ddd/ddd.spec 7 Mar 2003 14:34:18 - 1.7
@@ -33,7 +33,7 @@
Group:Development
License: GPL
Version: 3.3.1
-Release: 20030224
+Release: 20030307
# list of sources
Source0: ftp://ftp.gnu.org/gnu/ddd/ddd-%{version}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.3604 -r1.3605 news.txt
--- openpkg-web/news.txt 7 Mar 2003 14:19:03 - 1.3604
+++ openpkg-web/news.txt 7 Mar 2003 14:34:16 - 1.3605
@@ -1,3 +1,4 @@
+07-Mar-2003: Upgraded package: P
07-Mar-2003: Upgraded package: P
07-Mar-2003: Upgraded package: P
07-Mar-2003: Upgraded package: P
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
