1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
|
diff -urN devtodo-0.1.18.orig/acconfig.h devtodo-0.1.18/acconfig.h
--- devtodo-0.1.18.orig/acconfig.h 2004-12-17 10:21:09.168345388 -0500
+++ devtodo-0.1.18/acconfig.h 1969-12-31 19:00:00.000000000 -0500
@@ -1,6 +0,0 @@
-/* System configuration directory */
-#undef SYSCONFDIR
-
-/* Use termcap to get terminal width */
-#undef USETERMCAP
-@TOP@
diff -urN devtodo-0.1.18.orig/configure.in devtodo-0.1.18/configure.in
--- devtodo-0.1.18.orig/configure.in 2004-12-17 10:21:09.166345721 -0500
+++ devtodo-0.1.18/configure.in 2004-12-17 10:21:34.049210408 -0500
@@ -25,7 +25,7 @@
# Don't use termcap to obtain window size
AC_ARG_WITH(termcap, [ --without-termcap don't use termcap to obtain terminal width])
if test "${with_termcap}_" = _ -o "${with_termcap}_" = yes; then
- AC_DEFINE(USETERMCAP)
+ AC_DEFINE(USETERMCAP, [], [Use termcap?])
fi
# Check for various headers and functions - although I'm not doing anything
@@ -79,7 +79,7 @@
AC_SUBST(READLINE_LIBS)
SYSCONFDIR="`eval echo $sysconfdir`"
-AC_DEFINE_UNQUOTED(SYSCONFDIR, "$SYSCONFDIR")
+AC_DEFINE_UNQUOTED(SYSCONFDIR, "$SYSCONFDIR", [System configuration directory])
AC_SUBST(SYSCONFDIR)
AC_CHECK_PROG(HAVE_CRASH_CONFIG, crash-config, yes)
diff -urN devtodo-0.1.18.orig/doc/devtodo.1.in devtodo-0.1.18/doc/devtodo.1.in
--- devtodo-0.1.18.orig/doc/devtodo.1.in 2004-12-17 10:21:09.135350872 -0500
+++ devtodo-0.1.18/doc/devtodo.1.in 2004-12-17 10:21:34.050210242 -0500
@@ -20,9 +20,6 @@
.TP
\fBtdd \fI<indices>\fP\fP
Mark the specified items as being done.
-.TP
-\fBtdl [\-g \fI<index>\fP] \fI<database>\fP\fP
-Link the specified devtodo database into the current one, optionally grafting it as a child of the specified index.
.SH "DESCRIPTION"
.LP
\fBtodo\fP is a program aimed specifically at programmers (but usable by anybody at the terminal) to aid in day\-to\-day development.
@@ -372,6 +369,10 @@
.TP
\fB~/.todorc\fR
User-specific options are specified in this file. Please refer to the section \fBTODORC\fR for more information.
+.SH "BUGS"
+.LP
+Because of a conflict with app-misc/tdl, the tdl symbolic link and the tdl manual page have been removed.
+See \fIhttp://bugs.gentoo.org/show_bug.cgi?id=55371\fR for more information.
.SH "AUTHORS"
.LP
Alec Thomas \fI<alec@swapoff.org>\fR
diff -urN devtodo-0.1.18.orig/doc/Makefile.am devtodo-0.1.18/doc/Makefile.am
--- devtodo-0.1.18.orig/doc/Makefile.am 2004-12-17 10:21:09.135350872 -0500
+++ devtodo-0.1.18/doc/Makefile.am 2004-12-17 10:21:34.050210242 -0500
@@ -1,5 +1,5 @@
man_MANS=devtodo.1
-manlinks=tda tdr tdd tde tdl todo
+manlinks=tda tdr tdd tde todo
install-data-local:
mkdir -p $(DESTDIR)$(mandir)/man1
diff -urN devtodo-0.1.18.orig/src/Makefile.am devtodo-0.1.18/src/Makefile.am
--- devtodo-0.1.18.orig/src/Makefile.am 2004-12-17 10:21:09.154347715 -0500
+++ devtodo-0.1.18/src/Makefile.am 2004-12-17 10:21:34.053209744 -0500
@@ -1,18 +1,12 @@
bin_PROGRAMS=devtodo
devtodo_SOURCES=Todo.cc Todo.h TodoDB.cc TodoDB.h support.cc support.h \
main.cc todoterm.cc todoterm.h Loaders.cc Loaders.h todorl.h
-binlinks=tda tdr tdd tdl tde todo
+binlinks=tda tdr tdd tde todo
devtodo_LDADD=../util/libutil.la
INCLUDES=-I../util
LIBS=@READLINE_LIBS@
-if DEBUG
-CPPFLAGS=-g
-else
-CPPFLAGS+=-DNDEBUG
-endif
-
install-exec-hook:
cd $(DESTDIR)$(bindir); for i in $(binlinks); do $(LN_S) -f devtodo $$i; done
diff -urN devtodo-0.1.18.orig/src/TodoDB.cc devtodo-0.1.18/src/TodoDB.cc
--- devtodo-0.1.18.orig/src/TodoDB.cc 2004-12-17 10:21:09.136350706 -0500
+++ devtodo-0.1.18/src/TodoDB.cc 2004-12-17 10:21:34.054209577 -0500
@@ -750,7 +750,6 @@
if (options.verbose > 1)
cout << info << "todo: permanently removing item '" << (*j) << "'" << normal << endl;
erase(todo, *j);
- t->db->setDirty(true);
} else
notfound.push_back(*j);
}
@@ -949,7 +948,11 @@
if (out.bad())
throw exception("couldn't open TODO for generation");
- if (titleText != "") wraptext(out, titleText, 0, options.columns);
+ if (titleText != "") {
+ wraptext(out, titleText, 0, options.columns);
+ out << endl << endl;
+ }
+
if (options.verbose > 1)
cout << "todo: generating using format '" << options.format["verbose-generated"] << "'" << endl;
filterView();
diff -urN devtodo-0.1.18.orig/util/c_regex.h devtodo-0.1.18/util/c_regex.h
--- devtodo-0.1.18.orig/util/c_regex.h 2004-12-17 10:21:09.157347216 -0500
+++ devtodo-0.1.18/util/c_regex.h 2004-12-17 10:25:41.026169344 -0500
@@ -533,7 +533,10 @@
/* For now unconditionally define __restrict_arr to expand to nothing.
Ideally we would have a test for the compiler which allows defining
it to restrict. */
-#define __restrict_arr
+#ifdef __restrict_arr
+# undef __restrict_arr
+# define __restrict_arr
+#endif
/* POSIX compatibility. */
extern int regcomp _RE_ARGS ((regex_t *__restrict __preg,
|
GitWeb