|
|
@@ -1,7 +1,7 @@
|
|
|
Index: Makefile.in
|
|
|
---- Makefile.in.orig 2007-03-02 13:00:51 +0100
|
|
|
-+++ Makefile.in 2007-03-03 18:22:34 +0100
|
|
|
-@@ -1,158 +1,70 @@
|
|
|
+--- Makefile.in.orig 2008-03-21 13:17:45 +0100
|
|
|
++++ Makefile.in 2008-03-25 08:34:42 +0100
|
|
|
+@@ -1,156 +1,70 @@
|
|
|
-LIBS = -lslang
|
|
|
-LIBTCL = -ltcl8.4
|
|
|
|
|
|
@@ -12,8 +12,7 @@ Index: Makefile.in
|
|
|
-
|
|
|
-SHLIBFLAGS= -Wl,--version-script,newt.0.52.ver
|
|
|
-VERSION = @VERSION@
|
|
|
--CVSTAG = r$(subst .,-,$(VERSION))
|
|
|
--CVSROOT = $(shell cat CVS/Root)
|
|
|
+-TAG = r$(subst .,-,$(VERSION))
|
|
|
-SONAME = @SONAME@
|
|
|
-
|
|
|
-PYTHONVERS = @PYTHONVERS@
|
|
|
@@ -201,15 +200,14 @@ Index: Makefile.in
|
|
|
- install -m 644 snack.py $(instroot)/$(libdir)/$$ver/site-packages ;\
|
|
|
- done
|
|
|
-
|
|
|
--configure: configure.ac newt.spec
|
|
|
-- autoconf
|
|
|
+-Makefile: newt.spec
|
|
|
- echo "You need to rerun ./configure before continuing"
|
|
|
-- exit 1
|
|
|
+- @exit 1
|
|
|
-
|
|
|
--create-archive: configure
|
|
|
-- @rm -rf /tmp/newt-$(VERSION) /tmp/newt
|
|
|
-- @cd /tmp; cvs -d $(CVSROOT) export -r$(CVSTAG) newt; mv newt newt-$(VERSION)
|
|
|
-- @cd /tmp/newt-$(VERSION); ./autogen.sh
|
|
|
+-create-archive: Makefile
|
|
|
+- @rm -rf /tmp/newt-$(VERSION)
|
|
|
+- @git archive --prefix=newt-$(VERSION)/ $(TAG) | tar x -C /tmp
|
|
|
+- @cd /tmp/newt-$(VERSION) && ./autogen.sh && rm -rf autom4te.cache
|
|
|
- @cd /tmp; tar czSpf newt-$(VERSION).tar.gz newt-$(VERSION)
|
|
|
- @rm -rf /tmp/newt-$(VERSION)
|
|
|
- @cp /tmp/newt-$(VERSION).tar.gz .
|
|
|
@@ -217,8 +215,8 @@ Index: Makefile.in
|
|
|
- @echo " "
|
|
|
- @echo "The final archive is ./newt-$(VERSION).tar.gz."
|
|
|
-
|
|
|
--tag-archive:
|
|
|
-- @cvs tag $(CVSTAG)
|
|
|
+-tag-archive: Makefile
|
|
|
+- @git tag $(TAG)
|
|
|
-
|
|
|
-archive: tag-archive create-archive
|
|
|
-
|
|
|
@@ -226,8 +224,8 @@ Index: Makefile.in
|
|
|
-include .depend
|
|
|
-endif
|
|
|
Index: newt.c
|
|
|
---- newt.c.orig 2007-02-28 18:35:01 +0100
|
|
|
-+++ newt.c 2007-03-03 18:22:34 +0100
|
|
|
+--- newt.c.orig 2008-03-21 13:17:45 +0100
|
|
|
++++ newt.c 2008-03-25 08:34:42 +0100
|
|
|
@@ -9,7 +9,9 @@
|
|
|
#include <sys/types.h>
|
|
|
#include <termios.h>
|
|
|
@@ -292,8 +290,8 @@ Index: newt.c
|
|
|
*p = '\0';
|
|
|
return;
|
|
|
Index: shtool
|
|
|
---- shtool.orig 2007-03-03 18:22:34 +0100
|
|
|
-+++ shtool 2007-03-03 18:22:34 +0100
|
|
|
+--- shtool.orig 2008-03-25 08:34:42 +0100
|
|
|
++++ shtool 2008-03-25 08:34:42 +0100
|
|
|
@@ -0,0 +1,661 @@
|
|
|
+#!/bin/sh
|
|
|
+##
|
|
|
@@ -957,8 +955,8 @@ Index: shtool
|
|
|
+shtool_exit 0
|
|
|
+
|
|
|
Index: textbox.c
|
|
|
---- textbox.c.orig 2006-10-12 16:18:38 +0200
|
|
|
-+++ textbox.c 2007-03-03 18:22:34 +0100
|
|
|
+--- textbox.c.orig 2008-03-21 13:17:45 +0100
|
|
|
++++ textbox.c 2008-03-25 08:34:42 +0100
|
|
|
@@ -4,7 +4,9 @@
|
|
|
#include <stdlib.h>
|
|
|
#include <string.h>
|
|
|
@@ -969,7 +967,7 @@ Index: textbox.c
|
|
|
|
|
|
#include "newt.h"
|
|
|
#include "newt_pr.h"
|
|
|
-@@ -172,8 +174,10 @@
|
|
|
+@@ -173,8 +175,10 @@
|
|
|
int i;
|
|
|
int howbad = 0;
|
|
|
int height = 0;
|
|
|
@@ -980,7 +978,7 @@ Index: textbox.c
|
|
|
|
|
|
if (resultPtr) {
|
|
|
/* XXX I think this will work */
|
|
|
-@@ -181,7 +185,9 @@
|
|
|
+@@ -182,7 +186,9 @@
|
|
|
*result = '\0';
|
|
|
}
|
|
|
|
|
|
@@ -990,7 +988,7 @@ Index: textbox.c
|
|
|
while (*text) {
|
|
|
end = strchr(text, '\n');
|
|
|
if (!end)
|
|
|
-@@ -213,6 +219,7 @@
|
|
|
+@@ -214,6 +220,7 @@
|
|
|
chptr = text;
|
|
|
w2 = 0;
|
|
|
for (i = 0; i < width - 1;) {
|
|
|
@@ -998,7 +996,7 @@ Index: textbox.c
|
|
|
if ((x=mbrtowc(&tmp,chptr,end-chptr,&ps))<=0)
|
|
|
break;
|
|
|
if (spc && !iswspace(tmp))
|
|
|
-@@ -226,6 +233,17 @@
|
|
|
+@@ -227,6 +234,17 @@
|
|
|
x = wcwidth(tmp);
|
|
|
if (x>0)
|
|
|
i+=x;
|
|
|
@@ -1016,7 +1014,7 @@ Index: textbox.c
|
|
|
}
|
|
|
howbad += width - w2 + 1;
|
|
|
#ifdef DEBUG_WRAP
|
|
|
-@@ -240,9 +258,14 @@
|
|
|
+@@ -241,9 +259,14 @@
|
|
|
|
|
|
text = chptr;
|
|
|
while (1) {
|
|
|
@@ -1032,8 +1030,8 @@ Index: textbox.c
|
|
|
}
|
|
|
}
|
|
|
Index: tutorial.txt
|
|
|
---- tutorial.txt.orig 2007-03-03 18:22:34 +0100
|
|
|
-+++ tutorial.txt 2007-03-03 18:22:34 +0100
|
|
|
+--- tutorial.txt.orig 2008-03-25 08:34:42 +0100
|
|
|
++++ tutorial.txt 2008-03-25 08:34:42 +0100
|
|
|
@@ -0,0 +1,1079 @@
|
|
|
+
|
|
|
+Writing Programs Using newtErik Troan, <ewt@redhat.com>
|
|
|
@@ -2115,8 +2113,8 @@ Index: tutorial.txt
|
|
|
+void newtFormSetHeight(newtComponent co, int height);
|
|
|
+void newtFormSetWidth(newtComponent co, int width);
|
|
|
Index: whiptail.c
|
|
|
---- whiptail.c.orig 2007-01-31 14:48:15 +0100
|
|
|
-+++ whiptail.c 2007-03-03 18:22:34 +0100
|
|
|
+--- whiptail.c.orig 2008-03-21 13:17:45 +0100
|
|
|
++++ whiptail.c 2008-03-25 08:34:42 +0100
|
|
|
@@ -8,6 +8,7 @@
|
|
|
#include <unistd.h>
|
|
|
#include <wchar.h>
|
