[SCM] image display tool for astronomy branch, master, updated. 8be7b24d70815ead7c4f44bf8e5bf9df2ec18829
Ole Streicher
debian at liska.ath.cx
Tue Jan 10 13:40:44 UTC 2012
The following commit has been merged in the master branch:
commit 201a653432463f1fb3629dfb37bb06deaa680aba
Author: Ole Streicher <debian at liska.ath.cx>
Date: Tue Jan 10 14:21:40 2012 +0100
Make htmlwidget compilable
diff --git a/debian/patches/htmlwidget.patch b/debian/patches/htmlwidget.patch
index 5fc2d7e..382b926 100644
--- a/debian/patches/htmlwidget.patch
+++ b/debian/patches/htmlwidget.patch
@@ -1,3 +1,72 @@
+Author: Ole Streicher <debian at liska.ath.cx>
+Description: Make htmlwidget compileable.
+--- a/Makefile
++++ b/Makefile
+@@ -36,6 +36,9 @@ ifeq ($(OS),unix)
+ BLTFLAGS = $(XFLAGS)
+ TKIMGFLAGS = $(XFLAGS)
+ XPAFLAGS = $(XFLAGS)
++ PREHTMLFLAGS = config_BUILD_TCLSH=tclsh \
++ config_TARGET_TK_SCRIPT_DIR=$(root)/share/tcltk/tk8.5 \
++ config_TARGET_TCL_INC=/usr/include/tcl
+
+ SIGNAL= signal
+ SIGNALCLEAN= signalclean
+
+--- a/htmlwidget/makemake.tcl.in
++++ b/htmlwidget/makemake.tcl.in
+@@ -109,18 +109,18 @@ proc MakeProg {name obj {libs {tk}}} {
+ set n "${PFX}${name}$TEXE"
+ switch $libs {
+ tcl {
+- set link "@TARGET_CC@ @TARGET_CFLAGS@ -I. @TARGET_TCL_INC@"
++ set link "@TARGET_CC@ @TARGET_CFLAGS@ -I. -I at TARGET_TCL_INC@"
+ append link " @TARGET_X_INC@"
+ set lib "@TARGET_TCL_LIBS@ @TARGET_LIBS@"
+ }
+ tk {
+- set link "@TARGET_CC@ @TARGET_CFLAGS@ -I. @TARGET_TCL_INC@"
++ set link "@TARGET_CC@ @TARGET_CFLAGS@ -I. -I at TARGET_TCL_INC@"
+ append link " @TARGET_X_INC@"
+ append link " @TARGET_TK_INC@"
+ set lib "@TARGET_TK_LIBS@ @TARGET_X_LIBS@ @TARGET_TCL_LIBS@ @TARGET_LIBS@"
+ }
+ blt {
+- set link "@TARGET_CC@ @TARGET_CFLAGS@ -I. @TARGET_TCL_INC@"
++ set link "@TARGET_CC@ @TARGET_CFLAGS@ -I. -I at TARGET_TCL_INC@"
+ append link " @TARGET_X_INC@"
+ append link " @TARGET_TK_INC@ @TARGET_BLT_INC@"
+ set lib "@TARGET_BLT_LIBS@ @TARGET_TK_LIBS@ @TARGET_TCL_LIBS@"
+@@ -148,7 +148,7 @@ proc MakeProg {name obj {libs {tk}}} {
+ proc MakeShObj {name src {dep {}}} {
+ if {"@ENABLE_SHLIB@"!=1} return
+ set n sh$name
+- set cc "@TARGET_CC@ @TARGET_SHLIB_CFLAGS@ -I. @TARGET_TCL_INC@"
++ set cc "@TARGET_CC@ @TARGET_SHLIB_CFLAGS@ -I. -I at TARGET_TCL_INC@"
+ append cc " @TARGET_X_INC@"
+ append cc " @TARGET_TK_INC@ @TARGET_BLT_INC@"
+ puts "$n: $src $dep"
+@@ -196,7 +196,7 @@ proc MakeShLib {name obj {libs tk}} {
+ #
+ proc MakeObj {name src {dep {}}} {
+ set n $name
+- set cc "@TARGET_CC@ @TARGET_CFLAGS@ -I. @TARGET_TCL_INC@"
++ set cc "@TARGET_CC@ @TARGET_CFLAGS@ -I. -I at TARGET_TCL_INC@"
+ append cc " @TARGET_X_INC@"
+ append cc " @TARGET_TK_INC@ @TARGET_BLT_INC@"
+ puts "$n: $src $dep"
+--- a/htmlwidget/tools/mktclapp.c
++++ b/htmlwidget/tools/mktclapp.c
+@@ -1261,9 +1261,6 @@ char zTail[] =
+ "** Define the ET_HAVE_INSERTPROC macro if and only if we are dealing\n"
+ "** with Tcl8.0.3 or later.\n"
+ "*/\n"
+-"#if TCL_MAJOR_VERSION==8 && (TCL_MINOR_VERSION>0 || TCL_RELEASE_SERIAL>=3)\n"
+-"# define ET_HAVE_INSERTPROC\n"
+-"#endif\n"
+ "\n"
+ "/*\n"
+ "** Don't allow Win32 applications to read from stdin. Nor do\n"
--- saods9-4.0b7.orig/htmlwidget/src/htmlindex.c
+++ saods9-4.0b7/htmlwidget/src/htmlindex.c
@@ -24,6 +24,7 @@
@@ -35,7 +104,3 @@
#include "htmlcmd.h"
/*
---- saods9-4.0b7.orig/htmlwidget/confdefs.h
-+++ saods9-4.0b7/htmlwidget/confdefs.h
-@@ -0,0 +1 @@
-+
--
image display tool for astronomy
More information about the debian-science-commits
mailing list