Termux
/
termux-packages
mirror of https://github.com/termux/termux-packages
1
0
Fork 0
Code Issues Releases Wiki Activity

boost: Bump to 1.81.0 

Revdep rebuild follows.
This commit is contained in:
Tee KOBAYASHI 2023-01-11 14:23:02 +09:00 committed by xtkoba
parent b2116fb87a
commit 984b6dd79f
6 changed files with 13 additions and 253 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

175
packages/boost/boost-1.80.0-0003-unordered-valid-after-move.patch
View File

@ -1,175 +0,0 @@
diff -urN boost_1_80_0/boost/unordered/detail/fca.hpp boost_1_80_1/boost/unordered/detail/fca.hpp
--- boost_1_80_0/boost/unordered/detail/fca.hpp 2022-08-03 22:47:16.000000000 -0400
+++ boost_1_80_1/boost/unordered/detail/fca.hpp 2022-08-24 19:44:43.139787681 -0400
@@ -646,7 +646,7 @@
size_type bucket_count() const { return size_; }
- iterator begin() const { return ++at(size_); }
+ iterator begin() const { return size_ == 0 ? end() : ++at(size_); }
iterator end() const
{
@@ -660,6 +660,10 @@
local_iterator begin(size_type n) const
{
+ if (size_ == 0) {
+ return this->end(n);
+ }
+
return local_iterator(
(buckets + static_cast<difference_type>(n))->next);
}
@@ -670,12 +674,16 @@
iterator at(size_type n) const
{
- std::size_t const N = group::N;
+ if (size_ > 0) {
+ std::size_t const N = group::N;
- iterator pbg(buckets + static_cast<difference_type>(n),
- groups + static_cast<difference_type>(n / N));
+ iterator pbg(buckets + static_cast<difference_type>(n),
+ groups + static_cast<difference_type>(n / N));
- return pbg;
+ return pbg;
+ } else {
+ return this->end();
+ }
}
span<Bucket> raw()
diff -urN boost_1_80_0/boost/unordered/detail/implementation.hpp boost_1_80_1/boost/unordered/detail/implementation.hpp
--- boost_1_80_0/boost/unordered/detail/implementation.hpp 2022-08-03 22:47:16.000000000 -0400
+++ boost_1_80_1/boost/unordered/detail/implementation.hpp 2022-08-24 19:44:43.139787681 -0400
@@ -2054,12 +2054,14 @@
std::size_t bucket_size(std::size_t index) const
{
- bucket_iterator itb = buckets_.at(index);
- node_pointer n = itb->next;
std::size_t count = 0;
- while (n) {
- ++count;
- n = n->next;
+ if (size_ > 0) {
+ bucket_iterator itb = buckets_.at(index);
+ node_pointer n = itb->next;
+ while (n) {
+ ++count;
+ n = n->next;
+ }
}
return count;
}
@@ -2420,11 +2422,14 @@
node_pointer find_node_impl(
Key const& x, bucket_iterator itb) const
{
- key_equal const& pred = this->key_eq();
- node_pointer p = itb->next;
- for (; p; p = p->next) {
- if (pred(x, extractor::extract(p->value()))) {
- break;
+ node_pointer p = node_pointer();
+ if (itb != buckets_.end()) {
+ key_equal const& pred = this->key_eq();
+ p = itb->next;
+ for (; p; p = p->next) {
+ if (pred(x, extractor::extract(p->value()))) {
+ break;
+ }
}
}
return p;
@@ -2453,11 +2458,13 @@
inline iterator transparent_find(
Key const& k, Hash const& h, Pred const& pred) const
{
- std::size_t const key_hash = h(k);
- bucket_iterator itb = buckets_.at(buckets_.position(key_hash));
- for (node_pointer p = itb->next; p; p = p->next) {
- if (BOOST_LIKELY(pred(k, extractor::extract(p->value())))) {
- return iterator(p, itb);
+ if (size_ > 0) {
+ std::size_t const key_hash = h(k);
+ bucket_iterator itb = buckets_.at(buckets_.position(key_hash));
+ for (node_pointer p = itb->next; p; p = p->next) {
+ if (BOOST_LIKELY(pred(k, extractor::extract(p->value())))) {
+ return iterator(p, itb);
+ }
}
}
@@ -2467,11 +2474,13 @@
template <class Key>
node_pointer* find_prev(Key const& key, bucket_iterator itb)
{
- key_equal pred = this->key_eq();
- for (node_pointer* pp = boost::addressof(itb->next); *pp;
- pp = boost::addressof((*pp)->next)) {
- if (pred(key, extractor::extract((*pp)->value()))) {
- return pp;
+ if (size_ > 0) {
+ key_equal pred = this->key_eq();
+ for (node_pointer* pp = boost::addressof(itb->next); *pp;
+ pp = boost::addressof((*pp)->next)) {
+ if (pred(key, extractor::extract((*pp)->value()))) {
+ return pp;
+ }
}
}
typedef node_pointer* node_pointer_pointer;
diff -urN boost_1_80_0/boost/unordered/unordered_map.hpp boost_1_80_1/boost/unordered/unordered_map.hpp
--- boost_1_80_0/boost/unordered/unordered_map.hpp 2022-08-03 22:47:16.000000000 -0400
+++ boost_1_80_1/boost/unordered/unordered_map.hpp 2022-08-24 19:44:43.139787681 -0400
@@ -2069,6 +2069,10 @@
template <class K, class T, class H, class P, class A>
float unordered_map<K, T, H, P, A>::load_factor() const BOOST_NOEXCEPT
{
+ if (table_.size_ == 0) {
+ return 0.0f;
+ }
+
BOOST_ASSERT(table_.bucket_count() != 0);
return static_cast<float>(table_.size_) /
static_cast<float>(table_.bucket_count());
@@ -2506,6 +2510,10 @@
template <class K, class T, class H, class P, class A>
float unordered_multimap<K, T, H, P, A>::load_factor() const BOOST_NOEXCEPT
{
+ if (table_.size_ == 0) {
+ return 0.0f;
+ }
+
BOOST_ASSERT(table_.bucket_count() != 0);
return static_cast<float>(table_.size_) /
static_cast<float>(table_.bucket_count());
diff -urN boost_1_80_0/boost/unordered/unordered_set.hpp boost_1_80_1/boost/unordered/unordered_set.hpp
--- boost_1_80_0/boost/unordered/unordered_set.hpp 2022-08-03 22:47:16.000000000 -0400
+++ boost_1_80_1/boost/unordered/unordered_set.hpp 2022-08-24 19:44:43.139787681 -0400
@@ -1586,6 +1586,10 @@
template <class T, class H, class P, class A>
float unordered_set<T, H, P, A>::load_factor() const BOOST_NOEXCEPT
{
+ if (table_.size_ == 0) {
+ return 0.0f;
+ }
+
BOOST_ASSERT(table_.bucket_count() != 0);
return static_cast<float>(table_.size_) /
static_cast<float>(table_.bucket_count());
@@ -1986,6 +1990,10 @@
template <class T, class H, class P, class A>
float unordered_multiset<T, H, P, A>::load_factor() const BOOST_NOEXCEPT
{
+ if (table_.size_ == 0) {
+ return 0.0f;
+ }
+
BOOST_ASSERT(table_.bucket_count() != 0);
return static_cast<float>(table_.size_) /
static_cast<float>(table_.bucket_count());

21
packages/boost/boost-1.80.0-0004-filesystem-posix-fix-no-at-apis-missing-include.patch
View File

@ -1,21 +0,0 @@
commit 5864f397ccad30f6e73221b90bdac57a303b9752
Author: Andrey Semashev <andrey.semashev@gmail.com>
Date: Fri Aug 12 12:59:56 2022 +0300
Fixed a missing include on POSIX systems that don't support *at APIs.
Fixes https://github.com/boostorg/filesystem/issues/250.
diff --git a/libs/filesystem/src/operations.cpp b/libs/filesystem/src/operations.cpp
index ca2fff3..e22967e 100644
--- a/libs/filesystem/src/operations.cpp
+++ b/libs/filesystem/src/operations.cpp
@@ -70,7 +70,7 @@
#include <unistd.h>
#include <fcntl.h>
-#if _POSIX_C_SOURCE < 200809L
+#if !defined(BOOST_FILESYSTEM_HAS_POSIX_AT_APIS)
#include <utime.h>
#endif
#include <limits.h>

17
packages/boost/boost-1.80.0-0005-config-libcpp15.patch
View File

@ -1,17 +0,0 @@
diff -urN boost_1_80_0/boost/config/stdlib/libcpp.hpp boost_1_80_1/boost/config/stdlib/libcpp.hpp
--- boost_1_80_0/boost/config/stdlib/libcpp.hpp 2022-08-03 22:47:07.000000000 -0400
+++ boost_1_80_1/boost/config/stdlib/libcpp.hpp 2022-09-16 22:16:17.044119011 -0400
@@ -168,4 +168,13 @@
# define BOOST_NO_CXX14_HDR_SHARED_MUTEX
#endif
+#if _LIBCPP_VERSION >= 15000
+//
+// Unary function is now deprecated in C++11 and later:
+//
+#if __cplusplus >= 201103L
+#define BOOST_NO_CXX98_FUNCTION_BASE
+#endif
+#endif
+
// --- end ---

37
packages/boost/boost-1.80.0-python-3.11.patch
View File

@ -1,37 +0,0 @@
https://github.com/boostorg/python/commit/a218babc8daee904a83f550fb66e5cb3f1cb3013
From a218babc8daee904a83f550fb66e5cb3f1cb3013 Mon Sep 17 00:00:00 2001
From: Victor Stinner <vstinner@python.org>
Date: Mon, 25 Apr 2022 10:51:46 +0200
Subject: [PATCH] Fix enum_type_object type on Python 3.11
The enum_type_object type inherits from PyLong_Type which is not tracked
by the GC. Instances doesn't have to be tracked by the GC: remove the
Py_TPFLAGS_HAVE_GC flag.
The Python C API documentation says:
"To create a container type, the tp_flags field of the type object
must include the Py_TPFLAGS_HAVE_GC and provide an implementation of
the tp_traverse handler."
https://docs.python.org/dev/c-api/gcsupport.html
The new exception was introduced in Python 3.11 by:
https://github.com/python/cpython/issues/88429
---
src/object/enum.cpp | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/object/enum.cpp b/src/object/enum.cpp
index 293e705899..5753b32e07 100644
--- a/src/object/enum.cpp
+++ b/libs/python/src/object/enum.cpp
@@ -113,7 +113,6 @@ static PyTypeObject enum_type_object = {
#if PY_VERSION_HEX < 0x03000000
| Py_TPFLAGS_CHECKTYPES
#endif
- | Py_TPFLAGS_HAVE_GC
| Py_TPFLAGS_BASETYPE, /* tp_flags */
0, /* tp_doc */
0, /* tp_traverse */

11
packages/boost/boost-1.81.0-phoenix-multiple-definitions.patch Normal file
View File

@ -0,0 +1,11 @@
https://bugs.gentoo.org/887041
https://github.com/boostorg/phoenix/issues/111
--- a/boost/phoenix/stl.hpp
+++ b/boost/phoenix/stl.hpp
@@ -11,6 +11,5 @@
#include <boost/phoenix/stl/algorithm.hpp>
#include <boost/phoenix/stl/container.hpp>
-#include <boost/phoenix/stl/tuple.hpp>
#endif

5
packages/boost/build.sh
View File

@ -4,10 +4,9 @@ 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.80.0
TERMUX_PKG_REVISION=1
TERMUX_PKG_VERSION=1.81.0
TERMUX_PKG_SRCURL=https://boostorg.jfrog.io/artifactory/main/release/$TERMUX_PKG_VERSION/source/boost_${TERMUX_PKG_VERSION//./_}.tar.bz2
TERMUX_PKG_SHA256=1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0
TERMUX_PKG_SHA256=71feeed900fbccca04a3b4f2f84a7c217186f28a940ed8b7ed4725986baf99fa
TERMUX_PKG_DEPENDS="libc++, libbz2, libiconv, liblzma, zlib"
TERMUX_PKG_BUILD_DEPENDS="python"
TERMUX_PKG_BREAKS="libboost-python (<= 1.65.1-2), boost-dev"