[Debian-astro-commits] [saods9] 04/07: Use tkhtml as package instead of linking it

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch experimental
in repository saods9.

commit cceed9793bc1e52b71a6be70b72ba3a656627a46
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Tue Jul 21 12:17:33 2015 +0200

    Use tkhtml as package instead of linking it
---
 debian/patches/ds9_use_tcltk_packages.patch | 46 +++++++++++++++++++++--------
 debian/saods9.install                       |  1 +
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/debian/patches/ds9_use_tcltk_packages.patch b/debian/patches/ds9_use_tcltk_packages.patch
index ec1ac98..acb3ed2 100644
--- a/debian/patches/ds9_use_tcltk_packages.patch
+++ b/debian/patches/ds9_use_tcltk_packages.patch
@@ -2,29 +2,39 @@ Author: Ole Streicher <olebole at debian.org>
 Description: Don't load TclTk extensions as shared libs, but as packages
 --- a/ds9/Makefile.unix
 +++ b/ds9/Makefile.unix
-@@ -16,11 +16,7 @@
+@@ -15,12 +15,7 @@
+ 	$(ZDIR)/cmaps \
  	$(ZDIR)/template
  
- LIBS	= \
+-LIBS	= \
 -	../lib/$(TKHTMLDIR)/libtkhtml1.0.a \
 -	../lib/$(TKMPEGDIR)/libtkmpeg1.0.a \
 -	../lib/$(TKSAODIR)/libtksao1.0.a \
 -	../lib/$(TCLIISDIR)/libtcliis1.0.a \
 -	../lib/$(TCLCHECKDNSDIR)/libtclcheckdns1.1.a
-+	../lib/$(TKHTMLDIR)/libtkhtml1.0.a
++LIBS	=
  
  #--------------------------main
  
+@@ -44,7 +39,7 @@
+ ds9Base	: $(OBJS) $(LIBS)
+ 	$(RM) $@
+ 	$(CXX) $(OPTS) $(LDFLAGS) -o $@ ds9.o tkAppInit.o \
+-	-Wl,-Bstatic -L../lib/$(TKHTMLDIR)/ -ltkhtml1.0 -Wl,-Bdynamic -ltk -ltcl \
++	-ltk -ltcl \
+ 	-L/usr/X11R6/lib -lX11
+ 
+ endif
 --- a/ds9/ds9.unix
 +++ b/ds9/ds9.unix
-@@ -17,22 +17,11 @@
+@@ -17,22 +17,10 @@
    int SAOLocalMainHook(int* argc, char*** argv);
  
    void Tcl_SetStartupScript(Tcl_Obj *path, const char *encoding);
 -
 -  int Tclcheckdns_Init(Tcl_Interp*);
 -  int Tksao_Init(Tcl_Interp*);
-   int Tkhtml_Init(Tcl_Interp*);
+-  int Tkhtml_Init(Tcl_Interp*);
 -  int Tkmpeg_Init(Tcl_Interp*);
 -  int Tcliis_Init(Tcl_Interp*);
  }
@@ -40,7 +50,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages
  // currently use relative path
  // using full path with spaces causes problems 
  // with htmwidget and tcl/tk
-@@ -73,36 +62,11 @@
+@@ -73,36 +61,5 @@
      return TCL_ERROR;
    Tcl_StaticPackage(interp,"Tk", Tk_Init, Tk_SafeInit);
  
@@ -56,12 +66,12 @@ Description: Don't load TclTk extensions as shared libs, but as packages
 -  Tcl_StaticPackage (interp, "tksao", Tksao_Init,
 -  		     (Tcl_PackageInitProc*)NULL);
 -
-   // Tkhtml
-   if (Tkhtml_Init(interp) == TCL_ERROR)
-     return TCL_ERROR;
-   Tcl_StaticPackage (interp, "tkhtml", Tkhtml_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;
@@ -79,11 +89,12 @@ Description: Don't load TclTk extensions as shared libs, but as packages
  }
 --- a/src/ds9.tcl
 +++ b/src/ds9.tcl
-@@ -218,6 +218,10 @@
+@@ -218,6 +218,11 @@
  	package require tkcon
  	source $ds9(root)/src/xmlrpc.tcl
  	package require BLT
 +	package require tksao
++	package require tkhtml
 +	package require tcliis
 +	package require tclcheckdns
 +	package require tkmpeg
@@ -119,6 +130,15 @@ Description: Don't load TclTk extensions as shared libs, but as packages
  	--enable-symbols
  	$(MAKE) -C $(TCLSIGNALDIR) install
  
+@@ -198,7 +198,7 @@
+ 	./configure \
+ 	$(WITHTCL) $(WITHTK) \
+ 	--prefix $(root) --exec-prefix $(root) \
+-	--disable-shared \
++	--enable-shared \
+ 	--enable-symbols
+ 	$(MAKE) -C $(TKHTMLDIR) install
+ 
 @@ -225,7 +225,7 @@
  	./configure \
  	$(WITHTCL) $(WITHTK) \
diff --git a/debian/saods9.install b/debian/saods9.install
index 6c6b4cf..5580b2f 100644
--- a/debian/saods9.install
+++ b/debian/saods9.install
@@ -9,3 +9,4 @@ ds9/zipdir/zvfsmntpt/template /usr/share/saods9/
 lib/tclcheckdns* /usr/lib/tcltk/
 lib/tcliis* /usr/lib/tcltk/
 lib/tkmpeg* /usr/lib/tcltk/
+lib/tkhtml* /usr/lib/tcltk/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/saods9.git