From ea18f7d12f66156248692dcc25669ba8f302f088 Mon Sep 17 00:00:00 2001 From: sunerok Date: Sat, 7 Sep 2024 19:58:48 -0400 Subject: [PATCH] update libcap and libX11, remove old boost patches --- depends/packages/libX11.mk | 4 +- depends/packages/libcap.mk | 4 +- .../boost/deprecated-two-arg-allocate.diff | 102 ------------------ depends/patches/boost/iostreams-106.patch | 25 ----- depends/patches/boost/signals2-noise.patch | 23 ---- 5 files changed, 4 insertions(+), 154 deletions(-) delete mode 100644 depends/patches/boost/deprecated-two-arg-allocate.diff delete mode 100644 depends/patches/boost/iostreams-106.patch delete mode 100644 depends/patches/boost/signals2-noise.patch diff --git a/depends/packages/libX11.mk b/depends/packages/libX11.mk index edadbf0a..caa8cbfa 100755 --- a/depends/packages/libX11.mk +++ b/depends/packages/libX11.mk @@ -1,8 +1,8 @@ package=libX11 -$(package)_version=1.8.9 +$(package)_version=1.8.10 $(package)_download_path=http://xorg.freedesktop.org/releases/individual/lib/ $(package)_file_name=$(package)-$($(package)_version).tar.gz -$(package)_sha256_hash=57CA5F07D263788AD661A86F4139412E8B699662E6B60C20F1F028C25A935E48 +$(package)_sha256_hash=B7A1A90D881BB7B94DF5CF31509E6B03F15C0972D3AC25AB0441F5FBC789650F $(package)_dependencies=libxcb xtrans xextproto xorgproto define $(package)_set_vars diff --git a/depends/packages/libcap.mk b/depends/packages/libcap.mk index 11e5a81d..495266ef 100755 --- a/depends/packages/libcap.mk +++ b/depends/packages/libcap.mk @@ -1,8 +1,8 @@ package=libcap -$(package)_version=2.69 +$(package)_version=2.70 $(package)_download_path=https://mirrors.edge.kernel.org/pub/linux/libs/security/linux-privs/libcap2/ $(package)_file_name=$(package)-$($(package)_version).tar.gz -$(package)_sha256_hash=3a99ec26452e328e0ea408efd67096ef914f4ee4788fa8e8e21f214e2bd670b9 +$(package)_sha256_hash=D3B777ED413C9FAFFACE03B917E171854709B5E4BE38DBFB9219AAF7DFD4EEA6 define $(package)_set_vars $(package)_config_opts=--disable-static diff --git a/depends/patches/boost/deprecated-two-arg-allocate.diff b/depends/patches/boost/deprecated-two-arg-allocate.diff deleted file mode 100644 index f9622856..00000000 --- a/depends/patches/boost/deprecated-two-arg-allocate.diff +++ /dev/null @@ -1,102 +0,0 @@ -diff -ur orig/include/boost/core/allocator_access.hpp patched/include/boost/core/allocator_access.hpp ---- orig/include/boost/core/allocator_access.hpp 2021-01-18 21:42:05.926895400 +0000 -+++ patched/include/boost/core/allocator_access.hpp 2021-01-18 21:44:26.426895400 +0000 -@@ -11,7 +11,7 @@ - #include - #if !defined(BOOST_NO_CXX11_ALLOCATOR) - #include --#if !defined(BOOST_MSVC) -+#if !defined(BOOST_MSVC) && !defined(BOOST_CLANG) - #include - #else - #include -@@ -49,7 +49,7 @@ - struct allocator_pointer { - typedef typename A::pointer type; - }; --#elif defined(BOOST_MSVC) -+#elif defined(BOOST_MSVC) || defined(BOOST_CLANG) - template - struct allocator_pointer { - typedef typename std::allocator_traits::pointer type; -@@ -72,7 +72,7 @@ - struct allocator_const_pointer { - typedef typename A::const_pointer type; - }; --#elif defined(BOOST_MSVC) -+#elif defined(BOOST_MSVC) || defined(BOOST_CLANG) - template - struct allocator_const_pointer { - typedef typename std::allocator_traits::const_pointer type; -@@ -137,7 +137,7 @@ - struct allocator_difference_type { - typedef typename A::difference_type type; - }; --#elif defined(BOOST_MSVC) -+#elif defined(BOOST_MSVC) || defined(BOOST_CLANG) - template - struct allocator_difference_type { - typedef typename std::allocator_traits::difference_type type; -@@ -161,7 +161,7 @@ - struct allocator_size_type { - typedef typename A::size_type type; - }; --#elif defined(BOOST_MSVC) -+#elif defined(BOOST_MSVC) || defined(BOOST_CLANG) - template - struct allocator_size_type { - typedef typename std::allocator_traits::size_type type; -@@ -260,7 +260,7 @@ - struct allocator_rebind { - typedef typename A::template rebind::other type; - }; --#elif defined(BOOST_MSVC) -+#elif defined(BOOST_MSVC) || defined(BOOST_CLANG) - template - struct allocator_rebind { - typedef typename std::allocator_traits::template rebind_alloc type; -@@ -313,7 +313,7 @@ - { - return a.allocate(n, h); - } --#elif defined(BOOST_MSVC) -+#elif defined(BOOST_MSVC) || defined(BOOST_CLANG) - template - inline typename allocator_pointer::type - allocator_allocate(A& a, typename allocator_size_type::type n, -@@ -400,7 +400,7 @@ - ::new((void*)p) T(v); - } - #endif --#elif defined(BOOST_MSVC) -+#elif defined(BOOST_MSVC) || defined(BOOST_CLANG) - template - inline void - allocator_construct(A& a, T* p, Args&&... args) -@@ -449,7 +449,7 @@ - p->~T(); - (void)p; - } --#elif defined(BOOST_MSVC) -+#elif defined(BOOST_MSVC) || defined(BOOST_CLANG) - template - inline void - allocator_destroy(A& a, T* p) -@@ -496,7 +496,7 @@ - { - return a.max_size(); - } --#elif defined(BOOST_MSVC) -+#elif defined(BOOST_MSVC) || defined(BOOST_CLANG) - template - inline typename allocator_size_type::type - allocator_max_size(const A& a) -@@ -545,7 +545,7 @@ - { - return a; - } --#elif defined(BOOST_MSVC) -+#elif defined(BOOST_MSVC) || defined(BOOST_CLANG) - template - inline A - allocator_select_on_container_copy_construction(const A& a) diff --git a/depends/patches/boost/iostreams-106.patch b/depends/patches/boost/iostreams-106.patch deleted file mode 100644 index dcecd5d0..00000000 --- a/depends/patches/boost/iostreams-106.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4e76f73826fd0a7067b837e4850a9051436f5ec5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jean-Micha=C3=ABl=20Celerier?= - -Date: Sun, 22 Dec 2019 10:26:38 +0100 -Subject: [PATCH] Fix build on windows with libc++ - -Proposed by @SquallATF in #67 ---- - include/boost/iostreams/detail/config/fpos.hpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/include/boost/iostreams/detail/config/fpos.hpp b/include/boost/iostreams/detail/config/fpos.hpp -index c5dc6cf59..a5835421f 100644 ---- a/include/boost/iostreams/detail/config/fpos.hpp -+++ b/include/boost/iostreams/detail/config/fpos.hpp -@@ -26,7 +26,8 @@ - - # if (defined(_YVALS) || defined(_CPPLIB_VER)) && !defined(__SGI_STL_PORT) && \ - !defined(_STLPORT_VERSION) && !defined(__QNX__) && !defined(_VX_CPU) && !defined(__VXWORKS__) \ -- && !((defined(BOOST_MSVC) || defined(BOOST_CLANG)) && _MSVC_STL_VERSION >= 141) -+ && !((defined(BOOST_MSVC) || defined(BOOST_CLANG)) && _MSVC_STL_VERSION >= 141) \ -+ && !defined(_LIBCPP_VERSION) - /**/ - - #include diff --git a/depends/patches/boost/signals2-noise.patch b/depends/patches/boost/signals2-noise.patch deleted file mode 100644 index e0a9ce48..00000000 --- a/depends/patches/boost/signals2-noise.patch +++ /dev/null @@ -1,23 +0,0 @@ -From fd27423fea5537bc857c1fa14bb0c25b994f77b3 Mon Sep 17 00:00:00 2001 -From: Frank Mori Hess -Date: Mon, 20 Jul 2020 14:17:05 -0400 -Subject: [PATCH] Fix warning about deprecated - boost/function_output_iterator.hpp - ---- - include/boost/signals2/detail/null_output_iterator.hpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/boost/signals2/detail/null_output_iterator.hpp b/include/boost/signals2/detail/null_output_iterator.hpp -index 9e986959..dee4373c 100644 ---- a/include/boost/signals2/detail/null_output_iterator.hpp -+++ b/include/boost/signals2/detail/null_output_iterator.hpp -@@ -11,7 +11,7 @@ - #ifndef BOOST_SIGNALS2_NULL_OUTPUT_ITERATOR_HPP - #define BOOST_SIGNALS2_NULL_OUTPUT_ITERATOR_HPP - --#include -+#include - - namespace boost - {