[Debian-astro-commits] [saods9] 02/05: Adjust patches and remove obsolete patches

Ole Streicher olebole at moszumanska.debian.org
Thu Jul 14 08:15:39 UTC 2016 

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

olebole pushed a commit to branch experimental
in repository saods9.

commit 0a4d6ff175c02091a7337b47a05be4c5c2fac4f2
Author: Ole Streicher <olebole at debian.org>
Date:   Thu Jul 14 09:50:45 2016 +0200

    Adjust patches and remove obsolete patches
---
 debian/patches/ds9_add_about_debian.patch   |  2 +-
 debian/patches/ds9_dont_exit_on_tkcon.patch |  2 +-
 debian/patches/ds9_fix_docdir.patch         |  2 +-
 debian/patches/ds9_use_system_libs.patch    | 24 ++++++------
 debian/patches/ds9_use_tcltk_packages.patch | 30 +++++++--------
 debian/patches/fix_gcc-6.patch              | 13 -------
 debian/patches/saotk_spellfix.patch         | 13 -------
 debian/patches/saotk_use_tkblt.patch        | 57 -----------------------------
 debian/patches/series                       |  4 --
 debian/patches/tcliis.patch                 | 14 -------
 10 files changed, 29 insertions(+), 132 deletions(-)

diff --git a/debian/patches/ds9_add_about_debian.patch b/debian/patches/ds9_add_about_debian.patch
index f859805..b16bf9b 100644
--- a/debian/patches/ds9_add_about_debian.patch
+++ b/debian/patches/ds9_add_about_debian.patch
@@ -13,7 +13,7 @@ Description: Add the Debian packager to the "About" box
  proc HelpRef {} {
 --- a/ds9/library/util.tcl
 +++ b/ds9/library/util.tcl
-@@ -691,7 +691,7 @@
+@@ -623,7 +623,7 @@
  
      # 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 8515016..35b29a2 100644
--- a/debian/patches/ds9_dont_exit_on_tkcon.patch
+++ b/debian/patches/ds9_dont_exit_on_tkcon.patch
@@ -6,7 +6,7 @@ Description: Don't close DS9 when closing the unpatched tkcon console
  This solution was taken from http://wiki.tcl.tk/17616
 --- a/ds9/library/util.tcl
 +++ b/ds9/library/util.tcl
-@@ -770,9 +770,15 @@
+@@ -702,9 +702,15 @@
      if {[winfo exists ".tkcon"]} {
  	tkcon show
      } else {
diff --git a/debian/patches/ds9_fix_docdir.patch b/debian/patches/ds9_fix_docdir.patch
index 03668a7..05fe89c 100644
--- a/debian/patches/ds9_fix_docdir.patch
+++ b/debian/patches/ds9_fix_docdir.patch
@@ -45,7 +45,7 @@ Description: Instead putting the documentation into the common shared
  	package require http
 --- a/ds9/library/util.tcl
 +++ b/ds9/library/util.tcl
-@@ -696,7 +696,7 @@
+@@ -628,7 +628,7 @@
      
      # 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_use_system_libs.patch b/debian/patches/ds9_use_system_libs.patch
index d8c9e3a..67a3906 100644
--- a/debian/patches/ds9_use_system_libs.patch
+++ b/debian/patches/ds9_use_system_libs.patch
@@ -4,17 +4,16 @@ Description: Link against system libraries.
  copies provided by ds9, and use tcl/tk packages wherever possible.
 --- a/ds9/unix/Makefile.in
 +++ b/ds9/unix/Makefile.in
-@@ -38,13 +38,7 @@
+@@ -40,12 +40,7 @@
  OBJS	= ds9.o tkAppInit.o
  
  FILES	= \
--	$(ZDIR)/$(TCLVER) \
+-	$(ZDIR)/tcl$(TCLVER) \
 -	$(ZDIR)/tcl8 \
--	$(ZDIR)/$(TKVER) \
+-	$(ZDIR)/tk$(TCLVER) \
 -	$(ZDIR)/tkblt \
 -	$(ZDIR)/tcllib \
 -	$(ZDIR)/tkcon \
--	$(ZDIR)/xmlrpc \
 +	$(ZDIR) \
  	$(ZDIR)/library \
  	$(ZDIR)/msgs \
@@ -23,10 +22,10 @@ Description: Link against system libraries.
 +++ b/unix/Makefile.in
 @@ -5,8 +5,8 @@
  TKIMGFLAGS = @TKIMGFLAGS@
- JOBS	= 4
+ JOBS	= @CORES@
  
--WITHTCL =--with-tcl=$(ROOT)/$(TCLVER)/unix
--WITHTK  =--with-tk=$(ROOT)/$(TKVER)/unix $(WITHTCL)
+-WITHTCL =--with-tcl=$(ROOT)/tcl$(TCLVER)/unix
+-WITHTK  =--with-tk=$(ROOT)/tk$(TCLVER)/unix $(WITHTCL)
 +WITHTCL =
 +WITHTK  =
  CACHE	=--config-cache --cache-file=../config.cache
@@ -38,7 +37,7 @@ Description: Link against system libraries.
  
 -saods9	: dirs tcl tk \
 -	tclcheckdns tcliis tclsignal \
--	tclzvfs tclxml xmlrpc xpa \
+-	tclzvfs tclxml xpa \
 -	tkblt tktable tkimg \
 -	tkmpeg tkhtml1 tkcon \
 +saods9	: dirs \
@@ -46,10 +45,10 @@ Description: Link against system libraries.
 +	tclxml \
  	tksao ds9
  
- tcl	: $(TCLVER)/unix/Makefile
+ tcl	: tcl$(TCLVER)/unix/Makefile
 --- a/make.include
 +++ b/make.include
-@@ -253,7 +253,7 @@
+@@ -249,7 +249,7 @@
  
  #-------------------------- tksao
  
@@ -58,7 +57,7 @@ Description: Link against system libraries.
  	@echo ""
  	@echo "*** Install tksao ***"
  	$(MAKE) -C tksao -j $(JOBS) install
-@@ -480,13 +480,9 @@
+@@ -467,13 +467,9 @@
  .PHONY	: tksaodistclean astdistclean funtoolsdistclean
  .PHONY	: tktabledistclean xpadistclean
  
@@ -77,7 +76,7 @@ Description: Link against system libraries.
  dirsdistclean:
 --- a/ds9/library/ds9.tcl
 +++ b/ds9/library/ds9.tcl
-@@ -183,31 +183,33 @@
+@@ -183,30 +183,33 @@
  	# so we can still find our files
  	set ds9(root) [file normalize [file join [pwd] zvfsmntpt]]
  
@@ -104,7 +103,6 @@ Description: Link against system libraries.
 -	source $ds9(root)/tcllib/math/fuzzy.tcl
 -
 -	source $ds9(root)/tkcon/tkcon.tcl
--	source $ds9(root)/xmlrpc/xmlrpc.tcl
 -	source $ds9(root)/tkblt/graph.tcl
 +	package require msgcat
 +	package require http
diff --git a/debian/patches/ds9_use_tcltk_packages.patch b/debian/patches/ds9_use_tcltk_packages.patch
index 200ec20..ad06c13 100644
--- a/debian/patches/ds9_use_tcltk_packages.patch
+++ b/debian/patches/ds9_use_tcltk_packages.patch
@@ -4,7 +4,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
  initialization.
 --- a/ds9/unix/Makefile.in
 +++ b/ds9/unix/Makefile.in
-@@ -78,6 +78,8 @@
+@@ -81,6 +81,8 @@
  .NOTPARALLEL :
  .PHONY	: debug
  
@@ -52,7 +52,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
  	package require Signal
 --- a/make.include
 +++ b/make.include
-@@ -80,7 +80,7 @@
+@@ -76,7 +76,7 @@
  	./configure \
  	$(WITHTCL) \
  	--prefix $(ROOT) --exec-prefix $(ROOT) \
@@ -61,7 +61,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
  	$(CACHE)
  
  #-------------------------- tcliis
-@@ -97,7 +97,7 @@
+@@ -93,7 +93,7 @@
  	./configure \
  	$(WITHTCL) \
  	--prefix $(ROOT) --exec-prefix $(ROOT) \
@@ -70,7 +70,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
  	$(CACHE)
  
  #-------------------------- tclsignal
-@@ -114,7 +114,7 @@
+@@ -110,7 +110,7 @@
  	./configure \
  	$(WITHTCL) \
  	--prefix $(ROOT) --exec-prefix $(ROOT) \
@@ -79,7 +79,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
  	$(CACHE)
  
  #-------------------------- tclxml
-@@ -133,7 +133,7 @@
+@@ -129,7 +129,7 @@
  	$(WITHTCL) \
  	$(TCLXMLFLAGS) \
  	--prefix $(ROOT) --exec-prefix $(ROOT) \
@@ -88,7 +88,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
  	$(CACHE)
  
  #-------------------------- tclzvfs
-@@ -150,7 +150,7 @@
+@@ -146,7 +146,7 @@
  	./configure \
  	$(WITHTCL) \
  	--prefix $(ROOT) --exec-prefix $(ROOT) \
@@ -97,7 +97,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
  	$(CACHE)
  
  #-------------------------- xpa
-@@ -169,7 +169,7 @@
+@@ -165,7 +165,7 @@
  	$(CONFIGFLAGS) $(TARGET) $(XPAFLAGS) \
  	$(WITHTCL) \
  	--prefix $(ROOT) --exec-prefix $(ROOT) \
@@ -106,7 +106,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
  	--with-x=disabled
  
  #-------------------------- tkblt
-@@ -186,7 +186,7 @@
+@@ -182,7 +182,7 @@
  	./configure \
  	$(WITHTK) \
  	--prefix $(ROOT) --exec-prefix $(ROOT) \
@@ -115,7 +115,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
  	$(CACHE)
  
  #-------------------------- tkcon
-@@ -213,7 +213,7 @@
+@@ -209,7 +209,7 @@
  	./configure \
  	$(WITHTK) \
  	--prefix $(ROOT) --exec-prefix $(ROOT) \
@@ -124,7 +124,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
  	$(CACHE)
  
  #-------------------------- tkimg
-@@ -232,7 +232,7 @@
+@@ -228,7 +228,7 @@
  	CFLAGS='-DPNG_NO_WRITE_gAMA' \
  	$(WITHTK) $(TKIMGFLAGS) \
  	--prefix $(ROOT) --exec-prefix $(ROOT) \
@@ -133,7 +133,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
  
  #-------------------------- tkmpeg
  
-@@ -248,7 +248,7 @@
+@@ -244,7 +244,7 @@
  	./configure \
  	$(WITHTK) \
  	--prefix $(ROOT) --exec-prefix $(ROOT) \
@@ -142,7 +142,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
  	$(CACHE)
  
  #-------------------------- tksao
-@@ -265,7 +265,7 @@
+@@ -261,7 +261,7 @@
  	./configure \
  	$(WITHTK) \
  	--prefix $(ROOT) --exec-prefix $(ROOT) \
@@ -151,7 +151,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
  	$(CACHE)
  
  #-------------------------- ast
-@@ -282,7 +282,7 @@
+@@ -278,7 +278,7 @@
  	star_cv_cnf_trail_type=long star_cv_cnf_f2c_compatible=no \
  	$(CONFIGFLAGS) \
  	--prefix $(ROOT) --exec-prefix $(ROOT) \
@@ -160,7 +160,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
  
  ast/ast.h :
  	@echo ""
-@@ -341,24 +341,7 @@
+@@ -337,24 +337,7 @@
  	--with-zlib=../lib --with-wcslib=../lib \
  	$(CONFIGFLAGS) $(TARGET) \
  	--prefix $(ROOT) --exec-prefix $(ROOT) \
@@ -185,7 +185,7 @@ Description: Don't load TclTk extensions as shared libs, but as packages.
 +	--enable-shared --enable-symbols \
  	$(CACHE)
  
- #-------------------------- xmlrpc
+ #-------------------------- language
 --- a/tksao/saotk.C
 +++ b/tksao/saotk.C
 @@ -27,6 +27,7 @@
diff --git a/debian/patches/fix_gcc-6.patch b/debian/patches/fix_gcc-6.patch
deleted file mode 100644
index 802eb3e..0000000
--- a/debian/patches/fix_gcc-6.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Specify char[] constant as unsigned since it contains bytes > 0x7f
---- a/tksao/fitsy++/outsocket.C
-+++ b/tksao/fitsy++/outsocket.C
-@@ -61,7 +61,7 @@
-   }
- 
-   // dump simple header
--  char header[10] = {0x1f,0x8b,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x03};
-+  unsigned char header[10] = {0x1f,0x8b,0x08,0x00,0x00,0x00,0x00,0x00,0x00,0x03};
-   send(id_, header, 10, 0);
-   
-   stream_->next_out = buf_;
diff --git a/debian/patches/saotk_spellfix.patch b/debian/patches/saotk_spellfix.patch
deleted file mode 100644
index b960773..0000000
--- a/debian/patches/saotk_spellfix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Author: Ole Streicher <debian at liska.ath.cx>
-Description: Spellfix; however this is unused at the end.
---- a/tksao/frame/ds9parser.C
-+++ b/tksao/frame/ds9parser.C
-@@ -1022,7 +1022,7 @@
-   "start", "commands", "command", "@1", "@2", "@3", "hash", "@4",
-   "comment", "@5", "shapeComment", "@6", "@7", "nonshapeComment", "@8",
-   "@9", "terminator", "numeric", "debug", "yesno", "sp", "bp", "ep",
--  "conjuction", "optangle", "angle", "value", "vvalue", "numberof",
-+  "conjunction", "optangle", "angle", "value", "vvalue", "numberof",
-   "sexagesimal", "hms", "dms", "coord", "coordSystem", "wcsSystem",
-   "skyFrame", "skyDist", "property", "callBack", "global",
-   "globalProperty", "globalRuler", "globalCompass", "initGlobal", "local",
diff --git a/debian/patches/saotk_use_tkblt.patch b/debian/patches/saotk_use_tkblt.patch
deleted file mode 100644
index 22acffe..0000000
--- a/debian/patches/saotk_use_tkblt.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Author: Ole Streicher <olebole at debian.org>
-Description: Use tkblt instead of BLT.
- This requires another header file.
---- a/tksao/frame/context.C
-+++ b/tksao/frame/context.C
-@@ -21,7 +21,7 @@
- #include "head.h"
- 
- extern "C" {
--#include "bltVector.h"
-+#include "tkbltVector.h"
- }
- 
- typedef struct {
---- a/tksao/frame/frblt.C
-+++ b/tksao/frame/frblt.C
-@@ -8,7 +8,7 @@
- 
- #include "projection.h"
- extern "C" {
--#include "bltVector.h"
-+#include "tkbltVector.h"
- }
- 
- #include "sigbus.h"
---- a/tksao/frame/marker.C
-+++ b/tksao/frame/marker.C
-@@ -8,7 +8,7 @@
- #include "fitsimage.h"
- 
- extern "C" {
--#include "bltVector.h"
-+#include "tkbltVector.h"
- }
- 
- static int markerSeqID = 1;
---- a/tksao/saotk.C
-+++ b/tksao/saotk.C
-@@ -4,6 +4,9 @@
- 
- #include <tk.h>
- 
-+extern CONST char *
-+Tkblt_InitStubs(Tcl_Interp *interp, CONST char *version, int exact);
-+
- extern int FrameTrueColor8_Init(Tcl_Interp*);
- extern int FrameTrueColor16_Init(Tcl_Interp*);
- extern int FrameTrueColor24_Init(Tcl_Interp*);
-@@ -40,6 +43,8 @@
-     return TCL_ERROR;
-   if (Tk_InitStubs(interp, TK_PATCH_LEVEL, 0) == NULL)
-     return TCL_ERROR;
-+  if (Tkblt_InitStubs(interp, NULL, 0) == NULL)
-+    return TCL_ERROR;
- 
-   if (FrameTrueColor8_Init(interp) == TCL_ERROR)
-     return TCL_ERROR;
diff --git a/debian/patches/series b/debian/patches/series
index d03664e..a4387a8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,9 +6,5 @@ ds9_add_about_debian.patch
 ds9_dont_exit_on_tkcon.patch
 saotk_add_ksearch.patch
 saotk_add_psscale.patch
-saotk_use_tkblt.patch
 saotk_avoid_compile_warnings.patch
 saotk_use_system_libs.patch
-saotk_spellfix.patch
-tcliis.patch
-fix_gcc-6.patch
diff --git a/debian/patches/tcliis.patch b/debian/patches/tcliis.patch
deleted file mode 100644
index 096b466..0000000
--- a/debian/patches/tcliis.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Justin Pryzby <justinpryzby at users.sf.net>
-Description: Avoid compilation errors and warnings in the IRAF/IIS "imtool" 
- protocol module. The code is K&R C.
---- a/tcliis/iis.c
-+++ b/tcliis/iis.c
-@@ -225,7 +225,7 @@
-   }
-  done:
-   /* Allocate and fill in i/o channel descriptor. */
--  if (datain > 0 && dataout > 0 && (chan = get_iochan(xim))) {
-+  if (datain > 0 && dataout > 0 && ((chan = get_iochan(xim)))) {
-     chan->xim = (XtPointer) xim;
-     chan->type = IO_FIFO;
-     chan->datain = datain;

-- 
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