SOURCES: newt-make.patch, newt-nopython.patch - updated for 0.52.10

[qboosh]

Author: qboosh                       Date: Tue Aug 19 19:25:43 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 0.52.10

---- Files affected:
SOURCES:
   newt-make.patch (1.1 -> 1.2) , newt-nopython.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/newt-make.patch
diff -u SOURCES/newt-make.patch:1.1 SOURCES/newt-make.patch:1.2
--- SOURCES/newt-make.patch:1.1	Sat Jan 27 23:09:03 2007
+++ SOURCES/newt-make.patch	Tue Aug 19 21:25:37 2008
@@ -1,6 +1,6 @@
---- Makefile.in.org	2007-01-27 23:03:10.003192750 +0100
-+++ Makefile.in	2007-01-27 23:07:13.690422250 +0100
-@@ -54,19 +54,19 @@
+--- newt-0.52.10/Makefile.in.orig	2008-08-19 21:13:55.701247852 +0200
++++ newt-0.52.10/Makefile.in	2008-08-19 21:15:15.285242824 +0200
+@@ -53,19 +53,19 @@
  all:	$(TARGET) $(SNACKSO)
  
  test:	test.o $(LIBNEWT)
@@ -24,8 +24,8 @@
 +	$(CC) $(CFLAGS) $(CPPFLAGS) -o showkey showkey.o $(LIBNEWT) $(LIBS)
  
  _snackmodule.so:   snackmodule.c $(LIBNEWTSH)
- 	[ -z "$(SNACKSO)" ] || for ver in $(PYTHONVERS) ; do \
-@@ -79,16 +79,16 @@
+ 	for ver in $(PYTHONVERS) ; do \
+@@ -76,16 +76,16 @@
  	touch $@
  
  whiptail: $(NDIALOGOBJS) $(LIBNEWTSH)
@@ -34,11 +34,11 @@
  
  whiptcl.o:   whiptcl.c
 -	gcc -fPIC $(CFLAGS) -c whiptcl.c
-+	gcc -fPIC $(CFLAGS) $(CPPFLAGS) -c whiptcl.c
++	$(CC) -fPIC $(CFLAGS) $(CPPFLAGS) -c whiptcl.c
  
  dialogboxes.o:   dialogboxes.c
 -	gcc -fPIC $(CFLAGS) -c dialogboxes.c
-+	gcc -fPIC $(CFLAGS) $(CPPFLAGS) -c dialogboxes.c
++	$(CC) -fPIC $(CFLAGS) $(CPPFLAGS) -c dialogboxes.c
  
  whiptcl.so: $(WHIPTCLOBJS) $(LIBNEWTSH)
 -	$(CC) -shared $(SHCFLAGS) -o whiptcl.so $(WHIPTCLOBJS) -L . -lnewt  $(LIBTCL) -lslang -lpopt -lm
@@ -46,12 +46,22 @@
  
  $(LIBNEWT): $(LIBOBJS)
  	ar rv $@ $^
