[Debian-astro-commits] [ftools-fv] 03/03: Adjust patches for new version
Ole Streicher
olebole at moszumanska.debian.org
Mon Aug 31 08:17:39 UTC 2015
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch debian
in repository ftools-fv.
commit 5b57e07e826062a266f90cfe2285b4b32248e2b5
Author: Ole Streicher <olebole at debian.org>
Date: Mon Aug 31 10:10:03 2015 +0200
Adjust patches for new version
---
debian/changelog | 6 +
debian/patches/clang_FTBFS_Wreturn-type.patch | 24 -
debian/patches/fv_fix_initial_menubar.patch | 16 +-
debian/patches/fv_fix_sample.patch | 9 -
debian/patches/fvtmp.patch | 2 +-
debian/patches/pow_create_package.patch | 6 +-
debian/patches/pow_fix_compilerwarnings.patch | 628 +-------------------------
debian/patches/pow_fix_startup.patch | 10 +-
debian/patches/pow_tcl8.6.patch | 545 ----------------------
debian/patches/pow_update_photo.patch | 72 ---
debian/patches/series | 4 -
11 files changed, 21 insertions(+), 1301 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e2bdd49..4bae34b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ftools-fv (5.4+dfsg-1) unstable; urgency=low
+
+ * New upstream version
+
+ -- Ole Streicher <olebole at debian.org> Mon, 31 Aug 2015 10:11:56 +0200
+
ftools-fv (5.3+dfsg-7) unstable; urgency=low
* Change default temp location to /tmp
diff --git a/debian/patches/clang_FTBFS_Wreturn-type.patch b/debian/patches/clang_FTBFS_Wreturn-type.patch
deleted file mode 100644
index e7146f3..0000000
--- a/debian/patches/clang_FTBFS_Wreturn-type.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: fix FTBFS with clang instead of gcc
-Author: Nicolas Sévelin-Radiguet <nicosr at free.fr>
-Last-Update: 2014-04-05
-
---- a/tcltk/pow/PowUtils.c
-+++ b/tcltk/pow/PowUtils.c
-@@ -664,7 +664,7 @@
- sprintf (errormsg, "Couldn't construct WCS information: %s", WCSpih_Message[status]);
- Tcl_SetResult(interp, errormsg ,TCL_VOLATILE);
- Tcl_SetVar(interp,"powWCSTranslation", WCSpih_Message[status] ,TCL_GLOBAL_ONLY);
-- return;
-+ return -1;
- }
-
- listObj = Tcl_NewObj();
-@@ -791,7 +791,7 @@
- sprintf (errormsg, "Couldn't construct WCS information: %s", WCSpih_Message[status]);
- Tcl_SetResult(interp, errormsg ,TCL_VOLATILE);
- Tcl_SetVar(interp,"powWCSTranslation", WCSpih_Message[status] ,TCL_GLOBAL_ONLY);
-- return;
-+ return -1;
- }
-
- listObj = Tcl_NewObj();
diff --git a/debian/patches/fv_fix_initial_menubar.patch b/debian/patches/fv_fix_initial_menubar.patch
index 9203ba0..e8af746 100644
--- a/debian/patches/fv_fix_initial_menubar.patch
+++ b/debian/patches/fv_fix_initial_menubar.patch
@@ -27,14 +27,14 @@ Bug: http://sourceforge.net/tracker/?func=detail&aid=3561016&group_id=12997&atid
--- a/ftools/guis/fv/class/fvApp.tcl
+++ b/ftools/guis/fv/class/fvApp.tcl
-@@ -412,8 +412,8 @@
- font create g_titleFont -family system -size -12
- font create g_notebookTitleFont -family system -size -14
+@@ -419,8 +419,8 @@
+ font create g_titleFont -family system -size -$fvPref::FontSize
+ font create g_notebookTitleFont -family system -size -[expr $fvPref::FontSize + 2]
} else {
-- font create g_titleFont -family Helvetica -size -12 -weight bold
-- font create g_notebookTitleFont -family Helvetica -size -14 -weight bold
-+ font create g_titleFont -family Helvetica -size -12
-+ font create g_notebookTitleFont -family Helvetica -size -14
+- font create g_titleFont -family Helvetica -size -$fvPref::FontSize -weight bold
+- font create g_notebookTitleFont -family Helvetica -size -[expr $fvPref::FontSize + 2] -weight bold
++ font create g_titleFont -family Helvetica -size -$fvPref::FontSize
++ font create g_notebookTitleFont -family Helvetica -size -[expr $fvPref::FontSize + 2]
}
- font create g_entryFont -family Courier -size -12
+ font create g_entryFont -family Courier -size -$fvPref::FontSize
diff --git a/debian/patches/fv_fix_sample.patch b/debian/patches/fv_fix_sample.patch
deleted file mode 100644
index 91466d8..0000000
--- a/debian/patches/fv_fix_sample.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: insert the shell name on the top of the sample script
---- a/ftools/guis/fv/scripts/XPAScript.csh
-+++ b/ftools/guis/fv/scripts/XPAScript.csh
-@@ -1,3 +1,4 @@
-+#!/bin/csh
- ########################################################################
- #
- # Sample C-Shell script for fv 2.6
diff --git a/debian/patches/fvtmp.patch b/debian/patches/fvtmp.patch
index 6d460f1..a98ce6b 100644
--- a/debian/patches/fvtmp.patch
+++ b/debian/patches/fvtmp.patch
@@ -5,7 +5,7 @@ Description: Change default temp location to /tmp
FVTMP behaviour intact.
--- a/ftools/guis/fv/class/fvApp.tcl
+++ b/ftools/guis/fv/class/fvApp.tcl
-@@ -438,37 +438,45 @@
+@@ -445,37 +445,45 @@
if { $isWin } {
set fvBackupDir "fv_tmp"
set fvHOME FV_HOME
diff --git a/debian/patches/pow_create_package.patch b/debian/patches/pow_create_package.patch
index 211a42c..88d847c 100644
--- a/debian/patches/pow_create_package.patch
+++ b/debian/patches/pow_create_package.patch
@@ -15,7 +15,7 @@ Description: Create and "package require" the POW package.
--- a/tcltk/pow/PowInit.c
+++ b/tcltk/pow/PowInit.c
-@@ -111,6 +111,8 @@
+@@ -108,6 +108,8 @@
return TCL_ERROR;
}
@@ -24,7 +24,7 @@ Description: Create and "package require" the POW package.
#if defined(MAC_TCL) && defined(PLUGIN)
-@@ -130,12 +132,9 @@
+@@ -127,12 +129,9 @@
charptr = Tcl_GetVar2(interp,"env", "POW_LIBRARY", TCL_GLOBAL_ONLY);
if( charptr == NULL ) {
@@ -39,7 +39,7 @@ Description: Create and "package require" the POW package.
/* Brackets needed around %s to prevent Windows-style paths */
/* ... eg, c:\fv... from getting converted to control chars */
-@@ -219,6 +218,9 @@
+@@ -216,6 +215,9 @@
Pow_CreateCommands(interp);
Tk_CreateItemType(&tkPowCurveType);
diff --git a/debian/patches/pow_fix_compilerwarnings.patch b/debian/patches/pow_fix_compilerwarnings.patch
index 80bf27d..e39d406 100644
--- a/debian/patches/pow_fix_compilerwarnings.patch
+++ b/debian/patches/pow_fix_compilerwarnings.patch
@@ -6,636 +6,12 @@ Description: Fix many compiler warnings. Most of them are because of
if it does not apply cleanly.
--- a/tcltk/pow/PowCanvCurve.c
+++ b/tcltk/pow/PowCanvCurve.c
-@@ -283,7 +283,7 @@
+@@ -280,7 +280,7 @@
PowCurveItem *powCurvePtr = (PowCurveItem *) itemPtr;
double *pCoordPtr, *lCoordPtr;
/*From the old PowProcessCurve command */
- char **bboxptr;
+ const char **bboxptr;
double x0 , x1, y0, y1;
- double rx0_curr, ry0_curr, rx1_curr, ry1_curr;
double rx0 , rx1, ry0, ry1, ry, rx;
-@@ -298,7 +298,7 @@
-
- int len;
- char *idxStr;
-- char *graphType;
-+ const char *graphType;
- int zoomed;
- int xCount, yCount;
- int coordSel;
-@@ -397,7 +397,7 @@
- tagstring = Tk_CanvasTagsPrintProc((ClientData) NULL,
- Tk_CanvasTkwin(canvas),
- (char *)itemPtr,
-- (int) NULL,
-+ 0,
- &freeProcPtr);
-
-
-@@ -1198,7 +1198,7 @@
- XColor *color;
-
- tkwin = Tk_CanvasTkwin(canvas);
-- if (Tk_ConfigureWidget(interp, tkwin, configSpecs, objc, (char**)objv,
-+ if (Tk_ConfigureWidget(interp, tkwin, configSpecs, objc, (const char**)objv,
- (char *) powCurvePtr, flags|TK_CONFIG_OBJS) != TCL_OK) {
- return TCL_ERROR;
- }
-@@ -1752,7 +1752,7 @@
- {
- PowCurveItem *powCurvePtr = (PowCurveItem *) itemPtr;
- int length, argc, i;
-- char **argv = (char **) NULL;
-+ const char **argv = (const char **) NULL;
- double *new, *coordPtr;
- Tk_State state = itemPtr->state;
-
---- a/tcltk/pow/PowCommands.c
-+++ b/tcltk/pow/PowCommands.c
-@@ -180,8 +180,8 @@
- int PowProcessCurve(ClientData clientData, Tcl_Interp *interp,
- int argc, char *argv[]) {
- /* calculate the list of points for powPlotCurve */
-- char **bboxptr;
-- char **rbboxptr;
-+ const char **bboxptr;
-+ const char **rbboxptr;
- double x0 , x1, y0, y1;
- double rx0 , rx1, ry0, ry1, ry, rx;
- double t_rx0 , t_rx1, t_ry0, t_ry1; /* to avoid point lossage due to roundoff
-@@ -327,9 +327,9 @@
- q1 = (int)(y + 3);
- q2 = (int)(y - 3);
- q3 = (int)(y);
-- sprintf(PlotCommand," %ld %ld %ld %ld ",p2,q3,p1,q3);
-+ sprintf(PlotCommand," %d %d %d %d ",p2,q3,p1,q3);
- Tcl_VarEval(interp,argv[9]," create line ",PlotCommand,"-tags {",argv[7],"} ", (char *) NULL);
-- sprintf(PlotCommand," %ld %ld %ld %ld ",p3,q2,p3,q1);
-+ sprintf(PlotCommand," %d %d %d %d ",p3,q2,p3,q1);
- Tcl_VarEval(interp,argv[9]," create line ",PlotCommand,"-tags {",argv[7],"} ", (char *) NULL);
- }
- if (dflag && lflag) {
-@@ -384,9 +384,9 @@
- q1 = (int)(y + ye);
- q2 = (int)(y - ye);
- q3 = (int)(y);
-- sprintf(PlotCommand," %ld %ld %ld %ld ",p2,q3,p1,q3);
-+ sprintf(PlotCommand," %d %d %d %d ",p2,q3,p1,q3);
- Tcl_VarEval(interp,argv[9]," create line ",PlotCommand,"-tags {",argv[7],"} ", (char *) NULL);
-- sprintf(PlotCommand," %ld %ld %ld %ld ",p3,q2,p3,q1);
-+ sprintf(PlotCommand," %d %d %d %d ",p3,q2,p3,q1);
- Tcl_VarEval(interp,argv[9]," create line ",PlotCommand,"-tags {",argv[7],"} ", (char *) NULL);
- /*update every 100 points */
- if (i - lasti > 100) {
-@@ -863,12 +863,12 @@
- int copy;
- char *direction;
- char *graphName;
-- char *canvas;
-+ const char *canvas;
- double x, y;
- Point bbox_ll, bbox_ur;
- int i, j;
- char cmdLine[1024];
-- char **list;
-+ const char **list;
-
- #if !(defined(__WIN32__) || defined(macintosh))
- char data_name[256];
-@@ -1987,7 +1987,7 @@
- int argc, char *argv[]) {
- /* usage: powCreateDataFromList data_name list_o_data*/
- int largc;
-- char **largv, **counter;
-+ const char **largv, **counter;
- double *data, *datacounter;
- int i,j;
- int status = 0;
-@@ -2126,7 +2126,7 @@
- char *graphName;
- int len;
- char *idxStr;
-- char *graphType;
-+ const char *graphType;
- int zoomed;
- int xCount, yCount;
- int graph_is_scope;
-@@ -2257,7 +2257,7 @@
- char *graphName;
- int len;
- char *idxStr;
-- char *graphType;
-+ const char *graphType;
- int zoomed;
- int xCount, yCount;
- int graph_is_scope;
-@@ -2373,7 +2373,7 @@
- char *canvas=".pow.pow";
- char *graphName, *operation, *direction;
- int wcsStatus;
-- char *WCSstring;
-+ const char *WCSstring;
- char powWCS[7]="powWCS";
- char curveName[512];
- struct wcsprm wcs;
-@@ -2865,7 +2865,7 @@
- char *sign;
- char *regionFile;
- double *dataPar;
-- char **argvPtr;
-+ const char **argvPtr;
-
- int i, numPars;
- int plen;
---- a/tcltk/pow/PowCreateCurve.c
-+++ b/tcltk/pow/PowCreateCurve.c
-@@ -12,7 +12,7 @@
- int new = 0, wcsStatus;
- char *str_ptr;
- int length = 0;
-- char *WCSstring;
-+ const char *WCSstring;
- char powWCS[7]="powWCS";
-
- entry_ptr = Tcl_CreateHashEntry(&PowCurveTable, curve_name, &new);
---- a/tcltk/pow/PowCreateGraph.c
-+++ b/tcltk/pow/PowCreateGraph.c
-@@ -42,9 +42,9 @@
- int len;
- int zoomed;
- char *idxStr;
-- char *graphType;
-+ const char *graphType;
- int xCount, yCount;
-- char *WCSvalue;
-+ const char *WCSvalue;
- char errormsg[512];
-
- #if !(defined(__WIN32__) || defined(macintosh))
---- a/tcltk/pow/PowCreateImage.c
-+++ b/tcltk/pow/PowCreateImage.c
-@@ -1,8 +1,8 @@
- #include "pow.h"
-
--void PowCreateImage(char *image_name,char *data_name, int *xoffset,
-+void PowCreateImage(char *image_name, char *data_name, int *xoffset,
- int *yoffset, int *width, int *height, double *xorigin,
-- double *xinc, double *yorigin, double *yinc,char *xunits,
-+ double *xinc, double *yorigin, double *yinc, char *xunits,
- char *yunits, char *zunits, int *status) {
- /* xinc or yinc == 0 will mean count by integers */
- PowImage *image_instance;
-@@ -25,7 +25,7 @@
- char smax[30];
- double datum;
- int i, wcsStatus;
-- char *WCSstring;
-+ const char *WCSstring;
- char powWCS[7]="powWCS";
-
- Tcl_GetInt(interp,Tcl_GetVar(interp,"powPseudoImages",TCL_GLOBAL_ONLY),
---- a/tcltk/pow/PowEventHandlers.c
-+++ b/tcltk/pow/PowEventHandlers.c
-@@ -169,7 +169,7 @@
- * exists a partial command, so use
- * the secondary prompt. */
- {
-- char *promptCmd;
-+ const char *promptCmd;
- int code;
-
- promptCmd = Tcl_GetVar(interp,
---- a/tcltk/pow/PowGrid.c
-+++ b/tcltk/pow/PowGrid.c
-@@ -39,20 +39,20 @@
-
- int PowDrawGridLines( ClientData clientData, Tcl_Interp *interp,
- int argc, char *argv[] );
--int CreateGridPts( PowGraph *graph, int zoomed, char *graphType, int xCount, int yCount,
-+int CreateGridPts( PowGraph *graph, int zoomed, const char *graphType, int xCount, int yCount,
- Point BotLeft_real, Point BotLeft, Point TopRgt, GridPt **rtnGrid );
- int GetTicks( int nGrid, GridPt Grid[], int useWCS, char *tickScal[2],
- int numTicks[2], double **ticks, char **axis );
- int GetTics( double a1, double a2, int nlabel, int maxlabels,
- char *tickScal, double *list );
- int PtBtwnPts( Point pt, Point pt1, Point pt2, char fixed );
--Point CalcXY( PowGraph *graph, Point pt, GridPt *G, int zoomed, char *graphType, int xCount, int yCount );
-+Point CalcXY( PowGraph *graph, Point pt, GridPt *G, int zoomed, const char *graphType, int xCount, int yCount );
- Point SolveXY( double Val, char axis, GridPt *G);
--void CalcCoeff( PowGraph *graph, GridPt *G1, GridPt *G2, GridPt *G3, int zoomed, char *graphType, int xCount, int yCount );
-+void CalcCoeff( PowGraph *graph, GridPt *G1, GridPt *G2, GridPt *G3, int zoomed, const char *graphType, int xCount, int yCount );
- void changeListOrder(double *list, int n);
-
- int CanvToGraph( PowGraph *graph, Point Pt0, Point pt, Point *Pt, SideVal sd );
--int GraphToCanv( PowGraph *graph, int zoomed, char *graphType, int xCount, int yCount,
-+int GraphToCanv( PowGraph *graph, int zoomed, const char *graphType, int xCount, int yCount,
- Point Pt0, Point Pt, Point Pt0_real, Point *pt );
-
- /*****************************************************************/
-@@ -60,7 +60,8 @@
- int PowDrawGridLines(ClientData clientData, Tcl_Interp *interp,
- int argc, char *argv[])
- {
-- char *gn, *canvas, *color, *dash, **list;
-+ char *gn, *canvas, *color, *dash;
-+ const char **list;
- char *tickScal[2];
- int useWCS, doGrid;
- Point bbox_ll, bbox_ur, BotLft_real, IntSects[16], GridSegs[100];
-@@ -77,7 +78,7 @@
- double tmp;
- int len;
- char *idxStr;
-- char *graphType;
-+ const char *graphType;
- int zoomed;
- int xCount, yCount;
-
-@@ -397,7 +398,7 @@
- &((Grid).imgPt), sd); \
- } \
-
--int CreateGridPts(PowGraph *graph, int zoomed, char *graphType, int xCount, int yCount,
-+int CreateGridPts(PowGraph *graph, int zoomed, const char *graphType, int xCount, int yCount,
- Point BotLft_real, Point BotLft, Point TopRgt, GridPt **rtnGrid)
- {
- GridPt *Grid;
-@@ -894,7 +895,7 @@
- int errFlag;
- int len;
- char *idxStr;
-- char *graphType;
-+ const char *graphType;
- int zoomed;
- int xCount, yCount;
-
-@@ -938,7 +939,7 @@
- return(errFlag);
- }
-
--int GraphToCanv( PowGraph *graph, int zoomed, char *graphType, int xCount, int yCount,
-+int GraphToCanv( PowGraph *graph, int zoomed, const char *graphType, int xCount, int yCount,
- Point Pt0, Point Pt, Point Pt0_real, Point *pt )
- {
- int errFlag;
-@@ -997,7 +998,7 @@
- return 1;
- }
-
--Point CalcXY ( PowGraph *graph, Point pt, GridPt *G, int zoomed, char *graphType, int xCount, int yCount )
-+Point CalcXY ( PowGraph *graph, Point pt, GridPt *G, int zoomed, const char *graphType, int xCount, int yCount )
- {
-
- /* Chai: 07/19/2007: This function is no longer used. */
-@@ -1078,7 +1079,7 @@
- return XY;
- }
-
--void CalcCoeff( PowGraph *graph, GridPt *G1, GridPt *G2, GridPt *G3, int zoomed, char *graphType, int xCount, int yCount )
-+void CalcCoeff( PowGraph *graph, GridPt *G1, GridPt *G2, GridPt *G3, int zoomed, const char *graphType, int xCount, int yCount )
- {
- double dX,dY,ds;
- double dX2,dY2;
-@@ -1143,7 +1144,7 @@
- int i, j, xbnds, ybnds;
- long nelem, elem;
- PowImage *img;
-- char **list;
-+ const char **list;
- #if !(defined(__WIN32__) || defined(macintosh))
- void *data;
- #endif
---- a/tcltk/pow/PowInit.c
-+++ b/tcltk/pow/PowInit.c
-@@ -95,7 +95,7 @@
-
- int Pow_Init(Tcl_Interp *interp_instance) {
- Tcl_DString pow_env;
-- char *charptr;
-+ const char *charptr;
- char temp[1000];
- #if !(defined(__WIN32__) || defined(macintosh))
- Tcl_DString pow_script;
---- a/tcltk/pow/PowUtils.c
-+++ b/tcltk/pow/PowUtils.c
-@@ -17,7 +17,7 @@
-
- static int Pt_in_Poly( double x, double y, int nPts, double *Pts );
-
--int PowFindCurvesMinMax(char *curves, char *axis, double *min, double *max,
-+int PowFindCurvesMinMax(const char *curves, char *axis, double *min, double *max,
- int filter)
- /* Sets min and max to the minimum and maximum values found in the
- "axis" vector of each member of the list of curves. Initial values
-@@ -29,7 +29,7 @@
- PowVector *current_vector;
- PowData *current_data;
- int curve_index,curveArgc;
-- char **curveArgv;
-+ const char **curveArgv;
- double datum;
- int i;
-
-@@ -80,11 +80,11 @@
- PowCurve *current_curve;
- PowVector *Xvec, *Yvec;
- int curve_index,curveArgc;
-- char **curveArgv;
-+ const char **curveArgv;
- double xdatum, ydatum, xmin, xmax, ymin, ymax, tmp;
- double lxmin, lxmax, lymin, lymax;
- int i,j, logX, logY;
-- char *optVal;
-+ const char *optVal;
- #if !(defined(__WIN32__) || defined(macintosh))
- PowData *current_data;
- #endif
-@@ -201,7 +201,7 @@
- {
- PowImage *current_image;
- int image_index,imageArgc;
-- char **imageArgv;
-+ const char **imageArgv;
- double xorigin,xotherend,yorigin,yotherend,xcorner,ycorner;
-
- if(images == NULL || strstr(images,"NULL") != NULL) return TCL_OK;
-@@ -349,7 +349,7 @@
- double tmp;
- int len;
- char *idxStr;
-- char *graphType;
-+ const char *graphType;
- int zoomed;
- int xCount, yCount;
-
-@@ -398,7 +398,7 @@
- }
-
- PowCurve *
--PowFindCurve(char *curve_name) {
-+PowFindCurve(const char *curve_name) {
- Tcl_HashEntry *entry_ptr;
- PowCurve *curve_ptr;
-
-@@ -415,7 +415,7 @@
- }
-
- PowImage *
--PowFindImage(char *image_name) {
-+PowFindImage(const char *image_name) {
- Tcl_HashEntry *entry_ptr;
- PowImage *image_ptr;
-
-@@ -547,10 +547,10 @@
- }
-
-
--char *PowGetObjectOption(char *graph, char *obj, char *option, char *objType)
-+const char *PowGetObjectOption(char *graph, const char *obj, char *option, char *objType)
- {
- char *idxStr, gn[255];
-- char *res;
-+ const char *res;
- int len;
-
- len = strlen(graph);
-@@ -604,7 +604,7 @@
- char powFitsHeaderCnt[17]="powFitsHeaderCnt";
- int i, relax, HDRcnt, ctrl, nreject=0, nwcs=0;
- struct wcsprm *wcs;
-- char *HDRstring;
-+ const char *HDRstring;
-
- /* input */
- int ncoord, nelem;
-@@ -618,7 +618,7 @@
- int coordSel;
-
- int useWCSInfo;
-- char *str = NULL;
-+ const char *str = NULL;
-
- if ( WCS->graphName[0] != '\0' && strcmp(WCS->graphName, "NULL") != 0 ) {
- str = Tcl_GetVar2(interp,"useWCSInfo",WCS->graphName,TCL_GLOBAL_ONLY);
-@@ -733,7 +733,7 @@
- char powFitsHeaderCnt[17]="powFitsHeaderCnt";
- int i, relax, HDRcnt, ctrl, nreject=0, nwcs=0;
- struct wcsprm *wcs;
-- char *HDRstring;
-+ const char *HDRstring;
-
- /* input */
- int ncoord, nelem;
-@@ -747,7 +747,7 @@
- int coordSel;
-
- int useWCSInfo;
-- char *str = NULL;
-+ const char *str = NULL;
-
- if ( WCS->graphName[0] != '\0' && strcmp(WCS->graphName, "NULL") != 0 ) {
- str = Tcl_GetVar2(interp,"useWCSInfo",WCS->graphName,TCL_GLOBAL_ONLY);
---- a/tcltk/pow/PowWCS.c
-+++ b/tcltk/pow/PowWCS.c
-@@ -39,7 +39,7 @@
- char powFitsHeaderCnt[17]="powFitsHeaderCnt";
- int i, relax, HDRcnt, ctrl, nreject=0, nwcs=0;
- struct wcsprm *wcs;
-- char *HDRstring;
-+ const char *HDRstring;
- int status;
- int coordSel;
- Tcl_Obj *listObj;
-@@ -247,7 +247,7 @@
- fprintf(stdout, "WCS->cdFrwd[1] : <%20.15f,%20.15f>\n", WCS->cdFrwd[1][0], WCS->cdFrwd[1][1]);
- fprintf(stdout, "WCS->cdRvrs[0] : <%20.15f,%20.15f>\n", WCS->cdRvrs[0][0], WCS->cdRvrs[0][1]);
- fprintf(stdout, "WCS->cdRvrs[1] : <%20.15f,%20.15f>\n", WCS->cdRvrs[1][0], WCS->cdRvrs[1][1]);
-- fprintf(stdout, "WCS->rot : <%d>\n", WCS->rot);
-+ fprintf(stdout, "WCS->rot : <%20.15f>\n", WCS->rot);
- fprintf(stdout, "WCS->haveWCSinfo: <%d>\n", WCS->haveWCSinfo);
- fprintf(stdout, "**********************************\n");
- fflush(stdout);
-@@ -386,7 +386,7 @@
- FillinWCSStructure(&curve_ptr->WCS);
-
- if ( curve_ptr->WCS.type[0] == '\0' ) {
-- char *WCSstring;
-+ const char *WCSstring;
-
- WCSstring = Tcl_GetVar2(interp, "powWCS", curveName,TCL_GLOBAL_ONLY);
- /* Tcl_SetVar2(interp,"powWCS", curveName, "", TCL_GLOBAL_ONLY); */
-@@ -400,7 +400,7 @@
- PowCurve *current_curve;
- PowImage *current_image;
- int index,Argc;
-- char **Argv;
-+ const char **Argv;
- char *p;
-
- graph->WCS.type[0] = '\0';
---- a/tcltk/pow/Visu_Init.c
-+++ b/tcltk/pow/Visu_Init.c
-@@ -48,7 +48,7 @@
- #if !(defined(__WIN32__) || defined(macintosh))
- char *visu_env;
- char temp[1000];
-- char *libDir;
-+ const char *libDir;
- #endif
-
- #if !(defined(__WIN32__) || defined(macintosh))
---- a/tcltk/pow/pow.h
-+++ b/tcltk/pow/pow.h
-@@ -233,7 +233,7 @@
- int x, int y, int width, int height,
- double zoomX, double zoomY, double Xoff, double Yoff));
-
--int PowFindCurvesMinMax(char *, char *, double *, double *, int);
-+int PowFindCurvesMinMax(const char *, char *, double *, double *, int);
- int PowFindCurvesValue (char *, char *, int, double *);
- int PowFindCurvesBBox(char *, char *, double *, double *,
- double *, double *, WCSdata *);
-@@ -245,7 +245,7 @@
- int PowSortGraphMinMax(PowGraph *, double *, double *,double *, double *,
- double *, double *);
-
--char *PowGetObjectOption(char *gn, char *obj, char *option, char *objType);
-+const char *PowGetObjectOption(char *gn, const char *obj, char *option, char *objType);
-
- #ifdef __WIN32__
- __int64 PowExtractDatumLong(PowData *, int);
-@@ -255,9 +255,9 @@
-
- double PowExtractDatum(PowData *, int);
- int PowPutDatum(PowData *,double,int);
--PowCurve * PowFindCurve(char *);
-+PowCurve * PowFindCurve(const char *);
- PowVector * PowFindVector(char *);
--PowImage * PowFindImage(char *);
-+PowImage * PowFindImage(const char *);
- PowGraph * PowFindGraph(char *);
- PowData * PowFindData(char *);
- int PowIsInRegion( double* , double *, int , char *, int* );
---- a/tcltk/pow/Visu_tkImgPict.c
-+++ b/tcltk/pow/Visu_tkImgPict.c
-@@ -109,16 +109,16 @@
- */
-
- static int ImgPictCmd _ANSI_ARGS_((ClientData clientData,
-- Tcl_Interp *interp, int argc, char **argv));
-+ Tcl_Interp *interp, int argc, const char **argv));
- static int ParseSubcommandOptions _ANSI_ARGS_((
- struct SubcommandOptions *optPtr,
- Tcl_Interp *interp, int allowedOptions,
-- int *indexPtr, int argc, char **argv));
-+ int *indexPtr, int argc, const char **argv));
- static void ImgPictCmdDeletedProc _ANSI_ARGS_((
- ClientData clientData));
- static int ImgPictConfigureMaster _ANSI_ARGS_((
- Tcl_Interp *interp, PictMaster *masterPtr,
-- int argc, char **argv, int flags));
-+ int argc, const char **argv, int flags));
- static void ImgPictConfigureInstance _ANSI_ARGS_((
- PictInstance *instancePtr));
- static void ImgPictSetSize _ANSI_ARGS_((PictMaster *masterPtr,
-@@ -128,15 +128,15 @@
- static int ImgPictCopy(Tcl_Interp *interp,
- PictMaster *masterPtr,
- int argc,
-- char **argv);
-+ const char **argv);
- static int ImgPictSnap2Photo(Tcl_Interp *interp,
- PictMaster *masterPtr,
- int argc,
-- char **argv);
-+ const char **argv);
- static int ImgPictSnap2Pict(Tcl_Interp *interp,
- PictMaster *masterPtr,
- int argc,
-- char **argv);
-+ const char **argv);
- static int MatchFileFormat _ANSI_ARGS_((Tcl_Interp *interp,
- Tcl_Channel f, char *fileName, char *formatString,
- Tk_PictImageFormat **imageFormatPtr,
-@@ -295,7 +295,7 @@
- Tcl_HashEntry *entry;
- int isNew;
- int j, argc;
-- char **argv;
-+ const char **argv;
-
- #ifdef DEBUG
- printf("ImgPictCreate\n");
-@@ -303,7 +303,7 @@
-
- /* Convert Tcl_Objs to char * */
- argc = objc;
-- argv = (char **) ckalloc( argc * sizeof(char *) );
-+ argv = (const char **) ckalloc( argc * sizeof(char *) );
- for( j=0; j<objc; j++ ) {
- argv[j] = Tcl_GetStringFromObj( objv[j], NULL );
- }
-@@ -384,7 +384,7 @@
- ClientData clientData; /* Information about Pict master. */
- Tcl_Interp *interp; /* Current interpreter. */
- int argc; /* Number of arguments. */
-- char **argv; /* Argument strings. */
-+ const char **argv; /* Argument strings. */
- {
- PictMaster *masterPtr = (PictMaster *) clientData;
- int c, result;
-@@ -520,7 +520,7 @@
- int y_lut[MAX_CLUT_LEN];
- int i,j;
- int lut_size, nElem;
-- char **lutElem;
-+ const char **lutElem;
- int *p_lut;
-
- if( (instancePtr=masterPtr->instancePtr) == NULL )
-@@ -1322,7 +1322,7 @@
- * current index in argv; this variable is
- * updated by this procedure. */
- int argc; /* Number of arguments in argv[]. */
-- char **argv; /* Arguments to be parsed. */
-+ const char **argv; /* Arguments to be parsed. */
- {
- int index, c, bit, currentBit;
- size_t length;
-@@ -1544,7 +1544,7 @@
- PictMaster *masterPtr; /* Pointer to data structure describing
- * overall Pict image to (re)configure. */
- int argc; /* Number of entries in argv. */
-- char **argv; /* Pairs of configuration options for image. */
-+ const char **argv; /* Pairs of configuration options for image. */
- int flags; /* Flags to pass to Tk_ConfigureWidget,
- * such as TK_CONFIG_ARGV_ONLY. */
- {
-@@ -2341,7 +2341,7 @@
- static int ImgPictCopy(Tcl_Interp *interp,
- PictMaster *masterPtr,
- int argc,
-- char **argv)
-+ const char **argv)
- {
- int index;
- int width, height;
-@@ -2469,7 +2469,7 @@
- int ImgPictSnap2Photo(Tcl_Interp *interp,
- PictMaster *masterPtr,
- int argc,
-- char **argv)
-+ const char **argv)
- {
- void *destHandle;
- int i,j,col;
-@@ -2599,7 +2599,7 @@
- int ImgPictSnap2Pict(Tcl_Interp *interp,
- PictMaster *masterPtr,
- int argc,
-- char **argv)
-+ const char **argv)
- {
- PictMaster *destmasterPtr;
- Tk_PictHandle destHandle;
+ int n, xoff, yoff, xeoff, yeoff;
diff --git a/debian/patches/pow_fix_startup.patch b/debian/patches/pow_fix_startup.patch
index 686f08c..987e2b0 100644
--- a/debian/patches/pow_fix_startup.patch
+++ b/debian/patches/pow_fix_startup.patch
@@ -39,15 +39,7 @@ Description: Replace the startup script by something simpler, and set the
event delete <<BtnPress>> <ButtonPress-1> <ButtonPress-2> <ButtonPress-3>
event delete <<LUT>> <ButtonPress-1> <ButtonPress-2> <ButtonPress-3>
-@@ -5401,7 +5401,6 @@
- if [info exists powPlotParam(xdimdisp,$currgn)] {
- set powPlotParam(xdimdisp,powDef) $powPlotParam(xdimdisp,$currgn)
- set powPlotParam(ydimdisp,powDef) $powPlotParam(ydimdisp,$currgn)
-- set result [$fvPrefObj setNewGraphSize [list $powPlotParam(xdimdisp,$currgn) $powPlotParam(ydimdisp,$currgn)]]
- }
- puts $RCFILE "\n# Default Graph Parameters:"
- foreach opt $powPlotParam(allOpts,powDef) {
-@@ -9238,8 +9237,6 @@
+@@ -9251,8 +9251,6 @@
set powWCSName(${cntr}scope) $powWCSName($gn)
powCreateContour $cntr $img $list $res
set powContourParam(list) $list
diff --git a/debian/patches/pow_tcl8.6.patch b/debian/patches/pow_tcl8.6.patch
deleted file mode 100644
index 5c935f4..0000000
--- a/debian/patches/pow_tcl8.6.patch
+++ /dev/null
@@ -1,545 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Remove interp->result which is not available in Tcl >=8.6
---- a/tcltk/pow/PowColormap.c
-+++ b/tcltk/pow/PowColormap.c
-@@ -59,8 +59,9 @@
-
-
- if (argc > 5 || argc < 3 ) {
-- interp->result =
-- "usage: powSetupColormap toplevel_name free_cells ?force_cmap? ?options_list?";
-+ Tcl_SetResult(interp,
-+ "usage: powSetupColormap toplevel_name free_cells "
-+ "?force_cmap? ?options_list?", TCL_STATIC);
- return TCL_ERROR;
- }
-
-@@ -118,7 +119,7 @@
- Finding this out in Xlib is stupidly complicated, so we'll
- let Tk do it for us */
- Tcl_Eval(interp,"string match \"pseudocolor\" [winfo screenvisual .]");
-- if (interp->result != "1") {
-+ if (Tcl_GetStringResult(interp) != "1") {
- Tcl_SetVar(interp,"powPseudoImages","0",TCL_GLOBAL_ONLY);
- }
- return TCL_OK;
-@@ -269,8 +270,7 @@
- Bool tfGotColors; /* True if we got colors from X */
-
- if (argc != 2 ) {
-- interp->result =
-- "usage: powTestColormap window";
-+ Tcl_SetResult(interp, "usage: powTestColormap window", TCL_STATIC);
- return TCL_ERROR;
- }
-
-@@ -318,7 +318,9 @@
- }
- ckfree((void*)plane_masks); plane_masks = NULL;
- ckfree((void*)pixels); pixels = NULL;
-- sprintf(interp->result,"%i",ncolors);
-+ char ncolor_s[4];
-+ snprintf(ncolor_s, 3, "%i", ncolors);
-+ Tcl_SetResult(interp, ncolor_s, TCL_STATIC);
- return TCL_OK;
- #endif /* __WIN32__ || macintosh */
- }
-@@ -801,7 +803,8 @@
- double min, max;
-
- if (argc != 4) {
-- interp->result = "usage: powReditherPhotoBlock imageName min max";
-+ Tcl_SetResult(interp,
-+ "usage: powReditherPhotoBlock imageName min max", TCL_STATIC);
- return TCL_ERROR;
- }
-
---- a/tcltk/pow/PowCommands.c
-+++ b/tcltk/pow/PowCommands.c
-@@ -214,7 +214,7 @@
- y_error = NULL;
-
- if(argc < 10 ) {
-- interp->result = "usage: powProcessCurve curve bbox rbbox xinc yinc magstep tags <Line|Points> canvas";
-+ Tcl_SetResult(interp, "usage: powProcessCurve curve bbox rbbox xinc yinc magstep tags <Line|Points> canvas", TCL_STATIC);
- return TCL_ERROR;
- }
-
-@@ -235,7 +235,7 @@
-
- Tcl_SplitList(interp,argv[2],&n,&bboxptr);
- if(n != 4) {
-- interp->result = "bbox malformed";
-+ Tcl_SetResult(interp, "bbox malformed", TCL_STATIC);
- return TCL_ERROR;
- }
- /* (x0,y0) -- lower left */
-@@ -249,7 +249,7 @@
-
- Tcl_SplitList(interp,argv[3],&n,&rbboxptr);
- if(n != 4) {
-- interp->result = "rbbox malformed";
-+ Tcl_SetResult(interp, "rbbox malformed", TCL_STATIC);
- return TCL_ERROR;
- }
- /* (x0,y0) -- lower left */
-@@ -408,12 +408,12 @@
- int status = TCL_OK;
- PowGraph *graph_ptr;
- if(argc != 4) {
-- interp->result = "usage: powSetGraphMagstep graphname newxmagstep newymagstep";
-+ Tcl_SetResult(interp, "usage: powSetGraphMagstep graphname newxmagstep newymagstep", TCL_STATIC);
- return TCL_ERROR;
- }
- graph_ptr = PowFindGraph(argv[1]);
- if (graph_ptr == (PowGraph *) NULL) {
-- interp->result = "Couldn't find graph.";
-+ Tcl_SetResult(interp, "Couldn't find graph.", TCL_STATIC);
- return TCL_ERROR;
- }
- status = Tcl_GetDouble(interp,argv[2],&(graph_ptr->xmagstep));
-@@ -427,20 +427,23 @@
- int argc, char *argv[]) {
- PowImage *image_ptr;
- if(argc != 3) {
-- interp->result = "wrong # args";
-+ Tcl_SetResult(interp, "wrong # args", TCL_STATIC);
- return TCL_ERROR;
- }
- image_ptr = PowFindImage(argv[1]);
- if (image_ptr == (PowImage *) NULL) {
-- interp->result = "Couldn't find image.";
-+ Tcl_SetResult(interp, "Couldn't find image.", TCL_STATIC);
- return TCL_ERROR;
- }
-+ char s[256];
- switch (*argv[2]) {
-- case 'X': sprintf(interp->result,"%le", image_ptr->xorigin);
-+ case 'X': sprintf(s,"%le", image_ptr->xorigin);
-+ Tcl_SetResult(interp, s, TCL_VOLATILE);
- break;
-- case 'Y': sprintf(interp->result,"%le", image_ptr->yorigin);
-+ case 'Y': sprintf(s,"%le", image_ptr->yorigin);
-+ Tcl_SetResult(interp, s, TCL_VOLATILE);
- break;
-- default: interp->result = "No such image axis (must be X or Y)";
-+ default: Tcl_SetResult(interp, "No such image axis (must be X or Y)", TCL_STATIC);
- return TCL_ERROR;
- }
- return TCL_OK;
-@@ -451,20 +454,23 @@
- int argc, char *argv[]) {
- PowImage *image_ptr;
- if(argc != 3) {
-- interp->result = "wrong # args";
-+ Tcl_SetResult(interp, "wrong # args", TCL_STATIC);
- return TCL_ERROR;
- }
- image_ptr = PowFindImage(argv[1]);
- if (image_ptr == (PowImage *) NULL) {
-- interp->result = "Couldn't find image.";
-+ Tcl_SetResult(interp, "Couldn't find image.", TCL_STATIC);
- return TCL_ERROR;
- }
-+ char s[256];
- switch (*argv[2]) {
-- case 'X': sprintf(interp->result,"%le", image_ptr->xotherend);
-+ case 'X': sprintf(s,"%le", image_ptr->xotherend);
-+ Tcl_SetResult(interp, s, TCL_VOLATILE);
- break;
-- case 'Y': sprintf(interp->result,"%le", image_ptr->yotherend);
-+ case 'Y': sprintf(s,"%le", image_ptr->yotherend);
-+ Tcl_SetResult(interp, s, TCL_VOLATILE);
- break;
-- default: interp->result = "No such image axis (must be X or Y)";
-+ default: Tcl_SetResult(interp, "No such image axis (must be X or Y)", TCL_STATIC);
- return TCL_ERROR;
- }
- return TCL_OK;
-@@ -476,22 +482,22 @@
- int argc, char *argv[]) {
- PowImage *image_ptr;
- if(argc != 3) {
-- interp->result = "wrong # args";
-+ Tcl_SetResult(interp, "wrong # args", TCL_STATIC);
- return TCL_ERROR;
- }
- image_ptr = PowFindImage(argv[1]);
- if (image_ptr == (PowImage *) NULL) {
-- interp->result = "Couldn't find image.";
-+ Tcl_SetResult(interp, "Couldn't find image.", TCL_STATIC);
- return TCL_ERROR;
- }
- switch (*argv[2]) {
-- case 'X': sprintf(interp->result,"%s", image_ptr->xunits);
-+ case 'X': Tcl_SetResult(interp, image_ptr->xunits, TCL_VOLATILE);
- break;
-- case 'Y': sprintf(interp->result,"%s", image_ptr->yunits);
-+ case 'Y': Tcl_SetResult(interp, image_ptr->yunits, TCL_VOLATILE);
- break;
-- case 'Z': sprintf(interp->result,"%s", image_ptr->zunits);
-+ case 'Z': Tcl_SetResult(interp, image_ptr->zunits, TCL_VOLATILE);
- break;
-- default: interp->result = "No such image axis (must be X or Y or Z)";
-+ default: Tcl_SetResult(interp, "No such image axis (must be X or Y or Z)", TCL_STATIC);
- return TCL_ERROR;
- }
- return TCL_OK;
-@@ -629,7 +635,7 @@
-
-
- if (argc != 9) {
-- interp->result = "usage: powPutZoomedBlock imageName graphName x y width height zoomX zoomY\nYou probably shouldn't be seeing this.";
-+ Tcl_SetResult(interp, "usage: powPutZoomedBlock imageName graphName x y width height zoomX zoomY\nYou probably shouldn't be seeing this.", TCL_STATIC);
- return TCL_ERROR;
- }
-
-@@ -844,7 +850,7 @@
- PowCreateDataFlip(argv[1], direction, &height, &width, &status);
-
- if(status != 0) {
-- sprintf(interp->result,"Couldn't flip data.");
-+ Tcl_SetResult(interp, "Couldn't flip data.", TCL_STATIC);
- return TCL_ERROR;
- }
-
-@@ -891,7 +897,7 @@
- Tcl_SetResult(interp,"Couldn't get bounding box", TCL_VOLATILE);
- return TCL_ERROR;
- }
-- strncpy(cmdLine,interp->result,256);
-+ strncpy(cmdLine,Tcl_GetStringResult(interp),256);
- Tcl_SplitList(interp,cmdLine,&i,&list);
- Tcl_GetDouble(interp,list[0],&(bbox_ll.x));
- Tcl_GetDouble(interp,list[1],&(bbox_ur.y));
-@@ -905,7 +911,7 @@
- PowCreateCurveFlip(graphName, direction, &status);
-
- if(status != 0) {
-- sprintf(interp->result,"Couldn't flip Curve data.");
-+ Tcl_SetResult(interp, "Couldn't flip Curve data.", TCL_STATIC);
- return TCL_ERROR;
- }
-
-@@ -951,7 +957,7 @@
-
- Tcl_GetInt(interp,argv[4],&length);
- if (sscanf(argv[2],PTRFORMAT,&databuff) != 1) {
-- sprintf(interp->result,"Couldn't parse data address into an integer");
-+ Tcl_SetResult(interp, "Couldn't parse data address into an integer", TCL_STATIC);
- return TCL_ERROR;
- }
- if (argc == 6) {
-@@ -963,7 +969,7 @@
- PowCreateData(argv[1],databuff,&data_type,&length,©,&status);
-
- if(status != 0) {
-- sprintf(interp->result,"Couldn't create data.");
-+ Tcl_SetResult(interp, "Couldn't create data.", TCL_STATIC);
- return TCL_ERROR;
- }
-
-@@ -1004,7 +1010,7 @@
- }
-
- if (sscanf(argv[1],PTRFORMAT,&powdatabuff) != 1) {
-- sprintf(interp->result,"Couldn't parse powdata address into an integer");
-+ Tcl_SetResult(interp, "Couldn't parse powdata address into an integer", TCL_STATIC);
- return TCL_ERROR;
- }
-
-@@ -1051,7 +1057,7 @@
-
-
- if(argc != 14) {
-- interp->result = "usage: powCreateImage image_name data_name xoffset yoffset\\\n width height xorigin xinc yorigin yinc xunits yunits zunits";
-+ Tcl_SetResult(interp, "usage: powCreateImage image_name data_name xoffset yoffset\\\n width height xorigin xinc yorigin yinc xunits yunits zunits", TCL_STATIC);
- return TCL_ERROR;
- }
-
-@@ -1097,7 +1103,7 @@
-
- /* fprintf(stdout, "done calling PowCommands\n"); */
- if(status != 0) {
-- sprintf(interp->result,"Couldn't create image.");
-+ Tcl_SetResult(interp, "Couldn't create image.", TCL_STATIC);
- return TCL_ERROR;
- }
-
-@@ -1137,7 +1143,7 @@
-
-
- if(argc != 6) {
-- interp->result = "usage: powCreateVector vector_name data_name offset length units";
-+ Tcl_SetResult(interp, "usage: powCreateVector vector_name data_name offset length units", TCL_STATIC);
- return TCL_ERROR;
- }
-
-@@ -1153,7 +1159,7 @@
- PowCreateVector(argv[1],argv[2],&offset,length,argv[5],&status);
-
- if(status != 0) {
-- sprintf(interp->result,"Couldn't create vector.");
-+ Tcl_SetResult(interp, "Couldn't create vector.", TCL_STATIC);
- return TCL_ERROR;
- }
-
-@@ -1193,7 +1199,7 @@
-
-
- if(argc < 6 || argc == 7) {
-- interp->result = "usage: powCreateCurve curve_name x_vector x_error y_vector y_error <z_vector z_error>";
-+ Tcl_SetResult(interp, "usage: powCreateCurve curve_name x_vector x_error y_vector y_error <z_vector z_error>", TCL_STATIC);
- return TCL_ERROR;
- }
-
-@@ -1211,7 +1217,7 @@
- PowCreateCurve(argv[1],argv[2],argv[3],argv[4],argv[5],z_vector,z_error,&status);
-
- if(status != 0) {
-- sprintf(interp->result,"Couldn't create curve.");
-+ Tcl_SetResult(interp, "Couldn't create curve.", TCL_STATIC);
- return TCL_ERROR;
- }
-
-@@ -1232,7 +1238,7 @@
-
-
- if(argc != 7) {
-- interp->result = "usage: powCreateVectorEN vector_name data_name length start increment units";
-+ Tcl_SetResult(interp, "usage: powCreateVectorEN vector_name data_name length start increment units", TCL_STATIC);
- return TCL_ERROR;
- }
-
-@@ -1246,7 +1252,7 @@
-
-
- if(status != 0) {
-- sprintf(interp->result,"Couldn't create vector.");
-+ Tcl_SetResult(interp, "Couldn't create vector.", TCL_STATIC);
- return TCL_ERROR;
- }
-
-@@ -1291,7 +1297,7 @@
-
-
- if(argc != 4) {
-- interp->result = "usage: powCreateHisto histo_name x_vector y_vector";
-+ Tcl_SetResult(interp, "usage: powCreateHisto histo_name x_vector y_vector", TCL_STATIC);
- return TCL_ERROR;
- }
-
-@@ -1299,7 +1305,7 @@
- PowCreateHisto(argv[1],argv[2],argv[3],&status);
-
- if(status != 0) {
-- sprintf(interp->result,"Couldn't create histo.");
-+ Tcl_SetResult(interp, "Couldn't create histo.", TCL_STATIC);
- return TCL_ERROR;
- }
-
-@@ -1349,7 +1355,7 @@
- pydimdisp = &ydimdisp;
-
- if(argc < 8) {
-- interp->result = "usage: powCreateGraph graph_name curves images xunits yunits xlabel\\\n ylabel ?xdimdisp ydimdisp xmin ymin xmax ymax? ";
-+ Tcl_SetResult(interp, "usage: powCreateGraph graph_name curves images xunits yunits xlabel\\\n ylabel ?xdimdisp ydimdisp xmin ymin xmax ymax? ", TCL_STATIC);
- return TCL_ERROR;
- }
-
-@@ -1523,7 +1529,7 @@
- /* used by the vector edit window to fetch component vector names */
- PowCurve *curve_ptr;
- if(argc != 2) {
-- interp->result = "usage: powFetchVectorHash curvename";
-+ Tcl_SetResult(interp, "usage: powFetchVectorHash curvename", TCL_STATIC);
- return TCL_ERROR;
- }
-
-@@ -1570,7 +1576,7 @@
- PowData *data_ptr;
- char length_str[22];
- if(argc != 2) {
-- interp->result = "usage: powFetchDataLength dataname";
-+ Tcl_SetResult(interp, "usage: powFetchDataLength dataname", TCL_STATIC);
- return TCL_ERROR;
- }
-
-@@ -1599,7 +1605,7 @@
- char ptrStr[16];
-
- if(argc != 2) {
-- interp->result = "usage: powExprDataInfo dataname";
-+ Tcl_SetResult(interp, "usage: powExprDataInfo dataname", TCL_STATIC);
- return TCL_ERROR;
- }
-
-@@ -1628,7 +1634,7 @@
- PowVector *vector_ptr;
- char length_str[22];
- if(argc != 2) {
-- interp->result = "usage: powFetchVectorInfoHash vectorname";
-+ Tcl_SetResult(interp, "usage: powFetchVectorInfoHash vectorname", TCL_STATIC);
- return TCL_ERROR;
- }
-
-@@ -1659,7 +1665,7 @@
- PowImage *image_ptr;
- char tmp_str[22];
- if(argc != 2) {
-- interp->result = "usage: powFetchImageInfoHash imagename";
-+ Tcl_SetResult(interp, "usage: powFetchImageInfoHash imagename", TCL_STATIC);
- return TCL_ERROR;
- }
-
-@@ -1718,7 +1724,7 @@
- char outstring[1024];
-
- if(argc != 3) {
-- interp->result = "usage: powFindCurveMinMax curves axis";
-+ Tcl_SetResult(interp, "usage: powFindCurveMinMax curves axis", TCL_STATIC);
- return TCL_ERROR;
- }
-
-@@ -1996,7 +2002,7 @@
- int string_flag = 0;
-
- if (argc < 3 || argc > 4) {
-- interp->result = "usage: powCreateDataFromList data_name list_o_data ?stringflag?";
-+ Tcl_SetResult(interp, "usage: powCreateDataFromList data_name list_o_data ?stringflag?", TCL_STATIC);
- return TCL_ERROR;
- }
-
---- a/tcltk/pow/PowCreateImage.c
-+++ b/tcltk/pow/PowCreateImage.c
-@@ -100,7 +100,7 @@
-
- if (Tcl_VarEval(interp,"image create pict ",image_instance->image_name,(char *) NULL) == TCL_ERROR) {
- *status = TCL_ERROR;
-- fprintf(stderr, "%s\n", interp->result);
-+ fprintf(stderr, "%s\n", Tcl_GetStringResult(interp));
- Tcl_DeleteHashEntry(entry_ptr);
- return;
- }
-@@ -109,7 +109,7 @@
-
- if(pict_image_handle == NULL) {
- *status = TCL_ERROR;
-- fprintf(stderr, "%s\n", interp->result);
-+ fprintf(stderr, "%s\n", Tcl_GetStringResult(interp));
- Tcl_DeleteHashEntry(entry_ptr);
- return;
- }
-@@ -124,7 +124,7 @@
- /* use Photo widget */
- if (Tcl_VarEval(interp,"image create photo ",image_instance->image_name,(char *) NULL) == TCL_ERROR) {
- *status = TCL_ERROR;
-- fprintf(stderr, "%s\n", interp->result);
-+ fprintf(stderr, "%s\n", Tcl_GetStringResult(interp));
- Tcl_DeleteHashEntry(entry_ptr);
- return;
- }
-@@ -132,7 +132,7 @@
- photo_image_handle = Tk_FindPhoto(interp,image_instance->image_name);
- if(photo_image_handle == NULL) {
- *status = TCL_ERROR;
-- fprintf(stderr, "%s\n", interp->result);
-+ fprintf(stderr, "%s\n", Tcl_GetStringResult(interp));
- Tcl_DeleteHashEntry(entry_ptr);
- return;
- }
-@@ -144,7 +144,7 @@
- entry_ptr = Tcl_FindHashEntry (&PowDataTable, data_name);
- if(entry_ptr == NULL) {
- *status = TCL_ERROR;
-- fprintf(stderr, "%s\n", interp->result);
-+ fprintf(stderr, "%s\n", Tcl_GetStringResult(interp));
- Tcl_DeleteHashEntry(entry_ptr);
- return;
- }
---- a/tcltk/pow/PowEventHandlers.c
-+++ b/tcltk/pow/PowEventHandlers.c
-@@ -121,14 +121,14 @@
- } */
- Tk_CreateFileHandler(0, TK_READABLE, StdinProc, (ClientData) 0);
- Tcl_DStringFree(&command);
-- if (*interp->result != 0) {
-+ if (*Tcl_GetStringResult(interp) != 0) {
- if ((code != TCL_OK) || (tty)) {
- /*
- * The statement below used to call "printf", but that resulted
- * in core dumps under Solaris 2.3 if the result was very long.
- */
-
-- puts(interp->result);
-+ puts(Tcl_GetStringResult(interp));
- }
- }
-
-@@ -184,7 +184,7 @@
- if (code != TCL_OK) {
- Tcl_AddErrorInfo(interp,
- "\n (script that generates prompt)");
-- fprintf(stderr, "%s\n", interp->result);
-+ fprintf(stderr, "%s\n", Tcl_GetStringResult(interp));
- goto defaultPrompt;
- }
- }
---- a/tcltk/pow/PowGrid.c
-+++ b/tcltk/pow/PowGrid.c
-@@ -121,7 +121,7 @@
- Tcl_SetResult(interp,"Couldn't get bounding box", TCL_VOLATILE);
- return TCL_ERROR;
- }
-- strncpy(cmdLine,interp->result,256);
-+ strncpy(cmdLine,Tcl_GetStringResult(interp),256);
- Tcl_SplitList(interp,cmdLine,&i,&list);
-
- len = strlen(gn)+15;
---- a/tcltk/pow/PowInit.c
-+++ b/tcltk/pow/PowInit.c
-@@ -531,12 +531,12 @@
-
- if (Tcl_Init(interp) == TCL_ERROR) {
- *status = TCL_ERROR;
-- fprintf(stderr, "%s\n", interp->result);
-+ fprintf(stderr, "%s\n", Tcl_GetStringResult(interp));
- return;
- }
- if (Tk_Init(interp) == TCL_ERROR) {
- *status = TCL_ERROR;
-- fprintf(stderr, "%s\n", interp->result);
-+ fprintf(stderr, "%s\n", Tcl_GetStringResult(interp));
- return;
- }
-
-@@ -557,13 +557,13 @@
- if(Tcl_VarEval(interp, "powSetupColormap ", powSetupColormapArgs,
- (char *) NULL) == TCL_ERROR) {
- *status = TCL_ERROR;
-- fprintf(stderr, "Error initializing POW.\n%s\n", interp->result);
-+ fprintf(stderr, "Error initializing POW.\n%s\n", Tcl_GetStringResult(interp));
- }
- }
-
- if(Tcl_VarEval(interp, "powInit ", powInitArgs, (char *) NULL) == TCL_ERROR) {
- *status = TCL_ERROR;
-- fprintf(stderr, "Error initializing POW.\n%s\n", interp->result);
-+ fprintf(stderr, "Error initializing POW.\n%s\n", Tcl_GetStringResult(interp));
- }
-
- }
---- a/tcltk/pow/readpha.c
-+++ b/tcltk/pow/readpha.c
-@@ -51,8 +51,9 @@
- width = (int) naxes[0];
- height = (int) naxes[1];
-
--
-- sprintf(interp->result,PTRFORMAT " %i %i", imagebuff, array_type, width*height);
-+ char s[256];
-+ snprintf(s, 255,PTRFORMAT " %i %i", imagebuff, array_type, width*height);
-+ Tcl_SetResult(interp, s, TCL_VOLATILE);
- return TCL_OK;
- }
-
diff --git a/debian/patches/pow_update_photo.patch b/debian/patches/pow_update_photo.patch
deleted file mode 100644
index 80ab21d..0000000
--- a/debian/patches/pow_update_photo.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Insert "Tcl_Interp *interp" as first argument to Tk_PhotoXXX()
- which is required by current versions of Tcl.
---- a/tcltk/pow/PowColormap.c
-+++ b/tcltk/pow/PowColormap.c
-@@ -829,7 +829,7 @@
- photo_block.offset[2] = 2;
-
-
-- Tk_PhotoPutBlock(photo_handle,&photo_block,0,0,image_instance->width,image_instance->height, TK_PHOTO_COMPOSITE_SET);
-+ Tk_PhotoPutBlock(interp, photo_handle,&photo_block,0,0,image_instance->width,image_instance->height, TK_PHOTO_COMPOSITE_SET);
-
- ckfree(photo_block.pixelPtr);
- return TCL_OK;
---- a/tcltk/pow/PowCommands.c
-+++ b/tcltk/pow/PowCommands.c
-@@ -3037,11 +3037,11 @@
- || (x < 0) || (y < 0) )
- return;
- if( (zoomX == 1.0) && (zoomY == 1.0) ) {
-- Tk_PhotoPutBlock(handle, blockPtr, x, y, width, height, TK_PHOTO_COMPOSITE_SET);
-+ Tk_PhotoPutBlock(interp,handle, blockPtr, x, y, width, height, TK_PHOTO_COMPOSITE_SET);
- return;
- }
-
-- Tk_PhotoExpand(handle, x+width, y+height);
-+ Tk_PhotoExpand(interp,handle, x+width, y+height);
- Tk_PhotoGetImage(handle, &destBlockPtr);
-
- /*
-@@ -3110,5 +3110,5 @@
- }
- }
-
-- Tk_PhotoPutBlock(handle, &destBlockPtr, x, y, width, height, TK_PHOTO_COMPOSITE_SET);
-+ Tk_PhotoPutBlock(interp,handle, &destBlockPtr, x, y, width, height, TK_PHOTO_COMPOSITE_SET);
- }
---- a/tcltk/pow/PowCreateImage.c
-+++ b/tcltk/pow/PowCreateImage.c
-@@ -209,10 +209,10 @@
- photo_block.offset[1] = 1;
- photo_block.offset[2] = 2;
-
-- Tk_PhotoExpand(photo_image_handle,
-+ Tk_PhotoExpand(interp,photo_image_handle,
- image_instance->width, image_instance->height);
-
-- Tk_PhotoPutBlock(photo_image_handle, &photo_block, 0, 0,
-+ Tk_PhotoPutBlock(interp,photo_image_handle, &photo_block, 0, 0,
- image_instance->width, image_instance->height, TK_PHOTO_COMPOSITE_SET);
-
- ckfree(photo_block.pixelPtr);
---- a/tcltk/pow/Visu_tkImgPict.c
-+++ b/tcltk/pow/Visu_tkImgPict.c
-@@ -2489,7 +2489,7 @@
- }
-
- /* set size */
-- Tk_PhotoExpand(destHandle,masterPtr->width,masterPtr->height);
-+ Tk_PhotoExpand(interp,destHandle,masterPtr->width,masterPtr->height);
-
- /* copy data from pict image to photo image. If no instance
- exists, no colors have been allocated, so we copy the
-@@ -2572,7 +2572,7 @@
- }
-
- /* put block in photo image */
-- Tk_PhotoPutBlock(destHandle,&photoblock,0,0,masterPtr->width,masterPtr->height, TK_PHOTO_COMPOSITE_SET);
-+ Tk_PhotoPutBlock(interp,destHandle,&photoblock,0,0,masterPtr->width,masterPtr->height, TK_PHOTO_COMPOSITE_SET);
-
- /* free photo block */
- ckfree((void*)photoblock.pixelPtr);
diff --git a/debian/patches/series b/debian/patches/series
index 8c2ca19..aa89bff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,13 +1,9 @@
-pow_update_photo.patch
pow_fix_makefile.patch
pow_create_package.patch
pow_fix_startup.patch
pow_fix_compilerwarnings.patch
pow_nolinux.patch
-pow_tcl8.6.patch
fv_require.patch
fv_fix_initial_menubar.patch
fv_fix_startup.patch
-fv_fix_sample.patch
-clang_FTBFS_Wreturn-type.patch
fvtmp.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/ftools-fv.git
More information about the Debian-astro-commits
mailing list