[Debian-astro-commits] [saods9] 02/03: Rediff patches
Ole Streicher
olebole at moszumanska.debian.org
Fri Dec 16 09:03:03 UTC 2016
This is an automated email from the git hooks/post-receive script.
olebole pushed a commit to branch debian
in repository saods9.
commit 190d3928b6e39f4f95f4693431abcdde4c4ef214
Author: Ole Streicher <olebole at debian.org>
Date: Fri Dec 16 09:39:27 2016 +0100
Rediff patches
---
debian/patches/ds9_add_about_debian.patch | 19 ++-
debian/patches/ds9_dont_exit_on_tkcon.patch | 22 ++-
debian/patches/ds9_fix_docdir.patch | 46 ++++--
debian/patches/ds9_optional_doc_package.patch | 16 +-
debian/patches/ds9_use_system_libs.patch | 182 ++++++++++++----------
debian/patches/ds9_use_tcltk_packages.patch | 90 +++++++----
debian/patches/saotk_add_ksearch.patch | 14 +-
debian/patches/saotk_add_psscale.patch | 21 ++-
debian/patches/saotk_avoid_compile_warnings.patch | 54 +++++--
debian/patches/saotk_use_system_libs.patch | 53 ++++---
10 files changed, 325 insertions(+), 192 deletions(-)
diff --git a/debian/patches/ds9_add_about_debian.patch b/debian/patches/ds9_add_about_debian.patch
index 113e71c..bec4e7b 100644
--- a/debian/patches/ds9_add_about_debian.patch
+++ b/debian/patches/ds9_add_about_debian.patch
@@ -1,8 +1,17 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Add the Debian packager to the "About" box
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Fri, 16 Dec 2016 09:23:38 +0100
+Subject: Add the Debian packager to the "About" box
+
+---
+ ds9/library/help.tcl | 2 ++
+ ds9/library/util.tcl | 2 +-
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/ds9/library/help.tcl b/ds9/library/help.tcl
+index d45dcc6..3026230 100644
--- a/ds9/library/help.tcl
+++ b/ds9/library/help.tcl
-@@ -22,6 +22,8 @@
+@@ -22,6 +22,8 @@ proc HelpDef {} {
set help(authors) "William Joye (Smithsonian Astrophysical Observatory)\nEric Mandel (Smithsonian Astrophysical Observatory)\nSteve Murray (Smithsonian Astrophysical Observatory)\n"
set help(about) "SAOImage DS9\nVersion $ds9(version)\n\nAuthors\n$help(authors)\nSAOImage DS9 development has been made possible by funding from NASA's Applied Information Systems Research Program, Chandra X-ray Science Center (CXC), and the High Energy Astrophysics Science Archive Center (HEASARC). Additional funding was provided by the JWST Mission office at Space Telescope Science Institute to improve capabilities for 3D data visualization.\n\nColormaps\nh5utils: Steven Johnson ( [...]
@@ -11,9 +20,11 @@ Description: Add the Debian packager to the "About" box
}
proc HelpRef {} {
+diff --git a/ds9/library/util.tcl b/ds9/library/util.tcl
+index f51a6d8..c6ff0f5 100644
--- a/ds9/library/util.tcl
+++ b/ds9/library/util.tcl
-@@ -626,7 +626,7 @@
+@@ -626,7 +626,7 @@ proc AboutBox {} {
# Param
set f [frame $w.param -background white]
diff --git a/debian/patches/ds9_dont_exit_on_tkcon.patch b/debian/patches/ds9_dont_exit_on_tkcon.patch
index 1fe4706..93c1007 100644
--- a/debian/patches/ds9_dont_exit_on_tkcon.patch
+++ b/debian/patches/ds9_dont_exit_on_tkcon.patch
@@ -1,12 +1,20 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Don't close DS9 when closing the unpatched tkcon console
- The original saods9 code contains a patched tkcon which replaced the exit with
- hide. In Debian, we are using the unpatched package.
- .
- This solution was taken from http://wiki.tcl.tk/17616
+From: Ole Streicher <olebole at debian.org>
+Date: Fri, 16 Dec 2016 09:23:38 +0100
+Subject: Don't close DS9 when closing the unpatched tkcon console The
+ original saods9 code contains a patched tkcon which replaced the exit with
+ hide. In Debian,
+ we are using the unpatched package. . This solution was taken from
+ http://wiki.tcl.tk/17616
+
+---
+ ds9/library/util.tcl | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/ds9/library/util.tcl b/ds9/library/util.tcl
+index c6ff0f5..a773688 100644
--- a/ds9/library/util.tcl
+++ b/ds9/library/util.tcl
-@@ -705,9 +705,15 @@
+@@ -705,9 +705,15 @@ proc OpenConsole {} {
if {[winfo exists ".tkcon"]} {
tkcon show
} else {
diff --git a/debian/patches/ds9_fix_docdir.patch b/debian/patches/ds9_fix_docdir.patch
index 69d4d10..e2702bf 100644
--- a/debian/patches/ds9_fix_docdir.patch
+++ b/debian/patches/ds9_fix_docdir.patch
@@ -1,10 +1,32 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Instead putting the documentation into the common shared
- dir of ds9, debian wants it in /usr/share/doc. This requires the help
- browser to be adjusted.
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Fri, 16 Dec 2016 09:23:38 +0100
+Subject: Instead putting the documentation into the common shared dir of ds9,
+ debian wants it in /usr/share/doc. This requires the help browser to
+ be adjusted.
+
+---
+ ds9/library/ds9.tcl | 1 +
+ ds9/library/help.tcl | 22 +++++++++++-----------
+ ds9/library/util.tcl | 2 +-
+ 3 files changed, 13 insertions(+), 12 deletions(-)
+
+diff --git a/ds9/library/ds9.tcl b/ds9/library/ds9.tcl
+index 6db0f2b..85d8df7 100755
+--- a/ds9/library/ds9.tcl
++++ b/ds9/library/ds9.tcl
+@@ -180,6 +180,7 @@ switch $ds9(wm) {
+ # set to absolute path so that if -cd command is used,
+ # so we can still find our files
+ set ds9(root) [file normalize [file join [file dirname [info script]] ..]]
++ set ds9(doc) "/usr/share/doc/saods9-doc"
+
+ package require msgcat
+ package require http
+diff --git a/ds9/library/help.tcl b/ds9/library/help.tcl
+index 8705678..d45dcc6 100644
--- a/ds9/library/help.tcl
+++ b/ds9/library/help.tcl
-@@ -8,17 +8,17 @@
+@@ -8,17 +8,17 @@ proc HelpDef {} {
global help
global ds9
@@ -33,19 +55,11 @@ Description: Instead putting the documentation into the common shared
set help(authors) "William Joye (Smithsonian Astrophysical Observatory)\nEric Mandel (Smithsonian Astrophysical Observatory)\nSteve Murray (Smithsonian Astrophysical Observatory)\n"
set help(about) "SAOImage DS9\nVersion $ds9(version)\n\nAuthors\n$help(authors)\nSAOImage DS9 development has been made possible by funding from NASA's Applied Information Systems Research Program, Chandra X-ray Science Center (CXC), and the High Energy Astrophysics Science Archive Center (HEASARC). Additional funding was provided by the JWST Mission office at Space Telescope Science Institute to improve capabilities for 3D data visualization.\n\nColormaps\nh5utils: Steven Johnson ( [...]
---- a/ds9/library/ds9.tcl
-+++ b/ds9/library/ds9.tcl
-@@ -180,6 +180,7 @@
- # set to absolute path so that if -cd command is used,
- # so we can still find our files
- set ds9(root) [file normalize [file join [file dirname [info script]] ..]]
-+ set ds9(doc) "/usr/share/doc/saods9-doc"
-
- package require msgcat
- package require http
+diff --git a/ds9/library/util.tcl b/ds9/library/util.tcl
+index c71ef83..f51a6d8 100644
--- a/ds9/library/util.tcl
+++ b/ds9/library/util.tcl
-@@ -631,7 +631,7 @@
+@@ -631,7 +631,7 @@ proc AboutBox {} {
# 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_optional_doc_package.patch b/debian/patches/ds9_optional_doc_package.patch
index 9f02a40..f26d425 100644
--- a/debian/patches/ds9_optional_doc_package.patch
+++ b/debian/patches/ds9_optional_doc_package.patch
@@ -1,8 +1,16 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Make the "-doc" package optional by disabling the help menu
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Fri, 16 Dec 2016 09:23:38 +0100
+Subject: Make the "-doc" package optional by disabling the help menu
+
+---
+ ds9/library/mhelp.tcl | 24 +++++++++++++++---------
+ 1 file changed, 15 insertions(+), 9 deletions(-)
+
+diff --git a/ds9/library/mhelp.tcl b/ds9/library/mhelp.tcl
+index a44c3d5..6c4fe56 100644
--- a/ds9/library/mhelp.tcl
+++ b/ds9/library/mhelp.tcl
-@@ -8,6 +8,7 @@
+@@ -8,6 +8,7 @@ package provide DS9 1.0
proc HelpMainMenu {} {
global ds9
@@ -10,7 +18,7 @@ Description: Make the "-doc" package optional by disabling the help menu
switch $ds9(wm) {
x11 -
-@@ -20,34 +21,39 @@
+@@ -20,34 +21,39 @@ proc HelpMainMenu {} {
}
}
diff --git a/debian/patches/ds9_use_system_libs.patch b/debian/patches/ds9_use_system_libs.patch
index b353292..67fe551 100644
--- a/debian/patches/ds9_use_system_libs.patch
+++ b/debian/patches/ds9_use_system_libs.patch
@@ -1,82 +1,21 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Link against system 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/unix/Makefile.in
-+++ b/ds9/unix/Makefile.in
-@@ -40,12 +40,7 @@
- OBJS = ds9.o tkAppInit.o
-
- FILES = \
-- $(ZDIR)/tcl$(TCLVER) \
-- $(ZDIR)/tcl8 \
-- $(ZDIR)/tk$(TCLVER) \
-- $(ZDIR)/tkblt \
-- $(ZDIR)/tcllib \
-- $(ZDIR)/tkcon \
-+ $(ZDIR) \
- $(ZDIR)/library \
- $(ZDIR)/msgs \
- $(ZDIR)/doc \
---- a/unix/Makefile.in
-+++ b/unix/Makefile.in
-@@ -5,8 +5,8 @@
- TKIMGFLAGS = @TKIMGFLAGS@
- JOBS = @CORES@
-
--WITHTCL =--with-tcl=$(ROOT)/tcl$(TCLVER)/unix
--WITHTK =--with-tk=$(ROOT)/tk$(TCLVER)/unix $(WITHTCL)
-+WITHTCL =
-+WITHTK =
- CACHE =--config-cache --cache-file=../config.cache
-
- include ./make.include
-@@ -15,11 +15,9 @@
-
- .PHONY : saods9 tcl tk
-
--saods9 : dirs tcl tk \
-- tclcheckdns tcliis tclsignal \
-- tclzvfs tclxml xpa \
-- tkblt tktable tkimg \
-- tkmpeg tkhtml1 tkcon \
-+saods9 : dirs \
-+ tclcheckdns tcliis \
-+ tclxml \
- tksao ds9
-
- tcl : tcl$(TCLVER)/unix/Makefile
---- a/make.include
-+++ b/make.include
-@@ -249,7 +249,7 @@
-
- #-------------------------- tksao
-
--tksao : ast funtools tksao/Makefile
-+tksao : tksao/Makefile
- @echo ""
- @echo "*** Install tksao ***"
- $(MAKE) -C tksao -j $(JOBS) install
-@@ -467,13 +467,9 @@
- .PHONY : tksaodistclean astdistclean funtoolsdistclean
- .PHONY : tktabledistclean xpadistclean
-
--distclean : tcldistclean tkdistclean \
-- tclcheckdnsdistclean tcliisdistclean tclsignaldistclean \
-- tclzvfsdistclean tclxmldistclean xpadistclean \
-- tkbltdistclean tktabledistclean tkimgdistclean \
-- tkmpegdistclean tkhtml1distclean \
-- tk$(OS)distclean \
-- tksaodistclean astdistclean funtoolsdistclean ds9distclean \
-+distclean : \
-+ tclcheckdnsdistclean tcliisdistclean \
-+ tksaodistclean astdistclean ds9distclean \
- dirsdistclean localdistclean
-
- dirsdistclean:
+From: Ole Streicher <olebole at debian.org>
+Date: Fri, 16 Dec 2016 09:23:38 +0100
+Subject: Link against system libraries. Use system provided libs of funtools,
+ ast etc. instead of the convienience copies provided by ds9,
+ and use tcl/tk packages wherever possible.
+
+---
+ ds9/library/ds9.tcl | 50 ++++++++++++++++++++++++++------------------------
+ ds9/unix/Makefile.in | 7 +------
+ make.include | 12 ++++--------
+ unix/Makefile.in | 12 +++++-------
+ 4 files changed, 36 insertions(+), 45 deletions(-)
+
+diff --git a/ds9/library/ds9.tcl b/ds9/library/ds9.tcl
+index 2beeca2..74a5418 100755
--- a/ds9/library/ds9.tcl
+++ b/ds9/library/ds9.tcl
-@@ -181,31 +181,33 @@
+@@ -181,31 +181,33 @@ switch $ds9(wm) {
# so we can still find our files
set ds9(root) [file normalize [file join [pwd] zvfsmntpt]]
@@ -87,7 +26,11 @@ Description: Link against system libraries.
- source $ds9(root)/tcl8/8.6/http-2.8.9.tm
- source $ds9(root)/library/htp.tcl
- }
--
++ package require msgcat
++ package require http
++ source $ds9(root)/library/htp.tcl
++ package require xml
+
- source $ds9(root)/tk8.6/tearoff.tcl
- source $ds9(root)/tk8.6/comdlg.tcl
- source $ds9(root)/tk8.6/focus.tcl
@@ -105,11 +48,6 @@ Description: Link against system libraries.
-
- source $ds9(root)/tkcon/tkcon.tcl
- source $ds9(root)/tkblt/graph.tcl
-+ package require msgcat
-+ package require http
-+ source $ds9(root)/library/htp.tcl
-+ package require xml
-+
+ package require base64
+ package require log
+ package require ftp
@@ -135,3 +73,81 @@ Description: Link against system libraries.
source $ds9(root)/library/source.tcl
+diff --git a/ds9/unix/Makefile.in b/ds9/unix/Makefile.in
+index 653472d..a4ad9ac 100644
+--- a/ds9/unix/Makefile.in
++++ b/ds9/unix/Makefile.in
+@@ -40,12 +40,7 @@ ZDIR = zvfsmntpt
+ OBJS = ds9.o tkAppInit.o
+
+ FILES = \
+- $(ZDIR)/tcl$(TCLVER) \
+- $(ZDIR)/tcl8 \
+- $(ZDIR)/tk$(TCLVER) \
+- $(ZDIR)/tkblt \
+- $(ZDIR)/tcllib \
+- $(ZDIR)/tkcon \
++ $(ZDIR) \
+ $(ZDIR)/library \
+ $(ZDIR)/msgs \
+ $(ZDIR)/doc \
+diff --git a/make.include b/make.include
+index 9d0d5e2..8ddd66b 100644
+--- a/make.include
++++ b/make.include
+@@ -247,7 +247,7 @@ tkmpeg/Makefile :
+
+ #-------------------------- tksao
+
+-tksao : ast funtools tksao/Makefile
++tksao : tksao/Makefile
+ @echo ""
+ @echo "*** Install tksao ***"
+ $(MAKE) -C tksao -j $(JOBS) install
+@@ -465,13 +465,9 @@ xpaclean :
+ .PHONY : tksaodistclean astdistclean funtoolsdistclean
+ .PHONY : tktabledistclean xpadistclean
+
+-distclean : tcldistclean tkdistclean \
+- tclcheckdnsdistclean tcliisdistclean tclsignaldistclean \
+- tclzvfsdistclean tclxmldistclean xpadistclean \
+- tkbltdistclean tktabledistclean tkimgdistclean \
+- tkmpegdistclean tkhtml1distclean \
+- tk$(OS)distclean \
+- tksaodistclean astdistclean funtoolsdistclean ds9distclean \
++distclean : \
++ tclcheckdnsdistclean tcliisdistclean \
++ tksaodistclean astdistclean ds9distclean \
+ dirsdistclean localdistclean
+
+ dirsdistclean:
+diff --git a/unix/Makefile.in b/unix/Makefile.in
+index f5f18bc..e40e76c 100644
+--- a/unix/Makefile.in
++++ b/unix/Makefile.in
+@@ -5,8 +5,8 @@ TKFLAGS = @TKFLAGS@
+ TKIMGFLAGS = @TKIMGFLAGS@
+ JOBS = @CORES@
+
+-WITHTCL =--with-tcl=$(ROOT)/tcl$(TCLVER)/unix
+-WITHTK =--with-tk=$(ROOT)/tk$(TCLVER)/unix $(WITHTCL)
++WITHTCL =
++WITHTK =
+ CACHE =--config-cache --cache-file=../config.cache
+
+ include ./make.include
+@@ -15,11 +15,9 @@ include ./make.include
+
+ .PHONY : saods9 tcl tk
+
+-saods9 : dirs tcl tk \
+- tclcheckdns tcliis tclsignal \
+- tclzvfs tclxml xpa \
+- tkblt tktable tkimg \
+- tkmpeg tkhtml1 tkcon \
++saods9 : dirs \
++ tclcheckdns tcliis \
++ tclxml \
+ tksao ds9
+
+ tcl : tcl$(TCLVER)/unix/Makefile
diff --git a/debian/patches/ds9_use_tcltk_packages.patch b/debian/patches/ds9_use_tcltk_packages.patch
index 5658626..d1f3c6e 100644
--- a/debian/patches/ds9_use_tcltk_packages.patch
+++ b/debian/patches/ds9_use_tcltk_packages.patch
@@ -1,26 +1,31 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Don't load TclTk extensions as shared libs, but as packages.
- This allows to start DS9 as a normal tk application without special
- initialization.
---- a/ds9/unix/Makefile.in
-+++ b/ds9/unix/Makefile.in
-@@ -81,6 +81,8 @@
- .NOTPARALLEL :
- .PHONY : debug
-
-+all: $(FILES)
-+
- ifeq (,$(findstring Darwin,$(system)))
-
- ds9 : ds9base ds9.zip
+From: Ole Streicher <olebole at debian.org>
+Date: Fri, 16 Dec 2016 09:23:38 +0100
+Subject: Don't load TclTk extensions as shared libs,
+ but as packages. This allows to start DS9 as a normal tk application
+ without special initialization.
+
+---
+ ds9/ds9 | 2 ++
+ ds9/library/ds9.tcl | 9 +++++++--
+ ds9/unix/Makefile.in | 2 ++
+ make.include | 43 +++++++++++++------------------------------
+ tksao/saotk.C | 10 ++++++++++
+ 5 files changed, 34 insertions(+), 32 deletions(-)
+ create mode 100644 ds9/ds9
+
+diff --git a/ds9/ds9 b/ds9/ds9
+new file mode 100644
+index 0000000..c98d5ef
--- /dev/null
+++ b/ds9/ds9
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec wish -f ${DS9_HOME-/usr/share/saods9}/library/ds9.tcl $*
+diff --git a/ds9/library/ds9.tcl b/ds9/library/ds9.tcl
+index 74a5418..6db0f2b 100755
--- a/ds9/library/ds9.tcl
+++ b/ds9/library/ds9.tcl
-@@ -148,7 +148,7 @@
+@@ -148,7 +148,7 @@ if {[catch {tk windowingsystem} ds9(wm)]} {
}
# who are we?
@@ -29,7 +34,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
# Themes are now hardcoded
switch $ds9(wm) {
-@@ -179,7 +179,7 @@
+@@ -179,7 +179,7 @@ switch $ds9(wm) {
x11 {
# set to absolute path so that if -cd command is used,
# so we can still find our files
@@ -38,7 +43,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
package require msgcat
package require http
-@@ -195,6 +195,11 @@
+@@ -195,6 +195,11 @@ switch $ds9(wm) {
package require tkcon
package require tkblt
@@ -50,9 +55,24 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
package require Tktable
package require tclxpa
package require Signal
+diff --git a/ds9/unix/Makefile.in b/ds9/unix/Makefile.in
+index a4ad9ac..23e4c01 100644
+--- a/ds9/unix/Makefile.in
++++ b/ds9/unix/Makefile.in
+@@ -81,6 +81,8 @@ LLIBS = \
+ .NOTPARALLEL :
+ .PHONY : debug
+
++all: $(FILES)
++
+ ifeq (,$(findstring Darwin,$(system)))
+
+ ds9 : ds9base ds9.zip
+diff --git a/make.include b/make.include
+index 8ddd66b..f4cccd4 100644
--- a/make.include
+++ b/make.include
-@@ -76,7 +76,7 @@
+@@ -74,7 +74,7 @@ tclcheckdns/Makefile :
./configure \
$(WITHTCL) \
--prefix $(ROOT) --exec-prefix $(ROOT) \
@@ -61,7 +81,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
$(CACHE)
#-------------------------- tcliis
-@@ -93,7 +93,7 @@
+@@ -91,7 +91,7 @@ tcliis/Makefile :
./configure \
$(WITHTCL) \
--prefix $(ROOT) --exec-prefix $(ROOT) \
@@ -70,7 +90,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
$(CACHE)
#-------------------------- tclsignal
-@@ -110,7 +110,7 @@
+@@ -108,7 +108,7 @@ tclsignal/Makefile :
./configure \
$(WITHTCL) \
--prefix $(ROOT) --exec-prefix $(ROOT) \
@@ -79,7 +99,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
$(CACHE)
#-------------------------- tclxml
-@@ -129,7 +129,7 @@
+@@ -127,7 +127,7 @@ tclxml/Makefile :
$(WITHTCL) \
$(TCLXMLFLAGS) \
--prefix $(ROOT) --exec-prefix $(ROOT) \
@@ -88,7 +108,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
$(CACHE)
#-------------------------- tclzvfs
-@@ -146,7 +146,7 @@
+@@ -144,7 +144,7 @@ tclzvfs/Makefile :
./configure \
$(WITHTCL) \
--prefix $(ROOT) --exec-prefix $(ROOT) \
@@ -97,7 +117,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
$(CACHE)
#-------------------------- xpa
-@@ -165,7 +165,7 @@
+@@ -163,7 +163,7 @@ xpa/Makefile :
$(CONFIGFLAGS) $(TARGET) $(XPAFLAGS) \
$(WITHTCL) \
--prefix $(ROOT) --exec-prefix $(ROOT) \
@@ -106,7 +126,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
--with-x=disabled
#-------------------------- tkblt
-@@ -182,7 +182,7 @@
+@@ -180,7 +180,7 @@ tkblt/Makefile :
./configure \
$(WITHTK) \
--prefix $(ROOT) --exec-prefix $(ROOT) \
@@ -115,7 +135,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
$(CACHE)
#-------------------------- tkcon
-@@ -209,7 +209,7 @@
+@@ -207,7 +207,7 @@ tkhtml1/Makefile :
./configure \
$(WITHTK) \
--prefix $(ROOT) --exec-prefix $(ROOT) \
@@ -124,7 +144,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
$(CACHE)
#-------------------------- tkimg
-@@ -228,7 +228,7 @@
+@@ -226,7 +226,7 @@ tkimg/Makefile :
CFLAGS='-DPNG_NO_WRITE_gAMA' \
$(WITHTK) $(TKIMGFLAGS) \
--prefix $(ROOT) --exec-prefix $(ROOT) \
@@ -133,7 +153,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
#-------------------------- tkmpeg
-@@ -244,7 +244,7 @@
+@@ -242,7 +242,7 @@ tkmpeg/Makefile :
./configure \
$(WITHTK) \
--prefix $(ROOT) --exec-prefix $(ROOT) \
@@ -142,7 +162,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
$(CACHE)
#-------------------------- tksao
-@@ -261,7 +261,7 @@
+@@ -259,7 +259,7 @@ tksao/Makefile :
./configure \
$(WITHTK) \
--prefix $(ROOT) --exec-prefix $(ROOT) \
@@ -151,7 +171,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
$(CACHE)
#-------------------------- ast
-@@ -278,7 +278,7 @@
+@@ -276,7 +276,7 @@ ast/Makefile :
star_cv_cnf_trail_type=long star_cv_cnf_f2c_compatible=no \
$(CONFIGFLAGS) \
--prefix $(ROOT) --exec-prefix $(ROOT) \
@@ -160,7 +180,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
ast/ast.h :
@echo ""
-@@ -337,24 +337,7 @@
+@@ -335,24 +335,7 @@ funtools/Makefile :
--with-zlib=../lib --with-wcslib=../lib \
$(CONFIGFLAGS) $(TARGET) \
--prefix $(ROOT) --exec-prefix $(ROOT) \
@@ -186,9 +206,11 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
$(CACHE)
#-------------------------- language
+diff --git a/tksao/saotk.C b/tksao/saotk.C
+index 9e238ad..d6b7adb 100644
--- a/tksao/saotk.C
+++ b/tksao/saotk.C
-@@ -27,6 +27,7 @@
+@@ -27,6 +27,7 @@ extern int ColorbarRGBTrueColor24_Init(Tcl_Interp*);
extern int PannerTrueColor_Init(Tcl_Interp*);
extern int MagnifierTrueColor_Init(Tcl_Interp*);
@@ -196,7 +218,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
extern "C" {
int Tksao_Init(Tcl_Interp* interp);
-@@ -91,6 +92,8 @@
+@@ -91,6 +92,8 @@ int Tksao_Init(Tcl_Interp* interp) {
if (Tcl_PkgProvide(interp, PACKAGE_NAME, PACKAGE_VERSION) != TCL_OK)
return TCL_ERROR;
@@ -205,7 +227,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
return TCL_OK;
}
-@@ -98,3 +101,10 @@
+@@ -98,3 +101,10 @@ int SaotkCmd(ClientData data, Tcl_Interp *interp, int argc, const char* argv[])
{
return TCL_OK;
}
diff --git a/debian/patches/saotk_add_ksearch.patch b/debian/patches/saotk_add_ksearch.patch
index 133aa1a..e85a7e4 100644
--- a/debian/patches/saotk_add_ksearch.patch
+++ b/debian/patches/saotk_add_ksearch.patch
@@ -1,6 +1,14 @@
-Author: Sergio Pascual <sergiopr at fedoraproject.org>
-Description: Insert the "ksearchh" routine that was originated by Doub Mink
- in wcssubs so that fitsImage.c will compile.
+From: Sergio Pascual <sergiopr at fedoraproject.org>
+Date: Fri, 16 Dec 2016 09:23:38 +0100
+Subject: Insert the "ksearchh" routine that was originated by Doub Mink in
+ wcssubs so that fitsImage.c will compile.
+
+---
+ tksao/frame/fitsimage.C | 92 ++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 91 insertions(+), 1 deletion(-)
+
+diff --git a/tksao/frame/fitsimage.C b/tksao/frame/fitsimage.C
+index 76d5843..289db3a 100644
--- a/tksao/frame/fitsimage.C
+++ b/tksao/frame/fitsimage.C
@@ -33,7 +33,97 @@
diff --git a/debian/patches/saotk_add_psscale.patch b/debian/patches/saotk_add_psscale.patch
index 334c408..441dab4 100644
--- a/debian/patches/saotk_add_psscale.patch
+++ b/debian/patches/saotk_add_psscale.patch
@@ -1,8 +1,17 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: The original code from ds9 uses a patched postscript code to allow
- scaling. Since we use standard Tk, we cannor support this (postscript scaling
- is silently ignored), but we need to support the global variable "psScale"
- which Doug Mink hacked into to get the scaling.
+From: Ole Streicher <debian at liska.ath.cx>
+Date: Fri, 16 Dec 2016 09:23:38 +0100
+Subject: The original code from ds9 uses a patched postscript code to allow
+ scaling. Since we use standard Tk,
+ we cannor support this (postscript scaling is silently ignored),
+ but we need to support the global variable "psScale" which Doug Mink hacked
+ into to get the scaling.
+
+---
+ tksao/widget/widget.C | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tksao/widget/widget.C b/tksao/widget/widget.C
+index 743ce7b..e1587bd 100644
--- a/tksao/widget/widget.C
+++ b/tksao/widget/widget.C
@@ -7,6 +7,8 @@
@@ -14,7 +23,7 @@ Description: The original code from ds9 uses a patched postscript code to allow
// Tk Canvas Widget Functions Declaration
int WidgetConfigProc(Tcl_Interp* interp, Tk_Canvas canvas, Tk_Item* item,
-@@ -592,7 +594,7 @@
+@@ -592,7 +594,7 @@ int Widget::getColor(const char* str)
XColor* cc= NULL;
// starting with tk8.6, colors are W3C based, not X11
if (!strncmp(str,"green",5) || !strncmp(str,"GREEN",5))
diff --git a/debian/patches/saotk_avoid_compile_warnings.patch b/debian/patches/saotk_avoid_compile_warnings.patch
index f6e1cc3..df3a7fd 100644
--- a/debian/patches/saotk_avoid_compile_warnings.patch
+++ b/debian/patches/saotk_avoid_compile_warnings.patch
@@ -1,8 +1,20 @@
-Author: Justin Pryzby <justinpryzby at users.sf.net>
-Description: Avoid compile time warnings in the saotk subsystem
+From: Justin Pryzby <justinpryzby at users.sf.net>
+Date: Fri, 16 Dec 2016 09:23:38 +0100
+Subject: Avoid compile time warnings in the saotk subsystem
+
+---
+ tksao/colorbar/cbgrid.C | 12 ++++++------
+ tksao/frame/fitsimage.C | 8 ++++----
+ tksao/frame/grid25d.C | 12 ++++++------
+ tksao/frame/grid2d.C | 14 +++++++-------
+ tksao/frame/grid3d.C | 30 +++++++++++++++---------------
+ 5 files changed, 38 insertions(+), 38 deletions(-)
+
+diff --git a/tksao/colorbar/cbgrid.C b/tksao/colorbar/cbgrid.C
+index 48bfb52..6f215de 100644
--- a/tksao/colorbar/cbgrid.C
+++ b/tksao/colorbar/cbgrid.C
-@@ -120,19 +120,19 @@
+@@ -120,19 +120,19 @@ int CBGrid::doit(RenderMode rm)
if (!(frameSet = astFrameSet(astFrame(2,"Domain=WIDGET"),"")))
goto error;
@@ -27,7 +39,7 @@ Description: Avoid compile time warnings in the saotk subsystem
goto error;
}
-@@ -194,7 +194,7 @@
+@@ -194,7 +194,7 @@ int CBGrid::doit(RenderMode rm)
pbox[3] = 0;
}
@@ -36,9 +48,11 @@ Description: Avoid compile time warnings in the saotk subsystem
// and now create astGrid
astGrid2dPtr = this;
+diff --git a/tksao/frame/fitsimage.C b/tksao/frame/fitsimage.C
+index 289db3a..90d541b 100644
--- a/tksao/frame/fitsimage.C
+++ b/tksao/frame/fitsimage.C
-@@ -1259,7 +1259,7 @@
+@@ -1259,7 +1259,7 @@ void FitsImage::initWCS()
if (ast_[0] && ast_[ii]) {
AstFrameSet* dep = (AstFrameSet*)astCopy(ast_[ii]);
astInvert(ast_[0]);
@@ -47,7 +61,7 @@ Description: Avoid compile time warnings in the saotk subsystem
astSetI(dep,"current",4);
astAnnul(ast_[0]);
ast_[0] = dep;
-@@ -3305,7 +3305,7 @@
+@@ -3305,7 +3305,7 @@ void FitsImage::setAstFormat(AstFrameSet* aa, int id, const char* format)
ostringstream str;
str << "Format(" << id << ")=" << format << ends;
@@ -56,7 +70,7 @@ Description: Avoid compile time warnings in the saotk subsystem
}
void FitsImage::setAstSkyFrame(AstFrameSet* aa, Coord::SkyFrame sky)
-@@ -3374,7 +3374,7 @@
+@@ -3374,7 +3374,7 @@ AstFrameSet* FitsImage::fits2ast(FitsHead* hd)
astClearStatus;
// new fitschan
@@ -65,7 +79,7 @@ Description: Avoid compile time warnings in the saotk subsystem
if (!astOK || chan == AST__NULL)
return NULL;
-@@ -3432,7 +3432,7 @@
+@@ -3432,7 +3432,7 @@ AstFrameSet* FitsImage::buildast(int ii, FitsHead* hd, FitsHead* prim)
astClearStatus;
// new fitschan
@@ -74,9 +88,11 @@ Description: Avoid compile time warnings in the saotk subsystem
if (!astOK || chan == AST__NULL)
return NULL;
+diff --git a/tksao/frame/grid25d.C b/tksao/frame/grid25d.C
+index cc9da43..a5c47d8 100644
--- a/tksao/frame/grid25d.C
+++ b/tksao/frame/grid25d.C
-@@ -113,7 +113,7 @@
+@@ -113,7 +113,7 @@ int Grid25d::doit(RenderMode rm)
// and now create astGrid
astGrid25dPtr = this;
@@ -85,7 +101,7 @@ Description: Avoid compile time warnings in the saotk subsystem
astGrid(plot);
astEnd; // now, clean up memory
-@@ -127,14 +127,14 @@
+@@ -127,14 +127,14 @@ void* Grid25d::matrixMap(Matrix& mx, const char* str)
mx.matrix(0,1),mx.matrix(1,1)};
double tt[] = {mx.matrix(2,0),mx.matrix(2,1)};
@@ -105,9 +121,11 @@ Description: Avoid compile time warnings in the saotk subsystem
astAddFrame(frameSet,AST__CURRENT,cmap,out);
return frameSet;
+diff --git a/tksao/frame/grid2d.C b/tksao/frame/grid2d.C
+index 7549dea..52716c5 100644
--- a/tksao/frame/grid2d.C
+++ b/tksao/frame/grid2d.C
-@@ -45,7 +45,7 @@
+@@ -45,7 +45,7 @@ int Grid2d::doit(RenderMode rm)
AstFrameSet* frameSet = NULL;
AstPlot* plot = NULL;
@@ -116,7 +134,7 @@ Description: Avoid compile time warnings in the saotk subsystem
astEnd;
return 0;
}
-@@ -77,7 +77,7 @@
+@@ -77,7 +77,7 @@ int Grid2d::doit(RenderMode rm)
// this will link frame 2 of frameset to frame 3 wcs with unitMap
// set the current of frameset to last
astInvert(wcsfs);
@@ -125,7 +143,7 @@ Description: Avoid compile time warnings in the saotk subsystem
astSetI(frameSet,"current",astGetI(frameSet,"nframe"));
}
}
-@@ -123,7 +123,7 @@
+@@ -123,7 +123,7 @@ int Grid2d::doit(RenderMode rm)
// and now create astGrid
astGrid2dPtr = this;
@@ -134,7 +152,7 @@ Description: Avoid compile time warnings in the saotk subsystem
astGrid(plot);
astEnd; // now, clean up memory
-@@ -140,18 +140,18 @@
+@@ -140,18 +140,18 @@ int Grid2d::matrixMap(void* fs, Matrix& mx, const char* str)
double tt[] = {mx.matrix(2,0),mx.matrix(2,1)};
AstMatrixMap* mm;
@@ -157,9 +175,11 @@ Description: Avoid compile time warnings in the saotk subsystem
return 1;
}
+diff --git a/tksao/frame/grid3d.C b/tksao/frame/grid3d.C
+index d646418..cf66171 100644
--- a/tksao/frame/grid3d.C
+++ b/tksao/frame/grid3d.C
-@@ -120,16 +120,16 @@
+@@ -120,16 +120,16 @@ int Grid3d::doit(RenderMode rm)
astSetI(wcs, "Base", idata);
// Create two 1D Frames and a 1D Mapping describing the third axis
@@ -180,7 +200,7 @@ Description: Avoid compile time warnings in the saotk subsystem
// Use astGetFrame and astGetMapping to get the base and current
// Frames from the 2D FrameSet, and the base->current Mapping.
-@@ -138,14 +138,14 @@
+@@ -138,14 +138,14 @@ int Grid3d::doit(RenderMode rm)
AstMapping* wcsmap = (AstMapping*)astGetMapping(wcs,AST__BASE,AST__CURRENT);
// Combine the 2D and 1D base Frames into a 3D CmpFrame
// Likewise, combine the 2D and 1D current Frames into a 3D CmpFrame
@@ -199,7 +219,7 @@ Description: Avoid compile time warnings in the saotk subsystem
astAddFrame(frameSet, AST__CURRENT, cmpwcsmap, cmpwcscurr);
}
}
-@@ -188,26 +188,26 @@
+@@ -188,26 +188,26 @@ void* Grid3d::matrixMap(Matrix& mx, const char* str)
double ss[] = {mx.matrix(0,0),mx.matrix(1,0),
mx.matrix(0,1),mx.matrix(1,1)};
AstMatrixMap* mm;
diff --git a/debian/patches/saotk_use_system_libs.patch b/debian/patches/saotk_use_system_libs.patch
index 1d89085..3abee46 100644
--- a/debian/patches/saotk_use_system_libs.patch
+++ b/debian/patches/saotk_use_system_libs.patch
@@ -1,8 +1,19 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Compile against system library wcstools and funtools
+From: Ole Streicher <olebole at debian.org>
+Date: Fri, 16 Dec 2016 09:23:38 +0100
+Subject: Compile against system library wcstools and funtools
+
+---
+ tksao/configure.in | 22 ++--------------------
+ tksao/fitsy++/hist.C | 4 ++--
+ tksao/fitsy++/hpx.C | 2 +-
+ tksao/frame/fitsimage.h | 2 +-
+ 4 files changed, 6 insertions(+), 24 deletions(-)
+
+diff --git a/tksao/configure.in b/tksao/configure.in
+index b3596b0..d6937e9 100755
--- a/tksao/configure.in
+++ b/tksao/configure.in
-@@ -260,25 +260,6 @@
+@@ -260,25 +260,6 @@ util/smooth.C
util/util.C
vector/vector.C
vector/vector3d.C
@@ -28,7 +39,7 @@ Description: Compile against system library wcstools and funtools
widget/truecolor16.C
widget/truecolor24.C
widget/truecolor8.C
-@@ -287,7 +268,7 @@
+@@ -287,7 +268,7 @@ widget/widget.C
TEA_ADD_HEADERS([])
TEA_ADD_INCLUDES([-I. -I./colorbar -I./fitsy++ -I./frame -I./list -I./magnifier -I./panner -I./util -I./vector -I./wcssubs -I./widget -I${prefix}/include])
@@ -37,7 +48,7 @@ Description: Compile against system library wcstools and funtools
TEA_ADD_CFLAGS([])
TEA_ADD_STUB_SOURCES([])
TEA_ADD_TCL_SOURCES([])
-@@ -381,6 +362,7 @@
+@@ -381,6 +362,7 @@ TEA_ENABLE_SYMBOLS
#--------------------------------------------------------------------
AC_DEFINE(USE_TCL_STUBS, 1, [Use Tcl stubs])
@@ -45,20 +56,11 @@ Description: Compile against system library wcstools and funtools
#AC_DEFINE(USE_TK_STUBS, 1, [Use Tk stubs])
#--------------------------------------------------------------------
---- a/tksao/frame/fitsimage.h
-+++ b/tksao/frame/fitsimage.h
-@@ -10,7 +10,7 @@
- #include "fitsdata.h"
- #include "coord.h"
- #include "file.h"
--#include "wcs.h"
-+#include <wcstools/wcs.h>
- #include "head.h"
-
- #include "smooth.h"
+diff --git a/tksao/fitsy++/hist.C b/tksao/fitsy++/hist.C
+index fa181fc..e628546 100644
--- a/tksao/fitsy++/hist.C
+++ b/tksao/fitsy++/hist.C
-@@ -13,8 +13,8 @@
+@@ -13,8 +13,8 @@ using namespace std;
#include "hist.h"
#include "util.h"
@@ -69,9 +71,11 @@ Description: Compile against system library wcstools and funtools
#ifdef __CYGWIN__
// limit size, cygwin pipe to 64K / (4 args x 4 bytes)
+diff --git a/tksao/fitsy++/hpx.C b/tksao/fitsy++/hpx.C
+index 0078858..1b4cb6f 100644
--- a/tksao/fitsy++/hpx.C
+++ b/tksao/fitsy++/hpx.C
-@@ -18,7 +18,7 @@
+@@ -18,7 +18,7 @@ using namespace std;
#include "hpx.h"
#include "util.h"
@@ -80,3 +84,16 @@ Description: Compile against system library wcstools and funtools
FitsHPX::FitsHPX(FitsFile* fits, Order oo, CoordSys ss, Layout ll,
int cc, int qq)
+diff --git a/tksao/frame/fitsimage.h b/tksao/frame/fitsimage.h
+index 8d90280..ded6400 100644
+--- a/tksao/frame/fitsimage.h
++++ b/tksao/frame/fitsimage.h
+@@ -10,7 +10,7 @@
+ #include "fitsdata.h"
+ #include "coord.h"
+ #include "file.h"
+-#include "wcs.h"
++#include <wcstools/wcs.h>
+ #include "head.h"
+
+ #include "smooth.h"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/saods9.git
More information about the Debian-astro-commits
mailing list