-@@ -103,7 +103,7 @@
+@@ -100,14 +100,15 @@
  		$(SHAREDDIR)/*.o *.so*
  
  depend:
 -	$(CPP) $(CFLAGS) $(CPPFLAGS) -M $(SOURCES) > .depend
 +	$(CPP) $(CPPFLAGS) -M $(SOURCES) > .depend
  
- $(SHAREDDIR):
+-$(SHAREDDIR):
++.shared.dir:
  	mkdir -p $(SHAREDDIR)
++	touch .shared.dir
+ 
+ sharedlib: $(LIBNEWTSH)
+ 
+-$(LIBNEWTSH): $(SHAREDDIR) $(SHAREDOBJS)
++$(LIBNEWTSH): .shared.dir $(SHAREDOBJS)
+ 	$(CC) -shared -o $(LIBNEWTSH) $(SHLIBFLAGS) -Wl,-soname,$(LIBNEWTSONAME) $(SHAREDOBJS) $(LIBS)
+ 	ln -fs $(LIBNEWTSONAME) libnewt.so
+ 	ln -fs $(LIBNEWTSH) $(LIBNEWTSONAME)

================================================================
Index: SOURCES/newt-nopython.patch
diff -u SOURCES/newt-nopython.patch:1.3 SOURCES/newt-nopython.patch:1.4
--- SOURCES/newt-nopython.patch:1.3	Sat Jan 27 23:11:57 2007
+++ SOURCES/newt-nopython.patch	Tue Aug 19 21:25:38 2008
@@ -1,41 +1,30 @@
---- newt-0.52.2/Makefile.in~	2006-05-18 02:14:47.822814196 +0300
-+++ newt-0.52.2/Makefile.in	2006-05-18 02:17:10.386024154 +0300
+--- newt-0.52.10/Makefile.in.orig	2008-08-19 20:45:13.753250367 +0200
++++ newt-0.52.10/Makefile.in	2008-08-19 20:45:13.817251205 +0200
 @@ -13,6 +13,7 @@
-
- PYTHONVERS = @PYTHONVERS@ 
+ 
+ PYTHONVERS = @PYTHONVERS@
  WHIPTCLSO = @WHIPTCLSO@
 +SNACKSO = _snackmodule.so
  
  PROGS = test whiptail $(WHIPTCLSO) testgrid testtree showchars showkey
  TESTOBJS = test.o testgrid.o testtree.o showchars.o showkey.o
-@@ -46,7 +46,7 @@
+@@ -49,7 +50,7 @@
  TARGET=depend $(PROGS)
  endif
  
 -all:	$(TARGET) _snackmodule.so
 +all:	$(TARGET) $(SNACKSO)
-
- test:	test.o $(LIBNEWT)
- 	$(CC) -g -o test test.o $(LIBNEWT) $(LIBS) 
-@@ -67,7 +67,7 @@
- 	$(CC) -g -o showkey showkey.o $(LIBNEWT) $(LIBS)
  
- _snackmodule.so:   snackmodule.c $(LIBNEWTSH)
--	for ver in $(PYTHONVERS) ; do \
-+	[ -z "$(SNACKSO)" ] || for ver in $(PYTHONVERS) ; do \
- 	    if [ ! -f "$$ver/_snackmodule.so" -o $(LIBNEWTSH) -nt "$$ver/_snackmodule.so" ]; then \
- 	    	mkdir -p $$ver ;\
- 	        $(CC) $(CFLAGS) -I/usr/include/$$ver -fPIC -c -o $$ver/snackmodule.o snackmodule.c ;\
-@@ -136,7 +136,7 @@
- 	install -m 644 $(LIBNEWT) $(instroot)/$(libdir)
- 	install -m 755 whiptail $(instroot)/$(bindir)
+ test:	test.o $(LIBNEWT)
+ 	$(CC) -g -o test test.o $(LIBNEWT) $(LIBS)
+@@ -125,13 +126,13 @@
+ 	install -m 644 whiptail.1 $(instroot)/$(man1dir)
+ 	make -C po datadir=$(instroot)/$(datadir) install
  
 -install-sh: sharedlib $(WHIPTCLSO) _snackmodule.so
 +install-sh: sharedlib $(WHIPTCLSO) $(SNACKSO)
  	[ -d $(instroot)/$(libdir) ] || install -m 755 -d $(instroot)/$(libdir)
  	install -m 755 $(LIBNEWTSH) $(instroot)/$(libdir)
- 	ln -sf $(LIBNEWTSH) $(instroot)/$(libdir)/$(LIBNEWTSONAME)
-@@ -142,7 +142,7 @@
  	ln -sf $(LIBNEWTSONAME) $(instroot)/$(libdir)/libnewt.so
  	ln -sf $(LIBNEWTSH) $(instroot)/$(libdir)/$(LIBNEWTSONAME)
  	[ -n "$(WHIPTCLSO)" ] && install -m 755 whiptcl.so $(instroot)/$(libdir) || :
@@ -43,4 +32,4 @@
 +	[ -z "$(SNACKSO)" ] || for ver in $(PYTHONVERS) ; do \
  	   [ -d $(instroot)/$(libdir)/$$ver/site-packages ] || install -m 755 -d $(instroot)/$(libdir)/$$ver/site-packages ;\
  	   install -m 755 $$ver/_snackmodule.so $(instroot)/$(libdir)/$$ver/site-packages ;\
- 	   install -m 755 snack.py $(instroot)/$(libdir)/$$ver/site-packages ;\
+ 	   install -m 644 snack.py $(instroot)/$(libdir)/$$ver/site-packages ;\
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/newt-make.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/newt-nopython.patch?r1=1.3&r2=1.4&f=u