From nobody Thu Jun 02 05:28:50 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id AAB821B4965C; Thu, 2 Jun 2022 05:28:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LDF1H1h4Kz4qtB; Thu, 2 Jun 2022 05:28:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654147731; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fQdDE+EEVDm0V9nGuDZf0aA7fqlI6Jl0skE+jUYMQTY=; b=jFIV64vvyXh2RIw5F8B8YRAJAbKP7Mij2HTZ1xXMxJYWCiPk+Gcy/52Fxb40j05kJaRPKV uZpytLDt0emKSFbWylIxPcVypx9T8zoGOR2jkqfhWQsqmVZCKsrNVtB8hMAn86+nVt8Hz6 4gfql4FNZo/DpM8QYd1Ep1VKO8Jd+nJDmiPjD7ZOfDRCLk7hKfViCM5TwqmybucHNWqhUU hB+SLM2fcF36SjSyL20dcShvYrnDv3KCYWCm71gf2jhyUrnlSk0EK+nPCCwIkgB5aQoyln nvQOSU120CRb+FmjOIY/bcO8I9480WiNTNFJVP71uAQ4b3ZzPiqfBYbFsrF0HQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D8EAE6775; Thu, 2 Jun 2022 05:28:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2525Soxk050731; Thu, 2 Jun 2022 05:28:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2525Soxl050730; Thu, 2 Jun 2022 05:28:50 GMT (envelope-from git) Date: Thu, 2 Jun 2022 05:28:50 GMT Message-Id: <202206020528.2525Soxl050730@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: d9241604bcd8 - main - lang/solidity: Unbreak List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d9241604bcd87c961d2b90e76c01e8b26fdd6e2c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654147731; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fQdDE+EEVDm0V9nGuDZf0aA7fqlI6Jl0skE+jUYMQTY=; b=PgUi89ZtH8C86+LJWyLi614PEondT8DbZDY0QXSrFBpBc2ELV8R5Rhjhl2ayuhWaBeqqxW yjDOpfR/+NHkpH3hXJdR65WSBWXubZ7PNM3/2R6VVotvqLy7/FS3vhjsgYqdlvrIQ83exm LdIt8WxoaU4yQ09pemJfLQBEQOH34inhknD8Ydn03cc3whdiNB2V830J/hm4GlBjUkMaKH oj3tW9X/Ow1PDJY3evqNXkV7Bo8JyYH1WYbgQM03PeOo6nZ8D6FEtStMwEQ39RABCfkiJe fX7OCZ0tthQRgugbgonY4ANebq2a3yfYLyiOvCc6BVTiq1ackucmDiUtOGo9ww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654147731; a=rsa-sha256; cv=none; b=ppfkq7xHI6i3CcVsOg71pon/V/dJyoSRKjeta4ty9B2L7LdzLfKfn3Nb4RlQLBKfQXVOr5 Jmd8IiTTrVbAuKt+3EoyymFibTmHxgU1dfE8yPhUVvbDQzaLlr/Xf4qVXtaotUyCEe4UCI ilmmgrLfTR6/bcyUb/8asBC1HhBpoaet/ziBKFBxPkI2wEzNbN3QUN4sX/dn+KfH9y5jxz HJcLEH1k93oEOblbHryGTJEDlvu+VB9yQp1kmzoFwmQkZXKa2ZyqUqS0OaL7O4qm/MhMzl AI0848+YTQzFO+6Dep1ByK2dD4+iTkS6+sb/GILUtp4DXnxuxdKqGVxkF+n8hg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=d9241604bcd87c961d2b90e76c01e8b26fdd6e2c commit d9241604bcd87c961d2b90e76c01e8b26fdd6e2c Author: Yuri Victorovich AuthorDate: 2022-06-02 05:26:54 +0000 Commit: Yuri Victorovich CommitDate: 2022-06-02 05:28:46 +0000 lang/solidity: Unbreak * boost-1.77.0 related compilation failure is fixed * missing STL header failure if fixed PR: 246106 Approved by: portmgr (unbreak) --- lang/solidity/Makefile | 5 +++-- lang/solidity/distinfo | 4 +++- .../files/patch-tools_solidityUpgrade_SourceUpgrade.cpp | 13 +++++++++++++ 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/lang/solidity/Makefile b/lang/solidity/Makefile index a53e7676869b..a34b27306990 100644 --- a/lang/solidity/Makefile +++ b/lang/solidity/Makefile @@ -6,6 +6,9 @@ CATEGORIES= lang MASTER_SITES= https://github.com/ethereum/solidity/releases/download/v${PORTVERSION}/ DISTNAME= ${PORTNAME}_${PORTVERSION} +PATCH_SITES= https://github.com/ethereum/solidity/commit/ +PATCHFILES= 026e26af998c10ca4e39ab6b1b8e64dbc2fdd910.patch:-p1 # https://github.com/ethereum/solidity/pull/13090 + MAINTAINER= ale@FreeBSD.org COMMENT= Solidity Contract-Oriented Programming Language @@ -14,8 +17,6 @@ LICENSE= GPLv3 NOT_FOR_ARCHS= powerpc powerpc64 powerpcspe sparc64 NOT_FOR_ARCHS_REASON= solidity currently does not support big endian systems -BROKEN= error: implicit conversion loses integer precision: 'typename std::enable_if>>::value == number_kind_integer, std::size_t>::type' (aka 'unsigned long') to 'unsigned int' - BUILD_DEPENDS= boost-libs>=0:devel/boost-libs \ libfmt>=0:devel/libfmt \ range-v3>=0:devel/range-v3 diff --git a/lang/solidity/distinfo b/lang/solidity/distinfo index 64d2bfcc474e..a2d79b177fe1 100644 --- a/lang/solidity/distinfo +++ b/lang/solidity/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1652802997 +TIMESTAMP = 1654144304 SHA256 (solidity_0.8.14.tar.gz) = 7ccdf20c889206103d0a48fe10b1c3f1f21269070861e80382f7ede8785e61d4 SIZE (solidity_0.8.14.tar.gz) = 3214611 +SHA256 (026e26af998c10ca4e39ab6b1b8e64dbc2fdd910.patch) = fe2ecb05f607e19cd6795c135e046a0414b32d6b12eee745c5a5d05fe38ce7c9 +SIZE (026e26af998c10ca4e39ab6b1b8e64dbc2fdd910.patch) = 2189 diff --git a/lang/solidity/files/patch-tools_solidityUpgrade_SourceUpgrade.cpp b/lang/solidity/files/patch-tools_solidityUpgrade_SourceUpgrade.cpp new file mode 100644 index 000000000000..59e040bce985 --- /dev/null +++ b/lang/solidity/files/patch-tools_solidityUpgrade_SourceUpgrade.cpp @@ -0,0 +1,13 @@ +- workaround for https://github.com/ethereum/solidity/issues/13091 + +--- tools/solidityUpgrade/SourceUpgrade.cpp.orig 2022-06-02 02:23:26 UTC ++++ tools/solidityUpgrade/SourceUpgrade.cpp +@@ -34,6 +34,8 @@ + #include + #endif + ++#include ++ + + namespace po = boost::program_options; + namespace fs = boost::filesystem;