From 7d4bc81a87518c8e5bdb1e64dd5d094e7ba24e91 Mon Sep 17 00:00:00 2001 From: termux-pacman-bot Date: Wed, 3 Dec 2025 13:45:37 +0000 Subject: [PATCH] bump(main/solidity): 0.8.31 Remove upstream patch file. https://github.com/argotorg/solidity/commit/db18d42bdeccf305695e477c74fc2a4141493c5e --- packages/solidity/boost-1.89.patch | 37 ------------------- packages/solidity/build.sh | 9 ++--- .../solidity/libsolutil-CMakeLists.txt.patch | 2 +- 3 files changed, 5 insertions(+), 43 deletions(-) delete mode 100644 packages/solidity/boost-1.89.patch diff --git a/packages/solidity/boost-1.89.patch b/packages/solidity/boost-1.89.patch deleted file mode 100644 index 40de35edf3..0000000000 --- a/packages/solidity/boost-1.89.patch +++ /dev/null @@ -1,37 +0,0 @@ -From db18d42bdeccf305695e477c74fc2a4141493c5e Mon Sep 17 00:00:00 2001 -From: Michael Cho -Date: Tue, 12 Aug 2025 18:55:45 -0400 -Subject: [PATCH] Fix build with Boost 1.89.0 - -Boost.System has been header-only since Boost 1.69 and will be dropping -the compatibility stub library in Boost 1.89 (boostorg/system@7a495bb). - -Since the `system` component is only needed for Boost < 1.69, it can be -added to `BOOST_COMPONENTS` in the fallback find_package. - -Signed-off-by: Michael Cho ---- - cmake/EthDependencies.cmake | 3 ++- - libsolutil/CMakeLists.txt | 2 +- - test/tools/CMakeLists.txt | 4 ++-- - 3 files changed, 5 insertions(+), 4 deletions(-) - ---- a/cmake/EthDependencies.cmake -+++ b/cmake/EthDependencies.cmake -@@ -29,7 +29,7 @@ if (WIN32) - option(Boost_USE_STATIC_RUNTIME "Link Boost against static C++ runtime libraries" ON) - endif() - --set(BOOST_COMPONENTS "filesystem;unit_test_framework;program_options;system") -+set(BOOST_COMPONENTS "filesystem;unit_test_framework;program_options") - - # CMake >= 3.30 should not use the vendored boost - if(POLICY CMP0167) -@@ -50,6 +50,7 @@ else() - if(POLICY CMP0167) - cmake_policy(SET CMP0167 OLD) - endif() -+ list(APPEND BOOST_COMPONENTS system) - find_package(Boost 1.67.0 QUIET REQUIRED COMPONENTS ${BOOST_COMPONENTS}) - endif() - endif() diff --git a/packages/solidity/build.sh b/packages/solidity/build.sh index ed3854ae31..09532a8e99 100644 --- a/packages/solidity/build.sh +++ b/packages/solidity/build.sh @@ -1,11 +1,10 @@ -TERMUX_PKG_HOMEPAGE=https://solidity.readthedocs.io +TERMUX_PKG_HOMEPAGE=https://www.soliditylang.org/ TERMUX_PKG_DESCRIPTION="An Ethereum smart contract-oriented language" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="0.8.30" -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=5e8d58dff551a18205e325c22f1a3b194058efbdc128853afd75d31b0568216d +TERMUX_PKG_VERSION="0.8.31" +TERMUX_PKG_SRCURL=https://github.com/argotorg/solidity/releases/download/v${TERMUX_PKG_VERSION}/solidity_${TERMUX_PKG_VERSION}.tar.gz +TERMUX_PKG_SHA256=1efcf5af92e39499ce64d9cb33ba1cc1aa43d0aba107472915d732bf4a31c837 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_DEPENDS="boost, libc++" TERMUX_PKG_BUILD_DEPENDS="boost-headers, fmt, nlohmann-json, range-v3" diff --git a/packages/solidity/libsolutil-CMakeLists.txt.patch b/packages/solidity/libsolutil-CMakeLists.txt.patch index 7ef8cb862a..dbf7d066a2 100644 --- a/packages/solidity/libsolutil-CMakeLists.txt.patch +++ b/packages/solidity/libsolutil-CMakeLists.txt.patch @@ -6,7 +6,7 @@ range-v3 and nlohmann-json are headers only and not libraries ) add_library(solutil ${sources}) --target_link_libraries(solutil PUBLIC Boost::boost Boost::filesystem Boost::system range-v3 fmt::fmt-header-only nlohmann_json::nlohmann_json) +-target_link_libraries(solutil PUBLIC Boost::boost Boost::filesystem ${Boost_SYSTEM_LIBRARY} range-v3 fmt::fmt-header-only nlohmann_json::nlohmann_json) +target_link_libraries(solutil PUBLIC Boost::boost Boost::filesystem fmt::fmt-header-only) target_include_directories(solutil PUBLIC "${PROJECT_SOURCE_DIR}") add_dependencies(solutil solidity_BuildInfo.h)