OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 26-Sep-2009 17:23:14
Branch: HEAD Handle: 2009092616231400
Modified files:
openpkg-src/newt newt.patch newt.spec
Log:
upgrading package: newt 0.52.10.4 -> 0.52.11.1
Summary:
Revision Changes Path
1.7 +33 -31 openpkg-src/newt/newt.patch
1.53 +3 -3 openpkg-src/newt/newt.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/newt/newt.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 newt.patch
--- openpkg-src/newt/newt.patch 25 Mar 2008 07:36:50 -0000 1.6
+++ openpkg-src/newt/newt.patch 26 Sep 2009 15:23:14 -0000 1.7
@@ -1,7 +1,7 @@
Index: Makefile.in
---- Makefile.in.orig 2008-03-21 13:17:45 +0100
-+++ Makefile.in 2008-03-25 08:34:42 +0100
-@@ -1,156 +1,70 @@
+--- Makefile.in.orig 2009-09-24 17:03:09 +0200
++++ Makefile.in 2009-09-26 17:15:52 +0200
+@@ -1,158 +1,70 @@
-LIBS = -lslang
-LIBTCL = -ltcl8.4
@@ -39,6 +39,7 @@
-datadir = @datadir@
-mandir = @mandir@
-man1dir = $(mandir)/man1
+-pkgconfigdir = $(libdir)/pkgconfig
-
-#--------------------------------------
-
@@ -74,7 +75,7 @@
- for ver in $(PYTHONVERS) ; do \
- mkdir -p $$ver ;\
- $(CC) $(CFLAGS) -I/usr/include/$$ver $(SHCFLAGS) -c -o
$$ver/snackmodule.o snackmodule.c ;\
-- $(CC) --shared $(SHCFLAGS) -o $$ver/_snackmodule.so
$$ver/snackmodule.o -L . -lnewt -lslang ;\
+- $(CC) --shared $(SHCFLAGS) -o $$ver/_snackmodule.so
$$ver/snackmodule.o -L . -lnewt ;\
- done
- touch $@
-
@@ -82,7 +83,7 @@
- $(CC) -g -o whiptail $(NDIALOGOBJS) -L . -lnewt $(LIBS) -lpopt
-
-whiptcl.so: $(WHIPTCLOBJS) $(LIBNEWTSH)
-- $(CC) -shared $(SHCFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L . -lnewt
$(LIBTCL) -lslang -lpopt -lm
+- $(CC) -shared $(SHCFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L . -lnewt
$(LIBTCL) -lpopt
-
-$(LIBNEWT): $(LIBOBJS)
- ar rv $@ $^
@@ -145,7 +146,7 @@
clean:
- rm -f $(PROGS) *.o $(LIBNEWT) core $(LIBNEWTSH) \
-- $(SHAREDDIR)/*.o *.so*
+- $(SHAREDDIR)/*.o *.so* *.pc
-
-depend:
- $(CPP) $(CFLAGS) $(CPPFLAGS) -M $(SOURCES) > .depend
@@ -187,6 +188,7 @@
- install -m 755 whiptail $(instroot)/$(bindir)
- install -m 644 whiptail.1 $(instroot)/$(man1dir)
- make -C po datadir=$(instroot)/$(datadir) install
+- install -m 644 -D libnewt.pc $(instroot)/$(pkgconfigdir)/libnewt.pc
-
-install-sh: sharedlib $(WHIPTCLSO) _snackmodule.so
- [ -d $(instroot)/$(libdir) ] || install -m 755 -d $(instroot)/$(libdir)
@@ -224,8 +226,8 @@
-include .depend
-endif
Index: newt.c
---- newt.c.orig 2008-03-21 13:17:45 +0100
-+++ newt.c 2008-03-25 08:34:42 +0100
+--- newt.c.orig 2009-09-24 17:03:09 +0200
++++ newt.c 2009-09-26 15:38:12 +0200
@@ -9,7 +9,9 @@
#include <sys/types.h>
#include <termios.h>
@@ -236,7 +238,7 @@
#ifdef HAVE_ALLOCA_H
#include <alloca.h>
-@@ -154,13 +156,16 @@
+@@ -156,13 +158,16 @@
}
int _newt_wstrlen(const char *str, int len) {
@@ -253,7 +255,7 @@
memset(&ps,0,sizeof(mbstate_t));
while (len > 0) {
int x,y;
-@@ -174,6 +179,9 @@
+@@ -176,6 +181,9 @@
nchars+=y;
} else break;
}
@@ -263,7 +265,7 @@
return nchars;
}
-@@ -186,19 +194,25 @@
+@@ -188,19 +196,25 @@
char *p = title;
int ln;
int x = 0,y = 0;
@@ -290,8 +292,8 @@
*p = '\0';
return;
Index: shtool
---- shtool.orig 2008-03-25 08:34:42 +0100
-+++ shtool 2008-03-25 08:34:42 +0100
+--- /dev/null 2009-09-26 17:15:39 +0200
++++ shtool 2009-09-26 15:38:12 +0200
@@ -0,0 +1,661 @@
+#!/bin/sh
+##
@@ -955,8 +957,8 @@
+shtool_exit 0
+
Index: textbox.c
---- textbox.c.orig 2008-03-21 13:17:45 +0100
-+++ textbox.c 2008-03-25 08:34:42 +0100
+--- textbox.c.orig 2009-09-24 17:03:09 +0200
++++ textbox.c 2009-09-26 17:19:22 +0200
@@ -4,7 +4,9 @@
#include <stdlib.h>
#include <string.h>
@@ -967,7 +969,7 @@
#include "newt.h"
#include "newt_pr.h"
-@@ -173,8 +175,10 @@
+@@ -171,8 +173,10 @@
int i;
int howbad = 0;
int height = 0;
@@ -977,8 +979,8 @@
+#endif
if (resultPtr) {
- /* XXX I think this will work */
-@@ -182,7 +186,9 @@
+ if (width > 1) {
+@@ -184,7 +188,9 @@
*result = '\0';
}
@@ -988,20 +990,20 @@
while (*text) {
end = strchr(text, '\n');
if (!end)
-@@ -214,6 +220,7 @@
+@@ -216,6 +222,7 @@
chptr = text;
- w2 = 0;
- for (i = 0; i < width - 1;) {
+ i = 0;
+ while (1) {
+#ifdef HAVE_WCHAR
if ((x=mbrtowc(&tmp,chptr,end-chptr,&ps))<=0)
break;
if (spc && !iswspace(tmp))
-@@ -227,6 +234,17 @@
- x = wcwidth(tmp);
- if (x>0)
- i+=x;
+@@ -232,6 +239,17 @@
+ break;
+ chptr += x;
+ i += w;
+#else
-+ if (spc && !isspace(*chptr))
++ if (spc && !isspace(*chptr))
+ spc = 0;
+ else if (!spc && isspace(*chptr)) {
+ spc = 1;
@@ -1014,7 +1016,7 @@
}
howbad += width - w2 + 1;
#ifdef DEBUG_WRAP
-@@ -241,9 +259,14 @@
+@@ -246,9 +264,14 @@
text = chptr;
while (1) {
@@ -1030,8 +1032,8 @@
}
}
Index: tutorial.txt
---- tutorial.txt.orig 2008-03-25 08:34:42 +0100
-+++ tutorial.txt 2008-03-25 08:34:42 +0100
+--- /dev/null 2009-09-26 17:15:39 +0200
++++ tutorial.txt 2009-09-26 15:38:12 +0200
@@ -0,0 +1,1079 @@
+
+Writing Programs Using newtErik Troan, <e...@redhat.com>
@@ -2113,8 +2115,8 @@
+void newtFormSetHeight(newtComponent co, int height);
+void newtFormSetWidth(newtComponent co, int width);
Index: whiptail.c
---- whiptail.c.orig 2008-03-21 13:17:45 +0100
-+++ whiptail.c 2008-03-25 08:34:42 +0100
+--- whiptail.c.orig 2009-09-24 17:03:09 +0200
++++ whiptail.c 2009-09-26 15:38:12 +0200
@@ -8,6 +8,7 @@
#include <unistd.h>
#include <wchar.h>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/newt/newt.spec
============================================================================
$ cvs diff -u -r1.52 -r1.53 newt.spec
--- openpkg-src/newt/newt.spec 30 Jul 2009 16:21:42 -0000 1.52
+++ openpkg-src/newt/newt.spec 26 Sep 2009 15:23:14 -0000 1.53
@@ -22,8 +22,8 @@
##
# package version
-%define V_major 0.52.10
-%define V_minor 4
+%define V_major 0.52.11
+%define V_minor 1
%define V_tag fc12
# package information
@@ -37,7 +37,7 @@
Group: Terminal
License: LGPL
Version: %{V_major}.%{V_minor}
-Release: 20090730
+Release: 20090926
# list of sources
Source0:
ftp://download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/newt-%{V_major}-%{V_minor}.%{V_tag}.src.rpm
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
