openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File ds9.patch of Package ds9 (Revision b5f0f9db92d3cf0ee0427ce667b8bc73)

Currently displaying revision b5f0f9db92d3cf0ee0427ce667b8bc73 , Show latest

diff -ur SAOImageDS9.orig/ast/plot.h SAOImageDS9/ast/plot.h
--- SAOImageDS9.orig/ast/plot.h	2021-05-14 16:49:20.000000000 +0200
+++ SAOImageDS9/ast/plot.h	2021-05-27 13:46:36.045166426 +0200
@@ -696,7 +696,7 @@
 #if defined(astCLASS)            /* Protected. */
 AstPlot *astPlot_( void *, const float *, const double *, const char *, int *, ...);
 #else
-AstPlot *astPlotId_( void *, const float [], const double [], const char *, ... )__attribute__((format(printf,4,5)));
+AstPlot *astPlotId_( void *, const float [], const double [], const char *, ... );
 #endif
 
 #if defined(astCLASS)            /* Protected */
diff -ur SAOImageDS9.orig/fitsy/compress.C SAOImageDS9/fitsy/compress.C
--- SAOImageDS9.orig/fitsy/compress.C	2021-05-14 16:49:20.000000000 +0200
+++ SAOImageDS9/fitsy/compress.C	2021-05-27 13:51:51.900192671 +0200
@@ -628,6 +628,7 @@
     return hasScaling_ ? (*ptr)*zs + zz : *ptr;
   case SUBDITHER1:
   case SUBDITHER2:
+  default:
     return unquantize(*ptr,zs,zz);
   }
 }
@@ -647,6 +648,7 @@
     return hasScaling_ ? (*ptr)*zs + zz : *ptr;
   case SUBDITHER1:
   case SUBDITHER2:
+  default:
     return unquantize(*ptr,zs,zz);
   }
 }
@@ -674,6 +676,7 @@
     return hasScaling_ ? (*ptr)*zs + zz : *ptr;
   case SUBDITHER1:
   case SUBDITHER2:
+  default:
     return unquantize(*ptr,zs,zz);
   }
 }
@@ -693,6 +696,7 @@
     return hasScaling_ ? (*ptr)*zs + zz : *ptr;
   case SUBDITHER1:
   case SUBDITHER2:
+  default:
     return unquantize(*ptr,zs,zz);
   }
 }
@@ -722,6 +726,8 @@
     return unquantize(*ptr,zs,zz);
   case SUBDITHER2:
     return unquantizeZero(*ptr,zs,zz);
+  default:
+    return NAN;
   }
 }
 
@@ -742,6 +748,8 @@
     return unquantize(*ptr,zs,zz);
   case SUBDITHER2:
     return unquantizeZero(*ptr,zs,zz);
+  default:
+    return NAN;
   }
 }
 
@@ -770,6 +778,8 @@
     return unquantize(*ptr,zs,zz);
   case SUBDITHER2:
     return unquantizeZero(*ptr,zs,zz);
+  default:
+    return NAN;
   }
 }
 
@@ -790,6 +800,8 @@
     return unquantize(*ptr,zs,zz);
   case SUBDITHER2:
     return unquantizeZero(*ptr,zs,zz);
+  default:
+    return NAN;
   }
 }
 
diff -ur SAOImageDS9.orig/tcl8.6/unix/configure SAOImageDS9/tcl8.6/unix/configure
--- SAOImageDS9.orig/tcl8.6/unix/configure	2021-05-14 16:49:20.000000000 +0200
+++ SAOImageDS9/tcl8.6/unix/configure	2021-05-28 22:02:40.360406505 +0200
@@ -4935,6 +4935,8 @@
 echo "${ECHO_T}$ac_cv_func_sin" >&6
 if test $ac_cv_func_sin = yes; then
   MATH_LIBS=""
+  # LIBS modific. apparently needed on the openSUSE Tumbleweed RJM 2021-05-28
+  LIBS="-lm $LIBS"
 else
   MATH_LIBS="-lm"
 fi
