[saods9] 03/04: Adjust patches
Ole Streicher
olebole-guest at moszumanska.debian.org
Sat Oct 4 14:17:18 UTC 2014
This is an automated email from the git hooks/post-receive script.
olebole-guest pushed a commit to branch debian
in repository saods9.
commit 5c26f0493f7292fca88c1d9079bf3a701f41f791
Author: Ole Streicher <debian at liska.ath.cx>
Date: Thu Oct 2 21:56:26 2014 +0200
Adjust patches
---
debian/patches/checkdns.patch | 4 +-
debian/patches/ds9_add_about_debian.patch | 14 +-
debian/patches/ds9_fix_docdir.patch | 8 +-
debian/patches/ds9_make_linux.patch | 56 +++-----
debian/patches/ds9_optional_doc_package.patch | 24 ++--
debian/patches/ds9_use_external_libs.patch | 141 ++++++++++++------
debian/patches/ds9_use_filesystem.patch | 24 +---
debian/patches/iis.patch | 196 +++-----------------------
debian/patches/saotk_add_ksearch.patch | 2 +-
debian/patches/saotk_add_psscale.patch | 2 +-
debian/patches/tlt_fix_crash.patch | 46 ++----
11 files changed, 179 insertions(+), 338 deletions(-)
diff --git a/debian/patches/checkdns.patch b/debian/patches/checkdns.patch
index 2dc9757..9532cea 100644
--- a/debian/patches/checkdns.patch
+++ b/debian/patches/checkdns.patch
@@ -1,7 +1,7 @@
Author: Justin Pryzby <justinpryzby at users.sf.net>
Description: Avoid compilation error in (Tcl) DNS checker
---- a/checkdns/checkdns.c
-+++ b/checkdns/checkdns.c
+--- a/tclcheckdns1.1/checkdns.c
++++ b/tclcheckdns1.1/checkdns.c
@@ -15,6 +15,8 @@
#include <netdb.h>
#if HAVE_TCL
diff --git a/debian/patches/ds9_add_about_debian.patch b/debian/patches/ds9_add_about_debian.patch
index 22b2a10..0c6dc76 100644
--- a/debian/patches/ds9_add_about_debian.patch
+++ b/debian/patches/ds9_add_about_debian.patch
@@ -2,18 +2,18 @@ Author: Ole Streicher <debian at liska.ath.cx>
Description: Add the Debian packager to the "About" box
--- a/src/help.tcl
+++ b/src/help.tcl
-@@ -22,6 +22,8 @@
+@@ -21,6 +21,8 @@
+ set help(vo) "$ds9(doc)/ref/vo.html"
- set help(about) "SAOImage DS9\nVersion $ds9(version)\n\nAuthors:\nWilliam Joye (Smithsonian Astrophysical Observatory)\nEric Mandel (Smithsonian Astrophysical Observatory)\nSteve Murray (Johns Hopkins University)\nJohn Roll (Smithsonian Astrophysical Observatory)\n\nTranslations:\nHans-Jakob Grimm (Smithsonian Astrophysical Observatory)\nAllan Hornstrup (Danmarks Tekniske Universitet)\nAlberto Martins (Universidade de Sao Paulo)\nManuel Perez Torres (Smithsonian Astrophysical Observ [...]
-
-+ append help(about) "\n\nDebian packaging:\nOle Streicher (AIP)"
+ set help(about) "SAOImage DS9\nVersion $ds9(version)\n\nAuthors:\nWilliam Joye (Smithsonian Astrophysical Observatory)\nEric Mandel (Smithsonian Astrophysical Observatory)\nSteve Murray (Johns Hopkins University)\nJohn Roll (Smithsonian Astrophysical Observatory)\n\nTranslations:\nHans-Jakob Grimm (Smithsonian Astrophysical Observatory)\nAllan Hornstrup (Danmarks Tekniske Universitet)\nAlberto Martins (Universidade de Sao Paulo)\nManuel Perez Torres (Smithsonian Astrophysical Observ [...]
+
- set help(email) "If you encounter any problems or have suggestions with ds9, please contact us at:
++ append help(about) "\n\nDebian packaging:\nOle Streicher (AIP)"
+ }
- saord at cfa.harvard.edu
+ proc HelpRef {} {
--- a/src/util.tcl
+++ b/src/util.tcl
-@@ -709,7 +709,7 @@
+@@ -681,7 +681,7 @@
# Param
set f [frame $w.param -background white]
diff --git a/debian/patches/ds9_fix_docdir.patch b/debian/patches/ds9_fix_docdir.patch
index 0659b25..e0e9919 100644
--- a/debian/patches/ds9_fix_docdir.patch
+++ b/debian/patches/ds9_fix_docdir.patch
@@ -31,11 +31,11 @@ Description: Instead putting the documentation into the common shared
+ set help(ack) "$ds9(doc)/acknowledgment.html"
+ set help(vo) "$ds9(doc)/ref/vo.html"
- set help(about) "SAOImage DS9\nVersion $ds9(version)\n\nAuthors:\nWilliam Joye (Smithsonian Astrophysical Observatory)\nEric Mandel (Smithsonian Astrophysical Observatory)\nSteve Murray (Johns Hopkins University)\nJohn Roll (Smithsonian Astrophysical Observatory)\n\nTranslations:\nHans-Jakob Grimm (Smithsonian Astrophysical Observatory)\nAllan Hornstrup (Danmarks Tekniske Universitet)\nAlberto Martins (Universidade de Sao Paulo)\nManuel Perez Torres (Smithsonian Astrophysical Observ [...]
-
+ set help(about) "SAOImage DS9\nVersion $ds9(version)\n\nAuthors:\nWilliam Joye (Smithsonian Astrophysical Observatory)\nEric Mandel (Smithsonian Astrophysical Observatory)\nSteve Murray (Johns Hopkins University)\nJohn Roll (Smithsonian Astrophysical Observatory)\n\nTranslations:\nHans-Jakob Grimm (Smithsonian Astrophysical Observatory)\nAllan Hornstrup (Danmarks Tekniske Universitet)\nAlberto Martins (Universidade de Sao Paulo)\nManuel Perez Torres (Smithsonian Astrophysical Observ [...]
+ }
--- a/src/ds9.tcl
+++ b/src/ds9.tcl
-@@ -179,6 +179,7 @@
+@@ -201,6 +201,7 @@
# set to absolute path so that if -cd command is used,
# so we can still find our files
set ds9(root) "/usr/share/saods9"
@@ -45,7 +45,7 @@ Description: Instead putting the documentation into the common shared
package require http
--- a/src/util.tcl
+++ b/src/util.tcl
-@@ -714,7 +714,7 @@
+@@ -686,7 +686,7 @@
# can't use -file for zvfs
# set ed(sun) [image create photo -format gif -file $ds9(root)/doc/sun.gif]
diff --git a/debian/patches/ds9_make_linux.patch b/debian/patches/ds9_make_linux.patch
index d7804e3..6e73f61 100644
--- a/debian/patches/ds9_make_linux.patch
+++ b/debian/patches/ds9_make_linux.patch
@@ -34,29 +34,29 @@ Description: Set the compile flags according to the Debian environment. We
--- a/Makefile.unix
+++ b/Makefile.unix
-@@ -35,12 +35,16 @@
+@@ -34,12 +34,17 @@
- tlt : FORCE
- @echo "Installing TLT..."
-- cd $(TLTDIR); CC='$(CC)' CFLAGS='$(OPTS)' \
-+ cd $(TLTDIR); CC='$(CC)' CPPFLAGS='$(CPPFLAGS)' \
+ tkblt : FORCE
+ @echo "Installing Tkblt..."
+- cd $(TKBLTDIR); CC='$(CC)' CFLAGS='$(OPTS)' \
++ cd $(TKBLTDIR); CC='$(CC)' CPPFLAGS='$(CPPFLAGS)' \
+ CFLAGS='$(CFLAGS) $(OPTS) -DUSE_INTERP_RESULT' \
+ LDFLAGS='$(LDFLAGS) $(LIBS)' \
./configure $(XFLAGS) \
--prefix $(root) \
-- --disable-shared \
+ --exec-prefix $(root) \
+ --enable-shared \
--enable-symbols
-- $(MAKE) -C $(TLTDIR) -j $(JOBS) install
-+ $(MAKE) -C $(TLTDIR) -j $(JOBS)
-+ cp $(TLTDIR)/*.so* lib/
-+ cp $(TLTDIR)/*.h include/
+- $(MAKE) -C $(TKBLTDIR) -j $(JOBS) install
++ $(MAKE) -C $(TKBLTDIR) -j $(JOBS)
++ cp $(TKBLTDIR)/*.so* lib/
++ cp $(TKBLTDIR)/*.h include/
tktable : FORCE
- @echo "Installing TkTable..."
-@@ -65,9 +69,9 @@
+ @echo "Installing Tktable..."
+@@ -64,9 +69,9 @@
tkimg : libtiff
- @echo "Installing TKIMG..."
+ @echo "Installing Tkimg..."
cd $(TKIMGDIR); CC='$(CC)' CFLAGS='$(OPTS) -DPNG_NO_WRITE_gAMA' \
+ CPPFLAGS='$(CPPFLAGS)' \
+ LDFLAGS='$(LDFLAGS)' \
@@ -66,9 +66,9 @@ Description: Set the compile flags according to the Debian environment. We
--prefix $(root) \
--disable-shared
$(MAKE) -C $(TKIMGDIR) -j $(JOBS) install
-@@ -75,9 +79,9 @@
+@@ -83,9 +88,9 @@
tkhtml : $(HTMLDIR)
- @echo "Installing TKHTML..."
+ @echo "Installing Tkhtml..."
cd $(HTMLDIR); CC='$(CC)' CFLAGS='$(OPTS) -DUSE_INTERP_RESULT' \
+ CPPFLAGS='$(CPPFLAGS)' \
+ LDFLAGS='$(LDFLAGS)' \
@@ -80,7 +80,7 @@ Description: Set the compile flags according to the Debian environment. We
$(MAKE) -C $(HTMLDIR) headers libtkhtml.a
--- a/Makefile
+++ b/Makefile
-@@ -196,7 +196,7 @@
+@@ -176,7 +176,7 @@
saotk : FORCE
@echo "Installing SAOTK..."
@@ -100,17 +100,6 @@ Description: Set the compile flags according to the Debian environment. We
-DTK_LOCAL_MAIN_HOOK=SAOLocalMainHook -c $(MAIN).c -o $@
$(MAIN).c : $(MAINDIR)/$(MAIN).c
---- a/checkdns/Makefile
-+++ b/checkdns/Makefile
-@@ -1,7 +1,7 @@
- include ../make.include
-
- # no ./configure
--CFLAGS = $(CCOPT) -I../include
-+CFLAGS += $(CCOPT) -I../include
-
- SRC = checkdns.c
-
--- a/hcompress/Makefile
+++ b/hcompress/Makefile
@@ -1,7 +1,7 @@
@@ -122,19 +111,6 @@ Description: Set the compile flags according to the Debian environment. We
SRC = hdecompress.c
---- a/iis/Makefile
-+++ b/iis/Makefile
-@@ -1,8 +1,8 @@
- include ../make.include
-
- # no ./configure and we need HAVE_SYS_UN_H set
--CXXFLAGS = $(CXXOPT) -I../include
--CFLAGS = $(CCOPT) -I../include
-+CXXFLAGS += $(CXXOPT) -I../include
-+CFLAGS += $(CCOPT) -I../include
-
- SRC = iistcl.C xim.C
- CSRC = iis.c util.c
--- a/plio/Makefile
+++ b/plio/Makefile
@@ -1,7 +1,7 @@
diff --git a/debian/patches/ds9_optional_doc_package.patch b/debian/patches/ds9_optional_doc_package.patch
index ad30b0c..bb11b2b 100644
--- a/debian/patches/ds9_optional_doc_package.patch
+++ b/debian/patches/ds9_optional_doc_package.patch
@@ -9,27 +9,31 @@ Description: Make the "-doc" package optional by disabling the help menu
+ global help
switch $ds9(wm) {
- x11 -
-@@ -20,28 +21,34 @@
- }
+ x11 {}
+@@ -20,34 +21,39 @@
+ win32 {}
}
-- $ds9(mb) add cascade -label [msgcat::mc {Help}] -menu $ds9(mb).help
+ if [ file exists $help(refman) ] {
+ set helpstate normal
+ } else {
+ set helpstate disabled
+ }
-+
-+ $ds9(mb) add cascade -label [msgcat::mc {Help}] -menu $ds9(mb).help
+ $ds9(mb) add cascade -label [msgcat::mc {Help}] -menu $ds9(mb).help
menu $ds9(mb).help
- $ds9(mb).help add command -label [msgcat::mc {Reference Manual}]\
-- -command HelpRef
-+ -command HelpRef -state $helpstate
+ switch $ds9(wm) {
+ x11 {
+ $ds9(mb).help add command -label [msgcat::mc {Reference Manual}]\
+- -command HelpRef
++ -command HelpRef -state $helpstate
+ }
+ aqua {}
+ win32 {}
+ }
$ds9(mb).help add command -label [msgcat::mc {User Manual}]\
- -command HelpUser
+ -command HelpUser -state $helpstate
- $ds9(mb).help add command -label [msgcat::mc {Mouse & Keyboard}] \
+ $ds9(mb).help add command -label [msgcat::mc {Mouse and Keyboard}] \
- -command HelpKeyboard
+ -command HelpKeyboard -state $helpstate
$ds9(mb).help add separator
diff --git a/debian/patches/ds9_use_external_libs.patch b/debian/patches/ds9_use_external_libs.patch
index f970963..7acf2a2 100644
--- a/debian/patches/ds9_use_external_libs.patch
+++ b/debian/patches/ds9_use_external_libs.patch
@@ -8,7 +8,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
CFLAGS= $(CCOPT) -I. -I../include -I$(X11INCLUDE)
-MAINDIR = ../$(TKDIR)/unix
-+MAINDIR = /usr/share/tcltk/tk$(shell . /usr/lib/tkConfig.sh ; echo $$TK_VERSION)
++MAINDIR = /usr/share/tcltk/tk$(shell . /usr/lib/tkConfig.sh ; echo $$TK_VERSION)
MAIN = tkAppInit
ZDIR = zipdir/zvfsmntpt
@@ -18,20 +18,20 @@ Description: Compile against external libraries of wcstools, funtools, ast,
- $(ZDIR)/$(TCLVER) \
- $(ZDIR)/tcl8 \
- $(ZDIR)/$(TKVER) \
-- $(ZDIR)/$(TLTVER) \
+- $(ZDIR)/$(TKBLTDIR) \
- $(ZDIR)/$(TCLLIBVER) \
- $(ZDIR)/$(TKCONVER) \
- $(ZDIR)/$(XMLRPCVER) \
$(ZDIR)/src \
$(ZDIR)/msgs \
$(ZDIR)/doc \
-@@ -23,42 +16,15 @@
+@@ -23,41 +16,14 @@
$(ZDIR)/template
LIBS = \
- ../lib/libsaotk.a \
../lib/libtkhtml.a \
- ../lib/libtkmpeg.a \
+- ../lib/$(TKMPEGDIR)/libtkmpeg1.0.a \
- ../lib/$(TCLXMLVER)/libTclxml3.2.a \
- ../lib/$(TKTABLEVER)/libTktable2.10.a \
- ../lib/$(TKIMGVER)/libtkimgpng1.4.a \
@@ -46,6 +46,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
- ../lib/$(TKIMGVER)/libtkimg1.4.a \
- ../lib/libtiff.a \
- ../lib/libfuntools.a \
++ ../lib/libtkmpeg1.0.a \
../lib/librice.a \
../lib/libhcomp.a \
../lib/libplio.a \
@@ -56,20 +57,20 @@ Description: Compile against external libraries of wcstools, funtools, ast,
- ../lib/libwcs.a \
- ../lib/libzvfs.a \
- ../lib/libxpa.a \
- ../lib/libiis.a \
- ../lib/libcheckdns.a \
+- ../lib/$(TCLIISDIR)/libtcliis1.0.a \
+- ../lib/$(TCLCHECKDNSDIR)/libtclcheckdns1.1.a \
- ../lib/libsignal_ext.a \
-- ../lib/libxxlib.a \
-- ../lib/$(TLTVER)/libtlt3.0.a \
+- ../lib/$(TKBLTDIR)/libtkblt3.0.a \
- ../lib/libtk8.6.a \
- ../lib/libtkstub8.6.a \
- ../lib/libtcl8.6.a \
- ../lib/libtclstub8.6.a
-+ ../lib/libxxlib.a
++ ../lib/libtcliis1.0.a \
++ ../lib/libtclcheckdns1.1.a
#--------------------------main
-@@ -86,11 +52,12 @@
+@@ -85,11 +51,12 @@
ds9Base : $(OBJS) $(LIBS)
$(RM) $@
@@ -81,7 +82,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
+ $(CXX) $(OPTS) $(LDFLAGS) -o $@ ds9.o tkAppInit.o ../lib/libsaotk.a \
+ -Wl,-Bdynamic -lstarlink_ast -lstarlink_ast_err \
+ -lstdc++ -Wl,-Bstatic -L../lib -lsaotk -lhcomp -lrice -lplio \
-+ -lxxlib -liis -ltkmpeg -ltkhtml -lcheckdns -Wl,-Bdynamic -Wl,--rpath,/usr/lib/saods9/tlt3.0 -ltlt3.0 \
++ -ltcliis1.0 -ltkmpeg1.0 -ltkhtml -ltclcheckdns1.1 -Wl,-Bdynamic -Wl,--rpath,/usr/lib/saods9/tkblt3.0 -ltkblt3.0 \
+ -lwcstools -lfuntools -ltk -ltcl -lz \
+ -L/usr/X11R6/lib -lX11 -ldl -lpthread -lxml2 -lXrandr
@@ -92,9 +93,9 @@ Description: Compile against external libraries of wcstools, funtools, ast,
@@ -22,29 +22,13 @@
int Zvfs_Mount(Tcl_Interp*, char*, char *);
- int Tlt_Init(Tcl_Interp*);
+ int Tkblt_Init(Tcl_Interp*);
- int Tktable_Init(Tcl_Interp*);
- int Checkdns_Init(Tcl_Interp*);
+ int Tclcheckdns_Init(Tcl_Interp*);
int Saotk_Init(Tcl_Interp*);
int Tkhtml_Init(Tcl_Interp*);
int Tkmpeg_Init(Tcl_Interp*);
@@ -111,7 +112,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
- int Tkimgwindow_Init(Tcl_Interp*);
-
- int Tclxpa_Init(Tcl_Interp*);
- int Iis_Init(Tcl_Interp*);
+ int Tcliis_Init(Tcl_Interp*);
- int Tclxml_Init(Tcl_Interp*);
- int Tclxml_libxml2_Init(Tcl_Interp*);
@@ -125,10 +126,10 @@ Description: Compile against external libraries of wcstools, funtools, ast,
return TCL_ERROR;
- Tcl_StaticPackage(interp,"Tk", Tk_Init, Tk_SafeInit);
- // tlt
- if (Tlt_Init(interp) == TCL_ERROR)
+ // Tkblt
+ if (Tkblt_Init(interp) == TCL_ERROR)
@@ -131,12 +114,6 @@
- Tcl_StaticPackage(interp, "tlt", Tlt_Init,
+ Tcl_StaticPackage(interp, "Tkblt", Tkblt_Init,
(Tcl_PackageInitProc*)NULL);
- // Tktable
@@ -137,8 +138,8 @@ Description: Compile against external libraries of wcstools, funtools, ast,
- Tcl_StaticPackage (interp, "Tktable", Tktable_Init,
- (Tcl_PackageInitProc*)NULL);
-
- // Checkdns
- if (Checkdns_Init(interp) == TCL_ERROR)
+ // Tclcheckdns
+ if (Tclcheckdns_Init(interp) == TCL_ERROR)
return TCL_ERROR;
@@ -155,12 +132,6 @@
Tcl_StaticPackage (interp, "tkhtml", Tkhtml_Init,
@@ -150,11 +151,11 @@ Description: Compile against external libraries of wcstools, funtools, ast,
- Tcl_StaticPackage (interp, "Tclxpa", Tclxpa_Init,
- (Tcl_PackageInitProc*)NULL);
-
- // IIS
- if (Iis_Init(interp) == TCL_ERROR)
+ // Tcliis
+ if (Tcliis_Init(interp) == TCL_ERROR)
return TCL_ERROR;
@@ -173,75 +144,5 @@
- Tcl_StaticPackage (interp, "tkmpeg", Tkmpeg_Init,
+ Tcl_StaticPackage (interp, "Tkmpeg", Tkmpeg_Init,
(Tcl_PackageInitProc*)NULL);
- // Tclxml
@@ -231,29 +232,28 @@ Description: Compile against external libraries of wcstools, funtools, ast,
}
--- a/Makefile.unix
+++ b/Makefile.unix
-@@ -87,15 +87,10 @@
- @echo "Installing unix..."
- $(MAKE) -C unix -j $(JOBS) install
+@@ -109,14 +109,10 @@
+ --enable-symbols
+ $(MAKE) -C $(TCLCHECKDNSDIR) -j $(JOBS) install
-distclean : tclclean tkclean \
-- tktableclean tltclean \
+- tktableclean tkbltclean \
- tclxmlclean tkimgclean tkmpegclean tkhtmlclean \
-- xpaclean iisclean checkdnsclean signalclean funtoolsclean \
+- xpaclean tcliisclean tclcheckdnsclean signalclean funtoolsclean \
- astclean wcssubsclean \
- riceclean hcompressclean plioclean \
-- unixclean \
- saotkclean zvfsclean ds9clean srcclean \
- filesclean dirsclean
+distclean : filesclean \
-+ tltclean tkmpegclean tkhtmlclean iisclean checkdnsclean \
-+ riceclean hcompressclean plioclean $(OPTDIRCLEAN) \
++ tkbltclean tkmpegclean tkhtmlclean tcliisclean tclcheckdnsclean \
++ riceclean hcompressclean plioclean $(OPTDIRCLEAN) \
+ saotkclean ds9clean srcclean dirsclean
- unixclean : FORCE
- $(MAKE) -C unix distclean
+ #--------------------------distribution
+
--- a/Makefile
+++ b/Makefile
-@@ -226,31 +226,8 @@
+@@ -215,31 +215,8 @@
dirsclean: FORCE
@for d in $(DIRS); do rm -rf $$d; done
@@ -266,8 +266,8 @@ Description: Compile against external libraries of wcstools, funtools, ast,
-tktableclean: FORCE
- $(MAKE) -C $(TKTABLEDIR) distclean
-
- tltclean: FORCE
-- $(MAKE) -C $(TLTDIR) distclean
+ tkbltclean: FORCE
+- $(MAKE) -C $(TKBLTDIR) distclean
-
-zlibclean: FORCE
- $(MAKE) -C $(ZLIBDIR) distclean
@@ -282,22 +282,22 @@ Description: Compile against external libraries of wcstools, funtools, ast,
-
-libtiffclean: FORCE
- $(MAKE) -C $(TKIMGDIR)/compat/libtiff distclean
-+ $(MAKE) -C $(TLTDIR) distclean || true
++ $(MAKE) -C $(TKBLTDIR) distclean || true
tkmpegclean: FORCE
$(MAKE) -C $(TKMPEGDIR) distclean
-@@ -259,27 +236,12 @@
+@@ -248,27 +225,12 @@
# cd $(HTMLDIR); $(MAKE) distclean
rm -rf $(HTMLDIR)
-xpaclean : FORCE
- $(MAKE) -C $(XPADIR) distclean
-
- iisclean : FORCE
- $(MAKE) -C $(IISDIR) distclean
+ tcliisclean : FORCE
+ $(MAKE) -C $(TCLIISDIR) distclean
- checkdnsclean : FORCE
- $(MAKE) -C $(CHECKDNSDIR) distclean
+ tclcheckdnsclean : FORCE
+ $(MAKE) -C $(TCLCHECKDNSDIR) distclean
-signalclean : FORCE
- $(MAKE) -C $(SIGNALDIR) distclean
@@ -314,7 +314,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
riceclean: FORCE
$(MAKE) -C $(RICEDIR) distclean
-@@ -292,9 +254,6 @@
+@@ -281,9 +243,6 @@
saotkclean : FORCE
$(MAKE) -C $(SAOTKDIR) distclean
@@ -326,7 +326,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
--- a/src/ds9.tcl
+++ b/src/ds9.tcl
-@@ -180,32 +180,35 @@
+@@ -202,32 +202,35 @@
# so we can still find our files
set ds9(root) [file normalize [file join [pwd] zvfsmntpt]]
@@ -366,7 +366,7 @@ Description: Compile against external libraries of wcstools, funtools, ast,
- source $ds9(root)/xmlrpc0.3/xmlrpc.tcl
+ package require tkcon
+ source $ds9(root)/src/xmlrpc.tcl
- source $ds9(root)/tlt3.0/graph.tcl
+ source $ds9(root)/tkblt3.0/graph.tcl
+ package require Tktable
+ package require tclxpa
@@ -384,4 +384,55 @@ Description: Compile against external libraries of wcstools, funtools, ast,
+
source $ds9(root)/src/source.tcl
- set tlt_library $ds9(root)/tlt3.0
+ set tkblt_library $ds9(root)/tkblt3.0
+--- a/tcliis1.0/Makefile.in
++++ b/tcliis1.0/Makefile.in
+@@ -80,7 +80,7 @@
+
+ PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION)
+ pkgdatadir = $(datadir)/$(PKG_DIR)
+-pkglibdir = $(libdir)/$(PKG_DIR)
++pkglibdir = $(libdir)
+ pkgincludedir = $(includedir)/$(PKG_DIR)
+
+ top_builddir = .
+@@ -155,7 +155,7 @@
+ # you do not compile with a similar machine setup as the Tcl core was
+ # compiled with.
+ #DEFS = $(TCL_DEFS) @DEFS@ $(PKG_CFLAGS)
+-DEFS = @DEFS@ $(PKG_CFLAGS)
++DEFS = @DEFS@ $(PKG_CFLAGS) -DUSE_TCL_STUBS
+
+ # Move pkgIndex.tcl to 'BINARIES' var if it is generated in the Makefile
+ CONFIG_CLEAN_FILES = Makefile pkgIndex.tcl
+--- a/tclcheckdns1.1/Makefile.in
++++ b/tclcheckdns1.1/Makefile.in
+@@ -80,7 +80,7 @@
+
+ PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION)
+ pkgdatadir = $(datadir)/$(PKG_DIR)
+-pkglibdir = $(libdir)/$(PKG_DIR)
++pkglibdir = $(libdir)
+ pkgincludedir = $(includedir)/$(PKG_DIR)
+
+ top_builddir = .
+--- a/tkmpeg1.0/Makefile.in
++++ b/tkmpeg1.0/Makefile.in
+@@ -80,7 +80,7 @@
+
+ PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION)
+ pkgdatadir = $(datadir)/$(PKG_DIR)
+-pkglibdir = $(libdir)/$(PKG_DIR)
++pkglibdir = $(libdir)
+ pkgincludedir = $(includedir)/$(PKG_DIR)
+
+ top_builddir = .
+@@ -155,7 +155,7 @@
+ # you do not compile with a similar machine setup as the Tcl core was
+ # compiled with.
+ #DEFS = $(TCL_DEFS) @DEFS@ $(PKG_CFLAGS)
+-DEFS = @DEFS@ $(PKG_CFLAGS)
++DEFS = @DEFS@ $(PKG_CFLAGS) -DUSE_TCL_STUBS
+
+ # Move pkgIndex.tcl to 'BINARIES' var if it is generated in the Makefile
+ CONFIG_CLEAN_FILES = Makefile pkgIndex.tcl
diff --git a/debian/patches/ds9_use_filesystem.patch b/debian/patches/ds9_use_filesystem.patch
index 79085e6..bb4a1ad 100644
--- a/debian/patches/ds9_use_filesystem.patch
+++ b/debian/patches/ds9_use_filesystem.patch
@@ -19,22 +19,6 @@ Description: Store all files in the usual FHS directories instead of
debug : ds9Base ds9.zip
$(RM) $@
-@@ -94,13 +89,8 @@
-
- CXXFLAGS = $(CXXOPT) -I. -I../include -I$(X11INCLUDE)
-
--ds9 : ds9Base ds9.zip
-- $(RM) $@
-- strip ds9Base
-- cat ds9Base ds9.zip > ds9
-- zip -A ds9
-- chmod 755 ds9
-- cp ds9 ../bin/.
-+ds9 : ds9Base $(FILES)
-+ cp ds9Base ../bin/ds9
-
- debug : ds9Base ds9.zip
- $(RM) $@
--- a/ds9/ds9.unix
+++ b/ds9/ds9.unix
@@ -16,10 +16,7 @@
@@ -47,8 +31,8 @@ Description: Store all files in the usual FHS directories instead of
- int Zvfs_Mount(Tcl_Interp*, char*, char *);
+ void Tcl_SetStartupScript(Tcl_Obj *path, const char *encoding);
- int Tlt_Init(Tcl_Interp*);
- int Checkdns_Init(Tcl_Interp*);
+ int Tkblt_Init(Tcl_Interp*);
+ int Tclcheckdns_Init(Tcl_Interp*);
@@ -52,13 +49,8 @@
// do this first
Tcl_FindExecutable((*argvPtr)[0]);
@@ -99,12 +83,12 @@ Description: Store all files in the usual FHS directories instead of
- Tcl_DStringFree(&pwd);
- }
-
- // Initialize Tcl and Tk
+ // Tcl
if (Tcl_Init(interp) == TCL_ERROR)
return TCL_ERROR;
--- a/src/ds9.tcl
+++ b/src/ds9.tcl
-@@ -178,7 +178,7 @@
+@@ -200,7 +200,7 @@
x11 {
# set to absolute path so that if -cd command is used,
# so we can still find our files
diff --git a/debian/patches/iis.patch b/debian/patches/iis.patch
index 02ba8de..1d247d1 100644
--- a/debian/patches/iis.patch
+++ b/debian/patches/iis.patch
@@ -1,186 +1,34 @@
Author: Justin Pryzby <justinpryzby at users.sf.net>
Description: Avoid compilation errors and warnings in the IRAF/IIS "imtool"
protocol module. The code is K&R C.
---- a/iis/iis.c
-+++ b/iis/iis.c
-@@ -5,10 +5,14 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
-+#include <string.h>
- #ifdef HAVE_SYS_UN_H
- #include <sys/un.h>
- #endif
- #include <fcntl.h>
-+#include <unistd.h>
-+#include <ctype.h>
-+#include <time.h>
-
- #include "iis.h"
- #include "xim.h"
-@@ -111,7 +115,7 @@
- * UNIX domain socket connection. All three types of server ports are
- * simultaneously ready to receive client connections.
- */
--xim_iisOpen (xim)
-+int xim_iisOpen (xim)
- register XimDataPtr xim;
- {
- int nopen = 0;
-@@ -141,7 +145,7 @@
- chan = &xim->chan[i];
- if (chan->id) {
- xim_removeInput (xim, chan->id);
-- chan->id = NULL;
-+ chan->id = 0;
- }
-
- switch (chan->type) {
-@@ -296,7 +300,7 @@
- fcntl(s, F_SETFD, FD_CLOEXEC);
-
- /* Allocate and fill in i/o channel descriptor. */
-- if (chan = get_iochan(xim)) {
-+ if ((chan = get_iochan(xim))) {
- chan->xim = (XtPointer) xim;
- chan->type = IO_INET;
- chan->datain = s;
-@@ -367,7 +371,7 @@
- fcntl(s, F_SETFD, FD_CLOEXEC);
-
- /* Allocate and fill in i/o channel descriptor. */
-- if (chan = get_iochan(xim)) {
-+ if ((chan = get_iochan(xim))) {
- chan->xim = (XtPointer) xim;
- chan->type = IO_UNIX;
- chan->datain = s;
-@@ -421,7 +425,7 @@
- } */
-
- /* Allocate and fill in i/o channel descriptor. */
-- if (chan = get_iochan(xim)) {
-+ if ((chan = get_iochan(xim))) {
- chan->xim = (XtPointer) xim;
- chan->type = chan_port->type;
- chan->datain = s;
-@@ -448,7 +452,7 @@
- close (chan->datain);
- if (chan->id) {
- xim_removeInput (chan->xim, chan->id);
-- chan->id = NULL;
-+ chan->id = 0;
- }
- chan->type = 0;
- break;
-@@ -464,7 +468,6 @@
- get_iochan (xim)
- register XimDataPtr xim;
- {
-- register IoChanPtr chan;
- register int i;
-
- for (i=0; i < XtNumber(xim->chan); i++)
-@@ -505,7 +508,7 @@
- if ((n = chan_read (datain, (char *)&iis, sizeof(iis))) < sizeof(iis)) {
- if (n != 0)
- fprintf (stderr,
-- "ximtool: command input read error, n=%d of %d, errno=%d\n",
-+ "ximtool: command input read error, n=%d of %lu, errno=%d\n",
- n, sizeof(iis), errno);
- if (n <= 0)
- xim_disconnectClient (chan);
-@@ -751,7 +754,7 @@
- */
- char emsg[SZ_WCSBUF];
- char *text;
-- int frame, wcsnum;
-+ int frame;
-
- memset ((char *)emsg, 0, SZ_WCSBUF);
-
-@@ -1038,7 +1041,7 @@
-
- /* DECODE_FRAMENO -- Decode encoded IIS register frame number.
- */
--static
-+static int
- decode_frameno (z)
- register int z;
- {
-@@ -1391,6 +1394,8 @@
- * elsewhere if needed, our only purpose here is to extract the frame WCS.
- */
-
-+void print_mappings (FrameBufPtr fr);
-+
- static void
- add_mapping (xim, ctran, wcsbuf, fr)
- register XimDataPtr xim;
-@@ -1482,8 +1487,7 @@
-
- /* PRINT_MAPPINGS -- Debug routine to print all mappings on a frame.
- */
--print_mappings (fr)
--FrameBufPtr fr;
-+void print_mappings (FrameBufPtr fr)
- {
- MappingPtr mp;
- register int i;
---- a/iis/iistcl.C
-+++ b/iis/iistcl.C
-@@ -42,6 +42,7 @@
- return copy;
- }
-
-+#if 0
- static char* toLower(char* str)
- {
- char* ptr = str;
-@@ -51,6 +52,7 @@
- }
- return str;
- }
-+#endif
-
- int Iis_Init(Tcl_Interp* interp) {
-
-@@ -150,7 +152,7 @@
- xim.chan[i].dataout = 0; // output channel
- xim.chan[i].keepalive = 0; // used to keep input fifo ready
- xim.chan[i].path[0] = '\0'; // for unix sockets
-- xim.chan[i].reference_frame;// reference (cmd i/o) frame
-+ xim.chan[i].reference_frame=0;// reference (cmd i/o) frame
- xim.chan[i].rf_p = NULL; // reference frame descriptor
- }
+--- a/tcliis1.0/iis.c
++++ b/tcliis1.0/iis.c
+@@ -225,7 +225,7 @@
}
---- a/iis/xim.C
-+++ b/iis/xim.C
+ done:
+ /* Allocate and fill in i/o channel descriptor. */
+- if (datain > 0 && dataout > 0 && (chan = get_iochan(xim))) {
++ if (datain > 0 && dataout > 0 && ((chan = get_iochan(xim)))) {
+ chan->xim = (XtPointer) xim;
+ chan->type = IO_FIFO;
+ chan->datain = datain;
+@@ -360,7 +360,7 @@
+ fcntl(s, F_SETFD, FD_CLOEXEC);
+
+ /* Allocate and fill in i/o channel descriptor. */
+- if (chan = get_iochan(xim)) {
++ if ((chan = get_iochan(xim))) {
+ chan->xim = (XtPointer) xim;
+ chan->type = IO_UNIX;
+ chan->datain = s;
+--- a/tcliis1.0/xim.C
++++ b/tcliis1.0/xim.C
@@ -19,7 +19,7 @@
- void iisIO(void* data, int mask)
+ void iisIO(ClientData data, int mask)
{
- int fd = (long)data;
+ int fd = *(long *)data;
if (IISDebug)
cerr << "iisIO() " << fd << ' ' << mask << endl;
-@@ -43,7 +43,7 @@
- iis->chan[fd] = chan;
- #ifndef __WIN32__
- Tcl_CreateFileHandler(fd, TCL_READABLE, (void (*)(void*,int))iisIO,
-- (void*)fd);
-+ &fd);
- #else
- Tcl_CreateEventSource(setupProc, checkProc, (void*)fd);
- #endif
---- a/iis/ximtool.h
-+++ b/iis/ximtool.h
-@@ -149,7 +149,7 @@
- /* Client IIS I/O channel. */
- typedef struct {
- XtPointer xim; /* backpointer to xim descriptor */
-- XtPointer id; /* input callback id */
-+ int id; /* input callback id */
- int type; /* channel type */
- int datain; /* input channel */
- int dataout; /* output channel */
diff --git a/debian/patches/saotk_add_ksearch.patch b/debian/patches/saotk_add_ksearch.patch
index 70b6640..3a4df04 100644
--- a/debian/patches/saotk_add_ksearch.patch
+++ b/debian/patches/saotk_add_ksearch.patch
@@ -3,7 +3,7 @@ Description: Insert the "ksearchh" routine that was originated by Doub Mink
in wcssubs so that fitsImage.c will compile.
--- a/saotk/frame/fitsimage.C
+++ b/saotk/frame/fitsimage.C
-@@ -30,7 +30,97 @@
+@@ -31,7 +31,97 @@
extern "C" {
FitsHead* wcshead = NULL;
FitsHead* wcsprim = NULL;
diff --git a/debian/patches/saotk_add_psscale.patch b/debian/patches/saotk_add_psscale.patch
index dfbe637..2eed26a 100644
--- a/debian/patches/saotk_add_psscale.patch
+++ b/debian/patches/saotk_add_psscale.patch
@@ -15,8 +15,8 @@ Description: The original code from ds9 uses a patched postscript code to allow
int WidgetConfigProc(Tcl_Interp* interp, Tk_Canvas canvas, Tk_Item* item,
@@ -558,7 +560,7 @@
- // starting with tk8.6, colors are W3C based, not X11
XColor* cc= NULL;
+ // starting with tk8.6, colors are W3C based, not X11
if (!strncmp(str,"green",5) || !strncmp(str,"GREEN",5))
- cc = Tk_GetColor(interp, tkwin, "lime");
+ cc = Tk_GetColor(interp, tkwin, "#32CD32");
diff --git a/debian/patches/tlt_fix_crash.patch b/debian/patches/tlt_fix_crash.patch
index 7ae2dfa..27c0734 100644
--- a/debian/patches/tlt_fix_crash.patch
+++ b/debian/patches/tlt_fix_crash.patch
@@ -24,20 +24,9 @@ Description: BLT crashes when it reaches this code. This seems to be some
TCL_OK)
goto error;
---- a/tlt3.0/bltFont.h
-+++ b/tlt3.0/bltFont.h
-@@ -35,6 +35,8 @@
- #ifndef _BLT_FONT_H
- #define _BLT_FONT_H
-
-+#include <X11/Xft/Xft.h>
-+
- #define FONT_ITALIC (1<<0)
- #define FONT_BOLD (1<<1)
-
--- a/saotk/frame/marker.C
+++ b/saotk/frame/marker.C
-@@ -1174,19 +1174,19 @@
+@@ -1187,19 +1187,19 @@
{
Blt_Vector* xx;
Blt_GetVector(parent->getInterp(), xname, &xx);
@@ -61,7 +50,7 @@ Description: BLT crashes when it reaches this code. This seems to be some
}
void Marker::analysisPlot3dResult(char* xname, char* yname,
-@@ -1195,11 +1195,11 @@
+@@ -1208,11 +1208,11 @@
{
Blt_Vector* xx;
Blt_GetVector(parent->getInterp(), xname, &xx);
@@ -75,7 +64,7 @@ Description: BLT crashes when it reaches this code. This seems to be some
}
void Marker::analysisPandaResult(double* x, double* y, double* e, int num)
-@@ -1216,15 +1216,15 @@
+@@ -1229,15 +1229,15 @@
{
Blt_Vector* xx;
Blt_GetVector(parent->getInterp(), xname, &xx);
@@ -94,25 +83,14 @@ Description: BLT crashes when it reaches this code. This seems to be some
}
Matrix Marker::fwdMatrix()
---- a/tlt3.0/bltInt.h
-+++ b/tlt3.0/bltInt.h
-@@ -317,8 +317,6 @@
- extern Tcl_AppInitProc Blt_GraphCmdInitProc;
- extern Tcl_AppInitProc Blt_VectorCmdInitProc;
+--- a/tkblt3.0/configure.in
++++ b/tkblt3.0/configure.in
+@@ -179,7 +179,7 @@
+ # building as a shared library instead of a static library.
+ #--------------------------------------------------------------------
--extern int TclGetLong(Tcl_Interp *interp, const char *s, long *longPtr);
--
- extern int sprintf_s(char *s, size_t size, const char *fmt, /*args*/ ...);
-
- extern void Blt_Panic TCL_VARARGS(const char *, args);
---- a/tlt3.0/bltUtil.c
-+++ b/tlt3.0/bltUtil.c
-@@ -61,7 +61,7 @@
- }
- }
+-#TEA_ENABLE_SHARED
++TEA_ENABLE_SHARED
--int TclGetLong(
-+int TclGetLong_unused(
- Tcl_Interp *interp, /* Interpreter used for error reporting if not
- * NULL. */
- CONST char *src, /* String containing a (possibly signed) long
+ #--------------------------------------------------------------------
+ # This macro figures out what flags to use with the compiler/linker
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/saods9.git
More information about the debian-science-commits
mailing list