Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics
In directory
sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv12330/stable/main/finkinfo/graphics
Modified Files:
xaos.info xaos.patch
Log Message:
new version, with build- and dep-fixes
Index: xaos.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/xaos.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- xaos.info 24 Mar 2009 07:04:31 -0000 1.5
+++ xaos.info 18 Oct 2010 03:08:21 -0000 1.6
@@ -1,17 +1,18 @@
Package: xaos
-Version: 3.0
-Revision: 1025
-Architecture: powerpc
-DescPackaging: Doesn't compile on intel
-Source: gnu
-Source-MD5: e0e66a873b6d5193a79bc89345992d6b
+Version: 3.2
+Revision: 1001
+Source: mirror:sourceforge:%n/XaoS-%v.tar.gz
+Source-MD5: a52ea623ca87fe1ea631b215d8d15214
PatchFile: %n.patch
-PatchFile-MD5: 46f294837d84a577fa71d84ed25a3bea
-Depends: libpng3-shlibs, slang-shlibs, x11, ncurses (>= 5.4-20041023-1006),
libncurses5-shlibs (>= 5.4-20041023-1006)
-BuildDepends: libpng3, slang, libncurses5 (>= 5.4-20041023-1006), x11-dev,
xmkmf (>= 1.0.2-3), fink (>= 0.24.12)
-UpdateConfigGuess: true
-ConfigureParams: --infodir='%p/share/info' --datadir='%p/share'
--mandir='%p/share/man' --bindir='%p/bin/' --with-pthread=yes
-SetCFLAGS: -I%p/include -DNO_MALLOC_H
+PatchFile-MD5: 133c0658d53877a8a72eeb029260b577
+PatchScript: <<
+ %{default_script}
+ perl -pi -e 's|(LOCALEDIR=).*|\1%p/share/locale|' configure
+<<
+Depends: libpng3-shlibs, slang-shlibs, x11, ncurses (>= 5.4-20041023-1006),
libncurses5-shlibs (>= 5.4-20041023-1006), libgettext3-shlibs, libiconv,
libggi2, libggi2-shlibs, libgii0, libgii0-shlibs
+BuildDepends: libpng3, slang, libncurses5 (>= 5.4-20041023-1006), x11-dev,
libgettext3-dev, gettext-tools, libiconv-dev, libggi2-dev, libgii0-dev, xmkmf
(>= 1.0.2-3), fink (>= 0.24.12)
+ConfigureParams: --infodir='%p/share/info' --datadir='%p/share'
--mandir='%p/share/man' --bindir='%p/bin/' --with-pthread=yes --with-ncurses=%p
+SetCFLAGS: -DNOASSEMBLY
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
CompileScript: <<
@@ -23,14 +24,13 @@
<<
InstallScript: <<
#!/bin/sh -ev
- export PATH=%p/lib/xmkmf/bin:$PATH
- export IMAKEINCLUDE=-I%p/lib/X11/config
-mv INSTALL foo
-mkdir -p %i/share/info
-make install DESTDIR=%d
+ make install DESTDIR=%d
+ mkdir -p %i/share/doc
+ mv %i/share/XaoS/doc %i/share/doc/%n
+ ln -s ../doc/%n %i/share/XaoS/doc
<<
InfoDocs: %n.info
-DocFiles: COPYING TODO doc/README doc/ANNOUNCE doc/PROBLEMS doc/SPONSORS
+DocFiles: COPYING ChangeLog* RELEASE_NOTES TODO doc/SPONSORS
doc/built-in_formulas.txt src/i18n/README:README.i18n
Description: Fractal explorer
DescDetail: <<
XaoS is a fast portable real-time interactive fractal zoomer. It
@@ -48,6 +48,40 @@
For those who are lazy to explore fractals manually an autopilot
function is provided.
<<
+DescUsage: <<
+ xaos is likely to crash if run remotely (X11 tunnelled over ssh)
+<<
+DescPackaging: <<
+ dmacks upgraded to v3.2, and made the following changes:
+
+ If CFLAGS is not defined, configure crashes during pthreads tests
+
+ Disable assembly because it doesn't compile:
+ i386.c: In function '_control87':
+ i386.c:31: error: PIC register 'bx' clobbered in 'asm'
+
+ Pass -L for -lggi test (needed to locate -lXext)
+
+ Patch Makefiles to give better diagnostics about where things are
+ being compiled and to abort immediately if something goes wrong
+
+ Actually use the gettext flags that configure declares
+
+ Patch sources to use actual locale dir as determined by configure
+
+ Force use system's MAX macro (10.3 vs 10.4 have different
+ (re)definition due to #include ordering otherwise)
+
+ Make sure xerror.h gets the #defines it needs
+
+ Avoid duplicate case when certain gii macros are the same
+
+ Remove const declaration from a variable to which we write
+
+ Merge package's own and fink's doc dirs into fink's and symlink 'em
+
+ EODMACKS
+<<
License: GPL
Maintainer: Ben Hines <[email protected]>
Homepage: http://www.gnu.org/software/xaos/xaos.html
Index: xaos.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/graphics/xaos.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xaos.patch 6 Feb 2006 18:14:28 -0000 1.1
+++ xaos.patch 18 Oct 2010 03:08:21 -0000 1.2
@@ -1,564 +1,269 @@
-diff -ruN xaos-3.0/src/engine/blur.c xaos-3.0-patched/src/engine/blur.c
---- xaos-3.0/src/engine/blur.c Wed Mar 4 13:49:12 1998
-+++ xaos-3.0-patched/src/engine/blur.c Thu May 30 14:04:40 2002
-@@ -1,5 +1,7 @@
- #ifndef _plan9_
-+#ifndef NO_MALLOC_H
- #include <malloc.h>
-+#endif
- #include <string.h>
- #include <math.h>
- #include <config.h>
-diff -ruN xaos-3.0/src/engine/btrace.c xaos-3.0-patched/src/engine/btrace.c
---- xaos-3.0/src/engine/btrace.c Wed Mar 4 13:49:12 1998
-+++ xaos-3.0-patched/src/engine/btrace.c Thu May 30 14:04:40 2002
-@@ -1,5 +1,7 @@
- #ifndef _plan9_
-+#ifndef NO_MALLOC_H
- #include <malloc.h>
-+#endif
- #include <math.h>
- #include <stdio.h>
- #include <string.h>
-diff -ruN xaos-3.0/src/engine/dither.c xaos-3.0-patched/src/engine/dither.c
---- xaos-3.0/src/engine/dither.c Wed Mar 4 13:49:12 1998
-+++ xaos-3.0-patched/src/engine/dither.c Thu May 30 14:04:40 2002
-@@ -14,7 +14,9 @@
- * fixedcolor displays.
- */
- #ifndef _plan9_
-+#ifndef NO_MALLOC_H
- #include <malloc.h>
-+#endif
- #include <config.h>
- #include <stdio.h>
- #include <string.h>
-diff -ruN xaos-3.0/src/engine/edge.c xaos-3.0-patched/src/engine/edge.c
---- xaos-3.0/src/engine/edge.c Wed Mar 4 13:49:12 1998
-+++ xaos-3.0-patched/src/engine/edge.c Thu May 30 14:04:40 2002
-@@ -3,7 +3,9 @@
- * does an simple edge detection algo on it.
- */
- #ifndef _plan9_
-+#ifndef NO_MALLOC_H
- #include <malloc.h>
-+#endif
- #include <stdio.h> /*for NULL */
- #else
- #include <u.h>
-diff -ruN xaos-3.0/src/engine/edge2.c xaos-3.0-patched/src/engine/edge2.c
---- xaos-3.0/src/engine/edge2.c Wed Mar 4 13:49:12 1998
-+++ xaos-3.0-patched/src/engine/edge2.c Thu May 30 14:04:40 2002
-@@ -3,7 +3,9 @@
- * does an simple edge detection algo on it.
- */
- #ifndef _plan9_
-+#ifndef NO_MALLOC_H
- #include <malloc.h>
-+#endif
- #include <stdio.h> /*for NULL */
- #else
- #include <u.h>
-diff -ruN xaos-3.0/src/engine/emboss.c xaos-3.0-patched/src/engine/emboss.c
---- xaos-3.0/src/engine/emboss.c Wed Mar 4 13:49:12 1998
-+++ xaos-3.0-patched/src/engine/emboss.c Thu May 30 14:26:19 2002
-@@ -1,5 +1,9 @@
- #ifndef _plan9_
-+#ifdef NO_MALLOC_H
-+#include <stdlib.h>
-+#else
- #include <malloc.h>
-+#endif
- #include <stdio.h>
- #else
- #include <u.h>
-@@ -100,7 +104,7 @@
- getinstance (struct filteraction *a)
- {
- struct filter *f = createfilter (a);
-- struct embossdata *i = calloc (sizeof (*i), 1);
-+ struct embossdata *i = calloc (1, sizeof (*i));
- i->savedpalette = NULL;
- i->palette = createpalette (0, 256, GRAYSCALE, 0, 256, NULL, NULL, NULL,
NULL);
- f->childimage = NULL;
-diff -ruN xaos-3.0/src/engine/fractal.c xaos-3.0-patched/src/engine/fractal.c
---- xaos-3.0/src/engine/fractal.c Wed Mar 4 13:49:12 1998
-+++ xaos-3.0-patched/src/engine/fractal.c Thu May 30 14:04:40 2002
-@@ -27,7 +27,9 @@
- #else
- #include <stdio.h>
- #ifndef _MAC
-+#ifndef NO_MALLOC_H
+diff -Nurd -x'*~' XaoS-3.2.orig/Makefile.in XaoS-3.2/Makefile.in
+--- XaoS-3.2.orig/Makefile.in 2005-02-11 04:37:47.000000000 -0500
++++ XaoS-3.2/Makefile.in 2006-04-26 21:24:38.000000000 -0400
+@@ -10,15 +10,13 @@
+
+ @SET_MAKE@
+
+-default clean realclean echo help depend xaos:
+- @cd src ; $(MAKE) $@
+-
+-all:
+- @cd src ; $(MAKE) all
++default clean realclean echo help depend xaos all:
++ $(MAKE) -C src $@
++ @echo "done in $@"
+
+ distclean:
+ #...@$(MAKE) -C src $@
+- @$(MAKE) -C src distclean
++ $(MAKE) -C src distclean
+ rm -f libtool config.cache config.status config.log
src/include/config.h src/include/aconfig.h
+ rm -f src/Makefile.common src/arch/linux/Makefile.main
+ rm -f `find . -name Makefile`
+@@ -36,6 +34,7 @@
+ @INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/help
+ @INSTALL@ -d $(DESTDIR)$(bindir)
+ @INSTALL@ -d $(DESTDIR)$(mandir)/man6
++ @INSTALL@ -d $(DESTDIR)$(infodir)
+ @INSTALL@ -s bin/xaos $(DESTDIR)$(bindir)
+ @INSTALL@ -m 444 tutorial/*.x[ah]f $(DESTDIR)$(datadir)/XaoS/tutorial
+
+diff -Nurd -x'*~' XaoS-3.2.orig/configure XaoS-3.2/configure
+--- XaoS-3.2.orig/configure 2006-01-22 17:48:38.000000000 -0500
++++ XaoS-3.2/configure 2006-04-26 22:45:05.000000000 -0400
+@@ -18892,7 +18892,7 @@
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lggi $LIBS $LIBS"
++LIBS="-lggi -L/usr/X11R6/lib $LIBS $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+diff -Nurd -x'*~' XaoS-3.2.orig/src/Makefile.in XaoS-3.2/src/Makefile.in
+--- XaoS-3.2.orig/src/Makefile.in 2003-02-10 17:42:28.000000000 -0500
++++ XaoS-3.2/src/Makefile.in 2006-04-26 20:36:51.000000000 -0400
+@@ -1,6 +1,6 @@
+ CC = @CC@
+ CFLAGS = @CFLAGS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ @INTLLIBS@
+ LFLAGS = @LDFLAGS@
+ AR = @AR@
+ RANLIB = @RANLIB@
+@@ -31,7 +31,7 @@
+ mkdir $@
+
+ libs:
+- @for name in $(DIRS) ; do sh -c "cd $$name ; $(MAKE) all"; done
++ @for name in $(DIRS) ; do echo "$(MAKE) -C $$name all"; $(MAKE) -C
$$name all || exit 1; echo "done in $$name"; done
+
+ $(PROG): @BINPATH@ @LIBPATH@ include/config.h libs
+ $(CC) $(CFLAGS) $(LFLAGS) -o $@ $(TLIBS) $(LIBS)
+diff -Nurd -x'*~' XaoS-3.2.orig/src/engine/3d.c XaoS-3.2/src/engine/3d.c
+--- XaoS-3.2.orig/src/engine/3d.c 2003-02-03 11:16:33.000000000 -0500
++++ XaoS-3.2/src/engine/3d.c 2006-04-26 17:46:36.000000000 -0400
+@@ -3,6 +3,7 @@
+ #ifndef NO_MALLOC_H
#include <malloc.h>
-+#endif
#endif
- #include <aconfig.h>
- #include <string.h>
-diff -ruN xaos-3.0/src/engine/interlace.c
xaos-3.0-patched/src/engine/interlace.c
---- xaos-3.0/src/engine/interlace.c Wed Mar 4 13:49:12 1998
-+++ xaos-3.0-patched/src/engine/interlace.c Thu May 30 14:24:58 2002
-@@ -1,5 +1,9 @@
- #ifndef _plan9_
-+#ifdef NO_MALLOC_H
+#include <stdlib.h>
-+#else
- #include <malloc.h>
-+#endif
#include <stdio.h> /*for NULL */
- #include <string.h> /*for memcpy */
+ #include <math.h>
#else
-@@ -59,7 +63,7 @@
- getinstance (struct filteraction *a)
+@@ -117,7 +118,7 @@
+ getinstance (CONST struct filteraction *a)
{
struct filter *f = createfilter (a);
-- struct intdata *i = calloc (sizeof (*i), 1);
-+ struct intdata *i = calloc (1, sizeof (*i));
- f->data = i;
- f->name = "Interlace filter";
+- struct threeddata *d = calloc (sizeof (*d), 1);
++ struct threeddata *d = calloc (1, sizeof (*d));
+ f->data = d;
+ f->name = "3d";
return (f);
-diff -ruN xaos-3.0/src/engine/itersmall.c
xaos-3.0-patched/src/engine/itersmall.c
---- xaos-3.0/src/engine/itersmall.c Wed Mar 4 13:49:12 1998
-+++ xaos-3.0-patched/src/engine/itersmall.c Thu May 30 14:04:40 2002
-@@ -1,5 +1,7 @@
- #ifndef _plan9_
-+#ifndef NO_MALLOC_H
- #include <malloc.h>
-+#endif
- #include <config.h>
- #ifdef HAVE_ALLOCA_H
- #include <alloca.h>
-diff -ruN xaos-3.0/src/engine/julia.c xaos-3.0-patched/src/engine/julia.c
---- xaos-3.0/src/engine/julia.c Wed Mar 4 13:49:12 1998
-+++ xaos-3.0-patched/src/engine/julia.c Thu May 30 14:04:40 2002
-@@ -5,7 +5,9 @@
- #else
- #include <math.h>
- #include <string.h>
-+#ifndef NO_MALLOC_H
+diff -Nurd -x'*~' XaoS-3.2.orig/src/engine/btrace.c
XaoS-3.2/src/engine/btrace.c
+--- XaoS-3.2.orig/src/engine/btrace.c 2004-11-24 02:11:43.000000000 -0500
++++ XaoS-3.2/src/engine/btrace.c 2006-04-26 17:47:02.000000000 -0400
+@@ -3,6 +3,7 @@
+ #ifndef NO_MALLOC_H
#include <malloc.h>
-+#endif
- #include <stdio.h>
- #include <stdlib.h>
#endif
-diff -ruN xaos-3.0/src/engine/palettef.c xaos-3.0-patched/src/engine/palettef.c
---- xaos-3.0/src/engine/palettef.c Wed Mar 4 13:49:12 1998
-+++ xaos-3.0-patched/src/engine/palettef.c Thu May 30 14:24:38 2002
-@@ -1,5 +1,9 @@
- #ifndef _plan9_
-+#ifdef NO_MALLOC_H
+#include <stdlib.h>
-+#else
- #include <malloc.h>
-+#endif
- #include <stdio.h>
- #else
- #include <u.h>
-@@ -90,7 +94,7 @@
- getinstance (struct filteraction *a)
- {
- struct filter *f = createfilter (a);
-- struct palettedata *i = calloc (sizeof (*i), 1);
-+ struct palettedata *i = calloc (1, sizeof (*i));
- i->active = 0;
- i->palette = createpalette (0, 256, C256, 0, 256, NULL, mysetcolor, NULL,
NULL);
- f->childimage = NULL;
-diff -ruN xaos-3.0/src/engine/rotate.c xaos-3.0-patched/src/engine/rotate.c
---- xaos-3.0/src/engine/rotate.c Wed Mar 4 13:49:12 1998
-+++ xaos-3.0-patched/src/engine/rotate.c Thu May 30 14:24:49 2002
-@@ -9,7 +9,11 @@
- #include <limits.h>
- #include <archaccel.h>
#include <math.h>
-+#ifdef NO_MALLOC_H
+ #include <stdio.h>
+ #include <string.h>
+diff -Nurd -x'*~' XaoS-3.2.orig/src/engine/fractal.c
XaoS-3.2/src/engine/fractal.c
+--- XaoS-3.2.orig/src/engine/fractal.c 2003-02-03 11:16:37.000000000 -0500
++++ XaoS-3.2/src/engine/fractal.c 2006-04-26 17:44:54.000000000 -0400
+@@ -65,6 +65,7 @@
+ #define M_PI 3.1415
+ #endif
+ #include <xerror.h>
+#include <stdlib.h>
-+#else
- #include <malloc.h>
+
+ struct symetryinfo2 cursymetry;
+ struct palette cpalette;
+diff -Nurd -x'*~' XaoS-3.2.orig/src/include/gccaccel.h
XaoS-3.2/src/include/gccaccel.h
+--- XaoS-3.2.orig/src/include/gccaccel.h 2002-10-02 07:30:21.000000000
-0400
++++ XaoS-3.2/src/include/gccaccel.h 2006-04-26 22:56:52.000000000 -0400
+@@ -36,3 +36,6 @@
+ #ifndef myfabs
+ #define myfabs(x) ((x)>0?(x):-(x))
+ #endif
++#ifndef CONST
++#define CONST const
+#endif
- #else
- #include <u.h>
- #include <libc.h>
-@@ -74,7 +78,7 @@
- getinstance (struct filteraction *a)
+diff -Nurd -x'*~' XaoS-3.2.orig/src/include/xerror.h
XaoS-3.2/src/include/xerror.h
+--- XaoS-3.2.orig/src/include/xerror.h 2002-09-25 11:52:09.000000000 -0400
++++ XaoS-3.2/src/include/xerror.h 2006-04-26 22:58:23.000000000 -0400
+@@ -4,6 +4,9 @@
+ extern "C"
{
- struct filter *f = createfilter (a);
-- struct rotatedata *i = calloc (sizeof (*i), 1);
-+ struct rotatedata *i = calloc (1, sizeof (*i));
- f->name = "Rotation filter";
- f->data = i;
- return (f);
-diff -ruN xaos-3.0/src/engine/star.c xaos-3.0-patched/src/engine/star.c
---- xaos-3.0/src/engine/star.c Wed Mar 4 13:49:12 1998
-+++ xaos-3.0-patched/src/engine/star.c Thu May 30 14:04:40 2002
-@@ -1,5 +1,7 @@
- #ifndef _plan9_
-+#ifndef NO_MALLOC_H
- #include <malloc.h>
-+#endif
- #include <config.h>
- #include <limits.h>
- #ifdef HAVE_ALLOCA_H
-diff -ruN xaos-3.0/src/engine/stereogram.c
xaos-3.0-patched/src/engine/stereogram.c
---- xaos-3.0/src/engine/stereogram.c Wed Mar 4 13:49:12 1998
-+++ xaos-3.0-patched/src/engine/stereogram.c Thu May 30 14:04:41 2002
-@@ -1,5 +1,7 @@
- #ifndef _plan9_
-+#ifndef NO_MALLOC_H
- #include <malloc.h>
+ #endif
++
++#include "gccaccel.h"
++
+ void x_message (CONST char *text, ...);
+ void x_error (CONST char *text, ...);
+ void x_fatalerror (CONST char *text, ...) NORETURN;
+diff -Nurd -x'*~' XaoS-3.2.orig/src/ui/Makefile.in XaoS-3.2/src/ui/Makefile.in
+--- XaoS-3.2.orig/src/ui/Makefile.in 2001-02-06 08:00:40.000000000 -0500
++++ XaoS-3.2/src/ui/Makefile.in 2006-04-26 21:45:18.000000000 -0400
+@@ -1,5 +1,5 @@
+ CC = @CC@
+-CFLAGS = @CFLAGS@
++CFLAGS = @CFLAGS@ -DLOCALEDIR=\"@locale...@\"
+ LIBS = @LIBS@ -lm
+ LFLAGS = @LDFLAGS@
+ AR = @AR@
+diff -Nurd -x'*~' XaoS-3.2.orig/src/ui/ui-drv/dga/ui_dga.c
XaoS-3.2/src/ui/ui-drv/dga/ui_dga.c
+--- XaoS-3.2.orig/src/ui/ui-drv/dga/ui_dga.c 2002-09-25 11:52:09.000000000
-0400
++++ XaoS-3.2/src/ui/ui-drv/dga/ui_dga.c 2006-04-26 17:26:31.000000000
-0400
+@@ -601,7 +601,7 @@
+ XCloseDisplay (display);
+ return 0;
+ }
+- names = calloc (sizeof (*names), xf86ctx.modecount + 1);
++ names = calloc (xf86ctx.modecount + 1, sizeof (*names));
+ for (i = 0; i < xf86ctx.modecount; i++)
+ {
+ char c[256];
+diff -Nurd -x'*~' XaoS-3.2.orig/src/ui/ui-drv/ggi/ui_ggi.c
XaoS-3.2/src/ui/ui-drv/ggi/ui_ggi.c
+--- XaoS-3.2.orig/src/ui/ui-drv/ggi/ui_ggi.c 2002-09-25 11:52:09.000000000
-0400
++++ XaoS-3.2/src/ui/ui-drv/ggi/ui_ggi.c 2006-04-26 23:05:52.000000000
-0400
+@@ -333,8 +333,10 @@
+ case GIIK_Delete:
+ #endif
+ #ifdef GIIUC_Delete
++#if GIIUC_Delete != GIIK_Delete
+ case GIIUC_Delete:
+ #endif
+#endif
- #include <config.h>
- #ifdef HAVE_ALLOCA_H
- #include <alloca.h>
-diff -ruN xaos-3.0/src/engine/subwindow.c
xaos-3.0-patched/src/engine/subwindow.c
---- xaos-3.0/src/engine/subwindow.c Wed Mar 4 13:49:12 1998
-+++ xaos-3.0-patched/src/engine/subwindow.c Thu May 30 14:25:13 2002
-@@ -1,5 +1,9 @@
- #ifndef _plan9_
-+#ifdef NO_MALLOC_H
-+#include <stdlib.h>
-+#else
+ case GIIUC_BackSpace:
+ ui_key (UIKEY_BACKSPACE);
+ break;
+@@ -397,7 +399,7 @@
+ "32",
+ NULL
+ };
+-static CONST menudialog uih_resizedialog[] = {
++static menudialog uih_resizedialog[] = {
+ DIALOGINT ("X:", 0),
+ DIALOGINT ("Y:", 0),
+ DIALOGCHOICE ("Depth", names, 0),
+diff -Nurd -x'*~' XaoS-3.2.orig/src/ui/ui-drv/x11/xlib.c
XaoS-3.2/src/ui/ui-drv/x11/xlib.c
+--- XaoS-3.2.orig/src/ui/ui-drv/x11/xlib.c 2004-11-24 02:11:49.000000000
-0500
++++ XaoS-3.2/src/ui/ui-drv/x11/xlib.c 2006-04-26 22:17:17.000000000 -0400
+@@ -31,6 +31,7 @@
+ #ifndef NO_MALLOC_H
#include <malloc.h>
-+#endif
- #include <stdio.h> /*for NULL */
- #include <string.h> /*for memcpy */
+ #endif
++#include <sys/param.h>
+ #include "xlib.h"
+ #ifdef AMIGA
+ #define XFlush(x) while(0)
+@@ -286,7 +287,6 @@
+ XDestroyImage (d->image[1]);
+ }
+
+-#define MAX(x,y) ((x)>(y)?(x):(y))
+
+
+ xdisplay *
+@@ -302,7 +302,7 @@
+ XWMHints *hints;
+ char **faked_argv;
+
+- new = (xdisplay *) calloc (sizeof (xdisplay), 1);
++ new = (xdisplay *) calloc (1, sizeof (xdisplay));
+ chkalloc (new);
+ new->display = XOpenDisplay (params->display);
+ if (!new->display)
+diff -Nurd -x'*~' XaoS-3.2.orig/src/ui/ui.c XaoS-3.2/src/ui/ui.c
+--- XaoS-3.2.orig/src/ui/ui.c 2004-11-24 02:11:46.000000000 -0500
++++ XaoS-3.2/src/ui/ui.c 2006-04-26 21:46:57.000000000 -0400
+@@ -1201,7 +1201,7 @@
+ )
+ #endif
#else
-@@ -111,7 +115,7 @@
- getinstance (struct filteraction *a)
- {
- struct filter *f = createfilter (a);
-- struct subdata *s = calloc (sizeof (*s), 1);
-+ struct subdata *s = calloc (1, sizeof (*s));
- f->name = "Subwindow";
- f->data = s;
- s->second = NULL;
-diff -ruN xaos-3.0/src/engine/zoom.c xaos-3.0-patched/src/engine/zoom.c
---- xaos-3.0/src/engine/zoom.c Wed Mar 4 13:49:12 1998
-+++ xaos-3.0-patched/src/engine/zoom.c Thu May 30 14:04:41 2002
-@@ -28,7 +28,9 @@
- #include <stdlib.h>
- #include <stdio.h>
- #ifndef _MAC
-+#ifndef NO_MALLOC_H
- #include <malloc.h>
-+#endif
+- "/usr/share/locale")
++ LOCALEDIR)
+ #ifdef DEBUG
+ )
#endif
- #ifdef __EMX__
- #include <float.h>
-diff -ruN xaos-3.0/src/filter/filter.c xaos-3.0-patched/src/filter/filter.c
---- xaos-3.0/src/filter/filter.c Wed Mar 4 13:49:12 1998
-+++ xaos-3.0-patched/src/filter/filter.c Thu May 30 14:23:14 2002
-@@ -1,5 +1,9 @@
- #ifndef _plan9_
-+#ifdef NO_MALLOC_H
-+#include <stdlib.h>
-+#else
+diff -Nurd -x'*~' XaoS-3.2.orig/src/ui-hlp/save.c XaoS-3.2/src/ui-hlp/save.c
+--- XaoS-3.2.orig/src/ui-hlp/save.c 2004-11-24 02:11:50.000000000 -0500
++++ XaoS-3.2/src/ui-hlp/save.c 2006-04-26 17:48:43.000000000 -0400
+@@ -6,6 +6,7 @@
+ #ifndef NO_MALLOC_H
#include <malloc.h>
-+#endif
- #else
- #include <u.h>
- #include <libc.h>
-@@ -10,7 +14,7 @@
- struct queue *
- create_queue (struct filter *f)
- {
-- struct queue *q = calloc (sizeof (struct queue), 1);
-+ struct queue *q = calloc (1, sizeof (struct queue));
- q->first = q->last = f;
- f->queue = q;
- f->next = f->previous = NULL;
-diff -ruN xaos-3.0/src/filter/image.c xaos-3.0-patched/src/filter/image.c
---- xaos-3.0/src/filter/image.c Wed Mar 4 13:49:12 1998
-+++ xaos-3.0-patched/src/filter/image.c Thu May 30 14:25:43 2002
-@@ -1,8 +1,12 @@
- #ifndef _plan9_
--#include <malloc.h>
- #include <string.h>
- #include <fconfig.h>
- #include <assert.h>
-+#ifdef NO_MALLOC_H
+ #endif
+#include <stdlib.h>
-+#else
-+#include <malloc.h>
-+#endif
#else
#include <u.h>
#include <libc.h>
-@@ -55,7 +59,7 @@
+diff -Nurd -x'*~' XaoS-3.2.orig/src/ui-hlp/ui_helper.c
XaoS-3.2/src/ui-hlp/ui_helper.c
+--- XaoS-3.2.orig/src/ui-hlp/ui_helper.c 2003-02-03 11:16:44.000000000
-0500
++++ XaoS-3.2/src/ui-hlp/ui_helper.c 2006-04-26 17:26:56.000000000 -0400
+@@ -2193,7 +2193,7 @@
+ void (*upd) (struct uih_context *, CONST char *))
{
- int i;
- static int version = 1;
-- struct image *img = calloc (sizeof (*img), 1);
-+ struct image *img = calloc (1, sizeof (*img));
- if (img == NULL)
- return NULL;
- if (flip == NULL)
-diff -ruN xaos-3.0/src/filter/palette.c xaos-3.0-patched/src/filter/palette.c
---- xaos-3.0/src/filter/palette.c Wed Mar 4 13:49:12 1998
-+++ xaos-3.0-patched/src/filter/palette.c Thu May 30 14:04:41 2002
-@@ -10,7 +10,9 @@
- #include <config.h>
- #include <assert.h>
- #include <stdio.h>
-+#ifndef NO_MALLOC_H
+ uih_context *uih;
+- uih = (uih_context *) calloc (sizeof (*uih), 1); /*setup parameters */
++ uih = (uih_context *) calloc (1, sizeof (*uih)); /*setup parameters */
+ uih->updatemenus = upd;
+ uih->autopilot = 0;
+ uih->flags = flags;
+diff -Nurd -x'*~' XaoS-3.2.orig/src/util/catalog.c XaoS-3.2/src/util/catalog.c
+--- XaoS-3.2.orig/src/util/catalog.c 2003-02-03 11:16:46.000000000 -0500
++++ XaoS-3.2/src/util/catalog.c 2006-04-26 17:49:06.000000000 -0400
+@@ -4,6 +4,7 @@
+ #ifndef NO_MALLOC_H
#include <malloc.h>
-+#endif
- #include <limits.h>
#endif
- #include <fconfig.h>
-diff -ruN xaos-3.0/src/ui/play.c xaos-3.0-patched/src/ui/play.c
---- xaos-3.0/src/ui/play.c Wed Mar 4 13:49:12 1998
-+++ xaos-3.0-patched/src/ui/play.c Thu May 30 14:26:27 2002
-@@ -1,6 +1,10 @@
- #ifndef _plan9_
- #include <limits.h>
-+#ifdef NO_MALLOC_H
+#include <stdlib.h>
-+#else
- #include <malloc.h>
-+#endif
#include <string.h>
#else
#include <u.h>
-diff -ruN xaos-3.0/src/ui/save.c xaos-3.0-patched/src/ui/save.c
---- xaos-3.0/src/ui/save.c Wed Mar 4 13:49:12 1998
-+++ xaos-3.0-patched/src/ui/save.c Thu May 30 14:04:42 2002
-@@ -2,7 +2,9 @@
- #include <limits.h>
- #include <string.h>
- #include <errno.h>
-+#ifndef NO_MALLOC_H
- #include <malloc.h>
-+#endif
- #else
- #include <u.h>
- #include <libc.h>
-diff -ruN xaos-3.0/src/ui/ui-drv/curses/mktable.c
xaos-3.0-patched/src/ui/ui-drv/curses/mktable.c
---- xaos-3.0/src/ui/ui-drv/curses/mktable.c Wed Mar 4 13:49:12 1998
-+++ xaos-3.0-patched/src/ui/ui-drv/curses/mktable.c Thu May 30 14:04:43 2002
-@@ -23,7 +23,9 @@
- #include <stdio.h>
- #include <ctype.h>
- #include <stdlib.h>
-+#ifndef NO_MALLOC_H
- #include <malloc.h>
-+#endif
- #include "mktable.h"
- #include <config.h>
- #ifdef CURSES_DRIVER
-diff -ruN xaos-3.0/src/ui/ui-drv/curses/ui_curses.c
xaos-3.0-patched/src/ui/ui-drv/curses/ui_curses.c
---- xaos-3.0/src/ui/ui-drv/curses/ui_curses.c Wed Mar 4 13:49:12 1998
-+++ xaos-3.0-patched/src/ui/ui-drv/curses/ui_curses.c Thu May 30 14:04:43 2002
-@@ -23,7 +23,9 @@
- #ifdef CURSES_DRIVER
- #include <stdio.h>
- #include <stdlib.h>
-+#ifndef NO_MALLOC_H
- #include <malloc.h>
-+#endif
+diff -Nurd -x'*~' XaoS-3.2.orig/src/util/thread.c XaoS-3.2/src/util/thread.c
+--- XaoS-3.2.orig/src/util/thread.c 2004-11-24 02:11:51.000000000 -0500
++++ XaoS-3.2/src/util/thread.c 2006-04-26 17:49:34.000000000 -0400
+@@ -1,6 +1,7 @@
+ #ifndef _plan9_
#include <signal.h>
- #include <sys/stat.h>
- #include <unistd.h>
-diff -ruN xaos-3.0/src/ui/ui-drv/x11/xlib.c
xaos-3.0-patched/src/ui/ui-drv/x11/xlib.c
---- xaos-3.0/src/ui/ui-drv/x11/xlib.c Wed Mar 4 13:49:12 1998
-+++ xaos-3.0-patched/src/ui/ui-drv/x11/xlib.c Thu May 30 14:04:44 2002
-@@ -26,7 +26,9 @@
#include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#ifndef NO_MALLOC_H
- #include <malloc.h>
-+#endif
- #include "xlib.h"
- #ifdef AMIGA
- #define XFlush(x) while(0)
-diff -ruN xaos-3.0/src/ui/ui_helper.c xaos-3.0-patched/src/ui/ui_helper.c
---- xaos-3.0/src/ui/ui_helper.c Wed Mar 4 13:49:12 1998
-+++ xaos-3.0-patched/src/ui/ui_helper.c Thu May 30 14:04:44 2002
-@@ -1,5 +1,7 @@
- #ifndef _plan9_
-+#ifndef NO_MALLOC_H
- #include <malloc.h>
-+#endif
- #include <ctype.h>
- #include <stdlib.h>
- #include <limits.h>
-diff -ruN xaos-3.0/src/util/catalog.c xaos-3.0-patched/src/util/catalog.c
---- xaos-3.0/src/util/catalog.c Wed Mar 4 13:49:12 1998
-+++ xaos-3.0-patched/src/util/catalog.c Thu May 30 14:04:44 2002
-@@ -1,6 +1,8 @@
- #ifndef _plan9_
- #include <string.h>
-+#ifndef NO_MALLOC_H
- #include <malloc.h>
-+#endif
- #include <string.h>
- #else
- #include <u.h>
-diff -ruN xaos-3.0/src/util/png.c xaos-3.0-patched/src/util/png.c
---- xaos-3.0/src/util/png.c Wed Mar 4 13:49:12 1998
-+++ xaos-3.0-patched/src/util/png.c Thu May 30 14:04:44 2002
-@@ -5,7 +5,9 @@
++#include <stdlib.h>
#endif
- #include <stdlib.h>
- #include <stdio.h>
-+#ifndef NO_MALLOC_H
- #include <malloc.h>
-+#endif
- #include <errno.h>
- #else
- #include <u.h>
-diff -ruN xaos-3.0/src/util/timers.c xaos-3.0-patched/src/util/timers.c
---- xaos-3.0/src/util/timers.c Wed Mar 4 13:49:12 1998
-+++ xaos-3.0-patched/src/util/timers.c Thu May 30 14:04:44 2002
-@@ -27,11 +27,15 @@
- #include <libc.h>
- #else
- #include <aconfig.h>
-+#ifndef NO_MALLOC_H
+ #include <xthread.h>
+ #ifndef __BEOS__
+diff -Nurd -x'*~' XaoS-3.2.orig/src/util/timers.c XaoS-3.2/src/util/timers.c
+--- XaoS-3.2.orig/src/util/timers.c 2004-11-24 02:11:51.000000000 -0500
++++ XaoS-3.2/src/util/timers.c 2006-04-26 17:50:08.000000000 -0400
+@@ -49,6 +49,7 @@
+ #ifndef NO_MALLOC_H
#include <malloc.h>
-+#endif
+ #endif
++#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
#ifndef _MAC
-+#ifndef NO_MALLOC_H
- #include <malloc.h>
-+#endif
- #endif
- #ifdef __BEOS__
- #include <OS.h>
-diff -ruN xaos-3.0/src/util/xstdio.c xaos-3.0-patched/src/util/xstdio.c
---- xaos-3.0/src/util/xstdio.c Wed Mar 4 13:49:12 1998
-+++ xaos-3.0-patched/src/util/xstdio.c Thu May 30 13:55:42 2002
-@@ -1,6 +1,6 @@
- #ifndef _plan9_
- #include <string.h>
--#ifdef __EMX__
-+#if defined(__EMX__) || defined(__APPLE__)
- #include <sys/types.h>
- #endif
- #include <dirent.h>
---- xaos-3.0/Makefile.in.orig 2003-01-28 16:11:43.000000000 -0800
-+++ xaos-3.0/Makefile.in 2003-01-28 16:12:19.000000000 -0800
-@@ -28,20 +28,20 @@
- rm -vf `find . -size 0`
-
- install:
-- @INSTALL@ -d $(datadir)/XaoS
-- @INSTALL@ -d $(datadir)/XaoS/tutorial
-- @INSTALL@ -d $(datadir)/XaoS/examples
-- @INSTALL@ -d $(datadir)/XaoS/catalogs
-- @INSTALL@ -d $(datadir)/XaoS/doc
-- @INSTALL@ -d $(bindir)
-- @INSTALL@ -d $(mandir)/man6
-- @INSTALL@ -s bin/xaos $(bindir)
-- @INSTALL@ -m 444 tutorial/*.x[ah]f $(datadir)/XaoS/tutorial
-- @INSTALL@ -m 444 examples/* $(datadir)/XaoS/examples
-- @INSTALL@ -m 444 catalogs/* $(datadir)/XaoS/catalogs
-- @INSTALL@ -m 444 doc/README doc/README.bugs doc/compilers.txt
doc/ANNOUNCE doc/PROBLEMS doc/tutorial.txt $(datadir)/XaoS/doc
-- @INSTALL@ -m 444 doc/xaos.6 $(mandir)/man6
-+ @INSTALL@ -d $(DESTDIR)$(datadir)/XaoS
-+ @INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/tutorial
-+ @INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/examples
-+ @INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/catalogs
-+ @INSTALL@ -d $(DESTDIR)$(datadir)/XaoS/doc
-+ @INSTALL@ -d $(DESTDIR)$(bindir)
-+ @INSTALL@ -d $(DESTDIR)$(mandir)/man6
-+ @INSTALL@ -s bin/xaos $(DESTDIR)$(bindir)
-+ @INSTALL@ -m 444 tutorial/*.x[ah]f $(DESTDIR)$(datadir)/XaoS/tutorial
-+ @INSTALL@ -m 444 examples/* $(DESTDIR)$(datadir)/XaoS/examples
-+ @INSTALL@ -m 444 catalogs/* $(DESTDIR)$(datadir)/XaoS/catalogs
-+ @INSTALL@ -m 444 doc/README doc/README.bugs doc/compilers.txt
doc/ANNOUNCE doc/PROBLEMS doc/tutorial.txt $(DESTDIR)$(datadir)/XaoS/doc
-+ @INSTALL@ -m 444 doc/xaos.6 $(DESTDIR)$(mandir)/man6
- @STICKY@
-- @INSTALL@ -m 444 doc/xaos.info $(infodir)
-+ @INSTALL@ -m 444 doc/xaos.info $(DESTDIR)$(infodir)
- #install-info doc/xaos.info
-
-diff -ur xaos-3.0.bak/src/include/fractal.h xaos-3.0/src/include/fractal.h
---- xaos-3.0.bak/src/include/fractal.h 1998-03-04 13:49:12.000000000 -0800
-+++ xaos-3.0/src/include/fractal.h 2005-06-13 17:04:46.000000000 -0700
-@@ -24,7 +24,6 @@
-
- #include "config.h"
- #include "fconfig.h"
--#include "formulas.h"
- #define INCOLORING 11
- #define OUTCOLORING 11
- #define TCOLOR 11
-@@ -41,44 +40,50 @@
- int nsymetries;
- symetry *symetry;
- };
--typedef struct
-- {
-- number_t mc, nc;
-- number_t mi, ni;
-- }
--vrect;
-+
-+typedef int (*iterationfunc) (number_t, number_t, number_t, number_t)
-+CONSTF REGISTERS (3);
-+
- typedef struct
- {
- number_t cr, ci;
- number_t rr, ri;
- }
- vinfo;
--typedef int (*iterationfunc) (number_t, number_t, number_t, number_t)
--CONSTF REGISTERS (3);
-+
-+struct formula
-+ {
-+ int magic;
-+#ifndef SLOWFUNCPTR
-+ iterationfunc calculate, calculate_periodicity, smooth_calculate,
-+ smooth_calculate_periodicity;
-+#endif
-+ void (*calculate_julia) (struct image * img, register number_t pre,
register number_t pim, int maxiter);
-+ char *name[2];
-+ char *shortname;
-+ vinfo v;
-+ int hasperiodicity;
-+ int mandelbrot;
-+ number_t pre, pim;
-+ struct symetryinfo out[OUTCOLORING + 1];
-+ struct symetryinfo in[INCOLORING + 1];
-+ int flags;
-+ };
-+
-+#include "formulas.h"
-+
-+typedef struct
-+ {
-+ number_t mc, nc;
-+ number_t mi, ni;
-+ }
-+vrect;
-
- struct fractal_context
- {
- number_t pre, pim;
- number_t bre, bim;
-- struct formula
-- {
-- int magic;
--#ifndef SLOWFUNCPTR
-- iterationfunc calculate, calculate_periodicity, smooth_calculate,
-- smooth_calculate_periodicity;
--#endif
-- void (*calculate_julia) (struct image * img, register number_t pre,
register number_t pim, int maxiter);
-- char *name[2];
-- char *shortname;
-- vinfo v;
-- int hasperiodicity;
-- int mandelbrot;
-- number_t pre, pim;
-- struct symetryinfo out[OUTCOLORING + 1];
-- struct symetryinfo in[INCOLORING + 1];
-- int flags;
-- }
-- *currentformula;
-+ struct formula *currentformula;
- number_t angle;
- int periodicity;
- unsigned int maxiter;
------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