diff -ur SAOImageDS9.orig/tkimg/compat/libtiff/libtiff/Makefile.am SAOImageDS9/tkimg/compat/libtiff/libtiff/Makefile.am
--- SAOImageDS9.orig/tkimg/compat/libtiff/libtiff/Makefile.am	2021-05-14 16:49:20.000000000 +0200
+++ SAOImageDS9/tkimg/compat/libtiff/libtiff/Makefile.am	2021-05-28 15:23:34.018240300 +0200
@@ -146,6 +146,8 @@
 mkg3states_SOURCES = mkg3states.c tif_fax3.h
 mkg3states_LDADD = $(LIBPORT)
 
+BUILT_SOURCES = tif_config.h
+
 faxtable: mkg3states
 	(rm -f tif_fax3sm.c && ./mkg3states -b -c const tif_fax3sm.c)
 
diff -ur SAOImageDS9.orig/tkimg/configure.in SAOImageDS9/tkimg/configure.in
--- SAOImageDS9.orig/tkimg/configure.in	2021-05-14 16:49:20.000000000 +0200
+++ SAOImageDS9/tkimg/configure.in	2021-05-28 22:58:38.115566235 +0200
@@ -109,33 +109,33 @@
 CC=`echo $CC | sed -e 's/ .*$//'`
 
 TEA_CONFIG_COLLECT
