Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump(main/boost): 1.87.0 #22661

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/aptitude/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="terminal-based package manager"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=0.8.13
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=http://deb.debian.org/debian/pool/main/a/aptitude/aptitude_$TERMUX_PKG_VERSION.orig.tar.xz
TERMUX_PKG_SHA256=0ef50cb5de27215dd30de74dd9b46b318f017bd0ec3f5c4735df7ac0beb40248
TERMUX_PKG_DEPENDS="apt, boost, libcwidget, libsigc++-2.0, libsqlite, libxapian, ncurses"
Expand Down

This file was deleted.

11 changes: 5 additions & 6 deletions packages/boost/boost-process-detail-posix-shell_path.hpp.patch
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
diff --color -uNr boost_1_80_0/boost/process/detail/posix/shell_path.hpp boost_1_80_0.mod/boost/process/detail/posix/shell_path.hpp
--- boost_1_80_0/boost/process/detail/posix/shell_path.hpp 2022-08-03 23:47:11.000000000 -0300
+++ boost_1_80_0.mod/boost/process/detail/posix/shell_path.hpp 2022-11-04 00:06:29.634809985 -0300
--- ./boost/process/v1/detail/posix/shell_path.hpp.orig 2024-12-22 10:13:07.037321432 +0530
+++ ./boost/process/v1/detail/posix/shell_path.hpp 2024-12-22 10:13:11.657295867 +0530
@@ -18,13 +18,13 @@

inline boost::process::filesystem::path shell_path()
inline boost::process::v1::filesystem::path shell_path()
{
- return "/bin/sh";
+ return "@TERMUX_PREFIX@/bin/sh";
}

