[Debian-astro-commits] [saods9] 01/01: Use Tcl/Tk stubs

[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 eebc6c85476e3fb2acfeab5b3e19108e1f481b65
Author: Ole Streicher <olebole at debian.org>
Date:   Wed Jul 22 08:53:08 2015 +0200

    Use Tcl/Tk stubs
---
 debian/changelog                            |  6 +++
 debian/patches/ds9_use_tcltk_packages.patch | 59 -----------------------------
 debian/patches/saotk_use_system_libs.patch  |  2 +-
 debian/patches/series                       |  1 +
 debian/patches/tkhtml.patch                 | 24 ++++++++++++
 5 files changed, 32 insertions(+), 60 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ac41721..4943965 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+saods9 (7.4~b5+repack-2) UNRELEASED; urgency=medium
+
+  * Use Tcl/Tk stubs
+
+ -- Ole Streicher <olebole at debian.org>  Wed, 22 Jul 2015 08:51:36 +0200
+
 saods9 (7.4~b5+repack-1) experimental; urgency=low
 
   * New upstream beta version
diff --git a/debian/patches/ds9_use_tcltk_packages.patch b/debian/patches/ds9_use_tcltk_packages.patch
index 68f4953..821b85f 100644
--- a/debian/patches/ds9_use_tcltk_packages.patch
+++ b/debian/patches/ds9_use_tcltk_packages.patch
@@ -103,52 +103,6 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
  	--enable-symbols
  	$(MAKE) -C $(TKSAODIR) -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/tksao1.0/configure.in
-+++ b/tksao1.0/configure.in
-@@ -375,7 +375,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/tksao1.0/saotk.C
 +++ b/tksao1.0/saotk.C
 @@ -27,6 +27,7 @@
@@ -179,16 +133,3 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
 +  Tcl_SetVar2(global_interp, "ds9", "msg,level", "error", TCL_GLOBAL_ONLY);
 +}
 +
---- a/tkhtml1.0/configure.in
-+++ b/tkhtml1.0/configure.in
-@@ -170,8 +170,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])
- 
- #--------------------------------------------------------------------
- # This macro generates a line to use when building a library.  It
diff --git a/debian/patches/saotk_use_system_libs.patch b/debian/patches/saotk_use_system_libs.patch
index 40e260b..80620d3 100644
--- a/debian/patches/saotk_use_system_libs.patch
+++ b/debian/patches/saotk_use_system_libs.patch
@@ -30,7 +30,7 @@ Description: Compile against system library wcstools
  widget/truecolor8.C
 @@ -377,7 +358,7 @@
  
- #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'
diff --git a/debian/patches/series b/debian/patches/series
index 19377db..4d75c42 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ saotk_avoid_compile_warnings.patch
 saotk_use_system_libs.patch
 saotk_spellfix.patch
 tcliis.patch
+tkhtml.patch
diff --git a/debian/patches/tkhtml.patch b/debian/patches/tkhtml.patch
new file mode 100644
index 0000000..0dc8600
--- /dev/null
+++ b/debian/patches/tkhtml.patch
@@ -0,0 +1,24 @@
+Author: Ole Streicher <olebole at debian.org>
+Description: Correct path for tk-private header file
+--- a/tkhtml1.0/src/htmldraw.c
++++ b/tkhtml1.0/src/htmldraw.c
+@@ -27,7 +27,7 @@
+ #include <stdlib.h>
+ #include "htmldraw.h"
+ #ifdef USE_TK_STUBS
+-# include <tkIntXlibDecls.h>
++# include <tk-private/generic/tkIntXlibDecls.h>
+ #endif
+ 
+ #define USE_TK_DRAWCHARS 1
+--- a/tkhtml1.0/src/htmlwidget.c
++++ b/tkhtml1.0/src/htmlwidget.c
+@@ -28,7 +28,7 @@
+ #include <string.h>
+ #include "htmlwidget.h"
+ #ifdef USE_TK_STUBS
+-# include <tkIntXlibDecls.h>
++# include <tk-private/generic/tkIntXlibDecls.h>
+ #endif
+ 
+ /*

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