-TEA_CONFIG_SUBDIR(zlib,       [--disable-option-checking])
-TEA_CONFIG_SUBDIR(libpng,     [--with-zlibtcl=`pwd`/zlib --disable-option-checking])
-TEA_CONFIG_SUBDIR(libtiff,    [--disable-option-checking])
-TEA_CONFIG_SUBDIR(libjpeg,    [--disable-option-checking])
-TEA_CONFIG_SUBDIR(base,       [--disable-option-checking])
-TEA_CONFIG_SUBDIR(bmp,        [--with-tkimg=`pwd`/base --disable-option-checking])
-TEA_CONFIG_SUBDIR(gif,        [--with-tkimg=`pwd`/base --disable-option-checking])
-TEA_CONFIG_SUBDIR(ico,        [--with-tkimg=`pwd`/base --disable-option-checking])
-TEA_CONFIG_SUBDIR(jpeg,       [--with-tkimg=`pwd`/base --with-jpegtcl=`pwd`/libjpeg --disable-option-checking])
-TEA_CONFIG_SUBDIR(pcx,        [--with-tkimg=`pwd`/base --disable-option-checking])
-TEA_CONFIG_SUBDIR(pixmap,     [--with-tkimg=`pwd`/base --disable-option-checking])
-TEA_CONFIG_SUBDIR(png,        [--with-tkimg=`pwd`/base --with-pngtcl=`pwd`/libpng --with-zlibtcl=`pwd`/zlib --disable-option-checking])
-TEA_CONFIG_SUBDIR(ppm,        [--with-tkimg=`pwd`/base --disable-option-checking])
-TEA_CONFIG_SUBDIR(ps,         [--with-tkimg=`pwd`/base --disable-option-checking])
-TEA_CONFIG_SUBDIR(sgi,        [--with-tkimg=`pwd`/base --disable-option-checking])
-TEA_CONFIG_SUBDIR(sun,        [--with-tkimg=`pwd`/base --disable-option-checking])
-TEA_CONFIG_SUBDIR(tga,        [--with-tkimg=`pwd`/base --disable-option-checking])
-TEA_CONFIG_SUBDIR(tiff,       [--with-tkimg=`pwd`/base --with-tifftcl=`pwd`/libtiff --with-zlibtcl=`pwd`/zlib --with-jpegtcl=`pwd`/libjpeg --disable-option-checking])
-TEA_CONFIG_SUBDIR(window,     [--with-tkimg=`pwd`/base --disable-option-checking])
-TEA_CONFIG_SUBDIR(xbm,        [--with-tkimg=`pwd`/base --disable-option-checking])
-TEA_CONFIG_SUBDIR(xpm,        [--with-tkimg=`pwd`/base --disable-option-checking])
-TEA_CONFIG_SUBDIR(dted,       [--with-tkimg=`pwd`/base --disable-option-checking])
-TEA_CONFIG_SUBDIR(raw,        [--with-tkimg=`pwd`/base --disable-option-checking])
-TEA_CONFIG_SUBDIR(flir,       [--with-tkimg=`pwd`/base --disable-option-checking])
-
-#--------------------------------------------------------------------
-#	Finally
-#--------------------------------------------------------------------
-
-AC_OUTPUT(Makefile)
+# TEA_CONFIG_SUBDIR(zlib,       [--disable-option-checking])
+# TEA_CONFIG_SUBDIR(libpng,     [--with-zlibtcl=`pwd`/zlib --disable-option-checking])
+# TEA_CONFIG_SUBDIR(libtiff,    [--disable-option-checking])
+# TEA_CONFIG_SUBDIR(libjpeg,    [--disable-option-checking])
+# TEA_CONFIG_SUBDIR(base,       [--disable-option-checking])
+# TEA_CONFIG_SUBDIR(bmp,        [--with-tkimg=`pwd`/base --disable-option-checking])
+# TEA_CONFIG_SUBDIR(gif,        [--with-tkimg=`pwd`/base --disable-option-checking])
+# TEA_CONFIG_SUBDIR(ico,        [--with-tkimg=`pwd`/base --disable-option-checking])
+# TEA_CONFIG_SUBDIR(jpeg,       [--with-tkimg=`pwd`/base --with-jpegtcl=`pwd`/libjpeg --disable-option-checking])
+# TEA_CONFIG_SUBDIR(pcx,        [--with-tkimg=`pwd`/base --disable-option-checking])
+# TEA_CONFIG_SUBDIR(pixmap,     [--with-tkimg=`pwd`/base --disable-option-checking])
+# TEA_CONFIG_SUBDIR(png,        [--with-tkimg=`pwd`/base --with-pngtcl=`pwd`/libpng --with-zlibtcl=`pwd`/zlib --disable-option-checking])
+# TEA_CONFIG_SUBDIR(ppm,        [--with-tkimg=`pwd`/base --disable-option-checking])
+# TEA_CONFIG_SUBDIR(ps,         [--with-tkimg=`pwd`/base --disable-option-checking])
+# TEA_CONFIG_SUBDIR(sgi,        [--with-tkimg=`pwd`/base --disable-option-checking])
+# TEA_CONFIG_SUBDIR(sun,        [--with-tkimg=`pwd`/base --disable-option-checking])
+# TEA_CONFIG_SUBDIR(tga,        [--with-tkimg=`pwd`/base --disable-option-checking])
+# TEA_CONFIG_SUBDIR(tiff,       [--with-tkimg=`pwd`/base --with-tifftcl=`pwd`/libtiff --with-zlibtcl=`pwd`/zlib --with-jpegtcl=`pwd`/libjpeg --disable-option-checking])
+# TEA_CONFIG_SUBDIR(window,     [--with-tkimg=`pwd`/base --disable-option-checking])
+# TEA_CONFIG_SUBDIR(xbm,        [--with-tkimg=`pwd`/base --disable-option-checking])
+# TEA_CONFIG_SUBDIR(xpm,        [--with-tkimg=`pwd`/base --disable-option-checking])
+# TEA_CONFIG_SUBDIR(dted,       [--with-tkimg=`pwd`/base --disable-option-checking])
+# TEA_CONFIG_SUBDIR(raw,        [--with-tkimg=`pwd`/base --disable-option-checking])
+# TEA_CONFIG_SUBDIR(flir,       [--with-tkimg=`pwd`/base --disable-option-checking])
+# 
+# #--------------------------------------------------------------------
+# #	Finally
+# #--------------------------------------------------------------------
+# 
+# AC_OUTPUT(Makefile)
diff -ur SAOImageDS9.orig/tkimg/genConfigureFiles.sh SAOImageDS9/tkimg/genConfigureFiles.sh
--- SAOImageDS9.orig/tkimg/genConfigureFiles.sh	2021-05-14 16:49:20.000000000 +0200
+++ SAOImageDS9/tkimg/genConfigureFiles.sh	2021-05-28 16:32:49.341798325 +0200
@@ -15,7 +15,7 @@
 pushd sgi    ; autoconf ; rm -r autom4te.cache ; popd
 pushd sun    ; autoconf ; rm -r autom4te.cache ; popd
 pushd tga    ; autoconf ; rm -r autom4te.cache ; popd
