1
diff -ruN newt-0.51.6-old/Makefile.in newt-0.51.6/Makefile.in
2
--- newt-0.51.6-old/Makefile.in 2004-08-14 22:13:51.000000000 +0100
3
+++ newt-0.51.6/Makefile.in 2004-08-14 23:04:27.000000000 +0100
5
if [ ! -f "$$ver/_snackmodule.so" -o $(LIBNEWTSH) -nt "$$ver/_snackmodule.so" ]; then \
7
$(CC) $(CFLAGS) -I/usr/include/$$ver -fPIC -c -o $$ver/snackmodule.o snackmodule.c ;\
8
- $(CC) --shared $(SHCFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L . $(LIBNEWTSH) ;\
9
+ $(CC) --shared $(SHCFLAGS) -o $$ver/_snackmodule.so $$ver/snackmodule.o -L . -lnewt -lslang ;\
13
whiptail: $(NDIALOGOBJS) $(LIBNEWTSH)
14
- $(CC) -g -o whiptail $(NDIALOGOBJS) -L . $(LIBNEWTSH) $(LIBS) -lpopt
15
+ $(CC) -g -o whiptail $(NDIALOGOBJS) -L . -lnewt $(LIBS) -lpopt
17
whiptcl.so: $(WHIPTCLOBJS) $(LIBNEWTSH)
18
- $(CC) -shared $(SHCFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L . $(LIBNEWTSH) $(LIBTCL) -lslang -lpopt -lm
19
+ $(CC) -shared $(SHCFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L . -lnewt $(LIBTCL) -lslang -lpopt -lm
21
# Ensure dialogboxes is compiled -fPIC
22
dialogboxes.o: dialogboxes.c
25
$(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)
26
$(CC) -shared -o $(LIBNEWTSH) $(SHLIBFLAGS) -Wl,-soname,$(LIBNEWTSONAME) $(SHAREDOBJS) $(SHLIBS)
27
+ ln -s $(LIBNEWTSH) libnewt.so
29
$(SHAREDDIR)/%.o : %.c
30
$(CC) $(SHCFLAGS) -c $(CFLAGS) -o $@ $<
31
diff -ruN newt-0.51.6-old/newt.0.51.ver newt-0.51.6/newt.0.51.ver
32
--- newt-0.51.6-old/newt.0.51.ver 2004-08-14 22:13:51.000000000 +0100
33
+++ newt-0.51.6/newt.0.51.ver 2004-08-14 23:04:36.000000000 +0100
41
diff -ruN newt-0.51.6-old/newt.c newt-0.51.6/newt.c
42
--- newt-0.51.6-old/newt.c 2004-08-14 22:13:51.000000000 +0100
43
+++ newt-0.51.6/newt.c 2004-08-14 22:13:51.000000000 +0100
48
-int wstrlen(const char *str, int len) {
49
+int _newt_wstrlen(const char *str, int len) {
53
diff -ruN newt-0.51.6-old/newt_pr.h newt-0.51.6/newt_pr.h
54
--- newt-0.51.6-old/newt_pr.h 2002-08-15 21:13:40.000000000 +0100
55
+++ newt-0.51.6/newt_pr.h 2004-08-14 22:13:51.000000000 +0100
57
struct eventResult newtDefaultEventHandler(newtComponent c,
60
-int wstrlen(const char *str, int len);
61
+int _newt_wstrlen(const char *str, int len);
62
+#define wstrlen(str,len) _newt_wstrlen((str),(len))
64
#endif /* H_NEWT_PR */
65
diff -ruN newt-0.51.6-old/whiptail.c newt-0.51.6/whiptail.c
66
--- newt-0.51.6-old/whiptail.c 2004-08-14 22:13:51.000000000 +0100
67
+++ newt-0.51.6/whiptail.c 2004-08-14 22:13:51.000000000 +0100
70
#include "dialogboxes.h"
74
enum { NO_ERROR = 0, WAS_ERROR = 1 };
81
/* FIXME Copied from newt.c
82
* Place somewhere better -- dialogboxes? -- amck
91
* The value of *width is increased if it is not as large as the width of
96
- *chrs = wstrlen (line, s - line );
97
+ *chrs = _newt_wstrlen (line, s - line );
98
*width = max(*width, *chrs);