diff options
| author | Jason W. Bacon <jwb@FreeBSD.org> | 2020-03-07 19:25:54 +0000 |
|---|---|---|
| committer | Jason W. Bacon <jwb@FreeBSD.org> | 2020-03-07 19:25:54 +0000 |
| commit | 4906705775ced663d5a202536b7ef38cedb63ef7 (patch) | |
| tree | 611546ebafae7b4cf9ad4013ed65ec7b19f30ff5 /biology | |
| parent | 3ebe952e96f38e46e4f29a1c8b5c9e167cdb8960 (diff) | |
| download | ports-4906705775ced663d5a202536b7ef38cedb63ef7.tar.gz ports-4906705775ced663d5a202536b7ef38cedb63ef7.zip | |
biology/jellyfish: Patch for clang 10
Add cast to silence implicit conversion error
PR: ports/244645
Submitted by: dim
Notes
Notes:
svn path=/head/; revision=527971
Diffstat (limited to 'biology')
| -rw-r--r-- | biology/jellyfish/Makefile | 2 | ||||
| -rw-r--r-- | biology/jellyfish/files/patch-lib_jsoncpp.cpp | 20 | ||||
| -rw-r--r-- | biology/jellyfish/files/patch-sub__commands_count__main.cc | 4 |
3 files changed, 23 insertions, 3 deletions
diff --git a/biology/jellyfish/Makefile b/biology/jellyfish/Makefile index 0f29e9b7cdf1..d8f05aaa0c97 100644 --- a/biology/jellyfish/Makefile +++ b/biology/jellyfish/Makefile @@ -3,7 +3,7 @@ PORTNAME= Jellyfish DISTVERSIONPREFIX= v DISTVERSION= 2.2.10 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= biology MAINTAINER= jwb@FreeBSD.org diff --git a/biology/jellyfish/files/patch-lib_jsoncpp.cpp b/biology/jellyfish/files/patch-lib_jsoncpp.cpp new file mode 100644 index 000000000000..5a15a2d84526 --- /dev/null +++ b/biology/jellyfish/files/patch-lib_jsoncpp.cpp @@ -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; diff --git a/biology/jellyfish/files/patch-sub__commands_count__main.cc b/biology/jellyfish/files/patch-sub__commands_count__main.cc index 658109d0087f..b4f2404b6cb2 100644 --- a/biology/jellyfish/files/patch-sub__commands_count__main.cc +++ b/biology/jellyfish/files/patch-sub__commands_count__main.cc @@ -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); |