inline boost::process::filesystem::path shell_path(std::error_code &ec)
inline boost::process::v1::filesystem::path shell_path(std::error_code &ec)
{
ec.clear();
- return "/bin/sh";
+ return "@TERMUX_PREFIX@/bin/sh";
}

}}}}
}}}}}
20 changes: 16 additions & 4 deletions packages/boost/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ TERMUX_PKG_LICENSE="BSL-1.0"
TERMUX_PKG_MAINTAINER="@termux"
# Never forget to always bump revision of reverse dependencies and rebuild them
# when bumping version.
TERMUX_PKG_VERSION="1.83.0"
TERMUX_PKG_REVISION=3
TERMUX_PKG_VERSION="1.87.0"
TERMUX_PKG_SRCURL=https://boostorg.jfrog.io/artifactory/main/release/$TERMUX_PKG_VERSION/source/boost_${TERMUX_PKG_VERSION//./_}.tar.bz2
TERMUX_PKG_SHA256=6478edfe2f3305127cffe8caf73ea0176c53769f4bf1585be237eb30798c3b8e
TERMUX_PKG_SHA256=af57be25cb4c4f4b413ed692fe378affb4352ea50fbe294a11ef548f4d527d89
TERMUX_PKG_AUTO_UPDATE=false
TERMUX_PKG_DEPENDS="libc++, libbz2, libiconv, liblzma, zlib"
TERMUX_PKG_DEPENDS="libc++, libbz2, libiconv, liblzma, libandroid-wordexp, zlib"
TERMUX_PKG_BUILD_DEPENDS="python"
TERMUX_PKG_BREAKS="libboost-python (<= 1.65.1-2), boost-dev"
TERMUX_PKG_REPLACES="libboost-python (<= 1.65.1-2), boost-dev"
Expand All @@ -25,6 +24,19 @@ termux_step_pre_configure() {

termux_step_make_install() {
CXXFLAGS+=" -std=c++14"
# https://www.boost.org/doc/libs/1_87_0/libs/unordered/doc/html/unordered.html#debuggability_gdb_pretty_printers
# Disable this as it causes inline assembly errors on arm:
# <inline asm>:1:41: error: expected '%<type>' or "<type>"
# 1 | .pushsection ".debug_gdb_scripts", "MS",@progbits,1
# | ^
# <inline asm>:318:12: error: .popsection without corresponding .pushsection
# 318 | .popsection
# | ^
# 2 errors generated.
sed -i -e 's|#ifndef BOOST_ALL_NO_EMBEDDED_GDB_SCRIPTS|#if 0|g' \
./boost/interprocess/interprocess_printers.hpp \
./boost/unordered/unordered_printers.hpp \
./boost/json/detail/config.hpp

rm $TERMUX_PREFIX/lib/libboost* -f
rm $TERMUX_PREFIX/include/boost -rf
Expand Down
20 changes: 0 additions & 20 deletions packages/boost/phoenix-linking-issue.patch

This file was deleted.

1 change: 1 addition & 0 deletions packages/i2pd/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="BSD 3-Clause"
TERMUX_PKG_LICENSE_FILE="../LICENSE"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="2.55.0"
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://github.com/PurpleI2P/i2pd/archive/$TERMUX_PKG_VERSION.tar.gz
TERMUX_PKG_SHA256=f5792a1c0499143c716663e90bfb105aaa7ec47d1c4550b5f90ebfc25da00c6c
TERMUX_PKG_AUTO_UPDATE=true
Expand Down
2 changes: 1 addition & 1 deletion packages/innoextract/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A tool to unpack installers created by Inno Setup"
TERMUX_PKG_LICENSE="ZLIB"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=1.9
TERMUX_PKG_REVISION=6
TERMUX_PKG_REVISION=7
TERMUX_PKG_SRCURL=https://constexpr.org/innoextract/files/innoextract-${TERMUX_PKG_VERSION}/innoextract-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=6344a69fc1ed847d4ed3e272e0da5998948c6b828cb7af39c6321aba6cf88126
TERMUX_PKG_DEPENDS="libc++, boost, liblzma, libiconv"
Expand Down
10 changes: 10 additions & 0 deletions packages/innoextract/src-stream-slice.cpp.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- ./src/stream/slice.cpp.orig 2024-12-22 10:58:32.048815117 +0000
+++ ./src/stream/slice.cpp 2024-12-22 10:59:03.805363747 +0000
@@ -27,6 +27,7 @@
#include <boost/cstdint.hpp>
#include <boost/algorithm/string/predicate.hpp>
#include <boost/filesystem/operations.hpp>
+#include <boost/filesystem/directory.hpp>
#include <boost/range/size.hpp>

#include "util/console.hpp"
2 changes: 1 addition & 1 deletion packages/ledger/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Powerful, double-entry accounting system"
TERMUX_PKG_LICENSE="BSD 3-Clause"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="3.3.2"
TERMUX_PKG_REVISION=3
TERMUX_PKG_REVISION=4
TERMUX_PKG_SRCURL=https://github.com/ledger/ledger/archive/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=555296ee1e870ff04e2356676977dcf55ebab5ad79126667bc56464cb1142035
TERMUX_PKG_AUTO_UPDATE=true
Expand Down
29 changes: 29 additions & 0 deletions packages/ledger/src-filters.cc.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
--- ./src/filters.cc.orig 2024-12-22 11:32:04.494785452 +0000
+++ ./src/filters.cc 2024-12-22 11:32:58.807916062 +0000
@@ -238,7 +238,7 @@
void anonymize_posts::operator()(post_t& post)
{
boost::uuids::detail::sha1 sha;
- unsigned int message_digest[5];
+ unsigned char message_digest[20];
bool copy_xact_details = false;

if (last_xact != post.xact) {
@@ -260,7 +260,7 @@
sha.process_bytes(buf.str().c_str(), buf.str().length());
sha.get_digest(message_digest);

- xact.payee = to_hex(message_digest);
+ xact.payee = to_hex((unsigned int*)message_digest);
xact.note = none;
} else {
xact.journal = post.xact->journal;
@@ -278,7 +278,7 @@
sha.process_bytes(buf.str().c_str(), buf.str().length());
sha.get_digest(message_digest);

- account_names.push_front(to_hex(message_digest));
+ account_names.push_front(to_hex((unsigned int*)message_digest));
}

account_t * new_account =
10 changes: 10 additions & 0 deletions packages/ledger/src-system.hh.in.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- ./src/system.hh.in.orig 2024-12-22 11:06:03.977157646 +0000
+++ ./src/system.hh.in 2024-12-22 11:06:09.980469189 +0000
@@ -144,7 +144,6 @@
#include <boost/date_time/posix_time/posix_time_io.hpp>
#include <boost/date_time/gregorian/gregorian_io.hpp>

-#include <boost/filesystem/convenience.hpp>
#include <boost/filesystem/exception.hpp>
#include <boost/filesystem/fstream.hpp>
#include <boost/filesystem/operations.hpp>
14 changes: 14 additions & 0 deletions packages/ledger/src-utils.h.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
--- ./src/utils.h.orig 2024-12-22 11:07:43.853461769 +0000
+++ ./src/utils.h 2024-12-22 11:31:05.161673812 +0000
@@ -627,9 +627,9 @@

sha.process_bytes(str.c_str(), str.length());

- unsigned int message_digest[5];
+ unsigned char message_digest[20];
sha.get_digest(message_digest);
- return to_hex(message_digest, 5);
+ return to_hex((unsigned int*)message_digest, 5);
}

extern const string version;
1 change: 1 addition & 0 deletions packages/lgogdownloader/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Open source downloader to GOG.com for Linux users using
TERMUX_PKG_LICENSE="WTFPL"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="3.16"
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://github.com/Sude-/lgogdownloader/releases/download/v${TERMUX_PKG_VERSION}/lgogdownloader-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=24b005bf3caf00ebc8c603251f5689d66098f66dd37bdf399836289064cb0c9f
TERMUX_PKG_AUTO_UPDATE=true
Expand Down
1 change: 1 addition & 0 deletions packages/libc++utilities/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Useful C++ classes and routines such as argument parser,
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="5.27.0"
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://github.com/Martchus/cpp-utilities/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=aa3bfdcd5cc16a27d2a80611d4c6a7fd96f37c4dad2622233a0e019885bffc82
TERMUX_PKG_AUTO_UPDATE=true
Expand Down
1 change: 1 addition & 0 deletions packages/libpagmo/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ TERMUX_PKG_LICENSE="LGPL-3.0, GPL-3.0"
TERMUX_PKG_LICENSE_FILE="COPYING.lgpl3"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="2.19.1"
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL="https://github.com/esa/pagmo2/archive/refs/tags/v$TERMUX_PKG_VERSION.tar.gz"
TERMUX_PKG_SHA256=ecc180e669fa6bbece959429ac7d92439e89e1fd1c523aa72b11b6c82e414a1d
TERMUX_PKG_AUTO_UPDATE=true
Expand Down
1 change: 1 addition & 0 deletions packages/librime/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ TERMUX_PKG_LICENSE="BSD 3-Clause, LGPL-3.0"
TERMUX_PKG_LICENSE_FILE="LICENSE, data/preset/LICENSE.PRELUDE"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="1.12.0"
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://github.com/rime/librime/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=e3efe05603e9ec6db058bbff478540c28482513c24662e0aa336d2da72cceee4
TERMUX_PKG_AUTO_UPDATE=true
Expand Down
2 changes: 1 addition & 1 deletion packages/libtorrent-rasterbar/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="A feature complete C++ bittorrent implementation focusin
TERMUX_PKG_LICENSE="BSD 3-Clause"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="2.0.10"
TERMUX_PKG_REVISION=1
TERMUX_PKG_REVISION=2
TERMUX_PKG_SRCURL=https://github.com/arvidn/libtorrent/releases/download/v${TERMUX_PKG_VERSION}/libtorrent-rasterbar-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=fc935b8c1daca5c0a4d304bff59e64e532be16bb877c012aea4bda73d9ca885d
TERMUX_PKG_AUTO_UPDATE=true
Expand Down
76 changes: 76 additions & 0 deletions packages/libupscaledb/boost-1.87.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
diff '--color=auto' -uNr src.orig/src/2worker/worker.h src/src/2worker/worker.h
--- src.orig/src/2worker/worker.h 2024-12-23 07:49:28.825179030 +0000
+++ src/src/2worker/worker.h 2024-12-23 07:49:35.408483875 +0000
@@ -78,9 +78,9 @@
// keep track of the threads so we can join them
std::vector<boost::thread *> workers;

- // the io_service we are wrapping
- boost::asio::io_service service;
- boost::asio::io_service::work working;
+ // the io_context we are wrapping
+ boost::asio::io_context service;
+ boost::asio::io_context::work working;
#if BOOST_VERSION < 106600
boost::asio::strand strand;
#else
diff '--color=auto' -uNr src.orig/src/5server/upsserver.h src/src/5server/upsserver.h
--- src.orig/src/5server/upsserver.h 2024-12-23 07:49:28.828512348 +0000
+++ src/src/5server/upsserver.h 2024-12-23 07:49:35.408483875 +0000
@@ -133,8 +133,8 @@
};

struct Session {
- Session(Server *server_, boost::asio::io_service &io_service)
- : server(server_), socket(io_service), buffer_in(1024),
+ Session(Server *server_, boost::asio::io_context &io_context)
+ : server(server_), socket(io_context), buffer_in(1024),
current_position(0) {
}

@@ -171,30 +171,30 @@

struct Server {
Server(short port)
- : acceptor(io_service, boost::asio::ip::tcp::endpoint(
+ : acceptor(io_context, boost::asio::ip::tcp::endpoint(
boost::asio::ip::tcp::v4(), port)) {
start_accept();
}

Server(std::string bind_url, short port)
- : acceptor(io_service, boost::asio::ip::tcp::endpoint(
+ : acceptor(io_context, boost::asio::ip::tcp::endpoint(
boost::asio::ip::address::from_string(bind_url),
port)) {
start_accept();
}

~Server() {
- io_service.stop();
+ io_context.stop();
thread->join();
}

void run() {
- thread.reset(new boost::thread(boost::bind(&boost::asio::io_service::run,
- &io_service)));
+ thread.reset(new boost::thread(boost::bind(&boost::asio::io_context::run,
+ &io_context)));
}

void start_accept() {
- Session *new_session = new Session(this, io_service);
+ Session *new_session = new Session(this, io_context);
acceptor.async_accept(new_session->socket,
boost::bind(&Server::handle_accept, this, new_session,
boost::asio::placeholders::error));
@@ -219,7 +219,7 @@
return Handle<Db>(0, 0, true);
}

- boost::asio::io_service io_service;
+ boost::asio::io_context io_context;
boost::asio::ip::tcp::acceptor acceptor;
ScopedPtr<boost::thread> thread;

2 changes: 1 addition & 1 deletion packages/libupscaledb/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ TERMUX_PKG_MAINTAINER="@termux"
_COMMIT=cb124e1f91601872a7b3bd4da10e5fa97a8da86b
_COMMIT_DATE=2021.08.20
TERMUX_PKG_VERSION=2.2.1p${_COMMIT_DATE//./}
TERMUX_PKG_REVISION=9
TERMUX_PKG_REVISION=10
TERMUX_PKG_SRCURL=git+https://github.com/cruppstahl/upscaledb
TERMUX_PKG_SHA256=83e26f9f099897f347129470b494487bddf96c3d09ab4747251135d47d8b4256
TERMUX_PKG_AUTO_UPDATE=false
Expand Down
1 change: 1 addition & 0 deletions packages/monero/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="A private, secure, untraceable, decentralised digital cu
TERMUX_PKG_LICENSE="BSD 3-Clause"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="0.18.3.4"
TERMUX_PKG_REVISION=1
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_SRCURL=git+https://github.com/monero-project/monero
TERMUX_PKG_DEPENDS="boost, libc++, libprotobuf, libsodium, libunbound, libusb, libzmq, miniupnpc, openssl, readline"
Expand Down
2 changes: 1 addition & 1 deletion packages/ncmpcpp/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="NCurses Music Player Client (Plus Plus)"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="0.10.1"
TERMUX_PKG_REVISION=1
TERMUX_PKG_REVISION=2
TERMUX_PKG_SRCURL=https://github.com/ncmpcpp/ncmpcpp/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=ddc89da86595d272282ae8726cc7913867b9517eec6e765e66e6da860b58e2f9
TERMUX_PKG_DEPENDS="boost, fftw, libandroid-support, libc++, libcurl, libicu, libmpdclient, ncurses, readline, taglib"
Expand Down
1 change: 1 addition & 0 deletions packages/openfoam/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="OpenFOAM is a CFD software written in C++"
TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91"
TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_VERSION=2406
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://develop.openfoam.com/Development/openfoam/-/archive/OpenFOAM-v${TERMUX_PKG_VERSION}/openfoam-OpenFOAM-v${TERMUX_PKG_VERSION}.tar.bz2
TERMUX_PKG_SHA256=f2cfe4af8d0e06aded6130850a21ba911fa1dbe3a008d8c2b6713b77e5c8dc53
TERMUX_PKG_DEPENDS="boost, libc++, libgmp, libmpfr, openmpi, readline, zlib"
Expand Down
1 change: 1 addition & 0 deletions packages/openscad/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="The programmers solid 3D CAD modeller (headless build)"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=2021.01
TERMUX_PKG_REVISION=1
TERMUX_PKG_SRCURL=https://files.openscad.org/openscad-$TERMUX_PKG_VERSION.src.tar.gz
TERMUX_PKG_SHA256=d938c297e7e5f65dbab1461cac472fc60dfeaa4999ea2c19b31a4184f2d70359
TERMUX_PKG_DEPENDS="boost, double-conversion, fontconfig, freetype, glib, harfbuzz, libc++, libgmp, libmpfr, libxml2, libzip"
Expand Down
11 changes: 11 additions & 0 deletions packages/openscad/src-FileModule.cc.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- ./src/FileModule.cc.orig 2024-12-22 12:44:51.462463542 +0000
+++ ./src/FileModule.cc 2024-12-22 12:45:36.708971549 +0000
@@ -65,7 +65,7 @@
auto ext = fs::path(path).extension().generic_string();

if (boost::iequals(ext, ".otf") || boost::iequals(ext, ".ttf")) {
- if (fs::is_regular(path)) {
+ if (fs::is_regular_file(path)) {
FontCache::instance()->register_font_file(path);
} else {
LOG(message_group::Error,Location::NONE,"","Can't read font with path '%1$s'",path);
Loading
Loading