[saods9] 01/02: Reorganize patches
Ole Streicher
olebole at moszumanska.debian.org
Wed Jul 8 08:53:30 UTC 2015
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch experimental
in repository saods9.
commit abc790c5e3d8cc176de28d727306cec380a8014e
Author: Ole Streicher <debian at liska.ath.cx>
Date: Wed Jul 8 10:26:13 2015 +0200
Reorganize patches
---
debian/patches/ds9_make_linux.patch | 4 +-
debian/patches/ds9_use_filesystem.patch | 14 +-
...ternal_libs.patch => ds9_use_shared_libs.patch} | 432 ++++++---------------
debian/patches/ds9_use_tcltk_packages.patch | 237 +++++++++++
debian/patches/saotk_fix_funtools_includes.patch | 29 --
..._wcstools.patch => saotk_use_system_libs.patch} | 33 ++
debian/patches/series | 8 +-
7 files changed, 410 insertions(+), 347 deletions(-)
diff --git a/debian/patches/ds9_make_linux.patch b/debian/patches/ds9_make_linux.patch
index 2fcff6b..4a2c632 100644
--- a/debian/patches/ds9_make_linux.patch
+++ b/debian/patches/ds9_make_linux.patch
@@ -87,9 +87,9 @@ Description: Set the compile flags according to the Debian environment. We
-CFLAGS= $(CCOPT) -I. -I../include -I$(X11INCLUDE)
+CFLAGS:= $(CCOPT) -I. -I../include -I$(X11INCLUDE)
- MAINDIR = /usr/share/tcltk/tk$(shell . /usr/lib/tkConfig.sh ; echo $$TK_VERSION)
+ MAINDIR = ../$(TKDIR)/unix
MAIN = tkAppInit
-@@ -27,7 +27,7 @@
+@@ -63,7 +63,7 @@
ifneq (,$(findstring linux,$(ARCH)))
diff --git a/debian/patches/ds9_use_filesystem.patch b/debian/patches/ds9_use_filesystem.patch
index 7206033..11ad699 100644
--- a/debian/patches/ds9_use_filesystem.patch
+++ b/debian/patches/ds9_use_filesystem.patch
@@ -8,7 +8,7 @@ Description: Store all files in the usual FHS directories
ds9, which is used for testing.
--- a/ds9/Makefile.unix
+++ b/ds9/Makefile.unix
-@@ -29,13 +29,8 @@
+@@ -65,13 +65,8 @@
CXXFLAGS := $(CXXOPT) -I. -I../include -I$(X11INCLUDE)
@@ -36,9 +36,9 @@ Description: Store all files in the usual FHS directories
- int Zvfs_Mount(Tcl_Interp*, char*, char *);
+ void Tcl_SetStartupScript(Tcl_Obj *path, const char *encoding);
- int Tkhtml_Init(Tcl_Interp*);
- }
-@@ -44,13 +41,15 @@
+ int Tkblt_Init(Tcl_Interp*);
+ int Tktable_Init(Tcl_Interp*);
+@@ -68,13 +65,15 @@
// do this first
Tcl_FindExecutable((*argvPtr)[0]);
@@ -60,7 +60,7 @@ Description: Store all files in the usual FHS directories
Tcl_SetStartupScript(path, NULL);
return TCL_OK;
-@@ -61,37 +60,6 @@
+@@ -85,37 +84,6 @@
// save interp for cputs function
global_interp = interp;
@@ -114,5 +114,5 @@ Description: Store all files in the usual FHS directories
+ set ds9(root) "/usr/share/saods9"
+ }
- package require msgcat
- package require http
+ if {![namespace exists msgcat]} {
+ source $ds9(root)/tcl8/8.5/msgcat-1.5.2.tm
diff --git a/debian/patches/ds9_use_external_libs.patch b/debian/patches/ds9_use_shared_libs.patch
similarity index 57%
rename from debian/patches/ds9_use_external_libs.patch
rename to debian/patches/ds9_use_shared_libs.patch
index 9a9b023..6ad5c69 100644
--- a/debian/patches/ds9_use_external_libs.patch
+++ b/debian/patches/ds9_use_shared_libs.patch
@@ -1,11 +1,12 @@
-Author: Sebastien Fabbro <bicatali at gentoo.org>, and others
-Description: Compile against external libraries of funtools, ast,
- and tk etc. instead of the convienience copies provided by ds9.
+Author: Ole Streicher <olebole at debian.org>
+Description: Link against shared libraries.
+ Use system provided libs of funtools, ast etc. instead of the convienience copies
+ provided by ds9, and use tcl/tk packages wherever possible.
--- a/ds9/Makefile.unix
+++ b/ds9/Makefile.unix
@@ -2,20 +2,13 @@
- CFLAGS= $(CCOPT) -I. -I../include -I$(X11INCLUDE)
+ CFLAGS:= $(CCOPT) -I. -I../include -I$(X11INCLUDE)
-MAINDIR = ../$(TKDIR)/unix
+MAINDIR = /usr/share/tcltk/tk$(shell . /usr/lib/tkConfig.sh ; echo $$TK_VERSION)
@@ -25,12 +26,12 @@ Description: Compile against external libraries of funtools, ast,
$(ZDIR)/src \
$(ZDIR)/msgs \
$(ZDIR)/doc \
-@@ -23,37 +16,7 @@
+@@ -23,37 +16,11 @@
$(ZDIR)/template
LIBS = \
- ../lib/$(SAOTKVER)/libsaotk1.0.a \
-- ../lib/libtkhtml.a \
+ ../lib/libtkhtml.a \
- ../lib/$(TKMPEGDIR)/libtkmpeg1.0.a \
- ../lib/$(TCLXMLVER)/libTclxml3.2.a \
- ../lib/$(TKTABLEVER)/libTktable2.10.a \
@@ -49,10 +50,11 @@ Description: Compile against external libraries of funtools, ast,
- ../lib/libast.a \
- ../lib/libast_err.a \
- ../lib/libast_pal.a \
-- ../lib/$(SAOTKVER)/libsaotk1.0.a \
+ ../lib/$(SAOTKVER)/libsaotk1.0.a \
- ../lib/libzvfs.a \
- ../lib/libxpa.a \
-- ../lib/$(TCLIISDIR)/libtcliis1.0.a \
++ ../lib/$(TKMPEGDIR)/libtkmpeg1.0.a \
+ ../lib/$(TCLIISDIR)/libtcliis1.0.a \
- ../lib/$(TCLCHECKDNSDIR)/libtclcheckdns1.1.a \
- ../lib/libsignal_ext.a \
- ../lib/$(TKBLTDIR)/libtkblt3.0.a \
@@ -60,11 +62,11 @@ Description: Compile against external libraries of funtools, ast,
- ../lib/libtkstub8.6.a \
- ../lib/libtcl8.6.a \
- ../lib/libtclstub8.6.a
-+ ../lib/libtkhtml.a
++ ../lib/$(TCLCHECKDNSDIR)/libtclcheckdns1.1.a
#--------------------------main
-@@ -81,11 +44,9 @@
+@@ -76,11 +43,9 @@
ds9Base : $(OBJS) $(LIBS)
$(RM) $@
@@ -79,18 +81,108 @@ Description: Compile against external libraries of funtools, ast,
endif
+--- a/Makefile.unix
++++ b/Makefile.unix
+@@ -50,13 +50,9 @@
+ $(MAKE) -C $(HTMLDIR) headers libtkhtml.a
+ cp $(HTMLDIR)/libtkhtml.a lib/.
+
+-distclean : tclclean tkclean \
+- tktableclean tkbltclean \
+- tclxmlclean tkimgclean tkmpegclean tkhtmlclean \
+- xpaclean tcliisclean tclcheckdnsclean signalclean funtoolsclean \
+- astclean \
+- saotkclean zvfsclean ds9clean \
+- srcclean filesclean dirsclean
++distclean : filesclean \
++ tkmpegclean tkhtmlclean tcliisclean tclcheckdnsclean \
++ saotkclean ds9clean srcclean dirsclean
+
+ #--------------------------distribution
+
+--- a/Makefile
++++ b/Makefile
+@@ -282,68 +282,21 @@
+ find . -name "*stackdump*" -exec rm {} \;
+ endif
+
+-tclclean : FORCE
+- $(MAKE) -C $(TCLDIRDIR) distclean
+-
+-tkclean : FORCE
+- $(MAKE) -C $(TKDIRDIR) distclean
+-
+-astclean: FORCE
+- $(MAKE) -C $(ASTDIR) distclean
+-
+-funtoolsclean: FORCE
+- $(MAKE) -C $(FUNTOOLSDIR) distclean
+-
+ saotkclean : FORCE
+ $(MAKE) -C $(SAOTKDIR) distclean
+
+-signalclean : FORCE
+- $(MAKE) -C $(SIGNALDIR) distclean
+-
+ tclcheckdnsclean : FORCE
+ $(MAKE) -C $(TCLCHECKDNSDIR) distclean
+
+ tcliisclean : FORCE
+ $(MAKE) -C $(TCLIISDIR) distclean
+
+-tclxmlclean: FORCE
+- $(MAKE) -C $(TCLXMLDIR) distclean
+-
+-tktableclean: FORCE
+- $(MAKE) -C $(TKTABLEDIR) distclean
+-
+-tkbltclean: FORCE
+- $(MAKE) -C $(TKBLTDIR) distclean
+-
+ tkhtmlclean: FORCE
+ rm -rf $(HTMLDIR)
+
+-tkimgclean: libtiffclean
+- rm -fr $(TKIMGDIR)/Img/*
+- rm -fr lib/Img1.*
+- $(MAKE) -C $(TKIMGDIR) distclean
+-
+-libtiffclean: FORCE
+- $(MAKE) -C $(TKIMGDIR)/compat/libtiff distclean
+-
+-tkmacosxclean : FORCE
+- $(MAKE) -C $(TKMACOSXDIR) distclean
+-
+ tkmpegclean: FORCE
+ $(MAKE) -C $(TKMPEGDIR) distclean
+
+-tkwinclean : FORCE
+- $(MAKE) -C $(TKWINDIR) distclean
+-
+-xpaclean : FORCE
+- $(MAKE) -C $(XPADIR) distclean
+-
+-zlibclean: FORCE
+- $(MAKE) -C $(ZLIBDIR) distclean
+-
+-zvfsclean: FORCE
+- $(MAKE) -C $(ZVFSDIR) distclean
+-
+ srcclean : FORCE
+ $(MAKE) -C $(SRCDIR) distclean
+
--- a/ds9/ds9.unix
+++ b/ds9/ds9.unix
-@@ -21,41 +21,11 @@
- int Zvfs_Init(Tcl_Interp*);
- int Zvfs_Mount(Tcl_Interp*, char*, char *);
+@@ -18,31 +18,11 @@
+
+ void Tcl_SetStartupScript(Tcl_Obj *path, const char *encoding);
- int Tkblt_Init(Tcl_Interp*);
- int Tktable_Init(Tcl_Interp*);
-- int Tclcheckdns_Init(Tcl_Interp*);
-- int Saotk_Init(Tcl_Interp*);
+ int Tclcheckdns_Init(Tcl_Interp*);
+ int Saotk_Init(Tcl_Interp*);
int Tkhtml_Init(Tcl_Interp*);
-- int Tkmpeg_Init(Tcl_Interp*);
+ int Tkmpeg_Init(Tcl_Interp*);
-
- int Tkimg_Init(Tcl_Interp*);
- int Zlibtcl_Init(Tcl_Interp*);
@@ -104,7 +196,7 @@ Description: Compile against external libraries of funtools, ast,
- int Tkimgwindow_Init(Tcl_Interp*);
-
- int Tclxpa_Init(Tcl_Interp*);
-- int Tcliis_Init(Tcl_Interp*);
+ int Tcliis_Init(Tcl_Interp*);
-
- int Tclxml_Init(Tcl_Interp*);
- int Tclxml_libxml2_Init(Tcl_Interp*);
@@ -113,22 +205,10 @@ Description: Compile against external libraries of funtools, ast,
}
Tcl_Interp *global_interp;
-
--void internalError(const char* msg)
--{
-- Tcl_SetVar2(global_interp, "ds9", "msg", msg, TCL_GLOBAL_ONLY);
-- Tcl_SetVar2(global_interp, "ds9", "msg,level", "error", TCL_GLOBAL_ONLY);
--}
--
- // currently use relative path
- // using full path with spaces causes problems
- // with htmwidget and tcl/tk
-@@ -123,31 +93,6 @@
- // Tk
- if (Tk_Init(interp) == TCL_ERROR)
+@@ -93,18 +73,6 @@
return TCL_ERROR;
-- Tcl_StaticPackage(interp,"Tk", Tk_Init, Tk_SafeInit);
--
+ Tcl_StaticPackage(interp,"Tk", Tk_Init, Tk_SafeInit);
+
- // Tkblt
- if (Tkblt_Init(interp) == TCL_ERROR)
- return TCL_ERROR;
@@ -141,21 +221,10 @@ Description: Compile against external libraries of funtools, ast,
- Tcl_StaticPackage (interp, "Tktable", Tktable_Init,
- (Tcl_PackageInitProc*)NULL);
-
-- // Tclcheckdns
-- if (Tclcheckdns_Init(interp) == TCL_ERROR)
-- return TCL_ERROR;
-- Tcl_StaticPackage (interp, "Tclcheckdns", Tclcheckdns_Init,
-- (Tcl_PackageInitProc*)NULL);
--
-- // Saotk
-- if (Saotk_Init(interp) == TCL_ERROR)
-- return TCL_ERROR;
-- Tcl_StaticPackage (interp, "saotk", Saotk_Init,
-- (Tcl_PackageInitProc*)NULL);
-
- // Tkhtml
- if (Tkhtml_Init(interp) == TCL_ERROR)
-@@ -155,93 +100,5 @@
+ // Tclcheckdns
+ if (Tclcheckdns_Init(interp) == TCL_ERROR)
+ return TCL_ERROR;
+@@ -123,12 +91,6 @@
Tcl_StaticPackage (interp, "tkhtml", Tkhtml_Init,
(Tcl_PackageInitProc*)NULL);
@@ -165,18 +234,13 @@ Description: Compile against external libraries of funtools, ast,
- Tcl_StaticPackage (interp, "Tclxpa", Tclxpa_Init,
- (Tcl_PackageInitProc*)NULL);
-
-- // Tcliis
-- if (Tcliis_Init(interp) == TCL_ERROR)
-- return TCL_ERROR;
-- Tcl_StaticPackage (interp, "Tcliis", Tcliis_Init,
-- (Tcl_PackageInitProc*)NULL);
--
-- // Tkmpeg
-- if (Tkmpeg_Init(interp) == TCL_ERROR)
-- return TCL_ERROR;
-- Tcl_StaticPackage (interp, "Tkmpeg", Tkmpeg_Init,
-- (Tcl_PackageInitProc*)NULL);
--
+ // Tcliis
+ if (Tcliis_Init(interp) == TCL_ERROR)
+ return TCL_ERROR;
+@@ -141,75 +103,6 @@
+ Tcl_StaticPackage (interp, "Tkmpeg", Tkmpeg_Init,
+ (Tcl_PackageInitProc*)NULL);
+
- // Tclxml
- if (Tclxml_Init(interp) == TCL_ERROR)
- return TCL_ERROR;
@@ -246,140 +310,14 @@ Description: Compile against external libraries of funtools, ast,
- return TCL_ERROR;
- Tcl_StaticPackage (interp, "signal", Signal_ext_Init,
- (Tcl_PackageInitProc*)NULL);
--
+
return TCL_OK;
}
---- a/Makefile.unix
-+++ b/Makefile.unix
-@@ -50,13 +50,9 @@
- $(MAKE) -C $(HTMLDIR) headers libtkhtml.a
- cp $(HTMLDIR)/libtkhtml.a lib/.
-
--distclean : tclclean tkclean \
-- tktableclean tkbltclean \
-- tclxmlclean tkimgclean tkmpegclean tkhtmlclean \
-- xpaclean tcliisclean tclcheckdnsclean signalclean funtoolsclean \
-- astclean \
-- saotkclean zvfsclean ds9clean \
-- srcclean filesclean dirsclean
-+distclean : filesclean \
-+ tkmpegclean tkhtmlclean tcliisclean tclcheckdnsclean \
-+ saotkclean ds9clean srcclean dirsclean
-
- #--------------------------distribution
-
---- a/Makefile
-+++ b/Makefile
-@@ -128,7 +128,7 @@
- ./configure \
- $(WITHTCL) $(WITHTK) \
- --prefix $(root) --exec-prefix $(root) \
-- --disable-shared \
-+ --enable-shared \
- --enable-symbols
- $(MAKE) -C $(SAOTKDIR) -j $(JOBS) install
-
-@@ -142,7 +142,7 @@
- ./configure \
- $(WITHTCL) \
- --prefix $(root) --exec-prefix $(root) \
-- --disable-shared \
-+ --enable-shared \
- --enable-symbols
- $(MAKE) -C $(TCLCHECKDNSDIR) -j $(JOBS) install
-
-@@ -152,7 +152,7 @@
- ./configure \
- $(WITHTCL) \
- --prefix $(root) --exec-prefix $(root) \
-- --disable-shared \
-+ --enable-shared \
- --enable-symbols
- $(MAKE) -C $(TCLIISDIR) -j $(JOBS) install
-
-@@ -209,7 +209,7 @@
- ./configure \
- $(WITHTCL) $(WITHTK) \
- --prefix $(root) --exec-prefix $(root) \
-- --disable-shared \
-+ --enable-shared \
- --enable-symbols
- $(MAKE) -C $(TKMPEGDIR) -j $(JOBS) install
-
-@@ -282,68 +282,21 @@
- find . -name "*stackdump*" -exec rm {} \;
- endif
-
--tclclean : FORCE
-- $(MAKE) -C $(TCLDIRDIR) distclean
--
--tkclean : FORCE
-- $(MAKE) -C $(TKDIRDIR) distclean
--
--astclean: FORCE
-- $(MAKE) -C $(ASTDIR) distclean
--
--funtoolsclean: FORCE
-- $(MAKE) -C $(FUNTOOLSDIR) distclean
--
- saotkclean : FORCE
- $(MAKE) -C $(SAOTKDIR) distclean
-
--signalclean : FORCE
-- $(MAKE) -C $(SIGNALDIR) distclean
--
- tclcheckdnsclean : FORCE
- $(MAKE) -C $(TCLCHECKDNSDIR) distclean
-
- tcliisclean : FORCE
- $(MAKE) -C $(TCLIISDIR) distclean
-
--tclxmlclean: FORCE
-- $(MAKE) -C $(TCLXMLDIR) distclean
--
--tktableclean: FORCE
-- $(MAKE) -C $(TKTABLEDIR) distclean
--
--tkbltclean: FORCE
-- $(MAKE) -C $(TKBLTDIR) distclean
--
- tkhtmlclean: FORCE
- rm -rf $(HTMLDIR)
-
--tkimgclean: libtiffclean
-- rm -fr $(TKIMGDIR)/Img/*
-- rm -fr lib/Img1.*
-- $(MAKE) -C $(TKIMGDIR) distclean
--
--libtiffclean: FORCE
-- $(MAKE) -C $(TKIMGDIR)/compat/libtiff distclean
--
--tkmacosxclean : FORCE
-- $(MAKE) -C $(TKMACOSXDIR) distclean
--
- tkmpegclean: FORCE
- $(MAKE) -C $(TKMPEGDIR) distclean
-
--tkwinclean : FORCE
-- $(MAKE) -C $(TKWINDIR) distclean
--
--xpaclean : FORCE
-- $(MAKE) -C $(XPADIR) distclean
--
--zlibclean: FORCE
-- $(MAKE) -C $(ZLIBDIR) distclean
--
--zvfsclean: FORCE
-- $(MAKE) -C $(ZVFSDIR) distclean
--
- srcclean : FORCE
- $(MAKE) -C $(SRCDIR) distclean
-
--- a/src/ds9.tcl
+++ b/src/ds9.tcl
-@@ -199,31 +199,37 @@
- # so we can still find our files
- set ds9(root) [file normalize [file join [pwd] zvfsmntpt]]
+@@ -204,31 +204,33 @@
+ set ds9(root) "/usr/share/saods9"
+ }
- if {![namespace exists msgcat]} {
- source $ds9(root)/tcl8/8.5/msgcat-1.5.2.tm
@@ -420,10 +358,6 @@ Description: Compile against external libraries of funtools, ast,
+ package require tkcon
+ source $ds9(root)/src/xmlrpc.tcl
+ package require BLT
-+ package require saotk
-+ package require tcliis
-+ package require tclcheckdns
-+ package require tkmpeg
+ package require Tktable
+ package require tclxpa
+ package require Signal
@@ -440,115 +374,3 @@ Description: Compile against external libraries of funtools, ast,
source $ds9(root)/src/source.tcl
---- a/tclcheckdns1.1/configure.in
-+++ b/tclcheckdns1.1/configure.in
-@@ -155,7 +155,7 @@
- # link against the non-stubbed Tcl library. Add Tk too if necessary.
- #--------------------------------------------------------------------
-
--AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
-+#AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
- #AC_DEFINE(USE_TK_STUBS, 1, [Use Tk stubs])
- SHLIB_LD_LIBS='${LIBS} -lstdc++'
-
---- a/tcliis1.0/configure.in
-+++ b/tcliis1.0/configure.in
-@@ -162,7 +162,7 @@
- # link against the non-stubbed Tcl library. Add Tk too if necessary.
- #--------------------------------------------------------------------
-
--AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
-+#AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
- #AC_DEFINE(USE_TK_STUBS, 1, [Use Tk stubs])
- SHLIB_LD_LIBS='${LIBS} -lstdc++'
-
---- a/tkmpeg1.0/configure.in
-+++ b/tkmpeg1.0/configure.in
-@@ -158,8 +158,8 @@
- # link against the non-stubbed Tcl library. Add Tk too if necessary.
- #--------------------------------------------------------------------
-
--AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
--AC_DEFINE(USE_TK_STUBS, 1, [Use Tk stubs])
-+#AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
-+#AC_DEFINE(USE_TK_STUBS, 1, [Use Tk stubs])
- SHLIB_LD_LIBS='${LIBS} -lstdc++'
-
- #--------------------------------------------------------------------
---- a/saotk/configure.in
-+++ b/saotk/configure.in
-@@ -356,9 +356,9 @@
- # link against the non-stubbed Tcl library. Add Tk too if necessary.
- #--------------------------------------------------------------------
-
--AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
-+#AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
- #AC_DEFINE(USE_TK_STUBS, 1, [Use Tk stubs])
--SHLIB_LD_LIBS='${LIBS} -lstdc++'
-+SHLIB_LD_LIBS='${LIBS} -lstdc++ -lstarlink_ast -lstarlink_ast_err -lfuntools -lwcstools -lBLT -lxml2'
-
- #--------------------------------------------------------------------
- # This macro generates a line to use when building a library. It
---- a/tclcheckdns1.1/checkdns.C
-+++ b/tclcheckdns1.1/checkdns.C
-@@ -163,7 +163,7 @@
-
- Tcl_CreateObjCommand(interp, "checkdns", TclcheckdnsCmd,
- (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
-- Tcl_PkgProvide(interp, "Tclcheckdns", "1.1");
-+ Tcl_PkgProvide(interp, "tclcheckdns", "1.1");
-
- return TCL_OK;
- }
---- a/tcliis1.0/iistcl.C
-+++ b/tcliis1.0/iistcl.C
-@@ -49,7 +49,7 @@
-
- // Define Package Name
-
-- if (Tcl_PkgProvide(interp, "Tcliis", "1.0") == TCL_ERROR)
-+ if (Tcl_PkgProvide(interp, "tcliis", "1.0") == TCL_ERROR)
- return TCL_ERROR;
-
- // Commands
---- a/tkmpeg1.0/tkmpeg.C
-+++ b/tkmpeg1.0/tkmpeg.C
-@@ -22,7 +22,7 @@
- int Tkmpeg_Init(Tcl_Interp* interp) {
-
- // Define Package Name
-- if (Tcl_PkgProvide(interp, "Tkmpeg", "1.0") == TCL_ERROR)
-+ if (Tcl_PkgProvide(interp, "tkmpeg", "1.0") == TCL_ERROR)
- return TCL_ERROR;
-
- // Commands
---- a/saotk/util/saotk.C
-+++ b/saotk/util/saotk.C
-@@ -27,6 +27,7 @@
- extern int PannerTrueColor_Init(Tcl_Interp*);
-
- extern int MagnifierTrueColor_Init(Tcl_Interp*);
-+static Tcl_Interp *global_interp;
-
- extern "C" {
- int Saotk_Init(Tcl_Interp* interp);
-@@ -90,6 +91,8 @@
- if (Tcl_PkgProvide(interp, "saotk", "1.0") == TCL_ERROR)
- return TCL_ERROR;
-
-+ global_interp = interp;
-+
- return TCL_OK;
- }
-
-@@ -97,3 +100,10 @@
- {
- return TCL_OK;
- }
-+
-+void internalError(const char* msg)
-+{
-+ Tcl_SetVar2(global_interp, "ds9", "msg", msg, TCL_GLOBAL_ONLY);
-+ Tcl_SetVar2(global_interp, "ds9", "msg,level", "error", TCL_GLOBAL_ONLY);
-+}
-+
diff --git a/debian/patches/ds9_use_tcltk_packages.patch b/debian/patches/ds9_use_tcltk_packages.patch
new file mode 100644
index 0000000..85a5800
--- /dev/null
+++ b/debian/patches/ds9_use_tcltk_packages.patch
@@ -0,0 +1,237 @@
+--- a/ds9/Makefile.unix
++++ b/ds9/Makefile.unix
+@@ -16,11 +16,7 @@
+ $(ZDIR)/template
+
+ LIBS = \
+- ../lib/libtkhtml.a \
+- ../lib/$(SAOTKVER)/libsaotk1.0.a \
+- ../lib/$(TKMPEGDIR)/libtkmpeg1.0.a \
+- ../lib/$(TCLIISDIR)/libtcliis1.0.a \
+- ../lib/$(TCLCHECKDNSDIR)/libtclcheckdns1.1.a
++ ../lib/libtkhtml.a
+
+ #--------------------------main
+
+--- a/ds9/ds9.unix
++++ b/ds9/ds9.unix
+@@ -17,22 +17,11 @@
+ int SAOLocalMainHook(int* argc, char*** argv);
+
+ void Tcl_SetStartupScript(Tcl_Obj *path, const char *encoding);
+-
+- int Tclcheckdns_Init(Tcl_Interp*);
+- int Saotk_Init(Tcl_Interp*);
+ int Tkhtml_Init(Tcl_Interp*);
+- int Tkmpeg_Init(Tcl_Interp*);
+- int Tcliis_Init(Tcl_Interp*);
+ }
+
+ Tcl_Interp *global_interp;
+
+-void internalError(const char* msg)
+-{
+- Tcl_SetVar2(global_interp, "ds9", "msg", msg, TCL_GLOBAL_ONLY);
+- Tcl_SetVar2(global_interp, "ds9", "msg,level", "error", TCL_GLOBAL_ONLY);
+-}
+-
+ // currently use relative path
+ // using full path with spaces causes problems
+ // with htmwidget and tcl/tk
+@@ -73,36 +62,11 @@
+ return TCL_ERROR;
+ Tcl_StaticPackage(interp,"Tk", Tk_Init, Tk_SafeInit);
+
+- // Tclcheckdns
+- if (Tclcheckdns_Init(interp) == TCL_ERROR)
+- return TCL_ERROR;
+- Tcl_StaticPackage (interp, "Tclcheckdns", Tclcheckdns_Init,
+- (Tcl_PackageInitProc*)NULL);
+-
+- // Saotk
+- if (Saotk_Init(interp) == TCL_ERROR)
+- return TCL_ERROR;
+- Tcl_StaticPackage (interp, "saotk", Saotk_Init,
+- (Tcl_PackageInitProc*)NULL);
+-
+ // Tkhtml
+ if (Tkhtml_Init(interp) == TCL_ERROR)
+ return TCL_ERROR;
+ Tcl_StaticPackage (interp, "tkhtml", Tkhtml_Init,
+ (Tcl_PackageInitProc*)NULL);
+
+- // Tcliis
+- if (Tcliis_Init(interp) == TCL_ERROR)
+- return TCL_ERROR;
+- Tcl_StaticPackage (interp, "Tcliis", Tcliis_Init,
+- (Tcl_PackageInitProc*)NULL);
+-
+- // Tkmpeg
+- if (Tkmpeg_Init(interp) == TCL_ERROR)
+- return TCL_ERROR;
+- Tcl_StaticPackage (interp, "Tkmpeg", Tkmpeg_Init,
+- (Tcl_PackageInitProc*)NULL);
+-
+-
+ return TCL_OK;
+ }
+--- a/src/ds9.tcl
++++ b/src/ds9.tcl
+@@ -218,6 +218,10 @@
+ package require tkcon
+ source $ds9(root)/src/xmlrpc.tcl
+ package require BLT
++ package require saotk
++ package require tcliis
++ package require tclcheckdns
++ package require tkmpeg
+ package require Tktable
+ package require tclxpa
+ package require Signal
+--- a/Makefile
++++ b/Makefile
+@@ -128,7 +128,7 @@
+ ./configure \
+ $(WITHTCL) $(WITHTK) \
+ --prefix $(root) --exec-prefix $(root) \
+- --disable-shared \
++ --enable-shared \
+ --enable-symbols
+ $(MAKE) -C $(SAOTKDIR) -j $(JOBS) install
+
+@@ -142,7 +142,7 @@
+ ./configure \
+ $(WITHTCL) \
+ --prefix $(root) --exec-prefix $(root) \
+- --disable-shared \
++ --enable-shared \
+ --enable-symbols
+ $(MAKE) -C $(TCLCHECKDNSDIR) -j $(JOBS) install
+
+@@ -152,7 +152,7 @@
+ ./configure \
+ $(WITHTCL) \
+ --prefix $(root) --exec-prefix $(root) \
+- --disable-shared \
++ --enable-shared \
+ --enable-symbols
+ $(MAKE) -C $(TCLIISDIR) -j $(JOBS) install
+
+@@ -209,7 +209,7 @@
+ ./configure \
+ $(WITHTCL) $(WITHTK) \
+ --prefix $(root) --exec-prefix $(root) \
+- --disable-shared \
++ --enable-shared \
+ --enable-symbols
+ $(MAKE) -C $(TKMPEGDIR) -j $(JOBS) install
+
+--- a/tclcheckdns1.1/configure.in
++++ b/tclcheckdns1.1/configure.in
+@@ -155,7 +155,7 @@
+ # link against the non-stubbed Tcl library. Add Tk too if necessary.
+ #--------------------------------------------------------------------
+
+-AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
++#AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
+ #AC_DEFINE(USE_TK_STUBS, 1, [Use Tk stubs])
+ SHLIB_LD_LIBS='${LIBS} -lstdc++'
+
+--- a/tcliis1.0/configure.in
++++ b/tcliis1.0/configure.in
+@@ -162,7 +162,7 @@
+ # link against the non-stubbed Tcl library. Add Tk too if necessary.
+ #--------------------------------------------------------------------
+
+-AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
++#AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
+ #AC_DEFINE(USE_TK_STUBS, 1, [Use Tk stubs])
+ SHLIB_LD_LIBS='${LIBS} -lstdc++'
+
+--- a/tkmpeg1.0/configure.in
++++ b/tkmpeg1.0/configure.in
+@@ -158,8 +158,8 @@
+ # link against the non-stubbed Tcl library. Add Tk too if necessary.
+ #--------------------------------------------------------------------
+
+-AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
+-AC_DEFINE(USE_TK_STUBS, 1, [Use Tk stubs])
++#AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
++#AC_DEFINE(USE_TK_STUBS, 1, [Use Tk stubs])
+ SHLIB_LD_LIBS='${LIBS} -lstdc++'
+
+ #--------------------------------------------------------------------
+--- a/saotk/configure.in
++++ b/saotk/configure.in
+@@ -356,7 +356,7 @@
+ # link against the non-stubbed Tcl library. Add Tk too if necessary.
+ #--------------------------------------------------------------------
+
+-AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
++#AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
+ #AC_DEFINE(USE_TK_STUBS, 1, [Use Tk stubs])
+ SHLIB_LD_LIBS='${LIBS} -lstdc++ -lstarlink_ast -lstarlink_ast_err -lfuntools -lwcstools -lBLT -lxml2'
+
+--- a/tclcheckdns1.1/checkdns.C
++++ b/tclcheckdns1.1/checkdns.C
+@@ -163,7 +163,7 @@
+
+ Tcl_CreateObjCommand(interp, "checkdns", TclcheckdnsCmd,
+ (ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
+- Tcl_PkgProvide(interp, "Tclcheckdns", "1.1");
++ Tcl_PkgProvide(interp, "tclcheckdns", "1.1");
+
+ return TCL_OK;
+ }
+--- a/tcliis1.0/iistcl.C
++++ b/tcliis1.0/iistcl.C
+@@ -49,7 +49,7 @@
+
+ // Define Package Name
+
+- if (Tcl_PkgProvide(interp, "Tcliis", "1.0") == TCL_ERROR)
++ if (Tcl_PkgProvide(interp, "tcliis", "1.0") == TCL_ERROR)
+ return TCL_ERROR;
+
+ // Commands
+--- a/tkmpeg1.0/tkmpeg.C
++++ b/tkmpeg1.0/tkmpeg.C
+@@ -22,7 +22,7 @@
+ int Tkmpeg_Init(Tcl_Interp* interp) {
+
+ // Define Package Name
+- if (Tcl_PkgProvide(interp, "Tkmpeg", "1.0") == TCL_ERROR)
++ if (Tcl_PkgProvide(interp, "tkmpeg", "1.0") == TCL_ERROR)
+ return TCL_ERROR;
+
+ // Commands
+--- a/saotk/util/saotk.C
++++ b/saotk/util/saotk.C
+@@ -27,6 +27,7 @@
+ extern int PannerTrueColor_Init(Tcl_Interp*);
+
+ extern int MagnifierTrueColor_Init(Tcl_Interp*);
++static Tcl_Interp *global_interp;
+
+ extern "C" {
+ int Saotk_Init(Tcl_Interp* interp);
+@@ -90,6 +91,8 @@
+ if (Tcl_PkgProvide(interp, "saotk", "1.0") == TCL_ERROR)
+ return TCL_ERROR;
+
++ global_interp = interp;
++
+ return TCL_OK;
+ }
+
+@@ -97,3 +100,10 @@
+ {
+ return TCL_OK;
+ }
++
++void internalError(const char* msg)
++{
++ Tcl_SetVar2(global_interp, "ds9", "msg", msg, TCL_GLOBAL_ONLY);
++ Tcl_SetVar2(global_interp, "ds9", "msg,level", "error", TCL_GLOBAL_ONLY);
++}
++
diff --git a/debian/patches/saotk_fix_funtools_includes.patch b/debian/patches/saotk_fix_funtools_includes.patch
deleted file mode 100644
index f710d70..0000000
--- a/debian/patches/saotk_fix_funtools_includes.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Since the funtools include files have quite generic names, we
- replace append the directory prefix "funtools/" instead of just adding
- /usr/include/funtools to the include path. This should prevent from accidently
- using the wrong include files.
---- a/saotk/fitsy++/hist.C
-+++ b/saotk/fitsy++/hist.C
-@@ -13,8 +13,8 @@
- #include "hist.h"
- #include "util.h"
-
--#include "fitsy.h"
--#include "filter.h"
-+#include <funtools/fitsy.h>
-+#include <funtools/filter.h>
-
- #ifdef __CYGWIN__
- // limit size, cygwin pipe to 64K / (4 args x 4 bytes)
---- a/saotk/fitsy++/hpx.C
-+++ b/saotk/fitsy++/hpx.C
-@@ -18,7 +18,7 @@
- #include "hpx.h"
- #include "util.h"
-
--#include "fitsy.h"
-+#include "funtools/fitsy.h"
-
- FitsHPX::FitsHPX(FitsFile* fits, Order oo, CoordSys ss, Layout ll,
- int cc, int qq)
diff --git a/debian/patches/saotk_use_system_wcstools.patch b/debian/patches/saotk_use_system_libs.patch
similarity index 65%
rename from debian/patches/saotk_use_system_wcstools.patch
rename to debian/patches/saotk_use_system_libs.patch
index 0a3397d..8d073e7 100644
--- a/debian/patches/saotk_use_system_wcstools.patch
+++ b/debian/patches/saotk_use_system_libs.patch
@@ -75,6 +75,15 @@ Description: Compile against system library wcstools
widget/truecolor16.C
widget/truecolor24.C
widget/truecolor8.C
+@@ -377,7 +358,7 @@
+
+ AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
+ #AC_DEFINE(USE_TK_STUBS, 1, [Use Tk stubs])
+-SHLIB_LD_LIBS='${LIBS} -lstdc++'
++SHLIB_LD_LIBS='${LIBS} -lstdc++ -lstarlink_ast -lstarlink_ast_err -lfuntools -lwcstools -lBLT -lxml2'
+
+ #--------------------------------------------------------------------
+ # This macro generates a line to use when building a library. It
--- a/saotk/frame/fitsimage.h
+++ b/saotk/frame/fitsimage.h
@@ -10,7 +10,7 @@
@@ -86,3 +95,27 @@ Description: Compile against system library wcstools
#include "head.h"
#include "smooth.h"
+--- a/saotk/fitsy++/hist.C
++++ b/saotk/fitsy++/hist.C
+@@ -13,8 +13,8 @@
+ #include "hist.h"
+ #include "util.h"
+
+-#include "fitsy.h"
+-#include "filter.h"
++#include <funtools/fitsy.h>
++#include <funtools/filter.h>
+
+ #ifdef __CYGWIN__
+ // limit size, cygwin pipe to 64K / (4 args x 4 bytes)
+--- a/saotk/fitsy++/hpx.C
++++ b/saotk/fitsy++/hpx.C
+@@ -18,7 +18,7 @@
+ #include "hpx.h"
+ #include "util.h"
+
+-#include "fitsy.h"
++#include "funtools/fitsy.h"
+
+ FitsHPX::FitsHPX(FitsFile* fits, Order oo, CoordSys ss, Layout ll,
+ int cc, int qq)
diff --git a/debian/patches/series b/debian/patches/series
index 1dcac9f..c2cdf16 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,13 +4,13 @@ saotk_fix_blt_crash.patch
saotk_add_ksearch.patch
saotk_add_psscale.patch
saotk_avoid_compile_warnings.patch
-saotk_use_system_wcstools.patch
-saotk_fix_funtools_includes.patch
+saotk_use_system_libs.patch
saotk_spellfix.patch
-ds9_support_blt.patch
-ds9_use_external_libs.patch
ds9_make_linux.patch
ds9_use_filesystem.patch
+ds9_use_shared_libs.patch
+ds9_use_tcltk_packages.patch
+ds9_support_blt.patch
ds9_fix_docdir.patch
ds9_optional_doc_package.patch
ds9_add_about_debian.patch
--
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