-pushd tiff   ; autoconf ; rm -r autom4te.cache ; popd
+# pushd tiff   ; autoconf ; rm -r autom4te.cache ; popd
 pushd window ; autoconf ; rm -r autom4te.cache ; popd
 pushd xbm    ; autoconf ; rm -r autom4te.cache ; popd
 pushd xpm    ; autoconf ; rm -r autom4te.cache ; popd
diff -ur SAOImageDS9.orig/tkimg/init.c SAOImageDS9/tkimg/init.c
--- SAOImageDS9.orig/tkimg/init.c	2021-05-14 16:49:20.000000000 +0200
+++ SAOImageDS9/tkimg/init.c	2021-05-29 16:42:55.086335209 +0200
@@ -6,6 +6,7 @@
  * Copyright (c) 2002 Andreas Kupries <andreas_kupries@users.sourceforge.net>
  *
  */
+#pragma once
 
 #include "tkimg.h"
 
diff -ur SAOImageDS9.orig/tkimg/libpng/Makefile.in SAOImageDS9/tkimg/libpng/Makefile.in
--- SAOImageDS9.orig/tkimg/libpng/Makefile.in	2021-05-14 16:49:20.000000000 +0200
+++ SAOImageDS9/tkimg/libpng/Makefile.in	2021-05-29 17:13:14.900570777 +0200
@@ -157,6 +157,8 @@
 AR		= @AR@
 CFLAGS		= @CFLAGS@ -DPNG_IMPEXP=MODULE_SCOPE -DPNG_EXTERN=MODULE_SCOPE
 COMPILE		= $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+
+BUILT_SOURCES = pnglibconf.h
 
 #========================================================================
 # Start of user-definable TARGETS section
diff -ur SAOImageDS9.orig/tksao/frame/context.C SAOImageDS9/tksao/frame/context.C
--- SAOImageDS9.orig/tksao/frame/context.C	2021-05-14 16:49:20.000000000 +0200
+++ SAOImageDS9/tksao/frame/context.C	2021-05-27 13:53:29.573129666 +0200
@@ -740,6 +740,7 @@
   case FrScale::DATASEC:
     return &iparams;
   case FrScale::CROPSEC:
+  default:
     return &cparams;
   }
 }
diff -ur SAOImageDS9.orig/tksao/frame/fitsdata.C SAOImageDS9/tksao/frame/fitsdata.C
--- SAOImageDS9.orig/tksao/frame/fitsdata.C	2021-05-14 16:49:20.000000000 +0200
+++ SAOImageDS9/tksao/frame/fitsdata.C	2021-05-27 13:55:11.150104106 +0200
@@ -153,6 +153,7 @@
   case FrScale::IRAFMIN:
     return 1;
   case FrScale::SAMPLE:
+  default:
     return minmaxSample_;
   }
 }
