openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File ds9.patch of Package ds9 (Revision 242b778cabb1039a0d6163b38c901be1)

Currently displaying revision 242b778cabb1039a0d6163b38c901be1 , Show latest

diff -ur SAOImageDS9.orig/make.include SAOImageDS9/make.include
--- SAOImageDS9.orig/make.include	2019-08-12 21:11:38.000000000 +0200
+++ SAOImageDS9/make.include	2019-09-26 19:52:52.836034931 +0200
@@ -20,7 +20,6 @@
 # xpa 2.1.18+
 # libxml2 2.9.4
 # libxslt 1.1.29
-# openssl 1.0.2k
 
 DS9_VERSION	= 8.1b2
 XPA_VERSION	= 2.1.18
@@ -66,7 +65,7 @@
 .NOTPARALLEL :
 .PHONY	: all dirs ds9 tcliis tclxml tclzipfs tls xpa
 .PHONY	: tkblt tkcon tkhtml1 tkimg tkmpeg tkagif tksao tktable
-.PHONY	: ast funtools openssl
+.PHONY	: ast funtools 
 
 all	: saods9
 
@@ -99,19 +98,6 @@
 	$(STD) \
 	$(CACHE)
 
-#--------------------------openssl
-
-openssl	: openssl/Makefile
-	@echo ""
-	@echo "*** $@ ***"
-	$(MAKE) -C openssl -j $(JOBS)
-
-openssl/Makefile:
-	@echo ""
-	@echo "*** $@ ***"
-	cd openssl; \
-	$(SSLCONFIG) --prefix=$(prefix)
-
 #-------------------------- tcliis
 
 tcliis	: tcliis/Makefile
@@ -160,9 +146,7 @@
 	@echo ""
 	@echo "*** $@ ***"
 	cd tls; \
-	./configure \
- 	--with-ssl-dir=$(prefix)/openssl \
-	 $(TLSFLAGS) \
+	./configure $(TLSFLAGS) \
 	$(WITHTCL) \
 	$(PREFIX) \
 	$(STD)
@@ -448,14 +432,13 @@
 
 .PHONY	: clean
 .PHONY	: dirsclean ds9clean ds9parsersclean localclean
-.PHONY	: opensslclean tcliisclean 
+.PHONY	: tcliisclean 
 .PHONY	: tclxmlclean tlsclean
 .PHONY	: tkbltclean tkconclean tkhtml1clean tkimgclean
 .PHONY	: tkmpegclean tkagifclean
 .PHONY	: tksaoclean astclean funtoolsclean tktableclean xpaclean
 
 clean	: tclclean tkclean \
-	opensslclean \
 	tcliisclean \
 	tlsclean tclxmlclean xpaclean \
 	tkbltclean tkconclean tktableclean tkimgclean \
@@ -483,11 +466,6 @@
 	@echo "*** $@ ***"
 	-rm -f core *~ *#
 
-opensslclean:
-	@echo ""
-	@echo "*** $@ ***"
-	$(MAKE) -C openssl clean
-
 tcliisclean :
 	@echo ""
 	@echo "*** $@ ***"
@@ -561,7 +539,7 @@
 #-------------------------- distclean
 
 .PHONY	: dirsdistclean ds9distclean localdistclean
-.PHONY	: openssldistclean tcliisdistclean 
+.PHONY	: tcliisdistclean 
 .PHONY	: tclxmldistclean tlsdistclean
 .PHONY	: tkbltdistclean tkcondistclean tkhtml1distclean 
 .PHONY	: tkimgdistclean tkmpegdistclean tkagifdistclean 
@@ -569,7 +547,7 @@
 .PHONY	: tktabledistclean xpadistclean
 
 distclean : tcldistclean tkdistclean \
-	  openssldistclean tcliisdistclean tclsignaldistclean \
+	  tcliisdistclean tclsignaldistclean \
 	  tlsdistclean tclxmldistclean xpadistclean \
 	  tkbltdistclean tktabledistclean tkcondistclean tkimgdistclean \
 	  tkmpegdistclean tkagifdistclean tkhtml1distclean \
@@ -592,19 +570,6 @@
 	-rm -f core *~ *#
 	-rm -f config.log config.status config.cache Makefile 
 
-openssldistclean :
-	@echo ""
-	@echo "*** $@ ***"
-	$(MAKE) -C openssl clean
-	rm -f openssl/Makefile
-	rm -rf openssl/include
-	rm -f openssl/crypto/opensslconf.h
-	rm -f openssl/apps/CA.pl
-	rm -f openssl/tools/c_rehash
-	find openssl/test -type l -exec rm {} \;
-	find openssl/apps -type l -exec rm {} \;
-	find openssl/certs/demo -type l -exec rm {} \;
-
 tcliisdistclean :
 	@echo ""
 	@echo "*** $@ ***"
