CVS commit: pkgsrc/misc/kstars

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Sat Jul 16 04:14:03 UTC 2016

Modified Files:
        pkgsrc/misc/kstars: distinfo
        pkgsrc/misc/kstars/patches: patch-kstars_fitsviewer_fitsimage.cpp

Log Message:
gcc6 build fix


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/misc/kstars/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/misc/kstars/patches/patch-kstars_fitsviewer_fitsimage.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/kstars/distinfo
diff -u pkgsrc/misc/kstars/distinfo:1.13 pkgsrc/misc/kstars/distinfo:1.14
--- pkgsrc/misc/kstars/distinfo:1.13    Tue Nov  3 23:49:41 2015
+++ pkgsrc/misc/kstars/distinfo Sat Jul 16 04:14:03 2016
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.13 2015/11/03 23:49:41 agc Exp $
+$NetBSD: distinfo,v 1.14 2016/07/16 04:14:03 markd Exp $
 
 SHA1 (kstars-4.14.3.tar.xz) = 108b204308d464f03f3119b08d2e53c203615c05
 RMD160 (kstars-4.14.3.tar.xz) = 6e0ae12cc2b7c9277294c720ebab6502d3fffd29
 SHA512 (kstars-4.14.3.tar.xz) = c843506ae0d85e03b9ac3b11be73f35b66f9fc64adddf7a4643cb397fc59628920254aa056d7bf968b54893ce035d40d0c17a7d0fc576d3dae5799fd0f16ec3e
 Size (kstars-4.14.3.tar.xz) = 12374500 bytes
-SHA1 (patch-kstars_fitsviewer_fitsimage.cpp) = f18ceecfa2267d0957f7f5d3b6e609a2d861b375
+SHA1 (patch-kstars_fitsviewer_fitsimage.cpp) = 006d16c81f6eaf897cc65233409b3b9af4b07868
 SHA1 (patch-kstars_skyobjects_satellite.cpp) = a30cd6139fff8e5968d704b901dd2a059548d527
 SHA1 (patch-kstars_tools_altvstime.cpp) = 24b8d4c31216fd08353e29825c6213349cfa6287
 SHA1 (patch-kstars_widgets_moonphasecalendarwidget.h) = c3c507447ea4586b2d1224e49cb4c44ba0a13918

Index: pkgsrc/misc/kstars/patches/patch-kstars_fitsviewer_fitsimage.cpp
diff -u pkgsrc/misc/kstars/patches/patch-kstars_fitsviewer_fitsimage.cpp:1.1 pkgsrc/misc/kstars/patches/patch-kstars_fitsviewer_fitsimage.cpp:1.2
--- pkgsrc/misc/kstars/patches/patch-kstars_fitsviewer_fitsimage.cpp:1.1        Sun Jun 23 19:09:15 2013
+++ pkgsrc/misc/kstars/patches/patch-kstars_fitsviewer_fitsimage.cpp    Sat Jul 16 04:14:03 2016
@@ -1,4 +1,4 @@
-$NetBSD: patch-kstars_fitsviewer_fitsimage.cpp,v 1.1 2013/06/23 19:09:15 jperkin Exp $
+$NetBSD: patch-kstars_fitsviewer_fitsimage.cpp,v 1.2 2016/07/16 04:14:03 markd Exp $
 
 Avoid "ambiguous call to overloaded function" errors.
 
@@ -9,7 +9,7 @@ Avoid "ambiguous call to overloaded func
      int diff_y=s1->y - s2->y;
  
 -    dis = abs( sqrt( diff_x*diff_x + diff_y*diff_y));
-+    dis = abs( sqrt((float)diff_x*diff_x + diff_y*diff_y));
++    dis = std::abs( sqrt((float)diff_x*diff_x + diff_y*diff_y));
      dis -= s1->width/2;
      dis -= s2->width/2;