Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32193/10.4/unstable/main/finkinfo/graphics
Modified Files: xrmap.info xrmap.patch Log Message: Probable gcc4 fix? Index: xrmap.patch =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/xrmap.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- xrmap.patch 20 Jan 2006 20:26:46 -0000 1.1 +++ xrmap.patch 3 Mar 2006 16:37:05 -0000 1.2 @@ -193,3 +193,71 @@ mkdir -p $(SHAREDIR) cp -f rc.example $(SHAREDIR)/rc.common cp -f README $(SHAREDIR) +diff -Nurd -x'*~' xrmap-2.33.orig/xrmap.c xrmap-2.33/xrmap.c +--- xrmap-2.33.orig/xrmap.c 2005-11-06 16:59:40.000000000 -0500 ++++ xrmap-2.33/xrmap.c 2005-12-27 23:02:08.000000000 -0500 +@@ -5742,21 +5742,21 @@ + return 1; + } + +-void arcinfo_lines(ImageLayout *scene) { +- void *fd; +- char buf[512]; +- char sep; +- char *ptr; +- char **seg; +- double a, b, c, d; +- int i, j, k, u, n, p, i0; +- int new_arc=0, ind, indpr, num_mod = -1, nstrokes, xi, yi; +- SpherePt sp; +- ScreenPt pt1, pt2; +- Pixel pix; +- double cotan_lat0, conv_lat0; ++/* fink patches here to un-nest next_segment from arcinfo_lines */ ++ static void *fd; ++ static char buf[512]; ++ static char sep; ++ static char *ptr; ++ static char **seg; ++ static double a, b, c, d; ++ static int i, j, k, u, n, p, i0; ++ static int new_arc=0, ind, indpr, num_mod = -1, nstrokes, xi, yi; ++ static SpherePt sp; ++ static ScreenPt pt1, pt2; ++ static Pixel pix; ++ static double cotan_lat0, conv_lat0; + +-void next_segment(double x, double y) ++void next_segment(double x, double y, ImageLayout *scene) + { + double u, v, w, t; + int i, j, dx, dy, dxp, dyp, epsx, epsy; +@@ -5849,6 +5849,10 @@ + } + } + ++void arcinfo_lines(ImageLayout *scene) ++{ ++ new_arc=0; ++ + if (!arc_file) return; + + i0 = -1; +@@ -5972,14 +5976,14 @@ + ptr[28] = '\0'; + n = sscanf(ptr, "%lg %lg", &a, &b); + if (n<2) continue; +- next_segment(a, b); ++ next_segment(a, b, &scene); + ptr[28] = sep; + p = sscanf(ptr+28, "%lg %lg", &c, &d); +- if (p>=2) next_segment(c, d); ++ if (p>=2) next_segment(c, d, &scene); + } else { + n = sscanf(ptr, "%lg %lg", &a, &b); + if (n<2) continue; +- next_segment(a, b); ++ next_segment(a, b, &scene); + } + } + #ifdef ZLIB Index: xrmap.info =================================================================== RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics/xrmap.info,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- xrmap.info 20 Jan 2006 20:26:46 -0000 1.1 +++ xrmap.info 3 Mar 2006 16:37:05 -0000 1.2 @@ -1,7 +1,6 @@ Package: xrmap Version: 2.33 -Revision: 1 -Architecture: powerpc +Revision: 2 Source: ftp://ftp.ac-grenoble.fr/ge/geosciences/%n/%n-%v.tar.bz2 Source-MD5: c743f0c90699227d5bdba4984e3edf77 Source2: ftp://ftp.ac-grenoble.fr/ge/geosciences/%n/data/CIA_WDB2.jpd.bz2 @@ -14,7 +13,7 @@ Suggests: qtplay, libjpeg, libpng3, inkscape, dillo, gv Patch: %n.patch SetCPPFLAGS: -I/usr/X11R6/include -SetCC: gcc-3.3 +SetCC: gcc-3.3 -Wall PatchScript: << mv INSTALL installfoo perl -pi.bak -e 's| INSTALL LI| installfoo LI|g' Makefile.noimake @@ -53,7 +52,8 @@ Ptch around symbol conflicts vs libncurses (why isn't termcap.c just using them instead of re-implementing?) - xrmap.c has nested functions...need to fix this for gcc4 + Major patch of xrmap.c to un-nest some functions. Thanks msachs for + validating this approach for gcc4. << License: GPL Maintainer: Ben Hines <[EMAIL PROTECTED]> ------------------------------------------------------- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/fink-commits