--- SAOImageDS9/ds9/unix/ds9.C.orig 2022-12-16 23:30:11.000000000 +0100 +++ SAOImageDS9/ds9/unix/ds9.C 2023-01-18 23:03:46.807613399 +0100 @@ -20,8 +20,8 @@ void TclSetStartupScriptFileName(const char*); - int TclZipfs_Init(Tcl_Interp*); - int TclZipfs_Mount(Tcl_Interp*, const char*, const char *, const char*); + // int TclZipfs_Init(Tcl_Interp*); + // int TclZipfs_Mount(Tcl_Interp*, const char*, const char *, const char*); int Tkblt_Init(Tcl_Interp*); int Tktable_Init(Tcl_Interp*); @@ -64,11 +64,11 @@ // so that tcl and tk know where to find their libs // we do it here before InitLibraryPath is called - putenv((char*)"TCL_LIBRARY=zipfs:/mntpt/tcl8.6"); - putenv((char*)"TK_LIBRARY=zipfs:/mntpt/tk8.6"); + // putenv((char*)"TCL_LIBRARY=zipfs:/mntpt/tcl8.6"); + // putenv((char*)"TK_LIBRARY=zipfs:/mntpt/tk8.6"); // startup script - Tcl_Obj *path = Tcl_NewStringObj("zipfs:/mntpt/library/ds9.tcl",-1); + Tcl_Obj *path = Tcl_NewStringObj("/usr/share/ds9/mntpt/library/ds9.tcl",-1); Tcl_SetStartupScript(path, NULL); return TCL_OK; @@ -82,54 +82,23 @@ // We have to initialize the virtual filesystem before calling // Tcl_Init(). Otherwise, Tcl_Init() will not be able to find // its startup script files. - if (TclZipfs_Init(interp) == TCL_ERROR) - return TCL_ERROR; - Tcl_StaticPackage (interp, "zipfs", TclZipfs_Init, - (Tcl_PackageInitProc*)NULL); + // if (TclZipfs_Init(interp) == TCL_ERROR) + // return TCL_ERROR; + // Tcl_StaticPackage (interp, "zipfs", TclZipfs_Init, + // (Tcl_PackageInitProc*)NULL); // find current working directory, and set as mount point - { -#ifdef ZIPFILE - ostringstream str; - str << (char *)Tcl_GetNameOfExecutable() - << ".zip" - << ends; - if(TclZipfs_Mount(interp, "", (const char*)str.str().c_str(), NULL) != TCL_OK ){ - cerr << "ERROR: Unable to open the auxiliary ds9 file 'ds9.zip'. If you moved the ds9 program from its original location, please also move the zip file to the same place." << endl; - exit(1); - } -#else - TclZipfs_Mount(interp, "", (const char *)Tcl_GetNameOfExecutable(), NULL); -#endif - } // Tcl if (Tcl_Init(interp) == TCL_ERROR) return TCL_ERROR; - // Tk - if (Tk_Init(interp) == TCL_ERROR) - return TCL_ERROR; - Tcl_StaticPackage(interp,"Tk", Tk_Init, Tk_SafeInit); - - // Tkblt - if (Tkblt_Init(interp) == TCL_ERROR) - return TCL_ERROR; - Tcl_StaticPackage(interp, "tkblt", Tkblt_Init, - (Tcl_PackageInitProc*)NULL); - // Tktable if (Tktable_Init(interp) == TCL_ERROR) return TCL_ERROR; Tcl_StaticPackage (interp, "Tktable", Tktable_Init, (Tcl_PackageInitProc*)NULL); - // Tls - if (Tls_Init(interp) == TCL_ERROR) - return TCL_ERROR; - Tcl_StaticPackage (interp, "tls", Tls_Init, - (Tcl_PackageInitProc*)NULL); - // Tksao if (Tksao_Init(interp) == TCL_ERROR) return TCL_ERROR; @@ -142,12 +111,6 @@ Tcl_StaticPackage (interp, "tkhtml1", Tkhtml1_Init, (Tcl_PackageInitProc*)NULL); - // Tclxpa - if (Tclxpa_Init(interp) == TCL_ERROR) - return TCL_ERROR; - Tcl_StaticPackage (interp, "Tclxpa", Tclxpa_Init, - (Tcl_PackageInitProc*)NULL); - // Tcliis if (Tcliis_Init(interp) == TCL_ERROR) return TCL_ERROR; @@ -181,49 +144,7 @@ // Tclxml if (Tclxml_Init(interp) == TCL_ERROR) return TCL_ERROR; - - // Tkimg - if (Tkimg_Init(interp) == TCL_ERROR) - return TCL_ERROR; - Tcl_StaticPackage (interp, "img", Tkimg_Init, - (Tcl_PackageInitProc*)NULL); - - // zlibtcl - if (Zlibtcl_Init(interp) == TCL_ERROR) - return TCL_ERROR; - Tcl_StaticPackage (interp, "zlibtcl", Zlibtcl_Init, - (Tcl_PackageInitProc*)NULL); - - // jpegtcl - if (Jpegtcl_Init(interp) == TCL_ERROR) - return TCL_ERROR; - Tcl_StaticPackage (interp, "jpegtcl", Jpegtcl_Init, - (Tcl_PackageInitProc*)NULL); - - // Tkimgjpeg - if (Tkimgjpeg_Init(interp) == TCL_ERROR) - return TCL_ERROR; - Tcl_StaticPackage (interp, "jpeg", Tkimgjpeg_Init, - (Tcl_PackageInitProc*)NULL); - - // Tifftcl - if (Tifftcl_Init(interp) == TCL_ERROR) - return TCL_ERROR; - Tcl_StaticPackage (interp, "tifftcl", Tifftcl_Init, - (Tcl_PackageInitProc*)NULL); - - // Tkimgtiff - if (Tkimgtiff_Init(interp) == TCL_ERROR) - return TCL_ERROR; - Tcl_StaticPackage (interp, "tiff", Tkimgtiff_Init, - (Tcl_PackageInitProc*)NULL); - - // Tkimgwindow - if (Tkimgwindow_Init(interp) == TCL_ERROR) - return TCL_ERROR; - Tcl_StaticPackage (interp, "window", Tkimgwindow_Init, - (Tcl_PackageInitProc*)NULL); - + // Signal_Ext if (Signal_ext_Init(interp) == TCL_ERROR) return TCL_ERROR;