commit ucblogo

16 Jan 2007

Hello community,

here is the log from the commit of package ucblogo
checked in at Tue Jan 16 17:35:35 CET 2007.

--------

--- ucblogo/ucblogo.changes	2006-01-25 21:42:22.000000000 +0100
+++ /mounts/work_src_done/STABLE/ucblogo/ucblogo.changes	2007-01-12 12:41:37.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Jan 12 12:40:26 CET 2007 - seife@suse.de
+
+- update to version 5.5
+- fix a compiler warning (bug 233365) 
+
+-------------------------------------------------------------------

Old:
----
  ucblogo-5.4.tar.gz
  ucblogo-compilerwarnings.diff

New:
----
  ucblogo-5.5-bug233365.diff
  ucblogo-5.5-compilerwarnings.diff
  ucblogo-5.5-ncurses.diff
  ucblogo-5.5.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ucblogo.spec ++++++
--- /var/tmp/diff_new_pack.c22389/_old	2007-01-16 17:35:07.000000000 +0100
+++ /var/tmp/diff_new_pack.c22389/_new	2007-01-16 17:35:07.000000000 +0100
@@ -1,11 +1,11 @@
 #
-# spec file for package ucblogo (Version 5.4)
+# spec file for package ucblogo (Version 5.5)
 #
-# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
-# Please submit bugfixes or comments via http://www.suse.de/feedback/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 # norootforbuild
@@ -13,14 +13,16 @@
 Name:         ucblogo
 BuildRequires: ghostscript-library libtiff-devel te_ams te_latex xorg-x11-devel
 URL:          http://www.cs.berkeley.edu/~bh/logo.html
-Version:      5.4
-Release:      5
+Version:        5.5
+Release:        1
 Summary:      LOGO implementation by UCB
-License:      GPL
+License:        GNU General Public License (GPL)
 Group:        Development/Languages/Other
 Source:       %{name}-%{version}.tar.gz
 Patch1:       ucblogo.diff
-Patch2:       ucblogo-compilerwarnings.diff
+Patch2:         ucblogo-5.5-bug233365.diff
+Patch3:         ucblogo-5.5-ncurses.diff
+Patch4:         ucblogo-5.5-compilerwarnings.diff
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 Prefix:       /usr
 
@@ -42,7 +44,9 @@
 %prep
 %setup
 %patch1 -p1
-%patch2 -p1
+%patch2 -p0
+%patch3 -p0
+%patch4 -p0
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -69,6 +73,9 @@
 %doc /usr/share/info/ucblogo*
 
 %changelog -n ucblogo
+* Fri Jan 12 2007 - seife@suse.de
+- update to version 5.5
+- fix a compiler warning (bug 233365)
 * Wed Jan 25 2006 - mls@suse.de
 - converted neededforbuild to BuildRequires
 * Wed Sep 28 2005 - dmueller@suse.de