diff -ur SAOImageDS9.orig/tksao/fitsy++/compress.C SAOImageDS9/tksao/fitsy++/compress.C
--- SAOImageDS9.orig/tksao/fitsy++/compress.C	2019-08-12 21:11:38.000000000 +0200
+++ SAOImageDS9/tksao/fitsy++/compress.C	2019-09-26 19:55:23.649528818 +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/tksao/frame/context.C SAOImageDS9/tksao/frame/context.C
--- SAOImageDS9.orig/tksao/frame/context.C	2019-08-12 21:11:38.000000000 +0200
+++ SAOImageDS9/tksao/frame/context.C	2019-09-26 19:46:39.936349227 +0200
@@ -764,7 +764,7 @@
   case FrScale::IMGSEC:
   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	2019-08-12 21:11:38.000000000 +0200
+++ SAOImageDS9/tksao/frame/fitsdata.C	2019-09-26 19:47:56.125097462 +0200
@@ -140,7 +140,7 @@
   case FrScale::DATAMIN:
   case FrScale::IRAFMIN:
     return 1;
-  case FrScale::SAMPLE:
+  default:
     return minmaxSample_;
   }
 }
@@ -274,9 +274,6 @@
 double FitsData::min()
 {
   switch (minmaxMode_) {
-  case FrScale::SCAN:
-  case FrScale::SAMPLE:
-    return min_;
 
   case FrScale::DATAMIN:
     if (hasdatamin_)
@@ -289,15 +286,14 @@
       return irafmin_;
     else
       return 0;
+  default:
+    return min_;
   }
 }
 
 double FitsData::max()
 {
   switch (minmaxMode_) {
-  case FrScale::SCAN:
-  case FrScale::SAMPLE:
-    return max_;
 
   case FrScale::DATAMIN:
     if (hasdatamin_)
@@ -309,6 +305,8 @@
     if (hasirafmin_)
       return irafmax_;
     return 0;
+  default:
+    return max_;
   }
 }
 
diff -ur SAOImageDS9.orig/tksao/frame/frmap.C SAOImageDS9/tksao/frame/frmap.C
--- SAOImageDS9.orig/tksao/frame/frmap.C	2019-08-12 21:11:38.000000000 +0200
+++ SAOImageDS9/tksao/frame/frmap.C	2019-09-26 19:48:46.725599450 +0200
@@ -99,7 +99,7 @@
     return vv * refToPanner;
   case Coord::MAGNIFIER:
     return vv * refToMagnifier;
-  case Coord::PS:
+  default:
     // should not happen
     return Vector();
   }
@@ -122,7 +122,7 @@
     return vv * pannerToRef;
   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	2019-08-12 21:11:38.000000000 +0200
+++ SAOImageDS9/tksao/frame/marker.C	2019-09-26 19:51:12.315038198 +0200
@@ -344,6 +344,7 @@
   // set width, color, dash
   switch (mode) {
   case SRC:
+  default:
     XSetForeground(display, gc, color); 
     if ((properties & SOURCE) && !(properties & DASH))
       renderXLineNoDash(gc);
@@ -1177,6 +1178,7 @@
   switch (parent->getOrientation()) {
   case Coord::NORMAL:
   case Coord::XY:
+  default:
     return angle + parent->getRotation();
   case Coord::XX:
   case Coord::YY:
@@ -1202,6 +1204,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	2019-08-12 21:11:38.000000000 +0200
+++ SAOImageDS9/tksao/frame/projection.C	2019-09-26 19:51:26.443178405 +0200
@@ -67,6 +67,7 @@
   // set width, color, dash
   switch (mode) {
   case SRC:
+  default:
     XSetForeground(display, gc, color); 
     renderXLineNoDash(gc);
     return gc;
diff -ur SAOImageDS9.orig/unix/Makefile.in SAOImageDS9/unix/Makefile.in
--- SAOImageDS9.orig/unix/Makefile.in	2019-08-12 21:11:38.000000000 +0200
+++ SAOImageDS9/unix/Makefile.in	2019-09-25 13:37:36.000000000 +0200
@@ -26,7 +26,6 @@
 .PHONY	: saods9 tcl tk
 
 saods9	: dirs tcl tk \
-	openssl \
 	tcliis tclsignal \
 	tclzipfs tls tclxml xpa \
 	tkblt tktable tkimg \

Places

File ds9.patch of Package ds9 (Revision 242b778cabb1039a0d6163b38c901be1)

Places