@@ -201,6 +202,7 @@
   switch (minmaxMode_) {
   case FrScale::SCAN:
   case FrScale::SAMPLE:
+  default:
     str << min_ << ends;
     break;
 
@@ -245,6 +247,7 @@
   switch (minmaxMode_) {
   case FrScale::SCAN:
   case FrScale::SAMPLE:
+  default:
     str << max_ << ends;
     break;
 
@@ -288,6 +291,7 @@
   switch (minmaxMode_) {
   case FrScale::SCAN:
   case FrScale::SAMPLE:
+  default:
     return min_;
 
   case FrScale::DATAMIN:
@@ -309,6 +313,7 @@
   switch (minmaxMode_) {
   case FrScale::SCAN:
   case FrScale::SAMPLE:
+  default:
     return max_;
 
   case FrScale::DATAMIN:
@@ -1012,6 +1017,7 @@
 
   switch (clipMode_) {
   case FrScale::MINMAX:
+  default:
     low_ = min();
     high_ = max();
     break;
diff -ur SAOImageDS9.orig/tksao/frame/frmap.C SAOImageDS9/tksao/frame/frmap.C
--- SAOImageDS9.orig/tksao/frame/frmap.C	2021-05-14 16:49:20.000000000 +0200
+++ SAOImageDS9/tksao/frame/frmap.C	2021-05-27 13:55:51.434490340 +0200
@@ -100,6 +100,7 @@
   case Coord::MAGNIFIER:
     return vv * refToMagnifier;
   case Coord::PS:
+  default:
     // should not happen
     return Vector();
   }
@@ -123,6 +124,7 @@
   case Coord::MAGNIFIER:
     return vv * magnifierToRef;
   case Coord::PS:
+  default:
     // should not happen
     return Vector();
   }
diff -ur SAOImageDS9.orig/tksao/frame/marker.C SAOImageDS9/tksao/frame/marker.C
--- SAOImageDS9.orig/tksao/frame/marker.C	2021-05-14 16:49:20.000000000 +0200
+++ SAOImageDS9/tksao/frame/marker.C	2021-05-27 13:57:29.599430571 +0200
@@ -278,6 +278,7 @@
     GC lgc;
     switch (mode) {
     case SRC:
+    default:
       lgc = gc;
       XSetForeground(display, gc, color);
       break;
@@ -343,6 +344,7 @@
   // set width, color, dash
   switch (mode) {
   case SRC:
+  default:
     XSetForeground(display, gc, color); 
     if ((properties & SOURCE) && !(properties & DASH))
       renderXLineNoDash(gc);
@@ -1074,6 +1076,7 @@
 {
   switch (parent->getOrientation()) {
   case Coord::NORMAL:
+  default:
   case Coord::XY:
     return angle + parent->getRotation();
   case Coord::XX:
@@ -1100,6 +1103,7 @@
 {
   switch (parent->frameType()) {
   case Base::F2D:
+  default:
     return arrow2D(p1,p2,sys);
   case Base::F3D:
     return arrow3D(p1,p2,sys);
diff -ur SAOImageDS9.orig/tksao/frame/projection.C SAOImageDS9/tksao/frame/projection.C
--- SAOImageDS9.orig/tksao/frame/projection.C	2021-05-14 16:49:20.000000000 +0200
+++ SAOImageDS9/tksao/frame/projection.C	2021-05-27 13:58:55.356251984 +0200
@@ -65,6 +65,7 @@
   // set width, color, dash
   switch (mode) {
   case SRC:
+  default:
     XSetForeground(display, gc, color); 
     renderXLineNoDash(gc);
     return gc;
@@ -195,6 +196,7 @@
 {
   switch (h) {
   case 1:
+  default:
     p1 = v;
     break;
   case 2:
diff -ur SAOImageDS9.orig/unix/configure.ac SAOImageDS9/unix/configure.ac
--- SAOImageDS9.orig/unix/configure.ac	2021-05-14 16:49:20.000000000 +0200
+++ SAOImageDS9/unix/configure.ac	2021-05-28 21:56:50.773144469 +0200
@@ -55,6 +55,7 @@
 #--------------------------------------------------------------------
 
 TEA_CONFIG_CFLAGS
+AC_CHECK_LIB([m],[cos])
 
 #--------------------------------------------------------------------
 # Set the default compiler switches based on the --enable-symbols option.

Places

File ds9.patch of Package ds9 (Revision b5f0f9db92d3cf0ee0427ce667b8bc73)

Places