From 462978bdb3d07dea452d8226307d647713b91255 Mon Sep 17 00:00:00 2001
From: Tee KOBAYASHI <xtkoba@gmail.com>
Date: Wed, 9 Feb 2022 02:07:48 +0900
Subject: [PATCH] solidity: Do not use bundled jsoncpp

to avoid build issue when jsoncpp package is installed.
---
 packages/solidity/CMakeLists.txt.patch      | 12 ++++++++++++
 packages/solidity/build.sh                  |  7 ++++++-
 packages/solidity/libsolutil-JSON.cpp.patch | 14 ++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 packages/solidity/CMakeLists.txt.patch
 create mode 100644 packages/solidity/libsolutil-JSON.cpp.patch

diff --git a/packages/solidity/CMakeLists.txt.patch b/packages/solidity/CMakeLists.txt.patch
new file mode 100644
index 000000000..123f46468
--- /dev/null
+++ b/packages/solidity/CMakeLists.txt.patch
@@ -0,0 +1,12 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -42,9 +42,7 @@
+ # Let's find our dependencies
+ include(EthDependencies)
+ include(fmtlib)
+-include(jsoncpp)
+ include(range-v3)
+-include_directories(SYSTEM ${JSONCPP_INCLUDE_DIR})
+ 
+ find_package(Threads)
+ 
diff --git a/packages/solidity/build.sh b/packages/solidity/build.sh
index 051fb5f5f..b140891fb 100644
--- a/packages/solidity/build.sh
+++ b/packages/solidity/build.sh
@@ -3,10 +3,11 @@ TERMUX_PKG_DESCRIPTION="An Ethereum smart contract-oriented language."
 TERMUX_PKG_LICENSE="GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION=0.8.11
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/ethereum/solidity/releases/download/v${TERMUX_PKG_VERSION}/solidity_${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=b67df542cc19f4181a07050950e235f60a6dcc8018529335701384e632947b5a
 TERMUX_PKG_AUTO_UPDATE=true
-TERMUX_PKG_DEPENDS="boost"
+TERMUX_PKG_DEPENDS="boost, jsoncpp"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DUSE_Z3=OFF
 -DUSE_CVC4=OFF
@@ -14,3 +15,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
 -DBoost_USE_STATIC_LIBS=OFF
 "
 TERMUX_CMAKE_BUILD="Unix Makefiles"
+
+termux_step_pre_configure() {
+	LDFLAGS+=" -ljsoncpp"
+}
diff --git a/packages/solidity/libsolutil-JSON.cpp.patch b/packages/solidity/libsolutil-JSON.cpp.patch
new file mode 100644
index 000000000..a876a216e
--- /dev/null
+++ b/packages/solidity/libsolutil-JSON.cpp.patch
@@ -0,0 +1,14 @@
+--- a/libsolutil/JSON.cpp
++++ b/libsolutil/JSON.cpp
+@@ -32,11 +32,6 @@
+ 
+ using namespace std;
+ 
+-static_assert(
+-	(JSONCPP_VERSION_MAJOR == 1) && (JSONCPP_VERSION_MINOR == 9) && (JSONCPP_VERSION_PATCH == 3),
+-	"Unexpected jsoncpp version: " JSONCPP_VERSION_STRING ". Expecting 1.9.3."
+-);
+-
+ namespace solidity::util
+ {
+