svn commit: r527971 - in head/biology/jellyfish: . files

[Jason W. Bacon]

Author: jwb
Date: Sat Mar  7 19:25:54 2020
New Revision: 527971
URL: https://svnweb.freebsd.org/changeset/ports/527971

Log:
  biology/jellyfish: Patch for clang 10
  
  Add cast to silence implicit conversion error
  
  PR:             ports/244645
  Submitted by:   dim

Added:
  head/biology/jellyfish/files/patch-lib_jsoncpp.cpp   (contents, props changed)
Modified:
  head/biology/jellyfish/Makefile
  head/biology/jellyfish/files/patch-sub__commands_count__main.cc

Modified: head/biology/jellyfish/Makefile
==============================================================================
--- head/biology/jellyfish/Makefile	Sat Mar  7 19:07:20 2020	(r527970)
+++ head/biology/jellyfish/Makefile	Sat Mar  7 19:25:54 2020	(r527971)
@@ -3,7 +3,7 @@
 PORTNAME=		Jellyfish
 DISTVERSIONPREFIX=	v
 DISTVERSION=		2.2.10
-PORTREVISION=		7
+PORTREVISION=		8
 CATEGORIES=		biology
 
 MAINTAINER=	jwb at FreeBSD.org

Added: head/biology/jellyfish/files/patch-lib_jsoncpp.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/biology/jellyfish/files/patch-lib_jsoncpp.cpp	Sat Mar  7 19:25:54 2020	(r527971)
@@ -0,0 +1,20 @@
+--- lib/jsoncpp.cpp.orig	2018-04-16 12:46:09 UTC
++++ lib/jsoncpp.cpp
+@@ -2300,7 +2300,7 @@ Value::asInt64() const
+       JSON_ASSERT_MESSAGE( value_.uint_ <= UInt64(maxInt64), "unsigned integer out of Int64 range" );
+       return value_.uint_;
+    case realValue:
+-      JSON_ASSERT_MESSAGE( value_.real_ >= minInt64  &&  value_.real_ <= maxInt64, "Real out of Int64 range" );
++      JSON_ASSERT_MESSAGE( value_.real_ >= minInt64  &&  value_.real_ < static_cast<double>(maxInt64), "Real out of Int64 range" );
+       return Int( value_.real_ );
+    case booleanValue:
+       return value_.bool_ ? 1 : 0;
+@@ -2328,7 +2328,7 @@ Value::asUInt64() const
+    case uintValue:
+       return value_.uint_;
+    case realValue:
+-      JSON_ASSERT_MESSAGE( value_.real_ >= 0  &&  value_.real_ <= maxUInt64,  "Real out of UInt64 range" );
++      JSON_ASSERT_MESSAGE( value_.real_ >= 0  &&  value_.real_ < static_cast<double>(maxUInt64),  "Real out of UInt64 range" );
+       return UInt( value_.real_ );
+    case booleanValue:
+       return value_.bool_ ? 1 : 0;

Modified: head/biology/jellyfish/files/patch-sub__commands_count__main.cc
==============================================================================
--- head/biology/jellyfish/files/patch-sub__commands_count__main.cc	Sat Mar  7 19:07:20 2020	(r527970)
+++ head/biology/jellyfish/files/patch-sub__commands_count__main.cc	Sat Mar  7 19:25:54 2020	(r527971)
@@ -1,6 +1,6 @@
---- sub_commands/count_main.cc.orig	2019-05-13 07:42:50 UTC
+--- sub_commands/count_main.cc.orig	2018-04-16 12:46:09 UTC
 +++ sub_commands/count_main.cc
-@@ -330,7 +330,7 @@ int count_main(int argc, char *argv[])
+@@ -360,7 +360,7 @@ int count_main(int argc, char *argv[])
          uint64_t max = args.upper_count_given ? args.upper_count_arg : std::numeric_limits<uint64_t>::max();
          try {
            merge_files(files, args.output_arg, header, min, max);