svn commit: r476725 - in head/lang/solidity: . files

[Alex Dupre]

Author: ale
Date: Thu Aug  9 08:01:28 2018
New Revision: 476725
URL: https://svnweb.freebsd.org/changeset/ports/476725

Log:
  Update to 0.4.24 release and fix build with newer boost lib.

Added:
  head/lang/solidity/files/patch-libevmasm_Assembly.cpp   (contents, props changed)
Modified:
  head/lang/solidity/Makefile
  head/lang/solidity/distinfo
  head/lang/solidity/files/patch-libdevcore_JSON.cpp

Modified: head/lang/solidity/Makefile
==============================================================================
--- head/lang/solidity/Makefile	Thu Aug  9 07:09:58 2018	(r476724)
+++ head/lang/solidity/Makefile	Thu Aug  9 08:01:28 2018	(r476725)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	solidity
-PORTVERSION=	0.4.23
-PORTREVISION=	1
+PORTVERSION=	0.4.24
 CATEGORIES=	lang
 MASTER_SITES=	https://github.com/ethereum/solidity/releases/download/v${PORTVERSION}/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -12,8 +11,6 @@ MAINTAINER=	ale at FreeBSD.org
 COMMENT=	Solidity Contract-Oriented Programming Language
 
 LICENSE=	GPLv3
-
-BROKEN=		fails to build with boost 1.68, see bug 230392
 
 BUILD_DEPENDS=	boost-libs>=0:devel/boost-libs
 LIB_DEPENDS=	libjsoncpp.so:devel/jsoncpp

Modified: head/lang/solidity/distinfo
==============================================================================
--- head/lang/solidity/distinfo	Thu Aug  9 07:09:58 2018	(r476724)
+++ head/lang/solidity/distinfo	Thu Aug  9 08:01:28 2018	(r476725)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1524729659
-SHA256 (solidity_0.4.23.tar.gz) = 1a01dfd0f19617c543a9dc012d4ae99aecc38bb3931e0c7af88007005e60413f
-SIZE (solidity_0.4.23.tar.gz) = 1136930
+TIMESTAMP = 1533799823
+SHA256 (solidity_0.4.24.tar.gz) = b6828266d9b108a035f44127a6107c9fbc516018b0fcf5de370196306cddb2a8
+SIZE (solidity_0.4.24.tar.gz) = 1154386

Modified: head/lang/solidity/files/patch-libdevcore_JSON.cpp
==============================================================================
--- head/lang/solidity/files/patch-libdevcore_JSON.cpp	Thu Aug  9 07:09:58 2018	(r476724)
+++ head/lang/solidity/files/patch-libdevcore_JSON.cpp	Thu Aug  9 08:01:28 2018	(r476725)
@@ -1,4 +1,4 @@
---- libdevcore/JSON.cpp.orig	2018-04-19 21:36:04 UTC
+--- libdevcore/JSON.cpp.orig	2018-05-16 14:30:44 UTC
 +++ libdevcore/JSON.cpp
 @@ -27,10 +27,12 @@
  
@@ -6,8 +6,8 @@
  
 +/*
  static_assert(
- 	(JSONCPP_VERSION_MAJOR == 1) && (JSONCPP_VERSION_MINOR == 7) && (JSONCPP_VERSION_PATCH == 7),
- 	"Unexpected jsoncpp version: " JSONCPP_VERSION_STRING ". Expecting 1.7.7."
+ 	(JSONCPP_VERSION_MAJOR == 1) && (JSONCPP_VERSION_MINOR == 8) && (JSONCPP_VERSION_PATCH == 4),
+ 	"Unexpected jsoncpp version: " JSONCPP_VERSION_STRING ". Expecting 1.8.4."
  );
 +*/
  

Added: head/lang/solidity/files/patch-libevmasm_Assembly.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lang/solidity/files/patch-libevmasm_Assembly.cpp	Thu Aug  9 08:01:28 2018	(r476725)
@@ -0,0 +1,20 @@
+--- libevmasm/Assembly.cpp.orig	2018-05-16 14:30:44 UTC
++++ libevmasm/Assembly.cpp
+@@ -264,7 +264,7 @@ Json::Value Assembly::assemblyJSON(Strin
+ 					createJsonValue("PUSH [ErrorTag]", i.location().start, i.location().end, ""));
+ 			else
+ 				collection.append(
+-					createJsonValue("PUSH [tag]", i.location().start, i.location().end, string(i.data())));
++					createJsonValue("PUSH [tag]", i.location().start, i.location().end, dev::toString(i.data())));
+ 			break;
+ 		case PushSub:
+ 			collection.append(
+@@ -290,7 +290,7 @@ Json::Value Assembly::assemblyJSON(Strin
+ 			break;
+ 		case Tag:
+ 			collection.append(
+-				createJsonValue("tag", i.location().start, i.location().end, string(i.data())));
++				createJsonValue("tag", i.location().start, i.location().end, dev::toString(i.data())));
+ 			collection.append(
+ 				createJsonValue("JUMPDEST", i.location().start, i.location().end));
+ 			break;