From 88258d1e14eb831fddb9f44c64ebe62b4289e5c0 Mon Sep 17 00:00:00 2001 From: Arjan Mossel Date: Tue, 2 May 2023 12:14:05 +0200 Subject: [PATCH] libbitcoin-system: remove package. The version packaged for Void Linux is extremely outdated. Removing it will help moving from libbitcoin-secp256k1 to bitcoin-core/secp256k1 for providing updated libsecp256k1. --- common/shlibs | 1 - srcpkgs/libbitcoin-system-devel | 1 - .../patches/boost-1.80.patch | 79 ------------------- srcpkgs/libbitcoin-system/patches/gcc12.patch | 10 --- srcpkgs/libbitcoin-system/template | 37 --------- srcpkgs/removed-packages/template | 2 + 6 files changed, 2 insertions(+), 128 deletions(-) delete mode 120000 srcpkgs/libbitcoin-system-devel delete mode 100644 srcpkgs/libbitcoin-system/patches/boost-1.80.patch delete mode 100644 srcpkgs/libbitcoin-system/patches/gcc12.patch delete mode 100644 srcpkgs/libbitcoin-system/template diff --git a/common/shlibs b/common/shlibs index 825d8906c81..da8b12690cb 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3669,7 +3669,6 @@ libdwarves_reorganize.so.1 pahole-1.12_1 libclthreads.so.2 clthreads-2.4.2_1 libclxclient.so.3 clxclient-3.9.2_1 libsecp256k1.so.0 libbitcoin-secp256k1-0.1.0.13_1 -libbitcoin.so.0 libbitcoin-system-3.5.0_1 libltc.so.11 libltc-1.3.1_1 libvpd-2.2.so.2 libvpd-2.2.6_1 libvpd_cxx-2.2.so.2 libvpd-2.2.6_1 diff --git a/srcpkgs/libbitcoin-system-devel b/srcpkgs/libbitcoin-system-devel deleted file mode 120000 index 13797e5b585..00000000000 --- a/srcpkgs/libbitcoin-system-devel +++ /dev/null @@ -1 +0,0 @@ -libbitcoin-system \ No newline at end of file diff --git a/srcpkgs/libbitcoin-system/patches/boost-1.80.patch b/srcpkgs/libbitcoin-system/patches/boost-1.80.patch deleted file mode 100644 index 2d44e24ea5a..00000000000 --- a/srcpkgs/libbitcoin-system/patches/boost-1.80.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- a/include/bitcoin/bitcoin/log/file_collector.hpp -+++ b/include/bitcoin/bitcoin/log/file_collector.hpp -@@ -68,14 +68,18 @@ public: - void store_file(boost::filesystem::path const& src_path) override; - - //! Scans the target directory for the files that have already been stored -+ boost::log::sinks::file::scan_result scan_for_files( -+ boost::log::sinks::file::scan_method method, -+ boost::filesystem::path const& pattern) override; - uintmax_t scan_for_files(boost::log::sinks::file::scan_method method, -- boost::filesystem::path const& pattern, unsigned int* counter) override; -+ boost::filesystem::path const& pattern, unsigned int* counter); - - //! The function updates storage restrictions - void update(size_t max_size, size_t min_free_space, size_t max_files); - - //! The function checks if the directory is governed by this collector - bool is_governed(boost::filesystem::path const& dir) const; -+ bool is_in_storage(boost::filesystem::path const & src_path) const override; - - private: - //! Information about a single stored file ---- a/src/log/file_collector.cpp -+++ b/src/log/file_collector.cpp -@@ -357,6 +357,17 @@ void file_collector::store_file(filesyst - - - //! Scans the target directory for the files that have already been stored -+boost::log::sinks::file::scan_result file_collector::scan_for_files( -+ boost::log::sinks::file::scan_method method, -+ filesystem::path const& pattern) -+{ -+ boost::log::sinks::file::scan_result result; -+ unsigned int counter = 0; -+ result.found_count = scan_for_files(method, pattern, &counter); -+ result.last_file_counter = counter; -+ return result; -+} -+ - uintmax_t file_collector::scan_for_files( - boost::log::sinks::file::scan_method method, - filesystem::path const& pattern, unsigned int* counter) -@@ -450,6 +461,15 @@ bool file_collector::is_governed(filesys - return filesystem::equivalent(storage_dir_, dir); - } - -+/* I don't care if this is correct or not */ -+/* upstream removed */ -+bool file_collector::is_in_storage(filesystem::path const& src_path) const -+{ -+ if (!is_governed(src_path.parent_path())) -+ return false; -+ return filesystem::exists(src_path); -+} -+ - filesystem::path file_collector::make_absolute( - filesystem::path const& path) - { ---- a/include/bitcoin/bitcoin/unicode/file_lock.hpp -+++ b/include/bitcoin/bitcoin/unicode/file_lock.hpp -@@ -14,14 +14,11 @@ - #define LIBBITCOIN_INTERPROCESS_FILE_LOCK_HPP - - #include --#include --#include -+#include - #include --#include --#include --#include --#include --#include -+#include -+#include -+#include - #include - - // Includes from bitcoin/unicode.hpp under _MSC_VER. diff --git a/srcpkgs/libbitcoin-system/patches/gcc12.patch b/srcpkgs/libbitcoin-system/patches/gcc12.patch deleted file mode 100644 index 0347ac22d21..00000000000 --- a/srcpkgs/libbitcoin-system/patches/gcc12.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/include/bitcoin/bitcoin/wallet/dictionary.hpp -+++ b/include/bitcoin/bitcoin/wallet/dictionary.hpp -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - namespace libbitcoin { - namespace wallet { diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template deleted file mode 100644 index ac13e044c27..00000000000 --- a/srcpkgs/libbitcoin-system/template +++ /dev/null @@ -1,37 +0,0 @@ -# Template file for 'libbitcoin-system' -pkgname=libbitcoin-system -version=3.6.0 -revision=10 -build_style=gnu-configure -configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib - --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --with-icu --with-png - --with-qrencode --without-examples" -hostmakedepends="autoconf automake libtool m4 pkg-config" -makedepends="boost-devel icu-devel libbitcoin-secp256k1-devel libpng-devel - qrencode-devel" -short_desc="Bitcoin Cross-Platform C++ Development Toolkit" -maintainer="Andy Weidenbaum " -license="AGPL-3.0-or-later" -homepage="https://github.com/libbitcoin/libbitcoin-system" -distfiles="https://github.com/libbitcoin/libbitcoin-system/archive/v${version}.tar.gz>${pkgname}-${version}.tar.gz" -checksum=5bcc4c31b53acbc9c0d151ace95d684909db4bf946f8d724f76c711934c6775c - -pre_configure() { - ./autogen.sh -} - -post_install() { - vlicense COPYING - vdoc README.md -} - -libbitcoin-system-devel_package() { - short_desc+=" - development files" - depends="${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove usr/include - vmove "usr/lib/*.a" - vmove "usr/lib/*.so" - vmove usr/lib/pkgconfig - } -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 26727c1fc22..ec0ddd9262f 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -286,6 +286,8 @@ replaces=" libbitcoin-protocol-devel<=3.6.0_10 libbitcoin-server<=3.6.0_10 libbitcoin-server-devel<=3.6.0_10 + libbitcoin-system<=3.6.0_10 + libbitcoin-system-devel<=3.6.0_10 libco-devel<=20_1 libco<=20_1 libechonest-qt5<=2.3.1_2