++++++ ucblogo-5.5-bug233365.diff ++++++
--- intern.c
+++ intern.c
@@ -43,7 +43,7 @@
 
     while (--len >= 0) {
 	h = (h << 4) + (FIXNUM)(*s++);
-	g = h & (0xf << (WORDSIZE-4));
+	g = h & (((FIXNUM)0xf) << (WORDSIZE-4));
 	if (g != 0) {
 	    h ^= g ^ (g >> (WORDSIZE-8));
 	}
++++++ ucblogo-5.5-compilerwarnings.diff ++++++
--- graphics.c
+++ graphics.c
@@ -196,7 +196,7 @@
     FLONUM delta_x, delta_y;
 #endif
    
-    prepare_to_draw;
+    prepare_to_draw();
     prepare_to_draw_turtle;
     save_pen(&saved_pen);
     plain_xor_pen();
@@ -262,7 +262,7 @@
 void save_arc(FLONUM, FLONUM, FLONUM, FLONUM, FLONUM, FLONUM, FLONUM, FLONUM);
 
 void right(FLONUM a) {
-    prepare_to_draw;
+    prepare_to_draw();
     draw_turtle();
     turtle_heading += a;
     turtle_heading = pfmod(turtle_heading,360.0);
@@ -319,7 +319,7 @@
 FLONUM wrap_down(FLONUM, FLONUM, FLONUM, FLONUM, FLONUM);
 
 void forward(FLONUM d) {
-    prepare_to_draw;
+    prepare_to_draw();
     draw_turtle();
     forward_helper(d);
     draw_turtle();
@@ -553,7 +553,7 @@
 }
 
 NODE *lshowturtle(NODE *args) {
-    prepare_to_draw;
+    prepare_to_draw(UNBOUND);
     if (!turtle_shown) {
 	turtle_shown = TRUE;
 	draw_turtle();
@@ -563,7 +563,7 @@
 }
 
 NODE *lhideturtle(NODE *args) {
-    prepare_to_draw;
+    prepare_to_draw(UNBOUND);
     if (turtle_shown) {
 	draw_turtle();
 	turtle_shown = FALSE;
@@ -581,7 +581,7 @@
     
     val = numeric_arg(arg);
     if (NOT_THROWING) {
-	prepare_to_draw;
+	prepare_to_draw(UNBOUND);
 	draw_turtle();
 	if (nodetype(val) == INT)
 	    turtle_heading = (FLONUM)getint(val);
@@ -685,7 +685,7 @@
 }
 
 NODE *lhome(NODE *args) {
-    prepare_to_draw;
+    prepare_to_draw(UNBOUND);
     out_of_bounds = FALSE;
     setpos_bynumber((FLONUM)0.0, (FLONUM)0.0);
     draw_turtle();
@@ -699,7 +699,7 @@
 #ifdef x_window
     clearing_screen++;
 #endif
-    prepare_to_draw;
+    prepare_to_draw();
     clear_screen;
 #ifdef x_window
     clearing_screen==0;
@@ -772,7 +772,7 @@
 
 void setpos_bynumber(FLONUM target_x, FLONUM target_y) {
     if (NOT_THROWING) {
-	prepare_to_draw;
+	prepare_to_draw();
 	draw_turtle();
 	move_to(g_round(screen_x_coord), g_round(screen_y_coord));
 	setpos_commonpart(target_x, target_y);
@@ -784,7 +784,7 @@
     FLONUM target_x, target_y;
     
     if (NOT_THROWING) {
-	prepare_to_draw;
+	prepare_to_draw();
 	draw_turtle();
 	move_to(g_round(screen_x_coord), g_round(screen_y_coord));
 	target_x = ((xnode == NIL) ?
@@ -841,7 +841,7 @@
 }
 
 NODE *lwrap(NODE *args) {
-    prepare_to_draw;
+    prepare_to_draw(UNBOUND);
     draw_turtle();
     current_mode = wrapmode;
     while (turtle_x > turtle_right_max) {
@@ -864,7 +864,7 @@
 
 NODE *lfence(NODE *args) {
     (void)lwrap(args);	    /* get turtle inside the fence */
-    prepare_to_draw;
+    prepare_to_draw(UNBOUND);
     draw_turtle();
     current_mode = fencemode;
     draw_turtle();
@@ -873,7 +873,7 @@
 }
 
 NODE *lwindow(NODE *args) {
-    prepare_to_draw;
+    prepare_to_draw(UNBOUND);
     draw_turtle();
     current_mode = windowmode;
     draw_turtle();
@@ -892,7 +892,7 @@
 }
 
 NODE *lfill(NODE *args) {
-    prepare_to_draw;
+    prepare_to_draw(UNBOUND);
     draw_turtle();
     logofill();
     draw_turtle();
@@ -914,7 +914,7 @@
     *print_stringptr = '\0';
 	
     if (NOT_THROWING) {
-	prepare_to_draw;
+	prepare_to_draw(UNBOUND);
 	draw_turtle();
 	theLength = strlen(textbuf);
 #ifdef mac
@@ -1027,7 +1027,7 @@
     NODE *val;
 
     if (NOT_THROWING) {
-	prepare_to_draw;
+	prepare_to_draw(UNBOUND);
 	if (is_list(car(arg))) {
 	    val = make_intnode(-1);
 	    lsetpalette(cons(val,arg));
@@ -1044,7 +1044,7 @@
     NODE *val;
 
     if (NOT_THROWING) {
-	prepare_to_draw;
+	prepare_to_draw(UNBOUND);
 	if (is_list(car(arg))) {
 	    val = make_intnode(-2);
 	    lsetpalette(cons(val,arg));
@@ -1064,7 +1064,7 @@
 	if (slotnum < -2) {
 	    err_logo(BAD_DATA_UNREC, slot);
 	} else if (NOT_THROWING && ((slotnum > 7) || (slotnum < 0))) {
-		prepare_to_draw;
+		prepare_to_draw(UNBOUND);
 		set_palette(slotnum,
 			    (unsigned int)getint(car(arg)),
 			    (unsigned int)getint(cadr(arg)),
@@ -1117,7 +1117,7 @@
     NODE *arg;
 
     if (NOT_THROWING) {
-	prepare_to_draw;
+	prepare_to_draw(UNBOUND);
 	if (is_list(car(args))) {
 	    arg = pos_int_vector_arg(args);
 	    set_pen_width((int)getint(car(arg)));
@@ -1141,7 +1141,7 @@
 	arg = err_logo(BAD_DATA, arg);
 	
     if (NOT_THROWING) {
-	prepare_to_draw;
+	prepare_to_draw(UNBOUND);
 	set_list_pen_pattern(arg);
 	save_pattern();
 	done_drawing;
@@ -1157,7 +1157,7 @@
     ynode = numeric_arg(cdr(args));
 
     if (NOT_THROWING) {
-	prepare_to_draw;
+	prepare_to_draw(UNBOUND);
 	draw_turtle();
 	x_scale = (nodetype(xnode) == FLOATT) ? getfloat(xnode) :
 			       (FLONUM)getint(xnode);
@@ -1294,7 +1294,7 @@
 	else
 	    radius = getfloat(val2);
 
-	prepare_to_draw;
+	prepare_to_draw(UNBOUND);
 	draw_turtle();
 
 	/* save and force turtle state */
@@ -1506,7 +1506,7 @@
 	return;
     }
 
-    prepare_to_draw;
+    prepare_to_draw();
     save_tx = turtle_x;
     save_ty = turtle_y;
     save_th = turtle_heading;
@@ -1671,7 +1671,7 @@
     lopenread(args);
 #endif
     if (NOT_THROWING) {
-	prepare_to_draw;
+	prepare_to_draw(UNBOUND);
 	fp = (FILE *)file_list->n_obj;
 	restore_palette(fp);
 	fread(&record_index, sizeof(FIXNUM), 1, fp);
--- wrksp.c
+++ wrksp.c
@@ -1519,7 +1519,7 @@
 #endif
 #else	/* !ibm (so unix) */
     if (fork() == 0) {
-	execlp(editor, editorname, tmp_filename, 0);
+	execlp(editor, editorname, tmp_filename, NULL);
 	exit(1);
     }
     wait(0);
--- xgraphics.c
+++ xgraphics.c
@@ -265,7 +265,7 @@
   XConfigureEvent *xce;
   XMotionEvent    *xme;
   XButtonEvent    *xbe;
-    checkX;
+    checkX();
 
   while(XCheckWindowEvent(dpy, win, EVENT_MASK, (XEvent *)&event))
 
@@ -307,14 +307,14 @@
 
     if (--count == 0) {
 	count = 300;
-	checkX;
+	checkX();
 	placate_x();
     }
 }
 
 int get_button()
 {
-  checkX;
+  checkX(-1);
 
   placate_x();
 
@@ -323,7 +323,7 @@
 
 int get_mouse_x()
 {
-  checkX;
+  checkX(-1);
 
   placate_x();
 
@@ -333,7 +333,7 @@
 
 int get_mouse_y()
 {
-  checkX;
+  checkX(-1);
 
   placate_x();
 
--- xgraphics.h
+++ xgraphics.h
@@ -22,15 +22,15 @@
 
 #define GR_SIZE         60000
 
-#define checkX { \
+#define checkX(ret) { \
     if (have_x < 0) real_window_init(); \
     if (!have_x) { \
 	err_logo(BAD_GRAPH_INIT,NIL); \
-	return; \
+	return ret; \
     } \
 }
 
-#define prepare_to_draw          {checkX; placate_x();}
+#define prepare_to_draw(ret)     {checkX(ret); placate_x();}
 #define done_drawing             XFlush(dpy)
 extern void placate_x();
 
++++++ ucblogo-5.5-ncurses.diff ++++++
--- configure
+++ configure
@@ -1416,13 +1416,13 @@
 
 fi
 if test $tcap = no; then
-   echo $ac_n "checking for -lcurses""... $ac_c" 1>&6
-ac_lib_var=`echo curses'_'tgetstr | tr './+\055' '__p_'`
+   echo $ac_n "checking for -lncurses""... $ac_c" 1>&6
+ac_lib_var=`echo ncurses'_'tgetstr | tr './+\055' '__p_'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-lcurses  $LIBS"
+LIBS="-lncurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 1422 "configure"
 #include "confdefs.h"
@@ -1452,7 +1452,7 @@
   cat >> confdefs.h <<\EOF
 #define HAVE_LIBCURSES 1
 EOF
- LIBS="$LIBS -lcurses" tcap=yes
+ LIBS="$LIBS -lncurses" tcap=yes
 else
   echo "$ac_t""no" 1>&6
 fi
++++++ ucblogo-5.4.tar.gz -> ucblogo-5.5.tar.gz ++++++
++++ 22849 lines of diff (skipped)

++++++ ucblogo.diff ++++++
--- /var/tmp/diff_new_pack.c22389/_old	2007-01-16 17:35:09.000000000 +0100
+++ /var/tmp/diff_new_pack.c22389/_new	2007-01-16 17:35:09.000000000 +0100
@@ -1,7 +1,6 @@
-diff -ru ucblogo-5.4~/docs/makefile ucblogo-5.4/docs/makefile
---- ucblogo-5.4~/docs/makefile	2004-11-30 16:57:46.000000000 +0100
-+++ ucblogo-5.4/docs/makefile	2005-04-01 18:24:06.000000000 +0200
-@@ -1,6 +1,6 @@
+--- ucblogo-5.5/docs/makefile
++++ ucblogo-5.5/docs/makefile
+@@ -1,9 +1,9 @@
  BUILDIR	      = `pwd`
 -INFODIR	      = $(prefix)/info
 -DOCSDIR	      = $(LIBLOC)/docs
@@ -9,7 +8,22 @@
 +DOCSDIR	      = /usr/share/doc/packages/ucblogo
  HTMLDIR	      = $(DOCSDIR)/html
  
- all: usermanual.ps usermanual.pdf html/usermanual_1.html ucblogo.info
+-all: usermanual.ps usermanual.pdf html/usermanual_1.html ucblogo.info
++all: usermanual.pdf html/usermanual_1.html ucblogo.info
+ 
+ ucblogo.info: usermanual.texi
+ 	makeinfo usermanual.texi
+@@ -17,8 +17,8 @@
+ usermanual.ps: usermanual.dvi
+ 	dvips -t letter -o usermanual.ps usermanual.dvi
+ 
+-usermanual.pdf: usermanual.ps usermanual.dvi
+-	ps2pdf usermanual.ps
++usermanual.pdf: usermanual.dvi
++#	ps2pdf usermanual.ps
+ 	dvipdf usermanual.dvi
+ 
+ html/usermanual_1.html: usermanual.texi
 @@ -30,10 +30,10 @@
  	-rm -f *.{aux,cp,cps,dvi,fn,ky,log,pg,toc,tp,vr}
  
@@ -24,13 +38,12 @@
 +	for d in $(INFODIR) $(DOCSDIR) $(HTMLDIR); do [ -d $(DESTDIR)/$$d ] || mkdir -p $(DESTDIR)/$$d || exit 1; done
 +	-cp -f *.info* $(DESTDIR)/$(INFODIR)/.
 +	-cp -f html/*.html $(DESTDIR)/$(HTMLDIR)/.
-+	-cp -f usermanual.ps $(DESTDIR)/$(DOCSDIR)/.
++#	-cp -f usermanual.ps $(DESTDIR)/$(DOCSDIR)/.
 +	-cp -f usermanual.pdf $(DESTDIR)/$(DOCSDIR)/.
-+	-cp -f usermanual.texi $(DESTDIR)/$(DOCSDIR)/.
++#	-cp -f usermanual.texi $(DESTDIR)/$(DOCSDIR)/.
 +	-cp -f ../usermanual $(DESTDIR)/$(DOCSDIR)/.
-diff -ru ucblogo-5.4~/makefile.in ucblogo-5.4/makefile.in
---- ucblogo-5.4~/makefile.in	2004-11-30 17:11:07.000000000 +0100
-+++ ucblogo-5.4/makefile.in	2005-04-01 18:18:55.000000000 +0200
+--- ucblogo-5.5/makefile.in
++++ ucblogo-5.5/makefile.in
 @@ -3,6 +3,7 @@
  LDFLAGS	= @LDFLAGS@
  LIBS  = @X_PRE_LIBS@ @X_LIBS@ @LIBS@ @X_EXTRA_LIBS@


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠Hilbert.suse.de

tags

participants (1)