[Debian-astro-commits] [ftools-fv] 01/01: Fix tcl8.6 fixes
Ole Streicher
olebole at moszumanska.debian.org
Wed Jul 22 16:01:45 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 e46bf8dbae4626dadd257207d5048d7d2a0b08e9
Author: Ole Streicher <olebole at debian.org>
Date: Wed Jul 22 18:01:40 2015 +0200
Fix tcl8.6 fixes
---
debian/changelog | 1 +
debian/copyright | 9 +--
debian/patches/pow_create_package.patch | 25 +++++---
debian/patches/pow_tcl8.6.patch | 108 ++++++++++++++++----------------
4 files changed, 75 insertions(+), 68 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 63ce1d9..caf50a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ ftools-fv (5.3+dfsg-7) UNRELEASED; urgency=low
* Change default temp location to /tmp
* Convert POW to multi-arch
+ * Make POW suitable for Tcl >= 8.6
-- Ole Streicher <olebole at debian.org> Mon, 18 May 2015 14:24:19 +0200
diff --git a/debian/copyright b/debian/copyright
index 59d395e..8ba5dfb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -9,6 +9,7 @@ Copyright: 2000-2009, William Pence, Pan Chai
1994-1996, Sun Microsystems, Inc
1996, Pierre-Louis Bossart
1994, The Australian National University
+ 2012-2015 Ole Streicher <olebole at debian.org> (Debian files)
License: MIT
Copyright (Unpublished--all rights reserved under the copyright laws of
the United States), U.S. Government as represented by the Administrator
@@ -35,11 +36,3 @@ License: MIT
PERSONS OR PROPERTY OR OTHERWISE, AND WHETHER OR NOT LOSS WAS SUSTAINED
FROM, OR AROSE OUT OF THE RESULTS OF, OR USE OF, THE SOFTWARE OR
SERVICES PROVIDED HEREUNDER.
-
-Files: debian/*
-Copyright: 2012-2014 Ole Streicher <olebole at debian.org>
-License: MIT
- see above
-Note:
- The package was first debianized by Jens Schmalzing <jensen at debian.org>
- Tue, 18 Sep 2001 21:37:02 +0200.
diff --git a/debian/patches/pow_create_package.patch b/debian/patches/pow_create_package.patch
index 8329570..211a42c 100644
--- a/debian/patches/pow_create_package.patch
+++ b/debian/patches/pow_create_package.patch
@@ -15,7 +15,16 @@ Description: Create and "package require" the POW package.
--- a/tcltk/pow/PowInit.c
+++ b/tcltk/pow/PowInit.c
-@@ -130,12 +130,9 @@
+@@ -111,6 +111,8 @@
+ return TCL_ERROR;
+ }
+
++ Tcl_PkgRequire(interp, "Itcl", "3.0", 0);
++
+ #if defined(MAC_TCL) && defined(PLUGIN)
+
+
+@@ -130,12 +132,9 @@
charptr = Tcl_GetVar2(interp,"env", "POW_LIBRARY", TCL_GLOBAL_ONLY);
if( charptr == NULL ) {
@@ -30,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 +216,9 @@
+@@ -219,6 +218,9 @@
Pow_CreateCommands(interp);
Tk_CreateItemType(&tkPowCurveType);
@@ -42,11 +51,8 @@ Description: Create and "package require" the POW package.
--- a/tcltk/pow/Makefile.in
+++ b/tcltk/pow/Makefile.in
-@@ -80,18 +80,19 @@
-
- shared: ${SHARED_OBJ}
+@@ -82,16 +82,16 @@
${SHLIB_LD} ${LD_FLAGS} ${SHARED_OBJ} ${SHLIB_LD_LIBS} -o ${SHARED_LIB}
-+ echo "pkg_mkIndex . libpow.so" | tclsh
install:
- @if [ ! -d ${INSTALLDIR}/lib/tcltk/POW ]; then \
@@ -67,7 +73,7 @@ Description: Create and "package require" the POW package.
fi
mkdir -p ${INSTALLDIR}/bin
@for file in ${SCRIPTS}; do \
-@@ -104,13 +105,13 @@
+@@ -104,13 +104,13 @@
cp $$file ${INSTALLDIR}/include/; \
done
mkdir -p ${INSTALLDIR}/share/ftools/POW
@@ -83,3 +89,8 @@ Description: Create and "package require" the POW package.
distclean: clean
-rm -f config.cache config.status config.log Makefile
+--- /dev/null
++++ b/tcltk/pow/pkgIndex.tcl
+@@ -0,0 +1,2 @@
++package ifneeded POW 3.0 [list load [file join $dir libpow.so]]
++
diff --git a/debian/patches/pow_tcl8.6.patch b/debian/patches/pow_tcl8.6.patch
index 6aae084..5c935f4 100644
--- a/debian/patches/pow_tcl8.6.patch
+++ b/debian/patches/pow_tcl8.6.patch
@@ -1,3 +1,5 @@
+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 @@
@@ -6,9 +8,9 @@
if (argc > 5 || argc < 3 ) {
- interp->result =
- "usage: powSetupColormap toplevel_name free_cells ?force_cmap? ?options_list?";
-+ Tcl_SetStringResult(interp,
-+ "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;
}
@@ -27,7 +29,7 @@
if (argc != 2 ) {
- interp->result =
- "usage: powTestColormap window";
-+ Tcl_SetStringResult(interp, "usage: powTestColormap window");
++ Tcl_SetResult(interp, "usage: powTestColormap window", TCL_STATIC);
return TCL_ERROR;
}
@@ -38,7 +40,7 @@
- sprintf(interp->result,"%i",ncolors);
+ char ncolor_s[4];
+ snprintf(ncolor_s, 3, "%i", ncolors);
-+ Tcl_SetStringResult(interp, ncolor_s);
++ Tcl_SetResult(interp, ncolor_s, TCL_STATIC);
return TCL_OK;
#endif /* __WIN32__ || macintosh */
}
@@ -47,8 +49,8 @@
if (argc != 4) {
- interp->result = "usage: powReditherPhotoBlock imageName min max";
-+ Tcl_SetStringResult(interp,
-+ "usage: powReditherPhotoBlock imageName min max");
++ Tcl_SetResult(interp,
++ "usage: powReditherPhotoBlock imageName min max", TCL_STATIC);
return TCL_ERROR;
}
@@ -59,7 +61,7 @@
if(argc < 10 ) {
- interp->result = "usage: powProcessCurve curve bbox rbbox xinc yinc magstep tags <Line|Points> canvas";
-+ Tcl_SetStringResult(interp, "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;
}
@@ -68,7 +70,7 @@
Tcl_SplitList(interp,argv[2],&n,&bboxptr);
if(n != 4) {
- interp->result = "bbox malformed";
-+ Tcl_SetStringResult(interp, "bbox malformed");
++ Tcl_SetResult(interp, "bbox malformed", TCL_STATIC);
return TCL_ERROR;
}
/* (x0,y0) -- lower left */
@@ -77,7 +79,7 @@
Tcl_SplitList(interp,argv[3],&n,&rbboxptr);
if(n != 4) {
- interp->result = "rbbox malformed";
-+ Tcl_SetStringResult(interp, "rbbox malformed");
++ Tcl_SetResult(interp, "rbbox malformed", TCL_STATIC);
return TCL_ERROR;
}
/* (x0,y0) -- lower left */
@@ -86,13 +88,13 @@
PowGraph *graph_ptr;
if(argc != 4) {
- interp->result = "usage: powSetGraphMagstep graphname newxmagstep newymagstep";
-+ Tcl_SetStringResult(interp, "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_SetStringResult(interp, "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));
@@ -101,27 +103,27 @@
PowImage *image_ptr;
if(argc != 3) {
- interp->result = "wrong # args";
-+ Tcl_SetStringResult(interp, "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_SetStringResult(interp, "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_SetStringResult(interp, s);
++ 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_SetStringResult(interp, s);
++ Tcl_SetResult(interp, s, TCL_VOLATILE);
break;
- default: interp->result = "No such image axis (must be X or Y)";
-+ default: Tcl_SetStringResult(interp, "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;
@@ -130,27 +132,27 @@
PowImage *image_ptr;
if(argc != 3) {
- interp->result = "wrong # args";
-+ Tcl_SetStringResult(interp, "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_SetStringResult(interp, "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_SetStringResult(interp, s);
++ 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_SetStringResult(interp, s);
++ Tcl_SetResult(interp, s, TCL_VOLATILE);
break;
- default: interp->result = "No such image axis (must be X or Y)";
-+ default: Tcl_SetStringResult(interp, "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;
@@ -159,27 +161,27 @@
PowImage *image_ptr;
if(argc != 3) {
- interp->result = "wrong # args";
-+ Tcl_SetStringResult(interp, "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_SetStringResult(interp, "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_SetStringResult(interp, 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_SetStringResult(interp, 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_SetStringResult(interp, 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_SetStringResult(interp, "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;
@@ -188,7 +190,7 @@
if (argc != 9) {
- interp->result = "usage: powPutZoomedBlock imageName graphName x y width height zoomX zoomY\nYou probably shouldn't be seeing this.";
-+ Tcl_SetStringResult(interp, "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;
}
@@ -197,7 +199,7 @@
if(status != 0) {
- sprintf(interp->result,"Couldn't flip data.");
-+ Tcl_SetStringResult(interp, "Couldn't flip data.");
++ Tcl_SetResult(interp, "Couldn't flip data.", TCL_STATIC);
return TCL_ERROR;
}
@@ -215,7 +217,7 @@
if(status != 0) {
- sprintf(interp->result,"Couldn't flip Curve data.");
-+ Tcl_SetStringResult(interp, "Couldn't flip Curve data.");
++ Tcl_SetResult(interp, "Couldn't flip Curve data.", TCL_STATIC);
return TCL_ERROR;
}
@@ -224,7 +226,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_SetStringResult(interp, "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) {
@@ -233,7 +235,7 @@
if(status != 0) {
- sprintf(interp->result,"Couldn't create data.");
-+ Tcl_SetStringResult(interp, "Couldn't create data.");
++ Tcl_SetResult(interp, "Couldn't create data.", TCL_STATIC);
return TCL_ERROR;
}
@@ -242,7 +244,7 @@
if (sscanf(argv[1],PTRFORMAT,&powdatabuff) != 1) {
- sprintf(interp->result,"Couldn't parse powdata address into an integer");
-+ Tcl_SetStringResult(interp, "Couldn't parse powdata address into an integer");
++ Tcl_SetResult(interp, "Couldn't parse powdata address into an integer", TCL_STATIC);
return TCL_ERROR;
}
@@ -251,7 +253,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_SetStringResult(interp, "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;
}
@@ -260,7 +262,7 @@
/* fprintf(stdout, "done calling PowCommands\n"); */
if(status != 0) {
- sprintf(interp->result,"Couldn't create image.");
-+ Tcl_SetStringResult(interp, "Couldn't create image.");
++ Tcl_SetResult(interp, "Couldn't create image.", TCL_STATIC);
return TCL_ERROR;
}
@@ -269,7 +271,7 @@
if(argc != 6) {
- interp->result = "usage: powCreateVector vector_name data_name offset length units";
-+ Tcl_SetStringResult(interp, "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;
}
@@ -278,7 +280,7 @@
if(status != 0) {
- sprintf(interp->result,"Couldn't create vector.");
-+ Tcl_SetStringResult(interp, "Couldn't create vector.");
++ Tcl_SetResult(interp, "Couldn't create vector.", TCL_STATIC);
return TCL_ERROR;
}
@@ -287,7 +289,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_SetStringResult(interp, "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;
}
@@ -296,7 +298,7 @@
if(status != 0) {
- sprintf(interp->result,"Couldn't create curve.");
-+ Tcl_SetStringResult(interp, "Couldn't create curve.");
++ Tcl_SetResult(interp, "Couldn't create curve.", TCL_STATIC);
return TCL_ERROR;
}
@@ -305,7 +307,7 @@
if(argc != 7) {
- interp->result = "usage: powCreateVectorEN vector_name data_name length start increment units";
-+ Tcl_SetStringResult(interp, "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;
}
@@ -314,7 +316,7 @@
if(status != 0) {
- sprintf(interp->result,"Couldn't create vector.");
-+ Tcl_SetStringResult(interp, "Couldn't create vector.");
++ Tcl_SetResult(interp, "Couldn't create vector.", TCL_STATIC);
return TCL_ERROR;
}
@@ -323,7 +325,7 @@
if(argc != 4) {
- interp->result = "usage: powCreateHisto histo_name x_vector y_vector";
-+ Tcl_SetStringResult(interp, "usage: powCreateHisto histo_name x_vector y_vector");
++ Tcl_SetResult(interp, "usage: powCreateHisto histo_name x_vector y_vector", TCL_STATIC);
return TCL_ERROR;
}
@@ -332,7 +334,7 @@
if(status != 0) {
- sprintf(interp->result,"Couldn't create histo.");
-+ Tcl_SetStringResult(interp, "Couldn't create histo.");
++ Tcl_SetResult(interp, "Couldn't create histo.", TCL_STATIC);
return TCL_ERROR;
}
@@ -341,7 +343,7 @@
if(argc < 8) {
- interp->result = "usage: powCreateGraph graph_name curves images xunits yunits xlabel\\\n ylabel ?xdimdisp ydimdisp xmin ymin xmax ymax? ";
-+ Tcl_SetStringResult(interp, "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;
}
@@ -350,7 +352,7 @@
PowCurve *curve_ptr;
if(argc != 2) {
- interp->result = "usage: powFetchVectorHash curvename";
-+ Tcl_SetStringResult(interp, "usage: powFetchVectorHash curvename");
++ Tcl_SetResult(interp, "usage: powFetchVectorHash curvename", TCL_STATIC);
return TCL_ERROR;
}
@@ -359,7 +361,7 @@
char length_str[22];
if(argc != 2) {
- interp->result = "usage: powFetchDataLength dataname";
-+ Tcl_SetStringResult(interp, "usage: powFetchDataLength dataname");
++ Tcl_SetResult(interp, "usage: powFetchDataLength dataname", TCL_STATIC);
return TCL_ERROR;
}
@@ -368,7 +370,7 @@
if(argc != 2) {
- interp->result = "usage: powExprDataInfo dataname";
-+ Tcl_SetStringResult(interp, "usage: powExprDataInfo dataname");
++ Tcl_SetResult(interp, "usage: powExprDataInfo dataname", TCL_STATIC);
return TCL_ERROR;
}
@@ -377,7 +379,7 @@
char length_str[22];
if(argc != 2) {
- interp->result = "usage: powFetchVectorInfoHash vectorname";
-+ Tcl_SetStringResult(interp, "usage: powFetchVectorInfoHash vectorname");
++ Tcl_SetResult(interp, "usage: powFetchVectorInfoHash vectorname", TCL_STATIC);
return TCL_ERROR;
}
@@ -386,7 +388,7 @@
char tmp_str[22];
if(argc != 2) {
- interp->result = "usage: powFetchImageInfoHash imagename";
-+ Tcl_SetStringResult(interp, "usage: powFetchImageInfoHash imagename");
++ Tcl_SetResult(interp, "usage: powFetchImageInfoHash imagename", TCL_STATIC);
return TCL_ERROR;
}
@@ -395,7 +397,7 @@
if(argc != 3) {
- interp->result = "usage: powFindCurveMinMax curves axis";
-+ Tcl_SetStringResult(interp, "usage: powFindCurveMinMax curves axis");
++ Tcl_SetResult(interp, "usage: powFindCurveMinMax curves axis", TCL_STATIC);
return TCL_ERROR;
}
@@ -404,7 +406,7 @@
if (argc < 3 || argc > 4) {
- interp->result = "usage: powCreateDataFromList data_name list_o_data ?stringflag?";
-+ Tcl_SetStringResult(interp, "usage: powCreateDataFromList data_name list_o_data ?stringflag?");
++ Tcl_SetResult(interp, "usage: powCreateDataFromList data_name list_o_data ?stringflag?", TCL_STATIC);
return TCL_ERROR;
}
@@ -537,7 +539,7 @@
- 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_SetStringResult(interp, s);
++ Tcl_SetResult(interp, s, TCL_VOLATILE);
return TCL_OK;
}
--
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