* Re: [PR PATCH] [Updated] [WIP] boost 1.80
2022-08-27 18:49 [PR PATCH] [WIP] boost 1.80 sgn
@ 2022-08-29 2:10 ` sgn
2022-08-29 12:49 ` sgn
` (6 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: sgn @ 2022-08-29 2:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1236 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages boost-1.80
https://github.com/void-linux/void-packages/pull/38949
[WIP] boost 1.80
<!-- Uncomment relevant sections and delete options which are not applicable -->
[ci skip]
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38949.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boost-1.80-38949.patch --]
[-- Type: text/x-diff, Size: 120776 bytes --]
From 706ab5dc3da975e0baa0e8da91709c9b3d3e7c4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 15:21:49 +0700
Subject: [PATCH 01/96] boost: update to 1.80.0.
---
common/shlibs | 65 +++---
.../{boost-python1.72 => boost-python3-1.80} | 0
.../patches/0001-compat-glibc-2.34.patch | 23 --
.../patches/0002-compat-glibc-2.34.patch | 30 ---
srcpkgs/boost/patches/exec_file.patch | 45 ----
.../boost/patches/install-strip-destdir.patch | 27 +++
srcpkgs/boost/patches/mips.patch | 11 -
srcpkgs/boost/template | 196 +++++++++---------
...boost-python3-1.72 => libboost_atomic1.80} | 0
...ibboost_atomic1.72 => libboost_chrono1.80} | 0
...oost_chrono1.72 => libboost_container1.80} | 0
...ost_container1.72 => libboost_context1.80} | 0
...oost_context1.72 => libboost_contract1.80} | 0
...st_contract1.72 => libboost_coroutine1.80} | 0
...t_coroutine1.72 => libboost_date_time1.80} | 0
...boost_date_time1.72 => libboost_fiber1.80} | 0
...oost_fiber1.72 => libboost_filesystem1.80} | 0
...oost_filesystem1.72 => libboost_graph1.80} | 0
...boost_graph1.72 => libboost_iostreams1.80} | 0
...bboost_iostreams1.72 => libboost_json1.80} | 0
...ibboost_locale1.72 => libboost_locale1.80} | 0
.../{libboost_log1.72 => libboost_log1.80} | 0
...t_log_setup1.72 => libboost_log_setup1.80} | 0
...ost_math_c991.72 => libboost_math_c991.80} | 0
...t_math_c99f1.72 => libboost_math_c99f1.80} | 0
...t_math_c99l1.72 => libboost_math_c99l1.80} | 0
...ost_math_tr11.72 => libboost_math_tr11.80} | 0
...t_math_tr1f1.72 => libboost_math_tr1f1.80} | 0
...t_math_tr1l1.72 => libboost_math_tr1l1.80} | 0
...g_exec_monitor1.72 => libboost_nowide1.80} | 0
...ions1.72 => libboost_prg_exec_monitor1.80} | 0
...andom1.72 => libboost_program_options1.80} | 0
...libboost_regex1.72 => libboost_random1.80} | 0
...t_serialization1.72 => libboost_regex1.80} | 0
...dr2line1.72 => libboost_serialization1.80} | 0
...1.72 => libboost_stacktrace_addr2line1.80} | 0
...noop1.72 => libboost_stacktrace_basic1.80} | 0
...ystem1.72 => libboost_stacktrace_noop1.80} | 0
...ibboost_thread1.72 => libboost_system1.80} | 0
...libboost_timer1.72 => libboost_thread1.80} | 0
...st_type_erasure1.72 => libboost_timer1.80} | 0
...ramework1.72 => libboost_type_erasure1.80} | 0
...e1.72 => libboost_unit_test_framework1.80} | 0
...t_wserialization1.72 => libboost_wave1.80} | 0
srcpkgs/libboost_wserialization1.80 | 1 +
45 files changed, 164 insertions(+), 234 deletions(-)
rename srcpkgs/{boost-python1.72 => boost-python3-1.80} (100%)
delete mode 100644 srcpkgs/boost/patches/0001-compat-glibc-2.34.patch
delete mode 100644 srcpkgs/boost/patches/0002-compat-glibc-2.34.patch
delete mode 100644 srcpkgs/boost/patches/exec_file.patch
create mode 100644 srcpkgs/boost/patches/install-strip-destdir.patch
delete mode 100644 srcpkgs/boost/patches/mips.patch
rename srcpkgs/{boost-python3-1.72 => libboost_atomic1.80} (100%)
rename srcpkgs/{libboost_atomic1.72 => libboost_chrono1.80} (100%)
rename srcpkgs/{libboost_chrono1.72 => libboost_container1.80} (100%)
rename srcpkgs/{libboost_container1.72 => libboost_context1.80} (100%)
rename srcpkgs/{libboost_context1.72 => libboost_contract1.80} (100%)
rename srcpkgs/{libboost_contract1.72 => libboost_coroutine1.80} (100%)
rename srcpkgs/{libboost_coroutine1.72 => libboost_date_time1.80} (100%)
rename srcpkgs/{libboost_date_time1.72 => libboost_fiber1.80} (100%)
rename srcpkgs/{libboost_fiber1.72 => libboost_filesystem1.80} (100%)
rename srcpkgs/{libboost_filesystem1.72 => libboost_graph1.80} (100%)
rename srcpkgs/{libboost_graph1.72 => libboost_iostreams1.80} (100%)
rename srcpkgs/{libboost_iostreams1.72 => libboost_json1.80} (100%)
rename srcpkgs/{libboost_locale1.72 => libboost_locale1.80} (100%)
rename srcpkgs/{libboost_log1.72 => libboost_log1.80} (100%)
rename srcpkgs/{libboost_log_setup1.72 => libboost_log_setup1.80} (100%)
rename srcpkgs/{libboost_math_c991.72 => libboost_math_c991.80} (100%)
rename srcpkgs/{libboost_math_c99f1.72 => libboost_math_c99f1.80} (100%)
rename srcpkgs/{libboost_math_c99l1.72 => libboost_math_c99l1.80} (100%)
rename srcpkgs/{libboost_math_tr11.72 => libboost_math_tr11.80} (100%)
rename srcpkgs/{libboost_math_tr1f1.72 => libboost_math_tr1f1.80} (100%)
rename srcpkgs/{libboost_math_tr1l1.72 => libboost_math_tr1l1.80} (100%)
rename srcpkgs/{libboost_prg_exec_monitor1.72 => libboost_nowide1.80} (100%)
rename srcpkgs/{libboost_program_options1.72 => libboost_prg_exec_monitor1.80} (100%)
rename srcpkgs/{libboost_random1.72 => libboost_program_options1.80} (100%)
rename srcpkgs/{libboost_regex1.72 => libboost_random1.80} (100%)
rename srcpkgs/{libboost_serialization1.72 => libboost_regex1.80} (100%)
rename srcpkgs/{libboost_stacktrace_addr2line1.72 => libboost_serialization1.80} (100%)
rename srcpkgs/{libboost_stacktrace_basic1.72 => libboost_stacktrace_addr2line1.80} (100%)
rename srcpkgs/{libboost_stacktrace_noop1.72 => libboost_stacktrace_basic1.80} (100%)
rename srcpkgs/{libboost_system1.72 => libboost_stacktrace_noop1.80} (100%)
rename srcpkgs/{libboost_thread1.72 => libboost_system1.80} (100%)
rename srcpkgs/{libboost_timer1.72 => libboost_thread1.80} (100%)
rename srcpkgs/{libboost_type_erasure1.72 => libboost_timer1.80} (100%)
rename srcpkgs/{libboost_unit_test_framework1.72 => libboost_type_erasure1.80} (100%)
rename srcpkgs/{libboost_wave1.72 => libboost_unit_test_framework1.80} (100%)
rename srcpkgs/{libboost_wserialization1.72 => libboost_wave1.80} (100%)
create mode 120000 srcpkgs/libboost_wserialization1.80
diff --git a/common/shlibs b/common/shlibs
index 48c63f2d0735..b91133da6484 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -620,38 +620,39 @@ libip4tc.so.2 iptables-1.8.3_1
libipq.so.0 iptables-1.4.7_1
libnm.so.0 libnm-1.0.0_1
libKF5ItemModels.so.5 kitemmodels-5.26.0_1
-libboost_context.so.1.72.0 libboost_context1.72-1.72.0_1
-libboost_coroutine.so.1.72.0 libboost_coroutine1.72-1.72.0_1
-libboost_container.so.1.72.0 libboost_container1.72-1.72.0_1
-libboost_prg_exec_monitor.so.1.72.0 libboost_prg_exec_monitor1.72-1.72.0_1
-libboost_timer.so.1.72.0 libboost_timer1.72-1.72.0_1
-libboost_random.so.1.72.0 libboost_random1.72-1.72.0_1
-libboost_filesystem.so.1.72.0 libboost_filesystem1.72-1.72.0_1
-libboost_unit_test_framework.so.1.72.0 libboost_unit_test_framework1.72-1.72.0_1
-libboost_math_c99.so.1.72.0 libboost_math_c991.72-1.72.0_1
-libboost_math_tr1.so.1.72.0 libboost_math_tr11.72-1.72.0_1
-libboost_regex.so.1.72.0 libboost_regex1.72-1.72.0_1
-libboost_serialization.so.1.72.0 libboost_serialization1.72-1.72.0_1
-libboost_chrono.so.1.72.0 libboost_chrono1.72-1.72.0_1
-libboost_wserialization.so.1.72.0 libboost_wserialization1.72-1.72.0_1
-libboost_graph.so.1.72.0 libboost_graph1.72-1.72.0_1
-libboost_log.so.1.72.0 libboost_log1.72-1.72.0_1
-libboost_locale.so.1.72.0 libboost_locale1.72-1.72.0_1
-libboost_program_options.so.1.72.0 libboost_program_options1.72-1.72.0_1
-libboost_iostreams.so.1.72.0 libboost_iostreams1.72-1.72.0_1
-libboost_system.so.1.72.0 libboost_system1.72-1.72.0_1
-libboost_thread.so.1.72.0 libboost_thread1.72-1.72.0_1
-libboost_log_setup.so.1.72.0 libboost_log_setup1.72-1.72.0_1
-libboost_date_time.so.1.72.0 libboost_date_time1.72-1.72.0_1
-libboost_wave.so.1.72.0 libboost_wave1.72-1.72.0_1
-libboost_atomic.so.1.72.0 libboost_atomic1.72-1.72.0_1
-libboost_type_erasure.so.1.72.0 libboost_type_erasure1.72-1.72.0_1
-libboost_fiber.so.1.72.0 libboost_fiber1.72-1.72.0_1
-libboost_stacktrace_noop.so.1.72.0 libboost_stacktrace_noop1.72-1.72.0_1
-libboost_stacktrace_addr2line.so.1.72.0 libboost_stacktrace_addr2line1.72-1.72.0_1
-libboost_stacktrace_basic.so.1.72.0 libboost_stacktrace_basic1.72-1.72.0_1
-libboost_python27.so.1.72.0 boost-python1.72-1.72.0_1
-libboost_python310.so.1.72.0 boost-python3-1.72-1.72.0_6
+libboost_context.so.1.80.0 libboost_context1.80-1.80.0_1
+libboost_coroutine.so.1.80.0 libboost_coroutine1.80-1.80.0_1
+libboost_container.so.1.80.0 libboost_container1.80-1.80.0_1
+libboost_prg_exec_monitor.so.1.80.0 libboost_prg_exec_monitor1.80-1.80.0_1
+libboost_timer.so.1.80.0 libboost_timer1.80-1.80.0_1
+libboost_random.so.1.80.0 libboost_random1.80-1.80.0_1
+libboost_filesystem.so.1.80.0 libboost_filesystem1.80-1.80.0_1
+libboost_unit_test_framework.so.1.80.0 libboost_unit_test_framework1.80-1.80.0_1
+libboost_math_c99.so.1.80.0 libboost_math_c991.80-1.80.0_1
+libboost_math_tr1.so.1.80.0 libboost_math_tr11.80-1.80.0_1
+libboost_nowide.so.1.80.0 libboost_nowide1.80-1.80.0_1
+libboost_json.so.1.80.0 libboost_json1.80-1.80.0_1
+libboost_regex.so.1.80.0 libboost_regex1.80-1.80.0_1
+libboost_serialization.so.1.80.0 libboost_serialization1.80-1.80.0_1
+libboost_chrono.so.1.80.0 libboost_chrono1.80-1.80.0_1
+libboost_wserialization.so.1.80.0 libboost_wserialization1.80-1.80.0_1
+libboost_graph.so.1.80.0 libboost_graph1.80-1.80.0_1
+libboost_log.so.1.80.0 libboost_log1.80-1.80.0_1
+libboost_locale.so.1.80.0 libboost_locale1.80-1.80.0_1
+libboost_program_options.so.1.80.0 libboost_program_options1.80-1.80.0_1
+libboost_iostreams.so.1.80.0 libboost_iostreams1.80-1.80.0_1
+libboost_system.so.1.80.0 libboost_system1.80-1.80.0_1
+libboost_thread.so.1.80.0 libboost_thread1.80-1.80.0_1
+libboost_log_setup.so.1.80.0 libboost_log_setup1.80-1.80.0_1
+libboost_date_time.so.1.80.0 libboost_date_time1.80-1.80.0_1
+libboost_wave.so.1.80.0 libboost_wave1.80-1.80.0_1
+libboost_atomic.so.1.80.0 libboost_atomic1.80-1.80.0_1
+libboost_type_erasure.so.1.80.0 libboost_type_erasure1.80-1.80.0_1
+libboost_fiber.so.1.80.0 libboost_fiber1.80-1.80.0_1
+libboost_stacktrace_noop.so.1.80.0 libboost_stacktrace_noop1.80-1.80.0_1
+libboost_stacktrace_addr2line.so.1.80.0 libboost_stacktrace_addr2line1.80-1.80.0_1
+libboost_stacktrace_basic.so.1.80.0 libboost_stacktrace_basic1.80-1.80.0_1
+libboost_python310.so.1.80.0 boost-python3-1.80-1.80.0_6
libexempi.so.8 exempi-2.5.0_1
libatasmart.so.4 libatasmart-0.17_1
libsgutils2-1.45.so.2 libsgutils-1.45_1
diff --git a/srcpkgs/boost-python1.72 b/srcpkgs/boost-python3-1.80
similarity index 100%
rename from srcpkgs/boost-python1.72
rename to srcpkgs/boost-python3-1.80
diff --git a/srcpkgs/boost/patches/0001-compat-glibc-2.34.patch b/srcpkgs/boost/patches/0001-compat-glibc-2.34.patch
deleted file mode 100644
index e1e5711e59f2..000000000000
--- a/srcpkgs/boost/patches/0001-compat-glibc-2.34.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 74fb0a26099bc51d717f5f154b37231ce7df3e98 Mon Sep 17 00:00:00 2001
-From: Rob Boehne <robb@datalogics.com>
-Date: Wed, 20 Nov 2019 11:25:20 -0600
-Subject: [PATCH] Revert change to elide a warning that caused Solaris builds
- to fail.
-
----
- include/boost/thread/pthread/thread_data.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/boost/thread/pthread/thread_data.hpp b/include/boost/thread/pthread/thread_data.hpp
-index aefbeb43c..bc9b1367a 100644
---- a/boost/thread/pthread/thread_data.hpp
-+++ b/boost/thread/pthread/thread_data.hpp
-@@ -57,7 +57,7 @@ namespace boost
- #else
- std::size_t page_size = ::sysconf( _SC_PAGESIZE);
- #endif
--#if PTHREAD_STACK_MIN > 0
-+#ifdef PTHREAD_STACK_MIN
- if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
- #endif
- size = ((size+page_size-1)/page_size)*page_size;
diff --git a/srcpkgs/boost/patches/0002-compat-glibc-2.34.patch b/srcpkgs/boost/patches/0002-compat-glibc-2.34.patch
deleted file mode 100644
index baf7c517f8b4..000000000000
--- a/srcpkgs/boost/patches/0002-compat-glibc-2.34.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f9d0e594d43afcb4ab0043117249feb266ba4515 Mon Sep 17 00:00:00 2001
-From: Romain Geissler <romain.geissler@amadeus.com>
-Date: Tue, 10 Aug 2021 14:22:28 +0000
-Subject: [PATCH] Fix -Wsign-compare warning with glibc 2.34 on Linux
- platforms.
-
-In file included from /data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/thread_only.hpp:17,
- from /data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/thread.hpp:12,
- from src/GetTest.cpp:12:
-/data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/pthread/thread_data.hpp: In member function 'void boost::thread_attributes::set_stack_size(std::size_t)':
-/data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/pthread/thread_data.hpp:61:19: error: comparison of integer expressions of different signedness: 'std::size_t' {aka 'long unsigned int'} and 'long int' [-Werror=sign-compare]
- 61 | if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
- | ^
----
- include/boost/thread/pthread/thread_data.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/boost/thread/pthread/thread_data.hpp b/include/boost/thread/pthread/thread_data.hpp
-index bc9b1367a..c43b276d1 100644
---- a/boost/thread/pthread/thread_data.hpp
-+++ b/boost/thread/pthread/thread_data.hpp
-@@ -58,7 +58,7 @@ namespace boost
- std::size_t page_size = ::sysconf( _SC_PAGESIZE);
- #endif
- #ifdef PTHREAD_STACK_MIN
-- if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
-+ if (size<static_cast<std::size_t>(PTHREAD_STACK_MIN)) size=PTHREAD_STACK_MIN;
- #endif
- size = ((size+page_size-1)/page_size)*page_size;
- int res = pthread_attr_setstacksize(&val_, size);
diff --git a/srcpkgs/boost/patches/exec_file.patch b/srcpkgs/boost/patches/exec_file.patch
deleted file mode 100644
index b1b0ef969c4d..000000000000
--- a/srcpkgs/boost/patches/exec_file.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From d9f06052e28873037db7f98629bce72182a42410 Mon Sep 17 00:00:00 2001
-From: Pat Riehecky <riehecky@fnal.gov>
-Date: Mon, 29 Jun 2020 10:51:58 -0500
-Subject: [PATCH] Convert Python 3.1+ to use public C API for filenames
-
- [
- Ed.: Paths were adapted from upstream commit
- https://github.com/boostorg/python/commit/d9f06052e28873037db7f98629bce72182a42410
- ]
-
----
- src/exec.cpp | 16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/libs/python/src/exec.cpp b/libs/python/src/exec.cpp
-index 171c6f4189..b2eabe59f6 100644
---- a/libs/python/src/exec.cpp
-+++ b/libs/python/src/exec.cpp
-@@ -104,14 +104,22 @@ object BOOST_PYTHON_DECL exec_file(char const *filename, object global, object l
- if (local.is_none()) local = global;
- // should be 'char const *' but older python versions don't use 'const' yet.
- char *f = const_cast<char *>(filename);
-- // Let python open the file to avoid potential binary incompatibilities.
--#if PY_VERSION_HEX >= 0x03040000
-- FILE *fs = _Py_fopen(f, "r");
-+#if PY_VERSION_HEX >= 0x03010000
-+ // Let python manage any UTF bits to avoid potential incompatibilities.
-+ PyObject *fo = Py_BuildValue("s", f);
-+ PyObject *fb = Py_None;
-+ PyUnicode_FSConverter(fo, &fb);
-+ f = PyBytes_AsString(fb);
-+ FILE *fs = fopen(f, "r");
-+ Py_DECREF(fo);
-+ Py_DECREF(fb);
- #elif PY_VERSION_HEX >= 0x03000000
-+ // Let python open the file to avoid potential binary incompatibilities.
- PyObject *fo = Py_BuildValue("s", f);
-- FILE *fs = _Py_fopen(fo, "r");
-+ FILE *fs = _Py_fopen(fo, "r"); // Private CPython API
- Py_DECREF(fo);
- #else
-+ // Let python open the file to avoid potential binary incompatibilities.
- PyObject *pyfile = PyFile_FromString(f, const_cast<char*>("r"));
- if (!pyfile) throw std::invalid_argument(std::string(f) + " : no such file");
- python::handle<> file(pyfile);
diff --git a/srcpkgs/boost/patches/install-strip-destdir.patch b/srcpkgs/boost/patches/install-strip-destdir.patch
new file mode 100644
index 000000000000..61047c5967b1
--- /dev/null
+++ b/srcpkgs/boost/patches/install-strip-destdir.patch
@@ -0,0 +1,27 @@
+--- a/tools/boost_install/boost-install.jam
++++ b/tools/boost_install/boost-install.jam
+@@ -678,6 +678,16 @@ local rule path-native-fwd ( path )
+ return $(path) ;
+ }
+
++local rule path-strip-destdir ( path )
++{
++ local parts = [ MATCH "^(/destdir(/[^/]+)?/boost-[0-9.]+)(/.*)" : $(path) ] ;
++ if $(parts)
++ {
++ path = $(parts[3]) ;
++ }
++ return $(path) ;
++}
++
+ local rule get-dir ( name : dir )
+ {
+ if [ path.is-rooted $(dir) ]
+@@ -756,6 +766,7 @@ rule generate-cmake-config- ( target : s
+ if [ path.is-rooted $(cmakedir) ]
+ {
+ local cmakedir-native = [ path-native-fwd $(cmakedir) ] ;
++ cmakedir-native = [ path-strip-destdir $(cmakedir-native) ] ;
+
+ print.text
+
diff --git a/srcpkgs/boost/patches/mips.patch b/srcpkgs/boost/patches/mips.patch
deleted file mode 100644
index a10a2122d9c7..000000000000
--- a/srcpkgs/boost/patches/mips.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/boost/fiber/detail/cpu_relax.hpp 2017-09-02 11:56:11.000000000 +0200
-+++ b/boost/fiber/detail/cpu_relax.hpp 2017-11-09 17:25:40.258995963 +0100
-@@ -48,7 +48,7 @@
- # define cpu_relax() asm volatile ("nop" ::: "memory");
- # endif
- #elif BOOST_ARCH_MIPS
--# define cpu_relax() asm volatile ("pause" ::: "memory");
-+# define cpu_relax() asm volatile ("nop" ::: "memory");
- #elif BOOST_ARCH_PPC
- // http://code.metager.de/source/xref/gnu/glibc/sysdeps/powerpc/sys/platform/ppc.h
- // http://stackoverflow.com/questions/5425506/equivalent-of-x86-pause-instruction-for-ppc
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index f0c5afcec9e8..0d103e335b52 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,53 +1,52 @@
# Template file for 'boost'
pkgname=boost
-version=1.72.0
-revision=9
+version=1.80.0
+revision=1
wrksrc="${pkgname}_${version//\./_}"
-hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
-makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
+hostmakedepends="which bzip2-devel icu-devel python3-devel pkg-config"
+makedepends="zlib-devel bzip2-devel icu-devel python3-devel liblzma-devel
+ libzstd-devel"
short_desc="Free peer-reviewed portable C++ source libraries"
maintainer="John <me@johnnynator.dev>"
license="BSL-1.0"
homepage="http://www.boost.org/"
distfiles="https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${version//./_}.tar.bz2"
-checksum=59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722
+checksum=1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0
python_version=3
-CXXFLAGS="-std=c++14"
-
-replaces="libboost_program_options1.69>=0 libboost_math_c99f1.69>=0
- libboost_stacktrace_basic1.69>=0 libboost_stacktrace_noop1.69>=0
- libboost_iostreams1.69>=0 libboost_math_tr1l1.69>=0 libboost_filesystem1.69>=0
- libboost_chrono1.69>=0 libboost_math_tr1f1.69>=0 libboost_wave1.69>=0
- libboost_graph1.69>=0 libboost_locale1.69>=0 libboost_regex1.69>=0
- libboost_fiber1.69>=0 libboost_type_erasure1.69>=0 libboost_coroutine1.69>=0
- libboost_atomic1.69>=0 libboost_prg_exec_monitor1.69>=0 libboost_math_c991.69>=0
- boost-python3-1.69>=0 libboost_log_setup1.69>=0 boost1.69>=0-devel
- libboost_timer1.69>=0 libboost_system1.69>=0 libboost_unit_test_framework1.69>=0
- libboost_serialization1.69>=0 libboost_math_tr11.69>=0 boost1.69>=0-build
- libboost_math_c99l1.69>=0 boost-python1.69>=0 libboost_contract1.69>=0
- libboost_date_time1.69>=0 libboost_log1.69>=0 libboost_random1.69>=0
- libboost_thread1.69>=0 libboost_container1.69>=0 boost1.69>=0-jam
- libboost_wserialization1.69>=0 libboost_context1.69>=0
- libboost_stacktrace_addr2line1.69>=0"
-
-subpackages="libboost_program_options1.72 libboost_math_c99f1.72
- libboost_stacktrace_basic1.72 libboost_stacktrace_noop1.72
- libboost_iostreams1.72 libboost_math_tr1l1.72 libboost_filesystem1.72
- libboost_chrono1.72 libboost_math_tr1f1.72 libboost_wave1.72
- libboost_graph1.72 libboost_locale1.72 libboost_regex1.72
- libboost_fiber1.72 libboost_type_erasure1.72 libboost_coroutine1.72
- libboost_atomic1.72 libboost_prg_exec_monitor1.72 libboost_math_c991.72
- boost-python3-1.72 libboost_log_setup1.72 boost-devel
- libboost_timer1.72 libboost_system1.72 libboost_unit_test_framework1.72
- libboost_serialization1.72 libboost_math_tr11.72 boost-build
- libboost_math_c99l1.72 boost-python1.72 libboost_contract1.72
- libboost_date_time1.72 libboost_log1.72 libboost_random1.72
- libboost_thread1.72 libboost_container1.72 boost-jam
- libboost_wserialization1.72 libboost_context1.72"
+replaces="libboost_program_options1.72>=0 libboost_math_c99f1.72>=0
+ libboost_stacktrace_basic1.72>=0 libboost_stacktrace_noop1.72>=0
+ libboost_iostreams1.72>=0 libboost_math_tr1l1.72>=0 libboost_filesystem1.72>=0
+ libboost_chrono1.72>=0 libboost_math_tr1f1.72>=0 libboost_wave1.72>=0
+ libboost_graph1.72>=0 libboost_locale1.72>=0 libboost_regex1.72>=0
+ libboost_fiber1.72>=0 libboost_type_erasure1.72>=0 libboost_coroutine1.72>=0
+ libboost_atomic1.72>=0 libboost_prg_exec_monitor1.72>=0 libboost_math_c991.72>=0
+ boost-python3-1.72>=0 libboost_log_setup1.72>=0
+ libboost_timer1.72>=0 libboost_system1.72>=0 libboost_unit_test_framework1.72>=0
+ libboost_serialization1.72>=0 libboost_math_tr11.72>=0
+ libboost_math_c99l1.72>=0 boost-python1.72>=0 libboost_contract1.72>=0
+ libboost_date_time1.72>=0 libboost_log1.72>=0 libboost_random1.72>=0
+ libboost_thread1.72>=0 libboost_container1.72>=0
+ libboost_wserialization1.72>=0 libboost_context1.72>=0
+ libboost_stacktrace_addr2line1.72>=0"
+
+subpackages="libboost_program_options1.80 libboost_math_c99f1.80
+ libboost_stacktrace_basic1.80 libboost_stacktrace_noop1.80
+ libboost_iostreams1.80 libboost_math_tr1l1.80 libboost_filesystem1.80
+ libboost_chrono1.80 libboost_math_tr1f1.80 libboost_wave1.80
+ libboost_graph1.80 libboost_locale1.80 libboost_regex1.80
+ libboost_fiber1.80 libboost_type_erasure1.80 libboost_coroutine1.80
+ libboost_atomic1.80 libboost_prg_exec_monitor1.80 libboost_math_c991.80
+ boost-python3-1.80 libboost_log_setup1.80 boost-devel libboost_json1.80
+ libboost_timer1.80 libboost_system1.80 libboost_unit_test_framework1.80
+ libboost_serialization1.80 libboost_math_tr11.80 boost-build
+ libboost_math_c99l1.80 libboost_contract1.80 libboost_nowide1.80
+ libboost_date_time1.80 libboost_log1.80 libboost_random1.80
+ libboost_thread1.80 libboost_container1.80 boost-jam
+ libboost_wserialization1.80 libboost_context1.80"
if [ -z "$CROSS_BUILD" ]; then
- subpackages+=" libboost_stacktrace_addr2line1.72"
+ subpackages+=" libboost_stacktrace_addr2line1.80"
fi
case "$XBPS_TARGET_MACHINE" in
@@ -60,38 +59,40 @@ case "$XBPS_TARGET_MACHINE" in
esac
do_build() {
- CXX=${BUILD_CXX} CXXFLAGS=${BUILD_CXXFLAGS} ./bootstrap.sh \
- --prefix=${DESTDIR}/usr --with-python=${XBPS_CROSS_BASE}/usr/bin/python3 \
+ # bootstrap.sh will reset CXX and CXXFLAGS (L229)
+ ./bootstrap.sh --with-toolset=gcc \
+ --prefix=${DESTDIR}/usr --with-python=/usr/bin/python3 \
--with-python-root=${XBPS_CROSS_BASE}/usr
(
# Rebuild bjam for target
cd tools/build/src/engine
- ./build.sh gcc
+ CXXFLAGS="$CXXFLAGS -fdebug-prefix-map=$PWD=."
+ # toolset gcc will force gcc -x c++ -O2 -s
+ # toolset cxx will use CXX and CXXFLAGS
+ CXX_VERSION_OPT=--version ./build.sh cxx
)
cat > user-config.jam <<-__EOF
using gcc : : ${CXX} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
- using python : 2.7 : ${XBPS_CROSS_BASE}/usr/bin/python2 : ${XBPS_CROSS_BASE}/usr/include/python2.7 : ${XBPS_CROSS_BASE}/usr/lib/python2.7 ;
- using python : ${py3_ver} : ${XBPS_CROSS_BASE}/usr/bin/python3 : ${XBPS_CROSS_BASE}/${py3_inc} : ${XBPS_CROSS_BASE}/${py3_lib} ;
+ using python : ${py3_ver} : /usr/bin/python3 : ${XBPS_CROSS_BASE}/${py3_inc} : ${XBPS_CROSS_BASE}/${py3_lib} ;
__EOF
- # --no-cmake-config should be removed with boost-1.71 or later
./b2 ${makejobs} \
--user-config=${wrksrc}/user-config.jam --debug-building \
- --no-cmake-config \
- --toolset=gcc abi=${_abi} architecture=${_arch} python=2.7,${py3_ver} \
+ --toolset=gcc abi=${_abi} architecture=${_arch} python=${py3_ver} \
threading=multi runtime-link=shared link=shared,static
}
do_install() {
# Install bjam
# XXX: make bjam a symlink to b2
- for _b in bjam b2; do
+ for _b in b2; do
vbin tools/build/src/engine/${_b}
done
+ ln -sf b2 "$DESTDIR/usr/bin/bjam"
# Install headers/libs
./b2 --prefix=${DESTDIR}/usr abi=${_abi} architecture=${_arch} \
- --user-config=${wrksrc}/user-config.jam --no-cmake-config \
- python=2.7,${py3_ver} threading=multi runtime-link=shared link=shared,static \
+ --user-config=${wrksrc}/user-config.jam \
+ python=${py3_ver} threading=multi runtime-link=shared link=shared,static \
install
# Install Boost.Build stuff.
@@ -119,15 +120,7 @@ boost-jam_package() {
vmove usr/bin/b2
}
}
-boost-python1.72_package() {
- depends="boost python"
- replaces="boost-python>=0"
- short_desc+=" - Python bindings"
- pkg_install() {
- vmove "usr/lib/libboost_python2*.so.*"
- }
-}
-boost-python3-1.72_package() {
+boost-python3-1.80_package() {
depends="boost python3"
replaces="boost-python3>=0"
short_desc+=" - Python3 bindings"
@@ -149,12 +142,13 @@ boost-devel_package() {
short_desc+=" - development files"
pkg_install() {
vmove usr/include
+ vmove usr/lib/cmake
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
}
}
-libboost_atomic1.72_package() {
+libboost_atomic1.80_package() {
depends="boost"
short_desc+=" - libboost_atomic"
pkg_install() {
@@ -162,7 +156,7 @@ libboost_atomic1.72_package() {
}
}
-libboost_chrono1.72_package() {
+libboost_chrono1.80_package() {
depends="boost"
short_desc+=" - libboost_chrono"
pkg_install() {
@@ -170,7 +164,7 @@ libboost_chrono1.72_package() {
}
}
-libboost_container1.72_package() {
+libboost_container1.80_package() {
depends="boost"
short_desc+=" - libboost_container"
pkg_install() {
@@ -178,7 +172,7 @@ libboost_container1.72_package() {
}
}
-libboost_context1.72_package() {
+libboost_context1.80_package() {
depends="boost"
short_desc+=" - libboost_context"
pkg_install() {
@@ -186,7 +180,7 @@ libboost_context1.72_package() {
}
}
-libboost_contract1.72_package() {
+libboost_contract1.80_package() {
depends="boost"
short_desc+=" - libboost_contract"
pkg_install() {
@@ -194,7 +188,7 @@ libboost_contract1.72_package() {
}
}
-libboost_coroutine1.72_package() {
+libboost_coroutine1.80_package() {
depends="boost"
short_desc+=" - libboost_coroutine"
pkg_install() {
@@ -202,7 +196,7 @@ libboost_coroutine1.72_package() {
}
}
-libboost_date_time1.72_package() {
+libboost_date_time1.80_package() {
depends="boost"
short_desc+=" - libboost_date_time"
pkg_install() {
@@ -210,7 +204,7 @@ libboost_date_time1.72_package() {
}
}
-libboost_fiber1.72_package() {
+libboost_fiber1.80_package() {
depends="boost"
short_desc+=" - libboost_fiber"
pkg_install() {
@@ -218,7 +212,7 @@ libboost_fiber1.72_package() {
}
}
-libboost_filesystem1.72_package() {
+libboost_filesystem1.80_package() {
depends="boost"
short_desc+=" - libboost_filesystem"
pkg_install() {
@@ -226,7 +220,7 @@ libboost_filesystem1.72_package() {
}
}
-libboost_graph1.72_package() {
+libboost_graph1.80_package() {
depends="boost"
short_desc+=" - libboost_graph"
pkg_install() {
@@ -234,7 +228,7 @@ libboost_graph1.72_package() {
}
}
-libboost_iostreams1.72_package() {
+libboost_iostreams1.80_package() {
depends="boost"
short_desc+=" - libboost_iostreams"
pkg_install() {
@@ -242,7 +236,7 @@ libboost_iostreams1.72_package() {
}
}
-libboost_locale1.72_package() {
+libboost_locale1.80_package() {
depends="boost"
short_desc+=" - libboost_locale"
pkg_install() {
@@ -250,7 +244,7 @@ libboost_locale1.72_package() {
}
}
-libboost_log1.72_package() {
+libboost_log1.80_package() {
depends="boost"
short_desc+=" - libboost_log"
pkg_install() {
@@ -258,7 +252,7 @@ libboost_log1.72_package() {
}
}
-libboost_log_setup1.72_package() {
+libboost_log_setup1.80_package() {
depends="boost"
short_desc+=" - libboost_log_setup"
pkg_install() {
@@ -266,7 +260,7 @@ libboost_log_setup1.72_package() {
}
}
-libboost_math_c991.72_package() {
+libboost_math_c991.80_package() {
depends="boost"
short_desc+=" - libboost_math_c99"
pkg_install() {
@@ -274,7 +268,7 @@ libboost_math_c991.72_package() {
}
}
-libboost_math_c99f1.72_package() {
+libboost_math_c99f1.80_package() {
depends="boost"
short_desc+=" - libboost_math_c99f"
pkg_install() {
@@ -282,7 +276,7 @@ libboost_math_c99f1.72_package() {
}
}
-libboost_math_c99l1.72_package() {
+libboost_math_c99l1.80_package() {
depends="boost"
short_desc+=" - libboost_math_c99l"
pkg_install() {
@@ -290,7 +284,15 @@ libboost_math_c99l1.72_package() {
}
}
-libboost_math_tr11.72_package() {
+libboost_json1.80_package() {
+ depends="boost"
+ short_desc+=" - libboost_json"
+ pkg_install() {
+ vmove usr/lib/libboost_json.so.*
+ }
+}
+
+libboost_math_tr11.80_package() {
depends="boost"
short_desc+=" - libboost_math_tr1"
pkg_install() {
@@ -298,7 +300,7 @@ libboost_math_tr11.72_package() {
}
}
-libboost_math_tr1f1.72_package() {
+libboost_math_tr1f1.80_package() {
depends="boost"
short_desc+=" - libboost_math_tr1f"
pkg_install() {
@@ -306,7 +308,7 @@ libboost_math_tr1f1.72_package() {
}
}
-libboost_math_tr1l1.72_package() {
+libboost_math_tr1l1.80_package() {
depends="boost"
short_desc+=" - libboost_math_tr1l"
pkg_install() {
@@ -314,7 +316,15 @@ libboost_math_tr1l1.72_package() {
}
}
-libboost_prg_exec_monitor1.72_package() {
+libboost_nowide1.80_package() {
+ depends="boost"
+ short_desc+=" - libboost_nowide"
+ pkg_install() {
+ vmove usr/lib/libboost_nowide.so.*
+ }
+}
+
+libboost_prg_exec_monitor1.80_package() {
depends="boost"
short_desc+=" - libboost_prg_exec_monitor"
pkg_install() {
@@ -322,7 +332,7 @@ libboost_prg_exec_monitor1.72_package() {
}
}
-libboost_program_options1.72_package() {
+libboost_program_options1.80_package() {
depends="boost"
short_desc+=" - libboost_program_options"
pkg_install() {
@@ -330,7 +340,7 @@ libboost_program_options1.72_package() {
}
}
-libboost_random1.72_package() {
+libboost_random1.80_package() {
depends="boost"
short_desc+=" - libboost_random"
pkg_install() {
@@ -338,7 +348,7 @@ libboost_random1.72_package() {
}
}
-libboost_regex1.72_package() {
+libboost_regex1.80_package() {
depends="boost"
short_desc+=" - libboost_regex"
pkg_install() {
@@ -346,7 +356,7 @@ libboost_regex1.72_package() {
}
}
-libboost_serialization1.72_package() {
+libboost_serialization1.80_package() {
depends="boost"
short_desc+=" - libboost_serialization"
pkg_install() {
@@ -354,7 +364,7 @@ libboost_serialization1.72_package() {
}
}
-libboost_stacktrace_addr2line1.72_package() {
+libboost_stacktrace_addr2line1.80_package() {
depends="boost"
short_desc+=" - libboost_stacktrace_addr2line"
pkg_install() {
@@ -362,7 +372,7 @@ libboost_stacktrace_addr2line1.72_package() {
}
}
-libboost_stacktrace_basic1.72_package() {
+libboost_stacktrace_basic1.80_package() {
depends="boost"
short_desc+=" - libboost_stacktrace_basic"
pkg_install() {
@@ -370,7 +380,7 @@ libboost_stacktrace_basic1.72_package() {
}
}
-libboost_stacktrace_noop1.72_package() {
+libboost_stacktrace_noop1.80_package() {
depends="boost"
short_desc+=" - libboost_stacktrace_noop"
pkg_install() {
@@ -378,7 +388,7 @@ libboost_stacktrace_noop1.72_package() {
}
}
-libboost_system1.72_package() {
+libboost_system1.80_package() {
depends="boost"
short_desc+=" - libboost_system"
pkg_install() {
@@ -386,7 +396,7 @@ libboost_system1.72_package() {
}
}
-libboost_thread1.72_package() {
+libboost_thread1.80_package() {
depends="boost"
short_desc+=" - libboost_thread"
pkg_install() {
@@ -394,7 +404,7 @@ libboost_thread1.72_package() {
}
}
-libboost_timer1.72_package() {
+libboost_timer1.80_package() {
depends="boost"
short_desc+=" - libboost_timer"
pkg_install() {
@@ -402,7 +412,7 @@ libboost_timer1.72_package() {
}
}
-libboost_type_erasure1.72_package() {
+libboost_type_erasure1.80_package() {
depends="boost"
short_desc+=" - libboost_type_erasure"
pkg_install() {
@@ -410,7 +420,7 @@ libboost_type_erasure1.72_package() {
}
}
-libboost_unit_test_framework1.72_package() {
+libboost_unit_test_framework1.80_package() {
depends="boost"
short_desc+=" - libboost_unit_test_framework"
pkg_install() {
@@ -418,7 +428,7 @@ libboost_unit_test_framework1.72_package() {
}
}
-libboost_wave1.72_package() {
+libboost_wave1.80_package() {
depends="boost"
short_desc+=" - libboost_wave"
pkg_install() {
@@ -426,7 +436,7 @@ libboost_wave1.72_package() {
}
}
-libboost_wserialization1.72_package() {
+libboost_wserialization1.80_package() {
depends="boost"
short_desc+=" - libboost_wserialization"
pkg_install() {
diff --git a/srcpkgs/boost-python3-1.72 b/srcpkgs/libboost_atomic1.80
similarity index 100%
rename from srcpkgs/boost-python3-1.72
rename to srcpkgs/libboost_atomic1.80
diff --git a/srcpkgs/libboost_atomic1.72 b/srcpkgs/libboost_chrono1.80
similarity index 100%
rename from srcpkgs/libboost_atomic1.72
rename to srcpkgs/libboost_chrono1.80
diff --git a/srcpkgs/libboost_chrono1.72 b/srcpkgs/libboost_container1.80
similarity index 100%
rename from srcpkgs/libboost_chrono1.72
rename to srcpkgs/libboost_container1.80
diff --git a/srcpkgs/libboost_container1.72 b/srcpkgs/libboost_context1.80
similarity index 100%
rename from srcpkgs/libboost_container1.72
rename to srcpkgs/libboost_context1.80
diff --git a/srcpkgs/libboost_context1.72 b/srcpkgs/libboost_contract1.80
similarity index 100%
rename from srcpkgs/libboost_context1.72
rename to srcpkgs/libboost_contract1.80
diff --git a/srcpkgs/libboost_contract1.72 b/srcpkgs/libboost_coroutine1.80
similarity index 100%
rename from srcpkgs/libboost_contract1.72
rename to srcpkgs/libboost_coroutine1.80
diff --git a/srcpkgs/libboost_coroutine1.72 b/srcpkgs/libboost_date_time1.80
similarity index 100%
rename from srcpkgs/libboost_coroutine1.72
rename to srcpkgs/libboost_date_time1.80
diff --git a/srcpkgs/libboost_date_time1.72 b/srcpkgs/libboost_fiber1.80
similarity index 100%
rename from srcpkgs/libboost_date_time1.72
rename to srcpkgs/libboost_fiber1.80
diff --git a/srcpkgs/libboost_fiber1.72 b/srcpkgs/libboost_filesystem1.80
similarity index 100%
rename from srcpkgs/libboost_fiber1.72
rename to srcpkgs/libboost_filesystem1.80
diff --git a/srcpkgs/libboost_filesystem1.72 b/srcpkgs/libboost_graph1.80
similarity index 100%
rename from srcpkgs/libboost_filesystem1.72
rename to srcpkgs/libboost_graph1.80
diff --git a/srcpkgs/libboost_graph1.72 b/srcpkgs/libboost_iostreams1.80
similarity index 100%
rename from srcpkgs/libboost_graph1.72
rename to srcpkgs/libboost_iostreams1.80
diff --git a/srcpkgs/libboost_iostreams1.72 b/srcpkgs/libboost_json1.80
similarity index 100%
rename from srcpkgs/libboost_iostreams1.72
rename to srcpkgs/libboost_json1.80
diff --git a/srcpkgs/libboost_locale1.72 b/srcpkgs/libboost_locale1.80
similarity index 100%
rename from srcpkgs/libboost_locale1.72
rename to srcpkgs/libboost_locale1.80
diff --git a/srcpkgs/libboost_log1.72 b/srcpkgs/libboost_log1.80
similarity index 100%
rename from srcpkgs/libboost_log1.72
rename to srcpkgs/libboost_log1.80
diff --git a/srcpkgs/libboost_log_setup1.72 b/srcpkgs/libboost_log_setup1.80
similarity index 100%
rename from srcpkgs/libboost_log_setup1.72
rename to srcpkgs/libboost_log_setup1.80
diff --git a/srcpkgs/libboost_math_c991.72 b/srcpkgs/libboost_math_c991.80
similarity index 100%
rename from srcpkgs/libboost_math_c991.72
rename to srcpkgs/libboost_math_c991.80
diff --git a/srcpkgs/libboost_math_c99f1.72 b/srcpkgs/libboost_math_c99f1.80
similarity index 100%
rename from srcpkgs/libboost_math_c99f1.72
rename to srcpkgs/libboost_math_c99f1.80
diff --git a/srcpkgs/libboost_math_c99l1.72 b/srcpkgs/libboost_math_c99l1.80
similarity index 100%
rename from srcpkgs/libboost_math_c99l1.72
rename to srcpkgs/libboost_math_c99l1.80
diff --git a/srcpkgs/libboost_math_tr11.72 b/srcpkgs/libboost_math_tr11.80
similarity index 100%
rename from srcpkgs/libboost_math_tr11.72
rename to srcpkgs/libboost_math_tr11.80
diff --git a/srcpkgs/libboost_math_tr1f1.72 b/srcpkgs/libboost_math_tr1f1.80
similarity index 100%
rename from srcpkgs/libboost_math_tr1f1.72
rename to srcpkgs/libboost_math_tr1f1.80
diff --git a/srcpkgs/libboost_math_tr1l1.72 b/srcpkgs/libboost_math_tr1l1.80
similarity index 100%
rename from srcpkgs/libboost_math_tr1l1.72
rename to srcpkgs/libboost_math_tr1l1.80
diff --git a/srcpkgs/libboost_prg_exec_monitor1.72 b/srcpkgs/libboost_nowide1.80
similarity index 100%
rename from srcpkgs/libboost_prg_exec_monitor1.72
rename to srcpkgs/libboost_nowide1.80
diff --git a/srcpkgs/libboost_program_options1.72 b/srcpkgs/libboost_prg_exec_monitor1.80
similarity index 100%
rename from srcpkgs/libboost_program_options1.72
rename to srcpkgs/libboost_prg_exec_monitor1.80
diff --git a/srcpkgs/libboost_random1.72 b/srcpkgs/libboost_program_options1.80
similarity index 100%
rename from srcpkgs/libboost_random1.72
rename to srcpkgs/libboost_program_options1.80
diff --git a/srcpkgs/libboost_regex1.72 b/srcpkgs/libboost_random1.80
similarity index 100%
rename from srcpkgs/libboost_regex1.72
rename to srcpkgs/libboost_random1.80
diff --git a/srcpkgs/libboost_serialization1.72 b/srcpkgs/libboost_regex1.80
similarity index 100%
rename from srcpkgs/libboost_serialization1.72
rename to srcpkgs/libboost_regex1.80
diff --git a/srcpkgs/libboost_stacktrace_addr2line1.72 b/srcpkgs/libboost_serialization1.80
similarity index 100%
rename from srcpkgs/libboost_stacktrace_addr2line1.72
rename to srcpkgs/libboost_serialization1.80
diff --git a/srcpkgs/libboost_stacktrace_basic1.72 b/srcpkgs/libboost_stacktrace_addr2line1.80
similarity index 100%
rename from srcpkgs/libboost_stacktrace_basic1.72
rename to srcpkgs/libboost_stacktrace_addr2line1.80
diff --git a/srcpkgs/libboost_stacktrace_noop1.72 b/srcpkgs/libboost_stacktrace_basic1.80
similarity index 100%
rename from srcpkgs/libboost_stacktrace_noop1.72
rename to srcpkgs/libboost_stacktrace_basic1.80
diff --git a/srcpkgs/libboost_system1.72 b/srcpkgs/libboost_stacktrace_noop1.80
similarity index 100%
rename from srcpkgs/libboost_system1.72
rename to srcpkgs/libboost_stacktrace_noop1.80
diff --git a/srcpkgs/libboost_thread1.72 b/srcpkgs/libboost_system1.80
similarity index 100%
rename from srcpkgs/libboost_thread1.72
rename to srcpkgs/libboost_system1.80
diff --git a/srcpkgs/libboost_timer1.72 b/srcpkgs/libboost_thread1.80
similarity index 100%
rename from srcpkgs/libboost_timer1.72
rename to srcpkgs/libboost_thread1.80
diff --git a/srcpkgs/libboost_type_erasure1.72 b/srcpkgs/libboost_timer1.80
similarity index 100%
rename from srcpkgs/libboost_type_erasure1.72
rename to srcpkgs/libboost_timer1.80
diff --git a/srcpkgs/libboost_unit_test_framework1.72 b/srcpkgs/libboost_type_erasure1.80
similarity index 100%
rename from srcpkgs/libboost_unit_test_framework1.72
rename to srcpkgs/libboost_type_erasure1.80
diff --git a/srcpkgs/libboost_wave1.72 b/srcpkgs/libboost_unit_test_framework1.80
similarity index 100%
rename from srcpkgs/libboost_wave1.72
rename to srcpkgs/libboost_unit_test_framework1.80
diff --git a/srcpkgs/libboost_wserialization1.72 b/srcpkgs/libboost_wave1.80
similarity index 100%
rename from srcpkgs/libboost_wserialization1.72
rename to srcpkgs/libboost_wave1.80
diff --git a/srcpkgs/libboost_wserialization1.80 b/srcpkgs/libboost_wserialization1.80
new file mode 120000
index 000000000000..baef819c48f6
--- /dev/null
+++ b/srcpkgs/libboost_wserialization1.80
@@ -0,0 +1 @@
+boost
\ No newline at end of file
From 3bd1cbb39b82627c69d3c26ee4b4ff6933566f4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 16:51:50 +0700
Subject: [PATCH 02/96] TSC: rebuild for boost-1.80
---
srcpkgs/TSC/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/TSC/template b/srcpkgs/TSC/template
index 71534315cf7c..469f6d859bc7 100644
--- a/srcpkgs/TSC/template
+++ b/srcpkgs/TSC/template
@@ -1,7 +1,7 @@
# Template file for 'TSC'
pkgname=TSC
version=2.1.0
-revision=2
+revision=3
build_wrksrc=tsc
build_style=cmake
build_helper="qemu"
From b310de018799e6be43eff5e359a88c5dd262f09f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:27 +0700
Subject: [PATCH 03/96] 0ad: rebuild for boost-1.80
---
srcpkgs/0ad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 552d2728a7a0..b9f0751c4836 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
# Template file for '0ad'
pkgname=0ad
version=0.0.25b
-revision=3
+revision=4
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
wrksrc="${pkgname}-${version}-alpha"
hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang"
From d2dc56be5b29b381a6db4c84943ea56094f74cb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:27 +0700
Subject: [PATCH 04/96] Aegisub: rebuild for boost-1.80
---
srcpkgs/Aegisub/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index ff34249aaee4..a68e1ab43089 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
# Template file for 'Aegisub'
pkgname=Aegisub
version=3.3.2
-revision=4
+revision=5
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
cmake_builddir="BUILD"
From 60f339991d0445d5b91ca4f7df7c53ae3df88652 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:27 +0700
Subject: [PATCH 05/96] Field3D: rebuild for boost-1.80
---
srcpkgs/Field3D/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 62f0589e9e0b..9a5af0034d14 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,7 +1,7 @@
# Template file for 'Field3D'
pkgname=Field3D
version=1.7.3
-revision=2
+revision=3
build_style=cmake
makedepends="boost-devel hdf5-devel ilmbase-devel"
short_desc="Library for storing voxel data on disk and in memory"
From e26da8993a3d6126a9e73bfd86aa78b349ec2c03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:28 +0700
Subject: [PATCH 06/96] LGOGDownloader: rebuild for boost-1.80
---
srcpkgs/LGOGDownloader/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6e7e5c685f83..0778374ad224 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,7 +1,7 @@
# Template file for 'LGOGDownloader'
pkgname=LGOGDownloader
version=3.9
-revision=1
+revision=2
wrksrc="lgogdownloader-${version}"
build_style=cmake
hostmakedepends="pkg-config"
From f4d72d28e1a416d23c6085f100fb1deea6c853bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:28 +0700
Subject: [PATCH 07/96] Lucene++: rebuild for boost-1.80
---
srcpkgs/Lucene++/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Lucene++/template b/srcpkgs/Lucene++/template
index 3873189f2dfc..34b6e05393fe 100644
--- a/srcpkgs/Lucene++/template
+++ b/srcpkgs/Lucene++/template
@@ -1,7 +1,7 @@
# Template file for 'Lucene++'
pkgname=Lucene++
version=3.0.7
-revision=11
+revision=12
wrksrc=LucenePlusPlus-rel_$version
build_style=cmake
configure_args="-Wno-dev"
From 4ab780726d4b3a0b499a8cbcc44f929198b34111 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:28 +0700
Subject: [PATCH 08/96] PrusaSlicer: rebuild for boost-1.80
---
srcpkgs/PrusaSlicer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 931ac73e5c94..29f1f641a488 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
version=2.4.2
-revision=1
+revision=2
wrksrc="PrusaSlicer-version_${version}"
build_style=cmake
build_helper="qemu"
From ed96e5e054ec50df50c3260a62421fdef1ca590b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:28 +0700
Subject: [PATCH 09/96] astroid: rebuild for boost-1.80
---
srcpkgs/astroid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/astroid/template b/srcpkgs/astroid/template
index 8ee0e729e134..478beb4de195 100644
--- a/srcpkgs/astroid/template
+++ b/srcpkgs/astroid/template
@@ -1,7 +1,7 @@
# Template file for 'astroid'
pkgname=astroid
version=0.16
-revision=5
+revision=6
build_style=cmake
hostmakedepends="pkg-config scdoc protobuf gobject-introspection"
makedepends="libnotmuch-devel gtkmm-devel webkit2gtk-devel libsass-devel
From 3ba155fe13992f4163b1c23b2f2a254c17121910 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:28 +0700
Subject: [PATCH 10/96] bitcoin: rebuild for boost-1.80
---
srcpkgs/bitcoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index ccc9c4cc5f10..9ae457ecb9c5 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=22.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
From 830c2e8b7b9d5818c7f52144c641d66792660ea0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:29 +0700
Subject: [PATCH 11/96] blender: rebuild for boost-1.80
---
srcpkgs/blender/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 91799f04fba5..28befed1faf8 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
version=3.0.0
-revision=4
+revision=5
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
From 893f2932cc9b9156d4a215437212b3df4d88f002 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:29 +0700
Subject: [PATCH 12/96] cclive: rebuild for boost-1.80
---
srcpkgs/cclive/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cclive/template b/srcpkgs/cclive/template
index c43dbb94209c..936be99b866c 100644
--- a/srcpkgs/cclive/template
+++ b/srcpkgs/cclive/template
@@ -1,7 +1,7 @@
# Template file for 'cclive'
pkgname=cclive
version=0.9.3
-revision=5
+revision=6
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="boost-devel pcre-devel libcurl-devel libquvi-devel glibmm-devel"
From 631461ee1098a04e1d02a402443ed0e4870f9ceb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:29 +0700
Subject: [PATCH 13/96] cgal: rebuild for boost-1.80
---
srcpkgs/cgal/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cgal/template b/srcpkgs/cgal/template
index 7e28c2b28dfd..d448e8dd3c63 100644
--- a/srcpkgs/cgal/template
+++ b/srcpkgs/cgal/template
@@ -1,7 +1,7 @@
# Template file for 'cgal'
pkgname=cgal
version=4.14
-revision=3
+revision=4
wrksrc="CGAL-${version}"
build_style=cmake
build_helper="qemu"
From e88f33125f728268fb06517f3dbfd81f2e983db7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:29 +0700
Subject: [PATCH 14/96] codeblocks: rebuild for boost-1.80
---
srcpkgs/codeblocks/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/codeblocks/template b/srcpkgs/codeblocks/template
index 33b9b9a77853..0079c3a8991c 100644
--- a/srcpkgs/codeblocks/template
+++ b/srcpkgs/codeblocks/template
@@ -1,7 +1,7 @@
# Template file for 'codeblocks'
pkgname=codeblocks
version=20.03
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-wx-config=wx-config-gtk3 --with-contrib-plugins
--with-boost=${XBPS_CROSS_BASE}/usr --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
From 233b012b364079cb5741039636ef38b7558e2110 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:29 +0700
Subject: [PATCH 15/96] colobot: rebuild for boost-1.80
---
srcpkgs/colobot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/colobot/template b/srcpkgs/colobot/template
index 1b415dd2cfad..a7613cad90b5 100644
--- a/srcpkgs/colobot/template
+++ b/srcpkgs/colobot/template
@@ -2,7 +2,7 @@
pkgname=colobot
# needs to be kept in sync with colobot-data (provides game assets)
version=0.2.0
-revision=1
+revision=2
wrksrc="colobot-colobot-gold-${version}-alpha"
build_style=cmake
configure_args="-DCOLOBOT_INSTALL_BIN_DIR=/usr/bin -DOpenGL_GL_PREFERENCE=GLVND"
From 20bf666c7429471a780285a43dd2365b7f5033ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:30 +0700
Subject: [PATCH 16/96] cryfs: rebuild for boost-1.80
---
srcpkgs/cryfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 495c2b318a3b..84dd02471f7b 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,7 +1,7 @@
# Template file for 'cryfs'
pkgname=cryfs
version=0.10.2
-revision=5
+revision=6
create_wrksrc=yes
build_style=cmake
configure_args="-DCRYFS_UPDATE_CHECKS=off
From 3913fbbaeb8c6de74764c96ee2bed964cec57aa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:30 +0700
Subject: [PATCH 17/96] eclib: rebuild for boost-1.80
---
srcpkgs/eclib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/eclib/template b/srcpkgs/eclib/template
index 3db0bd2119b9..694a39ed4068 100644
--- a/srcpkgs/eclib/template
+++ b/srcpkgs/eclib/template
@@ -1,7 +1,7 @@
# Template file for 'eclib'
pkgname=eclib
version=20210625
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-flint --with-boost"
hostmakedepends="automake autoconf-archive libtool"
From 8bbd4e3c621db7cb4cf9f75e4290ed208a69134a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:30 +0700
Subject: [PATCH 18/96] facter: rebuild for boost-1.80
---
srcpkgs/facter/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 93d6bfc6af51..45c921a0b72d 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
# Template file for 'facter'
pkgname=facter
version=3.14.16
-revision=3
+revision=4
build_style=cmake
configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
-DENABLE_CXX_WERROR=OFF -DCMAKE_INSTALL_LIBDIR=/usr/lib"
From 82993d648faba8ad5efc0d462db38cfce6ad45de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:30 +0700
Subject: [PATCH 19/96] fcitx5-chinese-addons: rebuild for boost-1.80
---
srcpkgs/fcitx5-chinese-addons/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fcitx5-chinese-addons/template b/srcpkgs/fcitx5-chinese-addons/template
index d207bde9ada9..a3a1948474a7 100644
--- a/srcpkgs/fcitx5-chinese-addons/template
+++ b/srcpkgs/fcitx5-chinese-addons/template
@@ -1,7 +1,7 @@
# Template file for 'fcitx5-chinese-addons'
pkgname=fcitx5-chinese-addons
version=5.0.14
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config gettext doxygen extra-cmake-modules qt5-qmake
qt5-host-tools libime-utils"
From 2257e34fa4c9fd1f9fbd8de8dea9bdfadb8a1715 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:31 +0700
Subject: [PATCH 20/96] fifengine: rebuild for boost-1.80
---
srcpkgs/fifengine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fifengine/template b/srcpkgs/fifengine/template
index 1987e06f7d03..24d2f8521c8d 100644
--- a/srcpkgs/fifengine/template
+++ b/srcpkgs/fifengine/template
@@ -1,7 +1,7 @@
# Template file for 'fifengine'
pkgname=fifengine
version=0.4.2
-revision=8
+revision=9
build_style=cmake
hostmakedepends="swig python3"
makedepends="SDL2-devel SDL2_image-devel SDL2_ttf-devel boost-devel
From 21be1e7d8d185612371253c7edf28816a2e5a332 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:31 +0700
Subject: [PATCH 21/96] freecad: rebuild for boost-1.80
---
srcpkgs/freecad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index 1e2aec024fd7..feb112ef9e94 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=0.19.4
-revision=1
+revision=2
wrksrc="FreeCAD-${version}"
build_style=cmake
From ac3d9169f35731b1a92577ede673e25042315b01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:31 +0700
Subject: [PATCH 22/96] freeorion: rebuild for boost-1.80
---
srcpkgs/freeorion/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freeorion/template b/srcpkgs/freeorion/template
index 20fd819e49b0..71d41f3e987b 100644
--- a/srcpkgs/freeorion/template
+++ b/srcpkgs/freeorion/template
@@ -1,7 +1,7 @@
# Template file for 'freeorion'
pkgname=freeorion
version=0.4.10.2
-revision=1
+revision=2
_release=${version}_2021-08-01.f663dad
wrksrc=src-tarball
build_style=cmake
From 06ac629e40e3f8d038c5b7c7b1712fe446c67d92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:31 +0700
Subject: [PATCH 23/96] gnucash: rebuild for boost-1.80
---
srcpkgs/gnucash/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 5d403e47c02b..81627ef4f8a1 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
# Template file for 'gnucash'
pkgname=gnucash
version=4.11
-revision=1
+revision=2
wrksrc="${pkgname}-${version%b}"
build_style=cmake
make_check_target=check
From 74b79961a48b4f39a266013c9843835a3447a0cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:31 +0700
Subject: [PATCH 24/96] gnuradio: rebuild for boost-1.80
---
srcpkgs/gnuradio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index 43ae4e1cb1ba..973339f92921 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
version=3.10.3.0
-revision=1
+revision=2
build_style=cmake
conf_files="/etc/gnuradio/conf.d/*"
configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax
From 10adb50149d9c96637aa17a0ac7bd06cc651baad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:32 +0700
Subject: [PATCH 25/96] gnuradio-osmosdr: rebuild for boost-1.80
---
srcpkgs/gnuradio-osmosdr/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template
index cdb4d27faf68..bf0696c672a9 100644
--- a/srcpkgs/gnuradio-osmosdr/template
+++ b/srcpkgs/gnuradio-osmosdr/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-osmosdr'
pkgname=gnuradio-osmosdr
version=0.2.3git20210128
-revision=1
+revision=2
_githash=a100eb024c0210b95e4738b6efd836d48225bd03
wrksrc="gr-osmosdr-${_githash}"
build_style=cmake
From 3caca4b23b2a08ca14f7a20a119cf2419b81c069 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:32 +0700
Subject: [PATCH 26/96] gnuradio-rds: rebuild for boost-1.80
---
srcpkgs/gnuradio-rds/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template
index 35d19fb82b11..e9e865151f7a 100644
--- a/srcpkgs/gnuradio-rds/template
+++ b/srcpkgs/gnuradio-rds/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-rds'
pkgname=gnuradio-rds
version=3.10
-revision=1
+revision=2
wrksrc="gr-rds-${version}"
build_style=cmake
configure_args="-Dpybind11_DIR=/${py3_sitelib}/pybind11/share/cmake/pybind11"
From b19d70347ce09a5c70a4d3a8c9ef3179e7a85d70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:32 +0700
Subject: [PATCH 27/96] gource: rebuild for boost-1.80
---
srcpkgs/gource/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gource/template b/srcpkgs/gource/template
index 8ec3b05ca772..08b2e222f607 100644
--- a/srcpkgs/gource/template
+++ b/srcpkgs/gource/template
@@ -1,7 +1,7 @@
# Template file for 'gource'
pkgname=gource
version=0.51
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-tinyxml --enable-ttf-font-dir=/usr/share/fonts/TTF
--with-boost-libdir=$XBPS_CROSS_BASE/usr/lib/"
From ea31b7dcdd2b8eebf46667f6c7aa517ba5eade0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:32 +0700
Subject: [PATCH 28/96] gpick: rebuild for boost-1.80
---
srcpkgs/gpick/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gpick/template b/srcpkgs/gpick/template
index b30108334144..7b3a4db6d69c 100644
--- a/srcpkgs/gpick/template
+++ b/srcpkgs/gpick/template
@@ -1,7 +1,7 @@
# Template file for 'gpick'
pkgname=gpick
version=0.2.6
-revision=1
+revision=2
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=cmake
hostmakedepends="gettext pkg-config ragel"
From 8eca63763648eb204e7b6bfe3504c0fd72d3155e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:32 +0700
Subject: [PATCH 29/96] grive2: rebuild for boost-1.80
---
srcpkgs/grive2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/grive2/template b/srcpkgs/grive2/template
index 140688ee9aec..e416cdc606b5 100644
--- a/srcpkgs/grive2/template
+++ b/srcpkgs/grive2/template
@@ -1,7 +1,7 @@
# Template file for 'grive2'
pkgname=grive2
version=0.5.1
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config"
makedepends="boost-devel libcurl-devel yajl-devel libgcrypt-devel expat-devel"
From 0ccacfaf5e30dda3ac6e23d78991642a0d71492e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:33 +0700
Subject: [PATCH 30/96] guitarix2: rebuild for boost-1.80
---
srcpkgs/guitarix2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/guitarix2/template b/srcpkgs/guitarix2/template
index 880814313a2b..de2edbf770b4 100644
--- a/srcpkgs/guitarix2/template
+++ b/srcpkgs/guitarix2/template
@@ -1,7 +1,7 @@
# Template file for 'guitarix2'
pkgname=guitarix2
version=0.42.1
-revision=1
+revision=2
wrksrc="guitarix-${version}"
build_style=waf3
configure_args="--cxxflags-release=-DNDEBUG --ladspa --new-ladspa --no-faust
From 135787356b165c99f43c0de5298ff576931fc8e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:33 +0700
Subject: [PATCH 31/96] heaptrack: rebuild for boost-1.80
---
srcpkgs/heaptrack/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/heaptrack/template b/srcpkgs/heaptrack/template
index ed98a952dfdc..0ccc1e6415a7 100644
--- a/srcpkgs/heaptrack/template
+++ b/srcpkgs/heaptrack/template
@@ -1,7 +1,7 @@
# Template file for 'heaptrack'
pkgname=heaptrack
version=1.4.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DHEAPTRACK_BUILD_GUI=ON"
hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules kcoreaddons
From 4cac97a8b9809d392572a1bd08cc7afe4482a643 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:33 +0700
Subject: [PATCH 32/96] hugin: rebuild for boost-1.80
---
srcpkgs/hugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 7961c74632a1..87cecac02106 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
# Template file for 'hugin'
pkgname=hugin
version=2021.0.0
-revision=1
+revision=2
wrksrc="${pkgname}-${version}"
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
From 3664e71df3f84242d518c21fcfb7bd6e418bfa44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:33 +0700
Subject: [PATCH 33/96] i2pd: rebuild for boost-1.80
---
srcpkgs/i2pd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index fe12bb2e19bf..522235bebc17 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,7 +1,7 @@
# Template file for 'i2pd'
pkgname=i2pd
version=2.42.1
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="USE_UPNP=yes"
makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
From 249ef84c1fec4b64527543b293824d13edab52ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:34 +0700
Subject: [PATCH 34/96] icinga2: rebuild for boost-1.80
---
srcpkgs/icinga2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index a884892fc49e..4ef7abea2fc3 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,7 +1,7 @@
# Template file for 'icinga2'
pkgname=icinga2
version=2.9.3
-revision=6
+revision=7
build_style=cmake
build_helper="qemu"
configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
From eced2f8890926f5550c53d5486ff6a7d5988ecee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:34 +0700
Subject: [PATCH 35/96] imagescan: rebuild for boost-1.80
---
srcpkgs/imagescan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imagescan/template b/srcpkgs/imagescan/template
index a12adfe05713..152ef2f83b33 100644
--- a/srcpkgs/imagescan/template
+++ b/srcpkgs/imagescan/template
@@ -1,7 +1,7 @@
# Template file for 'imagescan'
pkgname=imagescan
version=3.65.0
-revision=1
+revision=2
wrksrc=utsushi-0.65.0
build_style=gnu-configure
configure_args="--libexecdir=/usr/lib --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
From e634727745bc48e74b95e928c6a23aed0af8bcd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:34 +0700
Subject: [PATCH 36/96] inkscape: rebuild for boost-1.80
---
srcpkgs/inkscape/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 4d902e663f73..c77236be6848 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.1.1
-revision=4
+revision=5
wrksrc="inkscape-${version}_2021-09-20_3bf5ae0d25"
build_style=cmake
# builds executables then runs checks
From a5b99a57afc825883fd8fd3d31f1868d811ec96b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:34 +0700
Subject: [PATCH 37/96] innoextract: rebuild for boost-1.80
---
srcpkgs/innoextract/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/innoextract/template b/srcpkgs/innoextract/template
index 079a8ce1350a..9b8e1e163e55 100644
--- a/srcpkgs/innoextract/template
+++ b/srcpkgs/innoextract/template
@@ -1,7 +1,7 @@
# Template file for 'innoextract'
pkgname=innoextract
version=1.9
-revision=1
+revision=2
build_style=cmake
configure_args="-DCMAKE_INSTALL_PREFIX=/usr"
hostmakedepends="boost extra-cmake-modules"
From a66d3c469ae7092494e5181215e7cb924e70d425 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:34 +0700
Subject: [PATCH 38/96] juCi++: rebuild for boost-1.80
---
srcpkgs/juCi++/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index 1a7604b44a00..5103324dec20 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -1,7 +1,7 @@
# Template file for 'juCi++'
pkgname=juCi++
version=1.6.2
-revision=2
+revision=3
_libclangmm_commit="b342f4dd6de4fe509a692a4b4fcfc7e24aae9590"
_tiny_commit="c9c8bf810ddad8cd17882b9a9ee628a690e779f5"
wrksrc="jucipp-v${version}"
From b3eb58e3ba5282284f624c6e46d8986c38f1084d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:35 +0700
Subject: [PATCH 39/96] kea: rebuild for boost-1.80
---
srcpkgs/kea/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index dc0bcc5de3fc..a55b58691de9 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -1,7 +1,7 @@
# Template file for 'kea'
pkgname=kea
version=1.9.5
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
$(vopt_if mysql --with-mysql)
From 5a6f5d501d2985bca714a9bdfa67e72487ebc97e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:35 +0700
Subject: [PATCH 40/96] kig: rebuild for boost-1.80
---
srcpkgs/kig/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index 591db4bd477c..748c09f99e59 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,7 +1,7 @@
# Template file for 'kig'
pkgname=kig
version=22.04.3
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
pkg-config qt5-host-tools qt5-qmake"
From 7e64cff192790bc10df78d858b56b5d538b9f6b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:35 +0700
Subject: [PATCH 41/96] leatherman: rebuild for boost-1.80
---
srcpkgs/leatherman/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/leatherman/template b/srcpkgs/leatherman/template
index b61fcd5dc205..5255ea4a18a1 100644
--- a/srcpkgs/leatherman/template
+++ b/srcpkgs/leatherman/template
@@ -1,7 +1,7 @@
# Template file for 'leatherman'
pkgname=leatherman
version=1.12.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DLEATHERMAN_SHARED=ON"
hostmakedepends="pkg-config python3"
From 09c1519cd600f76255b721547f8571140a671a0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:35 +0700
Subject: [PATCH 42/96] ledger: rebuild for boost-1.80
---
srcpkgs/ledger/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ledger/template b/srcpkgs/ledger/template
index c94b72709dea..130c727e7768 100644
--- a/srcpkgs/ledger/template
+++ b/srcpkgs/ledger/template
@@ -1,7 +1,7 @@
# Template file for 'ledger'
pkgname=ledger
version=3.2.1
-revision=1
+revision=2
build_style=cmake
makedepends="boost-devel gmp-devel mpfr-devel gettext-devel libedit-devel"
short_desc="Double-entry accounting system with a command-line reporting interface"
From 96bb119d0a979ec8353a0f5fda70e82867250992 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:36 +0700
Subject: [PATCH 43/96] libbitcoin-blockchain: rebuild for boost-1.80
---
srcpkgs/libbitcoin-blockchain/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index e43ab8b9ede1..09a126e75356 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-blockchain'
pkgname=libbitcoin-blockchain
version=3.6.0
-revision=6
+revision=7
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
From 11ba2b072a9717101a243b882ad0eebe9d60a977 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:36 +0700
Subject: [PATCH 44/96] libbitcoin-client: rebuild for boost-1.80
---
srcpkgs/libbitcoin-client/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index 17849cd906d0..35f17b74ae00 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-client'
pkgname=libbitcoin-client
version=3.6.0
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"
From 93f070b5bac432c3d26747d1d3fc0270679bb805 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:36 +0700
Subject: [PATCH 45/96] libbitcoin-database: rebuild for boost-1.80
---
srcpkgs/libbitcoin-database/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index a3c48226ba2d..13cec4fdc3dd 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-database'
pkgname=libbitcoin-database
version=3.6.0
-revision=6
+revision=7
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
From 2110ac59a3350750b77da0bd0997cf457bfed7b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:36 +0700
Subject: [PATCH 46/96] libbitcoin-explorer: rebuild for boost-1.80
---
srcpkgs/libbitcoin-explorer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index a1929f350269..7a5f8368b271 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-explorer'
pkgname=libbitcoin-explorer
version=3.6.0
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
From 48d2e518add565145e91cc0741fb17259edd1613 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:36 +0700
Subject: [PATCH 47/96] libbitcoin-network: rebuild for boost-1.80
---
srcpkgs/libbitcoin-network/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index d130facc40de..4f730a814242 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-network'
pkgname=libbitcoin-network
version=3.6.0
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
From 312b64f341f14fafda0dfed4a9bda67c65aa38a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:37 +0700
Subject: [PATCH 48/96] libbitcoin-node: rebuild for boost-1.80
---
srcpkgs/libbitcoin-node/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 23e32624b5cc..ead87310627b 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-node'
pkgname=libbitcoin-node
version=3.6.0
-revision=6
+revision=7
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
From e20a5a54debb730a219a1e732ec0b093cb52aa00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:37 +0700
Subject: [PATCH 49/96] libbitcoin-protocol: rebuild for boost-1.80
---
srcpkgs/libbitcoin-protocol/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 838d62cc9ecd..53e2e6520f6a 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-protocol'
pkgname=libbitcoin-protocol
version=3.6.0
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
From d1a3fff070da655561fd9564d7d260598f0e6460 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:37 +0700
Subject: [PATCH 50/96] libbitcoin-server: rebuild for boost-1.80
---
srcpkgs/libbitcoin-server/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index fc4988deac2b..70d4c492c5bb 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-server'
pkgname=libbitcoin-server
version=3.6.0
-revision=6
+revision=7
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
From 85aa94dc1a9be8520fbccc5a7b928d38b842c6c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:37 +0700
Subject: [PATCH 51/96] libbitcoin-system: rebuild for boost-1.80
---
srcpkgs/libbitcoin-system/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index 8b03fb248c42..8e6790c3ba66 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-system'
pkgname=libbitcoin-system
version=3.6.0
-revision=6
+revision=7
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
From 0711743ed54444542484b8e07051977723cf74e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:38 +0700
Subject: [PATCH 52/96] libcmis: rebuild for boost-1.80
---
srcpkgs/libcmis/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libcmis/template b/srcpkgs/libcmis/template
index fac133d5e4d9..43dd0a856122 100644
--- a/srcpkgs/libcmis/template
+++ b/srcpkgs/libcmis/template
@@ -1,7 +1,7 @@
# Template file for 'libcmis'
pkgname=libcmis
version=0.5.2
-revision=4
+revision=5
build_style=gnu-configure
configure_args="DOCBOOK2MAN=docbook2man --disable-werror"
hostmakedepends="pkg-config docbook2x"
From 77f291eb716df197656fd50c8de1cd957b92252a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:38 +0700
Subject: [PATCH 53/96] libime: rebuild for boost-1.80
---
srcpkgs/libime/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libime/template b/srcpkgs/libime/template
index a37db9885a48..363bdd93b16d 100644
--- a/srcpkgs/libime/template
+++ b/srcpkgs/libime/template
@@ -1,7 +1,7 @@
# Template file for 'libime'
pkgname=libime
version=1.0.13
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config gettext extra-cmake-modules python3"
From 0d3fbeb86d084c9bbfedca68a7d1b7d6aa90b0b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:38 +0700
Subject: [PATCH 54/96] libime-jyutping: rebuild for boost-1.80
---
srcpkgs/libime-jyutping/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libime-jyutping/template b/srcpkgs/libime-jyutping/template
index 3c33940ca368..6ae0855c3d7a 100644
--- a/srcpkgs/libime-jyutping/template
+++ b/srcpkgs/libime-jyutping/template
@@ -1,7 +1,7 @@
# Template file for 'libime-jyutping'
pkgname=libime-jyutping
version=1.0.4
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config gettext extra-cmake-modules python3 libime-utils"
From 580fe691c683b9f8cc4021c0edad261018973298 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:38 +0700
Subject: [PATCH 55/96] libixion: rebuild for boost-1.80
---
srcpkgs/libixion/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libixion/template b/srcpkgs/libixion/template
index 37298a8b9427..ef1a00100f53 100644
--- a/srcpkgs/libixion/template
+++ b/srcpkgs/libixion/template
@@ -1,7 +1,7 @@
# Template file for 'libixion'
pkgname=libixion
version=0.17.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config python3"
makedepends="boost-devel fmt-devel mdds python3-devel spdlog"
From 8846246be6a7f3d90be7fd31afef041487a5b153 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:38 +0700
Subject: [PATCH 56/96] liborcus: rebuild for boost-1.80
---
srcpkgs/liborcus/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/liborcus/template b/srcpkgs/liborcus/template
index cf4b938fe37a..7b6b21a26dca 100644
--- a/srcpkgs/liborcus/template
+++ b/srcpkgs/liborcus/template
@@ -1,7 +1,7 @@
# Template file for 'liborcus'
pkgname=liborcus
version=0.17.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config python3"
makedepends="boost-devel mdds libixion-devel python3-devel zlib-devel"
From 159dc557e1d167979ac4460c9f540d18be941daa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:39 +0700
Subject: [PATCH 57/96] libphonenumber: rebuild for boost-1.80
---
srcpkgs/libphonenumber/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libphonenumber/template b/srcpkgs/libphonenumber/template
index 9bef2825781c..05f28c4f5579 100644
--- a/srcpkgs/libphonenumber/template
+++ b/srcpkgs/libphonenumber/template
@@ -1,7 +1,7 @@
# Template file for 'libphonenumber'
pkgname=libphonenumber
version=8.12.39
-revision=6
+revision=7
build_wrksrc=cpp
build_style=cmake
build_helper=qemu
From b969b8f156a55a2324d4d8def3ff9d3b80da9b03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:39 +0700
Subject: [PATCH 58/96] libreoffice: rebuild for boost-1.80
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 158df0f30ebc..cc00e88157d0 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.3.3.2
-revision=3
+revision=4
build_style=meta
make_build_target="build-nocheck"
nocross="Several dependencies are nocross=yes"
From 9afbf326097d2df2d0358a2f166197bf26e31fd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:39 +0700
Subject: [PATCH 59/96] librime: rebuild for boost-1.80
---
srcpkgs/librime/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/librime/template b/srcpkgs/librime/template
index 5f734c200bd7..7110eeffd3f9 100644
--- a/srcpkgs/librime/template
+++ b/srcpkgs/librime/template
@@ -1,7 +1,7 @@
# Template file for 'librime'
pkgname=librime
version=1.7.3
-revision=3
+revision=4
build_style=cmake
configure_args="-DCMAKE_BUILD_TYPE=None -DENABLE_LOGGING=OFF -DBUILD_TEST=ON
-DCAPNP_EXECUTABLE=/usr/bin/capnp -DCAPNPC_CXX_EXECUTABLE=/usr/bin/capnpc-c++"
From c2c8db4e1e025220eb51168127770eeda1a69103 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:39 +0700
Subject: [PATCH 60/96] libtorrent-rasterbar: rebuild for boost-1.80
---
srcpkgs/libtorrent-rasterbar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index b1ceddc95282..5aceddec5646 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,7 +2,7 @@
# Breaks ABI/API without changing soname, revbump all dependants
pkgname=libtorrent-rasterbar
version=1.2.14
-revision=2
+revision=3
build_style=cmake
configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
-Dpython-bindings=ON"
From ed1e27f230a6bb71f50943162113f455b2fea4d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:40 +0700
Subject: [PATCH 61/96] linssid: rebuild for boost-1.80
---
srcpkgs/linssid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linssid/template b/srcpkgs/linssid/template
index 937c8a0745e0..09206656186e 100644
--- a/srcpkgs/linssid/template
+++ b/srcpkgs/linssid/template
@@ -1,7 +1,7 @@
# Template file for 'linssid'
pkgname=linssid
version=3.6
-revision=4
+revision=5
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools"
makedepends="boost-devel qwt-devel"
From 4dc898795440d3cf97a9ea527a6b23e6b0980448 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:40 +0700
Subject: [PATCH 62/96] litecoin: rebuild for boost-1.80
---
srcpkgs/litecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 3c33d9b0eb8a..7a188c3c9af8 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.18.1
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
--disable-tests --with-openssl"
From 496ba2cb2fba8da891280e1fe67921efd006ff35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:40 +0700
Subject: [PATCH 63/96] monero: rebuild for boost-1.80
---
srcpkgs/monero/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index bff62347ebd6..eebce3d0a551 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
# Template file for 'monero'
pkgname=monero
version=0.17.2.3
-revision=2
+revision=3
_randomx_version="1.1.9"
# the revision monero uses as a submodule for the specific version
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
From 023a2b4d7b9fc31b9f9092441760eb600ad7a1a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:40 +0700
Subject: [PATCH 64/96] monero-gui: rebuild for boost-1.80
---
srcpkgs/monero-gui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 67ed3273defa..61e5dd9da1b7 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
# Template file for 'monero-gui'
pkgname=monero-gui
version=0.17.2.3
-revision=1
+revision=2
_monero_version=0.17.2.3
_randomx_version="1.1.9"
# the revision monero uses as a submodule for the specific version
From 940327cab3f9c13e3cf8d3f9d6388034982b1d1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:40 +0700
Subject: [PATCH 65/96] mupen64plus: rebuild for boost-1.80
---
srcpkgs/mupen64plus/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mupen64plus/template b/srcpkgs/mupen64plus/template
index 4984a7f4a777..f4a58a4749cb 100644
--- a/srcpkgs/mupen64plus/template
+++ b/srcpkgs/mupen64plus/template
@@ -1,7 +1,7 @@
# Template file for 'mupen64plus'
pkgname=mupen64plus
version=2.5.9
-revision=1
+revision=2
archs="x86_64* i686*"
wrksrc="mupen64plus-bundle-src-${version}"
hostmakedepends="pkg-config which nasm"
From 0c95df707c211255f0cba460fee19a6fb574cd6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:41 +0700
Subject: [PATCH 66/96] musikcube: rebuild for boost-1.80
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index 2b75cbd976ea..11a3df3dc0aa 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=0.98.0
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1 -DENABLE_BUNDLED_TAGLIB=false"
From dbc2b8ef9bdacaa95fd98c2fbe7608e73d46e4c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:41 +0700
Subject: [PATCH 67/96] namecoin: rebuild for boost-1.80
---
srcpkgs/namecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index e4cfb3777b71..7839d4008cd3 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
# Template file for 'namecoin'
pkgname=namecoin
version=0.18.1
-revision=5
+revision=6
wrksrc="${pkgname}-core-nc${version}"
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-static
From 9a3ed08889eb2f5202f2f3183610c8755a50e450 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:41 +0700
Subject: [PATCH 68/96] ncmpcpp: rebuild for boost-1.80
---
srcpkgs/ncmpcpp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 773deb4917d4..72a0d35e5e7f 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
--enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
From a957b5824c9854f25e1e5bc00f6075556714a409 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:41 +0700
Subject: [PATCH 69/96] nix: rebuild for boost-1.80
---
srcpkgs/nix/template | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index bb585b6d7d54..e21c94aa2759 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,23 +1,25 @@
# Template file for 'nix'
pkgname=nix
-version=2.8.1
-revision=1
+version=2.10.3
+revision=2
build_style=gnu-configure
# Use /nix/var as suggested by the official Manual.
-configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
-hostmakedepends="curl pkg-config flex tar xz automake autoconf-archive mdBook jq"
+configure_args="--localstatedir=/nix/var
+ --with-sandbox-shell=/usr/bin/busybox.static"
+hostmakedepends="curl pkg-config flex tar xz automake autoconf-archive mdBook jq
+ busybox-static"
makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
liblzma-devel openssl-devel libsodium-devel sqlite-devel
libseccomp-devel editline-devel jq-devel libarchive-devel
gtest-devel lowdown-devel json-c++"
-depends="curl tar xz"
+depends="curl tar xz busybox-static"
short_desc="Purely functional package manager"
-maintainer="Juan RP <xtraeme@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://nixos.org/nix/"
changelog="https://nixos.org/releases/${pkgname}/${pkgname}-${version}/manual/#sec-relnotes"
distfiles="https://github.com/NixOS/nix/archive/refs/tags/${version}.tar.gz"
-checksum=6f19455775523fca4ae4096e6a6fc493f577198b968811f7fa77eb1fa5213b43
+checksum=5a8d79714bf04c425f41fdd22e67d4704d2e44c7a760c6c144e5767c6d662413
disable_parallel_build=yes
nocross="cross build populates /usr/lib32 with libraries and tries to link against them"
From 245d4c80cda080a1894df1af420345c81af0638d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:42 +0700
Subject: [PATCH 70/96] opencamlib: rebuild for boost-1.80
---
srcpkgs/opencamlib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencamlib/template b/srcpkgs/opencamlib/template
index 8722aaf9ee64..140315ef3467 100644
--- a/srcpkgs/opencamlib/template
+++ b/srcpkgs/opencamlib/template
@@ -1,7 +1,7 @@
# Template file for 'opencamlib'
pkgname=opencamlib
version=2019.07
-revision=3
+revision=4
build_style=cmake
configure_args="-DBUILD_PY_LIB=ON -DUSE_PY_3=ON -DVERSION_STRING=${version}"
hostmakedepends="python3"
From 38876b97aa116a5a6f4d37256e0f668102c8a057 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:42 +0700
Subject: [PATCH 71/96] openimageio: rebuild for boost-1.80
---
srcpkgs/openimageio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index 8abf3b05d6a3..23de3c1a91c3 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
# Template file for 'openimageio'
pkgname=openimageio
version=2.2.15.1
-revision=3
+revision=4
wrksrc="oiio-Release-${version}"
build_style=cmake
configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
From 36523224978d2e419bb612182da3c7a89fc7c763 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:42 +0700
Subject: [PATCH 72/96] openmw: rebuild for boost-1.80
---
srcpkgs/openmw/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openmw/template b/srcpkgs/openmw/template
index 581e2cbb081e..9a263c9eae45 100644
--- a/srcpkgs/openmw/template
+++ b/srcpkgs/openmw/template
@@ -1,7 +1,7 @@
# Template file for 'openmw'
pkgname=openmw
version=0.47.0
-revision=1
+revision=2
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=cmake
# System bullet doesn't use double precision (double precision would break vdrift)
From 2097278e3c122858539a234be2cd552dce3c236c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:42 +0700
Subject: [PATCH 73/96] openscad: rebuild for boost-1.80
---
srcpkgs/openscad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index 60d45d60615f..a3951a1a2201 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -1,7 +1,7 @@
# Template file for 'openscad'
pkgname=openscad
version=2021.01
-revision=2
+revision=3
build_style=qmake
hostmakedepends="bison flex pkg-config gettext qt5-qmake qt5-host-tools"
makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
From 74b49f347e5171d55726cff970482402938d0b5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:42 +0700
Subject: [PATCH 74/96] openvdb: rebuild for boost-1.80
---
srcpkgs/openvdb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 4957f642552a..24bc2253828b 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,7 +1,7 @@
# Template file for 'openvdb'
pkgname=openvdb
version=9.0.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
hostmakedepends="pkg-config"
From 119ca514c0624d3272782c62e1ea012b7cbb1f50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:43 +0700
Subject: [PATCH 75/96] osm2pgsql: rebuild for boost-1.80
---
srcpkgs/osm2pgsql/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index 1c53c4505047..1d5f71b70140 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,7 +1,7 @@
# Template file for 'osm2pgsql'
pkgname=osm2pgsql
version=1.6.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="boost"
makedepends="expat-devel proj-devel bzip2-devel zlib-devel boost-devel
From d88cd228f868991b3b7f762d405683e8f3b49861 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:43 +0700
Subject: [PATCH 76/96] poedit: rebuild for boost-1.80
---
srcpkgs/poedit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index f10aaf4c88a2..15cd4b6bae20 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
# Template file for 'poedit'
pkgname=poedit
version=3.0.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-wx-config=wx-config-gtk3"
hostmakedepends="pkg-config"
From dc098437bbde3a6394e16ddded81236fd04f54f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:43 +0700
Subject: [PATCH 77/96] povray: rebuild for boost-1.80
---
srcpkgs/povray/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/povray/template b/srcpkgs/povray/template
index 30a2baab2039..93ab71f8e0db 100644
--- a/srcpkgs/povray/template
+++ b/srcpkgs/povray/template
@@ -1,7 +1,7 @@
# Template file for 'povray'
pkgname=povray
version=3.7.0.8
-revision=5
+revision=6
build_style=gnu-configure
_v=${version%.*.*}
configure_args="COMPILED_BY=Void --disable-optimiz-arch"
From 9f3e6d2c3df44e2cd225ef1a93381ebac3f090ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:43 +0700
Subject: [PATCH 78/96] pulseeffects-legacy: rebuild for boost-1.80
---
srcpkgs/pulseeffects-legacy/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pulseeffects-legacy/template b/srcpkgs/pulseeffects-legacy/template
index 585f25a55c8f..121e90e7f7dc 100644
--- a/srcpkgs/pulseeffects-legacy/template
+++ b/srcpkgs/pulseeffects-legacy/template
@@ -1,7 +1,7 @@
# Template file for 'pulseeffects-legacy'
pkgname=pulseeffects-legacy
version=4.8.5
-revision=3
+revision=4
wrksrc="easyeffects-${version}"
build_style=meson
hostmakedepends="itstool pkg-config gettext glib-devel"
From c078e7d1484fbcad4a4967e7611f317ec9af4628 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:44 +0700
Subject: [PATCH 79/96] pulseview: rebuild for boost-1.80
---
srcpkgs/pulseview/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pulseview/template b/srcpkgs/pulseview/template
index 83ce80bc39d9..e24c6cd30e88 100644
--- a/srcpkgs/pulseview/template
+++ b/srcpkgs/pulseview/template
@@ -1,7 +1,7 @@
# Template file for 'pulseview'
pkgname=pulseview
version=0.4.2
-revision=1
+revision=2
build_style=cmake
configure_args="-DDISABLE_WERROR=TRUE"
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From e9bbc9358bd17f00f879c19f0bfcfa0e1df0073d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:44 +0700
Subject: [PATCH 80/96] remwharead: rebuild for boost-1.80
---
srcpkgs/remwharead/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index 3e52473f86ce..cd36bd3b9849 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -1,7 +1,7 @@
# Template file for 'remwharead'
pkgname=remwharead
version=0.10.0
-revision=2
+revision=3
build_style=cmake
hostmakedepends="poco-devel asciidoc pkg-config"
makedepends="poco-devel boost-devel"
From 23ff7c4b7f388a90b0e55a42b4c7a937ba48ea6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:44 +0700
Subject: [PATCH 81/96] rstudio: rebuild for boost-1.80
---
srcpkgs/rstudio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index ad7c1e85cce7..c0354b8130cc 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
# Template file for 'rstudio'
pkgname=rstudio
version=1.4.1717
-revision=3
+revision=4
build_style=cmake
configure_args="-DRSTUDIO_TARGET=Desktop
-DRSTUDIO_USE_SYSTEM_BOOST=ON
From 0258b884c3274a634b8dc7f351316bd9e95b7494 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:44 +0700
Subject: [PATCH 82/96] snapper: rebuild for boost-1.80
---
srcpkgs/snapper/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template
index bc7bbe5cf84b..85697667ff77 100644
--- a/srcpkgs/snapper/template
+++ b/srcpkgs/snapper/template
@@ -1,7 +1,7 @@
# Template file for 'snapper'
pkgname=snapper
version=0.10.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-zypp --disable-systemd --with-conf=/etc/conf.d"
conf_files="/etc/conf.d/snapper"
From 1d38b223068ee456a864a7e88e5c7f727a1e8531 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:45 +0700
Subject: [PATCH 83/96] source-highlight: rebuild for boost-1.80
---
srcpkgs/source-highlight/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/source-highlight/template b/srcpkgs/source-highlight/template
index ab56401c64a0..f76c987335af 100644
--- a/srcpkgs/source-highlight/template
+++ b/srcpkgs/source-highlight/template
@@ -1,7 +1,7 @@
# Template file for 'source-highlight'
pkgname=source-highlight
version=3.1.9
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--with-boost=${XBPS_CROSS_BASE}/usr
--with-bash-completion=/usr/share/bash-completion/completions"
From b532aaaf0c9dbd23499e03da8e3758c64e83c602 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:45 +0700
Subject: [PATCH 84/96] supercollider: rebuild for boost-1.80
---
srcpkgs/supercollider/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/supercollider/template b/srcpkgs/supercollider/template
index 35f6d9dfb7c2..b0b8278470ef 100644
--- a/srcpkgs/supercollider/template
+++ b/srcpkgs/supercollider/template
@@ -1,7 +1,7 @@
# Template file for 'supercollider'
pkgname=supercollider
version=3.11.1
-revision=3
+revision=4
wrksrc="SuperCollider-${version}-Source"
build_style=cmake
make_cmd=make
From ef62b291a78651fe5b4acc9d9ce28f2612329db3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:45 +0700
Subject: [PATCH 85/96] supertux2: rebuild for boost-1.80
---
srcpkgs/supertux2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/supertux2/template b/srcpkgs/supertux2/template
index 56057f5837d5..fce60e205a59 100644
--- a/srcpkgs/supertux2/template
+++ b/srcpkgs/supertux2/template
@@ -1,7 +1,7 @@
# Template file for 'supertux2'
pkgname=supertux2
version=0.6.3
-revision=1
+revision=2
wrksrc="SuperTux-v${version}-Source"
build_style=cmake
configure_args="
From f8afd51e13be1858858f3952e6a4434c2d879834 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:45 +0700
Subject: [PATCH 86/96] swiften: rebuild for boost-1.80
---
srcpkgs/swiften/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 969ef1eb5d78..9f6fd1d0d9a8 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,7 +1,7 @@
# Template file for 'swiften'
pkgname=swiften
version=4.0.3
-revision=2
+revision=3
wrksrc="swift-${version}"
hostmakedepends="scons pkg-config"
makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
From 98727f08faff1a2ae24aa77798ad474301fa7326 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:46 +0700
Subject: [PATCH 87/96] syncthingtray: rebuild for boost-1.80
---
srcpkgs/syncthingtray/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/syncthingtray/template b/srcpkgs/syncthingtray/template
index 4f338f2cc200..f445aa92db1e 100644
--- a/srcpkgs/syncthingtray/template
+++ b/srcpkgs/syncthingtray/template
@@ -1,7 +1,7 @@
# Template file for 'syncthingtray'
pkgname=syncthingtray
version=1.2.2
-revision=1
+revision=2
build_style=cmake
configure_args="-DJS_PROVIDER=qml -DBUILTIN_TRANSLATIONS=ON -DSYSTEMD_SUPPORT=OFF
-DBUILD_SHARED_LIBS=ON -DWEBVIEW_PROVIDER=$(vopt_if webengine webengine none)"
From 62a4c075717ebb066b28b6b12fbb30c9d9a4fff2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:46 +0700
Subject: [PATCH 88/96] tmfs: rebuild for boost-1.80
---
srcpkgs/tmfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tmfs/template b/srcpkgs/tmfs/template
index 1dbed3e0eb72..ed4fb5fed836 100644
--- a/srcpkgs/tmfs/template
+++ b/srcpkgs/tmfs/template
@@ -1,7 +1,7 @@
# Template file for 'tmfs'
pkgname=tmfs
version=r5
-revision=7
+revision=8
build_style=cmake
hostmakedepends="pkg-config"
makedepends="fuse-devel boost-devel"
From 6e8a4ef814c3c7d994f436c4800dffaa305a39b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:46 +0700
Subject: [PATCH 89/96] tomahawk: rebuild for boost-1.80
---
srcpkgs/tomahawk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tomahawk/template b/srcpkgs/tomahawk/template
index 0edbacc5f8ad..b66b9a876a5c 100644
--- a/srcpkgs/tomahawk/template
+++ b/srcpkgs/tomahawk/template
@@ -1,7 +1,7 @@
# Template file for 'tomahawk'
pkgname=tomahawk
version=0.8.4
-revision=21
+revision=22
wrksrc=${pkgname}-${_commit}
_commit=90ec6f0dc701cba0533c66abdcb904e29f02a66f
build_style=cmake
From 89f0950c8d35ca12c85f4a789809c52e7dd5a2ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:46 +0700
Subject: [PATCH 90/96] uhd: rebuild for boost-1.80
---
srcpkgs/uhd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template
index 5f043162d7dc..170e12670c2c 100644
--- a/srcpkgs/uhd/template
+++ b/srcpkgs/uhd/template
@@ -1,7 +1,7 @@
# Template file for 'uhd'
pkgname=uhd
version=4.0.0.0
-revision=1
+revision=2
build_wrksrc=host
build_style=cmake
configure_args="-DCMAKE_BUILD_TYPE=None"
From d6b7c45f17562c46b6176d5389509e8dccd8078b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:47 +0700
Subject: [PATCH 91/96] wesnoth: rebuild for boost-1.80
---
srcpkgs/wesnoth/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 0fcc09b29c10..4d55d20b5959 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,7 +1,7 @@
# Template file for 'wesnoth'
pkgname=wesnoth
version=1.14.17
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_OMP=1"
hostmakedepends="pkg-config gettext"
@@ -18,7 +18,7 @@ checksum=3646cba604e09c12d6900a733bcb78cbf05f2f75f05346630d6529c220f584e1
replaces="wesnoth-data>=0"
CFLAGS="-UNDEBUG"
-CXXFLAGS="-UNDEBUG"
+CXXFLAGS="-UNDEBUG -std=c++14"
post_install() {
# runit service
From 42b7d520b5bdbdd27dc8cb804f0dbad9ca7101be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 27 Aug 2022 11:09:29 +0700
Subject: [PATCH 92/96] bootiso: depends on exfatprogs
---
srcpkgs/bootiso/patches/new-exfat.patch | 11 +++++++++++
srcpkgs/bootiso/template | 7 +++----
2 files changed, 14 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/bootiso/patches/new-exfat.patch
diff --git a/srcpkgs/bootiso/patches/new-exfat.patch b/srcpkgs/bootiso/patches/new-exfat.patch
new file mode 100644
index 000000000000..57085311bfd6
--- /dev/null
+++ b/srcpkgs/bootiso/patches/new-exfat.patch
@@ -0,0 +1,11 @@
+--- a/bootiso
++++ b/bootiso
+@@ -507,7 +507,7 @@ function fs_formatPartition() {
+ # These options always end up with the label flag setter
+ local -Ar _mkfsOpts=(
+ ['vfat']="-v -F 32 -n" # Fat32 mode
+- ['exfat']="-n"
++ ['exfat']="-L"
+ ['ntfs']="-Q -c 4096 -L" # Quick mode + cluster size = 4096 for syslinux support
+ ['ext2']="-O ^64bit -L" # Disabling pure 64 bits compression for syslinux compatibility
+ ['ext3']="-O ^64bit -L" # see https://www.syslinux.org/wiki/index.php?title=Filesystem#ext
diff --git a/srcpkgs/bootiso/template b/srcpkgs/bootiso/template
index db30bfb9db19..2d740ca06809 100644
--- a/srcpkgs/bootiso/template
+++ b/srcpkgs/bootiso/template
@@ -1,11 +1,10 @@
# Template file for 'bootiso'
pkgname=bootiso
version=4.2.0
-revision=2
+revision=3
build_style=gnu-makefile
-depends="bash bc binutils coreutils curl dosfstools e2fsprogs eudev exfat-utils
- f2fs-tools file findutils gawk grep ncurses ntfs-3g rsync syslinux tar util-linux
- wimlib jq"
+depends="bash bc binutils curl dosfstools e2fsprogs eudev exfatprogs
+ f2fs-tools file ncurses ntfs-3g rsync syslinux wimlib jq"
short_desc="Create a USB bootable device from an ISO image easily and securely"
maintainer="Lorem <notloremipsum@protonmail.com>"
license="GPL-3.0-only"
From 6e33801bd631d4e597affc7e4674c0fdc0d6282f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 28 Aug 2022 00:01:40 +0700
Subject: [PATCH 93/96] fcitx: update to 4.2.9.9.
---
srcpkgs/fcitx/template | 38 ++++++++++++++++++++++++++++++++++----
1 file changed, 34 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/fcitx/template b/srcpkgs/fcitx/template
index 590f93109621..c2183bf5dcfc 100644
--- a/srcpkgs/fcitx/template
+++ b/srcpkgs/fcitx/template
@@ -1,7 +1,7 @@
# Template file for 'fcitx'
pkgname=fcitx
-version=4.2.9.8
-revision=5
+version=4.2.9.9
+revision=1
build_style=cmake
build_helper=gir
configure_args="-DSYSCONFDIR=/etc -DFORCE_OPENCC=OFF -DFORCE_PRESAGE=OFF
@@ -18,8 +18,28 @@ short_desc="Flexible Context-aware Input Tool with eXtension"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="GPL-2.0-or-later, LGPL-2.1-or-later, MIT"
homepage="https://fcitx-im.org/"
-distfiles="http://download.fcitx-im.org/fcitx/fcitx-${version}_dict.tar.xz"
-checksum=bc3515cba0561546fe02dae81391d4a03e0e79a2d668aa794cd3a377284033c6
+_en_dict=20121020
+_pytable=20121124
+_pystroke=20121124
+distfiles="http://download.fcitx-im.org/fcitx/fcitx-${version}.tar.xz
+ https://download.fcitx-im.org/data/en_dict-${_en_dict}.tar.gz
+ http://download.fcitx-im.org/data/py_table-${_pytable}.tar.gz
+ http://download.fcitx-im.org/data/py_stroke-${_pystroke}.tar.gz
+ http://download.fcitx-im.org/data/pinyin.tar.gz
+ http://download.fcitx-im.org/data/table.tar.gz
+ "
+checksum="307bddeabbec383eb27c4ea222d9f71d8d9011d7942f4010368e5bc3ca7440a1
+ c44a5d7847925eea9e4d2d04748d442cd28dd9299a0b572ef7d91eac4f5a6ceb
+ 42146ac97de6c13d55f9e99ed873915f4c66739e9c11532a34556badf9792c04
+ 8eb128a9bfa43952e67cf2fcee1fd134c6f4cfd317bc2f6c38a615f5eb64e248
+ 583829b24a758c087c08de4a69480d0bf5946354fe77db360d6d7f467c2bd8e1
+ 6196053c724125e3ae3d8bd6b2f9172d0c83b65b0d410d3cde63b7a8d6ab87b7"
+skip_extraction="
+ en_dict-${_en_dict}.tar.gz
+ py_table-${_pytable}.tar.gz
+ py_stroke-${_pystroke}.tar.gz
+ pinyin.tar.gz
+ table.tar.gz"
lib32disabled=yes
# Warning: do NOT enable backtrace for musl, do NOT add libexecinfo-devel
@@ -34,6 +54,16 @@ fi
build_options="gir"
build_options_default="gir"
+post_extract() {
+ local _src="$XBPS_SRCDISTDIR/fcitx-$version"
+ cp "$_src/en_dict-${_en_dict}.tar.gz" src/module/spell/dict
+ cp "$_src/py_table-${_pytable}.tar.gz" \
+ "$_src/py_stroke-${_pystroke}.tar.gz" \
+ src/module/pinyin-enhance/data
+ cp "$_src/pinyin.tar.gz" src/im/pinyin/data
+ cp "$_src/table.tar.gz" src/im/table/data
+}
+
pre_configure() {
# include FcitxMacro.cmake without invoking fcitx4-config
vsed -i -e 's;INCLUDE(${FCITX4_PREFIX}/share/cmake/fcitx;INCLUDE(${CMAKE_CURRENT_LIST_DIR};' \
From 1f8ae23b7fe26411e4f2cad09dfb7c62f2f4c346 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sun, 28 Aug 2022 00:06:50 +0700
Subject: [PATCH 94/96] fcitx5-gtk: update to 5.0.17.
---
srcpkgs/fcitx5-gtk/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/fcitx5-gtk/template b/srcpkgs/fcitx5-gtk/template
index ddf2910cc696..3e0912f6e211 100644
--- a/srcpkgs/fcitx5-gtk/template
+++ b/srcpkgs/fcitx5-gtk/template
@@ -1,6 +1,6 @@
# Template file for 'fcitx5-gtk'
pkgname=fcitx5-gtk
-version=5.0.16
+version=5.0.17
revision=1
build_style=cmake
build_helper=gir
@@ -14,7 +14,7 @@ maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="LGPL-2.1-or-later"
homepage="https://fcitx-im.org/wiki/Fcitx"
distfiles="https://download.fcitx-im.org/fcitx5/fcitx5-gtk/fcitx5-gtk-${version}.tar.xz"
-checksum=3dd1f941170fffda0bafa75baea84fdbcd2d212c6b1dfd99555915aa033e6de6
+checksum=ec168aca234180d6f93e10ca093a49f5eb61095b181ebe049a76d7d09b2216e2
lib32disabled=yes
build_options="gir"
From 43be38804abdf2fd8373aa40d0a4ceb112745326 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:47 +0700
Subject: [PATCH 95/96] wsjtx: rebuild for boost-1.80
---
srcpkgs/wsjtx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wsjtx/template b/srcpkgs/wsjtx/template
index c1838dd7cf51..7324d85bd64d 100644
--- a/srcpkgs/wsjtx/template
+++ b/srcpkgs/wsjtx/template
@@ -1,7 +1,7 @@
# Template file for 'wsjtx'
pkgname=wsjtx
version=2.5.4
-revision=1
+revision=2
build_wrksrc=wsjtx
build_style=cmake
configure_args="-DRIGCTLCOM_EXE= -DRIGCTL_EXE= -DRIGCTLD_EXE="
From b122b68bd3d75c3fe830d6f97070e9e5ec37c3af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 20 Aug 2022 15:51:41 +0700
Subject: [PATCH 96/96] schroot: update to 1.6.12.
---
srcpkgs/schroot/patches/musl.patch | 1 +
srcpkgs/schroot/patches/schroot-cppunit.patch | 11 -----
srcpkgs/schroot/patches/test-chown.patch | 8 ++++
srcpkgs/schroot/template | 47 ++++++++++++-------
4 files changed, 38 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/schroot/patches/schroot-cppunit.patch
create mode 100644 srcpkgs/schroot/patches/test-chown.patch
diff --git a/srcpkgs/schroot/patches/musl.patch b/srcpkgs/schroot/patches/musl.patch
index e0dcaf3bae01..ff69d554cd9a 100644
--- a/srcpkgs/schroot/patches/musl.patch
+++ b/srcpkgs/schroot/patches/musl.patch
@@ -28,3 +28,4 @@
+#include "sbuild-i18n.h"
using namespace sbuild;
+
diff --git a/srcpkgs/schroot/patches/schroot-cppunit.patch b/srcpkgs/schroot/patches/schroot-cppunit.patch
deleted file mode 100644
index 3e11c73fd40b..000000000000
--- a/srcpkgs/schroot/patches/schroot-cppunit.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac 2017-05-20 09:50:30.146864516 +0000
-+++ b/configure.ac 2017-05-20 09:51:26.216792794 +0000
-@@ -336,7 +336,7 @@
- [HAVE_UUID=yes],
- [HAVE_UUID=no])
-
--AM_PATH_CPPUNIT([1.10.0], [HAVE_CPPUNIT=yes])
-+PKG_CHECK_MODULES([CPPUNIT], [cppunit], [HAVE_CPPUNIT=yes], [HAVE_CPPUNIT=no])
- AM_CONDITIONAL([USE_UNIT_TESTS], [test -n "$HAVE_CPPUNIT"])
-
- SCHROOT_CFLAGS="$UUID_CFLAGS"
diff --git a/srcpkgs/schroot/patches/test-chown.patch b/srcpkgs/schroot/patches/test-chown.patch
new file mode 100644
index 000000000000..c9d4e3919428
--- /dev/null
+++ b/srcpkgs/schroot/patches/test-chown.patch
@@ -0,0 +1,8 @@
+--- a/test/setup-test-data.cmake
++++ b/test/setup-test-data.cmake
+@@ -5,4 +5,4 @@ rm -rf test/testdata
+ mkdir test/testdata
+ cp -r ${PROJECT_SOURCE_DIR}/test/*.ex* test/testdata
+ mkdir test/testdata/run-parts.ex2
+-chown -R root:root test/testdata
++# chown -R root:root test/testdata
diff --git a/srcpkgs/schroot/template b/srcpkgs/schroot/template
index fd9ff15c7140..d73a149920a7 100644
--- a/srcpkgs/schroot/template
+++ b/srcpkgs/schroot/template
@@ -1,21 +1,25 @@
# Template file for 'schroot'
pkgname=schroot
reverts="1.7.2_9"
-version=1.6.10
-revision=12
-_debian_version=12+deb11u1
+version=1.6.12
+revision=1
+_debian_version=2
build_style=cmake
configure_args="
+ -DSCHROOT_LIBEXEC_DIR=/usr/libexec/schroot
+ -Ddebug=OFF
-Ddchroot=ON
-Dlvm-snapshot=ON
-Dbtrfs-snapshot=ON
+ -Dzfs-snapshot=ON
-Dblock-device=ON
-Dloopback=ON
+ -DLOSETUP_EXECUTABLE=/usr/sbin/losetup
-Duuid=ON
- -DBTRFS_EXECUTABLE=/usr/bin/btrfs
+ -DBTRFS_EXECUTABLE=/usr/sbin/btrfs
-DLVCREATE_EXECUTABLE=/usr/sbin/lvcreate
-DLVREMOVE_EXECUTABLE=/usr/sbin/lvremove
- -DZFS_EXECUTABLE=/usr/bin/zfs
+ -DZFS_EXECUTABLE=/usr/sbin/zfs
-Dbash_completion_dir=/usr/share/bash-completion/completions"
conf_files="
/etc/schroot/minimal/nssdatabases
@@ -41,27 +45,34 @@ make_dirs="
/var/lib/schroot/session 0755 root root
/var/lib/schroot/mount 0755 root root
/etc/schroot/chroot.d 0755 root root"
-hostmakedepends="pkg-config libtool gettext xz po4a groff"
-makedepends="boost-devel pam-devel lockdev-devel libuuid-devel e2fsprogs-devel
- gettext-devel libcppunit-devel"
+hostmakedepends="pkg-config gettext xz po4a groff"
+makedepends="boost-devel pam-devel lockdev-devel libuuid-devel
+ e2fsprogs-devel gettext-devel libcppunit-devel"
short_desc="Allows users to execute commands in different chroots"
maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
license="GPL-3.0-only"
homepage="https://wiki.debian.org/Schroot"
-distfiles="
- ${DEBIAN_SITE}/main/s/${pkgname}/${pkgname}_${version}.orig.tar.xz
- http://security.debian.org/debian-security/pool/main/s/${pkgname}/${pkgname}_${version}-${_debian_version}.debian.tar.xz"
-checksum="
- 3ce8dfd9cb97b099e4b6d4ccec421d6cc8c9ef84574681e928a12badb5643d0b
- 7bd4e0c2709979362c86a86c10d2b23d290d26e1a2d301a602e829327f483ec1"
-nocross=yes
+distfiles="${DEBIAN_SITE}/main/s/${pkgname}/${pkgname}_${version}.orig.tar.xz
+ ${DEBIAN_SITE}/main/s/${pkgname}/${pkgname}_${version}-${_debian_version}.debian.tar.xz"
+checksum="0bed8a069856a82261046b2e549af60ee32b79ebcdbf642424f378ec7aea6b77
+ 8ff03534007c6d55eb4032b637232954eaddba5cf18c91b42ff3016697ba0f93"
+skip_extraction="${pkgname}_${version}-${_debian_version}.debian.tar.xz"
-pre_configure() {
- cat ../debian/patches/series | while read p; do
- patch -p1 -i ../debian/patches/$p
+pre_patch() {
+ rm -rf debian
+ bsdtar -xf "$XBPS_SRCDISTDIR/$pkgname-$version/$skip_extraction"
+ grep '^[^#]' debian/patches/series | while read p; do
+ msg_normal "Patching (Debian): $p\n"
+ patch -Np1 -s -F0 -i debian/patches/$p
done
}
+do_check() {
+ # expect to be run with root
+ cd build
+ ctest -E "(sbuild-chroot-config)"
+}
+
post_install() {
# Remove development files
rm -rf ${DESTDIR}/usr/include \
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Updated] [WIP] boost 1.80
2022-08-27 18:49 [PR PATCH] [WIP] boost 1.80 sgn
2022-08-29 2:10 ` [PR PATCH] [Updated] " sgn
@ 2022-08-29 12:49 ` sgn
2022-08-29 15:28 ` sgn
` (5 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: sgn @ 2022-08-29 12:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1236 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages boost-1.80
https://github.com/void-linux/void-packages/pull/38949
[WIP] boost 1.80
<!-- Uncomment relevant sections and delete options which are not applicable -->
[ci skip]
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38949.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boost-1.80-38949.patch --]
[-- Type: text/x-diff, Size: 153435 bytes --]
From 95ffe404eb7a4736a33dda983b2fa7a0be1f20f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 15:21:49 +0700
Subject: [PATCH 001/107] boost: update to 1.80.0.
---
common/shlibs | 65 +++---
.../{boost-python1.72 => boost-python3-1.80} | 0
.../patches/0001-compat-glibc-2.34.patch | 23 --
.../patches/0002-compat-glibc-2.34.patch | 30 ---
srcpkgs/boost/patches/exec_file.patch | 45 ----
.../boost/patches/install-strip-destdir.patch | 27 +++
srcpkgs/boost/patches/mips.patch | 11 -
srcpkgs/boost/template | 196 +++++++++---------
...boost-python3-1.72 => libboost_atomic1.80} | 0
...ibboost_atomic1.72 => libboost_chrono1.80} | 0
...oost_chrono1.72 => libboost_container1.80} | 0
...ost_container1.72 => libboost_context1.80} | 0
...oost_context1.72 => libboost_contract1.80} | 0
...st_contract1.72 => libboost_coroutine1.80} | 0
...t_coroutine1.72 => libboost_date_time1.80} | 0
...boost_date_time1.72 => libboost_fiber1.80} | 0
...oost_fiber1.72 => libboost_filesystem1.80} | 0
...oost_filesystem1.72 => libboost_graph1.80} | 0
...boost_graph1.72 => libboost_iostreams1.80} | 0
...bboost_iostreams1.72 => libboost_json1.80} | 0
...ibboost_locale1.72 => libboost_locale1.80} | 0
.../{libboost_log1.72 => libboost_log1.80} | 0
...t_log_setup1.72 => libboost_log_setup1.80} | 0
...ost_math_c991.72 => libboost_math_c991.80} | 0
...t_math_c99f1.72 => libboost_math_c99f1.80} | 0
...t_math_c99l1.72 => libboost_math_c99l1.80} | 0
...ost_math_tr11.72 => libboost_math_tr11.80} | 0
...t_math_tr1f1.72 => libboost_math_tr1f1.80} | 0
...t_math_tr1l1.72 => libboost_math_tr1l1.80} | 0
...g_exec_monitor1.72 => libboost_nowide1.80} | 0
...ions1.72 => libboost_prg_exec_monitor1.80} | 0
...andom1.72 => libboost_program_options1.80} | 0
...libboost_regex1.72 => libboost_random1.80} | 0
...t_serialization1.72 => libboost_regex1.80} | 0
...dr2line1.72 => libboost_serialization1.80} | 0
...1.72 => libboost_stacktrace_addr2line1.80} | 0
...noop1.72 => libboost_stacktrace_basic1.80} | 0
...ystem1.72 => libboost_stacktrace_noop1.80} | 0
...ibboost_thread1.72 => libboost_system1.80} | 0
...libboost_timer1.72 => libboost_thread1.80} | 0
...st_type_erasure1.72 => libboost_timer1.80} | 0
...ramework1.72 => libboost_type_erasure1.80} | 0
...e1.72 => libboost_unit_test_framework1.80} | 0
...t_wserialization1.72 => libboost_wave1.80} | 0
srcpkgs/libboost_wserialization1.80 | 1 +
45 files changed, 164 insertions(+), 234 deletions(-)
rename srcpkgs/{boost-python1.72 => boost-python3-1.80} (100%)
delete mode 100644 srcpkgs/boost/patches/0001-compat-glibc-2.34.patch
delete mode 100644 srcpkgs/boost/patches/0002-compat-glibc-2.34.patch
delete mode 100644 srcpkgs/boost/patches/exec_file.patch
create mode 100644 srcpkgs/boost/patches/install-strip-destdir.patch
delete mode 100644 srcpkgs/boost/patches/mips.patch
rename srcpkgs/{boost-python3-1.72 => libboost_atomic1.80} (100%)
rename srcpkgs/{libboost_atomic1.72 => libboost_chrono1.80} (100%)
rename srcpkgs/{libboost_chrono1.72 => libboost_container1.80} (100%)
rename srcpkgs/{libboost_container1.72 => libboost_context1.80} (100%)
rename srcpkgs/{libboost_context1.72 => libboost_contract1.80} (100%)
rename srcpkgs/{libboost_contract1.72 => libboost_coroutine1.80} (100%)
rename srcpkgs/{libboost_coroutine1.72 => libboost_date_time1.80} (100%)
rename srcpkgs/{libboost_date_time1.72 => libboost_fiber1.80} (100%)
rename srcpkgs/{libboost_fiber1.72 => libboost_filesystem1.80} (100%)
rename srcpkgs/{libboost_filesystem1.72 => libboost_graph1.80} (100%)
rename srcpkgs/{libboost_graph1.72 => libboost_iostreams1.80} (100%)
rename srcpkgs/{libboost_iostreams1.72 => libboost_json1.80} (100%)
rename srcpkgs/{libboost_locale1.72 => libboost_locale1.80} (100%)
rename srcpkgs/{libboost_log1.72 => libboost_log1.80} (100%)
rename srcpkgs/{libboost_log_setup1.72 => libboost_log_setup1.80} (100%)
rename srcpkgs/{libboost_math_c991.72 => libboost_math_c991.80} (100%)
rename srcpkgs/{libboost_math_c99f1.72 => libboost_math_c99f1.80} (100%)
rename srcpkgs/{libboost_math_c99l1.72 => libboost_math_c99l1.80} (100%)
rename srcpkgs/{libboost_math_tr11.72 => libboost_math_tr11.80} (100%)
rename srcpkgs/{libboost_math_tr1f1.72 => libboost_math_tr1f1.80} (100%)
rename srcpkgs/{libboost_math_tr1l1.72 => libboost_math_tr1l1.80} (100%)
rename srcpkgs/{libboost_prg_exec_monitor1.72 => libboost_nowide1.80} (100%)
rename srcpkgs/{libboost_program_options1.72 => libboost_prg_exec_monitor1.80} (100%)
rename srcpkgs/{libboost_random1.72 => libboost_program_options1.80} (100%)
rename srcpkgs/{libboost_regex1.72 => libboost_random1.80} (100%)
rename srcpkgs/{libboost_serialization1.72 => libboost_regex1.80} (100%)
rename srcpkgs/{libboost_stacktrace_addr2line1.72 => libboost_serialization1.80} (100%)
rename srcpkgs/{libboost_stacktrace_basic1.72 => libboost_stacktrace_addr2line1.80} (100%)
rename srcpkgs/{libboost_stacktrace_noop1.72 => libboost_stacktrace_basic1.80} (100%)
rename srcpkgs/{libboost_system1.72 => libboost_stacktrace_noop1.80} (100%)
rename srcpkgs/{libboost_thread1.72 => libboost_system1.80} (100%)
rename srcpkgs/{libboost_timer1.72 => libboost_thread1.80} (100%)
rename srcpkgs/{libboost_type_erasure1.72 => libboost_timer1.80} (100%)
rename srcpkgs/{libboost_unit_test_framework1.72 => libboost_type_erasure1.80} (100%)
rename srcpkgs/{libboost_wave1.72 => libboost_unit_test_framework1.80} (100%)
rename srcpkgs/{libboost_wserialization1.72 => libboost_wave1.80} (100%)
create mode 120000 srcpkgs/libboost_wserialization1.80
diff --git a/common/shlibs b/common/shlibs
index 48c63f2d0735..b91133da6484 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -620,38 +620,39 @@ libip4tc.so.2 iptables-1.8.3_1
libipq.so.0 iptables-1.4.7_1
libnm.so.0 libnm-1.0.0_1
libKF5ItemModels.so.5 kitemmodels-5.26.0_1
-libboost_context.so.1.72.0 libboost_context1.72-1.72.0_1
-libboost_coroutine.so.1.72.0 libboost_coroutine1.72-1.72.0_1
-libboost_container.so.1.72.0 libboost_container1.72-1.72.0_1
-libboost_prg_exec_monitor.so.1.72.0 libboost_prg_exec_monitor1.72-1.72.0_1
-libboost_timer.so.1.72.0 libboost_timer1.72-1.72.0_1
-libboost_random.so.1.72.0 libboost_random1.72-1.72.0_1
-libboost_filesystem.so.1.72.0 libboost_filesystem1.72-1.72.0_1
-libboost_unit_test_framework.so.1.72.0 libboost_unit_test_framework1.72-1.72.0_1
-libboost_math_c99.so.1.72.0 libboost_math_c991.72-1.72.0_1
-libboost_math_tr1.so.1.72.0 libboost_math_tr11.72-1.72.0_1
-libboost_regex.so.1.72.0 libboost_regex1.72-1.72.0_1
-libboost_serialization.so.1.72.0 libboost_serialization1.72-1.72.0_1
-libboost_chrono.so.1.72.0 libboost_chrono1.72-1.72.0_1
-libboost_wserialization.so.1.72.0 libboost_wserialization1.72-1.72.0_1
-libboost_graph.so.1.72.0 libboost_graph1.72-1.72.0_1
-libboost_log.so.1.72.0 libboost_log1.72-1.72.0_1
-libboost_locale.so.1.72.0 libboost_locale1.72-1.72.0_1
-libboost_program_options.so.1.72.0 libboost_program_options1.72-1.72.0_1
-libboost_iostreams.so.1.72.0 libboost_iostreams1.72-1.72.0_1
-libboost_system.so.1.72.0 libboost_system1.72-1.72.0_1
-libboost_thread.so.1.72.0 libboost_thread1.72-1.72.0_1
-libboost_log_setup.so.1.72.0 libboost_log_setup1.72-1.72.0_1
-libboost_date_time.so.1.72.0 libboost_date_time1.72-1.72.0_1
-libboost_wave.so.1.72.0 libboost_wave1.72-1.72.0_1
-libboost_atomic.so.1.72.0 libboost_atomic1.72-1.72.0_1
-libboost_type_erasure.so.1.72.0 libboost_type_erasure1.72-1.72.0_1
-libboost_fiber.so.1.72.0 libboost_fiber1.72-1.72.0_1
-libboost_stacktrace_noop.so.1.72.0 libboost_stacktrace_noop1.72-1.72.0_1
-libboost_stacktrace_addr2line.so.1.72.0 libboost_stacktrace_addr2line1.72-1.72.0_1
-libboost_stacktrace_basic.so.1.72.0 libboost_stacktrace_basic1.72-1.72.0_1
-libboost_python27.so.1.72.0 boost-python1.72-1.72.0_1
-libboost_python310.so.1.72.0 boost-python3-1.72-1.72.0_6
+libboost_context.so.1.80.0 libboost_context1.80-1.80.0_1
+libboost_coroutine.so.1.80.0 libboost_coroutine1.80-1.80.0_1
+libboost_container.so.1.80.0 libboost_container1.80-1.80.0_1
+libboost_prg_exec_monitor.so.1.80.0 libboost_prg_exec_monitor1.80-1.80.0_1
+libboost_timer.so.1.80.0 libboost_timer1.80-1.80.0_1
+libboost_random.so.1.80.0 libboost_random1.80-1.80.0_1
+libboost_filesystem.so.1.80.0 libboost_filesystem1.80-1.80.0_1
+libboost_unit_test_framework.so.1.80.0 libboost_unit_test_framework1.80-1.80.0_1
+libboost_math_c99.so.1.80.0 libboost_math_c991.80-1.80.0_1
+libboost_math_tr1.so.1.80.0 libboost_math_tr11.80-1.80.0_1
+libboost_nowide.so.1.80.0 libboost_nowide1.80-1.80.0_1
+libboost_json.so.1.80.0 libboost_json1.80-1.80.0_1
+libboost_regex.so.1.80.0 libboost_regex1.80-1.80.0_1
+libboost_serialization.so.1.80.0 libboost_serialization1.80-1.80.0_1
+libboost_chrono.so.1.80.0 libboost_chrono1.80-1.80.0_1
+libboost_wserialization.so.1.80.0 libboost_wserialization1.80-1.80.0_1
+libboost_graph.so.1.80.0 libboost_graph1.80-1.80.0_1
+libboost_log.so.1.80.0 libboost_log1.80-1.80.0_1
+libboost_locale.so.1.80.0 libboost_locale1.80-1.80.0_1
+libboost_program_options.so.1.80.0 libboost_program_options1.80-1.80.0_1
+libboost_iostreams.so.1.80.0 libboost_iostreams1.80-1.80.0_1
+libboost_system.so.1.80.0 libboost_system1.80-1.80.0_1
+libboost_thread.so.1.80.0 libboost_thread1.80-1.80.0_1
+libboost_log_setup.so.1.80.0 libboost_log_setup1.80-1.80.0_1
+libboost_date_time.so.1.80.0 libboost_date_time1.80-1.80.0_1
+libboost_wave.so.1.80.0 libboost_wave1.80-1.80.0_1
+libboost_atomic.so.1.80.0 libboost_atomic1.80-1.80.0_1
+libboost_type_erasure.so.1.80.0 libboost_type_erasure1.80-1.80.0_1
+libboost_fiber.so.1.80.0 libboost_fiber1.80-1.80.0_1
+libboost_stacktrace_noop.so.1.80.0 libboost_stacktrace_noop1.80-1.80.0_1
+libboost_stacktrace_addr2line.so.1.80.0 libboost_stacktrace_addr2line1.80-1.80.0_1
+libboost_stacktrace_basic.so.1.80.0 libboost_stacktrace_basic1.80-1.80.0_1
+libboost_python310.so.1.80.0 boost-python3-1.80-1.80.0_6
libexempi.so.8 exempi-2.5.0_1
libatasmart.so.4 libatasmart-0.17_1
libsgutils2-1.45.so.2 libsgutils-1.45_1
diff --git a/srcpkgs/boost-python1.72 b/srcpkgs/boost-python3-1.80
similarity index 100%
rename from srcpkgs/boost-python1.72
rename to srcpkgs/boost-python3-1.80
diff --git a/srcpkgs/boost/patches/0001-compat-glibc-2.34.patch b/srcpkgs/boost/patches/0001-compat-glibc-2.34.patch
deleted file mode 100644
index e1e5711e59f2..000000000000
--- a/srcpkgs/boost/patches/0001-compat-glibc-2.34.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 74fb0a26099bc51d717f5f154b37231ce7df3e98 Mon Sep 17 00:00:00 2001
-From: Rob Boehne <robb@datalogics.com>
-Date: Wed, 20 Nov 2019 11:25:20 -0600
-Subject: [PATCH] Revert change to elide a warning that caused Solaris builds
- to fail.
-
----
- include/boost/thread/pthread/thread_data.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/boost/thread/pthread/thread_data.hpp b/include/boost/thread/pthread/thread_data.hpp
-index aefbeb43c..bc9b1367a 100644
---- a/boost/thread/pthread/thread_data.hpp
-+++ b/boost/thread/pthread/thread_data.hpp
-@@ -57,7 +57,7 @@ namespace boost
- #else
- std::size_t page_size = ::sysconf( _SC_PAGESIZE);
- #endif
--#if PTHREAD_STACK_MIN > 0
-+#ifdef PTHREAD_STACK_MIN
- if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
- #endif
- size = ((size+page_size-1)/page_size)*page_size;
diff --git a/srcpkgs/boost/patches/0002-compat-glibc-2.34.patch b/srcpkgs/boost/patches/0002-compat-glibc-2.34.patch
deleted file mode 100644
index baf7c517f8b4..000000000000
--- a/srcpkgs/boost/patches/0002-compat-glibc-2.34.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f9d0e594d43afcb4ab0043117249feb266ba4515 Mon Sep 17 00:00:00 2001
-From: Romain Geissler <romain.geissler@amadeus.com>
-Date: Tue, 10 Aug 2021 14:22:28 +0000
-Subject: [PATCH] Fix -Wsign-compare warning with glibc 2.34 on Linux
- platforms.
-
-In file included from /data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/thread_only.hpp:17,
- from /data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/thread.hpp:12,
- from src/GetTest.cpp:12:
-/data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/pthread/thread_data.hpp: In member function 'void boost::thread_attributes::set_stack_size(std::size_t)':
-/data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/pthread/thread_data.hpp:61:19: error: comparison of integer expressions of different signedness: 'std::size_t' {aka 'long unsigned int'} and 'long int' [-Werror=sign-compare]
- 61 | if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
- | ^
----
- include/boost/thread/pthread/thread_data.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/boost/thread/pthread/thread_data.hpp b/include/boost/thread/pthread/thread_data.hpp
-index bc9b1367a..c43b276d1 100644
---- a/boost/thread/pthread/thread_data.hpp
-+++ b/boost/thread/pthread/thread_data.hpp
-@@ -58,7 +58,7 @@ namespace boost
- std::size_t page_size = ::sysconf( _SC_PAGESIZE);
- #endif
- #ifdef PTHREAD_STACK_MIN
-- if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
-+ if (size<static_cast<std::size_t>(PTHREAD_STACK_MIN)) size=PTHREAD_STACK_MIN;
- #endif
- size = ((size+page_size-1)/page_size)*page_size;
- int res = pthread_attr_setstacksize(&val_, size);
diff --git a/srcpkgs/boost/patches/exec_file.patch b/srcpkgs/boost/patches/exec_file.patch
deleted file mode 100644
index b1b0ef969c4d..000000000000
--- a/srcpkgs/boost/patches/exec_file.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From d9f06052e28873037db7f98629bce72182a42410 Mon Sep 17 00:00:00 2001
-From: Pat Riehecky <riehecky@fnal.gov>
-Date: Mon, 29 Jun 2020 10:51:58 -0500
-Subject: [PATCH] Convert Python 3.1+ to use public C API for filenames
-
- [
- Ed.: Paths were adapted from upstream commit
- https://github.com/boostorg/python/commit/d9f06052e28873037db7f98629bce72182a42410
- ]
-
----
- src/exec.cpp | 16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/libs/python/src/exec.cpp b/libs/python/src/exec.cpp
-index 171c6f4189..b2eabe59f6 100644
---- a/libs/python/src/exec.cpp
-+++ b/libs/python/src/exec.cpp
-@@ -104,14 +104,22 @@ object BOOST_PYTHON_DECL exec_file(char const *filename, object global, object l
- if (local.is_none()) local = global;
- // should be 'char const *' but older python versions don't use 'const' yet.
- char *f = const_cast<char *>(filename);
-- // Let python open the file to avoid potential binary incompatibilities.
--#if PY_VERSION_HEX >= 0x03040000
-- FILE *fs = _Py_fopen(f, "r");
-+#if PY_VERSION_HEX >= 0x03010000
-+ // Let python manage any UTF bits to avoid potential incompatibilities.
-+ PyObject *fo = Py_BuildValue("s", f);
-+ PyObject *fb = Py_None;
-+ PyUnicode_FSConverter(fo, &fb);
-+ f = PyBytes_AsString(fb);
-+ FILE *fs = fopen(f, "r");
-+ Py_DECREF(fo);
-+ Py_DECREF(fb);
- #elif PY_VERSION_HEX >= 0x03000000
-+ // Let python open the file to avoid potential binary incompatibilities.
- PyObject *fo = Py_BuildValue("s", f);
-- FILE *fs = _Py_fopen(fo, "r");
-+ FILE *fs = _Py_fopen(fo, "r"); // Private CPython API
- Py_DECREF(fo);
- #else
-+ // Let python open the file to avoid potential binary incompatibilities.
- PyObject *pyfile = PyFile_FromString(f, const_cast<char*>("r"));
- if (!pyfile) throw std::invalid_argument(std::string(f) + " : no such file");
- python::handle<> file(pyfile);
diff --git a/srcpkgs/boost/patches/install-strip-destdir.patch b/srcpkgs/boost/patches/install-strip-destdir.patch
new file mode 100644
index 000000000000..61047c5967b1
--- /dev/null
+++ b/srcpkgs/boost/patches/install-strip-destdir.patch
@@ -0,0 +1,27 @@
+--- a/tools/boost_install/boost-install.jam
++++ b/tools/boost_install/boost-install.jam
+@@ -678,6 +678,16 @@ local rule path-native-fwd ( path )
+ return $(path) ;
+ }
+
++local rule path-strip-destdir ( path )
++{
++ local parts = [ MATCH "^(/destdir(/[^/]+)?/boost-[0-9.]+)(/.*)" : $(path) ] ;
++ if $(parts)
++ {
++ path = $(parts[3]) ;
++ }
++ return $(path) ;
++}
++
+ local rule get-dir ( name : dir )
+ {
+ if [ path.is-rooted $(dir) ]
+@@ -756,6 +766,7 @@ rule generate-cmake-config- ( target : s
+ if [ path.is-rooted $(cmakedir) ]
+ {
+ local cmakedir-native = [ path-native-fwd $(cmakedir) ] ;
++ cmakedir-native = [ path-strip-destdir $(cmakedir-native) ] ;
+
+ print.text
+
diff --git a/srcpkgs/boost/patches/mips.patch b/srcpkgs/boost/patches/mips.patch
deleted file mode 100644
index a10a2122d9c7..000000000000
--- a/srcpkgs/boost/patches/mips.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/boost/fiber/detail/cpu_relax.hpp 2017-09-02 11:56:11.000000000 +0200
-+++ b/boost/fiber/detail/cpu_relax.hpp 2017-11-09 17:25:40.258995963 +0100
-@@ -48,7 +48,7 @@
- # define cpu_relax() asm volatile ("nop" ::: "memory");
- # endif
- #elif BOOST_ARCH_MIPS
--# define cpu_relax() asm volatile ("pause" ::: "memory");
-+# define cpu_relax() asm volatile ("nop" ::: "memory");
- #elif BOOST_ARCH_PPC
- // http://code.metager.de/source/xref/gnu/glibc/sysdeps/powerpc/sys/platform/ppc.h
- // http://stackoverflow.com/questions/5425506/equivalent-of-x86-pause-instruction-for-ppc
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index f0c5afcec9e8..0d103e335b52 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,53 +1,52 @@
# Template file for 'boost'
pkgname=boost
-version=1.72.0
-revision=9
+version=1.80.0
+revision=1
wrksrc="${pkgname}_${version//\./_}"
-hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
-makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
+hostmakedepends="which bzip2-devel icu-devel python3-devel pkg-config"
+makedepends="zlib-devel bzip2-devel icu-devel python3-devel liblzma-devel
+ libzstd-devel"
short_desc="Free peer-reviewed portable C++ source libraries"
maintainer="John <me@johnnynator.dev>"
license="BSL-1.0"
homepage="http://www.boost.org/"
distfiles="https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${version//./_}.tar.bz2"
-checksum=59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722
+checksum=1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0
python_version=3
-CXXFLAGS="-std=c++14"
-
-replaces="libboost_program_options1.69>=0 libboost_math_c99f1.69>=0
- libboost_stacktrace_basic1.69>=0 libboost_stacktrace_noop1.69>=0
- libboost_iostreams1.69>=0 libboost_math_tr1l1.69>=0 libboost_filesystem1.69>=0
- libboost_chrono1.69>=0 libboost_math_tr1f1.69>=0 libboost_wave1.69>=0
- libboost_graph1.69>=0 libboost_locale1.69>=0 libboost_regex1.69>=0
- libboost_fiber1.69>=0 libboost_type_erasure1.69>=0 libboost_coroutine1.69>=0
- libboost_atomic1.69>=0 libboost_prg_exec_monitor1.69>=0 libboost_math_c991.69>=0
- boost-python3-1.69>=0 libboost_log_setup1.69>=0 boost1.69>=0-devel
- libboost_timer1.69>=0 libboost_system1.69>=0 libboost_unit_test_framework1.69>=0
- libboost_serialization1.69>=0 libboost_math_tr11.69>=0 boost1.69>=0-build
- libboost_math_c99l1.69>=0 boost-python1.69>=0 libboost_contract1.69>=0
- libboost_date_time1.69>=0 libboost_log1.69>=0 libboost_random1.69>=0
- libboost_thread1.69>=0 libboost_container1.69>=0 boost1.69>=0-jam
- libboost_wserialization1.69>=0 libboost_context1.69>=0
- libboost_stacktrace_addr2line1.69>=0"
-
-subpackages="libboost_program_options1.72 libboost_math_c99f1.72
- libboost_stacktrace_basic1.72 libboost_stacktrace_noop1.72
- libboost_iostreams1.72 libboost_math_tr1l1.72 libboost_filesystem1.72
- libboost_chrono1.72 libboost_math_tr1f1.72 libboost_wave1.72
- libboost_graph1.72 libboost_locale1.72 libboost_regex1.72
- libboost_fiber1.72 libboost_type_erasure1.72 libboost_coroutine1.72
- libboost_atomic1.72 libboost_prg_exec_monitor1.72 libboost_math_c991.72
- boost-python3-1.72 libboost_log_setup1.72 boost-devel
- libboost_timer1.72 libboost_system1.72 libboost_unit_test_framework1.72
- libboost_serialization1.72 libboost_math_tr11.72 boost-build
- libboost_math_c99l1.72 boost-python1.72 libboost_contract1.72
- libboost_date_time1.72 libboost_log1.72 libboost_random1.72
- libboost_thread1.72 libboost_container1.72 boost-jam
- libboost_wserialization1.72 libboost_context1.72"
+replaces="libboost_program_options1.72>=0 libboost_math_c99f1.72>=0
+ libboost_stacktrace_basic1.72>=0 libboost_stacktrace_noop1.72>=0
+ libboost_iostreams1.72>=0 libboost_math_tr1l1.72>=0 libboost_filesystem1.72>=0
+ libboost_chrono1.72>=0 libboost_math_tr1f1.72>=0 libboost_wave1.72>=0
+ libboost_graph1.72>=0 libboost_locale1.72>=0 libboost_regex1.72>=0
+ libboost_fiber1.72>=0 libboost_type_erasure1.72>=0 libboost_coroutine1.72>=0
+ libboost_atomic1.72>=0 libboost_prg_exec_monitor1.72>=0 libboost_math_c991.72>=0
+ boost-python3-1.72>=0 libboost_log_setup1.72>=0
+ libboost_timer1.72>=0 libboost_system1.72>=0 libboost_unit_test_framework1.72>=0
+ libboost_serialization1.72>=0 libboost_math_tr11.72>=0
+ libboost_math_c99l1.72>=0 boost-python1.72>=0 libboost_contract1.72>=0
+ libboost_date_time1.72>=0 libboost_log1.72>=0 libboost_random1.72>=0
+ libboost_thread1.72>=0 libboost_container1.72>=0
+ libboost_wserialization1.72>=0 libboost_context1.72>=0
+ libboost_stacktrace_addr2line1.72>=0"
+
+subpackages="libboost_program_options1.80 libboost_math_c99f1.80
+ libboost_stacktrace_basic1.80 libboost_stacktrace_noop1.80
+ libboost_iostreams1.80 libboost_math_tr1l1.80 libboost_filesystem1.80
+ libboost_chrono1.80 libboost_math_tr1f1.80 libboost_wave1.80
+ libboost_graph1.80 libboost_locale1.80 libboost_regex1.80
+ libboost_fiber1.80 libboost_type_erasure1.80 libboost_coroutine1.80
+ libboost_atomic1.80 libboost_prg_exec_monitor1.80 libboost_math_c991.80
+ boost-python3-1.80 libboost_log_setup1.80 boost-devel libboost_json1.80
+ libboost_timer1.80 libboost_system1.80 libboost_unit_test_framework1.80
+ libboost_serialization1.80 libboost_math_tr11.80 boost-build
+ libboost_math_c99l1.80 libboost_contract1.80 libboost_nowide1.80
+ libboost_date_time1.80 libboost_log1.80 libboost_random1.80
+ libboost_thread1.80 libboost_container1.80 boost-jam
+ libboost_wserialization1.80 libboost_context1.80"
if [ -z "$CROSS_BUILD" ]; then
- subpackages+=" libboost_stacktrace_addr2line1.72"
+ subpackages+=" libboost_stacktrace_addr2line1.80"
fi
case "$XBPS_TARGET_MACHINE" in
@@ -60,38 +59,40 @@ case "$XBPS_TARGET_MACHINE" in
esac
do_build() {
- CXX=${BUILD_CXX} CXXFLAGS=${BUILD_CXXFLAGS} ./bootstrap.sh \
- --prefix=${DESTDIR}/usr --with-python=${XBPS_CROSS_BASE}/usr/bin/python3 \
+ # bootstrap.sh will reset CXX and CXXFLAGS (L229)
+ ./bootstrap.sh --with-toolset=gcc \
+ --prefix=${DESTDIR}/usr --with-python=/usr/bin/python3 \
--with-python-root=${XBPS_CROSS_BASE}/usr
(
# Rebuild bjam for target
cd tools/build/src/engine
- ./build.sh gcc
+ CXXFLAGS="$CXXFLAGS -fdebug-prefix-map=$PWD=."
+ # toolset gcc will force gcc -x c++ -O2 -s
+ # toolset cxx will use CXX and CXXFLAGS
+ CXX_VERSION_OPT=--version ./build.sh cxx
)
cat > user-config.jam <<-__EOF
using gcc : : ${CXX} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
- using python : 2.7 : ${XBPS_CROSS_BASE}/usr/bin/python2 : ${XBPS_CROSS_BASE}/usr/include/python2.7 : ${XBPS_CROSS_BASE}/usr/lib/python2.7 ;
- using python : ${py3_ver} : ${XBPS_CROSS_BASE}/usr/bin/python3 : ${XBPS_CROSS_BASE}/${py3_inc} : ${XBPS_CROSS_BASE}/${py3_lib} ;
+ using python : ${py3_ver} : /usr/bin/python3 : ${XBPS_CROSS_BASE}/${py3_inc} : ${XBPS_CROSS_BASE}/${py3_lib} ;
__EOF
- # --no-cmake-config should be removed with boost-1.71 or later
./b2 ${makejobs} \
--user-config=${wrksrc}/user-config.jam --debug-building \
- --no-cmake-config \
- --toolset=gcc abi=${_abi} architecture=${_arch} python=2.7,${py3_ver} \
+ --toolset=gcc abi=${_abi} architecture=${_arch} python=${py3_ver} \
threading=multi runtime-link=shared link=shared,static
}
do_install() {
# Install bjam
# XXX: make bjam a symlink to b2
- for _b in bjam b2; do
+ for _b in b2; do
vbin tools/build/src/engine/${_b}
done
+ ln -sf b2 "$DESTDIR/usr/bin/bjam"
# Install headers/libs
./b2 --prefix=${DESTDIR}/usr abi=${_abi} architecture=${_arch} \
- --user-config=${wrksrc}/user-config.jam --no-cmake-config \
- python=2.7,${py3_ver} threading=multi runtime-link=shared link=shared,static \
+ --user-config=${wrksrc}/user-config.jam \
+ python=${py3_ver} threading=multi runtime-link=shared link=shared,static \
install
# Install Boost.Build stuff.
@@ -119,15 +120,7 @@ boost-jam_package() {
vmove usr/bin/b2
}
}
-boost-python1.72_package() {
- depends="boost python"
- replaces="boost-python>=0"
- short_desc+=" - Python bindings"
- pkg_install() {
- vmove "usr/lib/libboost_python2*.so.*"
- }
-}
-boost-python3-1.72_package() {
+boost-python3-1.80_package() {
depends="boost python3"
replaces="boost-python3>=0"
short_desc+=" - Python3 bindings"
@@ -149,12 +142,13 @@ boost-devel_package() {
short_desc+=" - development files"
pkg_install() {
vmove usr/include
+ vmove usr/lib/cmake
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
}
}
-libboost_atomic1.72_package() {
+libboost_atomic1.80_package() {
depends="boost"
short_desc+=" - libboost_atomic"
pkg_install() {
@@ -162,7 +156,7 @@ libboost_atomic1.72_package() {
}
}
-libboost_chrono1.72_package() {
+libboost_chrono1.80_package() {
depends="boost"
short_desc+=" - libboost_chrono"
pkg_install() {
@@ -170,7 +164,7 @@ libboost_chrono1.72_package() {
}
}
-libboost_container1.72_package() {
+libboost_container1.80_package() {
depends="boost"
short_desc+=" - libboost_container"
pkg_install() {
@@ -178,7 +172,7 @@ libboost_container1.72_package() {
}
}
-libboost_context1.72_package() {
+libboost_context1.80_package() {
depends="boost"
short_desc+=" - libboost_context"
pkg_install() {
@@ -186,7 +180,7 @@ libboost_context1.72_package() {
}
}
-libboost_contract1.72_package() {
+libboost_contract1.80_package() {
depends="boost"
short_desc+=" - libboost_contract"
pkg_install() {
@@ -194,7 +188,7 @@ libboost_contract1.72_package() {
}
}
-libboost_coroutine1.72_package() {
+libboost_coroutine1.80_package() {
depends="boost"
short_desc+=" - libboost_coroutine"
pkg_install() {
@@ -202,7 +196,7 @@ libboost_coroutine1.72_package() {
}
}
-libboost_date_time1.72_package() {
+libboost_date_time1.80_package() {
depends="boost"
short_desc+=" - libboost_date_time"
pkg_install() {
@@ -210,7 +204,7 @@ libboost_date_time1.72_package() {
}
}
-libboost_fiber1.72_package() {
+libboost_fiber1.80_package() {
depends="boost"
short_desc+=" - libboost_fiber"
pkg_install() {
@@ -218,7 +212,7 @@ libboost_fiber1.72_package() {
}
}
-libboost_filesystem1.72_package() {
+libboost_filesystem1.80_package() {
depends="boost"
short_desc+=" - libboost_filesystem"
pkg_install() {
@@ -226,7 +220,7 @@ libboost_filesystem1.72_package() {
}
}
-libboost_graph1.72_package() {
+libboost_graph1.80_package() {
depends="boost"
short_desc+=" - libboost_graph"
pkg_install() {
@@ -234,7 +228,7 @@ libboost_graph1.72_package() {
}
}
-libboost_iostreams1.72_package() {
+libboost_iostreams1.80_package() {
depends="boost"
short_desc+=" - libboost_iostreams"
pkg_install() {
@@ -242,7 +236,7 @@ libboost_iostreams1.72_package() {
}
}
-libboost_locale1.72_package() {
+libboost_locale1.80_package() {
depends="boost"
short_desc+=" - libboost_locale"
pkg_install() {
@@ -250,7 +244,7 @@ libboost_locale1.72_package() {
}
}
-libboost_log1.72_package() {
+libboost_log1.80_package() {
depends="boost"
short_desc+=" - libboost_log"
pkg_install() {
@@ -258,7 +252,7 @@ libboost_log1.72_package() {
}
}
-libboost_log_setup1.72_package() {
+libboost_log_setup1.80_package() {
depends="boost"
short_desc+=" - libboost_log_setup"
pkg_install() {
@@ -266,7 +260,7 @@ libboost_log_setup1.72_package() {
}
}
-libboost_math_c991.72_package() {
+libboost_math_c991.80_package() {
depends="boost"
short_desc+=" - libboost_math_c99"
pkg_install() {
@@ -274,7 +268,7 @@ libboost_math_c991.72_package() {
}
}
-libboost_math_c99f1.72_package() {
+libboost_math_c99f1.80_package() {
depends="boost"
short_desc+=" - libboost_math_c99f"
pkg_install() {
@@ -282,7 +276,7 @@ libboost_math_c99f1.72_package() {
}
}
-libboost_math_c99l1.72_package() {
+libboost_math_c99l1.80_package() {
depends="boost"
short_desc+=" - libboost_math_c99l"
pkg_install() {
@@ -290,7 +284,15 @@ libboost_math_c99l1.72_package() {
}
}
-libboost_math_tr11.72_package() {
+libboost_json1.80_package() {
+ depends="boost"
+ short_desc+=" - libboost_json"
+ pkg_install() {
+ vmove usr/lib/libboost_json.so.*
+ }
+}
+
+libboost_math_tr11.80_package() {
depends="boost"
short_desc+=" - libboost_math_tr1"
pkg_install() {
@@ -298,7 +300,7 @@ libboost_math_tr11.72_package() {
}
}
-libboost_math_tr1f1.72_package() {
+libboost_math_tr1f1.80_package() {
depends="boost"
short_desc+=" - libboost_math_tr1f"
pkg_install() {
@@ -306,7 +308,7 @@ libboost_math_tr1f1.72_package() {
}
}
-libboost_math_tr1l1.72_package() {
+libboost_math_tr1l1.80_package() {
depends="boost"
short_desc+=" - libboost_math_tr1l"
pkg_install() {
@@ -314,7 +316,15 @@ libboost_math_tr1l1.72_package() {
}
}
-libboost_prg_exec_monitor1.72_package() {
+libboost_nowide1.80_package() {
+ depends="boost"
+ short_desc+=" - libboost_nowide"
+ pkg_install() {
+ vmove usr/lib/libboost_nowide.so.*
+ }
+}
+
+libboost_prg_exec_monitor1.80_package() {
depends="boost"
short_desc+=" - libboost_prg_exec_monitor"
pkg_install() {
@@ -322,7 +332,7 @@ libboost_prg_exec_monitor1.72_package() {
}
}
-libboost_program_options1.72_package() {
+libboost_program_options1.80_package() {
depends="boost"
short_desc+=" - libboost_program_options"
pkg_install() {
@@ -330,7 +340,7 @@ libboost_program_options1.72_package() {
}
}
-libboost_random1.72_package() {
+libboost_random1.80_package() {
depends="boost"
short_desc+=" - libboost_random"
pkg_install() {
@@ -338,7 +348,7 @@ libboost_random1.72_package() {
}
}
-libboost_regex1.72_package() {
+libboost_regex1.80_package() {
depends="boost"
short_desc+=" - libboost_regex"
pkg_install() {
@@ -346,7 +356,7 @@ libboost_regex1.72_package() {
}
}
-libboost_serialization1.72_package() {
+libboost_serialization1.80_package() {
depends="boost"
short_desc+=" - libboost_serialization"
pkg_install() {
@@ -354,7 +364,7 @@ libboost_serialization1.72_package() {
}
}
-libboost_stacktrace_addr2line1.72_package() {
+libboost_stacktrace_addr2line1.80_package() {
depends="boost"
short_desc+=" - libboost_stacktrace_addr2line"
pkg_install() {
@@ -362,7 +372,7 @@ libboost_stacktrace_addr2line1.72_package() {
}
}
-libboost_stacktrace_basic1.72_package() {
+libboost_stacktrace_basic1.80_package() {
depends="boost"
short_desc+=" - libboost_stacktrace_basic"
pkg_install() {
@@ -370,7 +380,7 @@ libboost_stacktrace_basic1.72_package() {
}
}
-libboost_stacktrace_noop1.72_package() {
+libboost_stacktrace_noop1.80_package() {
depends="boost"
short_desc+=" - libboost_stacktrace_noop"
pkg_install() {
@@ -378,7 +388,7 @@ libboost_stacktrace_noop1.72_package() {
}
}
-libboost_system1.72_package() {
+libboost_system1.80_package() {
depends="boost"
short_desc+=" - libboost_system"
pkg_install() {
@@ -386,7 +396,7 @@ libboost_system1.72_package() {
}
}
-libboost_thread1.72_package() {
+libboost_thread1.80_package() {
depends="boost"
short_desc+=" - libboost_thread"
pkg_install() {
@@ -394,7 +404,7 @@ libboost_thread1.72_package() {
}
}
-libboost_timer1.72_package() {
+libboost_timer1.80_package() {
depends="boost"
short_desc+=" - libboost_timer"
pkg_install() {
@@ -402,7 +412,7 @@ libboost_timer1.72_package() {
}
}
-libboost_type_erasure1.72_package() {
+libboost_type_erasure1.80_package() {
depends="boost"
short_desc+=" - libboost_type_erasure"
pkg_install() {
@@ -410,7 +420,7 @@ libboost_type_erasure1.72_package() {
}
}
-libboost_unit_test_framework1.72_package() {
+libboost_unit_test_framework1.80_package() {
depends="boost"
short_desc+=" - libboost_unit_test_framework"
pkg_install() {
@@ -418,7 +428,7 @@ libboost_unit_test_framework1.72_package() {
}
}
-libboost_wave1.72_package() {
+libboost_wave1.80_package() {
depends="boost"
short_desc+=" - libboost_wave"
pkg_install() {
@@ -426,7 +436,7 @@ libboost_wave1.72_package() {
}
}
-libboost_wserialization1.72_package() {
+libboost_wserialization1.80_package() {
depends="boost"
short_desc+=" - libboost_wserialization"
pkg_install() {
diff --git a/srcpkgs/boost-python3-1.72 b/srcpkgs/libboost_atomic1.80
similarity index 100%
rename from srcpkgs/boost-python3-1.72
rename to srcpkgs/libboost_atomic1.80
diff --git a/srcpkgs/libboost_atomic1.72 b/srcpkgs/libboost_chrono1.80
similarity index 100%
rename from srcpkgs/libboost_atomic1.72
rename to srcpkgs/libboost_chrono1.80
diff --git a/srcpkgs/libboost_chrono1.72 b/srcpkgs/libboost_container1.80
similarity index 100%
rename from srcpkgs/libboost_chrono1.72
rename to srcpkgs/libboost_container1.80
diff --git a/srcpkgs/libboost_container1.72 b/srcpkgs/libboost_context1.80
similarity index 100%
rename from srcpkgs/libboost_container1.72
rename to srcpkgs/libboost_context1.80
diff --git a/srcpkgs/libboost_context1.72 b/srcpkgs/libboost_contract1.80
similarity index 100%
rename from srcpkgs/libboost_context1.72
rename to srcpkgs/libboost_contract1.80
diff --git a/srcpkgs/libboost_contract1.72 b/srcpkgs/libboost_coroutine1.80
similarity index 100%
rename from srcpkgs/libboost_contract1.72
rename to srcpkgs/libboost_coroutine1.80
diff --git a/srcpkgs/libboost_coroutine1.72 b/srcpkgs/libboost_date_time1.80
similarity index 100%
rename from srcpkgs/libboost_coroutine1.72
rename to srcpkgs/libboost_date_time1.80
diff --git a/srcpkgs/libboost_date_time1.72 b/srcpkgs/libboost_fiber1.80
similarity index 100%
rename from srcpkgs/libboost_date_time1.72
rename to srcpkgs/libboost_fiber1.80
diff --git a/srcpkgs/libboost_fiber1.72 b/srcpkgs/libboost_filesystem1.80
similarity index 100%
rename from srcpkgs/libboost_fiber1.72
rename to srcpkgs/libboost_filesystem1.80
diff --git a/srcpkgs/libboost_filesystem1.72 b/srcpkgs/libboost_graph1.80
similarity index 100%
rename from srcpkgs/libboost_filesystem1.72
rename to srcpkgs/libboost_graph1.80
diff --git a/srcpkgs/libboost_graph1.72 b/srcpkgs/libboost_iostreams1.80
similarity index 100%
rename from srcpkgs/libboost_graph1.72
rename to srcpkgs/libboost_iostreams1.80
diff --git a/srcpkgs/libboost_iostreams1.72 b/srcpkgs/libboost_json1.80
similarity index 100%
rename from srcpkgs/libboost_iostreams1.72
rename to srcpkgs/libboost_json1.80
diff --git a/srcpkgs/libboost_locale1.72 b/srcpkgs/libboost_locale1.80
similarity index 100%
rename from srcpkgs/libboost_locale1.72
rename to srcpkgs/libboost_locale1.80
diff --git a/srcpkgs/libboost_log1.72 b/srcpkgs/libboost_log1.80
similarity index 100%
rename from srcpkgs/libboost_log1.72
rename to srcpkgs/libboost_log1.80
diff --git a/srcpkgs/libboost_log_setup1.72 b/srcpkgs/libboost_log_setup1.80
similarity index 100%
rename from srcpkgs/libboost_log_setup1.72
rename to srcpkgs/libboost_log_setup1.80
diff --git a/srcpkgs/libboost_math_c991.72 b/srcpkgs/libboost_math_c991.80
similarity index 100%
rename from srcpkgs/libboost_math_c991.72
rename to srcpkgs/libboost_math_c991.80
diff --git a/srcpkgs/libboost_math_c99f1.72 b/srcpkgs/libboost_math_c99f1.80
similarity index 100%
rename from srcpkgs/libboost_math_c99f1.72
rename to srcpkgs/libboost_math_c99f1.80
diff --git a/srcpkgs/libboost_math_c99l1.72 b/srcpkgs/libboost_math_c99l1.80
similarity index 100%
rename from srcpkgs/libboost_math_c99l1.72
rename to srcpkgs/libboost_math_c99l1.80
diff --git a/srcpkgs/libboost_math_tr11.72 b/srcpkgs/libboost_math_tr11.80
similarity index 100%
rename from srcpkgs/libboost_math_tr11.72
rename to srcpkgs/libboost_math_tr11.80
diff --git a/srcpkgs/libboost_math_tr1f1.72 b/srcpkgs/libboost_math_tr1f1.80
similarity index 100%
rename from srcpkgs/libboost_math_tr1f1.72
rename to srcpkgs/libboost_math_tr1f1.80
diff --git a/srcpkgs/libboost_math_tr1l1.72 b/srcpkgs/libboost_math_tr1l1.80
similarity index 100%
rename from srcpkgs/libboost_math_tr1l1.72
rename to srcpkgs/libboost_math_tr1l1.80
diff --git a/srcpkgs/libboost_prg_exec_monitor1.72 b/srcpkgs/libboost_nowide1.80
similarity index 100%
rename from srcpkgs/libboost_prg_exec_monitor1.72
rename to srcpkgs/libboost_nowide1.80
diff --git a/srcpkgs/libboost_program_options1.72 b/srcpkgs/libboost_prg_exec_monitor1.80
similarity index 100%
rename from srcpkgs/libboost_program_options1.72
rename to srcpkgs/libboost_prg_exec_monitor1.80
diff --git a/srcpkgs/libboost_random1.72 b/srcpkgs/libboost_program_options1.80
similarity index 100%
rename from srcpkgs/libboost_random1.72
rename to srcpkgs/libboost_program_options1.80
diff --git a/srcpkgs/libboost_regex1.72 b/srcpkgs/libboost_random1.80
similarity index 100%
rename from srcpkgs/libboost_regex1.72
rename to srcpkgs/libboost_random1.80
diff --git a/srcpkgs/libboost_serialization1.72 b/srcpkgs/libboost_regex1.80
similarity index 100%
rename from srcpkgs/libboost_serialization1.72
rename to srcpkgs/libboost_regex1.80
diff --git a/srcpkgs/libboost_stacktrace_addr2line1.72 b/srcpkgs/libboost_serialization1.80
similarity index 100%
rename from srcpkgs/libboost_stacktrace_addr2line1.72
rename to srcpkgs/libboost_serialization1.80
diff --git a/srcpkgs/libboost_stacktrace_basic1.72 b/srcpkgs/libboost_stacktrace_addr2line1.80
similarity index 100%
rename from srcpkgs/libboost_stacktrace_basic1.72
rename to srcpkgs/libboost_stacktrace_addr2line1.80
diff --git a/srcpkgs/libboost_stacktrace_noop1.72 b/srcpkgs/libboost_stacktrace_basic1.80
similarity index 100%
rename from srcpkgs/libboost_stacktrace_noop1.72
rename to srcpkgs/libboost_stacktrace_basic1.80
diff --git a/srcpkgs/libboost_system1.72 b/srcpkgs/libboost_stacktrace_noop1.80
similarity index 100%
rename from srcpkgs/libboost_system1.72
rename to srcpkgs/libboost_stacktrace_noop1.80
diff --git a/srcpkgs/libboost_thread1.72 b/srcpkgs/libboost_system1.80
similarity index 100%
rename from srcpkgs/libboost_thread1.72
rename to srcpkgs/libboost_system1.80
diff --git a/srcpkgs/libboost_timer1.72 b/srcpkgs/libboost_thread1.80
similarity index 100%
rename from srcpkgs/libboost_timer1.72
rename to srcpkgs/libboost_thread1.80
diff --git a/srcpkgs/libboost_type_erasure1.72 b/srcpkgs/libboost_timer1.80
similarity index 100%
rename from srcpkgs/libboost_type_erasure1.72
rename to srcpkgs/libboost_timer1.80
diff --git a/srcpkgs/libboost_unit_test_framework1.72 b/srcpkgs/libboost_type_erasure1.80
similarity index 100%
rename from srcpkgs/libboost_unit_test_framework1.72
rename to srcpkgs/libboost_type_erasure1.80
diff --git a/srcpkgs/libboost_wave1.72 b/srcpkgs/libboost_unit_test_framework1.80
similarity index 100%
rename from srcpkgs/libboost_wave1.72
rename to srcpkgs/libboost_unit_test_framework1.80
diff --git a/srcpkgs/libboost_wserialization1.72 b/srcpkgs/libboost_wave1.80
similarity index 100%
rename from srcpkgs/libboost_wserialization1.72
rename to srcpkgs/libboost_wave1.80
diff --git a/srcpkgs/libboost_wserialization1.80 b/srcpkgs/libboost_wserialization1.80
new file mode 120000
index 000000000000..baef819c48f6
--- /dev/null
+++ b/srcpkgs/libboost_wserialization1.80
@@ -0,0 +1 @@
+boost
\ No newline at end of file
From 71428f077847f413801a4c4ecc9a4a06731a67bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 16:51:50 +0700
Subject: [PATCH 002/107] TSC: rebuild for boost-1.80
---
srcpkgs/TSC/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/TSC/template b/srcpkgs/TSC/template
index 71534315cf7c..469f6d859bc7 100644
--- a/srcpkgs/TSC/template
+++ b/srcpkgs/TSC/template
@@ -1,7 +1,7 @@
# Template file for 'TSC'
pkgname=TSC
version=2.1.0
-revision=2
+revision=3
build_wrksrc=tsc
build_style=cmake
build_helper="qemu"
From 2b0639d38b77f69aa296fda1e9142bd524a6d096 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:27 +0700
Subject: [PATCH 003/107] 0ad: rebuild for boost-1.80
---
srcpkgs/0ad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 552d2728a7a0..b9f0751c4836 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
# Template file for '0ad'
pkgname=0ad
version=0.0.25b
-revision=3
+revision=4
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
wrksrc="${pkgname}-${version}-alpha"
hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang"
From c01aaa2239572f275dd913bbf2e2888f9714e6a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:27 +0700
Subject: [PATCH 004/107] Aegisub: rebuild for boost-1.80
---
srcpkgs/Aegisub/patches/link-icu18n.patch | 15 +++++++++++++++
srcpkgs/Aegisub/template | 2 +-
2 files changed, 16 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/Aegisub/patches/link-icu18n.patch
diff --git a/srcpkgs/Aegisub/patches/link-icu18n.patch b/srcpkgs/Aegisub/patches/link-icu18n.patch
new file mode 100644
index 000000000000..e5c037ca1f68
--- /dev/null
+++ b/srcpkgs/Aegisub/patches/link-icu18n.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -347,9 +347,9 @@ target_link_libraries(Aegisub PRIVATE "O
+ find_package(Iconv REQUIRED)
+ target_link_libraries(libaegisub PRIVATE "Iconv::Iconv")
+
+-find_package(ICU REQUIRED uc)
+-target_link_libraries(libaegisub PRIVATE "ICU::uc")
+-target_link_libraries(Aegisub PRIVATE "ICU::uc")
++find_package(ICU REQUIRED uc i18n)
++target_link_libraries(libaegisub PRIVATE "ICU::uc" ICU::i18n)
++target_link_libraries(Aegisub PRIVATE "ICU::uc" ICU::i18n)
+
+ find_package(wxWidgets REQUIRED adv base core gl stc xml)
+ include(${wxWidgets_USE_FILE})
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index ff34249aaee4..a68e1ab43089 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
# Template file for 'Aegisub'
pkgname=Aegisub
version=3.3.2
-revision=4
+revision=5
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
cmake_builddir="BUILD"
From 0716f1d2c19c5f1fe8d7a957c939c5e1d8dff480 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:27 +0700
Subject: [PATCH 005/107] Field3D: rebuild for boost-1.80
---
srcpkgs/Field3D/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 62f0589e9e0b..9a5af0034d14 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,7 +1,7 @@
# Template file for 'Field3D'
pkgname=Field3D
version=1.7.3
-revision=2
+revision=3
build_style=cmake
makedepends="boost-devel hdf5-devel ilmbase-devel"
short_desc="Library for storing voxel data on disk and in memory"
From c0a3a9dc635c96f60e7b2ee814e01cd6e8a39d43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:28 +0700
Subject: [PATCH 006/107] LGOGDownloader: rebuild for boost-1.80
---
srcpkgs/LGOGDownloader/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6e7e5c685f83..0778374ad224 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,7 +1,7 @@
# Template file for 'LGOGDownloader'
pkgname=LGOGDownloader
version=3.9
-revision=1
+revision=2
wrksrc="lgogdownloader-${version}"
build_style=cmake
hostmakedepends="pkg-config"
From ade8230384434152ce1ab0e2ee7eaff4234b2f70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:28 +0700
Subject: [PATCH 007/107] Lucene++: rebuild for boost-1.80
---
srcpkgs/Lucene++/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Lucene++/template b/srcpkgs/Lucene++/template
index 3873189f2dfc..34b6e05393fe 100644
--- a/srcpkgs/Lucene++/template
+++ b/srcpkgs/Lucene++/template
@@ -1,7 +1,7 @@
# Template file for 'Lucene++'
pkgname=Lucene++
version=3.0.7
-revision=11
+revision=12
wrksrc=LucenePlusPlus-rel_$version
build_style=cmake
configure_args="-Wno-dev"
From 70d34f9424b78be1fb5deb1a0b6619ef5d8e8032 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:28 +0700
Subject: [PATCH 008/107] PrusaSlicer: rebuild for boost-1.80
---
srcpkgs/PrusaSlicer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 931ac73e5c94..29f1f641a488 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
version=2.4.2
-revision=1
+revision=2
wrksrc="PrusaSlicer-version_${version}"
build_style=cmake
build_helper="qemu"
From d52df1d8b968b429e6b0a9df0fbd3248fdea2a79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:28 +0700
Subject: [PATCH 009/107] astroid: rebuild for boost-1.80
---
srcpkgs/astroid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/astroid/template b/srcpkgs/astroid/template
index 8ee0e729e134..478beb4de195 100644
--- a/srcpkgs/astroid/template
+++ b/srcpkgs/astroid/template
@@ -1,7 +1,7 @@
# Template file for 'astroid'
pkgname=astroid
version=0.16
-revision=5
+revision=6
build_style=cmake
hostmakedepends="pkg-config scdoc protobuf gobject-introspection"
makedepends="libnotmuch-devel gtkmm-devel webkit2gtk-devel libsass-devel
From ce8d9dedd1ae72146bf25b801478d83d09325438 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:28 +0700
Subject: [PATCH 010/107] bitcoin: rebuild for boost-1.80
---
srcpkgs/bitcoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index ccc9c4cc5f10..9ae457ecb9c5 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=22.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
From 4868ff34c04ec2168acf9f6141243c5d8bebfdfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:29 +0700
Subject: [PATCH 011/107] blender: rebuild for boost-1.80
---
srcpkgs/blender/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 91799f04fba5..28befed1faf8 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
version=3.0.0
-revision=4
+revision=5
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
From 6492fece9b1aa53a6533e246118e9ec54fbc9d8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:29 +0700
Subject: [PATCH 012/107] cclive: rebuild for boost-1.80
---
srcpkgs/cclive/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cclive/template b/srcpkgs/cclive/template
index c43dbb94209c..936be99b866c 100644
--- a/srcpkgs/cclive/template
+++ b/srcpkgs/cclive/template
@@ -1,7 +1,7 @@
# Template file for 'cclive'
pkgname=cclive
version=0.9.3
-revision=5
+revision=6
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="boost-devel pcre-devel libcurl-devel libquvi-devel glibmm-devel"
From 36df210b64d951cebe810dad0bc5e6db0c0433d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:29 +0700
Subject: [PATCH 013/107] cgal: rebuild for boost-1.80
---
srcpkgs/cgal/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cgal/template b/srcpkgs/cgal/template
index 7e28c2b28dfd..d448e8dd3c63 100644
--- a/srcpkgs/cgal/template
+++ b/srcpkgs/cgal/template
@@ -1,7 +1,7 @@
# Template file for 'cgal'
pkgname=cgal
version=4.14
-revision=3
+revision=4
wrksrc="CGAL-${version}"
build_style=cmake
build_helper="qemu"
From 41f8df1a82b3fceca0ba3924a30bb181d17d1514 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:29 +0700
Subject: [PATCH 014/107] codeblocks: rebuild for boost-1.80
---
srcpkgs/codeblocks/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/codeblocks/template b/srcpkgs/codeblocks/template
index 33b9b9a77853..0079c3a8991c 100644
--- a/srcpkgs/codeblocks/template
+++ b/srcpkgs/codeblocks/template
@@ -1,7 +1,7 @@
# Template file for 'codeblocks'
pkgname=codeblocks
version=20.03
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-wx-config=wx-config-gtk3 --with-contrib-plugins
--with-boost=${XBPS_CROSS_BASE}/usr --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
From 0fb18eb0f392f1aa429955b74a67c1366122ab8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:29 +0700
Subject: [PATCH 015/107] colobot: rebuild for boost-1.80
---
srcpkgs/colobot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/colobot/template b/srcpkgs/colobot/template
index 1b415dd2cfad..a7613cad90b5 100644
--- a/srcpkgs/colobot/template
+++ b/srcpkgs/colobot/template
@@ -2,7 +2,7 @@
pkgname=colobot
# needs to be kept in sync with colobot-data (provides game assets)
version=0.2.0
-revision=1
+revision=2
wrksrc="colobot-colobot-gold-${version}-alpha"
build_style=cmake
configure_args="-DCOLOBOT_INSTALL_BIN_DIR=/usr/bin -DOpenGL_GL_PREFERENCE=GLVND"
From 1c7651522eafcf68b4800dace9eef1a8ea4c3c01 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Mon, 29 Aug 2022 10:56:35 +1000
Subject: [PATCH 016/107] cryfs: update to 0.11.2.
---
.../cryfs/patches/allow-build-type-none.patch | 22 ---
srcpkgs/cryfs/patches/de-vendor.patch | 134 +++++++-----------
srcpkgs/cryfs/patches/fix-test.patch | 22 ---
srcpkgs/cryfs/patches/fmt-9-fix.patch | 54 +++++++
.../rename-simple-to-basic-filesink.patch | 21 ---
srcpkgs/cryfs/patches/spdlog-include.patch | 33 -----
srcpkgs/cryfs/template | 13 +-
7 files changed, 109 insertions(+), 190 deletions(-)
delete mode 100644 srcpkgs/cryfs/patches/fix-test.patch
create mode 100644 srcpkgs/cryfs/patches/fmt-9-fix.patch
delete mode 100644 srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch
delete mode 100644 srcpkgs/cryfs/patches/spdlog-include.patch
diff --git a/srcpkgs/cryfs/patches/allow-build-type-none.patch b/srcpkgs/cryfs/patches/allow-build-type-none.patch
index e591974c05f4..ffcf0ee53320 100644
--- a/srcpkgs/cryfs/patches/allow-build-type-none.patch
+++ b/srcpkgs/cryfs/patches/allow-build-type-none.patch
@@ -9,25 +9,3 @@ Index: cryfs-0.10.2/doc/CMakeLists.txt
- CONFIGURATIONS Release
)
ENDIF(WIN32)
-Index: cryfs-0.10.2/src/cryfs-cli/CMakeLists.txt
-===================================================================
---- cryfs-0.10.2.orig/src/cryfs-cli/CMakeLists.txt
-+++ cryfs-0.10.2/src/cryfs-cli/CMakeLists.txt
-@@ -27,6 +27,5 @@ target_enable_style_warnings(${PROJECT_N
- target_activate_cpp14(${PROJECT_NAME}_bin)
-
- install(TARGETS ${PROJECT_NAME}_bin
-- CONFIGURATIONS Debug Release RelWithDebInfo
- DESTINATION ${CMAKE_INSTALL_BINDIR}
- )
-Index: cryfs-0.10.2/src/cryfs-unmount/CMakeLists.txt
-===================================================================
---- cryfs-0.10.2.orig/src/cryfs-unmount/CMakeLists.txt
-+++ cryfs-0.10.2/src/cryfs-unmount/CMakeLists.txt
-@@ -19,6 +19,5 @@ target_enable_style_warnings(${PROJECT_N
- target_activate_cpp14(${PROJECT_NAME}_bin)
-
- install(TARGETS ${PROJECT_NAME}_bin
-- CONFIGURATIONS Debug Release RelWithDebInfo
- DESTINATION ${CMAKE_INSTALL_BINDIR}
- )
diff --git a/srcpkgs/cryfs/patches/de-vendor.patch b/srcpkgs/cryfs/patches/de-vendor.patch
index 4909cad7b84a..09e51f0aa7fc 100644
--- a/srcpkgs/cryfs/patches/de-vendor.patch
+++ b/srcpkgs/cryfs/patches/de-vendor.patch
@@ -1,32 +1,14 @@
-Index: cryfs-0.10.2/src/blockstore/implementations/compressing/compressors/Gzip.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/blockstore/implementations/compressing/compressors/Gzip.cpp
-+++ cryfs-0.10.2/src/blockstore/implementations/compressing/compressors/Gzip.cpp
-@@ -1,6 +1,6 @@
- #include "cpp-utils/crypto/cryptopp_byte.h"
+--- a/src/blockstore/implementations/compressing/compressors/Gzip.cpp 2022-08-25 22:14:05.481898162 +0400
++++ b/src/blockstore/implementations/compressing/compressors/Gzip.cpp 2022-08-25 22:17:49.606653292 +0400
+@@ -1,5 +1,5 @@
#include "Gzip.h"
-#include <vendor_cryptopp/gzip.h>
+#include <cryptopp/gzip.h>
using cpputils::Data;
-Index: cryfs-0.10.2/src/cpp-utils/crypto/cryptopp_byte.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/cryptopp_byte.h
-+++ cryfs-0.10.2/src/cpp-utils/crypto/cryptopp_byte.h
-@@ -2,7 +2,7 @@
- #ifndef _CPPUTILS_CRYPTO_CRYPTOPP_BYTE_H
- #define _CPPUTILS_CRYPTO_CRYPTOPP_BYTE_H
-
--#include <vendor_cryptopp/cryptlib.h>
-+#include <cryptopp/cryptlib.h>
-
- // If we're running an older CryptoPP version, CryptoPP::byte isn't defined yet.
- // Define it. Refer to "byte" type in the global namespace (placed by CryptoPP).
-Index: cryfs-0.10.2/src/cpp-utils/crypto/hash/Hash.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/hash/Hash.cpp
-+++ cryfs-0.10.2/src/cpp-utils/crypto/hash/Hash.cpp
+--- a/src/cpp-utils/crypto/hash/Hash.cpp 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/hash/Hash.cpp 2022-08-25 22:18:07.131800277 +0400
@@ -1,6 +1,6 @@
#include "Hash.h"
#include <cpp-utils/random/Random.h>
@@ -35,10 +17,8 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/hash/Hash.cpp
using cpputils::Random;
using CryptoPP::SHA512;
-Index: cryfs-0.10.2/src/cpp-utils/crypto/kdf/Scrypt.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/kdf/Scrypt.cpp
-+++ cryfs-0.10.2/src/cpp-utils/crypto/kdf/Scrypt.cpp
+--- a/src/cpp-utils/crypto/kdf/Scrypt.cpp 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/kdf/Scrypt.cpp 2022-08-25 22:18:17.754889373 +0400
@@ -1,5 +1,5 @@
#include "Scrypt.h"
-#include <vendor_cryptopp/scrypt.h>
@@ -46,11 +26,9 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/kdf/Scrypt.cpp
using std::string;
-Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
-+++ cryfs-0.10.2/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
-@@ -7,7 +7,7 @@
+--- a/src/cpp-utils/crypto/symmetric/CFB_Cipher.h 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/symmetric/CFB_Cipher.h 2022-08-25 22:18:28.524979704 +0400
+@@ -6,7 +6,7 @@
#include "../../data/Data.h"
#include "../../random/Random.h"
#include <boost/optional.hpp>
@@ -59,24 +37,9 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
#include "Cipher.h"
#include "EncryptionKey.h"
-Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
-+++ cryfs-0.10.2/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
-@@ -6,7 +6,7 @@
- #include "../../data/FixedSizeData.h"
- #include "../../data/Data.h"
- #include "../../random/Random.h"
--#include <vendor_cryptopp/gcm.h>
-+#include <cryptopp/gcm.h>
- #include "Cipher.h"
- #include "EncryptionKey.h"
-
-Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/ciphers.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/symmetric/ciphers.h
-+++ cryfs-0.10.2/src/cpp-utils/crypto/symmetric/ciphers.h
-@@ -2,11 +2,11 @@
+--- a/src/cpp-utils/crypto/symmetric/ciphers.h 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/symmetric/ciphers.h 2022-08-25 22:18:52.181178110 +0400
+@@ -2,12 +2,12 @@
#ifndef MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_
#define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_
@@ -85,30 +48,39 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/ciphers.h
-#include <vendor_cryptopp/serpent.h>
-#include <vendor_cryptopp/cast.h>
-#include <vendor_cryptopp/mars.h>
+-#include <vendor_cryptopp/chachapoly.h>
+#include <cryptopp/aes.h>
+#include <cryptopp/twofish.h>
+#include <cryptopp/serpent.h>
+#include <cryptopp/cast.h>
+#include <cryptopp/mars.h>
++#include <cryptopp/chachapoly.h>
#include "GCM_Cipher.h"
#include "CFB_Cipher.h"
-Index: cryfs-0.10.2/src/cpp-utils/data/Data.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/data/Data.cpp
-+++ cryfs-0.10.2/src/cpp-utils/data/Data.cpp
+--- a/src/cpp-utils/crypto/symmetric/GCM_Cipher.h 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/symmetric/GCM_Cipher.h 2022-08-25 22:18:38.836066183 +0400
+@@ -3,7 +3,7 @@
+ #define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_GCMCIPHER_H_
+
+ #include "AEAD_Cipher.h"
+-#include <vendor_cryptopp/gcm.h>
++#include <cryptopp/gcm.h>
+
+ namespace cpputils {
+
+--- a/src/cpp-utils/data/Data.cpp 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/data/Data.cpp 2022-08-25 22:19:09.349322106 +0400
@@ -1,6 +1,6 @@
#include "Data.h"
#include <stdexcept>
-#include <vendor_cryptopp/hex.h>
+#include <cryptopp/hex.h>
- #include <cpp-utils/crypto/cryptopp_byte.h>
using std::istream;
-Index: cryfs-0.10.2/src/cpp-utils/data/FixedSizeData.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/data/FixedSizeData.h
-+++ cryfs-0.10.2/src/cpp-utils/data/FixedSizeData.h
+ using std::ofstream;
+--- a/src/cpp-utils/data/FixedSizeData.h 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/data/FixedSizeData.h 2022-08-25 22:19:19.103403916 +0400
@@ -2,7 +2,7 @@
#ifndef MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_
#define MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_
@@ -116,25 +88,21 @@ Index: cryfs-0.10.2/src/cpp-utils/data/FixedSizeData.h
-#include <vendor_cryptopp/hex.h>
+#include <cryptopp/hex.h>
#include <string>
+ #include <array>
#include <cstring>
- #include "../assert/assert.h"
-Index: cryfs-0.10.2/src/cpp-utils/random/OSRandomGenerator.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/random/OSRandomGenerator.h
-+++ cryfs-0.10.2/src/cpp-utils/random/OSRandomGenerator.h
-@@ -4,7 +4,7 @@
+--- a/src/cpp-utils/random/OSRandomGenerator.h 2022-08-25 22:14:05.483898156 +0400
++++ b/src/cpp-utils/random/OSRandomGenerator.h 2022-08-25 22:19:29.602491973 +0400
+@@ -3,7 +3,7 @@
+ #define MESSMER_CPPUTILS_RANDOM_OSRANDOMGENERATOR_H
- #include "cpp-utils/crypto/cryptopp_byte.h"
#include "RandomGenerator.h"
-#include <vendor_cryptopp/osrng.h>
+#include <cryptopp/osrng.h>
namespace cpputils {
class OSRandomGenerator final : public RandomGenerator {
-Index: cryfs-0.10.2/src/cpp-utils/random/RandomGeneratorThread.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/random/RandomGeneratorThread.h
-+++ cryfs-0.10.2/src/cpp-utils/random/RandomGeneratorThread.h
+--- a/src/cpp-utils/random/RandomGeneratorThread.h 2022-08-25 22:14:05.484898153 +0400
++++ b/src/cpp-utils/random/RandomGeneratorThread.h 2022-08-25 22:19:36.713551613 +0400
@@ -4,7 +4,7 @@
#include "../thread/LoopThread.h"
@@ -144,10 +112,9 @@ Index: cryfs-0.10.2/src/cpp-utils/random/RandomGeneratorThread.h
namespace cpputils {
//TODO Test
-Index: cryfs-0.10.2/src/cryfs/localstate/BasedirMetadata.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cryfs/localstate/BasedirMetadata.cpp
-+++ cryfs-0.10.2/src/cryfs/localstate/BasedirMetadata.cpp
+diff -Naurp0 -U3 cryfs-0.11.2/src/cryfs/impl/localstate/BasedirMetadata.cpp cryfs-0.11.2-mine/src/cryfs/impl/localstate/BasedirMetadata.cpp
+--- a/src/cryfs/impl/localstate/BasedirMetadata.cpp 2022-08-25 22:14:05.487898144 +0400
++++ b/src/cryfs/impl/localstate/BasedirMetadata.cpp 2022-08-25 22:19:46.722635560 +0400
@@ -1,7 +1,7 @@
#include "BasedirMetadata.h"
#include <boost/property_tree/ptree.hpp>
@@ -157,11 +124,9 @@ Index: cryfs-0.10.2/src/cryfs/localstate/BasedirMetadata.cpp
#include <boost/filesystem/operations.hpp>
#include "LocalStateDir.h"
#include <cpp-utils/logging/logging.h>
-Index: cryfs-0.10.2/test/cryfs/config/CompatibilityTest.cpp
-===================================================================
---- cryfs-0.10.2.orig/test/cryfs/config/CompatibilityTest.cpp
-+++ cryfs-0.10.2/test/cryfs/config/CompatibilityTest.cpp
-@@ -3,7 +3,7 @@
+--- a/test/cryfs/impl/config/CompatibilityTest.cpp 2022-08-25 22:14:05.493898126 +0400
++++ b/test/cryfs/impl/config/CompatibilityTest.cpp 2022-08-25 22:19:54.589701542 +0400
+@@ -2,7 +2,7 @@
#include <vector>
#include <boost/filesystem.hpp>
#include <cpp-utils/data/Data.h>
@@ -169,12 +134,9 @@ Index: cryfs-0.10.2/test/cryfs/config/CompatibilityTest.cpp
+#include <cryptopp/hex.h>
#include <cpp-utils/crypto/symmetric/ciphers.h>
#include <cpp-utils/tempfile/TempFile.h>
- #include <cryfs/config/CryConfigFile.h>
-Index: cryfs-0.10.2/vendor/CMakeLists.txt
-===================================================================
---- cryfs-0.10.2.orig/vendor/CMakeLists.txt
-+++ cryfs-0.10.2/vendor/CMakeLists.txt
-@@ -1,3 +1 @@
+ #include <cryfs/impl/config/CryConfigFile.h>
+--- a/vendor/CMakeLists.txt 2022-08-25 22:14:05.497898115 +0400
++++ b/vendor/CMakeLists.txt 2022-08-25 22:20:11.176840657 +0400
+@@ -1,2 +1 @@
add_subdirectory(googletest)
--add_subdirectory(spdlog)
-add_subdirectory(cryptopp)
diff --git a/srcpkgs/cryfs/patches/fix-test.patch b/srcpkgs/cryfs/patches/fix-test.patch
deleted file mode 100644
index d3a5847b1a3c..000000000000
--- a/srcpkgs/cryfs/patches/fix-test.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: cryfs-0.10.2/test/cpp-utils/logging/testutils/LoggingTest.h
-===================================================================
---- cryfs-0.10.2.orig/test/cpp-utils/logging/testutils/LoggingTest.h
-+++ cryfs-0.10.2/test/cpp-utils/logging/testutils/LoggingTest.h
-@@ -11,8 +11,7 @@ class MockLogger final {
- public:
- MockLogger():
- _capturedLogData(),
-- _sink(std::make_shared<spdlog::sinks::ostream_sink<std::mutex>>(_capturedLogData, true)),
-- _logger(spdlog::create("MockLogger", {_sink})) {
-+ _logger(spdlog::create<spdlog::sinks::ostream_sink_mt>("MockLogger", _capturedLogData, true)) {
- }
-
- ~MockLogger() {
-@@ -28,7 +27,6 @@ public:
- }
- private:
- std::ostringstream _capturedLogData;
-- std::shared_ptr<spdlog::sinks::ostream_sink<std::mutex>> _sink;
- std::shared_ptr<spdlog::logger> _logger;
- };
-
diff --git a/srcpkgs/cryfs/patches/fmt-9-fix.patch b/srcpkgs/cryfs/patches/fmt-9-fix.patch
new file mode 100644
index 000000000000..6fe97eaeafa4
--- /dev/null
+++ b/srcpkgs/cryfs/patches/fmt-9-fix.patch
@@ -0,0 +1,54 @@
+From 27515e0116fd7cb034bd4e9763d1f3bfdc855a5f Mon Sep 17 00:00:00 2001
+From: Bernhard Rosenkraenzer <bero@lindev.ch>
+Date: Fri, 22 Jul 2022 14:13:38 +0200
+Subject: [PATCH] Fix build with fmt 9.0 (#433)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* Fix build with fmt 9.0
+
+Co-authored-by: Sebastian Meßmer <smessmer@users.noreply.github.com>
+---
+ ChangeLog.txt | 4 ++++
+ src/fspp/fuse/Fuse.cpp | 8 ++++----
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/src/fspp/fuse/Fuse.cpp b/src/fspp/fuse/Fuse.cpp
+index 4e9dbd7f..4b881815 100644
+--- a/src/fspp/fuse/Fuse.cpp
++++ b/src/fspp/fuse/Fuse.cpp
+@@ -603,21 +603,21 @@ int Fuse::mknod(const bf::path &path, ::mode_t mode, dev_t rdev) {
+ UNUSED(mode);
+ UNUSED(path);
+ ThreadNameForDebugging _threadName("mknod");
+- LOG(WARN, "Called non-implemented mknod({}, {}, _)", path, mode);
++ LOG(WARN, "Called non-implemented mknod({}, {}, _)", path.string(), mode);
+ return ENOSYS;
+ }
+
+ int Fuse::mkdir(const bf::path &path, ::mode_t mode) {
+ ThreadNameForDebugging _threadName("mkdir");
+ #ifdef FSPP_LOG
+- LOG(DEBUG, "mkdir({}, {})", path, mode);
++ LOG(DEBUG, "mkdir({}, {})", path.string(), mode);
+ #endif
+ try {
+ ASSERT(is_valid_fspp_path(path), "has to be an absolute path");
+ // DokanY seems to call mkdir("/"). Ignore that
+ if ("/" == path) {
+ #ifdef FSPP_LOG
+- LOG(DEBUG, "mkdir({}, {}): ignored", path, mode);
++ LOG(DEBUG, "mkdir({}, {}): ignored", path.string(), mode);
+ #endif
+ return 0;
+ }
+@@ -766,7 +766,7 @@ int Fuse::rename(const bf::path &from, const bf::path &to) {
+ //TODO
+ int Fuse::link(const bf::path &from, const bf::path &to) {
+ ThreadNameForDebugging _threadName("link");
+- LOG(WARN, "NOT IMPLEMENTED: link({}, {})", from, to);
++ LOG(WARN, "NOT IMPLEMENTED: link({}, {})", from.string(), to.string());
+ //auto real_from = _impl->RootDir() / from;
+ //auto real_to = _impl->RootDir() / to;
+ //int retstat = ::link(real_from.string().c_str(), real_to.string().c_str());
diff --git a/srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch b/srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch
deleted file mode 100644
index 08513cb4d0ca..000000000000
--- a/srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: cryfs-0.10.2/src/cryfs-cli/Cli.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cryfs-cli/Cli.cpp
-+++ cryfs-0.10.2/src/cryfs-cli/Cli.cpp
-@@ -27,6 +27,7 @@
- #include "Environment.h"
- #include <cryfs/CryfsException.h>
- #include <cpp-utils/thread/debugging.h>
-+#include <spdlog/sinks/basic_file_sink.h>
-
- //TODO Many functions accessing the ProgramOptions object. Factor out into class that stores it as a member.
- //TODO Factor out class handling askPassword
-@@ -310,7 +311,7 @@ namespace cryfs_cli {
- //TODO Test that --logfile parameter works. Should be: file if specified, otherwise stderr if foreground, else syslog.
- if (options.logFile() != none) {
- cpputils::logging::setLogger(
-- spdlog::create<spdlog::sinks::simple_file_sink<std::mutex>>("cryfs", options.logFile()->string()));
-+ spdlog::create<spdlog::sinks::basic_file_sink<std::mutex>>("cryfs", options.logFile()->string()));
- } else if (options.foreground()) {
- cpputils::logging::setLogger(spdlog::stderr_logger_mt("cryfs"));
- } else {
diff --git a/srcpkgs/cryfs/patches/spdlog-include.patch b/srcpkgs/cryfs/patches/spdlog-include.patch
deleted file mode 100644
index 2c1c5a926cf3..000000000000
--- a/srcpkgs/cryfs/patches/spdlog-include.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: cryfs-0.10.2/src/cpp-utils/logging/Logger.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/logging/Logger.h
-+++ cryfs-0.10.2/src/cpp-utils/logging/Logger.h
-@@ -7,6 +7,7 @@
- #endif
-
- #include <spdlog/spdlog.h>
-+#include <spdlog/sinks/stdout_sinks.h>
- #include "../macros.h"
-
- namespace cpputils {
-Index: cryfs-0.10.2/src/cpp-utils/logging/logging.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/logging/logging.h
-+++ cryfs-0.10.2/src/cpp-utils/logging/logging.h
-@@ -5,6 +5,7 @@
- #include "Logger.h"
- #include <stdexcept>
- #include <spdlog/fmt/ostr.h>
-+#include <spdlog/sinks/syslog_sink.h>
-
- #if defined(_MSC_VER)
- #include <spdlog/sinks/msvc_sink.h>
-@@ -75,7 +76,7 @@ namespace cpputils {
- #if defined(_MSC_VER)
- return spdlog::create<spdlog::sinks::msvc_sink_mt>(name);
- #else
-- return spdlog::syslog_logger(name, name, LOG_PID);
-+ return spdlog::syslog_logger_mt(name, name, LOG_PID);
- #endif
- }
- }
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 495c2b318a3b..3c8dc28e519c 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,14 +1,15 @@
# Template file for 'cryfs'
pkgname=cryfs
-version=0.10.2
-revision=5
+version=0.11.2
+revision=1
create_wrksrc=yes
build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off
- -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
+configure_args="-DCRYFS_UPDATE_CHECKS=off -DBoost_USE_STATIC_LIBS=OFF
+ -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt
+ -DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
hostmakedepends="pkg-config python3"
makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel
- spdlog"
+ spdlog range-v3"
depends="fuse"
short_desc="Cryptographic filesystem for the cloud"
maintainer="Andy Weidenbaum <atweiden@tutanota.de>"
@@ -16,7 +17,7 @@ license="LGPL-3.0-only"
homepage="https://www.cryfs.org"
changelog="https://github.com/cryfs/cryfs/raw/master/ChangeLog.txt"
distfiles="https://github.com/cryfs/cryfs/releases/download/${version}/${pkgname}-${version}.tar.gz"
-checksum=004c7fdf537062e197aaa0bcdafd2682904a279802441bb6063cb72c1fba52d2
+checksum=a89ab8fea2d494b496867107ec0a3772fe606ebd71ef12152fcd233f463a2c00
if [ "${XBPS_CHECK_PKGS}" ]; then
configure_args+=" -DBUILD_TESTING=on"
From 38d4f93985cdee9f1be6192a3ef772b73db99926 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:30 +0700
Subject: [PATCH 017/107] eclib: rebuild for boost-1.80
---
srcpkgs/eclib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/eclib/template b/srcpkgs/eclib/template
index 3db0bd2119b9..694a39ed4068 100644
--- a/srcpkgs/eclib/template
+++ b/srcpkgs/eclib/template
@@ -1,7 +1,7 @@
# Template file for 'eclib'
pkgname=eclib
version=20210625
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-flint --with-boost"
hostmakedepends="automake autoconf-archive libtool"
From 4a67d3c54946fa82c49b5df98790e80ebfc022fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:30 +0700
Subject: [PATCH 018/107] facter: rebuild for boost-1.80
---
srcpkgs/facter/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 93d6bfc6af51..45c921a0b72d 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
# Template file for 'facter'
pkgname=facter
version=3.14.16
-revision=3
+revision=4
build_style=cmake
configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
-DENABLE_CXX_WERROR=OFF -DCMAKE_INSTALL_LIBDIR=/usr/lib"
From a47613d9bab0e2ce8deb1fb64b3ff1e718f05bf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:30 +0700
Subject: [PATCH 019/107] fcitx5-chinese-addons: rebuild for boost-1.80
---
srcpkgs/fcitx5-chinese-addons/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fcitx5-chinese-addons/template b/srcpkgs/fcitx5-chinese-addons/template
index d207bde9ada9..a3a1948474a7 100644
--- a/srcpkgs/fcitx5-chinese-addons/template
+++ b/srcpkgs/fcitx5-chinese-addons/template
@@ -1,7 +1,7 @@
# Template file for 'fcitx5-chinese-addons'
pkgname=fcitx5-chinese-addons
version=5.0.14
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config gettext doxygen extra-cmake-modules qt5-qmake
qt5-host-tools libime-utils"
From a4f646abf36a023edcc43ab8e4c08c5bdc0c695f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:31 +0700
Subject: [PATCH 020/107] fifengine: rebuild for boost-1.80
---
srcpkgs/fifengine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fifengine/template b/srcpkgs/fifengine/template
index 1987e06f7d03..24d2f8521c8d 100644
--- a/srcpkgs/fifengine/template
+++ b/srcpkgs/fifengine/template
@@ -1,7 +1,7 @@
# Template file for 'fifengine'
pkgname=fifengine
version=0.4.2
-revision=8
+revision=9
build_style=cmake
hostmakedepends="swig python3"
makedepends="SDL2-devel SDL2_image-devel SDL2_ttf-devel boost-devel
From a7976bcc90d5ee6a9f3575abe8076e0ad4f97715 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:31 +0700
Subject: [PATCH 021/107] freecad: rebuild for boost-1.80
---
srcpkgs/freecad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index e9c697adbe1a..843d2281f324 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=0.20.1
-revision=1
+revision=2
wrksrc="FreeCAD-${version}"
build_style=cmake
From 9a71aa4ad2222129296bcfbdd04eea8743fe85a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:31 +0700
Subject: [PATCH 022/107] freeorion: rebuild for boost-1.80
---
srcpkgs/freeorion/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freeorion/template b/srcpkgs/freeorion/template
index 20fd819e49b0..71d41f3e987b 100644
--- a/srcpkgs/freeorion/template
+++ b/srcpkgs/freeorion/template
@@ -1,7 +1,7 @@
# Template file for 'freeorion'
pkgname=freeorion
version=0.4.10.2
-revision=1
+revision=2
_release=${version}_2021-08-01.f663dad
wrksrc=src-tarball
build_style=cmake
From 96f9e8fa9a8eeb428c2773b9131129fcc0e39588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:31 +0700
Subject: [PATCH 023/107] gnucash: rebuild for boost-1.80
---
srcpkgs/gnucash/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 5d403e47c02b..81627ef4f8a1 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
# Template file for 'gnucash'
pkgname=gnucash
version=4.11
-revision=1
+revision=2
wrksrc="${pkgname}-${version%b}"
build_style=cmake
make_check_target=check
From 715d30a507f0a7fbdc669190bda5383da76c19dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:31 +0700
Subject: [PATCH 024/107] gnuradio: rebuild for boost-1.80
---
srcpkgs/gnuradio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index 43ae4e1cb1ba..973339f92921 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
version=3.10.3.0
-revision=1
+revision=2
build_style=cmake
conf_files="/etc/gnuradio/conf.d/*"
configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax
From 8974292cd249ab3921001a8819d6dfd7fdfe2ea3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:32 +0700
Subject: [PATCH 025/107] gnuradio-osmosdr: rebuild for boost-1.80
---
srcpkgs/gnuradio-osmosdr/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template
index cdb4d27faf68..bf0696c672a9 100644
--- a/srcpkgs/gnuradio-osmosdr/template
+++ b/srcpkgs/gnuradio-osmosdr/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-osmosdr'
pkgname=gnuradio-osmosdr
version=0.2.3git20210128
-revision=1
+revision=2
_githash=a100eb024c0210b95e4738b6efd836d48225bd03
wrksrc="gr-osmosdr-${_githash}"
build_style=cmake
From 996504f85bde3f7fb8d9e5dc0df265ca7b6fcfea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:32 +0700
Subject: [PATCH 026/107] gnuradio-rds: rebuild for boost-1.80
---
srcpkgs/gnuradio-rds/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template
index 35d19fb82b11..e9e865151f7a 100644
--- a/srcpkgs/gnuradio-rds/template
+++ b/srcpkgs/gnuradio-rds/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-rds'
pkgname=gnuradio-rds
version=3.10
-revision=1
+revision=2
wrksrc="gr-rds-${version}"
build_style=cmake
configure_args="-Dpybind11_DIR=/${py3_sitelib}/pybind11/share/cmake/pybind11"
From da3e2d40deed4194eecd8729701c6b65bafbec96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:32 +0700
Subject: [PATCH 027/107] gource: rebuild for boost-1.80
---
srcpkgs/gource/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gource/template b/srcpkgs/gource/template
index 8ec3b05ca772..08b2e222f607 100644
--- a/srcpkgs/gource/template
+++ b/srcpkgs/gource/template
@@ -1,7 +1,7 @@
# Template file for 'gource'
pkgname=gource
version=0.51
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-tinyxml --enable-ttf-font-dir=/usr/share/fonts/TTF
--with-boost-libdir=$XBPS_CROSS_BASE/usr/lib/"
From 79c5b15f7a6ac003214fd347db0b58645696f524 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:32 +0700
Subject: [PATCH 028/107] gpick: rebuild for boost-1.80
---
srcpkgs/gpick/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gpick/template b/srcpkgs/gpick/template
index b30108334144..7b3a4db6d69c 100644
--- a/srcpkgs/gpick/template
+++ b/srcpkgs/gpick/template
@@ -1,7 +1,7 @@
# Template file for 'gpick'
pkgname=gpick
version=0.2.6
-revision=1
+revision=2
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=cmake
hostmakedepends="gettext pkg-config ragel"
From 4ed2a4da8a774294902fd5c127a5e66a211207a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:32 +0700
Subject: [PATCH 029/107] grive2: rebuild for boost-1.80
---
srcpkgs/grive2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/grive2/template b/srcpkgs/grive2/template
index 140688ee9aec..e416cdc606b5 100644
--- a/srcpkgs/grive2/template
+++ b/srcpkgs/grive2/template
@@ -1,7 +1,7 @@
# Template file for 'grive2'
pkgname=grive2
version=0.5.1
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config"
makedepends="boost-devel libcurl-devel yajl-devel libgcrypt-devel expat-devel"
From f541704419c113b37e79065e474627a8e8b67b73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:33 +0700
Subject: [PATCH 030/107] guitarix2: rebuild for boost-1.80
---
srcpkgs/guitarix2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/guitarix2/template b/srcpkgs/guitarix2/template
index 880814313a2b..de2edbf770b4 100644
--- a/srcpkgs/guitarix2/template
+++ b/srcpkgs/guitarix2/template
@@ -1,7 +1,7 @@
# Template file for 'guitarix2'
pkgname=guitarix2
version=0.42.1
-revision=1
+revision=2
wrksrc="guitarix-${version}"
build_style=waf3
configure_args="--cxxflags-release=-DNDEBUG --ladspa --new-ladspa --no-faust
From 36192eccf4858874777e4dd72b39527c7a5bea83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:33 +0700
Subject: [PATCH 031/107] heaptrack: rebuild for boost-1.80
---
srcpkgs/heaptrack/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/heaptrack/template b/srcpkgs/heaptrack/template
index ed98a952dfdc..0ccc1e6415a7 100644
--- a/srcpkgs/heaptrack/template
+++ b/srcpkgs/heaptrack/template
@@ -1,7 +1,7 @@
# Template file for 'heaptrack'
pkgname=heaptrack
version=1.4.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DHEAPTRACK_BUILD_GUI=ON"
hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules kcoreaddons
From 6cd0e8c72b9bfba00de438bff3a8c046ea303605 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:33 +0700
Subject: [PATCH 032/107] hugin: rebuild for boost-1.80
---
srcpkgs/hugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 7961c74632a1..87cecac02106 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
# Template file for 'hugin'
pkgname=hugin
version=2021.0.0
-revision=1
+revision=2
wrksrc="${pkgname}-${version}"
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
From 2090f8849bb93af74a28619eb4aec3bfe0c197dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:33 +0700
Subject: [PATCH 033/107] i2pd: rebuild for boost-1.80
---
srcpkgs/i2pd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index fe12bb2e19bf..522235bebc17 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,7 +1,7 @@
# Template file for 'i2pd'
pkgname=i2pd
version=2.42.1
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="USE_UPNP=yes"
makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
From 97073777f3b2d49fb6d7d5a6b37dd4493e6ab1e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:34 +0700
Subject: [PATCH 034/107] icinga2: rebuild for boost-1.80
---
srcpkgs/icinga2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index a884892fc49e..4ef7abea2fc3 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,7 +1,7 @@
# Template file for 'icinga2'
pkgname=icinga2
version=2.9.3
-revision=6
+revision=7
build_style=cmake
build_helper="qemu"
configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
From 3c5bb678460d10b35441133626659b02abecca07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:34 +0700
Subject: [PATCH 035/107] imagescan: rebuild for boost-1.80
---
srcpkgs/imagescan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imagescan/template b/srcpkgs/imagescan/template
index a12adfe05713..152ef2f83b33 100644
--- a/srcpkgs/imagescan/template
+++ b/srcpkgs/imagescan/template
@@ -1,7 +1,7 @@
# Template file for 'imagescan'
pkgname=imagescan
version=3.65.0
-revision=1
+revision=2
wrksrc=utsushi-0.65.0
build_style=gnu-configure
configure_args="--libexecdir=/usr/lib --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
From a68ee457ead37748b2ebf6e9757f7b999af1fd1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:34 +0700
Subject: [PATCH 036/107] inkscape: rebuild for boost-1.80
---
srcpkgs/inkscape/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 4d902e663f73..c77236be6848 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.1.1
-revision=4
+revision=5
wrksrc="inkscape-${version}_2021-09-20_3bf5ae0d25"
build_style=cmake
# builds executables then runs checks
From 9637d180ca2a39bc48e5894f2b6d55640eb37165 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:34 +0700
Subject: [PATCH 037/107] innoextract: rebuild for boost-1.80
---
srcpkgs/innoextract/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/innoextract/template b/srcpkgs/innoextract/template
index 079a8ce1350a..9b8e1e163e55 100644
--- a/srcpkgs/innoextract/template
+++ b/srcpkgs/innoextract/template
@@ -1,7 +1,7 @@
# Template file for 'innoextract'
pkgname=innoextract
version=1.9
-revision=1
+revision=2
build_style=cmake
configure_args="-DCMAKE_INSTALL_PREFIX=/usr"
hostmakedepends="boost extra-cmake-modules"
From cb37b6c2fed9b081a15474ce5c5a5c79c07dcd96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:34 +0700
Subject: [PATCH 038/107] juCi++: rebuild for boost-1.80
---
srcpkgs/juCi++/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index 1a7604b44a00..5103324dec20 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -1,7 +1,7 @@
# Template file for 'juCi++'
pkgname=juCi++
version=1.6.2
-revision=2
+revision=3
_libclangmm_commit="b342f4dd6de4fe509a692a4b4fcfc7e24aae9590"
_tiny_commit="c9c8bf810ddad8cd17882b9a9ee628a690e779f5"
wrksrc="jucipp-v${version}"
From 7682406d886ca9033724118c283cf86264d80e85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:35 +0700
Subject: [PATCH 039/107] kea: rebuild for boost-1.80
---
srcpkgs/kea/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index dc0bcc5de3fc..a55b58691de9 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -1,7 +1,7 @@
# Template file for 'kea'
pkgname=kea
version=1.9.5
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
$(vopt_if mysql --with-mysql)
From 1a7d47ccd427736569ad147721e65f960f837912 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:35 +0700
Subject: [PATCH 040/107] kig: rebuild for boost-1.80
---
srcpkgs/kig/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index 591db4bd477c..748c09f99e59 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,7 +1,7 @@
# Template file for 'kig'
pkgname=kig
version=22.04.3
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
pkg-config qt5-host-tools qt5-qmake"
From 60b968641e8b1503e66b8e3c8011a9b6593df440 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:35 +0700
Subject: [PATCH 041/107] leatherman: rebuild for boost-1.80
---
srcpkgs/leatherman/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/leatherman/template b/srcpkgs/leatherman/template
index b61fcd5dc205..5255ea4a18a1 100644
--- a/srcpkgs/leatherman/template
+++ b/srcpkgs/leatherman/template
@@ -1,7 +1,7 @@
# Template file for 'leatherman'
pkgname=leatherman
version=1.12.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DLEATHERMAN_SHARED=ON"
hostmakedepends="pkg-config python3"
From 2cd81f9508462d606f501a693aeec86b16f5d744 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:35 +0700
Subject: [PATCH 042/107] ledger: rebuild for boost-1.80
---
srcpkgs/ledger/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ledger/template b/srcpkgs/ledger/template
index c94b72709dea..130c727e7768 100644
--- a/srcpkgs/ledger/template
+++ b/srcpkgs/ledger/template
@@ -1,7 +1,7 @@
# Template file for 'ledger'
pkgname=ledger
version=3.2.1
-revision=1
+revision=2
build_style=cmake
makedepends="boost-devel gmp-devel mpfr-devel gettext-devel libedit-devel"
short_desc="Double-entry accounting system with a command-line reporting interface"
From e86041c70cd8d293139a4c5acd564bb5fe2fca06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:36 +0700
Subject: [PATCH 043/107] libbitcoin-blockchain: rebuild for boost-1.80
---
srcpkgs/libbitcoin-blockchain/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index e43ab8b9ede1..09a126e75356 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-blockchain'
pkgname=libbitcoin-blockchain
version=3.6.0
-revision=6
+revision=7
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
From 2de425a47c12c9466f3addbed1637899cf06b74d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:36 +0700
Subject: [PATCH 044/107] libbitcoin-client: rebuild for boost-1.80
---
srcpkgs/libbitcoin-client/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index 17849cd906d0..35f17b74ae00 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-client'
pkgname=libbitcoin-client
version=3.6.0
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"
From 7a7591fb6ed905638999d2141ef87552953c0706 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:36 +0700
Subject: [PATCH 045/107] libbitcoin-database: rebuild for boost-1.80
---
srcpkgs/libbitcoin-database/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index a3c48226ba2d..13cec4fdc3dd 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-database'
pkgname=libbitcoin-database
version=3.6.0
-revision=6
+revision=7
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
From f761daa6ba961f36c468c95db75e19091faf6741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:36 +0700
Subject: [PATCH 046/107] libbitcoin-explorer: rebuild for boost-1.80
---
srcpkgs/libbitcoin-explorer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index a1929f350269..7a5f8368b271 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-explorer'
pkgname=libbitcoin-explorer
version=3.6.0
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
From 4b975aeb1f50f583952db56b86b026ba8818e861 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:36 +0700
Subject: [PATCH 047/107] libbitcoin-network: rebuild for boost-1.80
---
srcpkgs/libbitcoin-network/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index d130facc40de..4f730a814242 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-network'
pkgname=libbitcoin-network
version=3.6.0
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
From cbe016a80000bfe80db85817ad3618afe8f524fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:37 +0700
Subject: [PATCH 048/107] libbitcoin-node: rebuild for boost-1.80
---
srcpkgs/libbitcoin-node/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 23e32624b5cc..ead87310627b 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-node'
pkgname=libbitcoin-node
version=3.6.0
-revision=6
+revision=7
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
From f4adf3c680389aef3608eecd1db8c984182acda0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:37 +0700
Subject: [PATCH 049/107] libbitcoin-protocol: rebuild for boost-1.80
---
srcpkgs/libbitcoin-protocol/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 838d62cc9ecd..53e2e6520f6a 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-protocol'
pkgname=libbitcoin-protocol
version=3.6.0
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
From 7b793f70dfed5762648ca3b4e8e0e27d814e48e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:37 +0700
Subject: [PATCH 050/107] libbitcoin-server: rebuild for boost-1.80
---
srcpkgs/libbitcoin-server/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index fc4988deac2b..70d4c492c5bb 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-server'
pkgname=libbitcoin-server
version=3.6.0
-revision=6
+revision=7
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
From 49326cd74d30b07cbf0dc679ff6b1b0f4d5a00a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:37 +0700
Subject: [PATCH 051/107] libbitcoin-system: rebuild for boost-1.80
---
srcpkgs/libbitcoin-system/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index 8b03fb248c42..8e6790c3ba66 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-system'
pkgname=libbitcoin-system
version=3.6.0
-revision=6
+revision=7
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
From 56f30f7ccf9a8cc7bd9453758112a4e0f08a3a80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:38 +0700
Subject: [PATCH 052/107] libcmis: rebuild for boost-1.80
---
srcpkgs/libcmis/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libcmis/template b/srcpkgs/libcmis/template
index fac133d5e4d9..43dd0a856122 100644
--- a/srcpkgs/libcmis/template
+++ b/srcpkgs/libcmis/template
@@ -1,7 +1,7 @@
# Template file for 'libcmis'
pkgname=libcmis
version=0.5.2
-revision=4
+revision=5
build_style=gnu-configure
configure_args="DOCBOOK2MAN=docbook2man --disable-werror"
hostmakedepends="pkg-config docbook2x"
From a0fd2510ff1967dbe4b4254f8c2b14ac4a6a3512 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:38 +0700
Subject: [PATCH 053/107] libime: rebuild for boost-1.80
---
srcpkgs/libime/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libime/template b/srcpkgs/libime/template
index a37db9885a48..363bdd93b16d 100644
--- a/srcpkgs/libime/template
+++ b/srcpkgs/libime/template
@@ -1,7 +1,7 @@
# Template file for 'libime'
pkgname=libime
version=1.0.13
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config gettext extra-cmake-modules python3"
From 7248d4d369f82b6d2d7268a9541832a32b17cf01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:38 +0700
Subject: [PATCH 054/107] libime-jyutping: rebuild for boost-1.80
---
srcpkgs/libime-jyutping/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libime-jyutping/template b/srcpkgs/libime-jyutping/template
index 3c33940ca368..6ae0855c3d7a 100644
--- a/srcpkgs/libime-jyutping/template
+++ b/srcpkgs/libime-jyutping/template
@@ -1,7 +1,7 @@
# Template file for 'libime-jyutping'
pkgname=libime-jyutping
version=1.0.4
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config gettext extra-cmake-modules python3 libime-utils"
From 74c03d968e96ec66405ce53f8cbac0510c1db429 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:38 +0700
Subject: [PATCH 055/107] libixion: rebuild for boost-1.80
---
srcpkgs/libixion/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libixion/template b/srcpkgs/libixion/template
index 37298a8b9427..ef1a00100f53 100644
--- a/srcpkgs/libixion/template
+++ b/srcpkgs/libixion/template
@@ -1,7 +1,7 @@
# Template file for 'libixion'
pkgname=libixion
version=0.17.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config python3"
makedepends="boost-devel fmt-devel mdds python3-devel spdlog"
From ea0304bc9365a55799f8be96cd66da98b51cb5de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:38 +0700
Subject: [PATCH 056/107] liborcus: rebuild for boost-1.80
---
srcpkgs/liborcus/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/liborcus/template b/srcpkgs/liborcus/template
index cf4b938fe37a..7b6b21a26dca 100644
--- a/srcpkgs/liborcus/template
+++ b/srcpkgs/liborcus/template
@@ -1,7 +1,7 @@
# Template file for 'liborcus'
pkgname=liborcus
version=0.17.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config python3"
makedepends="boost-devel mdds libixion-devel python3-devel zlib-devel"
From c20225a0ed88de83c79598918df9ec4bc95a3498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:39 +0700
Subject: [PATCH 057/107] libphonenumber: rebuild for boost-1.80
---
srcpkgs/libphonenumber/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libphonenumber/template b/srcpkgs/libphonenumber/template
index 9bef2825781c..05f28c4f5579 100644
--- a/srcpkgs/libphonenumber/template
+++ b/srcpkgs/libphonenumber/template
@@ -1,7 +1,7 @@
# Template file for 'libphonenumber'
pkgname=libphonenumber
version=8.12.39
-revision=6
+revision=7
build_wrksrc=cpp
build_style=cmake
build_helper=qemu
From e3a30c7fbbddcd4d3268eb8a7c41c712f3a65ed3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:39 +0700
Subject: [PATCH 058/107] librime: rebuild for boost-1.80
---
srcpkgs/librime/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/librime/template b/srcpkgs/librime/template
index 5f734c200bd7..7110eeffd3f9 100644
--- a/srcpkgs/librime/template
+++ b/srcpkgs/librime/template
@@ -1,7 +1,7 @@
# Template file for 'librime'
pkgname=librime
version=1.7.3
-revision=3
+revision=4
build_style=cmake
configure_args="-DCMAKE_BUILD_TYPE=None -DENABLE_LOGGING=OFF -DBUILD_TEST=ON
-DCAPNP_EXECUTABLE=/usr/bin/capnp -DCAPNPC_CXX_EXECUTABLE=/usr/bin/capnpc-c++"
From bd93db5fc8fd9455fd1b2d0c3e61a3ecf5694aa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:39 +0700
Subject: [PATCH 059/107] libtorrent-rasterbar: rebuild for boost-1.80
---
srcpkgs/libtorrent-rasterbar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index b1ceddc95282..5aceddec5646 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,7 +2,7 @@
# Breaks ABI/API without changing soname, revbump all dependants
pkgname=libtorrent-rasterbar
version=1.2.14
-revision=2
+revision=3
build_style=cmake
configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
-Dpython-bindings=ON"
From 074e19f508849b0eace6fbd325c392eb867e51ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:40 +0700
Subject: [PATCH 060/107] linssid: rebuild for boost-1.80
---
srcpkgs/linssid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linssid/template b/srcpkgs/linssid/template
index 937c8a0745e0..09206656186e 100644
--- a/srcpkgs/linssid/template
+++ b/srcpkgs/linssid/template
@@ -1,7 +1,7 @@
# Template file for 'linssid'
pkgname=linssid
version=3.6
-revision=4
+revision=5
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools"
makedepends="boost-devel qwt-devel"
From 4bc75e08c64d1ecdddcb40a4a0d5400bb001f248 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:40 +0700
Subject: [PATCH 061/107] litecoin: rebuild for boost-1.80
---
srcpkgs/litecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 3c33d9b0eb8a..7a188c3c9af8 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.18.1
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
--disable-tests --with-openssl"
From 273a3c883bfee0ee0ca0420e03e03c0bf8defbaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:40 +0700
Subject: [PATCH 062/107] monero: rebuild for boost-1.80
---
srcpkgs/monero/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index bff62347ebd6..eebce3d0a551 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
# Template file for 'monero'
pkgname=monero
version=0.17.2.3
-revision=2
+revision=3
_randomx_version="1.1.9"
# the revision monero uses as a submodule for the specific version
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
From 9043a4a043e550cd0fdf82ee2f1f2b9be76158e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:40 +0700
Subject: [PATCH 063/107] monero-gui: rebuild for boost-1.80
---
srcpkgs/monero-gui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 67ed3273defa..61e5dd9da1b7 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
# Template file for 'monero-gui'
pkgname=monero-gui
version=0.17.2.3
-revision=1
+revision=2
_monero_version=0.17.2.3
_randomx_version="1.1.9"
# the revision monero uses as a submodule for the specific version
From 4aa61002b65533b94ec016df037bb60b06e4e118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:40 +0700
Subject: [PATCH 064/107] mupen64plus: rebuild for boost-1.80
---
srcpkgs/mupen64plus/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mupen64plus/template b/srcpkgs/mupen64plus/template
index 4984a7f4a777..f4a58a4749cb 100644
--- a/srcpkgs/mupen64plus/template
+++ b/srcpkgs/mupen64plus/template
@@ -1,7 +1,7 @@
# Template file for 'mupen64plus'
pkgname=mupen64plus
version=2.5.9
-revision=1
+revision=2
archs="x86_64* i686*"
wrksrc="mupen64plus-bundle-src-${version}"
hostmakedepends="pkg-config which nasm"
From 14f213c3b39dba01b36f85fb6d52b7047be31598 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:41 +0700
Subject: [PATCH 065/107] musikcube: rebuild for boost-1.80
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index 2b75cbd976ea..11a3df3dc0aa 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=0.98.0
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1 -DENABLE_BUNDLED_TAGLIB=false"
From c11d16c79a418d99542a510bca060bdf52d76ec6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:41 +0700
Subject: [PATCH 066/107] namecoin: rebuild for boost-1.80
---
srcpkgs/namecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index e4cfb3777b71..7839d4008cd3 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
# Template file for 'namecoin'
pkgname=namecoin
version=0.18.1
-revision=5
+revision=6
wrksrc="${pkgname}-core-nc${version}"
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-static
From 4b4091ad7a501c8de1db69694b07e5e2fb676360 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:41 +0700
Subject: [PATCH 067/107] ncmpcpp: rebuild for boost-1.80
---
srcpkgs/ncmpcpp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 773deb4917d4..72a0d35e5e7f 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
--enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
From 2939fb23e2ba0e3210578bd95e814834d066bc05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:41 +0700
Subject: [PATCH 068/107] nix: rebuild for boost-1.80
---
srcpkgs/nix/template | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index bb585b6d7d54..e21c94aa2759 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,23 +1,25 @@
# Template file for 'nix'
pkgname=nix
-version=2.8.1
-revision=1
+version=2.10.3
+revision=2
build_style=gnu-configure
# Use /nix/var as suggested by the official Manual.
-configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
-hostmakedepends="curl pkg-config flex tar xz automake autoconf-archive mdBook jq"
+configure_args="--localstatedir=/nix/var
+ --with-sandbox-shell=/usr/bin/busybox.static"
+hostmakedepends="curl pkg-config flex tar xz automake autoconf-archive mdBook jq
+ busybox-static"
makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
liblzma-devel openssl-devel libsodium-devel sqlite-devel
libseccomp-devel editline-devel jq-devel libarchive-devel
gtest-devel lowdown-devel json-c++"
-depends="curl tar xz"
+depends="curl tar xz busybox-static"
short_desc="Purely functional package manager"
-maintainer="Juan RP <xtraeme@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://nixos.org/nix/"
changelog="https://nixos.org/releases/${pkgname}/${pkgname}-${version}/manual/#sec-relnotes"
distfiles="https://github.com/NixOS/nix/archive/refs/tags/${version}.tar.gz"
-checksum=6f19455775523fca4ae4096e6a6fc493f577198b968811f7fa77eb1fa5213b43
+checksum=5a8d79714bf04c425f41fdd22e67d4704d2e44c7a760c6c144e5767c6d662413
disable_parallel_build=yes
nocross="cross build populates /usr/lib32 with libraries and tries to link against them"
From 1dfab5f1ce35737ab84d14659e0b0dbe7bfb9930 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:42 +0700
Subject: [PATCH 069/107] opencamlib: rebuild for boost-1.80
---
srcpkgs/opencamlib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencamlib/template b/srcpkgs/opencamlib/template
index 8722aaf9ee64..140315ef3467 100644
--- a/srcpkgs/opencamlib/template
+++ b/srcpkgs/opencamlib/template
@@ -1,7 +1,7 @@
# Template file for 'opencamlib'
pkgname=opencamlib
version=2019.07
-revision=3
+revision=4
build_style=cmake
configure_args="-DBUILD_PY_LIB=ON -DUSE_PY_3=ON -DVERSION_STRING=${version}"
hostmakedepends="python3"
From 2315cfc8b30f65c194248011873c47ce2d57e0fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:42 +0700
Subject: [PATCH 070/107] openimageio: rebuild for boost-1.80
---
srcpkgs/openimageio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index 8abf3b05d6a3..23de3c1a91c3 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
# Template file for 'openimageio'
pkgname=openimageio
version=2.2.15.1
-revision=3
+revision=4
wrksrc="oiio-Release-${version}"
build_style=cmake
configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
From 66f8c9424dc4e9bd139e599b36e382436818ff7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:42 +0700
Subject: [PATCH 071/107] openmw: rebuild for boost-1.80
---
srcpkgs/openmw/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openmw/template b/srcpkgs/openmw/template
index 581e2cbb081e..9a263c9eae45 100644
--- a/srcpkgs/openmw/template
+++ b/srcpkgs/openmw/template
@@ -1,7 +1,7 @@
# Template file for 'openmw'
pkgname=openmw
version=0.47.0
-revision=1
+revision=2
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=cmake
# System bullet doesn't use double precision (double precision would break vdrift)
From 4403e5b45e83ead8da8748f0149ea69ba6d50724 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:42 +0700
Subject: [PATCH 072/107] openscad: rebuild for boost-1.80
---
srcpkgs/openscad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index 60d45d60615f..a3951a1a2201 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -1,7 +1,7 @@
# Template file for 'openscad'
pkgname=openscad
version=2021.01
-revision=2
+revision=3
build_style=qmake
hostmakedepends="bison flex pkg-config gettext qt5-qmake qt5-host-tools"
makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
From 030cd69805276f25b1d9d33f3d5f2e1cf1a1b38b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:42 +0700
Subject: [PATCH 073/107] openvdb: rebuild for boost-1.80
---
srcpkgs/openvdb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 4957f642552a..24bc2253828b 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,7 +1,7 @@
# Template file for 'openvdb'
pkgname=openvdb
version=9.0.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
hostmakedepends="pkg-config"
From 3a9da3af8ed90b30e305412cf41a6e47ade8c5a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:43 +0700
Subject: [PATCH 074/107] osm2pgsql: rebuild for boost-1.80
---
srcpkgs/osm2pgsql/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index 1c53c4505047..1d5f71b70140 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,7 +1,7 @@
# Template file for 'osm2pgsql'
pkgname=osm2pgsql
version=1.6.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="boost"
makedepends="expat-devel proj-devel bzip2-devel zlib-devel boost-devel
From 72e5de6a9aad4e4fe81b52d79bfec2bab42f94ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:43 +0700
Subject: [PATCH 075/107] poedit: rebuild for boost-1.80
---
srcpkgs/poedit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index f10aaf4c88a2..15cd4b6bae20 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
# Template file for 'poedit'
pkgname=poedit
version=3.0.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-wx-config=wx-config-gtk3"
hostmakedepends="pkg-config"
From 14382b5189c197c48c5bf037697e9eb38a3eb703 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:43 +0700
Subject: [PATCH 076/107] povray: rebuild for boost-1.80
---
srcpkgs/povray/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/povray/template b/srcpkgs/povray/template
index 30a2baab2039..93ab71f8e0db 100644
--- a/srcpkgs/povray/template
+++ b/srcpkgs/povray/template
@@ -1,7 +1,7 @@
# Template file for 'povray'
pkgname=povray
version=3.7.0.8
-revision=5
+revision=6
build_style=gnu-configure
_v=${version%.*.*}
configure_args="COMPILED_BY=Void --disable-optimiz-arch"
From 3d90d06b39a76819454d8cc00f3ccb9b76421a7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:43 +0700
Subject: [PATCH 077/107] pulseeffects-legacy: rebuild for boost-1.80
---
srcpkgs/pulseeffects-legacy/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pulseeffects-legacy/template b/srcpkgs/pulseeffects-legacy/template
index 585f25a55c8f..121e90e7f7dc 100644
--- a/srcpkgs/pulseeffects-legacy/template
+++ b/srcpkgs/pulseeffects-legacy/template
@@ -1,7 +1,7 @@
# Template file for 'pulseeffects-legacy'
pkgname=pulseeffects-legacy
version=4.8.5
-revision=3
+revision=4
wrksrc="easyeffects-${version}"
build_style=meson
hostmakedepends="itstool pkg-config gettext glib-devel"
From c05c62da8e57777eeabd775a66e8dd5578d58115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:44 +0700
Subject: [PATCH 078/107] pulseview: rebuild for boost-1.80
---
srcpkgs/pulseview/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pulseview/template b/srcpkgs/pulseview/template
index 83ce80bc39d9..e24c6cd30e88 100644
--- a/srcpkgs/pulseview/template
+++ b/srcpkgs/pulseview/template
@@ -1,7 +1,7 @@
# Template file for 'pulseview'
pkgname=pulseview
version=0.4.2
-revision=1
+revision=2
build_style=cmake
configure_args="-DDISABLE_WERROR=TRUE"
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From ca966febe0c067e48960ce6ae9337ddcf8530092 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:44 +0700
Subject: [PATCH 079/107] remwharead: rebuild for boost-1.80
---
srcpkgs/remwharead/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index 3e52473f86ce..cd36bd3b9849 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -1,7 +1,7 @@
# Template file for 'remwharead'
pkgname=remwharead
version=0.10.0
-revision=2
+revision=3
build_style=cmake
hostmakedepends="poco-devel asciidoc pkg-config"
makedepends="poco-devel boost-devel"
From 46e543ba21839aad2e54b4a033fb7f891f41b05a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:44 +0700
Subject: [PATCH 080/107] rstudio: rebuild for boost-1.80
---
srcpkgs/rstudio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index ad7c1e85cce7..c0354b8130cc 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
# Template file for 'rstudio'
pkgname=rstudio
version=1.4.1717
-revision=3
+revision=4
build_style=cmake
configure_args="-DRSTUDIO_TARGET=Desktop
-DRSTUDIO_USE_SYSTEM_BOOST=ON
From df0a4c016bb800b5284a4a577d96d0d1f0d1fb60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 20 Aug 2022 15:51:41 +0700
Subject: [PATCH 081/107] schroot: update to 1.6.12.
---
.../patches/{musl.patch => sbuild-i18n.patch} | 1 +
srcpkgs/schroot/patches/schroot-cppunit.patch | 11 -----
srcpkgs/schroot/patches/test-chown.patch | 8 ++++
srcpkgs/schroot/template | 47 ++++++++++++-------
4 files changed, 38 insertions(+), 29 deletions(-)
rename srcpkgs/schroot/patches/{musl.patch => sbuild-i18n.patch} (99%)
delete mode 100644 srcpkgs/schroot/patches/schroot-cppunit.patch
create mode 100644 srcpkgs/schroot/patches/test-chown.patch
diff --git a/srcpkgs/schroot/patches/musl.patch b/srcpkgs/schroot/patches/sbuild-i18n.patch
similarity index 99%
rename from srcpkgs/schroot/patches/musl.patch
rename to srcpkgs/schroot/patches/sbuild-i18n.patch
index e0dcaf3bae01..ff69d554cd9a 100644
--- a/srcpkgs/schroot/patches/musl.patch
+++ b/srcpkgs/schroot/patches/sbuild-i18n.patch
@@ -28,3 +28,4 @@
+#include "sbuild-i18n.h"
using namespace sbuild;
+
diff --git a/srcpkgs/schroot/patches/schroot-cppunit.patch b/srcpkgs/schroot/patches/schroot-cppunit.patch
deleted file mode 100644
index 3e11c73fd40b..000000000000
--- a/srcpkgs/schroot/patches/schroot-cppunit.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac 2017-05-20 09:50:30.146864516 +0000
-+++ b/configure.ac 2017-05-20 09:51:26.216792794 +0000
-@@ -336,7 +336,7 @@
- [HAVE_UUID=yes],
- [HAVE_UUID=no])
-
--AM_PATH_CPPUNIT([1.10.0], [HAVE_CPPUNIT=yes])
-+PKG_CHECK_MODULES([CPPUNIT], [cppunit], [HAVE_CPPUNIT=yes], [HAVE_CPPUNIT=no])
- AM_CONDITIONAL([USE_UNIT_TESTS], [test -n "$HAVE_CPPUNIT"])
-
- SCHROOT_CFLAGS="$UUID_CFLAGS"
diff --git a/srcpkgs/schroot/patches/test-chown.patch b/srcpkgs/schroot/patches/test-chown.patch
new file mode 100644
index 000000000000..c9d4e3919428
--- /dev/null
+++ b/srcpkgs/schroot/patches/test-chown.patch
@@ -0,0 +1,8 @@
+--- a/test/setup-test-data.cmake
++++ b/test/setup-test-data.cmake
+@@ -5,4 +5,4 @@ rm -rf test/testdata
+ mkdir test/testdata
+ cp -r ${PROJECT_SOURCE_DIR}/test/*.ex* test/testdata
+ mkdir test/testdata/run-parts.ex2
+-chown -R root:root test/testdata
++# chown -R root:root test/testdata
diff --git a/srcpkgs/schroot/template b/srcpkgs/schroot/template
index fd9ff15c7140..d73a149920a7 100644
--- a/srcpkgs/schroot/template
+++ b/srcpkgs/schroot/template
@@ -1,21 +1,25 @@
# Template file for 'schroot'
pkgname=schroot
reverts="1.7.2_9"
-version=1.6.10
-revision=12
-_debian_version=12+deb11u1
+version=1.6.12
+revision=1
+_debian_version=2
build_style=cmake
configure_args="
+ -DSCHROOT_LIBEXEC_DIR=/usr/libexec/schroot
+ -Ddebug=OFF
-Ddchroot=ON
-Dlvm-snapshot=ON
-Dbtrfs-snapshot=ON
+ -Dzfs-snapshot=ON
-Dblock-device=ON
-Dloopback=ON
+ -DLOSETUP_EXECUTABLE=/usr/sbin/losetup
-Duuid=ON
- -DBTRFS_EXECUTABLE=/usr/bin/btrfs
+ -DBTRFS_EXECUTABLE=/usr/sbin/btrfs
-DLVCREATE_EXECUTABLE=/usr/sbin/lvcreate
-DLVREMOVE_EXECUTABLE=/usr/sbin/lvremove
- -DZFS_EXECUTABLE=/usr/bin/zfs
+ -DZFS_EXECUTABLE=/usr/sbin/zfs
-Dbash_completion_dir=/usr/share/bash-completion/completions"
conf_files="
/etc/schroot/minimal/nssdatabases
@@ -41,27 +45,34 @@ make_dirs="
/var/lib/schroot/session 0755 root root
/var/lib/schroot/mount 0755 root root
/etc/schroot/chroot.d 0755 root root"
-hostmakedepends="pkg-config libtool gettext xz po4a groff"
-makedepends="boost-devel pam-devel lockdev-devel libuuid-devel e2fsprogs-devel
- gettext-devel libcppunit-devel"
+hostmakedepends="pkg-config gettext xz po4a groff"
+makedepends="boost-devel pam-devel lockdev-devel libuuid-devel
+ e2fsprogs-devel gettext-devel libcppunit-devel"
short_desc="Allows users to execute commands in different chroots"
maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
license="GPL-3.0-only"
homepage="https://wiki.debian.org/Schroot"
-distfiles="
- ${DEBIAN_SITE}/main/s/${pkgname}/${pkgname}_${version}.orig.tar.xz
- http://security.debian.org/debian-security/pool/main/s/${pkgname}/${pkgname}_${version}-${_debian_version}.debian.tar.xz"
-checksum="
- 3ce8dfd9cb97b099e4b6d4ccec421d6cc8c9ef84574681e928a12badb5643d0b
- 7bd4e0c2709979362c86a86c10d2b23d290d26e1a2d301a602e829327f483ec1"
-nocross=yes
+distfiles="${DEBIAN_SITE}/main/s/${pkgname}/${pkgname}_${version}.orig.tar.xz
+ ${DEBIAN_SITE}/main/s/${pkgname}/${pkgname}_${version}-${_debian_version}.debian.tar.xz"
+checksum="0bed8a069856a82261046b2e549af60ee32b79ebcdbf642424f378ec7aea6b77
+ 8ff03534007c6d55eb4032b637232954eaddba5cf18c91b42ff3016697ba0f93"
+skip_extraction="${pkgname}_${version}-${_debian_version}.debian.tar.xz"
-pre_configure() {
- cat ../debian/patches/series | while read p; do
- patch -p1 -i ../debian/patches/$p
+pre_patch() {
+ rm -rf debian
+ bsdtar -xf "$XBPS_SRCDISTDIR/$pkgname-$version/$skip_extraction"
+ grep '^[^#]' debian/patches/series | while read p; do
+ msg_normal "Patching (Debian): $p\n"
+ patch -Np1 -s -F0 -i debian/patches/$p
done
}
+do_check() {
+ # expect to be run with root
+ cd build
+ ctest -E "(sbuild-chroot-config)"
+}
+
post_install() {
# Remove development files
rm -rf ${DESTDIR}/usr/include \
From c53ffa9f6073f4d61b448ba8ccbcf16032bade8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:44 +0700
Subject: [PATCH 082/107] snapper: rebuild for boost-1.80
---
srcpkgs/snapper/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template
index bc7bbe5cf84b..85697667ff77 100644
--- a/srcpkgs/snapper/template
+++ b/srcpkgs/snapper/template
@@ -1,7 +1,7 @@
# Template file for 'snapper'
pkgname=snapper
version=0.10.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-zypp --disable-systemd --with-conf=/etc/conf.d"
conf_files="/etc/conf.d/snapper"
From f656bdf3ff26c09c29a65cd48f648c70dab036ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:45 +0700
Subject: [PATCH 083/107] source-highlight: rebuild for boost-1.80
---
srcpkgs/source-highlight/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/source-highlight/template b/srcpkgs/source-highlight/template
index ab56401c64a0..f76c987335af 100644
--- a/srcpkgs/source-highlight/template
+++ b/srcpkgs/source-highlight/template
@@ -1,7 +1,7 @@
# Template file for 'source-highlight'
pkgname=source-highlight
version=3.1.9
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--with-boost=${XBPS_CROSS_BASE}/usr
--with-bash-completion=/usr/share/bash-completion/completions"
From 928f660fdb78e98905f9eee446d5eb8a524db754 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:45 +0700
Subject: [PATCH 084/107] supercollider: rebuild for boost-1.80
---
srcpkgs/supercollider/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/supercollider/template b/srcpkgs/supercollider/template
index 35f6d9dfb7c2..b0b8278470ef 100644
--- a/srcpkgs/supercollider/template
+++ b/srcpkgs/supercollider/template
@@ -1,7 +1,7 @@
# Template file for 'supercollider'
pkgname=supercollider
version=3.11.1
-revision=3
+revision=4
wrksrc="SuperCollider-${version}-Source"
build_style=cmake
make_cmd=make
From df13190892cd9491aed69f3912c5ebac5b799dcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:45 +0700
Subject: [PATCH 085/107] supertux2: rebuild for boost-1.80
---
srcpkgs/supertux2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/supertux2/template b/srcpkgs/supertux2/template
index 56057f5837d5..fce60e205a59 100644
--- a/srcpkgs/supertux2/template
+++ b/srcpkgs/supertux2/template
@@ -1,7 +1,7 @@
# Template file for 'supertux2'
pkgname=supertux2
version=0.6.3
-revision=1
+revision=2
wrksrc="SuperTux-v${version}-Source"
build_style=cmake
configure_args="
From 291f41b6d263f3201abbe2d1a74e6161b97248b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:45 +0700
Subject: [PATCH 086/107] swiften: rebuild for boost-1.80
---
srcpkgs/swiften/patches/boost-endian.patch | 15 +++++++++++++++
srcpkgs/swiften/patches/std.patch | 11 +++++++++++
srcpkgs/swiften/template | 4 ++--
3 files changed, 28 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/swiften/patches/boost-endian.patch
create mode 100644 srcpkgs/swiften/patches/std.patch
diff --git a/srcpkgs/swiften/patches/boost-endian.patch b/srcpkgs/swiften/patches/boost-endian.patch
new file mode 100644
index 000000000000..1cd2c2fb4816
--- /dev/null
+++ b/srcpkgs/swiften/patches/boost-endian.patch
@@ -0,0 +1,15 @@
+--- a/Swiften/Base/Platform.h
++++ b/Swiften/Base/Platform.h
+@@ -43,9 +43,9 @@
+ #endif
+
+ // Endianness
+-#include <boost/detail/endian.hpp>
+-#if defined(BOOST_LITTLE_ENDIAN)
++#include <boost/predef/other/endian.h>
++#if BOOST_ENDIAN_LITTLE_BYTE
+ #define SWIFTEN_LITTLE_ENDIAN
+-#elif defined(BOOST_BIG_ENDIAN)
++#elif BOOST_ENDIAN_BIG_BYTE
+ #define SWIFTEN_BIG_ENDIAN
+ #endif
diff --git a/srcpkgs/swiften/patches/std.patch b/srcpkgs/swiften/patches/std.patch
new file mode 100644
index 000000000000..9534e8a321d2
--- /dev/null
+++ b/srcpkgs/swiften/patches/std.patch
@@ -0,0 +1,11 @@
+--- a/Swift/Controllers/ShowProfileController.h
++++ b/Swift/Controllers/ShowProfileController.h
+@@ -18,6 +18,8 @@
+
+ #include <Swift/Controllers/UIEvents/UIEvent.h>
+
++#include <map>
++
+ namespace Swift {
+ class VCardManager;
+ class ProfileWindow;
diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 969ef1eb5d78..9014153a8818 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,11 +1,11 @@
# Template file for 'swiften'
pkgname=swiften
version=4.0.3
-revision=2
+revision=3
wrksrc="swift-${version}"
hostmakedepends="scons pkg-config"
makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
- lua51-devel miniupnpc-devel sqlite-devel"
+ lua51-devel miniupnpc-devel sqlite-devel hunspell-devel"
short_desc="XMPP library for C++"
maintainer="John Regan <john@jrjrtech.com>"
license="GPL-3.0-only"
From e4e4d2b994d36dd3586e7a7ab9c404c437099e4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:46 +0700
Subject: [PATCH 087/107] syncthingtray: rebuild for boost-1.80
---
srcpkgs/syncthingtray/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/syncthingtray/template b/srcpkgs/syncthingtray/template
index 4f338f2cc200..f445aa92db1e 100644
--- a/srcpkgs/syncthingtray/template
+++ b/srcpkgs/syncthingtray/template
@@ -1,7 +1,7 @@
# Template file for 'syncthingtray'
pkgname=syncthingtray
version=1.2.2
-revision=1
+revision=2
build_style=cmake
configure_args="-DJS_PROVIDER=qml -DBUILTIN_TRANSLATIONS=ON -DSYSTEMD_SUPPORT=OFF
-DBUILD_SHARED_LIBS=ON -DWEBVIEW_PROVIDER=$(vopt_if webengine webengine none)"
From aef5ab68a99001b89c5eff85b9d199dcd9f8c665 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:46 +0700
Subject: [PATCH 088/107] tmfs: rebuild for boost-1.80
---
srcpkgs/tmfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tmfs/template b/srcpkgs/tmfs/template
index 1dbed3e0eb72..ed4fb5fed836 100644
--- a/srcpkgs/tmfs/template
+++ b/srcpkgs/tmfs/template
@@ -1,7 +1,7 @@
# Template file for 'tmfs'
pkgname=tmfs
version=r5
-revision=7
+revision=8
build_style=cmake
hostmakedepends="pkg-config"
makedepends="fuse-devel boost-devel"
From ccdf157e5dc4921fb251738c384d8c5224a21321 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:46 +0700
Subject: [PATCH 089/107] tomahawk: rebuild for boost-1.80
---
srcpkgs/tomahawk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tomahawk/template b/srcpkgs/tomahawk/template
index 0edbacc5f8ad..b66b9a876a5c 100644
--- a/srcpkgs/tomahawk/template
+++ b/srcpkgs/tomahawk/template
@@ -1,7 +1,7 @@
# Template file for 'tomahawk'
pkgname=tomahawk
version=0.8.4
-revision=21
+revision=22
wrksrc=${pkgname}-${_commit}
_commit=90ec6f0dc701cba0533c66abdcb904e29f02a66f
build_style=cmake
From 1508ba9c7418a81979d25b45c98c6f5fac03f047 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:46 +0700
Subject: [PATCH 090/107] uhd: rebuild for boost-1.80
---
srcpkgs/uhd/patches/boost-math.patch | 31 +++++++++++++++++++++++++++
srcpkgs/uhd/patches/std-complex.patch | 10 +++++++++
srcpkgs/uhd/template | 2 +-
3 files changed, 42 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/uhd/patches/boost-math.patch
create mode 100644 srcpkgs/uhd/patches/std-complex.patch
diff --git a/srcpkgs/uhd/patches/boost-math.patch b/srcpkgs/uhd/patches/boost-math.patch
new file mode 100644
index 000000000000..9ac6dae1df9d
--- /dev/null
+++ b/srcpkgs/uhd/patches/boost-math.patch
@@ -0,0 +1,31 @@
+--- a/host/lib/usrp/usrp2/usrp2_impl.cpp
++++ b/host/lib/usrp/usrp2/usrp2_impl.cpp
+@@ -18,6 +18,8 @@
+ #include <boost/asio.hpp> //used for htonl and ntohl
+ #include <boost/asio/ip/address_v4.hpp>
+ #include <boost/format.hpp>
++#include <boost/math/special_functions/round.hpp>
++#include <boost/math/special_functions/sign.hpp>
+ #include <boost/thread.hpp>
+ #include <functional>
+
+--- a/host/lib/usrp/cores/rx_frontend_core_3000.cpp
++++ b/host/lib/usrp/cores/rx_frontend_core_3000.cpp
+@@ -12,6 +12,7 @@
+ #include <uhdlib/usrp/cores/rx_frontend_core_3000.hpp>
+ #include <boost/assign/list_of.hpp>
+ #include <boost/math/special_functions/round.hpp>
++#include <boost/math/special_functions/sign.hpp>
+ #include <functional>
+
+ using namespace uhd;
+--- a/host/lib/usrp/cores/rx_dsp_core_3000.cpp
++++ b/host/lib/usrp/cores/rx_dsp_core_3000.cpp
+@@ -14,6 +14,7 @@
+ #include <uhdlib/usrp/cores/rx_dsp_core_3000.hpp>
+ #include <boost/assign/list_of.hpp>
+ #include <boost/math/special_functions/round.hpp>
++#include <boost/math/special_functions/sign.hpp>
+ #include <algorithm>
+ #include <cmath>
+ #include <functional>
diff --git a/srcpkgs/uhd/patches/std-complex.patch b/srcpkgs/uhd/patches/std-complex.patch
new file mode 100644
index 000000000000..c7573bf4ade2
--- /dev/null
+++ b/srcpkgs/uhd/patches/std-complex.patch
@@ -0,0 +1,10 @@
+--- a/host/tests/tx_streamer_test.cpp
++++ b/host/tests/tx_streamer_test.cpp
+@@ -7,6 +7,7 @@
+ #include "../common/mock_link.hpp"
+ #include <uhdlib/transport/tx_streamer_impl.hpp>
+ #include <boost/test/unit_test.hpp>
++#include <complex>
+ #include <iostream>
+ #include <memory>
+
diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template
index 5f043162d7dc..170e12670c2c 100644
--- a/srcpkgs/uhd/template
+++ b/srcpkgs/uhd/template
@@ -1,7 +1,7 @@
# Template file for 'uhd'
pkgname=uhd
version=4.0.0.0
-revision=1
+revision=2
build_wrksrc=host
build_style=cmake
configure_args="-DCMAKE_BUILD_TYPE=None"
From a9c25ff7cfa44ca80bf2f8b8b6bee93c10c0b90c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:47 +0700
Subject: [PATCH 091/107] wesnoth: rebuild for boost-1.80
---
srcpkgs/wesnoth/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 0fcc09b29c10..4d55d20b5959 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,7 +1,7 @@
# Template file for 'wesnoth'
pkgname=wesnoth
version=1.14.17
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_OMP=1"
hostmakedepends="pkg-config gettext"
@@ -18,7 +18,7 @@ checksum=3646cba604e09c12d6900a733bcb78cbf05f2f75f05346630d6529c220f584e1
replaces="wesnoth-data>=0"
CFLAGS="-UNDEBUG"
-CXXFLAGS="-UNDEBUG"
+CXXFLAGS="-UNDEBUG -std=c++14"
post_install() {
# runit service
From ef06323851cd7a139a6c41a399f3433601a18631 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:47 +0700
Subject: [PATCH 092/107] wsjtx: rebuild for boost-1.80
---
srcpkgs/wsjtx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wsjtx/template b/srcpkgs/wsjtx/template
index c1838dd7cf51..7324d85bd64d 100644
--- a/srcpkgs/wsjtx/template
+++ b/srcpkgs/wsjtx/template
@@ -1,7 +1,7 @@
# Template file for 'wsjtx'
pkgname=wsjtx
version=2.5.4
-revision=1
+revision=2
build_wrksrc=wsjtx
build_style=cmake
configure_args="-DRIGCTLCOM_EXE= -DRIGCTL_EXE= -DRIGCTLD_EXE="
From fc501a807a30fd852f09eb7b125a5661f6b2a27d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:39 +0700
Subject: [PATCH 093/107] libreoffice: update to 7.4.0.3.
---
srcpkgs/libreoffice/template | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 158df0f30ebc..00ceb97950ff 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
-version=7.3.3.2
-revision=3
+version=7.4.0.3
+revision=1
build_style=meta
make_build_target="build-nocheck"
nocross="Several dependencies are nocross=yes"
@@ -9,7 +9,7 @@ nocross="Several dependencies are nocross=yes"
hostmakedepends="automake flex git gperf hyphen icu libtool openldap which gettext xz
perl-Archive-Zip pkg-config qt5-qmake sane ucpp unzip zip python3-setuptools
fontforge python3-lxml"
-makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
+makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel icu-devel
frameworkintegration-devel glyphy-devel gpgmepp-devel gst-plugins-base1-devel
gtk+-devel gtk+3-devel hunspell-devel hyphen-devel libXt-devel libabw-devel
libatomic_ops-devel libbluetooth-devel libcdr-devel libe-book-devel
@@ -111,10 +111,10 @@ distfiles="
${_addurl}/Scheherazade-2.100.zip
${_addurl}/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz
"
-checksum="ee12bdbe1621c20e2744bc5b6c5967810f25a5760b98ac5812d550ab00968685
- a6f67d5a20fe656c909b16c338759c187cf7e5e7f463d33d8d58a8bbe0280323
- 688634eccb802c156496124b394c0ec5e21059a9b6cd0095930f9e76f9eefe9b
- b91b0a482fa42d59e1605f39a3917166e7ff76bfa8e9b62d6eef0a9b04b3351c
+checksum="acc383a4386e1ceb74266a2f6406dee4b3a78576bda6bc71630f629ea20e3c19
+ 7d0b2927051111acdf99c9e805078cf5fb7f90f855b6182a225d4319bb0419ad
+ aa1922940b1742a833f34efc2cc2267dd592363530764dcfd352112c9b329547
+ e6fc4b8b4adf6c3b23f555f0a245ef535ad1771a386480ec14cab71e70179d8c
1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66
From 111e3773ffa191b53c0e4d797615b102d0c38fbb Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 20:49:38 +0400
Subject: [PATCH 094/107] fmt: update to 9.0.0.
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index b91133da6484..dbc48a29aad1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3540,7 +3540,7 @@ libcotp.so.12 libcotp-1.2.1_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.8 fmt-8.0.1_1
+libfmt.so.9 fmt-9.0.0_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.25 libtls-3.5.2_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index 35a914c75eab..6fa037dfbaab 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=8.1.1
+version=9.0.0
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,7 +10,7 @@ license="BSD-2-Clause"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=3d794d3cf67633b34b2771eb9f073bde87e846e0d395d254df7b211ef1ec7346
+checksum=9a1e0e9e843a356d65c7604e2c8bf9402b50fe294c355de0095ebd42fb9bd2c5
post_install() {
vlicense LICENSE.rst LICENSE
From 784b69dd995f511d9467c3ad32e0549cbdd66ce6 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:33 +0400
Subject: [PATCH 095/107] Bear: update to 3.0.20.
---
srcpkgs/Bear/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index fce6309ca6fa..c6c1fb6e9c38 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
-version=3.0.19
-revision=2
+version=3.0.20
+revision=1
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-3.0-or-later"
homepage="https://github.com/rizsotto/Bear"
distfiles="https://github.com/rizsotto/Bear/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=2fcfe2c6e029182cfc54ed26b3505c0ef12b0f43df03fb587f335afdc2ca9431
+checksum=45cfcdab07f824f6c06c9776701156f7a04b23eadd25ecbc88c188789a447cc7
conflicts="interception-tools>=0" # /usr/bin/intercept
if [ -z "$XBPS_CHECK_PKGS" ]; then
From 0f47131c0c331089673af61bfc17e2c1baf4627a Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:33 +0400
Subject: [PATCH 096/107] cherrytree: revbump for fmt 9.0
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 55512e3b5ef7..e52a677a47b5 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=0.99.39
-revision=2
+revision=3
wrksrc="${pkgname}_${version}"
build_style=cmake
hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
From 9b0258045e2e515f84671a76e6ac7634dc9264a2 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:33 +0400
Subject: [PATCH 097/107] coeurl: revbump for fmt 9.0
---
srcpkgs/coeurl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index d0dbcbc60ba0..a9f2dfbbc123 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,7 +1,7 @@
# Template file for 'coeurl'
pkgname=coeurl
version=0.1.1
-revision=1
+revision=2
wrksrc=coeurl-v${version}
build_style=meson
hostmakedepends="pkg-config"
From e481abb5509b869c78b98f89666f192038a8db5d Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:34 +0400
Subject: [PATCH 098/107] easyeffects: revbump for fmt 9.0
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index ac84ce15b068..0ddfb1b5833d 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=6.2.4
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel"
makedepends="gtkmm4-devel pipewire-devel zita-convolver-devel lilv-devel
From c6b831b8d9db98226645ec7b1dcad6aeede4d338 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:34 +0400
Subject: [PATCH 099/107] gerbera: revbump for fmt 9.0, add patch
---
srcpkgs/gerbera/patches/fmt-9-fix.patch | 32 +++++++++++++++++++++++++
srcpkgs/gerbera/template | 2 +-
2 files changed, 33 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/gerbera/patches/fmt-9-fix.patch
diff --git a/srcpkgs/gerbera/patches/fmt-9-fix.patch b/srcpkgs/gerbera/patches/fmt-9-fix.patch
new file mode 100644
index 000000000000..7adedf9005db
--- /dev/null
+++ b/srcpkgs/gerbera/patches/fmt-9-fix.patch
@@ -0,0 +1,32 @@
+From d7b8fafbc94405c20753fed569abd8878cccde89 Mon Sep 17 00:00:00 2001
+From: Felix Yan <felixonmars@archlinux.org>
+Date: Fri, 19 Aug 2022 15:22:10 +0300
+Subject: [PATCH] Fix build with fmt 9.0
+
+Fixes #2681
+---
+ src/database/sql_format.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/database/sql_format.h b/src/database/sql_format.h
+index 32dc00efa..e4e1909a8 100644
+--- a/src/database/sql_format.h
++++ b/src/database/sql_format.h
+@@ -42,7 +42,7 @@ struct SQLIdentifier {
+ template <>
+ struct fmt::formatter<SQLIdentifier> : formatter<std::string_view> {
+ template <typename FormatContext>
+- auto format(const SQLIdentifier& tn, FormatContext& ctx) -> decltype(ctx.out())
++ auto format(const SQLIdentifier& tn, FormatContext& ctx) const -> decltype(ctx.out())
+ {
+ return format_to(ctx.out(), "{}{}{}", tn.quote_begin, tn.name, tn.quote_end);
+ }
+@@ -61,7 +61,7 @@ struct ColumnUpdate {
+ template <>
+ struct fmt::formatter<ColumnUpdate> : formatter<std::string_view> {
+ template <typename FormatContext>
+- auto format(const ColumnUpdate& a, FormatContext& ctx) -> decltype(ctx.out())
++ auto format(const ColumnUpdate& a, FormatContext& ctx) const -> decltype(ctx.out())
+ {
+ return format_to(ctx.out(), "{} = {}", a.column, a.value);
+ }
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 35136708b3e5..100b94a7acbe 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.11.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From f5e601820a3a2d23732a08fda7cb64cde6908d0d Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:34 +0400
Subject: [PATCH 100/107] kodi: revbump for fmt 9.0
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index d3e9a13afdd5..4b6c9e1ade0c 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=19.4
-revision=3
+revision=4
_codename="Matrix"
wrksrc="xbmc-${version}-${_codename}"
build_style=cmake
From aba3c0ec18f9547dde2455fe6ea1106de026c170 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:34 +0400
Subject: [PATCH 101/107] MangoHud: revbump for fmt 9.0
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index a9973bcad30a..fb0e18c1a1f4 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -2,7 +2,7 @@
pkgname=MangoHud
version=0.6.7.1
_version="${version%.*}-${version##*.}"
-revision=2
+revision=3
wrksrc="MangoHud-v${_version}"
build_style=meson
configure_args="-Duse_system_vulkan=enabled -Dwith_xnvctrl=disabled
From 8bac11cc1bb97be15e06baefd48b74c960375651 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 102/107] mkvtoolnix: revbump for fmt 9.0
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index a1d2adbc4b3f..d98022773c0a 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=70.0.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
From 86aa126e32cc533dff524b94f0418e3992d7293f Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 103/107] mpd: revbump for fmt 9.0
---
srcpkgs/mpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 98195b80a38d..b43c83fbb0f7 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,7 +1,7 @@
# Template file for 'mpd'
pkgname=mpd
version=0.23.8
-revision=1
+revision=2
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
-Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
From 2dd6b7d52ca6d3b933fa8373b38c3510ee88533c Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 104/107] mtxclient: revbump for fmt 9.0
---
srcpkgs/mtxclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 4ec895656749..12fea54d3fd5 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.8.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From 0f502a46c3c8a08b20fff1045cc0e2b54950b8a3 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 105/107] nheko: revbump for fmt 9.0
---
srcpkgs/nheko/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index f35fd3942116..8e41e9e1f2f0 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.10.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative asciidoc"
makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
From cb6c39e4f29583049bec68d46543788617e57793 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 106/107] spdlog: revbump for fmt 9.0
---
srcpkgs/spdlog/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 187ec0d0eb6e..ef1ee76ffcca 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
# Template file for 'spdlog'
pkgname=spdlog
version=1.10.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
-DSPDLOG_BUILD_SHARED=ON"
From ce1b9eff4521ef800d24ebb3bc8976f8343b4cd0 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 107/107] Waybar: revbump for fmt 9.0
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 8ac3d4290b39..e40288e00b75 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.9.13
-revision=1
+revision=2
_date_version=3.0.0
build_style=meson
configure_args="-Dgtk-layer-shell=enabled -Dlibudev=enabled -Dman-pages=enabled
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Updated] [WIP] boost 1.80
2022-08-27 18:49 [PR PATCH] [WIP] boost 1.80 sgn
2022-08-29 2:10 ` [PR PATCH] [Updated] " sgn
2022-08-29 12:49 ` sgn
@ 2022-08-29 15:28 ` sgn
2022-08-29 15:54 ` sgn
` (4 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: sgn @ 2022-08-29 15:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1251 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages boost-1.80
https://github.com/void-linux/void-packages/pull/38949
[WIP] boost 1.80
<!-- Uncomment relevant sections and delete options which are not applicable -->
[ci skip]
#### Testing the changes
- I tested the changes in this PR: **NO**
Close #38916
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38949.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boost-1.80-38949.patch --]
[-- Type: text/x-diff, Size: 154627 bytes --]
From 95ffe404eb7a4736a33dda983b2fa7a0be1f20f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 15:21:49 +0700
Subject: [PATCH 001/108] boost: update to 1.80.0.
---
common/shlibs | 65 +++---
.../{boost-python1.72 => boost-python3-1.80} | 0
.../patches/0001-compat-glibc-2.34.patch | 23 --
.../patches/0002-compat-glibc-2.34.patch | 30 ---
srcpkgs/boost/patches/exec_file.patch | 45 ----
.../boost/patches/install-strip-destdir.patch | 27 +++
srcpkgs/boost/patches/mips.patch | 11 -
srcpkgs/boost/template | 196 +++++++++---------
...boost-python3-1.72 => libboost_atomic1.80} | 0
...ibboost_atomic1.72 => libboost_chrono1.80} | 0
...oost_chrono1.72 => libboost_container1.80} | 0
...ost_container1.72 => libboost_context1.80} | 0
...oost_context1.72 => libboost_contract1.80} | 0
...st_contract1.72 => libboost_coroutine1.80} | 0
...t_coroutine1.72 => libboost_date_time1.80} | 0
...boost_date_time1.72 => libboost_fiber1.80} | 0
...oost_fiber1.72 => libboost_filesystem1.80} | 0
...oost_filesystem1.72 => libboost_graph1.80} | 0
...boost_graph1.72 => libboost_iostreams1.80} | 0
...bboost_iostreams1.72 => libboost_json1.80} | 0
...ibboost_locale1.72 => libboost_locale1.80} | 0
.../{libboost_log1.72 => libboost_log1.80} | 0
...t_log_setup1.72 => libboost_log_setup1.80} | 0
...ost_math_c991.72 => libboost_math_c991.80} | 0
...t_math_c99f1.72 => libboost_math_c99f1.80} | 0
...t_math_c99l1.72 => libboost_math_c99l1.80} | 0
...ost_math_tr11.72 => libboost_math_tr11.80} | 0
...t_math_tr1f1.72 => libboost_math_tr1f1.80} | 0
...t_math_tr1l1.72 => libboost_math_tr1l1.80} | 0
...g_exec_monitor1.72 => libboost_nowide1.80} | 0
...ions1.72 => libboost_prg_exec_monitor1.80} | 0
...andom1.72 => libboost_program_options1.80} | 0
...libboost_regex1.72 => libboost_random1.80} | 0
...t_serialization1.72 => libboost_regex1.80} | 0
...dr2line1.72 => libboost_serialization1.80} | 0
...1.72 => libboost_stacktrace_addr2line1.80} | 0
...noop1.72 => libboost_stacktrace_basic1.80} | 0
...ystem1.72 => libboost_stacktrace_noop1.80} | 0
...ibboost_thread1.72 => libboost_system1.80} | 0
...libboost_timer1.72 => libboost_thread1.80} | 0
...st_type_erasure1.72 => libboost_timer1.80} | 0
...ramework1.72 => libboost_type_erasure1.80} | 0
...e1.72 => libboost_unit_test_framework1.80} | 0
...t_wserialization1.72 => libboost_wave1.80} | 0
srcpkgs/libboost_wserialization1.80 | 1 +
45 files changed, 164 insertions(+), 234 deletions(-)
rename srcpkgs/{boost-python1.72 => boost-python3-1.80} (100%)
delete mode 100644 srcpkgs/boost/patches/0001-compat-glibc-2.34.patch
delete mode 100644 srcpkgs/boost/patches/0002-compat-glibc-2.34.patch
delete mode 100644 srcpkgs/boost/patches/exec_file.patch
create mode 100644 srcpkgs/boost/patches/install-strip-destdir.patch
delete mode 100644 srcpkgs/boost/patches/mips.patch
rename srcpkgs/{boost-python3-1.72 => libboost_atomic1.80} (100%)
rename srcpkgs/{libboost_atomic1.72 => libboost_chrono1.80} (100%)
rename srcpkgs/{libboost_chrono1.72 => libboost_container1.80} (100%)
rename srcpkgs/{libboost_container1.72 => libboost_context1.80} (100%)
rename srcpkgs/{libboost_context1.72 => libboost_contract1.80} (100%)
rename srcpkgs/{libboost_contract1.72 => libboost_coroutine1.80} (100%)
rename srcpkgs/{libboost_coroutine1.72 => libboost_date_time1.80} (100%)
rename srcpkgs/{libboost_date_time1.72 => libboost_fiber1.80} (100%)
rename srcpkgs/{libboost_fiber1.72 => libboost_filesystem1.80} (100%)
rename srcpkgs/{libboost_filesystem1.72 => libboost_graph1.80} (100%)
rename srcpkgs/{libboost_graph1.72 => libboost_iostreams1.80} (100%)
rename srcpkgs/{libboost_iostreams1.72 => libboost_json1.80} (100%)
rename srcpkgs/{libboost_locale1.72 => libboost_locale1.80} (100%)
rename srcpkgs/{libboost_log1.72 => libboost_log1.80} (100%)
rename srcpkgs/{libboost_log_setup1.72 => libboost_log_setup1.80} (100%)
rename srcpkgs/{libboost_math_c991.72 => libboost_math_c991.80} (100%)
rename srcpkgs/{libboost_math_c99f1.72 => libboost_math_c99f1.80} (100%)
rename srcpkgs/{libboost_math_c99l1.72 => libboost_math_c99l1.80} (100%)
rename srcpkgs/{libboost_math_tr11.72 => libboost_math_tr11.80} (100%)
rename srcpkgs/{libboost_math_tr1f1.72 => libboost_math_tr1f1.80} (100%)
rename srcpkgs/{libboost_math_tr1l1.72 => libboost_math_tr1l1.80} (100%)
rename srcpkgs/{libboost_prg_exec_monitor1.72 => libboost_nowide1.80} (100%)
rename srcpkgs/{libboost_program_options1.72 => libboost_prg_exec_monitor1.80} (100%)
rename srcpkgs/{libboost_random1.72 => libboost_program_options1.80} (100%)
rename srcpkgs/{libboost_regex1.72 => libboost_random1.80} (100%)
rename srcpkgs/{libboost_serialization1.72 => libboost_regex1.80} (100%)
rename srcpkgs/{libboost_stacktrace_addr2line1.72 => libboost_serialization1.80} (100%)
rename srcpkgs/{libboost_stacktrace_basic1.72 => libboost_stacktrace_addr2line1.80} (100%)
rename srcpkgs/{libboost_stacktrace_noop1.72 => libboost_stacktrace_basic1.80} (100%)
rename srcpkgs/{libboost_system1.72 => libboost_stacktrace_noop1.80} (100%)
rename srcpkgs/{libboost_thread1.72 => libboost_system1.80} (100%)
rename srcpkgs/{libboost_timer1.72 => libboost_thread1.80} (100%)
rename srcpkgs/{libboost_type_erasure1.72 => libboost_timer1.80} (100%)
rename srcpkgs/{libboost_unit_test_framework1.72 => libboost_type_erasure1.80} (100%)
rename srcpkgs/{libboost_wave1.72 => libboost_unit_test_framework1.80} (100%)
rename srcpkgs/{libboost_wserialization1.72 => libboost_wave1.80} (100%)
create mode 120000 srcpkgs/libboost_wserialization1.80
diff --git a/common/shlibs b/common/shlibs
index 48c63f2d0735..b91133da6484 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -620,38 +620,39 @@ libip4tc.so.2 iptables-1.8.3_1
libipq.so.0 iptables-1.4.7_1
libnm.so.0 libnm-1.0.0_1
libKF5ItemModels.so.5 kitemmodels-5.26.0_1
-libboost_context.so.1.72.0 libboost_context1.72-1.72.0_1
-libboost_coroutine.so.1.72.0 libboost_coroutine1.72-1.72.0_1
-libboost_container.so.1.72.0 libboost_container1.72-1.72.0_1
-libboost_prg_exec_monitor.so.1.72.0 libboost_prg_exec_monitor1.72-1.72.0_1
-libboost_timer.so.1.72.0 libboost_timer1.72-1.72.0_1
-libboost_random.so.1.72.0 libboost_random1.72-1.72.0_1
-libboost_filesystem.so.1.72.0 libboost_filesystem1.72-1.72.0_1
-libboost_unit_test_framework.so.1.72.0 libboost_unit_test_framework1.72-1.72.0_1
-libboost_math_c99.so.1.72.0 libboost_math_c991.72-1.72.0_1
-libboost_math_tr1.so.1.72.0 libboost_math_tr11.72-1.72.0_1
-libboost_regex.so.1.72.0 libboost_regex1.72-1.72.0_1
-libboost_serialization.so.1.72.0 libboost_serialization1.72-1.72.0_1
-libboost_chrono.so.1.72.0 libboost_chrono1.72-1.72.0_1
-libboost_wserialization.so.1.72.0 libboost_wserialization1.72-1.72.0_1
-libboost_graph.so.1.72.0 libboost_graph1.72-1.72.0_1
-libboost_log.so.1.72.0 libboost_log1.72-1.72.0_1
-libboost_locale.so.1.72.0 libboost_locale1.72-1.72.0_1
-libboost_program_options.so.1.72.0 libboost_program_options1.72-1.72.0_1
-libboost_iostreams.so.1.72.0 libboost_iostreams1.72-1.72.0_1
-libboost_system.so.1.72.0 libboost_system1.72-1.72.0_1
-libboost_thread.so.1.72.0 libboost_thread1.72-1.72.0_1
-libboost_log_setup.so.1.72.0 libboost_log_setup1.72-1.72.0_1
-libboost_date_time.so.1.72.0 libboost_date_time1.72-1.72.0_1
-libboost_wave.so.1.72.0 libboost_wave1.72-1.72.0_1
-libboost_atomic.so.1.72.0 libboost_atomic1.72-1.72.0_1
-libboost_type_erasure.so.1.72.0 libboost_type_erasure1.72-1.72.0_1
-libboost_fiber.so.1.72.0 libboost_fiber1.72-1.72.0_1
-libboost_stacktrace_noop.so.1.72.0 libboost_stacktrace_noop1.72-1.72.0_1
-libboost_stacktrace_addr2line.so.1.72.0 libboost_stacktrace_addr2line1.72-1.72.0_1
-libboost_stacktrace_basic.so.1.72.0 libboost_stacktrace_basic1.72-1.72.0_1
-libboost_python27.so.1.72.0 boost-python1.72-1.72.0_1
-libboost_python310.so.1.72.0 boost-python3-1.72-1.72.0_6
+libboost_context.so.1.80.0 libboost_context1.80-1.80.0_1
+libboost_coroutine.so.1.80.0 libboost_coroutine1.80-1.80.0_1
+libboost_container.so.1.80.0 libboost_container1.80-1.80.0_1
+libboost_prg_exec_monitor.so.1.80.0 libboost_prg_exec_monitor1.80-1.80.0_1
+libboost_timer.so.1.80.0 libboost_timer1.80-1.80.0_1
+libboost_random.so.1.80.0 libboost_random1.80-1.80.0_1
+libboost_filesystem.so.1.80.0 libboost_filesystem1.80-1.80.0_1
+libboost_unit_test_framework.so.1.80.0 libboost_unit_test_framework1.80-1.80.0_1
+libboost_math_c99.so.1.80.0 libboost_math_c991.80-1.80.0_1
+libboost_math_tr1.so.1.80.0 libboost_math_tr11.80-1.80.0_1
+libboost_nowide.so.1.80.0 libboost_nowide1.80-1.80.0_1
+libboost_json.so.1.80.0 libboost_json1.80-1.80.0_1
+libboost_regex.so.1.80.0 libboost_regex1.80-1.80.0_1
+libboost_serialization.so.1.80.0 libboost_serialization1.80-1.80.0_1
+libboost_chrono.so.1.80.0 libboost_chrono1.80-1.80.0_1
+libboost_wserialization.so.1.80.0 libboost_wserialization1.80-1.80.0_1
+libboost_graph.so.1.80.0 libboost_graph1.80-1.80.0_1
+libboost_log.so.1.80.0 libboost_log1.80-1.80.0_1
+libboost_locale.so.1.80.0 libboost_locale1.80-1.80.0_1
+libboost_program_options.so.1.80.0 libboost_program_options1.80-1.80.0_1
+libboost_iostreams.so.1.80.0 libboost_iostreams1.80-1.80.0_1
+libboost_system.so.1.80.0 libboost_system1.80-1.80.0_1
+libboost_thread.so.1.80.0 libboost_thread1.80-1.80.0_1
+libboost_log_setup.so.1.80.0 libboost_log_setup1.80-1.80.0_1
+libboost_date_time.so.1.80.0 libboost_date_time1.80-1.80.0_1
+libboost_wave.so.1.80.0 libboost_wave1.80-1.80.0_1
+libboost_atomic.so.1.80.0 libboost_atomic1.80-1.80.0_1
+libboost_type_erasure.so.1.80.0 libboost_type_erasure1.80-1.80.0_1
+libboost_fiber.so.1.80.0 libboost_fiber1.80-1.80.0_1
+libboost_stacktrace_noop.so.1.80.0 libboost_stacktrace_noop1.80-1.80.0_1
+libboost_stacktrace_addr2line.so.1.80.0 libboost_stacktrace_addr2line1.80-1.80.0_1
+libboost_stacktrace_basic.so.1.80.0 libboost_stacktrace_basic1.80-1.80.0_1
+libboost_python310.so.1.80.0 boost-python3-1.80-1.80.0_6
libexempi.so.8 exempi-2.5.0_1
libatasmart.so.4 libatasmart-0.17_1
libsgutils2-1.45.so.2 libsgutils-1.45_1
diff --git a/srcpkgs/boost-python1.72 b/srcpkgs/boost-python3-1.80
similarity index 100%
rename from srcpkgs/boost-python1.72
rename to srcpkgs/boost-python3-1.80
diff --git a/srcpkgs/boost/patches/0001-compat-glibc-2.34.patch b/srcpkgs/boost/patches/0001-compat-glibc-2.34.patch
deleted file mode 100644
index e1e5711e59f2..000000000000
--- a/srcpkgs/boost/patches/0001-compat-glibc-2.34.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 74fb0a26099bc51d717f5f154b37231ce7df3e98 Mon Sep 17 00:00:00 2001
-From: Rob Boehne <robb@datalogics.com>
-Date: Wed, 20 Nov 2019 11:25:20 -0600
-Subject: [PATCH] Revert change to elide a warning that caused Solaris builds
- to fail.
-
----
- include/boost/thread/pthread/thread_data.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/boost/thread/pthread/thread_data.hpp b/include/boost/thread/pthread/thread_data.hpp
-index aefbeb43c..bc9b1367a 100644
---- a/boost/thread/pthread/thread_data.hpp
-+++ b/boost/thread/pthread/thread_data.hpp
-@@ -57,7 +57,7 @@ namespace boost
- #else
- std::size_t page_size = ::sysconf( _SC_PAGESIZE);
- #endif
--#if PTHREAD_STACK_MIN > 0
-+#ifdef PTHREAD_STACK_MIN
- if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
- #endif
- size = ((size+page_size-1)/page_size)*page_size;
diff --git a/srcpkgs/boost/patches/0002-compat-glibc-2.34.patch b/srcpkgs/boost/patches/0002-compat-glibc-2.34.patch
deleted file mode 100644
index baf7c517f8b4..000000000000
--- a/srcpkgs/boost/patches/0002-compat-glibc-2.34.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f9d0e594d43afcb4ab0043117249feb266ba4515 Mon Sep 17 00:00:00 2001
-From: Romain Geissler <romain.geissler@amadeus.com>
-Date: Tue, 10 Aug 2021 14:22:28 +0000
-Subject: [PATCH] Fix -Wsign-compare warning with glibc 2.34 on Linux
- platforms.
-
-In file included from /data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/thread_only.hpp:17,
- from /data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/thread.hpp:12,
- from src/GetTest.cpp:12:
-/data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/pthread/thread_data.hpp: In member function 'void boost::thread_attributes::set_stack_size(std::size_t)':
-/data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/pthread/thread_data.hpp:61:19: error: comparison of integer expressions of different signedness: 'std::size_t' {aka 'long unsigned int'} and 'long int' [-Werror=sign-compare]
- 61 | if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
- | ^
----
- include/boost/thread/pthread/thread_data.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/boost/thread/pthread/thread_data.hpp b/include/boost/thread/pthread/thread_data.hpp
-index bc9b1367a..c43b276d1 100644
---- a/boost/thread/pthread/thread_data.hpp
-+++ b/boost/thread/pthread/thread_data.hpp
-@@ -58,7 +58,7 @@ namespace boost
- std::size_t page_size = ::sysconf( _SC_PAGESIZE);
- #endif
- #ifdef PTHREAD_STACK_MIN
-- if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
-+ if (size<static_cast<std::size_t>(PTHREAD_STACK_MIN)) size=PTHREAD_STACK_MIN;
- #endif
- size = ((size+page_size-1)/page_size)*page_size;
- int res = pthread_attr_setstacksize(&val_, size);
diff --git a/srcpkgs/boost/patches/exec_file.patch b/srcpkgs/boost/patches/exec_file.patch
deleted file mode 100644
index b1b0ef969c4d..000000000000
--- a/srcpkgs/boost/patches/exec_file.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From d9f06052e28873037db7f98629bce72182a42410 Mon Sep 17 00:00:00 2001
-From: Pat Riehecky <riehecky@fnal.gov>
-Date: Mon, 29 Jun 2020 10:51:58 -0500
-Subject: [PATCH] Convert Python 3.1+ to use public C API for filenames
-
- [
- Ed.: Paths were adapted from upstream commit
- https://github.com/boostorg/python/commit/d9f06052e28873037db7f98629bce72182a42410
- ]
-
----
- src/exec.cpp | 16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/libs/python/src/exec.cpp b/libs/python/src/exec.cpp
-index 171c6f4189..b2eabe59f6 100644
---- a/libs/python/src/exec.cpp
-+++ b/libs/python/src/exec.cpp
-@@ -104,14 +104,22 @@ object BOOST_PYTHON_DECL exec_file(char const *filename, object global, object l
- if (local.is_none()) local = global;
- // should be 'char const *' but older python versions don't use 'const' yet.
- char *f = const_cast<char *>(filename);
-- // Let python open the file to avoid potential binary incompatibilities.
--#if PY_VERSION_HEX >= 0x03040000
-- FILE *fs = _Py_fopen(f, "r");
-+#if PY_VERSION_HEX >= 0x03010000
-+ // Let python manage any UTF bits to avoid potential incompatibilities.
-+ PyObject *fo = Py_BuildValue("s", f);
-+ PyObject *fb = Py_None;
-+ PyUnicode_FSConverter(fo, &fb);
-+ f = PyBytes_AsString(fb);
-+ FILE *fs = fopen(f, "r");
-+ Py_DECREF(fo);
-+ Py_DECREF(fb);
- #elif PY_VERSION_HEX >= 0x03000000
-+ // Let python open the file to avoid potential binary incompatibilities.
- PyObject *fo = Py_BuildValue("s", f);
-- FILE *fs = _Py_fopen(fo, "r");
-+ FILE *fs = _Py_fopen(fo, "r"); // Private CPython API
- Py_DECREF(fo);
- #else
-+ // Let python open the file to avoid potential binary incompatibilities.
- PyObject *pyfile = PyFile_FromString(f, const_cast<char*>("r"));
- if (!pyfile) throw std::invalid_argument(std::string(f) + " : no such file");
- python::handle<> file(pyfile);
diff --git a/srcpkgs/boost/patches/install-strip-destdir.patch b/srcpkgs/boost/patches/install-strip-destdir.patch
new file mode 100644
index 000000000000..61047c5967b1
--- /dev/null
+++ b/srcpkgs/boost/patches/install-strip-destdir.patch
@@ -0,0 +1,27 @@
+--- a/tools/boost_install/boost-install.jam
++++ b/tools/boost_install/boost-install.jam
+@@ -678,6 +678,16 @@ local rule path-native-fwd ( path )
+ return $(path) ;
+ }
+
++local rule path-strip-destdir ( path )
++{
++ local parts = [ MATCH "^(/destdir(/[^/]+)?/boost-[0-9.]+)(/.*)" : $(path) ] ;
++ if $(parts)
++ {
++ path = $(parts[3]) ;
++ }
++ return $(path) ;
++}
++
+ local rule get-dir ( name : dir )
+ {
+ if [ path.is-rooted $(dir) ]
+@@ -756,6 +766,7 @@ rule generate-cmake-config- ( target : s
+ if [ path.is-rooted $(cmakedir) ]
+ {
+ local cmakedir-native = [ path-native-fwd $(cmakedir) ] ;
++ cmakedir-native = [ path-strip-destdir $(cmakedir-native) ] ;
+
+ print.text
+
diff --git a/srcpkgs/boost/patches/mips.patch b/srcpkgs/boost/patches/mips.patch
deleted file mode 100644
index a10a2122d9c7..000000000000
--- a/srcpkgs/boost/patches/mips.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/boost/fiber/detail/cpu_relax.hpp 2017-09-02 11:56:11.000000000 +0200
-+++ b/boost/fiber/detail/cpu_relax.hpp 2017-11-09 17:25:40.258995963 +0100
-@@ -48,7 +48,7 @@
- # define cpu_relax() asm volatile ("nop" ::: "memory");
- # endif
- #elif BOOST_ARCH_MIPS
--# define cpu_relax() asm volatile ("pause" ::: "memory");
-+# define cpu_relax() asm volatile ("nop" ::: "memory");
- #elif BOOST_ARCH_PPC
- // http://code.metager.de/source/xref/gnu/glibc/sysdeps/powerpc/sys/platform/ppc.h
- // http://stackoverflow.com/questions/5425506/equivalent-of-x86-pause-instruction-for-ppc
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index f0c5afcec9e8..0d103e335b52 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,53 +1,52 @@
# Template file for 'boost'
pkgname=boost
-version=1.72.0
-revision=9
+version=1.80.0
+revision=1
wrksrc="${pkgname}_${version//\./_}"
-hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
-makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
+hostmakedepends="which bzip2-devel icu-devel python3-devel pkg-config"
+makedepends="zlib-devel bzip2-devel icu-devel python3-devel liblzma-devel
+ libzstd-devel"
short_desc="Free peer-reviewed portable C++ source libraries"
maintainer="John <me@johnnynator.dev>"
license="BSL-1.0"
homepage="http://www.boost.org/"
distfiles="https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${version//./_}.tar.bz2"
-checksum=59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722
+checksum=1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0
python_version=3
-CXXFLAGS="-std=c++14"
-
-replaces="libboost_program_options1.69>=0 libboost_math_c99f1.69>=0
- libboost_stacktrace_basic1.69>=0 libboost_stacktrace_noop1.69>=0
- libboost_iostreams1.69>=0 libboost_math_tr1l1.69>=0 libboost_filesystem1.69>=0
- libboost_chrono1.69>=0 libboost_math_tr1f1.69>=0 libboost_wave1.69>=0
- libboost_graph1.69>=0 libboost_locale1.69>=0 libboost_regex1.69>=0
- libboost_fiber1.69>=0 libboost_type_erasure1.69>=0 libboost_coroutine1.69>=0
- libboost_atomic1.69>=0 libboost_prg_exec_monitor1.69>=0 libboost_math_c991.69>=0
- boost-python3-1.69>=0 libboost_log_setup1.69>=0 boost1.69>=0-devel
- libboost_timer1.69>=0 libboost_system1.69>=0 libboost_unit_test_framework1.69>=0
- libboost_serialization1.69>=0 libboost_math_tr11.69>=0 boost1.69>=0-build
- libboost_math_c99l1.69>=0 boost-python1.69>=0 libboost_contract1.69>=0
- libboost_date_time1.69>=0 libboost_log1.69>=0 libboost_random1.69>=0
- libboost_thread1.69>=0 libboost_container1.69>=0 boost1.69>=0-jam
- libboost_wserialization1.69>=0 libboost_context1.69>=0
- libboost_stacktrace_addr2line1.69>=0"
-
-subpackages="libboost_program_options1.72 libboost_math_c99f1.72
- libboost_stacktrace_basic1.72 libboost_stacktrace_noop1.72
- libboost_iostreams1.72 libboost_math_tr1l1.72 libboost_filesystem1.72
- libboost_chrono1.72 libboost_math_tr1f1.72 libboost_wave1.72
- libboost_graph1.72 libboost_locale1.72 libboost_regex1.72
- libboost_fiber1.72 libboost_type_erasure1.72 libboost_coroutine1.72
- libboost_atomic1.72 libboost_prg_exec_monitor1.72 libboost_math_c991.72
- boost-python3-1.72 libboost_log_setup1.72 boost-devel
- libboost_timer1.72 libboost_system1.72 libboost_unit_test_framework1.72
- libboost_serialization1.72 libboost_math_tr11.72 boost-build
- libboost_math_c99l1.72 boost-python1.72 libboost_contract1.72
- libboost_date_time1.72 libboost_log1.72 libboost_random1.72
- libboost_thread1.72 libboost_container1.72 boost-jam
- libboost_wserialization1.72 libboost_context1.72"
+replaces="libboost_program_options1.72>=0 libboost_math_c99f1.72>=0
+ libboost_stacktrace_basic1.72>=0 libboost_stacktrace_noop1.72>=0
+ libboost_iostreams1.72>=0 libboost_math_tr1l1.72>=0 libboost_filesystem1.72>=0
+ libboost_chrono1.72>=0 libboost_math_tr1f1.72>=0 libboost_wave1.72>=0
+ libboost_graph1.72>=0 libboost_locale1.72>=0 libboost_regex1.72>=0
+ libboost_fiber1.72>=0 libboost_type_erasure1.72>=0 libboost_coroutine1.72>=0
+ libboost_atomic1.72>=0 libboost_prg_exec_monitor1.72>=0 libboost_math_c991.72>=0
+ boost-python3-1.72>=0 libboost_log_setup1.72>=0
+ libboost_timer1.72>=0 libboost_system1.72>=0 libboost_unit_test_framework1.72>=0
+ libboost_serialization1.72>=0 libboost_math_tr11.72>=0
+ libboost_math_c99l1.72>=0 boost-python1.72>=0 libboost_contract1.72>=0
+ libboost_date_time1.72>=0 libboost_log1.72>=0 libboost_random1.72>=0
+ libboost_thread1.72>=0 libboost_container1.72>=0
+ libboost_wserialization1.72>=0 libboost_context1.72>=0
+ libboost_stacktrace_addr2line1.72>=0"
+
+subpackages="libboost_program_options1.80 libboost_math_c99f1.80
+ libboost_stacktrace_basic1.80 libboost_stacktrace_noop1.80
+ libboost_iostreams1.80 libboost_math_tr1l1.80 libboost_filesystem1.80
+ libboost_chrono1.80 libboost_math_tr1f1.80 libboost_wave1.80
+ libboost_graph1.80 libboost_locale1.80 libboost_regex1.80
+ libboost_fiber1.80 libboost_type_erasure1.80 libboost_coroutine1.80
+ libboost_atomic1.80 libboost_prg_exec_monitor1.80 libboost_math_c991.80
+ boost-python3-1.80 libboost_log_setup1.80 boost-devel libboost_json1.80
+ libboost_timer1.80 libboost_system1.80 libboost_unit_test_framework1.80
+ libboost_serialization1.80 libboost_math_tr11.80 boost-build
+ libboost_math_c99l1.80 libboost_contract1.80 libboost_nowide1.80
+ libboost_date_time1.80 libboost_log1.80 libboost_random1.80
+ libboost_thread1.80 libboost_container1.80 boost-jam
+ libboost_wserialization1.80 libboost_context1.80"
if [ -z "$CROSS_BUILD" ]; then
- subpackages+=" libboost_stacktrace_addr2line1.72"
+ subpackages+=" libboost_stacktrace_addr2line1.80"
fi
case "$XBPS_TARGET_MACHINE" in
@@ -60,38 +59,40 @@ case "$XBPS_TARGET_MACHINE" in
esac
do_build() {
- CXX=${BUILD_CXX} CXXFLAGS=${BUILD_CXXFLAGS} ./bootstrap.sh \
- --prefix=${DESTDIR}/usr --with-python=${XBPS_CROSS_BASE}/usr/bin/python3 \
+ # bootstrap.sh will reset CXX and CXXFLAGS (L229)
+ ./bootstrap.sh --with-toolset=gcc \
+ --prefix=${DESTDIR}/usr --with-python=/usr/bin/python3 \
--with-python-root=${XBPS_CROSS_BASE}/usr
(
# Rebuild bjam for target
cd tools/build/src/engine
- ./build.sh gcc
+ CXXFLAGS="$CXXFLAGS -fdebug-prefix-map=$PWD=."
+ # toolset gcc will force gcc -x c++ -O2 -s
+ # toolset cxx will use CXX and CXXFLAGS
+ CXX_VERSION_OPT=--version ./build.sh cxx
)
cat > user-config.jam <<-__EOF
using gcc : : ${CXX} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
- using python : 2.7 : ${XBPS_CROSS_BASE}/usr/bin/python2 : ${XBPS_CROSS_BASE}/usr/include/python2.7 : ${XBPS_CROSS_BASE}/usr/lib/python2.7 ;
- using python : ${py3_ver} : ${XBPS_CROSS_BASE}/usr/bin/python3 : ${XBPS_CROSS_BASE}/${py3_inc} : ${XBPS_CROSS_BASE}/${py3_lib} ;
+ using python : ${py3_ver} : /usr/bin/python3 : ${XBPS_CROSS_BASE}/${py3_inc} : ${XBPS_CROSS_BASE}/${py3_lib} ;
__EOF
- # --no-cmake-config should be removed with boost-1.71 or later
./b2 ${makejobs} \
--user-config=${wrksrc}/user-config.jam --debug-building \
- --no-cmake-config \
- --toolset=gcc abi=${_abi} architecture=${_arch} python=2.7,${py3_ver} \
+ --toolset=gcc abi=${_abi} architecture=${_arch} python=${py3_ver} \
threading=multi runtime-link=shared link=shared,static
}
do_install() {
# Install bjam
# XXX: make bjam a symlink to b2
- for _b in bjam b2; do
+ for _b in b2; do
vbin tools/build/src/engine/${_b}
done
+ ln -sf b2 "$DESTDIR/usr/bin/bjam"
# Install headers/libs
./b2 --prefix=${DESTDIR}/usr abi=${_abi} architecture=${_arch} \
- --user-config=${wrksrc}/user-config.jam --no-cmake-config \
- python=2.7,${py3_ver} threading=multi runtime-link=shared link=shared,static \
+ --user-config=${wrksrc}/user-config.jam \
+ python=${py3_ver} threading=multi runtime-link=shared link=shared,static \
install
# Install Boost.Build stuff.
@@ -119,15 +120,7 @@ boost-jam_package() {
vmove usr/bin/b2
}
}
-boost-python1.72_package() {
- depends="boost python"
- replaces="boost-python>=0"
- short_desc+=" - Python bindings"
- pkg_install() {
- vmove "usr/lib/libboost_python2*.so.*"
- }
-}
-boost-python3-1.72_package() {
+boost-python3-1.80_package() {
depends="boost python3"
replaces="boost-python3>=0"
short_desc+=" - Python3 bindings"
@@ -149,12 +142,13 @@ boost-devel_package() {
short_desc+=" - development files"
pkg_install() {
vmove usr/include
+ vmove usr/lib/cmake
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
}
}
-libboost_atomic1.72_package() {
+libboost_atomic1.80_package() {
depends="boost"
short_desc+=" - libboost_atomic"
pkg_install() {
@@ -162,7 +156,7 @@ libboost_atomic1.72_package() {
}
}
-libboost_chrono1.72_package() {
+libboost_chrono1.80_package() {
depends="boost"
short_desc+=" - libboost_chrono"
pkg_install() {
@@ -170,7 +164,7 @@ libboost_chrono1.72_package() {
}
}
-libboost_container1.72_package() {
+libboost_container1.80_package() {
depends="boost"
short_desc+=" - libboost_container"
pkg_install() {
@@ -178,7 +172,7 @@ libboost_container1.72_package() {
}
}
-libboost_context1.72_package() {
+libboost_context1.80_package() {
depends="boost"
short_desc+=" - libboost_context"
pkg_install() {
@@ -186,7 +180,7 @@ libboost_context1.72_package() {
}
}
-libboost_contract1.72_package() {
+libboost_contract1.80_package() {
depends="boost"
short_desc+=" - libboost_contract"
pkg_install() {
@@ -194,7 +188,7 @@ libboost_contract1.72_package() {
}
}
-libboost_coroutine1.72_package() {
+libboost_coroutine1.80_package() {
depends="boost"
short_desc+=" - libboost_coroutine"
pkg_install() {
@@ -202,7 +196,7 @@ libboost_coroutine1.72_package() {
}
}
-libboost_date_time1.72_package() {
+libboost_date_time1.80_package() {
depends="boost"
short_desc+=" - libboost_date_time"
pkg_install() {
@@ -210,7 +204,7 @@ libboost_date_time1.72_package() {
}
}
-libboost_fiber1.72_package() {
+libboost_fiber1.80_package() {
depends="boost"
short_desc+=" - libboost_fiber"
pkg_install() {
@@ -218,7 +212,7 @@ libboost_fiber1.72_package() {
}
}
-libboost_filesystem1.72_package() {
+libboost_filesystem1.80_package() {
depends="boost"
short_desc+=" - libboost_filesystem"
pkg_install() {
@@ -226,7 +220,7 @@ libboost_filesystem1.72_package() {
}
}
-libboost_graph1.72_package() {
+libboost_graph1.80_package() {
depends="boost"
short_desc+=" - libboost_graph"
pkg_install() {
@@ -234,7 +228,7 @@ libboost_graph1.72_package() {
}
}
-libboost_iostreams1.72_package() {
+libboost_iostreams1.80_package() {
depends="boost"
short_desc+=" - libboost_iostreams"
pkg_install() {
@@ -242,7 +236,7 @@ libboost_iostreams1.72_package() {
}
}
-libboost_locale1.72_package() {
+libboost_locale1.80_package() {
depends="boost"
short_desc+=" - libboost_locale"
pkg_install() {
@@ -250,7 +244,7 @@ libboost_locale1.72_package() {
}
}
-libboost_log1.72_package() {
+libboost_log1.80_package() {
depends="boost"
short_desc+=" - libboost_log"
pkg_install() {
@@ -258,7 +252,7 @@ libboost_log1.72_package() {
}
}
-libboost_log_setup1.72_package() {
+libboost_log_setup1.80_package() {
depends="boost"
short_desc+=" - libboost_log_setup"
pkg_install() {
@@ -266,7 +260,7 @@ libboost_log_setup1.72_package() {
}
}
-libboost_math_c991.72_package() {
+libboost_math_c991.80_package() {
depends="boost"
short_desc+=" - libboost_math_c99"
pkg_install() {
@@ -274,7 +268,7 @@ libboost_math_c991.72_package() {
}
}
-libboost_math_c99f1.72_package() {
+libboost_math_c99f1.80_package() {
depends="boost"
short_desc+=" - libboost_math_c99f"
pkg_install() {
@@ -282,7 +276,7 @@ libboost_math_c99f1.72_package() {
}
}
-libboost_math_c99l1.72_package() {
+libboost_math_c99l1.80_package() {
depends="boost"
short_desc+=" - libboost_math_c99l"
pkg_install() {
@@ -290,7 +284,15 @@ libboost_math_c99l1.72_package() {
}
}
-libboost_math_tr11.72_package() {
+libboost_json1.80_package() {
+ depends="boost"
+ short_desc+=" - libboost_json"
+ pkg_install() {
+ vmove usr/lib/libboost_json.so.*
+ }
+}
+
+libboost_math_tr11.80_package() {
depends="boost"
short_desc+=" - libboost_math_tr1"
pkg_install() {
@@ -298,7 +300,7 @@ libboost_math_tr11.72_package() {
}
}
-libboost_math_tr1f1.72_package() {
+libboost_math_tr1f1.80_package() {
depends="boost"
short_desc+=" - libboost_math_tr1f"
pkg_install() {
@@ -306,7 +308,7 @@ libboost_math_tr1f1.72_package() {
}
}
-libboost_math_tr1l1.72_package() {
+libboost_math_tr1l1.80_package() {
depends="boost"
short_desc+=" - libboost_math_tr1l"
pkg_install() {
@@ -314,7 +316,15 @@ libboost_math_tr1l1.72_package() {
}
}
-libboost_prg_exec_monitor1.72_package() {
+libboost_nowide1.80_package() {
+ depends="boost"
+ short_desc+=" - libboost_nowide"
+ pkg_install() {
+ vmove usr/lib/libboost_nowide.so.*
+ }
+}
+
+libboost_prg_exec_monitor1.80_package() {
depends="boost"
short_desc+=" - libboost_prg_exec_monitor"
pkg_install() {
@@ -322,7 +332,7 @@ libboost_prg_exec_monitor1.72_package() {
}
}
-libboost_program_options1.72_package() {
+libboost_program_options1.80_package() {
depends="boost"
short_desc+=" - libboost_program_options"
pkg_install() {
@@ -330,7 +340,7 @@ libboost_program_options1.72_package() {
}
}
-libboost_random1.72_package() {
+libboost_random1.80_package() {
depends="boost"
short_desc+=" - libboost_random"
pkg_install() {
@@ -338,7 +348,7 @@ libboost_random1.72_package() {
}
}
-libboost_regex1.72_package() {
+libboost_regex1.80_package() {
depends="boost"
short_desc+=" - libboost_regex"
pkg_install() {
@@ -346,7 +356,7 @@ libboost_regex1.72_package() {
}
}
-libboost_serialization1.72_package() {
+libboost_serialization1.80_package() {
depends="boost"
short_desc+=" - libboost_serialization"
pkg_install() {
@@ -354,7 +364,7 @@ libboost_serialization1.72_package() {
}
}
-libboost_stacktrace_addr2line1.72_package() {
+libboost_stacktrace_addr2line1.80_package() {
depends="boost"
short_desc+=" - libboost_stacktrace_addr2line"
pkg_install() {
@@ -362,7 +372,7 @@ libboost_stacktrace_addr2line1.72_package() {
}
}
-libboost_stacktrace_basic1.72_package() {
+libboost_stacktrace_basic1.80_package() {
depends="boost"
short_desc+=" - libboost_stacktrace_basic"
pkg_install() {
@@ -370,7 +380,7 @@ libboost_stacktrace_basic1.72_package() {
}
}
-libboost_stacktrace_noop1.72_package() {
+libboost_stacktrace_noop1.80_package() {
depends="boost"
short_desc+=" - libboost_stacktrace_noop"
pkg_install() {
@@ -378,7 +388,7 @@ libboost_stacktrace_noop1.72_package() {
}
}
-libboost_system1.72_package() {
+libboost_system1.80_package() {
depends="boost"
short_desc+=" - libboost_system"
pkg_install() {
@@ -386,7 +396,7 @@ libboost_system1.72_package() {
}
}
-libboost_thread1.72_package() {
+libboost_thread1.80_package() {
depends="boost"
short_desc+=" - libboost_thread"
pkg_install() {
@@ -394,7 +404,7 @@ libboost_thread1.72_package() {
}
}
-libboost_timer1.72_package() {
+libboost_timer1.80_package() {
depends="boost"
short_desc+=" - libboost_timer"
pkg_install() {
@@ -402,7 +412,7 @@ libboost_timer1.72_package() {
}
}
-libboost_type_erasure1.72_package() {
+libboost_type_erasure1.80_package() {
depends="boost"
short_desc+=" - libboost_type_erasure"
pkg_install() {
@@ -410,7 +420,7 @@ libboost_type_erasure1.72_package() {
}
}
-libboost_unit_test_framework1.72_package() {
+libboost_unit_test_framework1.80_package() {
depends="boost"
short_desc+=" - libboost_unit_test_framework"
pkg_install() {
@@ -418,7 +428,7 @@ libboost_unit_test_framework1.72_package() {
}
}
-libboost_wave1.72_package() {
+libboost_wave1.80_package() {
depends="boost"
short_desc+=" - libboost_wave"
pkg_install() {
@@ -426,7 +436,7 @@ libboost_wave1.72_package() {
}
}
-libboost_wserialization1.72_package() {
+libboost_wserialization1.80_package() {
depends="boost"
short_desc+=" - libboost_wserialization"
pkg_install() {
diff --git a/srcpkgs/boost-python3-1.72 b/srcpkgs/libboost_atomic1.80
similarity index 100%
rename from srcpkgs/boost-python3-1.72
rename to srcpkgs/libboost_atomic1.80
diff --git a/srcpkgs/libboost_atomic1.72 b/srcpkgs/libboost_chrono1.80
similarity index 100%
rename from srcpkgs/libboost_atomic1.72
rename to srcpkgs/libboost_chrono1.80
diff --git a/srcpkgs/libboost_chrono1.72 b/srcpkgs/libboost_container1.80
similarity index 100%
rename from srcpkgs/libboost_chrono1.72
rename to srcpkgs/libboost_container1.80
diff --git a/srcpkgs/libboost_container1.72 b/srcpkgs/libboost_context1.80
similarity index 100%
rename from srcpkgs/libboost_container1.72
rename to srcpkgs/libboost_context1.80
diff --git a/srcpkgs/libboost_context1.72 b/srcpkgs/libboost_contract1.80
similarity index 100%
rename from srcpkgs/libboost_context1.72
rename to srcpkgs/libboost_contract1.80
diff --git a/srcpkgs/libboost_contract1.72 b/srcpkgs/libboost_coroutine1.80
similarity index 100%
rename from srcpkgs/libboost_contract1.72
rename to srcpkgs/libboost_coroutine1.80
diff --git a/srcpkgs/libboost_coroutine1.72 b/srcpkgs/libboost_date_time1.80
similarity index 100%
rename from srcpkgs/libboost_coroutine1.72
rename to srcpkgs/libboost_date_time1.80
diff --git a/srcpkgs/libboost_date_time1.72 b/srcpkgs/libboost_fiber1.80
similarity index 100%
rename from srcpkgs/libboost_date_time1.72
rename to srcpkgs/libboost_fiber1.80
diff --git a/srcpkgs/libboost_fiber1.72 b/srcpkgs/libboost_filesystem1.80
similarity index 100%
rename from srcpkgs/libboost_fiber1.72
rename to srcpkgs/libboost_filesystem1.80
diff --git a/srcpkgs/libboost_filesystem1.72 b/srcpkgs/libboost_graph1.80
similarity index 100%
rename from srcpkgs/libboost_filesystem1.72
rename to srcpkgs/libboost_graph1.80
diff --git a/srcpkgs/libboost_graph1.72 b/srcpkgs/libboost_iostreams1.80
similarity index 100%
rename from srcpkgs/libboost_graph1.72
rename to srcpkgs/libboost_iostreams1.80
diff --git a/srcpkgs/libboost_iostreams1.72 b/srcpkgs/libboost_json1.80
similarity index 100%
rename from srcpkgs/libboost_iostreams1.72
rename to srcpkgs/libboost_json1.80
diff --git a/srcpkgs/libboost_locale1.72 b/srcpkgs/libboost_locale1.80
similarity index 100%
rename from srcpkgs/libboost_locale1.72
rename to srcpkgs/libboost_locale1.80
diff --git a/srcpkgs/libboost_log1.72 b/srcpkgs/libboost_log1.80
similarity index 100%
rename from srcpkgs/libboost_log1.72
rename to srcpkgs/libboost_log1.80
diff --git a/srcpkgs/libboost_log_setup1.72 b/srcpkgs/libboost_log_setup1.80
similarity index 100%
rename from srcpkgs/libboost_log_setup1.72
rename to srcpkgs/libboost_log_setup1.80
diff --git a/srcpkgs/libboost_math_c991.72 b/srcpkgs/libboost_math_c991.80
similarity index 100%
rename from srcpkgs/libboost_math_c991.72
rename to srcpkgs/libboost_math_c991.80
diff --git a/srcpkgs/libboost_math_c99f1.72 b/srcpkgs/libboost_math_c99f1.80
similarity index 100%
rename from srcpkgs/libboost_math_c99f1.72
rename to srcpkgs/libboost_math_c99f1.80
diff --git a/srcpkgs/libboost_math_c99l1.72 b/srcpkgs/libboost_math_c99l1.80
similarity index 100%
rename from srcpkgs/libboost_math_c99l1.72
rename to srcpkgs/libboost_math_c99l1.80
diff --git a/srcpkgs/libboost_math_tr11.72 b/srcpkgs/libboost_math_tr11.80
similarity index 100%
rename from srcpkgs/libboost_math_tr11.72
rename to srcpkgs/libboost_math_tr11.80
diff --git a/srcpkgs/libboost_math_tr1f1.72 b/srcpkgs/libboost_math_tr1f1.80
similarity index 100%
rename from srcpkgs/libboost_math_tr1f1.72
rename to srcpkgs/libboost_math_tr1f1.80
diff --git a/srcpkgs/libboost_math_tr1l1.72 b/srcpkgs/libboost_math_tr1l1.80
similarity index 100%
rename from srcpkgs/libboost_math_tr1l1.72
rename to srcpkgs/libboost_math_tr1l1.80
diff --git a/srcpkgs/libboost_prg_exec_monitor1.72 b/srcpkgs/libboost_nowide1.80
similarity index 100%
rename from srcpkgs/libboost_prg_exec_monitor1.72
rename to srcpkgs/libboost_nowide1.80
diff --git a/srcpkgs/libboost_program_options1.72 b/srcpkgs/libboost_prg_exec_monitor1.80
similarity index 100%
rename from srcpkgs/libboost_program_options1.72
rename to srcpkgs/libboost_prg_exec_monitor1.80
diff --git a/srcpkgs/libboost_random1.72 b/srcpkgs/libboost_program_options1.80
similarity index 100%
rename from srcpkgs/libboost_random1.72
rename to srcpkgs/libboost_program_options1.80
diff --git a/srcpkgs/libboost_regex1.72 b/srcpkgs/libboost_random1.80
similarity index 100%
rename from srcpkgs/libboost_regex1.72
rename to srcpkgs/libboost_random1.80
diff --git a/srcpkgs/libboost_serialization1.72 b/srcpkgs/libboost_regex1.80
similarity index 100%
rename from srcpkgs/libboost_serialization1.72
rename to srcpkgs/libboost_regex1.80
diff --git a/srcpkgs/libboost_stacktrace_addr2line1.72 b/srcpkgs/libboost_serialization1.80
similarity index 100%
rename from srcpkgs/libboost_stacktrace_addr2line1.72
rename to srcpkgs/libboost_serialization1.80
diff --git a/srcpkgs/libboost_stacktrace_basic1.72 b/srcpkgs/libboost_stacktrace_addr2line1.80
similarity index 100%
rename from srcpkgs/libboost_stacktrace_basic1.72
rename to srcpkgs/libboost_stacktrace_addr2line1.80
diff --git a/srcpkgs/libboost_stacktrace_noop1.72 b/srcpkgs/libboost_stacktrace_basic1.80
similarity index 100%
rename from srcpkgs/libboost_stacktrace_noop1.72
rename to srcpkgs/libboost_stacktrace_basic1.80
diff --git a/srcpkgs/libboost_system1.72 b/srcpkgs/libboost_stacktrace_noop1.80
similarity index 100%
rename from srcpkgs/libboost_system1.72
rename to srcpkgs/libboost_stacktrace_noop1.80
diff --git a/srcpkgs/libboost_thread1.72 b/srcpkgs/libboost_system1.80
similarity index 100%
rename from srcpkgs/libboost_thread1.72
rename to srcpkgs/libboost_system1.80
diff --git a/srcpkgs/libboost_timer1.72 b/srcpkgs/libboost_thread1.80
similarity index 100%
rename from srcpkgs/libboost_timer1.72
rename to srcpkgs/libboost_thread1.80
diff --git a/srcpkgs/libboost_type_erasure1.72 b/srcpkgs/libboost_timer1.80
similarity index 100%
rename from srcpkgs/libboost_type_erasure1.72
rename to srcpkgs/libboost_timer1.80
diff --git a/srcpkgs/libboost_unit_test_framework1.72 b/srcpkgs/libboost_type_erasure1.80
similarity index 100%
rename from srcpkgs/libboost_unit_test_framework1.72
rename to srcpkgs/libboost_type_erasure1.80
diff --git a/srcpkgs/libboost_wave1.72 b/srcpkgs/libboost_unit_test_framework1.80
similarity index 100%
rename from srcpkgs/libboost_wave1.72
rename to srcpkgs/libboost_unit_test_framework1.80
diff --git a/srcpkgs/libboost_wserialization1.72 b/srcpkgs/libboost_wave1.80
similarity index 100%
rename from srcpkgs/libboost_wserialization1.72
rename to srcpkgs/libboost_wave1.80
diff --git a/srcpkgs/libboost_wserialization1.80 b/srcpkgs/libboost_wserialization1.80
new file mode 120000
index 000000000000..baef819c48f6
--- /dev/null
+++ b/srcpkgs/libboost_wserialization1.80
@@ -0,0 +1 @@
+boost
\ No newline at end of file
From 71428f077847f413801a4c4ecc9a4a06731a67bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 16:51:50 +0700
Subject: [PATCH 002/108] TSC: rebuild for boost-1.80
---
srcpkgs/TSC/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/TSC/template b/srcpkgs/TSC/template
index 71534315cf7c..469f6d859bc7 100644
--- a/srcpkgs/TSC/template
+++ b/srcpkgs/TSC/template
@@ -1,7 +1,7 @@
# Template file for 'TSC'
pkgname=TSC
version=2.1.0
-revision=2
+revision=3
build_wrksrc=tsc
build_style=cmake
build_helper="qemu"
From 2b0639d38b77f69aa296fda1e9142bd524a6d096 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:27 +0700
Subject: [PATCH 003/108] 0ad: rebuild for boost-1.80
---
srcpkgs/0ad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 552d2728a7a0..b9f0751c4836 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
# Template file for '0ad'
pkgname=0ad
version=0.0.25b
-revision=3
+revision=4
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
wrksrc="${pkgname}-${version}-alpha"
hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang"
From c01aaa2239572f275dd913bbf2e2888f9714e6a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:27 +0700
Subject: [PATCH 004/108] Aegisub: rebuild for boost-1.80
---
srcpkgs/Aegisub/patches/link-icu18n.patch | 15 +++++++++++++++
srcpkgs/Aegisub/template | 2 +-
2 files changed, 16 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/Aegisub/patches/link-icu18n.patch
diff --git a/srcpkgs/Aegisub/patches/link-icu18n.patch b/srcpkgs/Aegisub/patches/link-icu18n.patch
new file mode 100644
index 000000000000..e5c037ca1f68
--- /dev/null
+++ b/srcpkgs/Aegisub/patches/link-icu18n.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -347,9 +347,9 @@ target_link_libraries(Aegisub PRIVATE "O
+ find_package(Iconv REQUIRED)
+ target_link_libraries(libaegisub PRIVATE "Iconv::Iconv")
+
+-find_package(ICU REQUIRED uc)
+-target_link_libraries(libaegisub PRIVATE "ICU::uc")
+-target_link_libraries(Aegisub PRIVATE "ICU::uc")
++find_package(ICU REQUIRED uc i18n)
++target_link_libraries(libaegisub PRIVATE "ICU::uc" ICU::i18n)
++target_link_libraries(Aegisub PRIVATE "ICU::uc" ICU::i18n)
+
+ find_package(wxWidgets REQUIRED adv base core gl stc xml)
+ include(${wxWidgets_USE_FILE})
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index ff34249aaee4..a68e1ab43089 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
# Template file for 'Aegisub'
pkgname=Aegisub
version=3.3.2
-revision=4
+revision=5
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
cmake_builddir="BUILD"
From 0716f1d2c19c5f1fe8d7a957c939c5e1d8dff480 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:27 +0700
Subject: [PATCH 005/108] Field3D: rebuild for boost-1.80
---
srcpkgs/Field3D/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 62f0589e9e0b..9a5af0034d14 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,7 +1,7 @@
# Template file for 'Field3D'
pkgname=Field3D
version=1.7.3
-revision=2
+revision=3
build_style=cmake
makedepends="boost-devel hdf5-devel ilmbase-devel"
short_desc="Library for storing voxel data on disk and in memory"
From c0a3a9dc635c96f60e7b2ee814e01cd6e8a39d43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:28 +0700
Subject: [PATCH 006/108] LGOGDownloader: rebuild for boost-1.80
---
srcpkgs/LGOGDownloader/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6e7e5c685f83..0778374ad224 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,7 +1,7 @@
# Template file for 'LGOGDownloader'
pkgname=LGOGDownloader
version=3.9
-revision=1
+revision=2
wrksrc="lgogdownloader-${version}"
build_style=cmake
hostmakedepends="pkg-config"
From ade8230384434152ce1ab0e2ee7eaff4234b2f70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:28 +0700
Subject: [PATCH 007/108] Lucene++: rebuild for boost-1.80
---
srcpkgs/Lucene++/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Lucene++/template b/srcpkgs/Lucene++/template
index 3873189f2dfc..34b6e05393fe 100644
--- a/srcpkgs/Lucene++/template
+++ b/srcpkgs/Lucene++/template
@@ -1,7 +1,7 @@
# Template file for 'Lucene++'
pkgname=Lucene++
version=3.0.7
-revision=11
+revision=12
wrksrc=LucenePlusPlus-rel_$version
build_style=cmake
configure_args="-Wno-dev"
From 70d34f9424b78be1fb5deb1a0b6619ef5d8e8032 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:28 +0700
Subject: [PATCH 008/108] PrusaSlicer: rebuild for boost-1.80
---
srcpkgs/PrusaSlicer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 931ac73e5c94..29f1f641a488 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
version=2.4.2
-revision=1
+revision=2
wrksrc="PrusaSlicer-version_${version}"
build_style=cmake
build_helper="qemu"
From d52df1d8b968b429e6b0a9df0fbd3248fdea2a79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:28 +0700
Subject: [PATCH 009/108] astroid: rebuild for boost-1.80
---
srcpkgs/astroid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/astroid/template b/srcpkgs/astroid/template
index 8ee0e729e134..478beb4de195 100644
--- a/srcpkgs/astroid/template
+++ b/srcpkgs/astroid/template
@@ -1,7 +1,7 @@
# Template file for 'astroid'
pkgname=astroid
version=0.16
-revision=5
+revision=6
build_style=cmake
hostmakedepends="pkg-config scdoc protobuf gobject-introspection"
makedepends="libnotmuch-devel gtkmm-devel webkit2gtk-devel libsass-devel
From ce8d9dedd1ae72146bf25b801478d83d09325438 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:28 +0700
Subject: [PATCH 010/108] bitcoin: rebuild for boost-1.80
---
srcpkgs/bitcoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index ccc9c4cc5f10..9ae457ecb9c5 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=22.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
From 4868ff34c04ec2168acf9f6141243c5d8bebfdfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:29 +0700
Subject: [PATCH 011/108] blender: rebuild for boost-1.80
---
srcpkgs/blender/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 91799f04fba5..28befed1faf8 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
version=3.0.0
-revision=4
+revision=5
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
From 6492fece9b1aa53a6533e246118e9ec54fbc9d8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:29 +0700
Subject: [PATCH 012/108] cclive: rebuild for boost-1.80
---
srcpkgs/cclive/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cclive/template b/srcpkgs/cclive/template
index c43dbb94209c..936be99b866c 100644
--- a/srcpkgs/cclive/template
+++ b/srcpkgs/cclive/template
@@ -1,7 +1,7 @@
# Template file for 'cclive'
pkgname=cclive
version=0.9.3
-revision=5
+revision=6
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="boost-devel pcre-devel libcurl-devel libquvi-devel glibmm-devel"
From 36df210b64d951cebe810dad0bc5e6db0c0433d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:29 +0700
Subject: [PATCH 013/108] cgal: rebuild for boost-1.80
---
srcpkgs/cgal/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cgal/template b/srcpkgs/cgal/template
index 7e28c2b28dfd..d448e8dd3c63 100644
--- a/srcpkgs/cgal/template
+++ b/srcpkgs/cgal/template
@@ -1,7 +1,7 @@
# Template file for 'cgal'
pkgname=cgal
version=4.14
-revision=3
+revision=4
wrksrc="CGAL-${version}"
build_style=cmake
build_helper="qemu"
From 41f8df1a82b3fceca0ba3924a30bb181d17d1514 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:29 +0700
Subject: [PATCH 014/108] codeblocks: rebuild for boost-1.80
---
srcpkgs/codeblocks/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/codeblocks/template b/srcpkgs/codeblocks/template
index 33b9b9a77853..0079c3a8991c 100644
--- a/srcpkgs/codeblocks/template
+++ b/srcpkgs/codeblocks/template
@@ -1,7 +1,7 @@
# Template file for 'codeblocks'
pkgname=codeblocks
version=20.03
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-wx-config=wx-config-gtk3 --with-contrib-plugins
--with-boost=${XBPS_CROSS_BASE}/usr --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
From 0fb18eb0f392f1aa429955b74a67c1366122ab8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:29 +0700
Subject: [PATCH 015/108] colobot: rebuild for boost-1.80
---
srcpkgs/colobot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/colobot/template b/srcpkgs/colobot/template
index 1b415dd2cfad..a7613cad90b5 100644
--- a/srcpkgs/colobot/template
+++ b/srcpkgs/colobot/template
@@ -2,7 +2,7 @@
pkgname=colobot
# needs to be kept in sync with colobot-data (provides game assets)
version=0.2.0
-revision=1
+revision=2
wrksrc="colobot-colobot-gold-${version}-alpha"
build_style=cmake
configure_args="-DCOLOBOT_INSTALL_BIN_DIR=/usr/bin -DOpenGL_GL_PREFERENCE=GLVND"
From 1c7651522eafcf68b4800dace9eef1a8ea4c3c01 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Mon, 29 Aug 2022 10:56:35 +1000
Subject: [PATCH 016/108] cryfs: update to 0.11.2.
---
.../cryfs/patches/allow-build-type-none.patch | 22 ---
srcpkgs/cryfs/patches/de-vendor.patch | 134 +++++++-----------
srcpkgs/cryfs/patches/fix-test.patch | 22 ---
srcpkgs/cryfs/patches/fmt-9-fix.patch | 54 +++++++
.../rename-simple-to-basic-filesink.patch | 21 ---
srcpkgs/cryfs/patches/spdlog-include.patch | 33 -----
srcpkgs/cryfs/template | 13 +-
7 files changed, 109 insertions(+), 190 deletions(-)
delete mode 100644 srcpkgs/cryfs/patches/fix-test.patch
create mode 100644 srcpkgs/cryfs/patches/fmt-9-fix.patch
delete mode 100644 srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch
delete mode 100644 srcpkgs/cryfs/patches/spdlog-include.patch
diff --git a/srcpkgs/cryfs/patches/allow-build-type-none.patch b/srcpkgs/cryfs/patches/allow-build-type-none.patch
index e591974c05f4..ffcf0ee53320 100644
--- a/srcpkgs/cryfs/patches/allow-build-type-none.patch
+++ b/srcpkgs/cryfs/patches/allow-build-type-none.patch
@@ -9,25 +9,3 @@ Index: cryfs-0.10.2/doc/CMakeLists.txt
- CONFIGURATIONS Release
)
ENDIF(WIN32)
-Index: cryfs-0.10.2/src/cryfs-cli/CMakeLists.txt
-===================================================================
---- cryfs-0.10.2.orig/src/cryfs-cli/CMakeLists.txt
-+++ cryfs-0.10.2/src/cryfs-cli/CMakeLists.txt
-@@ -27,6 +27,5 @@ target_enable_style_warnings(${PROJECT_N
- target_activate_cpp14(${PROJECT_NAME}_bin)
-
- install(TARGETS ${PROJECT_NAME}_bin
-- CONFIGURATIONS Debug Release RelWithDebInfo
- DESTINATION ${CMAKE_INSTALL_BINDIR}
- )
-Index: cryfs-0.10.2/src/cryfs-unmount/CMakeLists.txt
-===================================================================
---- cryfs-0.10.2.orig/src/cryfs-unmount/CMakeLists.txt
-+++ cryfs-0.10.2/src/cryfs-unmount/CMakeLists.txt
-@@ -19,6 +19,5 @@ target_enable_style_warnings(${PROJECT_N
- target_activate_cpp14(${PROJECT_NAME}_bin)
-
- install(TARGETS ${PROJECT_NAME}_bin
-- CONFIGURATIONS Debug Release RelWithDebInfo
- DESTINATION ${CMAKE_INSTALL_BINDIR}
- )
diff --git a/srcpkgs/cryfs/patches/de-vendor.patch b/srcpkgs/cryfs/patches/de-vendor.patch
index 4909cad7b84a..09e51f0aa7fc 100644
--- a/srcpkgs/cryfs/patches/de-vendor.patch
+++ b/srcpkgs/cryfs/patches/de-vendor.patch
@@ -1,32 +1,14 @@
-Index: cryfs-0.10.2/src/blockstore/implementations/compressing/compressors/Gzip.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/blockstore/implementations/compressing/compressors/Gzip.cpp
-+++ cryfs-0.10.2/src/blockstore/implementations/compressing/compressors/Gzip.cpp
-@@ -1,6 +1,6 @@
- #include "cpp-utils/crypto/cryptopp_byte.h"
+--- a/src/blockstore/implementations/compressing/compressors/Gzip.cpp 2022-08-25 22:14:05.481898162 +0400
++++ b/src/blockstore/implementations/compressing/compressors/Gzip.cpp 2022-08-25 22:17:49.606653292 +0400
+@@ -1,5 +1,5 @@
#include "Gzip.h"
-#include <vendor_cryptopp/gzip.h>
+#include <cryptopp/gzip.h>
using cpputils::Data;
-Index: cryfs-0.10.2/src/cpp-utils/crypto/cryptopp_byte.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/cryptopp_byte.h
-+++ cryfs-0.10.2/src/cpp-utils/crypto/cryptopp_byte.h
-@@ -2,7 +2,7 @@
- #ifndef _CPPUTILS_CRYPTO_CRYPTOPP_BYTE_H
- #define _CPPUTILS_CRYPTO_CRYPTOPP_BYTE_H
-
--#include <vendor_cryptopp/cryptlib.h>
-+#include <cryptopp/cryptlib.h>
-
- // If we're running an older CryptoPP version, CryptoPP::byte isn't defined yet.
- // Define it. Refer to "byte" type in the global namespace (placed by CryptoPP).
-Index: cryfs-0.10.2/src/cpp-utils/crypto/hash/Hash.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/hash/Hash.cpp
-+++ cryfs-0.10.2/src/cpp-utils/crypto/hash/Hash.cpp
+--- a/src/cpp-utils/crypto/hash/Hash.cpp 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/hash/Hash.cpp 2022-08-25 22:18:07.131800277 +0400
@@ -1,6 +1,6 @@
#include "Hash.h"
#include <cpp-utils/random/Random.h>
@@ -35,10 +17,8 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/hash/Hash.cpp
using cpputils::Random;
using CryptoPP::SHA512;
-Index: cryfs-0.10.2/src/cpp-utils/crypto/kdf/Scrypt.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/kdf/Scrypt.cpp
-+++ cryfs-0.10.2/src/cpp-utils/crypto/kdf/Scrypt.cpp
+--- a/src/cpp-utils/crypto/kdf/Scrypt.cpp 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/kdf/Scrypt.cpp 2022-08-25 22:18:17.754889373 +0400
@@ -1,5 +1,5 @@
#include "Scrypt.h"
-#include <vendor_cryptopp/scrypt.h>
@@ -46,11 +26,9 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/kdf/Scrypt.cpp
using std::string;
-Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
-+++ cryfs-0.10.2/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
-@@ -7,7 +7,7 @@
+--- a/src/cpp-utils/crypto/symmetric/CFB_Cipher.h 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/symmetric/CFB_Cipher.h 2022-08-25 22:18:28.524979704 +0400
+@@ -6,7 +6,7 @@
#include "../../data/Data.h"
#include "../../random/Random.h"
#include <boost/optional.hpp>
@@ -59,24 +37,9 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
#include "Cipher.h"
#include "EncryptionKey.h"
-Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
-+++ cryfs-0.10.2/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
-@@ -6,7 +6,7 @@
- #include "../../data/FixedSizeData.h"
- #include "../../data/Data.h"
- #include "../../random/Random.h"
--#include <vendor_cryptopp/gcm.h>
-+#include <cryptopp/gcm.h>
- #include "Cipher.h"
- #include "EncryptionKey.h"
-
-Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/ciphers.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/symmetric/ciphers.h
-+++ cryfs-0.10.2/src/cpp-utils/crypto/symmetric/ciphers.h
-@@ -2,11 +2,11 @@
+--- a/src/cpp-utils/crypto/symmetric/ciphers.h 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/symmetric/ciphers.h 2022-08-25 22:18:52.181178110 +0400
+@@ -2,12 +2,12 @@
#ifndef MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_
#define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_
@@ -85,30 +48,39 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/ciphers.h
-#include <vendor_cryptopp/serpent.h>
-#include <vendor_cryptopp/cast.h>
-#include <vendor_cryptopp/mars.h>
+-#include <vendor_cryptopp/chachapoly.h>
+#include <cryptopp/aes.h>
+#include <cryptopp/twofish.h>
+#include <cryptopp/serpent.h>
+#include <cryptopp/cast.h>
+#include <cryptopp/mars.h>
++#include <cryptopp/chachapoly.h>
#include "GCM_Cipher.h"
#include "CFB_Cipher.h"
-Index: cryfs-0.10.2/src/cpp-utils/data/Data.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/data/Data.cpp
-+++ cryfs-0.10.2/src/cpp-utils/data/Data.cpp
+--- a/src/cpp-utils/crypto/symmetric/GCM_Cipher.h 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/symmetric/GCM_Cipher.h 2022-08-25 22:18:38.836066183 +0400
+@@ -3,7 +3,7 @@
+ #define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_GCMCIPHER_H_
+
+ #include "AEAD_Cipher.h"
+-#include <vendor_cryptopp/gcm.h>
++#include <cryptopp/gcm.h>
+
+ namespace cpputils {
+
+--- a/src/cpp-utils/data/Data.cpp 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/data/Data.cpp 2022-08-25 22:19:09.349322106 +0400
@@ -1,6 +1,6 @@
#include "Data.h"
#include <stdexcept>
-#include <vendor_cryptopp/hex.h>
+#include <cryptopp/hex.h>
- #include <cpp-utils/crypto/cryptopp_byte.h>
using std::istream;
-Index: cryfs-0.10.2/src/cpp-utils/data/FixedSizeData.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/data/FixedSizeData.h
-+++ cryfs-0.10.2/src/cpp-utils/data/FixedSizeData.h
+ using std::ofstream;
+--- a/src/cpp-utils/data/FixedSizeData.h 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/data/FixedSizeData.h 2022-08-25 22:19:19.103403916 +0400
@@ -2,7 +2,7 @@
#ifndef MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_
#define MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_
@@ -116,25 +88,21 @@ Index: cryfs-0.10.2/src/cpp-utils/data/FixedSizeData.h
-#include <vendor_cryptopp/hex.h>
+#include <cryptopp/hex.h>
#include <string>
+ #include <array>
#include <cstring>
- #include "../assert/assert.h"
-Index: cryfs-0.10.2/src/cpp-utils/random/OSRandomGenerator.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/random/OSRandomGenerator.h
-+++ cryfs-0.10.2/src/cpp-utils/random/OSRandomGenerator.h
-@@ -4,7 +4,7 @@
+--- a/src/cpp-utils/random/OSRandomGenerator.h 2022-08-25 22:14:05.483898156 +0400
++++ b/src/cpp-utils/random/OSRandomGenerator.h 2022-08-25 22:19:29.602491973 +0400
+@@ -3,7 +3,7 @@
+ #define MESSMER_CPPUTILS_RANDOM_OSRANDOMGENERATOR_H
- #include "cpp-utils/crypto/cryptopp_byte.h"
#include "RandomGenerator.h"
-#include <vendor_cryptopp/osrng.h>
+#include <cryptopp/osrng.h>
namespace cpputils {
class OSRandomGenerator final : public RandomGenerator {
-Index: cryfs-0.10.2/src/cpp-utils/random/RandomGeneratorThread.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/random/RandomGeneratorThread.h
-+++ cryfs-0.10.2/src/cpp-utils/random/RandomGeneratorThread.h
+--- a/src/cpp-utils/random/RandomGeneratorThread.h 2022-08-25 22:14:05.484898153 +0400
++++ b/src/cpp-utils/random/RandomGeneratorThread.h 2022-08-25 22:19:36.713551613 +0400
@@ -4,7 +4,7 @@
#include "../thread/LoopThread.h"
@@ -144,10 +112,9 @@ Index: cryfs-0.10.2/src/cpp-utils/random/RandomGeneratorThread.h
namespace cpputils {
//TODO Test
-Index: cryfs-0.10.2/src/cryfs/localstate/BasedirMetadata.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cryfs/localstate/BasedirMetadata.cpp
-+++ cryfs-0.10.2/src/cryfs/localstate/BasedirMetadata.cpp
+diff -Naurp0 -U3 cryfs-0.11.2/src/cryfs/impl/localstate/BasedirMetadata.cpp cryfs-0.11.2-mine/src/cryfs/impl/localstate/BasedirMetadata.cpp
+--- a/src/cryfs/impl/localstate/BasedirMetadata.cpp 2022-08-25 22:14:05.487898144 +0400
++++ b/src/cryfs/impl/localstate/BasedirMetadata.cpp 2022-08-25 22:19:46.722635560 +0400
@@ -1,7 +1,7 @@
#include "BasedirMetadata.h"
#include <boost/property_tree/ptree.hpp>
@@ -157,11 +124,9 @@ Index: cryfs-0.10.2/src/cryfs/localstate/BasedirMetadata.cpp
#include <boost/filesystem/operations.hpp>
#include "LocalStateDir.h"
#include <cpp-utils/logging/logging.h>
-Index: cryfs-0.10.2/test/cryfs/config/CompatibilityTest.cpp
-===================================================================
---- cryfs-0.10.2.orig/test/cryfs/config/CompatibilityTest.cpp
-+++ cryfs-0.10.2/test/cryfs/config/CompatibilityTest.cpp
-@@ -3,7 +3,7 @@
+--- a/test/cryfs/impl/config/CompatibilityTest.cpp 2022-08-25 22:14:05.493898126 +0400
++++ b/test/cryfs/impl/config/CompatibilityTest.cpp 2022-08-25 22:19:54.589701542 +0400
+@@ -2,7 +2,7 @@
#include <vector>
#include <boost/filesystem.hpp>
#include <cpp-utils/data/Data.h>
@@ -169,12 +134,9 @@ Index: cryfs-0.10.2/test/cryfs/config/CompatibilityTest.cpp
+#include <cryptopp/hex.h>
#include <cpp-utils/crypto/symmetric/ciphers.h>
#include <cpp-utils/tempfile/TempFile.h>
- #include <cryfs/config/CryConfigFile.h>
-Index: cryfs-0.10.2/vendor/CMakeLists.txt
-===================================================================
---- cryfs-0.10.2.orig/vendor/CMakeLists.txt
-+++ cryfs-0.10.2/vendor/CMakeLists.txt
-@@ -1,3 +1 @@
+ #include <cryfs/impl/config/CryConfigFile.h>
+--- a/vendor/CMakeLists.txt 2022-08-25 22:14:05.497898115 +0400
++++ b/vendor/CMakeLists.txt 2022-08-25 22:20:11.176840657 +0400
+@@ -1,2 +1 @@
add_subdirectory(googletest)
--add_subdirectory(spdlog)
-add_subdirectory(cryptopp)
diff --git a/srcpkgs/cryfs/patches/fix-test.patch b/srcpkgs/cryfs/patches/fix-test.patch
deleted file mode 100644
index d3a5847b1a3c..000000000000
--- a/srcpkgs/cryfs/patches/fix-test.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: cryfs-0.10.2/test/cpp-utils/logging/testutils/LoggingTest.h
-===================================================================
---- cryfs-0.10.2.orig/test/cpp-utils/logging/testutils/LoggingTest.h
-+++ cryfs-0.10.2/test/cpp-utils/logging/testutils/LoggingTest.h
-@@ -11,8 +11,7 @@ class MockLogger final {
- public:
- MockLogger():
- _capturedLogData(),
-- _sink(std::make_shared<spdlog::sinks::ostream_sink<std::mutex>>(_capturedLogData, true)),
-- _logger(spdlog::create("MockLogger", {_sink})) {
-+ _logger(spdlog::create<spdlog::sinks::ostream_sink_mt>("MockLogger", _capturedLogData, true)) {
- }
-
- ~MockLogger() {
-@@ -28,7 +27,6 @@ public:
- }
- private:
- std::ostringstream _capturedLogData;
-- std::shared_ptr<spdlog::sinks::ostream_sink<std::mutex>> _sink;
- std::shared_ptr<spdlog::logger> _logger;
- };
-
diff --git a/srcpkgs/cryfs/patches/fmt-9-fix.patch b/srcpkgs/cryfs/patches/fmt-9-fix.patch
new file mode 100644
index 000000000000..6fe97eaeafa4
--- /dev/null
+++ b/srcpkgs/cryfs/patches/fmt-9-fix.patch
@@ -0,0 +1,54 @@
+From 27515e0116fd7cb034bd4e9763d1f3bfdc855a5f Mon Sep 17 00:00:00 2001
+From: Bernhard Rosenkraenzer <bero@lindev.ch>
+Date: Fri, 22 Jul 2022 14:13:38 +0200
+Subject: [PATCH] Fix build with fmt 9.0 (#433)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* Fix build with fmt 9.0
+
+Co-authored-by: Sebastian Meßmer <smessmer@users.noreply.github.com>
+---
+ ChangeLog.txt | 4 ++++
+ src/fspp/fuse/Fuse.cpp | 8 ++++----
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/src/fspp/fuse/Fuse.cpp b/src/fspp/fuse/Fuse.cpp
+index 4e9dbd7f..4b881815 100644
+--- a/src/fspp/fuse/Fuse.cpp
++++ b/src/fspp/fuse/Fuse.cpp
+@@ -603,21 +603,21 @@ int Fuse::mknod(const bf::path &path, ::mode_t mode, dev_t rdev) {
+ UNUSED(mode);
+ UNUSED(path);
+ ThreadNameForDebugging _threadName("mknod");
+- LOG(WARN, "Called non-implemented mknod({}, {}, _)", path, mode);
++ LOG(WARN, "Called non-implemented mknod({}, {}, _)", path.string(), mode);
+ return ENOSYS;
+ }
+
+ int Fuse::mkdir(const bf::path &path, ::mode_t mode) {
+ ThreadNameForDebugging _threadName("mkdir");
+ #ifdef FSPP_LOG
+- LOG(DEBUG, "mkdir({}, {})", path, mode);
++ LOG(DEBUG, "mkdir({}, {})", path.string(), mode);
+ #endif
+ try {
+ ASSERT(is_valid_fspp_path(path), "has to be an absolute path");
+ // DokanY seems to call mkdir("/"). Ignore that
+ if ("/" == path) {
+ #ifdef FSPP_LOG
+- LOG(DEBUG, "mkdir({}, {}): ignored", path, mode);
++ LOG(DEBUG, "mkdir({}, {}): ignored", path.string(), mode);
+ #endif
+ return 0;
+ }
+@@ -766,7 +766,7 @@ int Fuse::rename(const bf::path &from, const bf::path &to) {
+ //TODO
+ int Fuse::link(const bf::path &from, const bf::path &to) {
+ ThreadNameForDebugging _threadName("link");
+- LOG(WARN, "NOT IMPLEMENTED: link({}, {})", from, to);
++ LOG(WARN, "NOT IMPLEMENTED: link({}, {})", from.string(), to.string());
+ //auto real_from = _impl->RootDir() / from;
+ //auto real_to = _impl->RootDir() / to;
+ //int retstat = ::link(real_from.string().c_str(), real_to.string().c_str());
diff --git a/srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch b/srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch
deleted file mode 100644
index 08513cb4d0ca..000000000000
--- a/srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: cryfs-0.10.2/src/cryfs-cli/Cli.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cryfs-cli/Cli.cpp
-+++ cryfs-0.10.2/src/cryfs-cli/Cli.cpp
-@@ -27,6 +27,7 @@
- #include "Environment.h"
- #include <cryfs/CryfsException.h>
- #include <cpp-utils/thread/debugging.h>
-+#include <spdlog/sinks/basic_file_sink.h>
-
- //TODO Many functions accessing the ProgramOptions object. Factor out into class that stores it as a member.
- //TODO Factor out class handling askPassword
-@@ -310,7 +311,7 @@ namespace cryfs_cli {
- //TODO Test that --logfile parameter works. Should be: file if specified, otherwise stderr if foreground, else syslog.
- if (options.logFile() != none) {
- cpputils::logging::setLogger(
-- spdlog::create<spdlog::sinks::simple_file_sink<std::mutex>>("cryfs", options.logFile()->string()));
-+ spdlog::create<spdlog::sinks::basic_file_sink<std::mutex>>("cryfs", options.logFile()->string()));
- } else if (options.foreground()) {
- cpputils::logging::setLogger(spdlog::stderr_logger_mt("cryfs"));
- } else {
diff --git a/srcpkgs/cryfs/patches/spdlog-include.patch b/srcpkgs/cryfs/patches/spdlog-include.patch
deleted file mode 100644
index 2c1c5a926cf3..000000000000
--- a/srcpkgs/cryfs/patches/spdlog-include.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: cryfs-0.10.2/src/cpp-utils/logging/Logger.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/logging/Logger.h
-+++ cryfs-0.10.2/src/cpp-utils/logging/Logger.h
-@@ -7,6 +7,7 @@
- #endif
-
- #include <spdlog/spdlog.h>
-+#include <spdlog/sinks/stdout_sinks.h>
- #include "../macros.h"
-
- namespace cpputils {
-Index: cryfs-0.10.2/src/cpp-utils/logging/logging.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/logging/logging.h
-+++ cryfs-0.10.2/src/cpp-utils/logging/logging.h
-@@ -5,6 +5,7 @@
- #include "Logger.h"
- #include <stdexcept>
- #include <spdlog/fmt/ostr.h>
-+#include <spdlog/sinks/syslog_sink.h>
-
- #if defined(_MSC_VER)
- #include <spdlog/sinks/msvc_sink.h>
-@@ -75,7 +76,7 @@ namespace cpputils {
- #if defined(_MSC_VER)
- return spdlog::create<spdlog::sinks::msvc_sink_mt>(name);
- #else
-- return spdlog::syslog_logger(name, name, LOG_PID);
-+ return spdlog::syslog_logger_mt(name, name, LOG_PID);
- #endif
- }
- }
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 495c2b318a3b..3c8dc28e519c 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,14 +1,15 @@
# Template file for 'cryfs'
pkgname=cryfs
-version=0.10.2
-revision=5
+version=0.11.2
+revision=1
create_wrksrc=yes
build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off
- -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
+configure_args="-DCRYFS_UPDATE_CHECKS=off -DBoost_USE_STATIC_LIBS=OFF
+ -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt
+ -DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
hostmakedepends="pkg-config python3"
makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel
- spdlog"
+ spdlog range-v3"
depends="fuse"
short_desc="Cryptographic filesystem for the cloud"
maintainer="Andy Weidenbaum <atweiden@tutanota.de>"
@@ -16,7 +17,7 @@ license="LGPL-3.0-only"
homepage="https://www.cryfs.org"
changelog="https://github.com/cryfs/cryfs/raw/master/ChangeLog.txt"
distfiles="https://github.com/cryfs/cryfs/releases/download/${version}/${pkgname}-${version}.tar.gz"
-checksum=004c7fdf537062e197aaa0bcdafd2682904a279802441bb6063cb72c1fba52d2
+checksum=a89ab8fea2d494b496867107ec0a3772fe606ebd71ef12152fcd233f463a2c00
if [ "${XBPS_CHECK_PKGS}" ]; then
configure_args+=" -DBUILD_TESTING=on"
From 38d4f93985cdee9f1be6192a3ef772b73db99926 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:30 +0700
Subject: [PATCH 017/108] eclib: rebuild for boost-1.80
---
srcpkgs/eclib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/eclib/template b/srcpkgs/eclib/template
index 3db0bd2119b9..694a39ed4068 100644
--- a/srcpkgs/eclib/template
+++ b/srcpkgs/eclib/template
@@ -1,7 +1,7 @@
# Template file for 'eclib'
pkgname=eclib
version=20210625
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-flint --with-boost"
hostmakedepends="automake autoconf-archive libtool"
From 4a67d3c54946fa82c49b5df98790e80ebfc022fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:30 +0700
Subject: [PATCH 018/108] facter: rebuild for boost-1.80
---
srcpkgs/facter/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 93d6bfc6af51..45c921a0b72d 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
# Template file for 'facter'
pkgname=facter
version=3.14.16
-revision=3
+revision=4
build_style=cmake
configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
-DENABLE_CXX_WERROR=OFF -DCMAKE_INSTALL_LIBDIR=/usr/lib"
From a47613d9bab0e2ce8deb1fb64b3ff1e718f05bf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:30 +0700
Subject: [PATCH 019/108] fcitx5-chinese-addons: rebuild for boost-1.80
---
srcpkgs/fcitx5-chinese-addons/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fcitx5-chinese-addons/template b/srcpkgs/fcitx5-chinese-addons/template
index d207bde9ada9..a3a1948474a7 100644
--- a/srcpkgs/fcitx5-chinese-addons/template
+++ b/srcpkgs/fcitx5-chinese-addons/template
@@ -1,7 +1,7 @@
# Template file for 'fcitx5-chinese-addons'
pkgname=fcitx5-chinese-addons
version=5.0.14
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config gettext doxygen extra-cmake-modules qt5-qmake
qt5-host-tools libime-utils"
From a4f646abf36a023edcc43ab8e4c08c5bdc0c695f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:31 +0700
Subject: [PATCH 020/108] fifengine: rebuild for boost-1.80
---
srcpkgs/fifengine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fifengine/template b/srcpkgs/fifengine/template
index 1987e06f7d03..24d2f8521c8d 100644
--- a/srcpkgs/fifengine/template
+++ b/srcpkgs/fifengine/template
@@ -1,7 +1,7 @@
# Template file for 'fifengine'
pkgname=fifengine
version=0.4.2
-revision=8
+revision=9
build_style=cmake
hostmakedepends="swig python3"
makedepends="SDL2-devel SDL2_image-devel SDL2_ttf-devel boost-devel
From a7976bcc90d5ee6a9f3575abe8076e0ad4f97715 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:31 +0700
Subject: [PATCH 021/108] freecad: rebuild for boost-1.80
---
srcpkgs/freecad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index e9c697adbe1a..843d2281f324 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=0.20.1
-revision=1
+revision=2
wrksrc="FreeCAD-${version}"
build_style=cmake
From 9a71aa4ad2222129296bcfbdd04eea8743fe85a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:31 +0700
Subject: [PATCH 022/108] freeorion: rebuild for boost-1.80
---
srcpkgs/freeorion/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freeorion/template b/srcpkgs/freeorion/template
index 20fd819e49b0..71d41f3e987b 100644
--- a/srcpkgs/freeorion/template
+++ b/srcpkgs/freeorion/template
@@ -1,7 +1,7 @@
# Template file for 'freeorion'
pkgname=freeorion
version=0.4.10.2
-revision=1
+revision=2
_release=${version}_2021-08-01.f663dad
wrksrc=src-tarball
build_style=cmake
From 96f9e8fa9a8eeb428c2773b9131129fcc0e39588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:31 +0700
Subject: [PATCH 023/108] gnucash: rebuild for boost-1.80
---
srcpkgs/gnucash/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 5d403e47c02b..81627ef4f8a1 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
# Template file for 'gnucash'
pkgname=gnucash
version=4.11
-revision=1
+revision=2
wrksrc="${pkgname}-${version%b}"
build_style=cmake
make_check_target=check
From 715d30a507f0a7fbdc669190bda5383da76c19dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:31 +0700
Subject: [PATCH 024/108] gnuradio: rebuild for boost-1.80
---
srcpkgs/gnuradio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index 43ae4e1cb1ba..973339f92921 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
version=3.10.3.0
-revision=1
+revision=2
build_style=cmake
conf_files="/etc/gnuradio/conf.d/*"
configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax
From 8974292cd249ab3921001a8819d6dfd7fdfe2ea3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:32 +0700
Subject: [PATCH 025/108] gnuradio-osmosdr: rebuild for boost-1.80
---
srcpkgs/gnuradio-osmosdr/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template
index cdb4d27faf68..bf0696c672a9 100644
--- a/srcpkgs/gnuradio-osmosdr/template
+++ b/srcpkgs/gnuradio-osmosdr/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-osmosdr'
pkgname=gnuradio-osmosdr
version=0.2.3git20210128
-revision=1
+revision=2
_githash=a100eb024c0210b95e4738b6efd836d48225bd03
wrksrc="gr-osmosdr-${_githash}"
build_style=cmake
From 996504f85bde3f7fb8d9e5dc0df265ca7b6fcfea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:32 +0700
Subject: [PATCH 026/108] gnuradio-rds: rebuild for boost-1.80
---
srcpkgs/gnuradio-rds/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template
index 35d19fb82b11..e9e865151f7a 100644
--- a/srcpkgs/gnuradio-rds/template
+++ b/srcpkgs/gnuradio-rds/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-rds'
pkgname=gnuradio-rds
version=3.10
-revision=1
+revision=2
wrksrc="gr-rds-${version}"
build_style=cmake
configure_args="-Dpybind11_DIR=/${py3_sitelib}/pybind11/share/cmake/pybind11"
From da3e2d40deed4194eecd8729701c6b65bafbec96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:32 +0700
Subject: [PATCH 027/108] gource: rebuild for boost-1.80
---
srcpkgs/gource/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gource/template b/srcpkgs/gource/template
index 8ec3b05ca772..08b2e222f607 100644
--- a/srcpkgs/gource/template
+++ b/srcpkgs/gource/template
@@ -1,7 +1,7 @@
# Template file for 'gource'
pkgname=gource
version=0.51
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-tinyxml --enable-ttf-font-dir=/usr/share/fonts/TTF
--with-boost-libdir=$XBPS_CROSS_BASE/usr/lib/"
From 79c5b15f7a6ac003214fd347db0b58645696f524 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:32 +0700
Subject: [PATCH 028/108] gpick: rebuild for boost-1.80
---
srcpkgs/gpick/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gpick/template b/srcpkgs/gpick/template
index b30108334144..7b3a4db6d69c 100644
--- a/srcpkgs/gpick/template
+++ b/srcpkgs/gpick/template
@@ -1,7 +1,7 @@
# Template file for 'gpick'
pkgname=gpick
version=0.2.6
-revision=1
+revision=2
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=cmake
hostmakedepends="gettext pkg-config ragel"
From 4ed2a4da8a774294902fd5c127a5e66a211207a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:32 +0700
Subject: [PATCH 029/108] grive2: rebuild for boost-1.80
---
srcpkgs/grive2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/grive2/template b/srcpkgs/grive2/template
index 140688ee9aec..e416cdc606b5 100644
--- a/srcpkgs/grive2/template
+++ b/srcpkgs/grive2/template
@@ -1,7 +1,7 @@
# Template file for 'grive2'
pkgname=grive2
version=0.5.1
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config"
makedepends="boost-devel libcurl-devel yajl-devel libgcrypt-devel expat-devel"
From f541704419c113b37e79065e474627a8e8b67b73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:33 +0700
Subject: [PATCH 030/108] guitarix2: rebuild for boost-1.80
---
srcpkgs/guitarix2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/guitarix2/template b/srcpkgs/guitarix2/template
index 880814313a2b..de2edbf770b4 100644
--- a/srcpkgs/guitarix2/template
+++ b/srcpkgs/guitarix2/template
@@ -1,7 +1,7 @@
# Template file for 'guitarix2'
pkgname=guitarix2
version=0.42.1
-revision=1
+revision=2
wrksrc="guitarix-${version}"
build_style=waf3
configure_args="--cxxflags-release=-DNDEBUG --ladspa --new-ladspa --no-faust
From 36192eccf4858874777e4dd72b39527c7a5bea83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:33 +0700
Subject: [PATCH 031/108] heaptrack: rebuild for boost-1.80
---
srcpkgs/heaptrack/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/heaptrack/template b/srcpkgs/heaptrack/template
index ed98a952dfdc..0ccc1e6415a7 100644
--- a/srcpkgs/heaptrack/template
+++ b/srcpkgs/heaptrack/template
@@ -1,7 +1,7 @@
# Template file for 'heaptrack'
pkgname=heaptrack
version=1.4.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DHEAPTRACK_BUILD_GUI=ON"
hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules kcoreaddons
From 6cd0e8c72b9bfba00de438bff3a8c046ea303605 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:33 +0700
Subject: [PATCH 032/108] hugin: rebuild for boost-1.80
---
srcpkgs/hugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 7961c74632a1..87cecac02106 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
# Template file for 'hugin'
pkgname=hugin
version=2021.0.0
-revision=1
+revision=2
wrksrc="${pkgname}-${version}"
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
From 2090f8849bb93af74a28619eb4aec3bfe0c197dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:33 +0700
Subject: [PATCH 033/108] i2pd: rebuild for boost-1.80
---
srcpkgs/i2pd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index fe12bb2e19bf..522235bebc17 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,7 +1,7 @@
# Template file for 'i2pd'
pkgname=i2pd
version=2.42.1
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="USE_UPNP=yes"
makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
From 97073777f3b2d49fb6d7d5a6b37dd4493e6ab1e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:34 +0700
Subject: [PATCH 034/108] icinga2: rebuild for boost-1.80
---
srcpkgs/icinga2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index a884892fc49e..4ef7abea2fc3 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,7 +1,7 @@
# Template file for 'icinga2'
pkgname=icinga2
version=2.9.3
-revision=6
+revision=7
build_style=cmake
build_helper="qemu"
configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
From 3c5bb678460d10b35441133626659b02abecca07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:34 +0700
Subject: [PATCH 035/108] imagescan: rebuild for boost-1.80
---
srcpkgs/imagescan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imagescan/template b/srcpkgs/imagescan/template
index a12adfe05713..152ef2f83b33 100644
--- a/srcpkgs/imagescan/template
+++ b/srcpkgs/imagescan/template
@@ -1,7 +1,7 @@
# Template file for 'imagescan'
pkgname=imagescan
version=3.65.0
-revision=1
+revision=2
wrksrc=utsushi-0.65.0
build_style=gnu-configure
configure_args="--libexecdir=/usr/lib --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
From a68ee457ead37748b2ebf6e9757f7b999af1fd1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:34 +0700
Subject: [PATCH 036/108] inkscape: rebuild for boost-1.80
---
srcpkgs/inkscape/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 4d902e663f73..c77236be6848 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.1.1
-revision=4
+revision=5
wrksrc="inkscape-${version}_2021-09-20_3bf5ae0d25"
build_style=cmake
# builds executables then runs checks
From 9637d180ca2a39bc48e5894f2b6d55640eb37165 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:34 +0700
Subject: [PATCH 037/108] innoextract: rebuild for boost-1.80
---
srcpkgs/innoextract/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/innoextract/template b/srcpkgs/innoextract/template
index 079a8ce1350a..9b8e1e163e55 100644
--- a/srcpkgs/innoextract/template
+++ b/srcpkgs/innoextract/template
@@ -1,7 +1,7 @@
# Template file for 'innoextract'
pkgname=innoextract
version=1.9
-revision=1
+revision=2
build_style=cmake
configure_args="-DCMAKE_INSTALL_PREFIX=/usr"
hostmakedepends="boost extra-cmake-modules"
From cb37b6c2fed9b081a15474ce5c5a5c79c07dcd96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:34 +0700
Subject: [PATCH 038/108] juCi++: rebuild for boost-1.80
---
srcpkgs/juCi++/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index 1a7604b44a00..5103324dec20 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -1,7 +1,7 @@
# Template file for 'juCi++'
pkgname=juCi++
version=1.6.2
-revision=2
+revision=3
_libclangmm_commit="b342f4dd6de4fe509a692a4b4fcfc7e24aae9590"
_tiny_commit="c9c8bf810ddad8cd17882b9a9ee628a690e779f5"
wrksrc="jucipp-v${version}"
From 7682406d886ca9033724118c283cf86264d80e85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:35 +0700
Subject: [PATCH 039/108] kea: rebuild for boost-1.80
---
srcpkgs/kea/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index dc0bcc5de3fc..a55b58691de9 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -1,7 +1,7 @@
# Template file for 'kea'
pkgname=kea
version=1.9.5
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
$(vopt_if mysql --with-mysql)
From 1a7d47ccd427736569ad147721e65f960f837912 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:35 +0700
Subject: [PATCH 040/108] kig: rebuild for boost-1.80
---
srcpkgs/kig/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index 591db4bd477c..748c09f99e59 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,7 +1,7 @@
# Template file for 'kig'
pkgname=kig
version=22.04.3
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
pkg-config qt5-host-tools qt5-qmake"
From 60b968641e8b1503e66b8e3c8011a9b6593df440 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:35 +0700
Subject: [PATCH 041/108] leatherman: rebuild for boost-1.80
---
srcpkgs/leatherman/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/leatherman/template b/srcpkgs/leatherman/template
index b61fcd5dc205..5255ea4a18a1 100644
--- a/srcpkgs/leatherman/template
+++ b/srcpkgs/leatherman/template
@@ -1,7 +1,7 @@
# Template file for 'leatherman'
pkgname=leatherman
version=1.12.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DLEATHERMAN_SHARED=ON"
hostmakedepends="pkg-config python3"
From 2cd81f9508462d606f501a693aeec86b16f5d744 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:35 +0700
Subject: [PATCH 042/108] ledger: rebuild for boost-1.80
---
srcpkgs/ledger/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ledger/template b/srcpkgs/ledger/template
index c94b72709dea..130c727e7768 100644
--- a/srcpkgs/ledger/template
+++ b/srcpkgs/ledger/template
@@ -1,7 +1,7 @@
# Template file for 'ledger'
pkgname=ledger
version=3.2.1
-revision=1
+revision=2
build_style=cmake
makedepends="boost-devel gmp-devel mpfr-devel gettext-devel libedit-devel"
short_desc="Double-entry accounting system with a command-line reporting interface"
From e86041c70cd8d293139a4c5acd564bb5fe2fca06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:36 +0700
Subject: [PATCH 043/108] libbitcoin-blockchain: rebuild for boost-1.80
---
srcpkgs/libbitcoin-blockchain/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index e43ab8b9ede1..09a126e75356 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-blockchain'
pkgname=libbitcoin-blockchain
version=3.6.0
-revision=6
+revision=7
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
From 2de425a47c12c9466f3addbed1637899cf06b74d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:36 +0700
Subject: [PATCH 044/108] libbitcoin-client: rebuild for boost-1.80
---
srcpkgs/libbitcoin-client/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index 17849cd906d0..35f17b74ae00 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-client'
pkgname=libbitcoin-client
version=3.6.0
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"
From 7a7591fb6ed905638999d2141ef87552953c0706 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:36 +0700
Subject: [PATCH 045/108] libbitcoin-database: rebuild for boost-1.80
---
srcpkgs/libbitcoin-database/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index a3c48226ba2d..13cec4fdc3dd 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-database'
pkgname=libbitcoin-database
version=3.6.0
-revision=6
+revision=7
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
From f761daa6ba961f36c468c95db75e19091faf6741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:36 +0700
Subject: [PATCH 046/108] libbitcoin-explorer: rebuild for boost-1.80
---
srcpkgs/libbitcoin-explorer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index a1929f350269..7a5f8368b271 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-explorer'
pkgname=libbitcoin-explorer
version=3.6.0
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
From 4b975aeb1f50f583952db56b86b026ba8818e861 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:36 +0700
Subject: [PATCH 047/108] libbitcoin-network: rebuild for boost-1.80
---
srcpkgs/libbitcoin-network/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index d130facc40de..4f730a814242 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-network'
pkgname=libbitcoin-network
version=3.6.0
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
From cbe016a80000bfe80db85817ad3618afe8f524fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:37 +0700
Subject: [PATCH 048/108] libbitcoin-node: rebuild for boost-1.80
---
srcpkgs/libbitcoin-node/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 23e32624b5cc..ead87310627b 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-node'
pkgname=libbitcoin-node
version=3.6.0
-revision=6
+revision=7
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
From f4adf3c680389aef3608eecd1db8c984182acda0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:37 +0700
Subject: [PATCH 049/108] libbitcoin-protocol: rebuild for boost-1.80
---
srcpkgs/libbitcoin-protocol/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 838d62cc9ecd..53e2e6520f6a 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-protocol'
pkgname=libbitcoin-protocol
version=3.6.0
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
From 7b793f70dfed5762648ca3b4e8e0e27d814e48e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:37 +0700
Subject: [PATCH 050/108] libbitcoin-server: rebuild for boost-1.80
---
srcpkgs/libbitcoin-server/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index fc4988deac2b..70d4c492c5bb 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-server'
pkgname=libbitcoin-server
version=3.6.0
-revision=6
+revision=7
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
From 49326cd74d30b07cbf0dc679ff6b1b0f4d5a00a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:37 +0700
Subject: [PATCH 051/108] libbitcoin-system: rebuild for boost-1.80
---
srcpkgs/libbitcoin-system/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index 8b03fb248c42..8e6790c3ba66 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-system'
pkgname=libbitcoin-system
version=3.6.0
-revision=6
+revision=7
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
From 56f30f7ccf9a8cc7bd9453758112a4e0f08a3a80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:38 +0700
Subject: [PATCH 052/108] libcmis: rebuild for boost-1.80
---
srcpkgs/libcmis/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libcmis/template b/srcpkgs/libcmis/template
index fac133d5e4d9..43dd0a856122 100644
--- a/srcpkgs/libcmis/template
+++ b/srcpkgs/libcmis/template
@@ -1,7 +1,7 @@
# Template file for 'libcmis'
pkgname=libcmis
version=0.5.2
-revision=4
+revision=5
build_style=gnu-configure
configure_args="DOCBOOK2MAN=docbook2man --disable-werror"
hostmakedepends="pkg-config docbook2x"
From a0fd2510ff1967dbe4b4254f8c2b14ac4a6a3512 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:38 +0700
Subject: [PATCH 053/108] libime: rebuild for boost-1.80
---
srcpkgs/libime/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libime/template b/srcpkgs/libime/template
index a37db9885a48..363bdd93b16d 100644
--- a/srcpkgs/libime/template
+++ b/srcpkgs/libime/template
@@ -1,7 +1,7 @@
# Template file for 'libime'
pkgname=libime
version=1.0.13
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config gettext extra-cmake-modules python3"
From 7248d4d369f82b6d2d7268a9541832a32b17cf01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:38 +0700
Subject: [PATCH 054/108] libime-jyutping: rebuild for boost-1.80
---
srcpkgs/libime-jyutping/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libime-jyutping/template b/srcpkgs/libime-jyutping/template
index 3c33940ca368..6ae0855c3d7a 100644
--- a/srcpkgs/libime-jyutping/template
+++ b/srcpkgs/libime-jyutping/template
@@ -1,7 +1,7 @@
# Template file for 'libime-jyutping'
pkgname=libime-jyutping
version=1.0.4
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config gettext extra-cmake-modules python3 libime-utils"
From 74c03d968e96ec66405ce53f8cbac0510c1db429 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:38 +0700
Subject: [PATCH 055/108] libixion: rebuild for boost-1.80
---
srcpkgs/libixion/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libixion/template b/srcpkgs/libixion/template
index 37298a8b9427..ef1a00100f53 100644
--- a/srcpkgs/libixion/template
+++ b/srcpkgs/libixion/template
@@ -1,7 +1,7 @@
# Template file for 'libixion'
pkgname=libixion
version=0.17.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config python3"
makedepends="boost-devel fmt-devel mdds python3-devel spdlog"
From ea0304bc9365a55799f8be96cd66da98b51cb5de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:38 +0700
Subject: [PATCH 056/108] liborcus: rebuild for boost-1.80
---
srcpkgs/liborcus/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/liborcus/template b/srcpkgs/liborcus/template
index cf4b938fe37a..7b6b21a26dca 100644
--- a/srcpkgs/liborcus/template
+++ b/srcpkgs/liborcus/template
@@ -1,7 +1,7 @@
# Template file for 'liborcus'
pkgname=liborcus
version=0.17.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config python3"
makedepends="boost-devel mdds libixion-devel python3-devel zlib-devel"
From c20225a0ed88de83c79598918df9ec4bc95a3498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:39 +0700
Subject: [PATCH 057/108] libphonenumber: rebuild for boost-1.80
---
srcpkgs/libphonenumber/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libphonenumber/template b/srcpkgs/libphonenumber/template
index 9bef2825781c..05f28c4f5579 100644
--- a/srcpkgs/libphonenumber/template
+++ b/srcpkgs/libphonenumber/template
@@ -1,7 +1,7 @@
# Template file for 'libphonenumber'
pkgname=libphonenumber
version=8.12.39
-revision=6
+revision=7
build_wrksrc=cpp
build_style=cmake
build_helper=qemu
From e3a30c7fbbddcd4d3268eb8a7c41c712f3a65ed3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:39 +0700
Subject: [PATCH 058/108] librime: rebuild for boost-1.80
---
srcpkgs/librime/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/librime/template b/srcpkgs/librime/template
index 5f734c200bd7..7110eeffd3f9 100644
--- a/srcpkgs/librime/template
+++ b/srcpkgs/librime/template
@@ -1,7 +1,7 @@
# Template file for 'librime'
pkgname=librime
version=1.7.3
-revision=3
+revision=4
build_style=cmake
configure_args="-DCMAKE_BUILD_TYPE=None -DENABLE_LOGGING=OFF -DBUILD_TEST=ON
-DCAPNP_EXECUTABLE=/usr/bin/capnp -DCAPNPC_CXX_EXECUTABLE=/usr/bin/capnpc-c++"
From bd93db5fc8fd9455fd1b2d0c3e61a3ecf5694aa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:39 +0700
Subject: [PATCH 059/108] libtorrent-rasterbar: rebuild for boost-1.80
---
srcpkgs/libtorrent-rasterbar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index b1ceddc95282..5aceddec5646 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,7 +2,7 @@
# Breaks ABI/API without changing soname, revbump all dependants
pkgname=libtorrent-rasterbar
version=1.2.14
-revision=2
+revision=3
build_style=cmake
configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
-Dpython-bindings=ON"
From 074e19f508849b0eace6fbd325c392eb867e51ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:40 +0700
Subject: [PATCH 060/108] linssid: rebuild for boost-1.80
---
srcpkgs/linssid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linssid/template b/srcpkgs/linssid/template
index 937c8a0745e0..09206656186e 100644
--- a/srcpkgs/linssid/template
+++ b/srcpkgs/linssid/template
@@ -1,7 +1,7 @@
# Template file for 'linssid'
pkgname=linssid
version=3.6
-revision=4
+revision=5
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools"
makedepends="boost-devel qwt-devel"
From 4bc75e08c64d1ecdddcb40a4a0d5400bb001f248 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:40 +0700
Subject: [PATCH 061/108] litecoin: rebuild for boost-1.80
---
srcpkgs/litecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 3c33d9b0eb8a..7a188c3c9af8 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.18.1
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
--disable-tests --with-openssl"
From 273a3c883bfee0ee0ca0420e03e03c0bf8defbaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:40 +0700
Subject: [PATCH 062/108] monero: rebuild for boost-1.80
---
srcpkgs/monero/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index bff62347ebd6..eebce3d0a551 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
# Template file for 'monero'
pkgname=monero
version=0.17.2.3
-revision=2
+revision=3
_randomx_version="1.1.9"
# the revision monero uses as a submodule for the specific version
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
From 9043a4a043e550cd0fdf82ee2f1f2b9be76158e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:40 +0700
Subject: [PATCH 063/108] monero-gui: rebuild for boost-1.80
---
srcpkgs/monero-gui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 67ed3273defa..61e5dd9da1b7 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
# Template file for 'monero-gui'
pkgname=monero-gui
version=0.17.2.3
-revision=1
+revision=2
_monero_version=0.17.2.3
_randomx_version="1.1.9"
# the revision monero uses as a submodule for the specific version
From 4aa61002b65533b94ec016df037bb60b06e4e118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:40 +0700
Subject: [PATCH 064/108] mupen64plus: rebuild for boost-1.80
---
srcpkgs/mupen64plus/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mupen64plus/template b/srcpkgs/mupen64plus/template
index 4984a7f4a777..f4a58a4749cb 100644
--- a/srcpkgs/mupen64plus/template
+++ b/srcpkgs/mupen64plus/template
@@ -1,7 +1,7 @@
# Template file for 'mupen64plus'
pkgname=mupen64plus
version=2.5.9
-revision=1
+revision=2
archs="x86_64* i686*"
wrksrc="mupen64plus-bundle-src-${version}"
hostmakedepends="pkg-config which nasm"
From 14f213c3b39dba01b36f85fb6d52b7047be31598 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:41 +0700
Subject: [PATCH 065/108] musikcube: rebuild for boost-1.80
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index 2b75cbd976ea..11a3df3dc0aa 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=0.98.0
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1 -DENABLE_BUNDLED_TAGLIB=false"
From c11d16c79a418d99542a510bca060bdf52d76ec6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:41 +0700
Subject: [PATCH 066/108] namecoin: rebuild for boost-1.80
---
srcpkgs/namecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index e4cfb3777b71..7839d4008cd3 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
# Template file for 'namecoin'
pkgname=namecoin
version=0.18.1
-revision=5
+revision=6
wrksrc="${pkgname}-core-nc${version}"
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-static
From 4b4091ad7a501c8de1db69694b07e5e2fb676360 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:41 +0700
Subject: [PATCH 067/108] ncmpcpp: rebuild for boost-1.80
---
srcpkgs/ncmpcpp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 773deb4917d4..72a0d35e5e7f 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
--enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
From 2939fb23e2ba0e3210578bd95e814834d066bc05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:41 +0700
Subject: [PATCH 068/108] nix: rebuild for boost-1.80
---
srcpkgs/nix/template | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index bb585b6d7d54..e21c94aa2759 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,23 +1,25 @@
# Template file for 'nix'
pkgname=nix
-version=2.8.1
-revision=1
+version=2.10.3
+revision=2
build_style=gnu-configure
# Use /nix/var as suggested by the official Manual.
-configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
-hostmakedepends="curl pkg-config flex tar xz automake autoconf-archive mdBook jq"
+configure_args="--localstatedir=/nix/var
+ --with-sandbox-shell=/usr/bin/busybox.static"
+hostmakedepends="curl pkg-config flex tar xz automake autoconf-archive mdBook jq
+ busybox-static"
makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
liblzma-devel openssl-devel libsodium-devel sqlite-devel
libseccomp-devel editline-devel jq-devel libarchive-devel
gtest-devel lowdown-devel json-c++"
-depends="curl tar xz"
+depends="curl tar xz busybox-static"
short_desc="Purely functional package manager"
-maintainer="Juan RP <xtraeme@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://nixos.org/nix/"
changelog="https://nixos.org/releases/${pkgname}/${pkgname}-${version}/manual/#sec-relnotes"
distfiles="https://github.com/NixOS/nix/archive/refs/tags/${version}.tar.gz"
-checksum=6f19455775523fca4ae4096e6a6fc493f577198b968811f7fa77eb1fa5213b43
+checksum=5a8d79714bf04c425f41fdd22e67d4704d2e44c7a760c6c144e5767c6d662413
disable_parallel_build=yes
nocross="cross build populates /usr/lib32 with libraries and tries to link against them"
From 1dfab5f1ce35737ab84d14659e0b0dbe7bfb9930 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:42 +0700
Subject: [PATCH 069/108] opencamlib: rebuild for boost-1.80
---
srcpkgs/opencamlib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencamlib/template b/srcpkgs/opencamlib/template
index 8722aaf9ee64..140315ef3467 100644
--- a/srcpkgs/opencamlib/template
+++ b/srcpkgs/opencamlib/template
@@ -1,7 +1,7 @@
# Template file for 'opencamlib'
pkgname=opencamlib
version=2019.07
-revision=3
+revision=4
build_style=cmake
configure_args="-DBUILD_PY_LIB=ON -DUSE_PY_3=ON -DVERSION_STRING=${version}"
hostmakedepends="python3"
From 2315cfc8b30f65c194248011873c47ce2d57e0fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:42 +0700
Subject: [PATCH 070/108] openimageio: rebuild for boost-1.80
---
srcpkgs/openimageio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index 8abf3b05d6a3..23de3c1a91c3 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
# Template file for 'openimageio'
pkgname=openimageio
version=2.2.15.1
-revision=3
+revision=4
wrksrc="oiio-Release-${version}"
build_style=cmake
configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
From 66f8c9424dc4e9bd139e599b36e382436818ff7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:42 +0700
Subject: [PATCH 071/108] openmw: rebuild for boost-1.80
---
srcpkgs/openmw/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openmw/template b/srcpkgs/openmw/template
index 581e2cbb081e..9a263c9eae45 100644
--- a/srcpkgs/openmw/template
+++ b/srcpkgs/openmw/template
@@ -1,7 +1,7 @@
# Template file for 'openmw'
pkgname=openmw
version=0.47.0
-revision=1
+revision=2
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=cmake
# System bullet doesn't use double precision (double precision would break vdrift)
From 4403e5b45e83ead8da8748f0149ea69ba6d50724 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:42 +0700
Subject: [PATCH 072/108] openscad: rebuild for boost-1.80
---
srcpkgs/openscad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index 60d45d60615f..a3951a1a2201 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -1,7 +1,7 @@
# Template file for 'openscad'
pkgname=openscad
version=2021.01
-revision=2
+revision=3
build_style=qmake
hostmakedepends="bison flex pkg-config gettext qt5-qmake qt5-host-tools"
makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
From 030cd69805276f25b1d9d33f3d5f2e1cf1a1b38b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:42 +0700
Subject: [PATCH 073/108] openvdb: rebuild for boost-1.80
---
srcpkgs/openvdb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 4957f642552a..24bc2253828b 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,7 +1,7 @@
# Template file for 'openvdb'
pkgname=openvdb
version=9.0.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
hostmakedepends="pkg-config"
From 3a9da3af8ed90b30e305412cf41a6e47ade8c5a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:43 +0700
Subject: [PATCH 074/108] osm2pgsql: rebuild for boost-1.80
---
srcpkgs/osm2pgsql/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index 1c53c4505047..1d5f71b70140 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,7 +1,7 @@
# Template file for 'osm2pgsql'
pkgname=osm2pgsql
version=1.6.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="boost"
makedepends="expat-devel proj-devel bzip2-devel zlib-devel boost-devel
From 72e5de6a9aad4e4fe81b52d79bfec2bab42f94ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:43 +0700
Subject: [PATCH 075/108] poedit: rebuild for boost-1.80
---
srcpkgs/poedit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index f10aaf4c88a2..15cd4b6bae20 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
# Template file for 'poedit'
pkgname=poedit
version=3.0.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-wx-config=wx-config-gtk3"
hostmakedepends="pkg-config"
From 14382b5189c197c48c5bf037697e9eb38a3eb703 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:43 +0700
Subject: [PATCH 076/108] povray: rebuild for boost-1.80
---
srcpkgs/povray/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/povray/template b/srcpkgs/povray/template
index 30a2baab2039..93ab71f8e0db 100644
--- a/srcpkgs/povray/template
+++ b/srcpkgs/povray/template
@@ -1,7 +1,7 @@
# Template file for 'povray'
pkgname=povray
version=3.7.0.8
-revision=5
+revision=6
build_style=gnu-configure
_v=${version%.*.*}
configure_args="COMPILED_BY=Void --disable-optimiz-arch"
From 3d90d06b39a76819454d8cc00f3ccb9b76421a7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:43 +0700
Subject: [PATCH 077/108] pulseeffects-legacy: rebuild for boost-1.80
---
srcpkgs/pulseeffects-legacy/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pulseeffects-legacy/template b/srcpkgs/pulseeffects-legacy/template
index 585f25a55c8f..121e90e7f7dc 100644
--- a/srcpkgs/pulseeffects-legacy/template
+++ b/srcpkgs/pulseeffects-legacy/template
@@ -1,7 +1,7 @@
# Template file for 'pulseeffects-legacy'
pkgname=pulseeffects-legacy
version=4.8.5
-revision=3
+revision=4
wrksrc="easyeffects-${version}"
build_style=meson
hostmakedepends="itstool pkg-config gettext glib-devel"
From c05c62da8e57777eeabd775a66e8dd5578d58115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:44 +0700
Subject: [PATCH 078/108] pulseview: rebuild for boost-1.80
---
srcpkgs/pulseview/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pulseview/template b/srcpkgs/pulseview/template
index 83ce80bc39d9..e24c6cd30e88 100644
--- a/srcpkgs/pulseview/template
+++ b/srcpkgs/pulseview/template
@@ -1,7 +1,7 @@
# Template file for 'pulseview'
pkgname=pulseview
version=0.4.2
-revision=1
+revision=2
build_style=cmake
configure_args="-DDISABLE_WERROR=TRUE"
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From ca966febe0c067e48960ce6ae9337ddcf8530092 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:44 +0700
Subject: [PATCH 079/108] remwharead: rebuild for boost-1.80
---
srcpkgs/remwharead/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index 3e52473f86ce..cd36bd3b9849 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -1,7 +1,7 @@
# Template file for 'remwharead'
pkgname=remwharead
version=0.10.0
-revision=2
+revision=3
build_style=cmake
hostmakedepends="poco-devel asciidoc pkg-config"
makedepends="poco-devel boost-devel"
From 46e543ba21839aad2e54b4a033fb7f891f41b05a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:44 +0700
Subject: [PATCH 080/108] rstudio: rebuild for boost-1.80
---
srcpkgs/rstudio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index ad7c1e85cce7..c0354b8130cc 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
# Template file for 'rstudio'
pkgname=rstudio
version=1.4.1717
-revision=3
+revision=4
build_style=cmake
configure_args="-DRSTUDIO_TARGET=Desktop
-DRSTUDIO_USE_SYSTEM_BOOST=ON
From df0a4c016bb800b5284a4a577d96d0d1f0d1fb60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 20 Aug 2022 15:51:41 +0700
Subject: [PATCH 081/108] schroot: update to 1.6.12.
---
.../patches/{musl.patch => sbuild-i18n.patch} | 1 +
srcpkgs/schroot/patches/schroot-cppunit.patch | 11 -----
srcpkgs/schroot/patches/test-chown.patch | 8 ++++
srcpkgs/schroot/template | 47 ++++++++++++-------
4 files changed, 38 insertions(+), 29 deletions(-)
rename srcpkgs/schroot/patches/{musl.patch => sbuild-i18n.patch} (99%)
delete mode 100644 srcpkgs/schroot/patches/schroot-cppunit.patch
create mode 100644 srcpkgs/schroot/patches/test-chown.patch
diff --git a/srcpkgs/schroot/patches/musl.patch b/srcpkgs/schroot/patches/sbuild-i18n.patch
similarity index 99%
rename from srcpkgs/schroot/patches/musl.patch
rename to srcpkgs/schroot/patches/sbuild-i18n.patch
index e0dcaf3bae01..ff69d554cd9a 100644
--- a/srcpkgs/schroot/patches/musl.patch
+++ b/srcpkgs/schroot/patches/sbuild-i18n.patch
@@ -28,3 +28,4 @@
+#include "sbuild-i18n.h"
using namespace sbuild;
+
diff --git a/srcpkgs/schroot/patches/schroot-cppunit.patch b/srcpkgs/schroot/patches/schroot-cppunit.patch
deleted file mode 100644
index 3e11c73fd40b..000000000000
--- a/srcpkgs/schroot/patches/schroot-cppunit.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac 2017-05-20 09:50:30.146864516 +0000
-+++ b/configure.ac 2017-05-20 09:51:26.216792794 +0000
-@@ -336,7 +336,7 @@
- [HAVE_UUID=yes],
- [HAVE_UUID=no])
-
--AM_PATH_CPPUNIT([1.10.0], [HAVE_CPPUNIT=yes])
-+PKG_CHECK_MODULES([CPPUNIT], [cppunit], [HAVE_CPPUNIT=yes], [HAVE_CPPUNIT=no])
- AM_CONDITIONAL([USE_UNIT_TESTS], [test -n "$HAVE_CPPUNIT"])
-
- SCHROOT_CFLAGS="$UUID_CFLAGS"
diff --git a/srcpkgs/schroot/patches/test-chown.patch b/srcpkgs/schroot/patches/test-chown.patch
new file mode 100644
index 000000000000..c9d4e3919428
--- /dev/null
+++ b/srcpkgs/schroot/patches/test-chown.patch
@@ -0,0 +1,8 @@
+--- a/test/setup-test-data.cmake
++++ b/test/setup-test-data.cmake
+@@ -5,4 +5,4 @@ rm -rf test/testdata
+ mkdir test/testdata
+ cp -r ${PROJECT_SOURCE_DIR}/test/*.ex* test/testdata
+ mkdir test/testdata/run-parts.ex2
+-chown -R root:root test/testdata
++# chown -R root:root test/testdata
diff --git a/srcpkgs/schroot/template b/srcpkgs/schroot/template
index fd9ff15c7140..d73a149920a7 100644
--- a/srcpkgs/schroot/template
+++ b/srcpkgs/schroot/template
@@ -1,21 +1,25 @@
# Template file for 'schroot'
pkgname=schroot
reverts="1.7.2_9"
-version=1.6.10
-revision=12
-_debian_version=12+deb11u1
+version=1.6.12
+revision=1
+_debian_version=2
build_style=cmake
configure_args="
+ -DSCHROOT_LIBEXEC_DIR=/usr/libexec/schroot
+ -Ddebug=OFF
-Ddchroot=ON
-Dlvm-snapshot=ON
-Dbtrfs-snapshot=ON
+ -Dzfs-snapshot=ON
-Dblock-device=ON
-Dloopback=ON
+ -DLOSETUP_EXECUTABLE=/usr/sbin/losetup
-Duuid=ON
- -DBTRFS_EXECUTABLE=/usr/bin/btrfs
+ -DBTRFS_EXECUTABLE=/usr/sbin/btrfs
-DLVCREATE_EXECUTABLE=/usr/sbin/lvcreate
-DLVREMOVE_EXECUTABLE=/usr/sbin/lvremove
- -DZFS_EXECUTABLE=/usr/bin/zfs
+ -DZFS_EXECUTABLE=/usr/sbin/zfs
-Dbash_completion_dir=/usr/share/bash-completion/completions"
conf_files="
/etc/schroot/minimal/nssdatabases
@@ -41,27 +45,34 @@ make_dirs="
/var/lib/schroot/session 0755 root root
/var/lib/schroot/mount 0755 root root
/etc/schroot/chroot.d 0755 root root"
-hostmakedepends="pkg-config libtool gettext xz po4a groff"
-makedepends="boost-devel pam-devel lockdev-devel libuuid-devel e2fsprogs-devel
- gettext-devel libcppunit-devel"
+hostmakedepends="pkg-config gettext xz po4a groff"
+makedepends="boost-devel pam-devel lockdev-devel libuuid-devel
+ e2fsprogs-devel gettext-devel libcppunit-devel"
short_desc="Allows users to execute commands in different chroots"
maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
license="GPL-3.0-only"
homepage="https://wiki.debian.org/Schroot"
-distfiles="
- ${DEBIAN_SITE}/main/s/${pkgname}/${pkgname}_${version}.orig.tar.xz
- http://security.debian.org/debian-security/pool/main/s/${pkgname}/${pkgname}_${version}-${_debian_version}.debian.tar.xz"
-checksum="
- 3ce8dfd9cb97b099e4b6d4ccec421d6cc8c9ef84574681e928a12badb5643d0b
- 7bd4e0c2709979362c86a86c10d2b23d290d26e1a2d301a602e829327f483ec1"
-nocross=yes
+distfiles="${DEBIAN_SITE}/main/s/${pkgname}/${pkgname}_${version}.orig.tar.xz
+ ${DEBIAN_SITE}/main/s/${pkgname}/${pkgname}_${version}-${_debian_version}.debian.tar.xz"
+checksum="0bed8a069856a82261046b2e549af60ee32b79ebcdbf642424f378ec7aea6b77
+ 8ff03534007c6d55eb4032b637232954eaddba5cf18c91b42ff3016697ba0f93"
+skip_extraction="${pkgname}_${version}-${_debian_version}.debian.tar.xz"
-pre_configure() {
- cat ../debian/patches/series | while read p; do
- patch -p1 -i ../debian/patches/$p
+pre_patch() {
+ rm -rf debian
+ bsdtar -xf "$XBPS_SRCDISTDIR/$pkgname-$version/$skip_extraction"
+ grep '^[^#]' debian/patches/series | while read p; do
+ msg_normal "Patching (Debian): $p\n"
+ patch -Np1 -s -F0 -i debian/patches/$p
done
}
+do_check() {
+ # expect to be run with root
+ cd build
+ ctest -E "(sbuild-chroot-config)"
+}
+
post_install() {
# Remove development files
rm -rf ${DESTDIR}/usr/include \
From c53ffa9f6073f4d61b448ba8ccbcf16032bade8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:44 +0700
Subject: [PATCH 082/108] snapper: rebuild for boost-1.80
---
srcpkgs/snapper/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template
index bc7bbe5cf84b..85697667ff77 100644
--- a/srcpkgs/snapper/template
+++ b/srcpkgs/snapper/template
@@ -1,7 +1,7 @@
# Template file for 'snapper'
pkgname=snapper
version=0.10.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-zypp --disable-systemd --with-conf=/etc/conf.d"
conf_files="/etc/conf.d/snapper"
From f656bdf3ff26c09c29a65cd48f648c70dab036ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:45 +0700
Subject: [PATCH 083/108] source-highlight: rebuild for boost-1.80
---
srcpkgs/source-highlight/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/source-highlight/template b/srcpkgs/source-highlight/template
index ab56401c64a0..f76c987335af 100644
--- a/srcpkgs/source-highlight/template
+++ b/srcpkgs/source-highlight/template
@@ -1,7 +1,7 @@
# Template file for 'source-highlight'
pkgname=source-highlight
version=3.1.9
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--with-boost=${XBPS_CROSS_BASE}/usr
--with-bash-completion=/usr/share/bash-completion/completions"
From 928f660fdb78e98905f9eee446d5eb8a524db754 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:45 +0700
Subject: [PATCH 084/108] supercollider: rebuild for boost-1.80
---
srcpkgs/supercollider/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/supercollider/template b/srcpkgs/supercollider/template
index 35f6d9dfb7c2..b0b8278470ef 100644
--- a/srcpkgs/supercollider/template
+++ b/srcpkgs/supercollider/template
@@ -1,7 +1,7 @@
# Template file for 'supercollider'
pkgname=supercollider
version=3.11.1
-revision=3
+revision=4
wrksrc="SuperCollider-${version}-Source"
build_style=cmake
make_cmd=make
From df13190892cd9491aed69f3912c5ebac5b799dcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:45 +0700
Subject: [PATCH 085/108] supertux2: rebuild for boost-1.80
---
srcpkgs/supertux2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/supertux2/template b/srcpkgs/supertux2/template
index 56057f5837d5..fce60e205a59 100644
--- a/srcpkgs/supertux2/template
+++ b/srcpkgs/supertux2/template
@@ -1,7 +1,7 @@
# Template file for 'supertux2'
pkgname=supertux2
version=0.6.3
-revision=1
+revision=2
wrksrc="SuperTux-v${version}-Source"
build_style=cmake
configure_args="
From 291f41b6d263f3201abbe2d1a74e6161b97248b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:45 +0700
Subject: [PATCH 086/108] swiften: rebuild for boost-1.80
---
srcpkgs/swiften/patches/boost-endian.patch | 15 +++++++++++++++
srcpkgs/swiften/patches/std.patch | 11 +++++++++++
srcpkgs/swiften/template | 4 ++--
3 files changed, 28 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/swiften/patches/boost-endian.patch
create mode 100644 srcpkgs/swiften/patches/std.patch
diff --git a/srcpkgs/swiften/patches/boost-endian.patch b/srcpkgs/swiften/patches/boost-endian.patch
new file mode 100644
index 000000000000..1cd2c2fb4816
--- /dev/null
+++ b/srcpkgs/swiften/patches/boost-endian.patch
@@ -0,0 +1,15 @@
+--- a/Swiften/Base/Platform.h
++++ b/Swiften/Base/Platform.h
+@@ -43,9 +43,9 @@
+ #endif
+
+ // Endianness
+-#include <boost/detail/endian.hpp>
+-#if defined(BOOST_LITTLE_ENDIAN)
++#include <boost/predef/other/endian.h>
++#if BOOST_ENDIAN_LITTLE_BYTE
+ #define SWIFTEN_LITTLE_ENDIAN
+-#elif defined(BOOST_BIG_ENDIAN)
++#elif BOOST_ENDIAN_BIG_BYTE
+ #define SWIFTEN_BIG_ENDIAN
+ #endif
diff --git a/srcpkgs/swiften/patches/std.patch b/srcpkgs/swiften/patches/std.patch
new file mode 100644
index 000000000000..9534e8a321d2
--- /dev/null
+++ b/srcpkgs/swiften/patches/std.patch
@@ -0,0 +1,11 @@
+--- a/Swift/Controllers/ShowProfileController.h
++++ b/Swift/Controllers/ShowProfileController.h
+@@ -18,6 +18,8 @@
+
+ #include <Swift/Controllers/UIEvents/UIEvent.h>
+
++#include <map>
++
+ namespace Swift {
+ class VCardManager;
+ class ProfileWindow;
diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 969ef1eb5d78..9014153a8818 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,11 +1,11 @@
# Template file for 'swiften'
pkgname=swiften
version=4.0.3
-revision=2
+revision=3
wrksrc="swift-${version}"
hostmakedepends="scons pkg-config"
makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
- lua51-devel miniupnpc-devel sqlite-devel"
+ lua51-devel miniupnpc-devel sqlite-devel hunspell-devel"
short_desc="XMPP library for C++"
maintainer="John Regan <john@jrjrtech.com>"
license="GPL-3.0-only"
From e4e4d2b994d36dd3586e7a7ab9c404c437099e4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:46 +0700
Subject: [PATCH 087/108] syncthingtray: rebuild for boost-1.80
---
srcpkgs/syncthingtray/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/syncthingtray/template b/srcpkgs/syncthingtray/template
index 4f338f2cc200..f445aa92db1e 100644
--- a/srcpkgs/syncthingtray/template
+++ b/srcpkgs/syncthingtray/template
@@ -1,7 +1,7 @@
# Template file for 'syncthingtray'
pkgname=syncthingtray
version=1.2.2
-revision=1
+revision=2
build_style=cmake
configure_args="-DJS_PROVIDER=qml -DBUILTIN_TRANSLATIONS=ON -DSYSTEMD_SUPPORT=OFF
-DBUILD_SHARED_LIBS=ON -DWEBVIEW_PROVIDER=$(vopt_if webengine webengine none)"
From aef5ab68a99001b89c5eff85b9d199dcd9f8c665 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:46 +0700
Subject: [PATCH 088/108] tmfs: rebuild for boost-1.80
---
srcpkgs/tmfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tmfs/template b/srcpkgs/tmfs/template
index 1dbed3e0eb72..ed4fb5fed836 100644
--- a/srcpkgs/tmfs/template
+++ b/srcpkgs/tmfs/template
@@ -1,7 +1,7 @@
# Template file for 'tmfs'
pkgname=tmfs
version=r5
-revision=7
+revision=8
build_style=cmake
hostmakedepends="pkg-config"
makedepends="fuse-devel boost-devel"
From ccdf157e5dc4921fb251738c384d8c5224a21321 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:46 +0700
Subject: [PATCH 089/108] tomahawk: rebuild for boost-1.80
---
srcpkgs/tomahawk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tomahawk/template b/srcpkgs/tomahawk/template
index 0edbacc5f8ad..b66b9a876a5c 100644
--- a/srcpkgs/tomahawk/template
+++ b/srcpkgs/tomahawk/template
@@ -1,7 +1,7 @@
# Template file for 'tomahawk'
pkgname=tomahawk
version=0.8.4
-revision=21
+revision=22
wrksrc=${pkgname}-${_commit}
_commit=90ec6f0dc701cba0533c66abdcb904e29f02a66f
build_style=cmake
From 1508ba9c7418a81979d25b45c98c6f5fac03f047 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:46 +0700
Subject: [PATCH 090/108] uhd: rebuild for boost-1.80
---
srcpkgs/uhd/patches/boost-math.patch | 31 +++++++++++++++++++++++++++
srcpkgs/uhd/patches/std-complex.patch | 10 +++++++++
srcpkgs/uhd/template | 2 +-
3 files changed, 42 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/uhd/patches/boost-math.patch
create mode 100644 srcpkgs/uhd/patches/std-complex.patch
diff --git a/srcpkgs/uhd/patches/boost-math.patch b/srcpkgs/uhd/patches/boost-math.patch
new file mode 100644
index 000000000000..9ac6dae1df9d
--- /dev/null
+++ b/srcpkgs/uhd/patches/boost-math.patch
@@ -0,0 +1,31 @@
+--- a/host/lib/usrp/usrp2/usrp2_impl.cpp
++++ b/host/lib/usrp/usrp2/usrp2_impl.cpp
+@@ -18,6 +18,8 @@
+ #include <boost/asio.hpp> //used for htonl and ntohl
+ #include <boost/asio/ip/address_v4.hpp>
+ #include <boost/format.hpp>
++#include <boost/math/special_functions/round.hpp>
++#include <boost/math/special_functions/sign.hpp>
+ #include <boost/thread.hpp>
+ #include <functional>
+
+--- a/host/lib/usrp/cores/rx_frontend_core_3000.cpp
++++ b/host/lib/usrp/cores/rx_frontend_core_3000.cpp
+@@ -12,6 +12,7 @@
+ #include <uhdlib/usrp/cores/rx_frontend_core_3000.hpp>
+ #include <boost/assign/list_of.hpp>
+ #include <boost/math/special_functions/round.hpp>
++#include <boost/math/special_functions/sign.hpp>
+ #include <functional>
+
+ using namespace uhd;
+--- a/host/lib/usrp/cores/rx_dsp_core_3000.cpp
++++ b/host/lib/usrp/cores/rx_dsp_core_3000.cpp
+@@ -14,6 +14,7 @@
+ #include <uhdlib/usrp/cores/rx_dsp_core_3000.hpp>
+ #include <boost/assign/list_of.hpp>
+ #include <boost/math/special_functions/round.hpp>
++#include <boost/math/special_functions/sign.hpp>
+ #include <algorithm>
+ #include <cmath>
+ #include <functional>
diff --git a/srcpkgs/uhd/patches/std-complex.patch b/srcpkgs/uhd/patches/std-complex.patch
new file mode 100644
index 000000000000..c7573bf4ade2
--- /dev/null
+++ b/srcpkgs/uhd/patches/std-complex.patch
@@ -0,0 +1,10 @@
+--- a/host/tests/tx_streamer_test.cpp
++++ b/host/tests/tx_streamer_test.cpp
+@@ -7,6 +7,7 @@
+ #include "../common/mock_link.hpp"
+ #include <uhdlib/transport/tx_streamer_impl.hpp>
+ #include <boost/test/unit_test.hpp>
++#include <complex>
+ #include <iostream>
+ #include <memory>
+
diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template
index 5f043162d7dc..170e12670c2c 100644
--- a/srcpkgs/uhd/template
+++ b/srcpkgs/uhd/template
@@ -1,7 +1,7 @@
# Template file for 'uhd'
pkgname=uhd
version=4.0.0.0
-revision=1
+revision=2
build_wrksrc=host
build_style=cmake
configure_args="-DCMAKE_BUILD_TYPE=None"
From a9c25ff7cfa44ca80bf2f8b8b6bee93c10c0b90c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:47 +0700
Subject: [PATCH 091/108] wesnoth: rebuild for boost-1.80
---
srcpkgs/wesnoth/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 0fcc09b29c10..4d55d20b5959 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,7 +1,7 @@
# Template file for 'wesnoth'
pkgname=wesnoth
version=1.14.17
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_OMP=1"
hostmakedepends="pkg-config gettext"
@@ -18,7 +18,7 @@ checksum=3646cba604e09c12d6900a733bcb78cbf05f2f75f05346630d6529c220f584e1
replaces="wesnoth-data>=0"
CFLAGS="-UNDEBUG"
-CXXFLAGS="-UNDEBUG"
+CXXFLAGS="-UNDEBUG -std=c++14"
post_install() {
# runit service
From ef06323851cd7a139a6c41a399f3433601a18631 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:47 +0700
Subject: [PATCH 092/108] wsjtx: rebuild for boost-1.80
---
srcpkgs/wsjtx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wsjtx/template b/srcpkgs/wsjtx/template
index c1838dd7cf51..7324d85bd64d 100644
--- a/srcpkgs/wsjtx/template
+++ b/srcpkgs/wsjtx/template
@@ -1,7 +1,7 @@
# Template file for 'wsjtx'
pkgname=wsjtx
version=2.5.4
-revision=1
+revision=2
build_wrksrc=wsjtx
build_style=cmake
configure_args="-DRIGCTLCOM_EXE= -DRIGCTL_EXE= -DRIGCTLD_EXE="
From fc501a807a30fd852f09eb7b125a5661f6b2a27d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:39 +0700
Subject: [PATCH 093/108] libreoffice: update to 7.4.0.3.
---
srcpkgs/libreoffice/template | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 158df0f30ebc..00ceb97950ff 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
-version=7.3.3.2
-revision=3
+version=7.4.0.3
+revision=1
build_style=meta
make_build_target="build-nocheck"
nocross="Several dependencies are nocross=yes"
@@ -9,7 +9,7 @@ nocross="Several dependencies are nocross=yes"
hostmakedepends="automake flex git gperf hyphen icu libtool openldap which gettext xz
perl-Archive-Zip pkg-config qt5-qmake sane ucpp unzip zip python3-setuptools
fontforge python3-lxml"
-makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
+makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel icu-devel
frameworkintegration-devel glyphy-devel gpgmepp-devel gst-plugins-base1-devel
gtk+-devel gtk+3-devel hunspell-devel hyphen-devel libXt-devel libabw-devel
libatomic_ops-devel libbluetooth-devel libcdr-devel libe-book-devel
@@ -111,10 +111,10 @@ distfiles="
${_addurl}/Scheherazade-2.100.zip
${_addurl}/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz
"
-checksum="ee12bdbe1621c20e2744bc5b6c5967810f25a5760b98ac5812d550ab00968685
- a6f67d5a20fe656c909b16c338759c187cf7e5e7f463d33d8d58a8bbe0280323
- 688634eccb802c156496124b394c0ec5e21059a9b6cd0095930f9e76f9eefe9b
- b91b0a482fa42d59e1605f39a3917166e7ff76bfa8e9b62d6eef0a9b04b3351c
+checksum="acc383a4386e1ceb74266a2f6406dee4b3a78576bda6bc71630f629ea20e3c19
+ 7d0b2927051111acdf99c9e805078cf5fb7f90f855b6182a225d4319bb0419ad
+ aa1922940b1742a833f34efc2cc2267dd592363530764dcfd352112c9b329547
+ e6fc4b8b4adf6c3b23f555f0a245ef535ad1771a386480ec14cab71e70179d8c
1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66
From 111e3773ffa191b53c0e4d797615b102d0c38fbb Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 20:49:38 +0400
Subject: [PATCH 094/108] fmt: update to 9.0.0.
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index b91133da6484..dbc48a29aad1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3540,7 +3540,7 @@ libcotp.so.12 libcotp-1.2.1_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.8 fmt-8.0.1_1
+libfmt.so.9 fmt-9.0.0_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.25 libtls-3.5.2_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index 35a914c75eab..6fa037dfbaab 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=8.1.1
+version=9.0.0
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,7 +10,7 @@ license="BSD-2-Clause"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=3d794d3cf67633b34b2771eb9f073bde87e846e0d395d254df7b211ef1ec7346
+checksum=9a1e0e9e843a356d65c7604e2c8bf9402b50fe294c355de0095ebd42fb9bd2c5
post_install() {
vlicense LICENSE.rst LICENSE
From 784b69dd995f511d9467c3ad32e0549cbdd66ce6 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:33 +0400
Subject: [PATCH 095/108] Bear: update to 3.0.20.
---
srcpkgs/Bear/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index fce6309ca6fa..c6c1fb6e9c38 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
-version=3.0.19
-revision=2
+version=3.0.20
+revision=1
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-3.0-or-later"
homepage="https://github.com/rizsotto/Bear"
distfiles="https://github.com/rizsotto/Bear/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=2fcfe2c6e029182cfc54ed26b3505c0ef12b0f43df03fb587f335afdc2ca9431
+checksum=45cfcdab07f824f6c06c9776701156f7a04b23eadd25ecbc88c188789a447cc7
conflicts="interception-tools>=0" # /usr/bin/intercept
if [ -z "$XBPS_CHECK_PKGS" ]; then
From 0f47131c0c331089673af61bfc17e2c1baf4627a Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:33 +0400
Subject: [PATCH 096/108] cherrytree: revbump for fmt 9.0
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 55512e3b5ef7..e52a677a47b5 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=0.99.39
-revision=2
+revision=3
wrksrc="${pkgname}_${version}"
build_style=cmake
hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
From 9b0258045e2e515f84671a76e6ac7634dc9264a2 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:33 +0400
Subject: [PATCH 097/108] coeurl: revbump for fmt 9.0
---
srcpkgs/coeurl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index d0dbcbc60ba0..a9f2dfbbc123 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,7 +1,7 @@
# Template file for 'coeurl'
pkgname=coeurl
version=0.1.1
-revision=1
+revision=2
wrksrc=coeurl-v${version}
build_style=meson
hostmakedepends="pkg-config"
From e481abb5509b869c78b98f89666f192038a8db5d Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:34 +0400
Subject: [PATCH 098/108] easyeffects: revbump for fmt 9.0
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index ac84ce15b068..0ddfb1b5833d 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=6.2.4
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel"
makedepends="gtkmm4-devel pipewire-devel zita-convolver-devel lilv-devel
From c6b831b8d9db98226645ec7b1dcad6aeede4d338 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:34 +0400
Subject: [PATCH 099/108] gerbera: revbump for fmt 9.0, add patch
---
srcpkgs/gerbera/patches/fmt-9-fix.patch | 32 +++++++++++++++++++++++++
srcpkgs/gerbera/template | 2 +-
2 files changed, 33 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/gerbera/patches/fmt-9-fix.patch
diff --git a/srcpkgs/gerbera/patches/fmt-9-fix.patch b/srcpkgs/gerbera/patches/fmt-9-fix.patch
new file mode 100644
index 000000000000..7adedf9005db
--- /dev/null
+++ b/srcpkgs/gerbera/patches/fmt-9-fix.patch
@@ -0,0 +1,32 @@
+From d7b8fafbc94405c20753fed569abd8878cccde89 Mon Sep 17 00:00:00 2001
+From: Felix Yan <felixonmars@archlinux.org>
+Date: Fri, 19 Aug 2022 15:22:10 +0300
+Subject: [PATCH] Fix build with fmt 9.0
+
+Fixes #2681
+---
+ src/database/sql_format.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/database/sql_format.h b/src/database/sql_format.h
+index 32dc00efa..e4e1909a8 100644
+--- a/src/database/sql_format.h
++++ b/src/database/sql_format.h
+@@ -42,7 +42,7 @@ struct SQLIdentifier {
+ template <>
+ struct fmt::formatter<SQLIdentifier> : formatter<std::string_view> {
+ template <typename FormatContext>
+- auto format(const SQLIdentifier& tn, FormatContext& ctx) -> decltype(ctx.out())
++ auto format(const SQLIdentifier& tn, FormatContext& ctx) const -> decltype(ctx.out())
+ {
+ return format_to(ctx.out(), "{}{}{}", tn.quote_begin, tn.name, tn.quote_end);
+ }
+@@ -61,7 +61,7 @@ struct ColumnUpdate {
+ template <>
+ struct fmt::formatter<ColumnUpdate> : formatter<std::string_view> {
+ template <typename FormatContext>
+- auto format(const ColumnUpdate& a, FormatContext& ctx) -> decltype(ctx.out())
++ auto format(const ColumnUpdate& a, FormatContext& ctx) const -> decltype(ctx.out())
+ {
+ return format_to(ctx.out(), "{} = {}", a.column, a.value);
+ }
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 35136708b3e5..100b94a7acbe 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.11.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From f5e601820a3a2d23732a08fda7cb64cde6908d0d Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:34 +0400
Subject: [PATCH 100/108] kodi: revbump for fmt 9.0
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index d3e9a13afdd5..4b6c9e1ade0c 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=19.4
-revision=3
+revision=4
_codename="Matrix"
wrksrc="xbmc-${version}-${_codename}"
build_style=cmake
From aba3c0ec18f9547dde2455fe6ea1106de026c170 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:34 +0400
Subject: [PATCH 101/108] MangoHud: revbump for fmt 9.0
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index a9973bcad30a..fb0e18c1a1f4 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -2,7 +2,7 @@
pkgname=MangoHud
version=0.6.7.1
_version="${version%.*}-${version##*.}"
-revision=2
+revision=3
wrksrc="MangoHud-v${_version}"
build_style=meson
configure_args="-Duse_system_vulkan=enabled -Dwith_xnvctrl=disabled
From 8bac11cc1bb97be15e06baefd48b74c960375651 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 102/108] mkvtoolnix: revbump for fmt 9.0
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index a1d2adbc4b3f..d98022773c0a 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=70.0.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
From 86aa126e32cc533dff524b94f0418e3992d7293f Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 103/108] mpd: revbump for fmt 9.0
---
srcpkgs/mpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 98195b80a38d..b43c83fbb0f7 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,7 +1,7 @@
# Template file for 'mpd'
pkgname=mpd
version=0.23.8
-revision=1
+revision=2
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
-Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
From 2dd6b7d52ca6d3b933fa8373b38c3510ee88533c Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 104/108] mtxclient: revbump for fmt 9.0
---
srcpkgs/mtxclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 4ec895656749..12fea54d3fd5 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.8.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From 0f502a46c3c8a08b20fff1045cc0e2b54950b8a3 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 105/108] nheko: revbump for fmt 9.0
---
srcpkgs/nheko/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index f35fd3942116..8e41e9e1f2f0 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.10.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative asciidoc"
makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
From cb6c39e4f29583049bec68d46543788617e57793 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 106/108] spdlog: revbump for fmt 9.0
---
srcpkgs/spdlog/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 187ec0d0eb6e..ef1ee76ffcca 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
# Template file for 'spdlog'
pkgname=spdlog
version=1.10.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
-DSPDLOG_BUILD_SHARED=ON"
From ce1b9eff4521ef800d24ebb3bc8976f8343b4cd0 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 107/108] Waybar: revbump for fmt 9.0
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 8ac3d4290b39..e40288e00b75 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.9.13
-revision=1
+revision=2
_date_version=3.0.0
build_style=meson
configure_args="-Dgtk-layer-shell=enabled -Dlibudev=enabled -Dman-pages=enabled
From bd528ab8697eec310dc6546c4cabee3c539be607 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 29 Aug 2022 22:27:49 +0700
Subject: [PATCH 108/108] fixup! PrusaSlicer
---
srcpkgs/PrusaSlicer/patches/fstream.patch | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/PrusaSlicer/patches/fstream.patch
diff --git a/srcpkgs/PrusaSlicer/patches/fstream.patch b/srcpkgs/PrusaSlicer/patches/fstream.patch
new file mode 100644
index 000000000000..a766c747f704
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/fstream.patch
@@ -0,0 +1,20 @@
+--- a/src/hints/HintsToPot.cpp
++++ b/src/hints/HintsToPot.cpp
+@@ -2,6 +2,7 @@
+ #include <vector>
+ #include <string>
+ #include <boost/filesystem.hpp>
++#include <boost/filesystem/fstream.hpp>
+ #include <boost/dll.hpp>
+ #include <boost/property_tree/ini_parser.hpp>
+ #include <boost/nowide/fstream.hpp>
+--- a/tests/fff_print/test_data.cpp
++++ b/tests/fff_print/test_data.cpp
+@@ -8,6 +8,7 @@
+ #include "libslic3r/Format/STL.hpp"
+
+ #include <cstdlib>
++#include <fstream>
+ #include <string>
+
+ #include <boost/nowide/cstdio.hpp>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Updated] [WIP] boost 1.80
2022-08-27 18:49 [PR PATCH] [WIP] boost 1.80 sgn
` (2 preceding siblings ...)
2022-08-29 15:28 ` sgn
@ 2022-08-29 15:54 ` sgn
2022-08-30 12:56 ` sgn
` (3 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: sgn @ 2022-08-29 15:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1251 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages boost-1.80
https://github.com/void-linux/void-packages/pull/38949
[WIP] boost 1.80
<!-- Uncomment relevant sections and delete options which are not applicable -->
[ci skip]
#### Testing the changes
- I tested the changes in this PR: **NO**
Close #38916
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38949.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boost-1.80-38949.patch --]
[-- Type: text/x-diff, Size: 155444 bytes --]
From 95ffe404eb7a4736a33dda983b2fa7a0be1f20f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 15:21:49 +0700
Subject: [PATCH 001/109] boost: update to 1.80.0.
---
common/shlibs | 65 +++---
.../{boost-python1.72 => boost-python3-1.80} | 0
.../patches/0001-compat-glibc-2.34.patch | 23 --
.../patches/0002-compat-glibc-2.34.patch | 30 ---
srcpkgs/boost/patches/exec_file.patch | 45 ----
.../boost/patches/install-strip-destdir.patch | 27 +++
srcpkgs/boost/patches/mips.patch | 11 -
srcpkgs/boost/template | 196 +++++++++---------
...boost-python3-1.72 => libboost_atomic1.80} | 0
...ibboost_atomic1.72 => libboost_chrono1.80} | 0
...oost_chrono1.72 => libboost_container1.80} | 0
...ost_container1.72 => libboost_context1.80} | 0
...oost_context1.72 => libboost_contract1.80} | 0
...st_contract1.72 => libboost_coroutine1.80} | 0
...t_coroutine1.72 => libboost_date_time1.80} | 0
...boost_date_time1.72 => libboost_fiber1.80} | 0
...oost_fiber1.72 => libboost_filesystem1.80} | 0
...oost_filesystem1.72 => libboost_graph1.80} | 0
...boost_graph1.72 => libboost_iostreams1.80} | 0
...bboost_iostreams1.72 => libboost_json1.80} | 0
...ibboost_locale1.72 => libboost_locale1.80} | 0
.../{libboost_log1.72 => libboost_log1.80} | 0
...t_log_setup1.72 => libboost_log_setup1.80} | 0
...ost_math_c991.72 => libboost_math_c991.80} | 0
...t_math_c99f1.72 => libboost_math_c99f1.80} | 0
...t_math_c99l1.72 => libboost_math_c99l1.80} | 0
...ost_math_tr11.72 => libboost_math_tr11.80} | 0
...t_math_tr1f1.72 => libboost_math_tr1f1.80} | 0
...t_math_tr1l1.72 => libboost_math_tr1l1.80} | 0
...g_exec_monitor1.72 => libboost_nowide1.80} | 0
...ions1.72 => libboost_prg_exec_monitor1.80} | 0
...andom1.72 => libboost_program_options1.80} | 0
...libboost_regex1.72 => libboost_random1.80} | 0
...t_serialization1.72 => libboost_regex1.80} | 0
...dr2line1.72 => libboost_serialization1.80} | 0
...1.72 => libboost_stacktrace_addr2line1.80} | 0
...noop1.72 => libboost_stacktrace_basic1.80} | 0
...ystem1.72 => libboost_stacktrace_noop1.80} | 0
...ibboost_thread1.72 => libboost_system1.80} | 0
...libboost_timer1.72 => libboost_thread1.80} | 0
...st_type_erasure1.72 => libboost_timer1.80} | 0
...ramework1.72 => libboost_type_erasure1.80} | 0
...e1.72 => libboost_unit_test_framework1.80} | 0
...t_wserialization1.72 => libboost_wave1.80} | 0
srcpkgs/libboost_wserialization1.80 | 1 +
45 files changed, 164 insertions(+), 234 deletions(-)
rename srcpkgs/{boost-python1.72 => boost-python3-1.80} (100%)
delete mode 100644 srcpkgs/boost/patches/0001-compat-glibc-2.34.patch
delete mode 100644 srcpkgs/boost/patches/0002-compat-glibc-2.34.patch
delete mode 100644 srcpkgs/boost/patches/exec_file.patch
create mode 100644 srcpkgs/boost/patches/install-strip-destdir.patch
delete mode 100644 srcpkgs/boost/patches/mips.patch
rename srcpkgs/{boost-python3-1.72 => libboost_atomic1.80} (100%)
rename srcpkgs/{libboost_atomic1.72 => libboost_chrono1.80} (100%)
rename srcpkgs/{libboost_chrono1.72 => libboost_container1.80} (100%)
rename srcpkgs/{libboost_container1.72 => libboost_context1.80} (100%)
rename srcpkgs/{libboost_context1.72 => libboost_contract1.80} (100%)
rename srcpkgs/{libboost_contract1.72 => libboost_coroutine1.80} (100%)
rename srcpkgs/{libboost_coroutine1.72 => libboost_date_time1.80} (100%)
rename srcpkgs/{libboost_date_time1.72 => libboost_fiber1.80} (100%)
rename srcpkgs/{libboost_fiber1.72 => libboost_filesystem1.80} (100%)
rename srcpkgs/{libboost_filesystem1.72 => libboost_graph1.80} (100%)
rename srcpkgs/{libboost_graph1.72 => libboost_iostreams1.80} (100%)
rename srcpkgs/{libboost_iostreams1.72 => libboost_json1.80} (100%)
rename srcpkgs/{libboost_locale1.72 => libboost_locale1.80} (100%)
rename srcpkgs/{libboost_log1.72 => libboost_log1.80} (100%)
rename srcpkgs/{libboost_log_setup1.72 => libboost_log_setup1.80} (100%)
rename srcpkgs/{libboost_math_c991.72 => libboost_math_c991.80} (100%)
rename srcpkgs/{libboost_math_c99f1.72 => libboost_math_c99f1.80} (100%)
rename srcpkgs/{libboost_math_c99l1.72 => libboost_math_c99l1.80} (100%)
rename srcpkgs/{libboost_math_tr11.72 => libboost_math_tr11.80} (100%)
rename srcpkgs/{libboost_math_tr1f1.72 => libboost_math_tr1f1.80} (100%)
rename srcpkgs/{libboost_math_tr1l1.72 => libboost_math_tr1l1.80} (100%)
rename srcpkgs/{libboost_prg_exec_monitor1.72 => libboost_nowide1.80} (100%)
rename srcpkgs/{libboost_program_options1.72 => libboost_prg_exec_monitor1.80} (100%)
rename srcpkgs/{libboost_random1.72 => libboost_program_options1.80} (100%)
rename srcpkgs/{libboost_regex1.72 => libboost_random1.80} (100%)
rename srcpkgs/{libboost_serialization1.72 => libboost_regex1.80} (100%)
rename srcpkgs/{libboost_stacktrace_addr2line1.72 => libboost_serialization1.80} (100%)
rename srcpkgs/{libboost_stacktrace_basic1.72 => libboost_stacktrace_addr2line1.80} (100%)
rename srcpkgs/{libboost_stacktrace_noop1.72 => libboost_stacktrace_basic1.80} (100%)
rename srcpkgs/{libboost_system1.72 => libboost_stacktrace_noop1.80} (100%)
rename srcpkgs/{libboost_thread1.72 => libboost_system1.80} (100%)
rename srcpkgs/{libboost_timer1.72 => libboost_thread1.80} (100%)
rename srcpkgs/{libboost_type_erasure1.72 => libboost_timer1.80} (100%)
rename srcpkgs/{libboost_unit_test_framework1.72 => libboost_type_erasure1.80} (100%)
rename srcpkgs/{libboost_wave1.72 => libboost_unit_test_framework1.80} (100%)
rename srcpkgs/{libboost_wserialization1.72 => libboost_wave1.80} (100%)
create mode 120000 srcpkgs/libboost_wserialization1.80
diff --git a/common/shlibs b/common/shlibs
index 48c63f2d0735..b91133da6484 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -620,38 +620,39 @@ libip4tc.so.2 iptables-1.8.3_1
libipq.so.0 iptables-1.4.7_1
libnm.so.0 libnm-1.0.0_1
libKF5ItemModels.so.5 kitemmodels-5.26.0_1
-libboost_context.so.1.72.0 libboost_context1.72-1.72.0_1
-libboost_coroutine.so.1.72.0 libboost_coroutine1.72-1.72.0_1
-libboost_container.so.1.72.0 libboost_container1.72-1.72.0_1
-libboost_prg_exec_monitor.so.1.72.0 libboost_prg_exec_monitor1.72-1.72.0_1
-libboost_timer.so.1.72.0 libboost_timer1.72-1.72.0_1
-libboost_random.so.1.72.0 libboost_random1.72-1.72.0_1
-libboost_filesystem.so.1.72.0 libboost_filesystem1.72-1.72.0_1
-libboost_unit_test_framework.so.1.72.0 libboost_unit_test_framework1.72-1.72.0_1
-libboost_math_c99.so.1.72.0 libboost_math_c991.72-1.72.0_1
-libboost_math_tr1.so.1.72.0 libboost_math_tr11.72-1.72.0_1
-libboost_regex.so.1.72.0 libboost_regex1.72-1.72.0_1
-libboost_serialization.so.1.72.0 libboost_serialization1.72-1.72.0_1
-libboost_chrono.so.1.72.0 libboost_chrono1.72-1.72.0_1
-libboost_wserialization.so.1.72.0 libboost_wserialization1.72-1.72.0_1
-libboost_graph.so.1.72.0 libboost_graph1.72-1.72.0_1
-libboost_log.so.1.72.0 libboost_log1.72-1.72.0_1
-libboost_locale.so.1.72.0 libboost_locale1.72-1.72.0_1
-libboost_program_options.so.1.72.0 libboost_program_options1.72-1.72.0_1
-libboost_iostreams.so.1.72.0 libboost_iostreams1.72-1.72.0_1
-libboost_system.so.1.72.0 libboost_system1.72-1.72.0_1
-libboost_thread.so.1.72.0 libboost_thread1.72-1.72.0_1
-libboost_log_setup.so.1.72.0 libboost_log_setup1.72-1.72.0_1
-libboost_date_time.so.1.72.0 libboost_date_time1.72-1.72.0_1
-libboost_wave.so.1.72.0 libboost_wave1.72-1.72.0_1
-libboost_atomic.so.1.72.0 libboost_atomic1.72-1.72.0_1
-libboost_type_erasure.so.1.72.0 libboost_type_erasure1.72-1.72.0_1
-libboost_fiber.so.1.72.0 libboost_fiber1.72-1.72.0_1
-libboost_stacktrace_noop.so.1.72.0 libboost_stacktrace_noop1.72-1.72.0_1
-libboost_stacktrace_addr2line.so.1.72.0 libboost_stacktrace_addr2line1.72-1.72.0_1
-libboost_stacktrace_basic.so.1.72.0 libboost_stacktrace_basic1.72-1.72.0_1
-libboost_python27.so.1.72.0 boost-python1.72-1.72.0_1
-libboost_python310.so.1.72.0 boost-python3-1.72-1.72.0_6
+libboost_context.so.1.80.0 libboost_context1.80-1.80.0_1
+libboost_coroutine.so.1.80.0 libboost_coroutine1.80-1.80.0_1
+libboost_container.so.1.80.0 libboost_container1.80-1.80.0_1
+libboost_prg_exec_monitor.so.1.80.0 libboost_prg_exec_monitor1.80-1.80.0_1
+libboost_timer.so.1.80.0 libboost_timer1.80-1.80.0_1
+libboost_random.so.1.80.0 libboost_random1.80-1.80.0_1
+libboost_filesystem.so.1.80.0 libboost_filesystem1.80-1.80.0_1
+libboost_unit_test_framework.so.1.80.0 libboost_unit_test_framework1.80-1.80.0_1
+libboost_math_c99.so.1.80.0 libboost_math_c991.80-1.80.0_1
+libboost_math_tr1.so.1.80.0 libboost_math_tr11.80-1.80.0_1
+libboost_nowide.so.1.80.0 libboost_nowide1.80-1.80.0_1
+libboost_json.so.1.80.0 libboost_json1.80-1.80.0_1
+libboost_regex.so.1.80.0 libboost_regex1.80-1.80.0_1
+libboost_serialization.so.1.80.0 libboost_serialization1.80-1.80.0_1
+libboost_chrono.so.1.80.0 libboost_chrono1.80-1.80.0_1
+libboost_wserialization.so.1.80.0 libboost_wserialization1.80-1.80.0_1
+libboost_graph.so.1.80.0 libboost_graph1.80-1.80.0_1
+libboost_log.so.1.80.0 libboost_log1.80-1.80.0_1
+libboost_locale.so.1.80.0 libboost_locale1.80-1.80.0_1
+libboost_program_options.so.1.80.0 libboost_program_options1.80-1.80.0_1
+libboost_iostreams.so.1.80.0 libboost_iostreams1.80-1.80.0_1
+libboost_system.so.1.80.0 libboost_system1.80-1.80.0_1
+libboost_thread.so.1.80.0 libboost_thread1.80-1.80.0_1
+libboost_log_setup.so.1.80.0 libboost_log_setup1.80-1.80.0_1
+libboost_date_time.so.1.80.0 libboost_date_time1.80-1.80.0_1
+libboost_wave.so.1.80.0 libboost_wave1.80-1.80.0_1
+libboost_atomic.so.1.80.0 libboost_atomic1.80-1.80.0_1
+libboost_type_erasure.so.1.80.0 libboost_type_erasure1.80-1.80.0_1
+libboost_fiber.so.1.80.0 libboost_fiber1.80-1.80.0_1
+libboost_stacktrace_noop.so.1.80.0 libboost_stacktrace_noop1.80-1.80.0_1
+libboost_stacktrace_addr2line.so.1.80.0 libboost_stacktrace_addr2line1.80-1.80.0_1
+libboost_stacktrace_basic.so.1.80.0 libboost_stacktrace_basic1.80-1.80.0_1
+libboost_python310.so.1.80.0 boost-python3-1.80-1.80.0_6
libexempi.so.8 exempi-2.5.0_1
libatasmart.so.4 libatasmart-0.17_1
libsgutils2-1.45.so.2 libsgutils-1.45_1
diff --git a/srcpkgs/boost-python1.72 b/srcpkgs/boost-python3-1.80
similarity index 100%
rename from srcpkgs/boost-python1.72
rename to srcpkgs/boost-python3-1.80
diff --git a/srcpkgs/boost/patches/0001-compat-glibc-2.34.patch b/srcpkgs/boost/patches/0001-compat-glibc-2.34.patch
deleted file mode 100644
index e1e5711e59f2..000000000000
--- a/srcpkgs/boost/patches/0001-compat-glibc-2.34.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 74fb0a26099bc51d717f5f154b37231ce7df3e98 Mon Sep 17 00:00:00 2001
-From: Rob Boehne <robb@datalogics.com>
-Date: Wed, 20 Nov 2019 11:25:20 -0600
-Subject: [PATCH] Revert change to elide a warning that caused Solaris builds
- to fail.
-
----
- include/boost/thread/pthread/thread_data.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/boost/thread/pthread/thread_data.hpp b/include/boost/thread/pthread/thread_data.hpp
-index aefbeb43c..bc9b1367a 100644
---- a/boost/thread/pthread/thread_data.hpp
-+++ b/boost/thread/pthread/thread_data.hpp
-@@ -57,7 +57,7 @@ namespace boost
- #else
- std::size_t page_size = ::sysconf( _SC_PAGESIZE);
- #endif
--#if PTHREAD_STACK_MIN > 0
-+#ifdef PTHREAD_STACK_MIN
- if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
- #endif
- size = ((size+page_size-1)/page_size)*page_size;
diff --git a/srcpkgs/boost/patches/0002-compat-glibc-2.34.patch b/srcpkgs/boost/patches/0002-compat-glibc-2.34.patch
deleted file mode 100644
index baf7c517f8b4..000000000000
--- a/srcpkgs/boost/patches/0002-compat-glibc-2.34.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f9d0e594d43afcb4ab0043117249feb266ba4515 Mon Sep 17 00:00:00 2001
-From: Romain Geissler <romain.geissler@amadeus.com>
-Date: Tue, 10 Aug 2021 14:22:28 +0000
-Subject: [PATCH] Fix -Wsign-compare warning with glibc 2.34 on Linux
- platforms.
-
-In file included from /data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/thread_only.hpp:17,
- from /data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/thread.hpp:12,
- from src/GetTest.cpp:12:
-/data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/pthread/thread_data.hpp: In member function 'void boost::thread_attributes::set_stack_size(std::size_t)':
-/data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/pthread/thread_data.hpp:61:19: error: comparison of integer expressions of different signedness: 'std::size_t' {aka 'long unsigned int'} and 'long int' [-Werror=sign-compare]
- 61 | if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
- | ^
----
- include/boost/thread/pthread/thread_data.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/boost/thread/pthread/thread_data.hpp b/include/boost/thread/pthread/thread_data.hpp
-index bc9b1367a..c43b276d1 100644
---- a/boost/thread/pthread/thread_data.hpp
-+++ b/boost/thread/pthread/thread_data.hpp
-@@ -58,7 +58,7 @@ namespace boost
- std::size_t page_size = ::sysconf( _SC_PAGESIZE);
- #endif
- #ifdef PTHREAD_STACK_MIN
-- if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
-+ if (size<static_cast<std::size_t>(PTHREAD_STACK_MIN)) size=PTHREAD_STACK_MIN;
- #endif
- size = ((size+page_size-1)/page_size)*page_size;
- int res = pthread_attr_setstacksize(&val_, size);
diff --git a/srcpkgs/boost/patches/exec_file.patch b/srcpkgs/boost/patches/exec_file.patch
deleted file mode 100644
index b1b0ef969c4d..000000000000
--- a/srcpkgs/boost/patches/exec_file.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From d9f06052e28873037db7f98629bce72182a42410 Mon Sep 17 00:00:00 2001
-From: Pat Riehecky <riehecky@fnal.gov>
-Date: Mon, 29 Jun 2020 10:51:58 -0500
-Subject: [PATCH] Convert Python 3.1+ to use public C API for filenames
-
- [
- Ed.: Paths were adapted from upstream commit
- https://github.com/boostorg/python/commit/d9f06052e28873037db7f98629bce72182a42410
- ]
-
----
- src/exec.cpp | 16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/libs/python/src/exec.cpp b/libs/python/src/exec.cpp
-index 171c6f4189..b2eabe59f6 100644
---- a/libs/python/src/exec.cpp
-+++ b/libs/python/src/exec.cpp
-@@ -104,14 +104,22 @@ object BOOST_PYTHON_DECL exec_file(char const *filename, object global, object l
- if (local.is_none()) local = global;
- // should be 'char const *' but older python versions don't use 'const' yet.
- char *f = const_cast<char *>(filename);
-- // Let python open the file to avoid potential binary incompatibilities.
--#if PY_VERSION_HEX >= 0x03040000
-- FILE *fs = _Py_fopen(f, "r");
-+#if PY_VERSION_HEX >= 0x03010000
-+ // Let python manage any UTF bits to avoid potential incompatibilities.
-+ PyObject *fo = Py_BuildValue("s", f);
-+ PyObject *fb = Py_None;
-+ PyUnicode_FSConverter(fo, &fb);
-+ f = PyBytes_AsString(fb);
-+ FILE *fs = fopen(f, "r");
-+ Py_DECREF(fo);
-+ Py_DECREF(fb);
- #elif PY_VERSION_HEX >= 0x03000000
-+ // Let python open the file to avoid potential binary incompatibilities.
- PyObject *fo = Py_BuildValue("s", f);
-- FILE *fs = _Py_fopen(fo, "r");
-+ FILE *fs = _Py_fopen(fo, "r"); // Private CPython API
- Py_DECREF(fo);
- #else
-+ // Let python open the file to avoid potential binary incompatibilities.
- PyObject *pyfile = PyFile_FromString(f, const_cast<char*>("r"));
- if (!pyfile) throw std::invalid_argument(std::string(f) + " : no such file");
- python::handle<> file(pyfile);
diff --git a/srcpkgs/boost/patches/install-strip-destdir.patch b/srcpkgs/boost/patches/install-strip-destdir.patch
new file mode 100644
index 000000000000..61047c5967b1
--- /dev/null
+++ b/srcpkgs/boost/patches/install-strip-destdir.patch
@@ -0,0 +1,27 @@
+--- a/tools/boost_install/boost-install.jam
++++ b/tools/boost_install/boost-install.jam
+@@ -678,6 +678,16 @@ local rule path-native-fwd ( path )
+ return $(path) ;
+ }
+
++local rule path-strip-destdir ( path )
++{
++ local parts = [ MATCH "^(/destdir(/[^/]+)?/boost-[0-9.]+)(/.*)" : $(path) ] ;
++ if $(parts)
++ {
++ path = $(parts[3]) ;
++ }
++ return $(path) ;
++}
++
+ local rule get-dir ( name : dir )
+ {
+ if [ path.is-rooted $(dir) ]
+@@ -756,6 +766,7 @@ rule generate-cmake-config- ( target : s
+ if [ path.is-rooted $(cmakedir) ]
+ {
+ local cmakedir-native = [ path-native-fwd $(cmakedir) ] ;
++ cmakedir-native = [ path-strip-destdir $(cmakedir-native) ] ;
+
+ print.text
+
diff --git a/srcpkgs/boost/patches/mips.patch b/srcpkgs/boost/patches/mips.patch
deleted file mode 100644
index a10a2122d9c7..000000000000
--- a/srcpkgs/boost/patches/mips.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/boost/fiber/detail/cpu_relax.hpp 2017-09-02 11:56:11.000000000 +0200
-+++ b/boost/fiber/detail/cpu_relax.hpp 2017-11-09 17:25:40.258995963 +0100
-@@ -48,7 +48,7 @@
- # define cpu_relax() asm volatile ("nop" ::: "memory");
- # endif
- #elif BOOST_ARCH_MIPS
--# define cpu_relax() asm volatile ("pause" ::: "memory");
-+# define cpu_relax() asm volatile ("nop" ::: "memory");
- #elif BOOST_ARCH_PPC
- // http://code.metager.de/source/xref/gnu/glibc/sysdeps/powerpc/sys/platform/ppc.h
- // http://stackoverflow.com/questions/5425506/equivalent-of-x86-pause-instruction-for-ppc
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index f0c5afcec9e8..0d103e335b52 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,53 +1,52 @@
# Template file for 'boost'
pkgname=boost
-version=1.72.0
-revision=9
+version=1.80.0
+revision=1
wrksrc="${pkgname}_${version//\./_}"
-hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
-makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
+hostmakedepends="which bzip2-devel icu-devel python3-devel pkg-config"
+makedepends="zlib-devel bzip2-devel icu-devel python3-devel liblzma-devel
+ libzstd-devel"
short_desc="Free peer-reviewed portable C++ source libraries"
maintainer="John <me@johnnynator.dev>"
license="BSL-1.0"
homepage="http://www.boost.org/"
distfiles="https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${version//./_}.tar.bz2"
-checksum=59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722
+checksum=1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0
python_version=3
-CXXFLAGS="-std=c++14"
-
-replaces="libboost_program_options1.69>=0 libboost_math_c99f1.69>=0
- libboost_stacktrace_basic1.69>=0 libboost_stacktrace_noop1.69>=0
- libboost_iostreams1.69>=0 libboost_math_tr1l1.69>=0 libboost_filesystem1.69>=0
- libboost_chrono1.69>=0 libboost_math_tr1f1.69>=0 libboost_wave1.69>=0
- libboost_graph1.69>=0 libboost_locale1.69>=0 libboost_regex1.69>=0
- libboost_fiber1.69>=0 libboost_type_erasure1.69>=0 libboost_coroutine1.69>=0
- libboost_atomic1.69>=0 libboost_prg_exec_monitor1.69>=0 libboost_math_c991.69>=0
- boost-python3-1.69>=0 libboost_log_setup1.69>=0 boost1.69>=0-devel
- libboost_timer1.69>=0 libboost_system1.69>=0 libboost_unit_test_framework1.69>=0
- libboost_serialization1.69>=0 libboost_math_tr11.69>=0 boost1.69>=0-build
- libboost_math_c99l1.69>=0 boost-python1.69>=0 libboost_contract1.69>=0
- libboost_date_time1.69>=0 libboost_log1.69>=0 libboost_random1.69>=0
- libboost_thread1.69>=0 libboost_container1.69>=0 boost1.69>=0-jam
- libboost_wserialization1.69>=0 libboost_context1.69>=0
- libboost_stacktrace_addr2line1.69>=0"
-
-subpackages="libboost_program_options1.72 libboost_math_c99f1.72
- libboost_stacktrace_basic1.72 libboost_stacktrace_noop1.72
- libboost_iostreams1.72 libboost_math_tr1l1.72 libboost_filesystem1.72
- libboost_chrono1.72 libboost_math_tr1f1.72 libboost_wave1.72
- libboost_graph1.72 libboost_locale1.72 libboost_regex1.72
- libboost_fiber1.72 libboost_type_erasure1.72 libboost_coroutine1.72
- libboost_atomic1.72 libboost_prg_exec_monitor1.72 libboost_math_c991.72
- boost-python3-1.72 libboost_log_setup1.72 boost-devel
- libboost_timer1.72 libboost_system1.72 libboost_unit_test_framework1.72
- libboost_serialization1.72 libboost_math_tr11.72 boost-build
- libboost_math_c99l1.72 boost-python1.72 libboost_contract1.72
- libboost_date_time1.72 libboost_log1.72 libboost_random1.72
- libboost_thread1.72 libboost_container1.72 boost-jam
- libboost_wserialization1.72 libboost_context1.72"
+replaces="libboost_program_options1.72>=0 libboost_math_c99f1.72>=0
+ libboost_stacktrace_basic1.72>=0 libboost_stacktrace_noop1.72>=0
+ libboost_iostreams1.72>=0 libboost_math_tr1l1.72>=0 libboost_filesystem1.72>=0
+ libboost_chrono1.72>=0 libboost_math_tr1f1.72>=0 libboost_wave1.72>=0
+ libboost_graph1.72>=0 libboost_locale1.72>=0 libboost_regex1.72>=0
+ libboost_fiber1.72>=0 libboost_type_erasure1.72>=0 libboost_coroutine1.72>=0
+ libboost_atomic1.72>=0 libboost_prg_exec_monitor1.72>=0 libboost_math_c991.72>=0
+ boost-python3-1.72>=0 libboost_log_setup1.72>=0
+ libboost_timer1.72>=0 libboost_system1.72>=0 libboost_unit_test_framework1.72>=0
+ libboost_serialization1.72>=0 libboost_math_tr11.72>=0
+ libboost_math_c99l1.72>=0 boost-python1.72>=0 libboost_contract1.72>=0
+ libboost_date_time1.72>=0 libboost_log1.72>=0 libboost_random1.72>=0
+ libboost_thread1.72>=0 libboost_container1.72>=0
+ libboost_wserialization1.72>=0 libboost_context1.72>=0
+ libboost_stacktrace_addr2line1.72>=0"
+
+subpackages="libboost_program_options1.80 libboost_math_c99f1.80
+ libboost_stacktrace_basic1.80 libboost_stacktrace_noop1.80
+ libboost_iostreams1.80 libboost_math_tr1l1.80 libboost_filesystem1.80
+ libboost_chrono1.80 libboost_math_tr1f1.80 libboost_wave1.80
+ libboost_graph1.80 libboost_locale1.80 libboost_regex1.80
+ libboost_fiber1.80 libboost_type_erasure1.80 libboost_coroutine1.80
+ libboost_atomic1.80 libboost_prg_exec_monitor1.80 libboost_math_c991.80
+ boost-python3-1.80 libboost_log_setup1.80 boost-devel libboost_json1.80
+ libboost_timer1.80 libboost_system1.80 libboost_unit_test_framework1.80
+ libboost_serialization1.80 libboost_math_tr11.80 boost-build
+ libboost_math_c99l1.80 libboost_contract1.80 libboost_nowide1.80
+ libboost_date_time1.80 libboost_log1.80 libboost_random1.80
+ libboost_thread1.80 libboost_container1.80 boost-jam
+ libboost_wserialization1.80 libboost_context1.80"
if [ -z "$CROSS_BUILD" ]; then
- subpackages+=" libboost_stacktrace_addr2line1.72"
+ subpackages+=" libboost_stacktrace_addr2line1.80"
fi
case "$XBPS_TARGET_MACHINE" in
@@ -60,38 +59,40 @@ case "$XBPS_TARGET_MACHINE" in
esac
do_build() {
- CXX=${BUILD_CXX} CXXFLAGS=${BUILD_CXXFLAGS} ./bootstrap.sh \
- --prefix=${DESTDIR}/usr --with-python=${XBPS_CROSS_BASE}/usr/bin/python3 \
+ # bootstrap.sh will reset CXX and CXXFLAGS (L229)
+ ./bootstrap.sh --with-toolset=gcc \
+ --prefix=${DESTDIR}/usr --with-python=/usr/bin/python3 \
--with-python-root=${XBPS_CROSS_BASE}/usr
(
# Rebuild bjam for target
cd tools/build/src/engine
- ./build.sh gcc
+ CXXFLAGS="$CXXFLAGS -fdebug-prefix-map=$PWD=."
+ # toolset gcc will force gcc -x c++ -O2 -s
+ # toolset cxx will use CXX and CXXFLAGS
+ CXX_VERSION_OPT=--version ./build.sh cxx
)
cat > user-config.jam <<-__EOF
using gcc : : ${CXX} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
- using python : 2.7 : ${XBPS_CROSS_BASE}/usr/bin/python2 : ${XBPS_CROSS_BASE}/usr/include/python2.7 : ${XBPS_CROSS_BASE}/usr/lib/python2.7 ;
- using python : ${py3_ver} : ${XBPS_CROSS_BASE}/usr/bin/python3 : ${XBPS_CROSS_BASE}/${py3_inc} : ${XBPS_CROSS_BASE}/${py3_lib} ;
+ using python : ${py3_ver} : /usr/bin/python3 : ${XBPS_CROSS_BASE}/${py3_inc} : ${XBPS_CROSS_BASE}/${py3_lib} ;
__EOF
- # --no-cmake-config should be removed with boost-1.71 or later
./b2 ${makejobs} \
--user-config=${wrksrc}/user-config.jam --debug-building \
- --no-cmake-config \
- --toolset=gcc abi=${_abi} architecture=${_arch} python=2.7,${py3_ver} \
+ --toolset=gcc abi=${_abi} architecture=${_arch} python=${py3_ver} \
threading=multi runtime-link=shared link=shared,static
}
do_install() {
# Install bjam
# XXX: make bjam a symlink to b2
- for _b in bjam b2; do
+ for _b in b2; do
vbin tools/build/src/engine/${_b}
done
+ ln -sf b2 "$DESTDIR/usr/bin/bjam"
# Install headers/libs
./b2 --prefix=${DESTDIR}/usr abi=${_abi} architecture=${_arch} \
- --user-config=${wrksrc}/user-config.jam --no-cmake-config \
- python=2.7,${py3_ver} threading=multi runtime-link=shared link=shared,static \
+ --user-config=${wrksrc}/user-config.jam \
+ python=${py3_ver} threading=multi runtime-link=shared link=shared,static \
install
# Install Boost.Build stuff.
@@ -119,15 +120,7 @@ boost-jam_package() {
vmove usr/bin/b2
}
}
-boost-python1.72_package() {
- depends="boost python"
- replaces="boost-python>=0"
- short_desc+=" - Python bindings"
- pkg_install() {
- vmove "usr/lib/libboost_python2*.so.*"
- }
-}
-boost-python3-1.72_package() {
+boost-python3-1.80_package() {
depends="boost python3"
replaces="boost-python3>=0"
short_desc+=" - Python3 bindings"
@@ -149,12 +142,13 @@ boost-devel_package() {
short_desc+=" - development files"
pkg_install() {
vmove usr/include
+ vmove usr/lib/cmake
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
}
}
-libboost_atomic1.72_package() {
+libboost_atomic1.80_package() {
depends="boost"
short_desc+=" - libboost_atomic"
pkg_install() {
@@ -162,7 +156,7 @@ libboost_atomic1.72_package() {
}
}
-libboost_chrono1.72_package() {
+libboost_chrono1.80_package() {
depends="boost"
short_desc+=" - libboost_chrono"
pkg_install() {
@@ -170,7 +164,7 @@ libboost_chrono1.72_package() {
}
}
-libboost_container1.72_package() {
+libboost_container1.80_package() {
depends="boost"
short_desc+=" - libboost_container"
pkg_install() {
@@ -178,7 +172,7 @@ libboost_container1.72_package() {
}
}
-libboost_context1.72_package() {
+libboost_context1.80_package() {
depends="boost"
short_desc+=" - libboost_context"
pkg_install() {
@@ -186,7 +180,7 @@ libboost_context1.72_package() {
}
}
-libboost_contract1.72_package() {
+libboost_contract1.80_package() {
depends="boost"
short_desc+=" - libboost_contract"
pkg_install() {
@@ -194,7 +188,7 @@ libboost_contract1.72_package() {
}
}
-libboost_coroutine1.72_package() {
+libboost_coroutine1.80_package() {
depends="boost"
short_desc+=" - libboost_coroutine"
pkg_install() {
@@ -202,7 +196,7 @@ libboost_coroutine1.72_package() {
}
}
-libboost_date_time1.72_package() {
+libboost_date_time1.80_package() {
depends="boost"
short_desc+=" - libboost_date_time"
pkg_install() {
@@ -210,7 +204,7 @@ libboost_date_time1.72_package() {
}
}
-libboost_fiber1.72_package() {
+libboost_fiber1.80_package() {
depends="boost"
short_desc+=" - libboost_fiber"
pkg_install() {
@@ -218,7 +212,7 @@ libboost_fiber1.72_package() {
}
}
-libboost_filesystem1.72_package() {
+libboost_filesystem1.80_package() {
depends="boost"
short_desc+=" - libboost_filesystem"
pkg_install() {
@@ -226,7 +220,7 @@ libboost_filesystem1.72_package() {
}
}
-libboost_graph1.72_package() {
+libboost_graph1.80_package() {
depends="boost"
short_desc+=" - libboost_graph"
pkg_install() {
@@ -234,7 +228,7 @@ libboost_graph1.72_package() {
}
}
-libboost_iostreams1.72_package() {
+libboost_iostreams1.80_package() {
depends="boost"
short_desc+=" - libboost_iostreams"
pkg_install() {
@@ -242,7 +236,7 @@ libboost_iostreams1.72_package() {
}
}
-libboost_locale1.72_package() {
+libboost_locale1.80_package() {
depends="boost"
short_desc+=" - libboost_locale"
pkg_install() {
@@ -250,7 +244,7 @@ libboost_locale1.72_package() {
}
}
-libboost_log1.72_package() {
+libboost_log1.80_package() {
depends="boost"
short_desc+=" - libboost_log"
pkg_install() {
@@ -258,7 +252,7 @@ libboost_log1.72_package() {
}
}
-libboost_log_setup1.72_package() {
+libboost_log_setup1.80_package() {
depends="boost"
short_desc+=" - libboost_log_setup"
pkg_install() {
@@ -266,7 +260,7 @@ libboost_log_setup1.72_package() {
}
}
-libboost_math_c991.72_package() {
+libboost_math_c991.80_package() {
depends="boost"
short_desc+=" - libboost_math_c99"
pkg_install() {
@@ -274,7 +268,7 @@ libboost_math_c991.72_package() {
}
}
-libboost_math_c99f1.72_package() {
+libboost_math_c99f1.80_package() {
depends="boost"
short_desc+=" - libboost_math_c99f"
pkg_install() {
@@ -282,7 +276,7 @@ libboost_math_c99f1.72_package() {
}
}
-libboost_math_c99l1.72_package() {
+libboost_math_c99l1.80_package() {
depends="boost"
short_desc+=" - libboost_math_c99l"
pkg_install() {
@@ -290,7 +284,15 @@ libboost_math_c99l1.72_package() {
}
}
-libboost_math_tr11.72_package() {
+libboost_json1.80_package() {
+ depends="boost"
+ short_desc+=" - libboost_json"
+ pkg_install() {
+ vmove usr/lib/libboost_json.so.*
+ }
+}
+
+libboost_math_tr11.80_package() {
depends="boost"
short_desc+=" - libboost_math_tr1"
pkg_install() {
@@ -298,7 +300,7 @@ libboost_math_tr11.72_package() {
}
}
-libboost_math_tr1f1.72_package() {
+libboost_math_tr1f1.80_package() {
depends="boost"
short_desc+=" - libboost_math_tr1f"
pkg_install() {
@@ -306,7 +308,7 @@ libboost_math_tr1f1.72_package() {
}
}
-libboost_math_tr1l1.72_package() {
+libboost_math_tr1l1.80_package() {
depends="boost"
short_desc+=" - libboost_math_tr1l"
pkg_install() {
@@ -314,7 +316,15 @@ libboost_math_tr1l1.72_package() {
}
}
-libboost_prg_exec_monitor1.72_package() {
+libboost_nowide1.80_package() {
+ depends="boost"
+ short_desc+=" - libboost_nowide"
+ pkg_install() {
+ vmove usr/lib/libboost_nowide.so.*
+ }
+}
+
+libboost_prg_exec_monitor1.80_package() {
depends="boost"
short_desc+=" - libboost_prg_exec_monitor"
pkg_install() {
@@ -322,7 +332,7 @@ libboost_prg_exec_monitor1.72_package() {
}
}
-libboost_program_options1.72_package() {
+libboost_program_options1.80_package() {
depends="boost"
short_desc+=" - libboost_program_options"
pkg_install() {
@@ -330,7 +340,7 @@ libboost_program_options1.72_package() {
}
}
-libboost_random1.72_package() {
+libboost_random1.80_package() {
depends="boost"
short_desc+=" - libboost_random"
pkg_install() {
@@ -338,7 +348,7 @@ libboost_random1.72_package() {
}
}
-libboost_regex1.72_package() {
+libboost_regex1.80_package() {
depends="boost"
short_desc+=" - libboost_regex"
pkg_install() {
@@ -346,7 +356,7 @@ libboost_regex1.72_package() {
}
}
-libboost_serialization1.72_package() {
+libboost_serialization1.80_package() {
depends="boost"
short_desc+=" - libboost_serialization"
pkg_install() {
@@ -354,7 +364,7 @@ libboost_serialization1.72_package() {
}
}
-libboost_stacktrace_addr2line1.72_package() {
+libboost_stacktrace_addr2line1.80_package() {
depends="boost"
short_desc+=" - libboost_stacktrace_addr2line"
pkg_install() {
@@ -362,7 +372,7 @@ libboost_stacktrace_addr2line1.72_package() {
}
}
-libboost_stacktrace_basic1.72_package() {
+libboost_stacktrace_basic1.80_package() {
depends="boost"
short_desc+=" - libboost_stacktrace_basic"
pkg_install() {
@@ -370,7 +380,7 @@ libboost_stacktrace_basic1.72_package() {
}
}
-libboost_stacktrace_noop1.72_package() {
+libboost_stacktrace_noop1.80_package() {
depends="boost"
short_desc+=" - libboost_stacktrace_noop"
pkg_install() {
@@ -378,7 +388,7 @@ libboost_stacktrace_noop1.72_package() {
}
}
-libboost_system1.72_package() {
+libboost_system1.80_package() {
depends="boost"
short_desc+=" - libboost_system"
pkg_install() {
@@ -386,7 +396,7 @@ libboost_system1.72_package() {
}
}
-libboost_thread1.72_package() {
+libboost_thread1.80_package() {
depends="boost"
short_desc+=" - libboost_thread"
pkg_install() {
@@ -394,7 +404,7 @@ libboost_thread1.72_package() {
}
}
-libboost_timer1.72_package() {
+libboost_timer1.80_package() {
depends="boost"
short_desc+=" - libboost_timer"
pkg_install() {
@@ -402,7 +412,7 @@ libboost_timer1.72_package() {
}
}
-libboost_type_erasure1.72_package() {
+libboost_type_erasure1.80_package() {
depends="boost"
short_desc+=" - libboost_type_erasure"
pkg_install() {
@@ -410,7 +420,7 @@ libboost_type_erasure1.72_package() {
}
}
-libboost_unit_test_framework1.72_package() {
+libboost_unit_test_framework1.80_package() {
depends="boost"
short_desc+=" - libboost_unit_test_framework"
pkg_install() {
@@ -418,7 +428,7 @@ libboost_unit_test_framework1.72_package() {
}
}
-libboost_wave1.72_package() {
+libboost_wave1.80_package() {
depends="boost"
short_desc+=" - libboost_wave"
pkg_install() {
@@ -426,7 +436,7 @@ libboost_wave1.72_package() {
}
}
-libboost_wserialization1.72_package() {
+libboost_wserialization1.80_package() {
depends="boost"
short_desc+=" - libboost_wserialization"
pkg_install() {
diff --git a/srcpkgs/boost-python3-1.72 b/srcpkgs/libboost_atomic1.80
similarity index 100%
rename from srcpkgs/boost-python3-1.72
rename to srcpkgs/libboost_atomic1.80
diff --git a/srcpkgs/libboost_atomic1.72 b/srcpkgs/libboost_chrono1.80
similarity index 100%
rename from srcpkgs/libboost_atomic1.72
rename to srcpkgs/libboost_chrono1.80
diff --git a/srcpkgs/libboost_chrono1.72 b/srcpkgs/libboost_container1.80
similarity index 100%
rename from srcpkgs/libboost_chrono1.72
rename to srcpkgs/libboost_container1.80
diff --git a/srcpkgs/libboost_container1.72 b/srcpkgs/libboost_context1.80
similarity index 100%
rename from srcpkgs/libboost_container1.72
rename to srcpkgs/libboost_context1.80
diff --git a/srcpkgs/libboost_context1.72 b/srcpkgs/libboost_contract1.80
similarity index 100%
rename from srcpkgs/libboost_context1.72
rename to srcpkgs/libboost_contract1.80
diff --git a/srcpkgs/libboost_contract1.72 b/srcpkgs/libboost_coroutine1.80
similarity index 100%
rename from srcpkgs/libboost_contract1.72
rename to srcpkgs/libboost_coroutine1.80
diff --git a/srcpkgs/libboost_coroutine1.72 b/srcpkgs/libboost_date_time1.80
similarity index 100%
rename from srcpkgs/libboost_coroutine1.72
rename to srcpkgs/libboost_date_time1.80
diff --git a/srcpkgs/libboost_date_time1.72 b/srcpkgs/libboost_fiber1.80
similarity index 100%
rename from srcpkgs/libboost_date_time1.72
rename to srcpkgs/libboost_fiber1.80
diff --git a/srcpkgs/libboost_fiber1.72 b/srcpkgs/libboost_filesystem1.80
similarity index 100%
rename from srcpkgs/libboost_fiber1.72
rename to srcpkgs/libboost_filesystem1.80
diff --git a/srcpkgs/libboost_filesystem1.72 b/srcpkgs/libboost_graph1.80
similarity index 100%
rename from srcpkgs/libboost_filesystem1.72
rename to srcpkgs/libboost_graph1.80
diff --git a/srcpkgs/libboost_graph1.72 b/srcpkgs/libboost_iostreams1.80
similarity index 100%
rename from srcpkgs/libboost_graph1.72
rename to srcpkgs/libboost_iostreams1.80
diff --git a/srcpkgs/libboost_iostreams1.72 b/srcpkgs/libboost_json1.80
similarity index 100%
rename from srcpkgs/libboost_iostreams1.72
rename to srcpkgs/libboost_json1.80
diff --git a/srcpkgs/libboost_locale1.72 b/srcpkgs/libboost_locale1.80
similarity index 100%
rename from srcpkgs/libboost_locale1.72
rename to srcpkgs/libboost_locale1.80
diff --git a/srcpkgs/libboost_log1.72 b/srcpkgs/libboost_log1.80
similarity index 100%
rename from srcpkgs/libboost_log1.72
rename to srcpkgs/libboost_log1.80
diff --git a/srcpkgs/libboost_log_setup1.72 b/srcpkgs/libboost_log_setup1.80
similarity index 100%
rename from srcpkgs/libboost_log_setup1.72
rename to srcpkgs/libboost_log_setup1.80
diff --git a/srcpkgs/libboost_math_c991.72 b/srcpkgs/libboost_math_c991.80
similarity index 100%
rename from srcpkgs/libboost_math_c991.72
rename to srcpkgs/libboost_math_c991.80
diff --git a/srcpkgs/libboost_math_c99f1.72 b/srcpkgs/libboost_math_c99f1.80
similarity index 100%
rename from srcpkgs/libboost_math_c99f1.72
rename to srcpkgs/libboost_math_c99f1.80
diff --git a/srcpkgs/libboost_math_c99l1.72 b/srcpkgs/libboost_math_c99l1.80
similarity index 100%
rename from srcpkgs/libboost_math_c99l1.72
rename to srcpkgs/libboost_math_c99l1.80
diff --git a/srcpkgs/libboost_math_tr11.72 b/srcpkgs/libboost_math_tr11.80
similarity index 100%
rename from srcpkgs/libboost_math_tr11.72
rename to srcpkgs/libboost_math_tr11.80
diff --git a/srcpkgs/libboost_math_tr1f1.72 b/srcpkgs/libboost_math_tr1f1.80
similarity index 100%
rename from srcpkgs/libboost_math_tr1f1.72
rename to srcpkgs/libboost_math_tr1f1.80
diff --git a/srcpkgs/libboost_math_tr1l1.72 b/srcpkgs/libboost_math_tr1l1.80
similarity index 100%
rename from srcpkgs/libboost_math_tr1l1.72
rename to srcpkgs/libboost_math_tr1l1.80
diff --git a/srcpkgs/libboost_prg_exec_monitor1.72 b/srcpkgs/libboost_nowide1.80
similarity index 100%
rename from srcpkgs/libboost_prg_exec_monitor1.72
rename to srcpkgs/libboost_nowide1.80
diff --git a/srcpkgs/libboost_program_options1.72 b/srcpkgs/libboost_prg_exec_monitor1.80
similarity index 100%
rename from srcpkgs/libboost_program_options1.72
rename to srcpkgs/libboost_prg_exec_monitor1.80
diff --git a/srcpkgs/libboost_random1.72 b/srcpkgs/libboost_program_options1.80
similarity index 100%
rename from srcpkgs/libboost_random1.72
rename to srcpkgs/libboost_program_options1.80
diff --git a/srcpkgs/libboost_regex1.72 b/srcpkgs/libboost_random1.80
similarity index 100%
rename from srcpkgs/libboost_regex1.72
rename to srcpkgs/libboost_random1.80
diff --git a/srcpkgs/libboost_serialization1.72 b/srcpkgs/libboost_regex1.80
similarity index 100%
rename from srcpkgs/libboost_serialization1.72
rename to srcpkgs/libboost_regex1.80
diff --git a/srcpkgs/libboost_stacktrace_addr2line1.72 b/srcpkgs/libboost_serialization1.80
similarity index 100%
rename from srcpkgs/libboost_stacktrace_addr2line1.72
rename to srcpkgs/libboost_serialization1.80
diff --git a/srcpkgs/libboost_stacktrace_basic1.72 b/srcpkgs/libboost_stacktrace_addr2line1.80
similarity index 100%
rename from srcpkgs/libboost_stacktrace_basic1.72
rename to srcpkgs/libboost_stacktrace_addr2line1.80
diff --git a/srcpkgs/libboost_stacktrace_noop1.72 b/srcpkgs/libboost_stacktrace_basic1.80
similarity index 100%
rename from srcpkgs/libboost_stacktrace_noop1.72
rename to srcpkgs/libboost_stacktrace_basic1.80
diff --git a/srcpkgs/libboost_system1.72 b/srcpkgs/libboost_stacktrace_noop1.80
similarity index 100%
rename from srcpkgs/libboost_system1.72
rename to srcpkgs/libboost_stacktrace_noop1.80
diff --git a/srcpkgs/libboost_thread1.72 b/srcpkgs/libboost_system1.80
similarity index 100%
rename from srcpkgs/libboost_thread1.72
rename to srcpkgs/libboost_system1.80
diff --git a/srcpkgs/libboost_timer1.72 b/srcpkgs/libboost_thread1.80
similarity index 100%
rename from srcpkgs/libboost_timer1.72
rename to srcpkgs/libboost_thread1.80
diff --git a/srcpkgs/libboost_type_erasure1.72 b/srcpkgs/libboost_timer1.80
similarity index 100%
rename from srcpkgs/libboost_type_erasure1.72
rename to srcpkgs/libboost_timer1.80
diff --git a/srcpkgs/libboost_unit_test_framework1.72 b/srcpkgs/libboost_type_erasure1.80
similarity index 100%
rename from srcpkgs/libboost_unit_test_framework1.72
rename to srcpkgs/libboost_type_erasure1.80
diff --git a/srcpkgs/libboost_wave1.72 b/srcpkgs/libboost_unit_test_framework1.80
similarity index 100%
rename from srcpkgs/libboost_wave1.72
rename to srcpkgs/libboost_unit_test_framework1.80
diff --git a/srcpkgs/libboost_wserialization1.72 b/srcpkgs/libboost_wave1.80
similarity index 100%
rename from srcpkgs/libboost_wserialization1.72
rename to srcpkgs/libboost_wave1.80
diff --git a/srcpkgs/libboost_wserialization1.80 b/srcpkgs/libboost_wserialization1.80
new file mode 120000
index 000000000000..baef819c48f6
--- /dev/null
+++ b/srcpkgs/libboost_wserialization1.80
@@ -0,0 +1 @@
+boost
\ No newline at end of file
From 71428f077847f413801a4c4ecc9a4a06731a67bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 16:51:50 +0700
Subject: [PATCH 002/109] TSC: rebuild for boost-1.80
---
srcpkgs/TSC/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/TSC/template b/srcpkgs/TSC/template
index 71534315cf7c..469f6d859bc7 100644
--- a/srcpkgs/TSC/template
+++ b/srcpkgs/TSC/template
@@ -1,7 +1,7 @@
# Template file for 'TSC'
pkgname=TSC
version=2.1.0
-revision=2
+revision=3
build_wrksrc=tsc
build_style=cmake
build_helper="qemu"
From 2b0639d38b77f69aa296fda1e9142bd524a6d096 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:27 +0700
Subject: [PATCH 003/109] 0ad: rebuild for boost-1.80
---
srcpkgs/0ad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 552d2728a7a0..b9f0751c4836 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
# Template file for '0ad'
pkgname=0ad
version=0.0.25b
-revision=3
+revision=4
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
wrksrc="${pkgname}-${version}-alpha"
hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang"
From c01aaa2239572f275dd913bbf2e2888f9714e6a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:27 +0700
Subject: [PATCH 004/109] Aegisub: rebuild for boost-1.80
---
srcpkgs/Aegisub/patches/link-icu18n.patch | 15 +++++++++++++++
srcpkgs/Aegisub/template | 2 +-
2 files changed, 16 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/Aegisub/patches/link-icu18n.patch
diff --git a/srcpkgs/Aegisub/patches/link-icu18n.patch b/srcpkgs/Aegisub/patches/link-icu18n.patch
new file mode 100644
index 000000000000..e5c037ca1f68
--- /dev/null
+++ b/srcpkgs/Aegisub/patches/link-icu18n.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -347,9 +347,9 @@ target_link_libraries(Aegisub PRIVATE "O
+ find_package(Iconv REQUIRED)
+ target_link_libraries(libaegisub PRIVATE "Iconv::Iconv")
+
+-find_package(ICU REQUIRED uc)
+-target_link_libraries(libaegisub PRIVATE "ICU::uc")
+-target_link_libraries(Aegisub PRIVATE "ICU::uc")
++find_package(ICU REQUIRED uc i18n)
++target_link_libraries(libaegisub PRIVATE "ICU::uc" ICU::i18n)
++target_link_libraries(Aegisub PRIVATE "ICU::uc" ICU::i18n)
+
+ find_package(wxWidgets REQUIRED adv base core gl stc xml)
+ include(${wxWidgets_USE_FILE})
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index ff34249aaee4..a68e1ab43089 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
# Template file for 'Aegisub'
pkgname=Aegisub
version=3.3.2
-revision=4
+revision=5
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
cmake_builddir="BUILD"
From 0716f1d2c19c5f1fe8d7a957c939c5e1d8dff480 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:27 +0700
Subject: [PATCH 005/109] Field3D: rebuild for boost-1.80
---
srcpkgs/Field3D/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 62f0589e9e0b..9a5af0034d14 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,7 +1,7 @@
# Template file for 'Field3D'
pkgname=Field3D
version=1.7.3
-revision=2
+revision=3
build_style=cmake
makedepends="boost-devel hdf5-devel ilmbase-devel"
short_desc="Library for storing voxel data on disk and in memory"
From c0a3a9dc635c96f60e7b2ee814e01cd6e8a39d43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:28 +0700
Subject: [PATCH 006/109] LGOGDownloader: rebuild for boost-1.80
---
srcpkgs/LGOGDownloader/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6e7e5c685f83..0778374ad224 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,7 +1,7 @@
# Template file for 'LGOGDownloader'
pkgname=LGOGDownloader
version=3.9
-revision=1
+revision=2
wrksrc="lgogdownloader-${version}"
build_style=cmake
hostmakedepends="pkg-config"
From ade8230384434152ce1ab0e2ee7eaff4234b2f70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:28 +0700
Subject: [PATCH 007/109] Lucene++: rebuild for boost-1.80
---
srcpkgs/Lucene++/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Lucene++/template b/srcpkgs/Lucene++/template
index 3873189f2dfc..34b6e05393fe 100644
--- a/srcpkgs/Lucene++/template
+++ b/srcpkgs/Lucene++/template
@@ -1,7 +1,7 @@
# Template file for 'Lucene++'
pkgname=Lucene++
version=3.0.7
-revision=11
+revision=12
wrksrc=LucenePlusPlus-rel_$version
build_style=cmake
configure_args="-Wno-dev"
From 70d34f9424b78be1fb5deb1a0b6619ef5d8e8032 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:28 +0700
Subject: [PATCH 008/109] PrusaSlicer: rebuild for boost-1.80
---
srcpkgs/PrusaSlicer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 931ac73e5c94..29f1f641a488 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
version=2.4.2
-revision=1
+revision=2
wrksrc="PrusaSlicer-version_${version}"
build_style=cmake
build_helper="qemu"
From d52df1d8b968b429e6b0a9df0fbd3248fdea2a79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:28 +0700
Subject: [PATCH 009/109] astroid: rebuild for boost-1.80
---
srcpkgs/astroid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/astroid/template b/srcpkgs/astroid/template
index 8ee0e729e134..478beb4de195 100644
--- a/srcpkgs/astroid/template
+++ b/srcpkgs/astroid/template
@@ -1,7 +1,7 @@
# Template file for 'astroid'
pkgname=astroid
version=0.16
-revision=5
+revision=6
build_style=cmake
hostmakedepends="pkg-config scdoc protobuf gobject-introspection"
makedepends="libnotmuch-devel gtkmm-devel webkit2gtk-devel libsass-devel
From ce8d9dedd1ae72146bf25b801478d83d09325438 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:28 +0700
Subject: [PATCH 010/109] bitcoin: rebuild for boost-1.80
---
srcpkgs/bitcoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index ccc9c4cc5f10..9ae457ecb9c5 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=22.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
From 4868ff34c04ec2168acf9f6141243c5d8bebfdfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:29 +0700
Subject: [PATCH 011/109] blender: rebuild for boost-1.80
---
srcpkgs/blender/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 91799f04fba5..28befed1faf8 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
version=3.0.0
-revision=4
+revision=5
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
From 6492fece9b1aa53a6533e246118e9ec54fbc9d8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:29 +0700
Subject: [PATCH 012/109] cclive: rebuild for boost-1.80
---
srcpkgs/cclive/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cclive/template b/srcpkgs/cclive/template
index c43dbb94209c..936be99b866c 100644
--- a/srcpkgs/cclive/template
+++ b/srcpkgs/cclive/template
@@ -1,7 +1,7 @@
# Template file for 'cclive'
pkgname=cclive
version=0.9.3
-revision=5
+revision=6
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="boost-devel pcre-devel libcurl-devel libquvi-devel glibmm-devel"
From 36df210b64d951cebe810dad0bc5e6db0c0433d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:29 +0700
Subject: [PATCH 013/109] cgal: rebuild for boost-1.80
---
srcpkgs/cgal/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cgal/template b/srcpkgs/cgal/template
index 7e28c2b28dfd..d448e8dd3c63 100644
--- a/srcpkgs/cgal/template
+++ b/srcpkgs/cgal/template
@@ -1,7 +1,7 @@
# Template file for 'cgal'
pkgname=cgal
version=4.14
-revision=3
+revision=4
wrksrc="CGAL-${version}"
build_style=cmake
build_helper="qemu"
From 41f8df1a82b3fceca0ba3924a30bb181d17d1514 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:29 +0700
Subject: [PATCH 014/109] codeblocks: rebuild for boost-1.80
---
srcpkgs/codeblocks/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/codeblocks/template b/srcpkgs/codeblocks/template
index 33b9b9a77853..0079c3a8991c 100644
--- a/srcpkgs/codeblocks/template
+++ b/srcpkgs/codeblocks/template
@@ -1,7 +1,7 @@
# Template file for 'codeblocks'
pkgname=codeblocks
version=20.03
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-wx-config=wx-config-gtk3 --with-contrib-plugins
--with-boost=${XBPS_CROSS_BASE}/usr --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
From 0fb18eb0f392f1aa429955b74a67c1366122ab8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:29 +0700
Subject: [PATCH 015/109] colobot: rebuild for boost-1.80
---
srcpkgs/colobot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/colobot/template b/srcpkgs/colobot/template
index 1b415dd2cfad..a7613cad90b5 100644
--- a/srcpkgs/colobot/template
+++ b/srcpkgs/colobot/template
@@ -2,7 +2,7 @@
pkgname=colobot
# needs to be kept in sync with colobot-data (provides game assets)
version=0.2.0
-revision=1
+revision=2
wrksrc="colobot-colobot-gold-${version}-alpha"
build_style=cmake
configure_args="-DCOLOBOT_INSTALL_BIN_DIR=/usr/bin -DOpenGL_GL_PREFERENCE=GLVND"
From 1c7651522eafcf68b4800dace9eef1a8ea4c3c01 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Mon, 29 Aug 2022 10:56:35 +1000
Subject: [PATCH 016/109] cryfs: update to 0.11.2.
---
.../cryfs/patches/allow-build-type-none.patch | 22 ---
srcpkgs/cryfs/patches/de-vendor.patch | 134 +++++++-----------
srcpkgs/cryfs/patches/fix-test.patch | 22 ---
srcpkgs/cryfs/patches/fmt-9-fix.patch | 54 +++++++
.../rename-simple-to-basic-filesink.patch | 21 ---
srcpkgs/cryfs/patches/spdlog-include.patch | 33 -----
srcpkgs/cryfs/template | 13 +-
7 files changed, 109 insertions(+), 190 deletions(-)
delete mode 100644 srcpkgs/cryfs/patches/fix-test.patch
create mode 100644 srcpkgs/cryfs/patches/fmt-9-fix.patch
delete mode 100644 srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch
delete mode 100644 srcpkgs/cryfs/patches/spdlog-include.patch
diff --git a/srcpkgs/cryfs/patches/allow-build-type-none.patch b/srcpkgs/cryfs/patches/allow-build-type-none.patch
index e591974c05f4..ffcf0ee53320 100644
--- a/srcpkgs/cryfs/patches/allow-build-type-none.patch
+++ b/srcpkgs/cryfs/patches/allow-build-type-none.patch
@@ -9,25 +9,3 @@ Index: cryfs-0.10.2/doc/CMakeLists.txt
- CONFIGURATIONS Release
)
ENDIF(WIN32)
-Index: cryfs-0.10.2/src/cryfs-cli/CMakeLists.txt
-===================================================================
---- cryfs-0.10.2.orig/src/cryfs-cli/CMakeLists.txt
-+++ cryfs-0.10.2/src/cryfs-cli/CMakeLists.txt
-@@ -27,6 +27,5 @@ target_enable_style_warnings(${PROJECT_N
- target_activate_cpp14(${PROJECT_NAME}_bin)
-
- install(TARGETS ${PROJECT_NAME}_bin
-- CONFIGURATIONS Debug Release RelWithDebInfo
- DESTINATION ${CMAKE_INSTALL_BINDIR}
- )
-Index: cryfs-0.10.2/src/cryfs-unmount/CMakeLists.txt
-===================================================================
---- cryfs-0.10.2.orig/src/cryfs-unmount/CMakeLists.txt
-+++ cryfs-0.10.2/src/cryfs-unmount/CMakeLists.txt
-@@ -19,6 +19,5 @@ target_enable_style_warnings(${PROJECT_N
- target_activate_cpp14(${PROJECT_NAME}_bin)
-
- install(TARGETS ${PROJECT_NAME}_bin
-- CONFIGURATIONS Debug Release RelWithDebInfo
- DESTINATION ${CMAKE_INSTALL_BINDIR}
- )
diff --git a/srcpkgs/cryfs/patches/de-vendor.patch b/srcpkgs/cryfs/patches/de-vendor.patch
index 4909cad7b84a..09e51f0aa7fc 100644
--- a/srcpkgs/cryfs/patches/de-vendor.patch
+++ b/srcpkgs/cryfs/patches/de-vendor.patch
@@ -1,32 +1,14 @@
-Index: cryfs-0.10.2/src/blockstore/implementations/compressing/compressors/Gzip.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/blockstore/implementations/compressing/compressors/Gzip.cpp
-+++ cryfs-0.10.2/src/blockstore/implementations/compressing/compressors/Gzip.cpp
-@@ -1,6 +1,6 @@
- #include "cpp-utils/crypto/cryptopp_byte.h"
+--- a/src/blockstore/implementations/compressing/compressors/Gzip.cpp 2022-08-25 22:14:05.481898162 +0400
++++ b/src/blockstore/implementations/compressing/compressors/Gzip.cpp 2022-08-25 22:17:49.606653292 +0400
+@@ -1,5 +1,5 @@
#include "Gzip.h"
-#include <vendor_cryptopp/gzip.h>
+#include <cryptopp/gzip.h>
using cpputils::Data;
-Index: cryfs-0.10.2/src/cpp-utils/crypto/cryptopp_byte.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/cryptopp_byte.h
-+++ cryfs-0.10.2/src/cpp-utils/crypto/cryptopp_byte.h
-@@ -2,7 +2,7 @@
- #ifndef _CPPUTILS_CRYPTO_CRYPTOPP_BYTE_H
- #define _CPPUTILS_CRYPTO_CRYPTOPP_BYTE_H
-
--#include <vendor_cryptopp/cryptlib.h>
-+#include <cryptopp/cryptlib.h>
-
- // If we're running an older CryptoPP version, CryptoPP::byte isn't defined yet.
- // Define it. Refer to "byte" type in the global namespace (placed by CryptoPP).
-Index: cryfs-0.10.2/src/cpp-utils/crypto/hash/Hash.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/hash/Hash.cpp
-+++ cryfs-0.10.2/src/cpp-utils/crypto/hash/Hash.cpp
+--- a/src/cpp-utils/crypto/hash/Hash.cpp 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/hash/Hash.cpp 2022-08-25 22:18:07.131800277 +0400
@@ -1,6 +1,6 @@
#include "Hash.h"
#include <cpp-utils/random/Random.h>
@@ -35,10 +17,8 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/hash/Hash.cpp
using cpputils::Random;
using CryptoPP::SHA512;
-Index: cryfs-0.10.2/src/cpp-utils/crypto/kdf/Scrypt.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/kdf/Scrypt.cpp
-+++ cryfs-0.10.2/src/cpp-utils/crypto/kdf/Scrypt.cpp
+--- a/src/cpp-utils/crypto/kdf/Scrypt.cpp 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/kdf/Scrypt.cpp 2022-08-25 22:18:17.754889373 +0400
@@ -1,5 +1,5 @@
#include "Scrypt.h"
-#include <vendor_cryptopp/scrypt.h>
@@ -46,11 +26,9 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/kdf/Scrypt.cpp
using std::string;
-Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
-+++ cryfs-0.10.2/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
-@@ -7,7 +7,7 @@
+--- a/src/cpp-utils/crypto/symmetric/CFB_Cipher.h 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/symmetric/CFB_Cipher.h 2022-08-25 22:18:28.524979704 +0400
+@@ -6,7 +6,7 @@
#include "../../data/Data.h"
#include "../../random/Random.h"
#include <boost/optional.hpp>
@@ -59,24 +37,9 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
#include "Cipher.h"
#include "EncryptionKey.h"
-Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
-+++ cryfs-0.10.2/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
-@@ -6,7 +6,7 @@
- #include "../../data/FixedSizeData.h"
- #include "../../data/Data.h"
- #include "../../random/Random.h"
--#include <vendor_cryptopp/gcm.h>
-+#include <cryptopp/gcm.h>
- #include "Cipher.h"
- #include "EncryptionKey.h"
-
-Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/ciphers.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/symmetric/ciphers.h
-+++ cryfs-0.10.2/src/cpp-utils/crypto/symmetric/ciphers.h
-@@ -2,11 +2,11 @@
+--- a/src/cpp-utils/crypto/symmetric/ciphers.h 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/symmetric/ciphers.h 2022-08-25 22:18:52.181178110 +0400
+@@ -2,12 +2,12 @@
#ifndef MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_
#define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_
@@ -85,30 +48,39 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/ciphers.h
-#include <vendor_cryptopp/serpent.h>
-#include <vendor_cryptopp/cast.h>
-#include <vendor_cryptopp/mars.h>
+-#include <vendor_cryptopp/chachapoly.h>
+#include <cryptopp/aes.h>
+#include <cryptopp/twofish.h>
+#include <cryptopp/serpent.h>
+#include <cryptopp/cast.h>
+#include <cryptopp/mars.h>
++#include <cryptopp/chachapoly.h>
#include "GCM_Cipher.h"
#include "CFB_Cipher.h"
-Index: cryfs-0.10.2/src/cpp-utils/data/Data.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/data/Data.cpp
-+++ cryfs-0.10.2/src/cpp-utils/data/Data.cpp
+--- a/src/cpp-utils/crypto/symmetric/GCM_Cipher.h 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/symmetric/GCM_Cipher.h 2022-08-25 22:18:38.836066183 +0400
+@@ -3,7 +3,7 @@
+ #define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_GCMCIPHER_H_
+
+ #include "AEAD_Cipher.h"
+-#include <vendor_cryptopp/gcm.h>
++#include <cryptopp/gcm.h>
+
+ namespace cpputils {
+
+--- a/src/cpp-utils/data/Data.cpp 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/data/Data.cpp 2022-08-25 22:19:09.349322106 +0400
@@ -1,6 +1,6 @@
#include "Data.h"
#include <stdexcept>
-#include <vendor_cryptopp/hex.h>
+#include <cryptopp/hex.h>
- #include <cpp-utils/crypto/cryptopp_byte.h>
using std::istream;
-Index: cryfs-0.10.2/src/cpp-utils/data/FixedSizeData.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/data/FixedSizeData.h
-+++ cryfs-0.10.2/src/cpp-utils/data/FixedSizeData.h
+ using std::ofstream;
+--- a/src/cpp-utils/data/FixedSizeData.h 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/data/FixedSizeData.h 2022-08-25 22:19:19.103403916 +0400
@@ -2,7 +2,7 @@
#ifndef MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_
#define MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_
@@ -116,25 +88,21 @@ Index: cryfs-0.10.2/src/cpp-utils/data/FixedSizeData.h
-#include <vendor_cryptopp/hex.h>
+#include <cryptopp/hex.h>
#include <string>
+ #include <array>
#include <cstring>
- #include "../assert/assert.h"
-Index: cryfs-0.10.2/src/cpp-utils/random/OSRandomGenerator.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/random/OSRandomGenerator.h
-+++ cryfs-0.10.2/src/cpp-utils/random/OSRandomGenerator.h
-@@ -4,7 +4,7 @@
+--- a/src/cpp-utils/random/OSRandomGenerator.h 2022-08-25 22:14:05.483898156 +0400
++++ b/src/cpp-utils/random/OSRandomGenerator.h 2022-08-25 22:19:29.602491973 +0400
+@@ -3,7 +3,7 @@
+ #define MESSMER_CPPUTILS_RANDOM_OSRANDOMGENERATOR_H
- #include "cpp-utils/crypto/cryptopp_byte.h"
#include "RandomGenerator.h"
-#include <vendor_cryptopp/osrng.h>
+#include <cryptopp/osrng.h>
namespace cpputils {
class OSRandomGenerator final : public RandomGenerator {
-Index: cryfs-0.10.2/src/cpp-utils/random/RandomGeneratorThread.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/random/RandomGeneratorThread.h
-+++ cryfs-0.10.2/src/cpp-utils/random/RandomGeneratorThread.h
+--- a/src/cpp-utils/random/RandomGeneratorThread.h 2022-08-25 22:14:05.484898153 +0400
++++ b/src/cpp-utils/random/RandomGeneratorThread.h 2022-08-25 22:19:36.713551613 +0400
@@ -4,7 +4,7 @@
#include "../thread/LoopThread.h"
@@ -144,10 +112,9 @@ Index: cryfs-0.10.2/src/cpp-utils/random/RandomGeneratorThread.h
namespace cpputils {
//TODO Test
-Index: cryfs-0.10.2/src/cryfs/localstate/BasedirMetadata.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cryfs/localstate/BasedirMetadata.cpp
-+++ cryfs-0.10.2/src/cryfs/localstate/BasedirMetadata.cpp
+diff -Naurp0 -U3 cryfs-0.11.2/src/cryfs/impl/localstate/BasedirMetadata.cpp cryfs-0.11.2-mine/src/cryfs/impl/localstate/BasedirMetadata.cpp
+--- a/src/cryfs/impl/localstate/BasedirMetadata.cpp 2022-08-25 22:14:05.487898144 +0400
++++ b/src/cryfs/impl/localstate/BasedirMetadata.cpp 2022-08-25 22:19:46.722635560 +0400
@@ -1,7 +1,7 @@
#include "BasedirMetadata.h"
#include <boost/property_tree/ptree.hpp>
@@ -157,11 +124,9 @@ Index: cryfs-0.10.2/src/cryfs/localstate/BasedirMetadata.cpp
#include <boost/filesystem/operations.hpp>
#include "LocalStateDir.h"
#include <cpp-utils/logging/logging.h>
-Index: cryfs-0.10.2/test/cryfs/config/CompatibilityTest.cpp
-===================================================================
---- cryfs-0.10.2.orig/test/cryfs/config/CompatibilityTest.cpp
-+++ cryfs-0.10.2/test/cryfs/config/CompatibilityTest.cpp
-@@ -3,7 +3,7 @@
+--- a/test/cryfs/impl/config/CompatibilityTest.cpp 2022-08-25 22:14:05.493898126 +0400
++++ b/test/cryfs/impl/config/CompatibilityTest.cpp 2022-08-25 22:19:54.589701542 +0400
+@@ -2,7 +2,7 @@
#include <vector>
#include <boost/filesystem.hpp>
#include <cpp-utils/data/Data.h>
@@ -169,12 +134,9 @@ Index: cryfs-0.10.2/test/cryfs/config/CompatibilityTest.cpp
+#include <cryptopp/hex.h>
#include <cpp-utils/crypto/symmetric/ciphers.h>
#include <cpp-utils/tempfile/TempFile.h>
- #include <cryfs/config/CryConfigFile.h>
-Index: cryfs-0.10.2/vendor/CMakeLists.txt
-===================================================================
---- cryfs-0.10.2.orig/vendor/CMakeLists.txt
-+++ cryfs-0.10.2/vendor/CMakeLists.txt
-@@ -1,3 +1 @@
+ #include <cryfs/impl/config/CryConfigFile.h>
+--- a/vendor/CMakeLists.txt 2022-08-25 22:14:05.497898115 +0400
++++ b/vendor/CMakeLists.txt 2022-08-25 22:20:11.176840657 +0400
+@@ -1,2 +1 @@
add_subdirectory(googletest)
--add_subdirectory(spdlog)
-add_subdirectory(cryptopp)
diff --git a/srcpkgs/cryfs/patches/fix-test.patch b/srcpkgs/cryfs/patches/fix-test.patch
deleted file mode 100644
index d3a5847b1a3c..000000000000
--- a/srcpkgs/cryfs/patches/fix-test.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: cryfs-0.10.2/test/cpp-utils/logging/testutils/LoggingTest.h
-===================================================================
---- cryfs-0.10.2.orig/test/cpp-utils/logging/testutils/LoggingTest.h
-+++ cryfs-0.10.2/test/cpp-utils/logging/testutils/LoggingTest.h
-@@ -11,8 +11,7 @@ class MockLogger final {
- public:
- MockLogger():
- _capturedLogData(),
-- _sink(std::make_shared<spdlog::sinks::ostream_sink<std::mutex>>(_capturedLogData, true)),
-- _logger(spdlog::create("MockLogger", {_sink})) {
-+ _logger(spdlog::create<spdlog::sinks::ostream_sink_mt>("MockLogger", _capturedLogData, true)) {
- }
-
- ~MockLogger() {
-@@ -28,7 +27,6 @@ public:
- }
- private:
- std::ostringstream _capturedLogData;
-- std::shared_ptr<spdlog::sinks::ostream_sink<std::mutex>> _sink;
- std::shared_ptr<spdlog::logger> _logger;
- };
-
diff --git a/srcpkgs/cryfs/patches/fmt-9-fix.patch b/srcpkgs/cryfs/patches/fmt-9-fix.patch
new file mode 100644
index 000000000000..6fe97eaeafa4
--- /dev/null
+++ b/srcpkgs/cryfs/patches/fmt-9-fix.patch
@@ -0,0 +1,54 @@
+From 27515e0116fd7cb034bd4e9763d1f3bfdc855a5f Mon Sep 17 00:00:00 2001
+From: Bernhard Rosenkraenzer <bero@lindev.ch>
+Date: Fri, 22 Jul 2022 14:13:38 +0200
+Subject: [PATCH] Fix build with fmt 9.0 (#433)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* Fix build with fmt 9.0
+
+Co-authored-by: Sebastian Meßmer <smessmer@users.noreply.github.com>
+---
+ ChangeLog.txt | 4 ++++
+ src/fspp/fuse/Fuse.cpp | 8 ++++----
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/src/fspp/fuse/Fuse.cpp b/src/fspp/fuse/Fuse.cpp
+index 4e9dbd7f..4b881815 100644
+--- a/src/fspp/fuse/Fuse.cpp
++++ b/src/fspp/fuse/Fuse.cpp
+@@ -603,21 +603,21 @@ int Fuse::mknod(const bf::path &path, ::mode_t mode, dev_t rdev) {
+ UNUSED(mode);
+ UNUSED(path);
+ ThreadNameForDebugging _threadName("mknod");
+- LOG(WARN, "Called non-implemented mknod({}, {}, _)", path, mode);
++ LOG(WARN, "Called non-implemented mknod({}, {}, _)", path.string(), mode);
+ return ENOSYS;
+ }
+
+ int Fuse::mkdir(const bf::path &path, ::mode_t mode) {
+ ThreadNameForDebugging _threadName("mkdir");
+ #ifdef FSPP_LOG
+- LOG(DEBUG, "mkdir({}, {})", path, mode);
++ LOG(DEBUG, "mkdir({}, {})", path.string(), mode);
+ #endif
+ try {
+ ASSERT(is_valid_fspp_path(path), "has to be an absolute path");
+ // DokanY seems to call mkdir("/"). Ignore that
+ if ("/" == path) {
+ #ifdef FSPP_LOG
+- LOG(DEBUG, "mkdir({}, {}): ignored", path, mode);
++ LOG(DEBUG, "mkdir({}, {}): ignored", path.string(), mode);
+ #endif
+ return 0;
+ }
+@@ -766,7 +766,7 @@ int Fuse::rename(const bf::path &from, const bf::path &to) {
+ //TODO
+ int Fuse::link(const bf::path &from, const bf::path &to) {
+ ThreadNameForDebugging _threadName("link");
+- LOG(WARN, "NOT IMPLEMENTED: link({}, {})", from, to);
++ LOG(WARN, "NOT IMPLEMENTED: link({}, {})", from.string(), to.string());
+ //auto real_from = _impl->RootDir() / from;
+ //auto real_to = _impl->RootDir() / to;
+ //int retstat = ::link(real_from.string().c_str(), real_to.string().c_str());
diff --git a/srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch b/srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch
deleted file mode 100644
index 08513cb4d0ca..000000000000
--- a/srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: cryfs-0.10.2/src/cryfs-cli/Cli.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cryfs-cli/Cli.cpp
-+++ cryfs-0.10.2/src/cryfs-cli/Cli.cpp
-@@ -27,6 +27,7 @@
- #include "Environment.h"
- #include <cryfs/CryfsException.h>
- #include <cpp-utils/thread/debugging.h>
-+#include <spdlog/sinks/basic_file_sink.h>
-
- //TODO Many functions accessing the ProgramOptions object. Factor out into class that stores it as a member.
- //TODO Factor out class handling askPassword
-@@ -310,7 +311,7 @@ namespace cryfs_cli {
- //TODO Test that --logfile parameter works. Should be: file if specified, otherwise stderr if foreground, else syslog.
- if (options.logFile() != none) {
- cpputils::logging::setLogger(
-- spdlog::create<spdlog::sinks::simple_file_sink<std::mutex>>("cryfs", options.logFile()->string()));
-+ spdlog::create<spdlog::sinks::basic_file_sink<std::mutex>>("cryfs", options.logFile()->string()));
- } else if (options.foreground()) {
- cpputils::logging::setLogger(spdlog::stderr_logger_mt("cryfs"));
- } else {
diff --git a/srcpkgs/cryfs/patches/spdlog-include.patch b/srcpkgs/cryfs/patches/spdlog-include.patch
deleted file mode 100644
index 2c1c5a926cf3..000000000000
--- a/srcpkgs/cryfs/patches/spdlog-include.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: cryfs-0.10.2/src/cpp-utils/logging/Logger.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/logging/Logger.h
-+++ cryfs-0.10.2/src/cpp-utils/logging/Logger.h
-@@ -7,6 +7,7 @@
- #endif
-
- #include <spdlog/spdlog.h>
-+#include <spdlog/sinks/stdout_sinks.h>
- #include "../macros.h"
-
- namespace cpputils {
-Index: cryfs-0.10.2/src/cpp-utils/logging/logging.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/logging/logging.h
-+++ cryfs-0.10.2/src/cpp-utils/logging/logging.h
-@@ -5,6 +5,7 @@
- #include "Logger.h"
- #include <stdexcept>
- #include <spdlog/fmt/ostr.h>
-+#include <spdlog/sinks/syslog_sink.h>
-
- #if defined(_MSC_VER)
- #include <spdlog/sinks/msvc_sink.h>
-@@ -75,7 +76,7 @@ namespace cpputils {
- #if defined(_MSC_VER)
- return spdlog::create<spdlog::sinks::msvc_sink_mt>(name);
- #else
-- return spdlog::syslog_logger(name, name, LOG_PID);
-+ return spdlog::syslog_logger_mt(name, name, LOG_PID);
- #endif
- }
- }
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 495c2b318a3b..3c8dc28e519c 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,14 +1,15 @@
# Template file for 'cryfs'
pkgname=cryfs
-version=0.10.2
-revision=5
+version=0.11.2
+revision=1
create_wrksrc=yes
build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off
- -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
+configure_args="-DCRYFS_UPDATE_CHECKS=off -DBoost_USE_STATIC_LIBS=OFF
+ -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt
+ -DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
hostmakedepends="pkg-config python3"
makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel
- spdlog"
+ spdlog range-v3"
depends="fuse"
short_desc="Cryptographic filesystem for the cloud"
maintainer="Andy Weidenbaum <atweiden@tutanota.de>"
@@ -16,7 +17,7 @@ license="LGPL-3.0-only"
homepage="https://www.cryfs.org"
changelog="https://github.com/cryfs/cryfs/raw/master/ChangeLog.txt"
distfiles="https://github.com/cryfs/cryfs/releases/download/${version}/${pkgname}-${version}.tar.gz"
-checksum=004c7fdf537062e197aaa0bcdafd2682904a279802441bb6063cb72c1fba52d2
+checksum=a89ab8fea2d494b496867107ec0a3772fe606ebd71ef12152fcd233f463a2c00
if [ "${XBPS_CHECK_PKGS}" ]; then
configure_args+=" -DBUILD_TESTING=on"
From 38d4f93985cdee9f1be6192a3ef772b73db99926 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:30 +0700
Subject: [PATCH 017/109] eclib: rebuild for boost-1.80
---
srcpkgs/eclib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/eclib/template b/srcpkgs/eclib/template
index 3db0bd2119b9..694a39ed4068 100644
--- a/srcpkgs/eclib/template
+++ b/srcpkgs/eclib/template
@@ -1,7 +1,7 @@
# Template file for 'eclib'
pkgname=eclib
version=20210625
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-flint --with-boost"
hostmakedepends="automake autoconf-archive libtool"
From 4a67d3c54946fa82c49b5df98790e80ebfc022fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:30 +0700
Subject: [PATCH 018/109] facter: rebuild for boost-1.80
---
srcpkgs/facter/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 93d6bfc6af51..45c921a0b72d 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
# Template file for 'facter'
pkgname=facter
version=3.14.16
-revision=3
+revision=4
build_style=cmake
configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
-DENABLE_CXX_WERROR=OFF -DCMAKE_INSTALL_LIBDIR=/usr/lib"
From a47613d9bab0e2ce8deb1fb64b3ff1e718f05bf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:30 +0700
Subject: [PATCH 019/109] fcitx5-chinese-addons: rebuild for boost-1.80
---
srcpkgs/fcitx5-chinese-addons/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fcitx5-chinese-addons/template b/srcpkgs/fcitx5-chinese-addons/template
index d207bde9ada9..a3a1948474a7 100644
--- a/srcpkgs/fcitx5-chinese-addons/template
+++ b/srcpkgs/fcitx5-chinese-addons/template
@@ -1,7 +1,7 @@
# Template file for 'fcitx5-chinese-addons'
pkgname=fcitx5-chinese-addons
version=5.0.14
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config gettext doxygen extra-cmake-modules qt5-qmake
qt5-host-tools libime-utils"
From a4f646abf36a023edcc43ab8e4c08c5bdc0c695f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:31 +0700
Subject: [PATCH 020/109] fifengine: rebuild for boost-1.80
---
srcpkgs/fifengine/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fifengine/template b/srcpkgs/fifengine/template
index 1987e06f7d03..24d2f8521c8d 100644
--- a/srcpkgs/fifengine/template
+++ b/srcpkgs/fifengine/template
@@ -1,7 +1,7 @@
# Template file for 'fifengine'
pkgname=fifengine
version=0.4.2
-revision=8
+revision=9
build_style=cmake
hostmakedepends="swig python3"
makedepends="SDL2-devel SDL2_image-devel SDL2_ttf-devel boost-devel
From a7976bcc90d5ee6a9f3575abe8076e0ad4f97715 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:31 +0700
Subject: [PATCH 021/109] freecad: rebuild for boost-1.80
---
srcpkgs/freecad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index e9c697adbe1a..843d2281f324 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=0.20.1
-revision=1
+revision=2
wrksrc="FreeCAD-${version}"
build_style=cmake
From 9a71aa4ad2222129296bcfbdd04eea8743fe85a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:31 +0700
Subject: [PATCH 022/109] freeorion: rebuild for boost-1.80
---
srcpkgs/freeorion/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freeorion/template b/srcpkgs/freeorion/template
index 20fd819e49b0..71d41f3e987b 100644
--- a/srcpkgs/freeorion/template
+++ b/srcpkgs/freeorion/template
@@ -1,7 +1,7 @@
# Template file for 'freeorion'
pkgname=freeorion
version=0.4.10.2
-revision=1
+revision=2
_release=${version}_2021-08-01.f663dad
wrksrc=src-tarball
build_style=cmake
From 96f9e8fa9a8eeb428c2773b9131129fcc0e39588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:31 +0700
Subject: [PATCH 023/109] gnucash: rebuild for boost-1.80
---
srcpkgs/gnucash/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 5d403e47c02b..81627ef4f8a1 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
# Template file for 'gnucash'
pkgname=gnucash
version=4.11
-revision=1
+revision=2
wrksrc="${pkgname}-${version%b}"
build_style=cmake
make_check_target=check
From 715d30a507f0a7fbdc669190bda5383da76c19dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:31 +0700
Subject: [PATCH 024/109] gnuradio: rebuild for boost-1.80
---
srcpkgs/gnuradio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index 43ae4e1cb1ba..973339f92921 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
version=3.10.3.0
-revision=1
+revision=2
build_style=cmake
conf_files="/etc/gnuradio/conf.d/*"
configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax
From 8974292cd249ab3921001a8819d6dfd7fdfe2ea3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:32 +0700
Subject: [PATCH 025/109] gnuradio-osmosdr: rebuild for boost-1.80
---
srcpkgs/gnuradio-osmosdr/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template
index cdb4d27faf68..bf0696c672a9 100644
--- a/srcpkgs/gnuradio-osmosdr/template
+++ b/srcpkgs/gnuradio-osmosdr/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-osmosdr'
pkgname=gnuradio-osmosdr
version=0.2.3git20210128
-revision=1
+revision=2
_githash=a100eb024c0210b95e4738b6efd836d48225bd03
wrksrc="gr-osmosdr-${_githash}"
build_style=cmake
From 996504f85bde3f7fb8d9e5dc0df265ca7b6fcfea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:32 +0700
Subject: [PATCH 026/109] gnuradio-rds: rebuild for boost-1.80
---
srcpkgs/gnuradio-rds/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template
index 35d19fb82b11..e9e865151f7a 100644
--- a/srcpkgs/gnuradio-rds/template
+++ b/srcpkgs/gnuradio-rds/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-rds'
pkgname=gnuradio-rds
version=3.10
-revision=1
+revision=2
wrksrc="gr-rds-${version}"
build_style=cmake
configure_args="-Dpybind11_DIR=/${py3_sitelib}/pybind11/share/cmake/pybind11"
From da3e2d40deed4194eecd8729701c6b65bafbec96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:32 +0700
Subject: [PATCH 027/109] gource: rebuild for boost-1.80
---
srcpkgs/gource/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gource/template b/srcpkgs/gource/template
index 8ec3b05ca772..08b2e222f607 100644
--- a/srcpkgs/gource/template
+++ b/srcpkgs/gource/template
@@ -1,7 +1,7 @@
# Template file for 'gource'
pkgname=gource
version=0.51
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-tinyxml --enable-ttf-font-dir=/usr/share/fonts/TTF
--with-boost-libdir=$XBPS_CROSS_BASE/usr/lib/"
From 79c5b15f7a6ac003214fd347db0b58645696f524 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:32 +0700
Subject: [PATCH 028/109] gpick: rebuild for boost-1.80
---
srcpkgs/gpick/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gpick/template b/srcpkgs/gpick/template
index b30108334144..7b3a4db6d69c 100644
--- a/srcpkgs/gpick/template
+++ b/srcpkgs/gpick/template
@@ -1,7 +1,7 @@
# Template file for 'gpick'
pkgname=gpick
version=0.2.6
-revision=1
+revision=2
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=cmake
hostmakedepends="gettext pkg-config ragel"
From 4ed2a4da8a774294902fd5c127a5e66a211207a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:32 +0700
Subject: [PATCH 029/109] grive2: rebuild for boost-1.80
---
srcpkgs/grive2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/grive2/template b/srcpkgs/grive2/template
index 140688ee9aec..e416cdc606b5 100644
--- a/srcpkgs/grive2/template
+++ b/srcpkgs/grive2/template
@@ -1,7 +1,7 @@
# Template file for 'grive2'
pkgname=grive2
version=0.5.1
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config"
makedepends="boost-devel libcurl-devel yajl-devel libgcrypt-devel expat-devel"
From f541704419c113b37e79065e474627a8e8b67b73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:33 +0700
Subject: [PATCH 030/109] guitarix2: rebuild for boost-1.80
---
srcpkgs/guitarix2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/guitarix2/template b/srcpkgs/guitarix2/template
index 880814313a2b..de2edbf770b4 100644
--- a/srcpkgs/guitarix2/template
+++ b/srcpkgs/guitarix2/template
@@ -1,7 +1,7 @@
# Template file for 'guitarix2'
pkgname=guitarix2
version=0.42.1
-revision=1
+revision=2
wrksrc="guitarix-${version}"
build_style=waf3
configure_args="--cxxflags-release=-DNDEBUG --ladspa --new-ladspa --no-faust
From 36192eccf4858874777e4dd72b39527c7a5bea83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:33 +0700
Subject: [PATCH 031/109] heaptrack: rebuild for boost-1.80
---
srcpkgs/heaptrack/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/heaptrack/template b/srcpkgs/heaptrack/template
index ed98a952dfdc..0ccc1e6415a7 100644
--- a/srcpkgs/heaptrack/template
+++ b/srcpkgs/heaptrack/template
@@ -1,7 +1,7 @@
# Template file for 'heaptrack'
pkgname=heaptrack
version=1.4.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DHEAPTRACK_BUILD_GUI=ON"
hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules kcoreaddons
From 6cd0e8c72b9bfba00de438bff3a8c046ea303605 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:33 +0700
Subject: [PATCH 032/109] hugin: rebuild for boost-1.80
---
srcpkgs/hugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 7961c74632a1..87cecac02106 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
# Template file for 'hugin'
pkgname=hugin
version=2021.0.0
-revision=1
+revision=2
wrksrc="${pkgname}-${version}"
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
From 2090f8849bb93af74a28619eb4aec3bfe0c197dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:33 +0700
Subject: [PATCH 033/109] i2pd: rebuild for boost-1.80
---
srcpkgs/i2pd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index fe12bb2e19bf..522235bebc17 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,7 +1,7 @@
# Template file for 'i2pd'
pkgname=i2pd
version=2.42.1
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="USE_UPNP=yes"
makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
From 97073777f3b2d49fb6d7d5a6b37dd4493e6ab1e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:34 +0700
Subject: [PATCH 034/109] icinga2: rebuild for boost-1.80
---
srcpkgs/icinga2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index a884892fc49e..4ef7abea2fc3 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,7 +1,7 @@
# Template file for 'icinga2'
pkgname=icinga2
version=2.9.3
-revision=6
+revision=7
build_style=cmake
build_helper="qemu"
configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
From 3c5bb678460d10b35441133626659b02abecca07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:34 +0700
Subject: [PATCH 035/109] imagescan: rebuild for boost-1.80
---
srcpkgs/imagescan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imagescan/template b/srcpkgs/imagescan/template
index a12adfe05713..152ef2f83b33 100644
--- a/srcpkgs/imagescan/template
+++ b/srcpkgs/imagescan/template
@@ -1,7 +1,7 @@
# Template file for 'imagescan'
pkgname=imagescan
version=3.65.0
-revision=1
+revision=2
wrksrc=utsushi-0.65.0
build_style=gnu-configure
configure_args="--libexecdir=/usr/lib --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
From a68ee457ead37748b2ebf6e9757f7b999af1fd1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:34 +0700
Subject: [PATCH 036/109] inkscape: rebuild for boost-1.80
---
srcpkgs/inkscape/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 4d902e663f73..c77236be6848 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.1.1
-revision=4
+revision=5
wrksrc="inkscape-${version}_2021-09-20_3bf5ae0d25"
build_style=cmake
# builds executables then runs checks
From 9637d180ca2a39bc48e5894f2b6d55640eb37165 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:34 +0700
Subject: [PATCH 037/109] innoextract: rebuild for boost-1.80
---
srcpkgs/innoextract/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/innoextract/template b/srcpkgs/innoextract/template
index 079a8ce1350a..9b8e1e163e55 100644
--- a/srcpkgs/innoextract/template
+++ b/srcpkgs/innoextract/template
@@ -1,7 +1,7 @@
# Template file for 'innoextract'
pkgname=innoextract
version=1.9
-revision=1
+revision=2
build_style=cmake
configure_args="-DCMAKE_INSTALL_PREFIX=/usr"
hostmakedepends="boost extra-cmake-modules"
From cb37b6c2fed9b081a15474ce5c5a5c79c07dcd96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:34 +0700
Subject: [PATCH 038/109] juCi++: rebuild for boost-1.80
---
srcpkgs/juCi++/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index 1a7604b44a00..5103324dec20 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -1,7 +1,7 @@
# Template file for 'juCi++'
pkgname=juCi++
version=1.6.2
-revision=2
+revision=3
_libclangmm_commit="b342f4dd6de4fe509a692a4b4fcfc7e24aae9590"
_tiny_commit="c9c8bf810ddad8cd17882b9a9ee628a690e779f5"
wrksrc="jucipp-v${version}"
From 7682406d886ca9033724118c283cf86264d80e85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:35 +0700
Subject: [PATCH 039/109] kea: rebuild for boost-1.80
---
srcpkgs/kea/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index dc0bcc5de3fc..a55b58691de9 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -1,7 +1,7 @@
# Template file for 'kea'
pkgname=kea
version=1.9.5
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
$(vopt_if mysql --with-mysql)
From 1a7d47ccd427736569ad147721e65f960f837912 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:35 +0700
Subject: [PATCH 040/109] kig: rebuild for boost-1.80
---
srcpkgs/kig/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index 591db4bd477c..748c09f99e59 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,7 +1,7 @@
# Template file for 'kig'
pkgname=kig
version=22.04.3
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
pkg-config qt5-host-tools qt5-qmake"
From 60b968641e8b1503e66b8e3c8011a9b6593df440 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:35 +0700
Subject: [PATCH 041/109] leatherman: rebuild for boost-1.80
---
srcpkgs/leatherman/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/leatherman/template b/srcpkgs/leatherman/template
index b61fcd5dc205..5255ea4a18a1 100644
--- a/srcpkgs/leatherman/template
+++ b/srcpkgs/leatherman/template
@@ -1,7 +1,7 @@
# Template file for 'leatherman'
pkgname=leatherman
version=1.12.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DLEATHERMAN_SHARED=ON"
hostmakedepends="pkg-config python3"
From 2cd81f9508462d606f501a693aeec86b16f5d744 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:35 +0700
Subject: [PATCH 042/109] ledger: rebuild for boost-1.80
---
srcpkgs/ledger/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ledger/template b/srcpkgs/ledger/template
index c94b72709dea..130c727e7768 100644
--- a/srcpkgs/ledger/template
+++ b/srcpkgs/ledger/template
@@ -1,7 +1,7 @@
# Template file for 'ledger'
pkgname=ledger
version=3.2.1
-revision=1
+revision=2
build_style=cmake
makedepends="boost-devel gmp-devel mpfr-devel gettext-devel libedit-devel"
short_desc="Double-entry accounting system with a command-line reporting interface"
From e86041c70cd8d293139a4c5acd564bb5fe2fca06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:36 +0700
Subject: [PATCH 043/109] libbitcoin-blockchain: rebuild for boost-1.80
---
srcpkgs/libbitcoin-blockchain/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index e43ab8b9ede1..09a126e75356 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-blockchain'
pkgname=libbitcoin-blockchain
version=3.6.0
-revision=6
+revision=7
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
From 2de425a47c12c9466f3addbed1637899cf06b74d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:36 +0700
Subject: [PATCH 044/109] libbitcoin-client: rebuild for boost-1.80
---
srcpkgs/libbitcoin-client/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index 17849cd906d0..35f17b74ae00 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-client'
pkgname=libbitcoin-client
version=3.6.0
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"
From 7a7591fb6ed905638999d2141ef87552953c0706 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:36 +0700
Subject: [PATCH 045/109] libbitcoin-database: rebuild for boost-1.80
---
srcpkgs/libbitcoin-database/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index a3c48226ba2d..13cec4fdc3dd 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-database'
pkgname=libbitcoin-database
version=3.6.0
-revision=6
+revision=7
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
From f761daa6ba961f36c468c95db75e19091faf6741 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:36 +0700
Subject: [PATCH 046/109] libbitcoin-explorer: rebuild for boost-1.80
---
srcpkgs/libbitcoin-explorer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index a1929f350269..7a5f8368b271 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-explorer'
pkgname=libbitcoin-explorer
version=3.6.0
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
From 4b975aeb1f50f583952db56b86b026ba8818e861 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:36 +0700
Subject: [PATCH 047/109] libbitcoin-network: rebuild for boost-1.80
---
srcpkgs/libbitcoin-network/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index d130facc40de..4f730a814242 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-network'
pkgname=libbitcoin-network
version=3.6.0
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
From cbe016a80000bfe80db85817ad3618afe8f524fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:37 +0700
Subject: [PATCH 048/109] libbitcoin-node: rebuild for boost-1.80
---
srcpkgs/libbitcoin-node/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 23e32624b5cc..ead87310627b 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-node'
pkgname=libbitcoin-node
version=3.6.0
-revision=6
+revision=7
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
From f4adf3c680389aef3608eecd1db8c984182acda0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:37 +0700
Subject: [PATCH 049/109] libbitcoin-protocol: rebuild for boost-1.80
---
srcpkgs/libbitcoin-protocol/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 838d62cc9ecd..53e2e6520f6a 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-protocol'
pkgname=libbitcoin-protocol
version=3.6.0
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
From 7b793f70dfed5762648ca3b4e8e0e27d814e48e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:37 +0700
Subject: [PATCH 050/109] libbitcoin-server: rebuild for boost-1.80
---
srcpkgs/libbitcoin-server/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index fc4988deac2b..70d4c492c5bb 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-server'
pkgname=libbitcoin-server
version=3.6.0
-revision=6
+revision=7
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
From 49326cd74d30b07cbf0dc679ff6b1b0f4d5a00a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:37 +0700
Subject: [PATCH 051/109] libbitcoin-system: rebuild for boost-1.80
---
srcpkgs/libbitcoin-system/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index 8b03fb248c42..8e6790c3ba66 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-system'
pkgname=libbitcoin-system
version=3.6.0
-revision=6
+revision=7
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
From 56f30f7ccf9a8cc7bd9453758112a4e0f08a3a80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:38 +0700
Subject: [PATCH 052/109] libcmis: rebuild for boost-1.80
---
srcpkgs/libcmis/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libcmis/template b/srcpkgs/libcmis/template
index fac133d5e4d9..43dd0a856122 100644
--- a/srcpkgs/libcmis/template
+++ b/srcpkgs/libcmis/template
@@ -1,7 +1,7 @@
# Template file for 'libcmis'
pkgname=libcmis
version=0.5.2
-revision=4
+revision=5
build_style=gnu-configure
configure_args="DOCBOOK2MAN=docbook2man --disable-werror"
hostmakedepends="pkg-config docbook2x"
From a0fd2510ff1967dbe4b4254f8c2b14ac4a6a3512 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:38 +0700
Subject: [PATCH 053/109] libime: rebuild for boost-1.80
---
srcpkgs/libime/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libime/template b/srcpkgs/libime/template
index a37db9885a48..363bdd93b16d 100644
--- a/srcpkgs/libime/template
+++ b/srcpkgs/libime/template
@@ -1,7 +1,7 @@
# Template file for 'libime'
pkgname=libime
version=1.0.13
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config gettext extra-cmake-modules python3"
From 7248d4d369f82b6d2d7268a9541832a32b17cf01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:38 +0700
Subject: [PATCH 054/109] libime-jyutping: rebuild for boost-1.80
---
srcpkgs/libime-jyutping/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libime-jyutping/template b/srcpkgs/libime-jyutping/template
index 3c33940ca368..6ae0855c3d7a 100644
--- a/srcpkgs/libime-jyutping/template
+++ b/srcpkgs/libime-jyutping/template
@@ -1,7 +1,7 @@
# Template file for 'libime-jyutping'
pkgname=libime-jyutping
version=1.0.4
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config gettext extra-cmake-modules python3 libime-utils"
From 74c03d968e96ec66405ce53f8cbac0510c1db429 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:38 +0700
Subject: [PATCH 055/109] libixion: rebuild for boost-1.80
---
srcpkgs/libixion/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libixion/template b/srcpkgs/libixion/template
index 37298a8b9427..ef1a00100f53 100644
--- a/srcpkgs/libixion/template
+++ b/srcpkgs/libixion/template
@@ -1,7 +1,7 @@
# Template file for 'libixion'
pkgname=libixion
version=0.17.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config python3"
makedepends="boost-devel fmt-devel mdds python3-devel spdlog"
From ea0304bc9365a55799f8be96cd66da98b51cb5de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:38 +0700
Subject: [PATCH 056/109] liborcus: rebuild for boost-1.80
---
srcpkgs/liborcus/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/liborcus/template b/srcpkgs/liborcus/template
index cf4b938fe37a..7b6b21a26dca 100644
--- a/srcpkgs/liborcus/template
+++ b/srcpkgs/liborcus/template
@@ -1,7 +1,7 @@
# Template file for 'liborcus'
pkgname=liborcus
version=0.17.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config python3"
makedepends="boost-devel mdds libixion-devel python3-devel zlib-devel"
From c20225a0ed88de83c79598918df9ec4bc95a3498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:39 +0700
Subject: [PATCH 057/109] libphonenumber: rebuild for boost-1.80
---
srcpkgs/libphonenumber/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libphonenumber/template b/srcpkgs/libphonenumber/template
index 9bef2825781c..05f28c4f5579 100644
--- a/srcpkgs/libphonenumber/template
+++ b/srcpkgs/libphonenumber/template
@@ -1,7 +1,7 @@
# Template file for 'libphonenumber'
pkgname=libphonenumber
version=8.12.39
-revision=6
+revision=7
build_wrksrc=cpp
build_style=cmake
build_helper=qemu
From e3a30c7fbbddcd4d3268eb8a7c41c712f3a65ed3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:39 +0700
Subject: [PATCH 058/109] librime: rebuild for boost-1.80
---
srcpkgs/librime/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/librime/template b/srcpkgs/librime/template
index 5f734c200bd7..7110eeffd3f9 100644
--- a/srcpkgs/librime/template
+++ b/srcpkgs/librime/template
@@ -1,7 +1,7 @@
# Template file for 'librime'
pkgname=librime
version=1.7.3
-revision=3
+revision=4
build_style=cmake
configure_args="-DCMAKE_BUILD_TYPE=None -DENABLE_LOGGING=OFF -DBUILD_TEST=ON
-DCAPNP_EXECUTABLE=/usr/bin/capnp -DCAPNPC_CXX_EXECUTABLE=/usr/bin/capnpc-c++"
From bd93db5fc8fd9455fd1b2d0c3e61a3ecf5694aa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:39 +0700
Subject: [PATCH 059/109] libtorrent-rasterbar: rebuild for boost-1.80
---
srcpkgs/libtorrent-rasterbar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index b1ceddc95282..5aceddec5646 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,7 +2,7 @@
# Breaks ABI/API without changing soname, revbump all dependants
pkgname=libtorrent-rasterbar
version=1.2.14
-revision=2
+revision=3
build_style=cmake
configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
-Dpython-bindings=ON"
From 074e19f508849b0eace6fbd325c392eb867e51ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:40 +0700
Subject: [PATCH 060/109] linssid: rebuild for boost-1.80
---
srcpkgs/linssid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linssid/template b/srcpkgs/linssid/template
index 937c8a0745e0..09206656186e 100644
--- a/srcpkgs/linssid/template
+++ b/srcpkgs/linssid/template
@@ -1,7 +1,7 @@
# Template file for 'linssid'
pkgname=linssid
version=3.6
-revision=4
+revision=5
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools"
makedepends="boost-devel qwt-devel"
From 4bc75e08c64d1ecdddcb40a4a0d5400bb001f248 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:40 +0700
Subject: [PATCH 061/109] litecoin: rebuild for boost-1.80
---
srcpkgs/litecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 3c33d9b0eb8a..7a188c3c9af8 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.18.1
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
--disable-tests --with-openssl"
From 273a3c883bfee0ee0ca0420e03e03c0bf8defbaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:40 +0700
Subject: [PATCH 062/109] monero: rebuild for boost-1.80
---
srcpkgs/monero/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index bff62347ebd6..eebce3d0a551 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
# Template file for 'monero'
pkgname=monero
version=0.17.2.3
-revision=2
+revision=3
_randomx_version="1.1.9"
# the revision monero uses as a submodule for the specific version
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
From 9043a4a043e550cd0fdf82ee2f1f2b9be76158e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:40 +0700
Subject: [PATCH 063/109] monero-gui: rebuild for boost-1.80
---
srcpkgs/monero-gui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 67ed3273defa..61e5dd9da1b7 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
# Template file for 'monero-gui'
pkgname=monero-gui
version=0.17.2.3
-revision=1
+revision=2
_monero_version=0.17.2.3
_randomx_version="1.1.9"
# the revision monero uses as a submodule for the specific version
From 4aa61002b65533b94ec016df037bb60b06e4e118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:40 +0700
Subject: [PATCH 064/109] mupen64plus: rebuild for boost-1.80
---
srcpkgs/mupen64plus/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mupen64plus/template b/srcpkgs/mupen64plus/template
index 4984a7f4a777..f4a58a4749cb 100644
--- a/srcpkgs/mupen64plus/template
+++ b/srcpkgs/mupen64plus/template
@@ -1,7 +1,7 @@
# Template file for 'mupen64plus'
pkgname=mupen64plus
version=2.5.9
-revision=1
+revision=2
archs="x86_64* i686*"
wrksrc="mupen64plus-bundle-src-${version}"
hostmakedepends="pkg-config which nasm"
From 14f213c3b39dba01b36f85fb6d52b7047be31598 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:41 +0700
Subject: [PATCH 065/109] musikcube: rebuild for boost-1.80
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index 2b75cbd976ea..11a3df3dc0aa 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=0.98.0
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1 -DENABLE_BUNDLED_TAGLIB=false"
From c11d16c79a418d99542a510bca060bdf52d76ec6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:41 +0700
Subject: [PATCH 066/109] namecoin: rebuild for boost-1.80
---
srcpkgs/namecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index e4cfb3777b71..7839d4008cd3 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
# Template file for 'namecoin'
pkgname=namecoin
version=0.18.1
-revision=5
+revision=6
wrksrc="${pkgname}-core-nc${version}"
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-static
From 4b4091ad7a501c8de1db69694b07e5e2fb676360 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:41 +0700
Subject: [PATCH 067/109] ncmpcpp: rebuild for boost-1.80
---
srcpkgs/ncmpcpp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 773deb4917d4..72a0d35e5e7f 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
--enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
From 2939fb23e2ba0e3210578bd95e814834d066bc05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:41 +0700
Subject: [PATCH 068/109] nix: rebuild for boost-1.80
---
srcpkgs/nix/template | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index bb585b6d7d54..e21c94aa2759 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,23 +1,25 @@
# Template file for 'nix'
pkgname=nix
-version=2.8.1
-revision=1
+version=2.10.3
+revision=2
build_style=gnu-configure
# Use /nix/var as suggested by the official Manual.
-configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
-hostmakedepends="curl pkg-config flex tar xz automake autoconf-archive mdBook jq"
+configure_args="--localstatedir=/nix/var
+ --with-sandbox-shell=/usr/bin/busybox.static"
+hostmakedepends="curl pkg-config flex tar xz automake autoconf-archive mdBook jq
+ busybox-static"
makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
liblzma-devel openssl-devel libsodium-devel sqlite-devel
libseccomp-devel editline-devel jq-devel libarchive-devel
gtest-devel lowdown-devel json-c++"
-depends="curl tar xz"
+depends="curl tar xz busybox-static"
short_desc="Purely functional package manager"
-maintainer="Juan RP <xtraeme@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://nixos.org/nix/"
changelog="https://nixos.org/releases/${pkgname}/${pkgname}-${version}/manual/#sec-relnotes"
distfiles="https://github.com/NixOS/nix/archive/refs/tags/${version}.tar.gz"
-checksum=6f19455775523fca4ae4096e6a6fc493f577198b968811f7fa77eb1fa5213b43
+checksum=5a8d79714bf04c425f41fdd22e67d4704d2e44c7a760c6c144e5767c6d662413
disable_parallel_build=yes
nocross="cross build populates /usr/lib32 with libraries and tries to link against them"
From 1dfab5f1ce35737ab84d14659e0b0dbe7bfb9930 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:42 +0700
Subject: [PATCH 069/109] opencamlib: rebuild for boost-1.80
---
srcpkgs/opencamlib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencamlib/template b/srcpkgs/opencamlib/template
index 8722aaf9ee64..140315ef3467 100644
--- a/srcpkgs/opencamlib/template
+++ b/srcpkgs/opencamlib/template
@@ -1,7 +1,7 @@
# Template file for 'opencamlib'
pkgname=opencamlib
version=2019.07
-revision=3
+revision=4
build_style=cmake
configure_args="-DBUILD_PY_LIB=ON -DUSE_PY_3=ON -DVERSION_STRING=${version}"
hostmakedepends="python3"
From 2315cfc8b30f65c194248011873c47ce2d57e0fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:42 +0700
Subject: [PATCH 070/109] openimageio: rebuild for boost-1.80
---
srcpkgs/openimageio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index 8abf3b05d6a3..23de3c1a91c3 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,7 +1,7 @@
# Template file for 'openimageio'
pkgname=openimageio
version=2.2.15.1
-revision=3
+revision=4
wrksrc="oiio-Release-${version}"
build_style=cmake
configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
From 66f8c9424dc4e9bd139e599b36e382436818ff7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:42 +0700
Subject: [PATCH 071/109] openmw: rebuild for boost-1.80
---
srcpkgs/openmw/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openmw/template b/srcpkgs/openmw/template
index 581e2cbb081e..9a263c9eae45 100644
--- a/srcpkgs/openmw/template
+++ b/srcpkgs/openmw/template
@@ -1,7 +1,7 @@
# Template file for 'openmw'
pkgname=openmw
version=0.47.0
-revision=1
+revision=2
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=cmake
# System bullet doesn't use double precision (double precision would break vdrift)
From 4403e5b45e83ead8da8748f0149ea69ba6d50724 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:42 +0700
Subject: [PATCH 072/109] openscad: rebuild for boost-1.80
---
srcpkgs/openscad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index 60d45d60615f..a3951a1a2201 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -1,7 +1,7 @@
# Template file for 'openscad'
pkgname=openscad
version=2021.01
-revision=2
+revision=3
build_style=qmake
hostmakedepends="bison flex pkg-config gettext qt5-qmake qt5-host-tools"
makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
From 030cd69805276f25b1d9d33f3d5f2e1cf1a1b38b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:42 +0700
Subject: [PATCH 073/109] openvdb: rebuild for boost-1.80
---
srcpkgs/openvdb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 4957f642552a..24bc2253828b 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,7 +1,7 @@
# Template file for 'openvdb'
pkgname=openvdb
version=9.0.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
hostmakedepends="pkg-config"
From 3a9da3af8ed90b30e305412cf41a6e47ade8c5a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:43 +0700
Subject: [PATCH 074/109] osm2pgsql: rebuild for boost-1.80
---
srcpkgs/osm2pgsql/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index 1c53c4505047..1d5f71b70140 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,7 +1,7 @@
# Template file for 'osm2pgsql'
pkgname=osm2pgsql
version=1.6.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="boost"
makedepends="expat-devel proj-devel bzip2-devel zlib-devel boost-devel
From 72e5de6a9aad4e4fe81b52d79bfec2bab42f94ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:43 +0700
Subject: [PATCH 075/109] poedit: rebuild for boost-1.80
---
srcpkgs/poedit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index f10aaf4c88a2..15cd4b6bae20 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
# Template file for 'poedit'
pkgname=poedit
version=3.0.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-wx-config=wx-config-gtk3"
hostmakedepends="pkg-config"
From 14382b5189c197c48c5bf037697e9eb38a3eb703 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:43 +0700
Subject: [PATCH 076/109] povray: rebuild for boost-1.80
---
srcpkgs/povray/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/povray/template b/srcpkgs/povray/template
index 30a2baab2039..93ab71f8e0db 100644
--- a/srcpkgs/povray/template
+++ b/srcpkgs/povray/template
@@ -1,7 +1,7 @@
# Template file for 'povray'
pkgname=povray
version=3.7.0.8
-revision=5
+revision=6
build_style=gnu-configure
_v=${version%.*.*}
configure_args="COMPILED_BY=Void --disable-optimiz-arch"
From 3d90d06b39a76819454d8cc00f3ccb9b76421a7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:43 +0700
Subject: [PATCH 077/109] pulseeffects-legacy: rebuild for boost-1.80
---
srcpkgs/pulseeffects-legacy/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pulseeffects-legacy/template b/srcpkgs/pulseeffects-legacy/template
index 585f25a55c8f..121e90e7f7dc 100644
--- a/srcpkgs/pulseeffects-legacy/template
+++ b/srcpkgs/pulseeffects-legacy/template
@@ -1,7 +1,7 @@
# Template file for 'pulseeffects-legacy'
pkgname=pulseeffects-legacy
version=4.8.5
-revision=3
+revision=4
wrksrc="easyeffects-${version}"
build_style=meson
hostmakedepends="itstool pkg-config gettext glib-devel"
From c05c62da8e57777eeabd775a66e8dd5578d58115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:44 +0700
Subject: [PATCH 078/109] pulseview: rebuild for boost-1.80
---
srcpkgs/pulseview/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pulseview/template b/srcpkgs/pulseview/template
index 83ce80bc39d9..e24c6cd30e88 100644
--- a/srcpkgs/pulseview/template
+++ b/srcpkgs/pulseview/template
@@ -1,7 +1,7 @@
# Template file for 'pulseview'
pkgname=pulseview
version=0.4.2
-revision=1
+revision=2
build_style=cmake
configure_args="-DDISABLE_WERROR=TRUE"
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From ca966febe0c067e48960ce6ae9337ddcf8530092 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:44 +0700
Subject: [PATCH 079/109] remwharead: rebuild for boost-1.80
---
srcpkgs/remwharead/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index 3e52473f86ce..cd36bd3b9849 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -1,7 +1,7 @@
# Template file for 'remwharead'
pkgname=remwharead
version=0.10.0
-revision=2
+revision=3
build_style=cmake
hostmakedepends="poco-devel asciidoc pkg-config"
makedepends="poco-devel boost-devel"
From 46e543ba21839aad2e54b4a033fb7f891f41b05a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:44 +0700
Subject: [PATCH 080/109] rstudio: rebuild for boost-1.80
---
srcpkgs/rstudio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index ad7c1e85cce7..c0354b8130cc 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
# Template file for 'rstudio'
pkgname=rstudio
version=1.4.1717
-revision=3
+revision=4
build_style=cmake
configure_args="-DRSTUDIO_TARGET=Desktop
-DRSTUDIO_USE_SYSTEM_BOOST=ON
From df0a4c016bb800b5284a4a577d96d0d1f0d1fb60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 20 Aug 2022 15:51:41 +0700
Subject: [PATCH 081/109] schroot: update to 1.6.12.
---
.../patches/{musl.patch => sbuild-i18n.patch} | 1 +
srcpkgs/schroot/patches/schroot-cppunit.patch | 11 -----
srcpkgs/schroot/patches/test-chown.patch | 8 ++++
srcpkgs/schroot/template | 47 ++++++++++++-------
4 files changed, 38 insertions(+), 29 deletions(-)
rename srcpkgs/schroot/patches/{musl.patch => sbuild-i18n.patch} (99%)
delete mode 100644 srcpkgs/schroot/patches/schroot-cppunit.patch
create mode 100644 srcpkgs/schroot/patches/test-chown.patch
diff --git a/srcpkgs/schroot/patches/musl.patch b/srcpkgs/schroot/patches/sbuild-i18n.patch
similarity index 99%
rename from srcpkgs/schroot/patches/musl.patch
rename to srcpkgs/schroot/patches/sbuild-i18n.patch
index e0dcaf3bae01..ff69d554cd9a 100644
--- a/srcpkgs/schroot/patches/musl.patch
+++ b/srcpkgs/schroot/patches/sbuild-i18n.patch
@@ -28,3 +28,4 @@
+#include "sbuild-i18n.h"
using namespace sbuild;
+
diff --git a/srcpkgs/schroot/patches/schroot-cppunit.patch b/srcpkgs/schroot/patches/schroot-cppunit.patch
deleted file mode 100644
index 3e11c73fd40b..000000000000
--- a/srcpkgs/schroot/patches/schroot-cppunit.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac 2017-05-20 09:50:30.146864516 +0000
-+++ b/configure.ac 2017-05-20 09:51:26.216792794 +0000
-@@ -336,7 +336,7 @@
- [HAVE_UUID=yes],
- [HAVE_UUID=no])
-
--AM_PATH_CPPUNIT([1.10.0], [HAVE_CPPUNIT=yes])
-+PKG_CHECK_MODULES([CPPUNIT], [cppunit], [HAVE_CPPUNIT=yes], [HAVE_CPPUNIT=no])
- AM_CONDITIONAL([USE_UNIT_TESTS], [test -n "$HAVE_CPPUNIT"])
-
- SCHROOT_CFLAGS="$UUID_CFLAGS"
diff --git a/srcpkgs/schroot/patches/test-chown.patch b/srcpkgs/schroot/patches/test-chown.patch
new file mode 100644
index 000000000000..c9d4e3919428
--- /dev/null
+++ b/srcpkgs/schroot/patches/test-chown.patch
@@ -0,0 +1,8 @@
+--- a/test/setup-test-data.cmake
++++ b/test/setup-test-data.cmake
+@@ -5,4 +5,4 @@ rm -rf test/testdata
+ mkdir test/testdata
+ cp -r ${PROJECT_SOURCE_DIR}/test/*.ex* test/testdata
+ mkdir test/testdata/run-parts.ex2
+-chown -R root:root test/testdata
++# chown -R root:root test/testdata
diff --git a/srcpkgs/schroot/template b/srcpkgs/schroot/template
index fd9ff15c7140..d73a149920a7 100644
--- a/srcpkgs/schroot/template
+++ b/srcpkgs/schroot/template
@@ -1,21 +1,25 @@
# Template file for 'schroot'
pkgname=schroot
reverts="1.7.2_9"
-version=1.6.10
-revision=12
-_debian_version=12+deb11u1
+version=1.6.12
+revision=1
+_debian_version=2
build_style=cmake
configure_args="
+ -DSCHROOT_LIBEXEC_DIR=/usr/libexec/schroot
+ -Ddebug=OFF
-Ddchroot=ON
-Dlvm-snapshot=ON
-Dbtrfs-snapshot=ON
+ -Dzfs-snapshot=ON
-Dblock-device=ON
-Dloopback=ON
+ -DLOSETUP_EXECUTABLE=/usr/sbin/losetup
-Duuid=ON
- -DBTRFS_EXECUTABLE=/usr/bin/btrfs
+ -DBTRFS_EXECUTABLE=/usr/sbin/btrfs
-DLVCREATE_EXECUTABLE=/usr/sbin/lvcreate
-DLVREMOVE_EXECUTABLE=/usr/sbin/lvremove
- -DZFS_EXECUTABLE=/usr/bin/zfs
+ -DZFS_EXECUTABLE=/usr/sbin/zfs
-Dbash_completion_dir=/usr/share/bash-completion/completions"
conf_files="
/etc/schroot/minimal/nssdatabases
@@ -41,27 +45,34 @@ make_dirs="
/var/lib/schroot/session 0755 root root
/var/lib/schroot/mount 0755 root root
/etc/schroot/chroot.d 0755 root root"
-hostmakedepends="pkg-config libtool gettext xz po4a groff"
-makedepends="boost-devel pam-devel lockdev-devel libuuid-devel e2fsprogs-devel
- gettext-devel libcppunit-devel"
+hostmakedepends="pkg-config gettext xz po4a groff"
+makedepends="boost-devel pam-devel lockdev-devel libuuid-devel
+ e2fsprogs-devel gettext-devel libcppunit-devel"
short_desc="Allows users to execute commands in different chroots"
maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
license="GPL-3.0-only"
homepage="https://wiki.debian.org/Schroot"
-distfiles="
- ${DEBIAN_SITE}/main/s/${pkgname}/${pkgname}_${version}.orig.tar.xz
- http://security.debian.org/debian-security/pool/main/s/${pkgname}/${pkgname}_${version}-${_debian_version}.debian.tar.xz"
-checksum="
- 3ce8dfd9cb97b099e4b6d4ccec421d6cc8c9ef84574681e928a12badb5643d0b
- 7bd4e0c2709979362c86a86c10d2b23d290d26e1a2d301a602e829327f483ec1"
-nocross=yes
+distfiles="${DEBIAN_SITE}/main/s/${pkgname}/${pkgname}_${version}.orig.tar.xz
+ ${DEBIAN_SITE}/main/s/${pkgname}/${pkgname}_${version}-${_debian_version}.debian.tar.xz"
+checksum="0bed8a069856a82261046b2e549af60ee32b79ebcdbf642424f378ec7aea6b77
+ 8ff03534007c6d55eb4032b637232954eaddba5cf18c91b42ff3016697ba0f93"
+skip_extraction="${pkgname}_${version}-${_debian_version}.debian.tar.xz"
-pre_configure() {
- cat ../debian/patches/series | while read p; do
- patch -p1 -i ../debian/patches/$p
+pre_patch() {
+ rm -rf debian
+ bsdtar -xf "$XBPS_SRCDISTDIR/$pkgname-$version/$skip_extraction"
+ grep '^[^#]' debian/patches/series | while read p; do
+ msg_normal "Patching (Debian): $p\n"
+ patch -Np1 -s -F0 -i debian/patches/$p
done
}
+do_check() {
+ # expect to be run with root
+ cd build
+ ctest -E "(sbuild-chroot-config)"
+}
+
post_install() {
# Remove development files
rm -rf ${DESTDIR}/usr/include \
From c53ffa9f6073f4d61b448ba8ccbcf16032bade8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:44 +0700
Subject: [PATCH 082/109] snapper: rebuild for boost-1.80
---
srcpkgs/snapper/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template
index bc7bbe5cf84b..85697667ff77 100644
--- a/srcpkgs/snapper/template
+++ b/srcpkgs/snapper/template
@@ -1,7 +1,7 @@
# Template file for 'snapper'
pkgname=snapper
version=0.10.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-zypp --disable-systemd --with-conf=/etc/conf.d"
conf_files="/etc/conf.d/snapper"
From f656bdf3ff26c09c29a65cd48f648c70dab036ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:45 +0700
Subject: [PATCH 083/109] source-highlight: rebuild for boost-1.80
---
srcpkgs/source-highlight/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/source-highlight/template b/srcpkgs/source-highlight/template
index ab56401c64a0..f76c987335af 100644
--- a/srcpkgs/source-highlight/template
+++ b/srcpkgs/source-highlight/template
@@ -1,7 +1,7 @@
# Template file for 'source-highlight'
pkgname=source-highlight
version=3.1.9
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--with-boost=${XBPS_CROSS_BASE}/usr
--with-bash-completion=/usr/share/bash-completion/completions"
From 928f660fdb78e98905f9eee446d5eb8a524db754 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:45 +0700
Subject: [PATCH 084/109] supercollider: rebuild for boost-1.80
---
srcpkgs/supercollider/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/supercollider/template b/srcpkgs/supercollider/template
index 35f6d9dfb7c2..b0b8278470ef 100644
--- a/srcpkgs/supercollider/template
+++ b/srcpkgs/supercollider/template
@@ -1,7 +1,7 @@
# Template file for 'supercollider'
pkgname=supercollider
version=3.11.1
-revision=3
+revision=4
wrksrc="SuperCollider-${version}-Source"
build_style=cmake
make_cmd=make
From df13190892cd9491aed69f3912c5ebac5b799dcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:45 +0700
Subject: [PATCH 085/109] supertux2: rebuild for boost-1.80
---
srcpkgs/supertux2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/supertux2/template b/srcpkgs/supertux2/template
index 56057f5837d5..fce60e205a59 100644
--- a/srcpkgs/supertux2/template
+++ b/srcpkgs/supertux2/template
@@ -1,7 +1,7 @@
# Template file for 'supertux2'
pkgname=supertux2
version=0.6.3
-revision=1
+revision=2
wrksrc="SuperTux-v${version}-Source"
build_style=cmake
configure_args="
From 291f41b6d263f3201abbe2d1a74e6161b97248b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:45 +0700
Subject: [PATCH 086/109] swiften: rebuild for boost-1.80
---
srcpkgs/swiften/patches/boost-endian.patch | 15 +++++++++++++++
srcpkgs/swiften/patches/std.patch | 11 +++++++++++
srcpkgs/swiften/template | 4 ++--
3 files changed, 28 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/swiften/patches/boost-endian.patch
create mode 100644 srcpkgs/swiften/patches/std.patch
diff --git a/srcpkgs/swiften/patches/boost-endian.patch b/srcpkgs/swiften/patches/boost-endian.patch
new file mode 100644
index 000000000000..1cd2c2fb4816
--- /dev/null
+++ b/srcpkgs/swiften/patches/boost-endian.patch
@@ -0,0 +1,15 @@
+--- a/Swiften/Base/Platform.h
++++ b/Swiften/Base/Platform.h
+@@ -43,9 +43,9 @@
+ #endif
+
+ // Endianness
+-#include <boost/detail/endian.hpp>
+-#if defined(BOOST_LITTLE_ENDIAN)
++#include <boost/predef/other/endian.h>
++#if BOOST_ENDIAN_LITTLE_BYTE
+ #define SWIFTEN_LITTLE_ENDIAN
+-#elif defined(BOOST_BIG_ENDIAN)
++#elif BOOST_ENDIAN_BIG_BYTE
+ #define SWIFTEN_BIG_ENDIAN
+ #endif
diff --git a/srcpkgs/swiften/patches/std.patch b/srcpkgs/swiften/patches/std.patch
new file mode 100644
index 000000000000..9534e8a321d2
--- /dev/null
+++ b/srcpkgs/swiften/patches/std.patch
@@ -0,0 +1,11 @@
+--- a/Swift/Controllers/ShowProfileController.h
++++ b/Swift/Controllers/ShowProfileController.h
+@@ -18,6 +18,8 @@
+
+ #include <Swift/Controllers/UIEvents/UIEvent.h>
+
++#include <map>
++
+ namespace Swift {
+ class VCardManager;
+ class ProfileWindow;
diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 969ef1eb5d78..9014153a8818 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,11 +1,11 @@
# Template file for 'swiften'
pkgname=swiften
version=4.0.3
-revision=2
+revision=3
wrksrc="swift-${version}"
hostmakedepends="scons pkg-config"
makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
- lua51-devel miniupnpc-devel sqlite-devel"
+ lua51-devel miniupnpc-devel sqlite-devel hunspell-devel"
short_desc="XMPP library for C++"
maintainer="John Regan <john@jrjrtech.com>"
license="GPL-3.0-only"
From e4e4d2b994d36dd3586e7a7ab9c404c437099e4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:46 +0700
Subject: [PATCH 087/109] syncthingtray: rebuild for boost-1.80
---
srcpkgs/syncthingtray/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/syncthingtray/template b/srcpkgs/syncthingtray/template
index 4f338f2cc200..f445aa92db1e 100644
--- a/srcpkgs/syncthingtray/template
+++ b/srcpkgs/syncthingtray/template
@@ -1,7 +1,7 @@
# Template file for 'syncthingtray'
pkgname=syncthingtray
version=1.2.2
-revision=1
+revision=2
build_style=cmake
configure_args="-DJS_PROVIDER=qml -DBUILTIN_TRANSLATIONS=ON -DSYSTEMD_SUPPORT=OFF
-DBUILD_SHARED_LIBS=ON -DWEBVIEW_PROVIDER=$(vopt_if webengine webengine none)"
From aef5ab68a99001b89c5eff85b9d199dcd9f8c665 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:46 +0700
Subject: [PATCH 088/109] tmfs: rebuild for boost-1.80
---
srcpkgs/tmfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tmfs/template b/srcpkgs/tmfs/template
index 1dbed3e0eb72..ed4fb5fed836 100644
--- a/srcpkgs/tmfs/template
+++ b/srcpkgs/tmfs/template
@@ -1,7 +1,7 @@
# Template file for 'tmfs'
pkgname=tmfs
version=r5
-revision=7
+revision=8
build_style=cmake
hostmakedepends="pkg-config"
makedepends="fuse-devel boost-devel"
From ccdf157e5dc4921fb251738c384d8c5224a21321 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:46 +0700
Subject: [PATCH 089/109] tomahawk: rebuild for boost-1.80
---
srcpkgs/tomahawk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tomahawk/template b/srcpkgs/tomahawk/template
index 0edbacc5f8ad..b66b9a876a5c 100644
--- a/srcpkgs/tomahawk/template
+++ b/srcpkgs/tomahawk/template
@@ -1,7 +1,7 @@
# Template file for 'tomahawk'
pkgname=tomahawk
version=0.8.4
-revision=21
+revision=22
wrksrc=${pkgname}-${_commit}
_commit=90ec6f0dc701cba0533c66abdcb904e29f02a66f
build_style=cmake
From 1508ba9c7418a81979d25b45c98c6f5fac03f047 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:46 +0700
Subject: [PATCH 090/109] uhd: rebuild for boost-1.80
---
srcpkgs/uhd/patches/boost-math.patch | 31 +++++++++++++++++++++++++++
srcpkgs/uhd/patches/std-complex.patch | 10 +++++++++
srcpkgs/uhd/template | 2 +-
3 files changed, 42 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/uhd/patches/boost-math.patch
create mode 100644 srcpkgs/uhd/patches/std-complex.patch
diff --git a/srcpkgs/uhd/patches/boost-math.patch b/srcpkgs/uhd/patches/boost-math.patch
new file mode 100644
index 000000000000..9ac6dae1df9d
--- /dev/null
+++ b/srcpkgs/uhd/patches/boost-math.patch
@@ -0,0 +1,31 @@
+--- a/host/lib/usrp/usrp2/usrp2_impl.cpp
++++ b/host/lib/usrp/usrp2/usrp2_impl.cpp
+@@ -18,6 +18,8 @@
+ #include <boost/asio.hpp> //used for htonl and ntohl
+ #include <boost/asio/ip/address_v4.hpp>
+ #include <boost/format.hpp>
++#include <boost/math/special_functions/round.hpp>
++#include <boost/math/special_functions/sign.hpp>
+ #include <boost/thread.hpp>
+ #include <functional>
+
+--- a/host/lib/usrp/cores/rx_frontend_core_3000.cpp
++++ b/host/lib/usrp/cores/rx_frontend_core_3000.cpp
+@@ -12,6 +12,7 @@
+ #include <uhdlib/usrp/cores/rx_frontend_core_3000.hpp>
+ #include <boost/assign/list_of.hpp>
+ #include <boost/math/special_functions/round.hpp>
++#include <boost/math/special_functions/sign.hpp>
+ #include <functional>
+
+ using namespace uhd;
+--- a/host/lib/usrp/cores/rx_dsp_core_3000.cpp
++++ b/host/lib/usrp/cores/rx_dsp_core_3000.cpp
+@@ -14,6 +14,7 @@
+ #include <uhdlib/usrp/cores/rx_dsp_core_3000.hpp>
+ #include <boost/assign/list_of.hpp>
+ #include <boost/math/special_functions/round.hpp>
++#include <boost/math/special_functions/sign.hpp>
+ #include <algorithm>
+ #include <cmath>
+ #include <functional>
diff --git a/srcpkgs/uhd/patches/std-complex.patch b/srcpkgs/uhd/patches/std-complex.patch
new file mode 100644
index 000000000000..c7573bf4ade2
--- /dev/null
+++ b/srcpkgs/uhd/patches/std-complex.patch
@@ -0,0 +1,10 @@
+--- a/host/tests/tx_streamer_test.cpp
++++ b/host/tests/tx_streamer_test.cpp
+@@ -7,6 +7,7 @@
+ #include "../common/mock_link.hpp"
+ #include <uhdlib/transport/tx_streamer_impl.hpp>
+ #include <boost/test/unit_test.hpp>
++#include <complex>
+ #include <iostream>
+ #include <memory>
+
diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template
index 5f043162d7dc..170e12670c2c 100644
--- a/srcpkgs/uhd/template
+++ b/srcpkgs/uhd/template
@@ -1,7 +1,7 @@
# Template file for 'uhd'
pkgname=uhd
version=4.0.0.0
-revision=1
+revision=2
build_wrksrc=host
build_style=cmake
configure_args="-DCMAKE_BUILD_TYPE=None"
From a9c25ff7cfa44ca80bf2f8b8b6bee93c10c0b90c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:47 +0700
Subject: [PATCH 091/109] wesnoth: rebuild for boost-1.80
---
srcpkgs/wesnoth/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 0fcc09b29c10..4d55d20b5959 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,7 +1,7 @@
# Template file for 'wesnoth'
pkgname=wesnoth
version=1.14.17
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_OMP=1"
hostmakedepends="pkg-config gettext"
@@ -18,7 +18,7 @@ checksum=3646cba604e09c12d6900a733bcb78cbf05f2f75f05346630d6529c220f584e1
replaces="wesnoth-data>=0"
CFLAGS="-UNDEBUG"
-CXXFLAGS="-UNDEBUG"
+CXXFLAGS="-UNDEBUG -std=c++14"
post_install() {
# runit service
From ef06323851cd7a139a6c41a399f3433601a18631 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:47 +0700
Subject: [PATCH 092/109] wsjtx: rebuild for boost-1.80
---
srcpkgs/wsjtx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wsjtx/template b/srcpkgs/wsjtx/template
index c1838dd7cf51..7324d85bd64d 100644
--- a/srcpkgs/wsjtx/template
+++ b/srcpkgs/wsjtx/template
@@ -1,7 +1,7 @@
# Template file for 'wsjtx'
pkgname=wsjtx
version=2.5.4
-revision=1
+revision=2
build_wrksrc=wsjtx
build_style=cmake
configure_args="-DRIGCTLCOM_EXE= -DRIGCTL_EXE= -DRIGCTLD_EXE="
From fc501a807a30fd852f09eb7b125a5661f6b2a27d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:39 +0700
Subject: [PATCH 093/109] libreoffice: update to 7.4.0.3.
---
srcpkgs/libreoffice/template | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 158df0f30ebc..00ceb97950ff 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
-version=7.3.3.2
-revision=3
+version=7.4.0.3
+revision=1
build_style=meta
make_build_target="build-nocheck"
nocross="Several dependencies are nocross=yes"
@@ -9,7 +9,7 @@ nocross="Several dependencies are nocross=yes"
hostmakedepends="automake flex git gperf hyphen icu libtool openldap which gettext xz
perl-Archive-Zip pkg-config qt5-qmake sane ucpp unzip zip python3-setuptools
fontforge python3-lxml"
-makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
+makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel icu-devel
frameworkintegration-devel glyphy-devel gpgmepp-devel gst-plugins-base1-devel
gtk+-devel gtk+3-devel hunspell-devel hyphen-devel libXt-devel libabw-devel
libatomic_ops-devel libbluetooth-devel libcdr-devel libe-book-devel
@@ -111,10 +111,10 @@ distfiles="
${_addurl}/Scheherazade-2.100.zip
${_addurl}/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz
"
-checksum="ee12bdbe1621c20e2744bc5b6c5967810f25a5760b98ac5812d550ab00968685
- a6f67d5a20fe656c909b16c338759c187cf7e5e7f463d33d8d58a8bbe0280323
- 688634eccb802c156496124b394c0ec5e21059a9b6cd0095930f9e76f9eefe9b
- b91b0a482fa42d59e1605f39a3917166e7ff76bfa8e9b62d6eef0a9b04b3351c
+checksum="acc383a4386e1ceb74266a2f6406dee4b3a78576bda6bc71630f629ea20e3c19
+ 7d0b2927051111acdf99c9e805078cf5fb7f90f855b6182a225d4319bb0419ad
+ aa1922940b1742a833f34efc2cc2267dd592363530764dcfd352112c9b329547
+ e6fc4b8b4adf6c3b23f555f0a245ef535ad1771a386480ec14cab71e70179d8c
1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66
From 111e3773ffa191b53c0e4d797615b102d0c38fbb Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 20:49:38 +0400
Subject: [PATCH 094/109] fmt: update to 9.0.0.
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index b91133da6484..dbc48a29aad1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3540,7 +3540,7 @@ libcotp.so.12 libcotp-1.2.1_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.8 fmt-8.0.1_1
+libfmt.so.9 fmt-9.0.0_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.25 libtls-3.5.2_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index 35a914c75eab..6fa037dfbaab 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=8.1.1
+version=9.0.0
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,7 +10,7 @@ license="BSD-2-Clause"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=3d794d3cf67633b34b2771eb9f073bde87e846e0d395d254df7b211ef1ec7346
+checksum=9a1e0e9e843a356d65c7604e2c8bf9402b50fe294c355de0095ebd42fb9bd2c5
post_install() {
vlicense LICENSE.rst LICENSE
From 784b69dd995f511d9467c3ad32e0549cbdd66ce6 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:33 +0400
Subject: [PATCH 095/109] Bear: update to 3.0.20.
---
srcpkgs/Bear/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index fce6309ca6fa..c6c1fb6e9c38 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
-version=3.0.19
-revision=2
+version=3.0.20
+revision=1
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-3.0-or-later"
homepage="https://github.com/rizsotto/Bear"
distfiles="https://github.com/rizsotto/Bear/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=2fcfe2c6e029182cfc54ed26b3505c0ef12b0f43df03fb587f335afdc2ca9431
+checksum=45cfcdab07f824f6c06c9776701156f7a04b23eadd25ecbc88c188789a447cc7
conflicts="interception-tools>=0" # /usr/bin/intercept
if [ -z "$XBPS_CHECK_PKGS" ]; then
From 0f47131c0c331089673af61bfc17e2c1baf4627a Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:33 +0400
Subject: [PATCH 096/109] cherrytree: revbump for fmt 9.0
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 55512e3b5ef7..e52a677a47b5 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=0.99.39
-revision=2
+revision=3
wrksrc="${pkgname}_${version}"
build_style=cmake
hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
From 9b0258045e2e515f84671a76e6ac7634dc9264a2 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:33 +0400
Subject: [PATCH 097/109] coeurl: revbump for fmt 9.0
---
srcpkgs/coeurl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index d0dbcbc60ba0..a9f2dfbbc123 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,7 +1,7 @@
# Template file for 'coeurl'
pkgname=coeurl
version=0.1.1
-revision=1
+revision=2
wrksrc=coeurl-v${version}
build_style=meson
hostmakedepends="pkg-config"
From e481abb5509b869c78b98f89666f192038a8db5d Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:34 +0400
Subject: [PATCH 098/109] easyeffects: revbump for fmt 9.0
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index ac84ce15b068..0ddfb1b5833d 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=6.2.4
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel"
makedepends="gtkmm4-devel pipewire-devel zita-convolver-devel lilv-devel
From c6b831b8d9db98226645ec7b1dcad6aeede4d338 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:34 +0400
Subject: [PATCH 099/109] gerbera: revbump for fmt 9.0, add patch
---
srcpkgs/gerbera/patches/fmt-9-fix.patch | 32 +++++++++++++++++++++++++
srcpkgs/gerbera/template | 2 +-
2 files changed, 33 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/gerbera/patches/fmt-9-fix.patch
diff --git a/srcpkgs/gerbera/patches/fmt-9-fix.patch b/srcpkgs/gerbera/patches/fmt-9-fix.patch
new file mode 100644
index 000000000000..7adedf9005db
--- /dev/null
+++ b/srcpkgs/gerbera/patches/fmt-9-fix.patch
@@ -0,0 +1,32 @@
+From d7b8fafbc94405c20753fed569abd8878cccde89 Mon Sep 17 00:00:00 2001
+From: Felix Yan <felixonmars@archlinux.org>
+Date: Fri, 19 Aug 2022 15:22:10 +0300
+Subject: [PATCH] Fix build with fmt 9.0
+
+Fixes #2681
+---
+ src/database/sql_format.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/database/sql_format.h b/src/database/sql_format.h
+index 32dc00efa..e4e1909a8 100644
+--- a/src/database/sql_format.h
++++ b/src/database/sql_format.h
+@@ -42,7 +42,7 @@ struct SQLIdentifier {
+ template <>
+ struct fmt::formatter<SQLIdentifier> : formatter<std::string_view> {
+ template <typename FormatContext>
+- auto format(const SQLIdentifier& tn, FormatContext& ctx) -> decltype(ctx.out())
++ auto format(const SQLIdentifier& tn, FormatContext& ctx) const -> decltype(ctx.out())
+ {
+ return format_to(ctx.out(), "{}{}{}", tn.quote_begin, tn.name, tn.quote_end);
+ }
+@@ -61,7 +61,7 @@ struct ColumnUpdate {
+ template <>
+ struct fmt::formatter<ColumnUpdate> : formatter<std::string_view> {
+ template <typename FormatContext>
+- auto format(const ColumnUpdate& a, FormatContext& ctx) -> decltype(ctx.out())
++ auto format(const ColumnUpdate& a, FormatContext& ctx) const -> decltype(ctx.out())
+ {
+ return format_to(ctx.out(), "{} = {}", a.column, a.value);
+ }
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 35136708b3e5..100b94a7acbe 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.11.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From f5e601820a3a2d23732a08fda7cb64cde6908d0d Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:34 +0400
Subject: [PATCH 100/109] kodi: revbump for fmt 9.0
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index d3e9a13afdd5..4b6c9e1ade0c 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=19.4
-revision=3
+revision=4
_codename="Matrix"
wrksrc="xbmc-${version}-${_codename}"
build_style=cmake
From aba3c0ec18f9547dde2455fe6ea1106de026c170 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:34 +0400
Subject: [PATCH 101/109] MangoHud: revbump for fmt 9.0
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index a9973bcad30a..fb0e18c1a1f4 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -2,7 +2,7 @@
pkgname=MangoHud
version=0.6.7.1
_version="${version%.*}-${version##*.}"
-revision=2
+revision=3
wrksrc="MangoHud-v${_version}"
build_style=meson
configure_args="-Duse_system_vulkan=enabled -Dwith_xnvctrl=disabled
From 8bac11cc1bb97be15e06baefd48b74c960375651 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 102/109] mkvtoolnix: revbump for fmt 9.0
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index a1d2adbc4b3f..d98022773c0a 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=70.0.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
From 86aa126e32cc533dff524b94f0418e3992d7293f Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 103/109] mpd: revbump for fmt 9.0
---
srcpkgs/mpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 98195b80a38d..b43c83fbb0f7 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,7 +1,7 @@
# Template file for 'mpd'
pkgname=mpd
version=0.23.8
-revision=1
+revision=2
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
-Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
From 2dd6b7d52ca6d3b933fa8373b38c3510ee88533c Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 104/109] mtxclient: revbump for fmt 9.0
---
srcpkgs/mtxclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 4ec895656749..12fea54d3fd5 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.8.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From 0f502a46c3c8a08b20fff1045cc0e2b54950b8a3 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 105/109] nheko: revbump for fmt 9.0
---
srcpkgs/nheko/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index f35fd3942116..8e41e9e1f2f0 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.10.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative asciidoc"
makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
From cb6c39e4f29583049bec68d46543788617e57793 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 106/109] spdlog: revbump for fmt 9.0
---
srcpkgs/spdlog/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 187ec0d0eb6e..ef1ee76ffcca 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
# Template file for 'spdlog'
pkgname=spdlog
version=1.10.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
-DSPDLOG_BUILD_SHARED=ON"
From ce1b9eff4521ef800d24ebb3bc8976f8343b4cd0 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 107/109] Waybar: revbump for fmt 9.0
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 8ac3d4290b39..e40288e00b75 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.9.13
-revision=1
+revision=2
_date_version=3.0.0
build_style=meson
configure_args="-Dgtk-layer-shell=enabled -Dlibudev=enabled -Dman-pages=enabled
From bd528ab8697eec310dc6546c4cabee3c539be607 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 29 Aug 2022 22:27:49 +0700
Subject: [PATCH 108/109] fixup! PrusaSlicer
---
srcpkgs/PrusaSlicer/patches/fstream.patch | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/PrusaSlicer/patches/fstream.patch
diff --git a/srcpkgs/PrusaSlicer/patches/fstream.patch b/srcpkgs/PrusaSlicer/patches/fstream.patch
new file mode 100644
index 000000000000..a766c747f704
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/fstream.patch
@@ -0,0 +1,20 @@
+--- a/src/hints/HintsToPot.cpp
++++ b/src/hints/HintsToPot.cpp
+@@ -2,6 +2,7 @@
+ #include <vector>
+ #include <string>
+ #include <boost/filesystem.hpp>
++#include <boost/filesystem/fstream.hpp>
+ #include <boost/dll.hpp>
+ #include <boost/property_tree/ini_parser.hpp>
+ #include <boost/nowide/fstream.hpp>
+--- a/tests/fff_print/test_data.cpp
++++ b/tests/fff_print/test_data.cpp
+@@ -8,6 +8,7 @@
+ #include "libslic3r/Format/STL.hpp"
+
+ #include <cstdlib>
++#include <fstream>
+ #include <string>
+
+ #include <boost/nowide/cstdio.hpp>
From 4c80392c3be4ddbd98665b65bb6d8edd4eb0b490 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Mon, 29 Aug 2022 22:51:03 +0700
Subject: [PATCH 109/109] fixup! TSC
---
srcpkgs/TSC/patches/boost-1.80.patch | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 srcpkgs/TSC/patches/boost-1.80.patch
diff --git a/srcpkgs/TSC/patches/boost-1.80.patch b/srcpkgs/TSC/patches/boost-1.80.patch
new file mode 100644
index 000000000000..19f9ee57bad5
--- /dev/null
+++ b/srcpkgs/TSC/patches/boost-1.80.patch
@@ -0,0 +1,11 @@
+--- a/tsc/scrdg/scrdg.cpp
++++ b/tsc/scrdg/scrdg.cpp
+@@ -15,6 +15,8 @@
+ */
+
+ #include "scrdg.hpp"
++#include <algorithm>
++#include <fstream>
+ #include <iostream>
+ #include <sstream>
+ #include <cstdio>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Updated] [WIP] boost 1.80
2022-08-27 18:49 [PR PATCH] [WIP] boost 1.80 sgn
` (3 preceding siblings ...)
2022-08-29 15:54 ` sgn
@ 2022-08-30 12:56 ` sgn
2022-08-30 14:56 ` sgn
` (2 subsequent siblings)
7 siblings, 0 replies; 9+ messages in thread
From: sgn @ 2022-08-30 12:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1251 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages boost-1.80
https://github.com/void-linux/void-packages/pull/38949
[WIP] boost 1.80
<!-- Uncomment relevant sections and delete options which are not applicable -->
[ci skip]
#### Testing the changes
- I tested the changes in this PR: **NO**
Close #38916
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38949.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boost-1.80-38949.patch --]
[-- Type: text/x-diff, Size: 167795 bytes --]
From 14e25aa9402c6ffb54303894a60b2e0fbe0a6c74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 15:21:49 +0700
Subject: [PATCH 001/107] boost: update to 1.80.0.
---
common/shlibs | 65 +++---
.../{boost-python1.72 => boost-python3-1.80} | 0
.../patches/0001-compat-glibc-2.34.patch | 23 --
.../patches/0002-compat-glibc-2.34.patch | 30 ---
srcpkgs/boost/patches/exec_file.patch | 45 ----
.../boost/patches/install-strip-destdir.patch | 27 +++
srcpkgs/boost/patches/mips.patch | 11 -
srcpkgs/boost/template | 196 +++++++++---------
...boost-python3-1.72 => libboost_atomic1.80} | 0
...ibboost_atomic1.72 => libboost_chrono1.80} | 0
...oost_chrono1.72 => libboost_container1.80} | 0
...ost_container1.72 => libboost_context1.80} | 0
...oost_context1.72 => libboost_contract1.80} | 0
...st_contract1.72 => libboost_coroutine1.80} | 0
...t_coroutine1.72 => libboost_date_time1.80} | 0
...boost_date_time1.72 => libboost_fiber1.80} | 0
...oost_fiber1.72 => libboost_filesystem1.80} | 0
...oost_filesystem1.72 => libboost_graph1.80} | 0
...boost_graph1.72 => libboost_iostreams1.80} | 0
...bboost_iostreams1.72 => libboost_json1.80} | 0
...ibboost_locale1.72 => libboost_locale1.80} | 0
.../{libboost_log1.72 => libboost_log1.80} | 0
...t_log_setup1.72 => libboost_log_setup1.80} | 0
...ost_math_c991.72 => libboost_math_c991.80} | 0
...t_math_c99f1.72 => libboost_math_c99f1.80} | 0
...t_math_c99l1.72 => libboost_math_c99l1.80} | 0
...ost_math_tr11.72 => libboost_math_tr11.80} | 0
...t_math_tr1f1.72 => libboost_math_tr1f1.80} | 0
...t_math_tr1l1.72 => libboost_math_tr1l1.80} | 0
...g_exec_monitor1.72 => libboost_nowide1.80} | 0
...ions1.72 => libboost_prg_exec_monitor1.80} | 0
...andom1.72 => libboost_program_options1.80} | 0
...libboost_regex1.72 => libboost_random1.80} | 0
...t_serialization1.72 => libboost_regex1.80} | 0
...dr2line1.72 => libboost_serialization1.80} | 0
...1.72 => libboost_stacktrace_addr2line1.80} | 0
...noop1.72 => libboost_stacktrace_basic1.80} | 0
...ystem1.72 => libboost_stacktrace_noop1.80} | 0
...ibboost_thread1.72 => libboost_system1.80} | 0
...libboost_timer1.72 => libboost_thread1.80} | 0
...st_type_erasure1.72 => libboost_timer1.80} | 0
...ramework1.72 => libboost_type_erasure1.80} | 0
...e1.72 => libboost_unit_test_framework1.80} | 0
...t_wserialization1.72 => libboost_wave1.80} | 0
srcpkgs/libboost_wserialization1.80 | 1 +
45 files changed, 164 insertions(+), 234 deletions(-)
rename srcpkgs/{boost-python1.72 => boost-python3-1.80} (100%)
delete mode 100644 srcpkgs/boost/patches/0001-compat-glibc-2.34.patch
delete mode 100644 srcpkgs/boost/patches/0002-compat-glibc-2.34.patch
delete mode 100644 srcpkgs/boost/patches/exec_file.patch
create mode 100644 srcpkgs/boost/patches/install-strip-destdir.patch
delete mode 100644 srcpkgs/boost/patches/mips.patch
rename srcpkgs/{boost-python3-1.72 => libboost_atomic1.80} (100%)
rename srcpkgs/{libboost_atomic1.72 => libboost_chrono1.80} (100%)
rename srcpkgs/{libboost_chrono1.72 => libboost_container1.80} (100%)
rename srcpkgs/{libboost_container1.72 => libboost_context1.80} (100%)
rename srcpkgs/{libboost_context1.72 => libboost_contract1.80} (100%)
rename srcpkgs/{libboost_contract1.72 => libboost_coroutine1.80} (100%)
rename srcpkgs/{libboost_coroutine1.72 => libboost_date_time1.80} (100%)
rename srcpkgs/{libboost_date_time1.72 => libboost_fiber1.80} (100%)
rename srcpkgs/{libboost_fiber1.72 => libboost_filesystem1.80} (100%)
rename srcpkgs/{libboost_filesystem1.72 => libboost_graph1.80} (100%)
rename srcpkgs/{libboost_graph1.72 => libboost_iostreams1.80} (100%)
rename srcpkgs/{libboost_iostreams1.72 => libboost_json1.80} (100%)
rename srcpkgs/{libboost_locale1.72 => libboost_locale1.80} (100%)
rename srcpkgs/{libboost_log1.72 => libboost_log1.80} (100%)
rename srcpkgs/{libboost_log_setup1.72 => libboost_log_setup1.80} (100%)
rename srcpkgs/{libboost_math_c991.72 => libboost_math_c991.80} (100%)
rename srcpkgs/{libboost_math_c99f1.72 => libboost_math_c99f1.80} (100%)
rename srcpkgs/{libboost_math_c99l1.72 => libboost_math_c99l1.80} (100%)
rename srcpkgs/{libboost_math_tr11.72 => libboost_math_tr11.80} (100%)
rename srcpkgs/{libboost_math_tr1f1.72 => libboost_math_tr1f1.80} (100%)
rename srcpkgs/{libboost_math_tr1l1.72 => libboost_math_tr1l1.80} (100%)
rename srcpkgs/{libboost_prg_exec_monitor1.72 => libboost_nowide1.80} (100%)
rename srcpkgs/{libboost_program_options1.72 => libboost_prg_exec_monitor1.80} (100%)
rename srcpkgs/{libboost_random1.72 => libboost_program_options1.80} (100%)
rename srcpkgs/{libboost_regex1.72 => libboost_random1.80} (100%)
rename srcpkgs/{libboost_serialization1.72 => libboost_regex1.80} (100%)
rename srcpkgs/{libboost_stacktrace_addr2line1.72 => libboost_serialization1.80} (100%)
rename srcpkgs/{libboost_stacktrace_basic1.72 => libboost_stacktrace_addr2line1.80} (100%)
rename srcpkgs/{libboost_stacktrace_noop1.72 => libboost_stacktrace_basic1.80} (100%)
rename srcpkgs/{libboost_system1.72 => libboost_stacktrace_noop1.80} (100%)
rename srcpkgs/{libboost_thread1.72 => libboost_system1.80} (100%)
rename srcpkgs/{libboost_timer1.72 => libboost_thread1.80} (100%)
rename srcpkgs/{libboost_type_erasure1.72 => libboost_timer1.80} (100%)
rename srcpkgs/{libboost_unit_test_framework1.72 => libboost_type_erasure1.80} (100%)
rename srcpkgs/{libboost_wave1.72 => libboost_unit_test_framework1.80} (100%)
rename srcpkgs/{libboost_wserialization1.72 => libboost_wave1.80} (100%)
create mode 120000 srcpkgs/libboost_wserialization1.80
diff --git a/common/shlibs b/common/shlibs
index 48c63f2d0735..b91133da6484 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -620,38 +620,39 @@ libip4tc.so.2 iptables-1.8.3_1
libipq.so.0 iptables-1.4.7_1
libnm.so.0 libnm-1.0.0_1
libKF5ItemModels.so.5 kitemmodels-5.26.0_1
-libboost_context.so.1.72.0 libboost_context1.72-1.72.0_1
-libboost_coroutine.so.1.72.0 libboost_coroutine1.72-1.72.0_1
-libboost_container.so.1.72.0 libboost_container1.72-1.72.0_1
-libboost_prg_exec_monitor.so.1.72.0 libboost_prg_exec_monitor1.72-1.72.0_1
-libboost_timer.so.1.72.0 libboost_timer1.72-1.72.0_1
-libboost_random.so.1.72.0 libboost_random1.72-1.72.0_1
-libboost_filesystem.so.1.72.0 libboost_filesystem1.72-1.72.0_1
-libboost_unit_test_framework.so.1.72.0 libboost_unit_test_framework1.72-1.72.0_1
-libboost_math_c99.so.1.72.0 libboost_math_c991.72-1.72.0_1
-libboost_math_tr1.so.1.72.0 libboost_math_tr11.72-1.72.0_1
-libboost_regex.so.1.72.0 libboost_regex1.72-1.72.0_1
-libboost_serialization.so.1.72.0 libboost_serialization1.72-1.72.0_1
-libboost_chrono.so.1.72.0 libboost_chrono1.72-1.72.0_1
-libboost_wserialization.so.1.72.0 libboost_wserialization1.72-1.72.0_1
-libboost_graph.so.1.72.0 libboost_graph1.72-1.72.0_1
-libboost_log.so.1.72.0 libboost_log1.72-1.72.0_1
-libboost_locale.so.1.72.0 libboost_locale1.72-1.72.0_1
-libboost_program_options.so.1.72.0 libboost_program_options1.72-1.72.0_1
-libboost_iostreams.so.1.72.0 libboost_iostreams1.72-1.72.0_1
-libboost_system.so.1.72.0 libboost_system1.72-1.72.0_1
-libboost_thread.so.1.72.0 libboost_thread1.72-1.72.0_1
-libboost_log_setup.so.1.72.0 libboost_log_setup1.72-1.72.0_1
-libboost_date_time.so.1.72.0 libboost_date_time1.72-1.72.0_1
-libboost_wave.so.1.72.0 libboost_wave1.72-1.72.0_1
-libboost_atomic.so.1.72.0 libboost_atomic1.72-1.72.0_1
-libboost_type_erasure.so.1.72.0 libboost_type_erasure1.72-1.72.0_1
-libboost_fiber.so.1.72.0 libboost_fiber1.72-1.72.0_1
-libboost_stacktrace_noop.so.1.72.0 libboost_stacktrace_noop1.72-1.72.0_1
-libboost_stacktrace_addr2line.so.1.72.0 libboost_stacktrace_addr2line1.72-1.72.0_1
-libboost_stacktrace_basic.so.1.72.0 libboost_stacktrace_basic1.72-1.72.0_1
-libboost_python27.so.1.72.0 boost-python1.72-1.72.0_1
-libboost_python310.so.1.72.0 boost-python3-1.72-1.72.0_6
+libboost_context.so.1.80.0 libboost_context1.80-1.80.0_1
+libboost_coroutine.so.1.80.0 libboost_coroutine1.80-1.80.0_1
+libboost_container.so.1.80.0 libboost_container1.80-1.80.0_1
+libboost_prg_exec_monitor.so.1.80.0 libboost_prg_exec_monitor1.80-1.80.0_1
+libboost_timer.so.1.80.0 libboost_timer1.80-1.80.0_1
+libboost_random.so.1.80.0 libboost_random1.80-1.80.0_1
+libboost_filesystem.so.1.80.0 libboost_filesystem1.80-1.80.0_1
+libboost_unit_test_framework.so.1.80.0 libboost_unit_test_framework1.80-1.80.0_1
+libboost_math_c99.so.1.80.0 libboost_math_c991.80-1.80.0_1
+libboost_math_tr1.so.1.80.0 libboost_math_tr11.80-1.80.0_1
+libboost_nowide.so.1.80.0 libboost_nowide1.80-1.80.0_1
+libboost_json.so.1.80.0 libboost_json1.80-1.80.0_1
+libboost_regex.so.1.80.0 libboost_regex1.80-1.80.0_1
+libboost_serialization.so.1.80.0 libboost_serialization1.80-1.80.0_1
+libboost_chrono.so.1.80.0 libboost_chrono1.80-1.80.0_1
+libboost_wserialization.so.1.80.0 libboost_wserialization1.80-1.80.0_1
+libboost_graph.so.1.80.0 libboost_graph1.80-1.80.0_1
+libboost_log.so.1.80.0 libboost_log1.80-1.80.0_1
+libboost_locale.so.1.80.0 libboost_locale1.80-1.80.0_1
+libboost_program_options.so.1.80.0 libboost_program_options1.80-1.80.0_1
+libboost_iostreams.so.1.80.0 libboost_iostreams1.80-1.80.0_1
+libboost_system.so.1.80.0 libboost_system1.80-1.80.0_1
+libboost_thread.so.1.80.0 libboost_thread1.80-1.80.0_1
+libboost_log_setup.so.1.80.0 libboost_log_setup1.80-1.80.0_1
+libboost_date_time.so.1.80.0 libboost_date_time1.80-1.80.0_1
+libboost_wave.so.1.80.0 libboost_wave1.80-1.80.0_1
+libboost_atomic.so.1.80.0 libboost_atomic1.80-1.80.0_1
+libboost_type_erasure.so.1.80.0 libboost_type_erasure1.80-1.80.0_1
+libboost_fiber.so.1.80.0 libboost_fiber1.80-1.80.0_1
+libboost_stacktrace_noop.so.1.80.0 libboost_stacktrace_noop1.80-1.80.0_1
+libboost_stacktrace_addr2line.so.1.80.0 libboost_stacktrace_addr2line1.80-1.80.0_1
+libboost_stacktrace_basic.so.1.80.0 libboost_stacktrace_basic1.80-1.80.0_1
+libboost_python310.so.1.80.0 boost-python3-1.80-1.80.0_6
libexempi.so.8 exempi-2.5.0_1
libatasmart.so.4 libatasmart-0.17_1
libsgutils2-1.45.so.2 libsgutils-1.45_1
diff --git a/srcpkgs/boost-python1.72 b/srcpkgs/boost-python3-1.80
similarity index 100%
rename from srcpkgs/boost-python1.72
rename to srcpkgs/boost-python3-1.80
diff --git a/srcpkgs/boost/patches/0001-compat-glibc-2.34.patch b/srcpkgs/boost/patches/0001-compat-glibc-2.34.patch
deleted file mode 100644
index e1e5711e59f2..000000000000
--- a/srcpkgs/boost/patches/0001-compat-glibc-2.34.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 74fb0a26099bc51d717f5f154b37231ce7df3e98 Mon Sep 17 00:00:00 2001
-From: Rob Boehne <robb@datalogics.com>
-Date: Wed, 20 Nov 2019 11:25:20 -0600
-Subject: [PATCH] Revert change to elide a warning that caused Solaris builds
- to fail.
-
----
- include/boost/thread/pthread/thread_data.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/boost/thread/pthread/thread_data.hpp b/include/boost/thread/pthread/thread_data.hpp
-index aefbeb43c..bc9b1367a 100644
---- a/boost/thread/pthread/thread_data.hpp
-+++ b/boost/thread/pthread/thread_data.hpp
-@@ -57,7 +57,7 @@ namespace boost
- #else
- std::size_t page_size = ::sysconf( _SC_PAGESIZE);
- #endif
--#if PTHREAD_STACK_MIN > 0
-+#ifdef PTHREAD_STACK_MIN
- if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
- #endif
- size = ((size+page_size-1)/page_size)*page_size;
diff --git a/srcpkgs/boost/patches/0002-compat-glibc-2.34.patch b/srcpkgs/boost/patches/0002-compat-glibc-2.34.patch
deleted file mode 100644
index baf7c517f8b4..000000000000
--- a/srcpkgs/boost/patches/0002-compat-glibc-2.34.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f9d0e594d43afcb4ab0043117249feb266ba4515 Mon Sep 17 00:00:00 2001
-From: Romain Geissler <romain.geissler@amadeus.com>
-Date: Tue, 10 Aug 2021 14:22:28 +0000
-Subject: [PATCH] Fix -Wsign-compare warning with glibc 2.34 on Linux
- platforms.
-
-In file included from /data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/thread_only.hpp:17,
- from /data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/thread.hpp:12,
- from src/GetTest.cpp:12:
-/data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/pthread/thread_data.hpp: In member function 'void boost::thread_attributes::set_stack_size(std::size_t)':
-/data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/pthread/thread_data.hpp:61:19: error: comparison of integer expressions of different signedness: 'std::size_t' {aka 'long unsigned int'} and 'long int' [-Werror=sign-compare]
- 61 | if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
- | ^
----
- include/boost/thread/pthread/thread_data.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/boost/thread/pthread/thread_data.hpp b/include/boost/thread/pthread/thread_data.hpp
-index bc9b1367a..c43b276d1 100644
---- a/boost/thread/pthread/thread_data.hpp
-+++ b/boost/thread/pthread/thread_data.hpp
-@@ -58,7 +58,7 @@ namespace boost
- std::size_t page_size = ::sysconf( _SC_PAGESIZE);
- #endif
- #ifdef PTHREAD_STACK_MIN
-- if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
-+ if (size<static_cast<std::size_t>(PTHREAD_STACK_MIN)) size=PTHREAD_STACK_MIN;
- #endif
- size = ((size+page_size-1)/page_size)*page_size;
- int res = pthread_attr_setstacksize(&val_, size);
diff --git a/srcpkgs/boost/patches/exec_file.patch b/srcpkgs/boost/patches/exec_file.patch
deleted file mode 100644
index b1b0ef969c4d..000000000000
--- a/srcpkgs/boost/patches/exec_file.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From d9f06052e28873037db7f98629bce72182a42410 Mon Sep 17 00:00:00 2001
-From: Pat Riehecky <riehecky@fnal.gov>
-Date: Mon, 29 Jun 2020 10:51:58 -0500
-Subject: [PATCH] Convert Python 3.1+ to use public C API for filenames
-
- [
- Ed.: Paths were adapted from upstream commit
- https://github.com/boostorg/python/commit/d9f06052e28873037db7f98629bce72182a42410
- ]
-
----
- src/exec.cpp | 16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/libs/python/src/exec.cpp b/libs/python/src/exec.cpp
-index 171c6f4189..b2eabe59f6 100644
---- a/libs/python/src/exec.cpp
-+++ b/libs/python/src/exec.cpp
-@@ -104,14 +104,22 @@ object BOOST_PYTHON_DECL exec_file(char const *filename, object global, object l
- if (local.is_none()) local = global;
- // should be 'char const *' but older python versions don't use 'const' yet.
- char *f = const_cast<char *>(filename);
-- // Let python open the file to avoid potential binary incompatibilities.
--#if PY_VERSION_HEX >= 0x03040000
-- FILE *fs = _Py_fopen(f, "r");
-+#if PY_VERSION_HEX >= 0x03010000
-+ // Let python manage any UTF bits to avoid potential incompatibilities.
-+ PyObject *fo = Py_BuildValue("s", f);
-+ PyObject *fb = Py_None;
-+ PyUnicode_FSConverter(fo, &fb);
-+ f = PyBytes_AsString(fb);
-+ FILE *fs = fopen(f, "r");
-+ Py_DECREF(fo);
-+ Py_DECREF(fb);
- #elif PY_VERSION_HEX >= 0x03000000
-+ // Let python open the file to avoid potential binary incompatibilities.
- PyObject *fo = Py_BuildValue("s", f);
-- FILE *fs = _Py_fopen(fo, "r");
-+ FILE *fs = _Py_fopen(fo, "r"); // Private CPython API
- Py_DECREF(fo);
- #else
-+ // Let python open the file to avoid potential binary incompatibilities.
- PyObject *pyfile = PyFile_FromString(f, const_cast<char*>("r"));
- if (!pyfile) throw std::invalid_argument(std::string(f) + " : no such file");
- python::handle<> file(pyfile);
diff --git a/srcpkgs/boost/patches/install-strip-destdir.patch b/srcpkgs/boost/patches/install-strip-destdir.patch
new file mode 100644
index 000000000000..61047c5967b1
--- /dev/null
+++ b/srcpkgs/boost/patches/install-strip-destdir.patch
@@ -0,0 +1,27 @@
+--- a/tools/boost_install/boost-install.jam
++++ b/tools/boost_install/boost-install.jam
+@@ -678,6 +678,16 @@ local rule path-native-fwd ( path )
+ return $(path) ;
+ }
+
++local rule path-strip-destdir ( path )
++{
++ local parts = [ MATCH "^(/destdir(/[^/]+)?/boost-[0-9.]+)(/.*)" : $(path) ] ;
++ if $(parts)
++ {
++ path = $(parts[3]) ;
++ }
++ return $(path) ;
++}
++
+ local rule get-dir ( name : dir )
+ {
+ if [ path.is-rooted $(dir) ]
+@@ -756,6 +766,7 @@ rule generate-cmake-config- ( target : s
+ if [ path.is-rooted $(cmakedir) ]
+ {
+ local cmakedir-native = [ path-native-fwd $(cmakedir) ] ;
++ cmakedir-native = [ path-strip-destdir $(cmakedir-native) ] ;
+
+ print.text
+
diff --git a/srcpkgs/boost/patches/mips.patch b/srcpkgs/boost/patches/mips.patch
deleted file mode 100644
index a10a2122d9c7..000000000000
--- a/srcpkgs/boost/patches/mips.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/boost/fiber/detail/cpu_relax.hpp 2017-09-02 11:56:11.000000000 +0200
-+++ b/boost/fiber/detail/cpu_relax.hpp 2017-11-09 17:25:40.258995963 +0100
-@@ -48,7 +48,7 @@
- # define cpu_relax() asm volatile ("nop" ::: "memory");
- # endif
- #elif BOOST_ARCH_MIPS
--# define cpu_relax() asm volatile ("pause" ::: "memory");
-+# define cpu_relax() asm volatile ("nop" ::: "memory");
- #elif BOOST_ARCH_PPC
- // http://code.metager.de/source/xref/gnu/glibc/sysdeps/powerpc/sys/platform/ppc.h
- // http://stackoverflow.com/questions/5425506/equivalent-of-x86-pause-instruction-for-ppc
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index f0c5afcec9e8..0d103e335b52 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,53 +1,52 @@
# Template file for 'boost'
pkgname=boost
-version=1.72.0
-revision=9
+version=1.80.0
+revision=1
wrksrc="${pkgname}_${version//\./_}"
-hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
-makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
+hostmakedepends="which bzip2-devel icu-devel python3-devel pkg-config"
+makedepends="zlib-devel bzip2-devel icu-devel python3-devel liblzma-devel
+ libzstd-devel"
short_desc="Free peer-reviewed portable C++ source libraries"
maintainer="John <me@johnnynator.dev>"
license="BSL-1.0"
homepage="http://www.boost.org/"
distfiles="https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${version//./_}.tar.bz2"
-checksum=59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722
+checksum=1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0
python_version=3
-CXXFLAGS="-std=c++14"
-
-replaces="libboost_program_options1.69>=0 libboost_math_c99f1.69>=0
- libboost_stacktrace_basic1.69>=0 libboost_stacktrace_noop1.69>=0
- libboost_iostreams1.69>=0 libboost_math_tr1l1.69>=0 libboost_filesystem1.69>=0
- libboost_chrono1.69>=0 libboost_math_tr1f1.69>=0 libboost_wave1.69>=0
- libboost_graph1.69>=0 libboost_locale1.69>=0 libboost_regex1.69>=0
- libboost_fiber1.69>=0 libboost_type_erasure1.69>=0 libboost_coroutine1.69>=0
- libboost_atomic1.69>=0 libboost_prg_exec_monitor1.69>=0 libboost_math_c991.69>=0
- boost-python3-1.69>=0 libboost_log_setup1.69>=0 boost1.69>=0-devel
- libboost_timer1.69>=0 libboost_system1.69>=0 libboost_unit_test_framework1.69>=0
- libboost_serialization1.69>=0 libboost_math_tr11.69>=0 boost1.69>=0-build
- libboost_math_c99l1.69>=0 boost-python1.69>=0 libboost_contract1.69>=0
- libboost_date_time1.69>=0 libboost_log1.69>=0 libboost_random1.69>=0
- libboost_thread1.69>=0 libboost_container1.69>=0 boost1.69>=0-jam
- libboost_wserialization1.69>=0 libboost_context1.69>=0
- libboost_stacktrace_addr2line1.69>=0"
-
-subpackages="libboost_program_options1.72 libboost_math_c99f1.72
- libboost_stacktrace_basic1.72 libboost_stacktrace_noop1.72
- libboost_iostreams1.72 libboost_math_tr1l1.72 libboost_filesystem1.72
- libboost_chrono1.72 libboost_math_tr1f1.72 libboost_wave1.72
- libboost_graph1.72 libboost_locale1.72 libboost_regex1.72
- libboost_fiber1.72 libboost_type_erasure1.72 libboost_coroutine1.72
- libboost_atomic1.72 libboost_prg_exec_monitor1.72 libboost_math_c991.72
- boost-python3-1.72 libboost_log_setup1.72 boost-devel
- libboost_timer1.72 libboost_system1.72 libboost_unit_test_framework1.72
- libboost_serialization1.72 libboost_math_tr11.72 boost-build
- libboost_math_c99l1.72 boost-python1.72 libboost_contract1.72
- libboost_date_time1.72 libboost_log1.72 libboost_random1.72
- libboost_thread1.72 libboost_container1.72 boost-jam
- libboost_wserialization1.72 libboost_context1.72"
+replaces="libboost_program_options1.72>=0 libboost_math_c99f1.72>=0
+ libboost_stacktrace_basic1.72>=0 libboost_stacktrace_noop1.72>=0
+ libboost_iostreams1.72>=0 libboost_math_tr1l1.72>=0 libboost_filesystem1.72>=0
+ libboost_chrono1.72>=0 libboost_math_tr1f1.72>=0 libboost_wave1.72>=0
+ libboost_graph1.72>=0 libboost_locale1.72>=0 libboost_regex1.72>=0
+ libboost_fiber1.72>=0 libboost_type_erasure1.72>=0 libboost_coroutine1.72>=0
+ libboost_atomic1.72>=0 libboost_prg_exec_monitor1.72>=0 libboost_math_c991.72>=0
+ boost-python3-1.72>=0 libboost_log_setup1.72>=0
+ libboost_timer1.72>=0 libboost_system1.72>=0 libboost_unit_test_framework1.72>=0
+ libboost_serialization1.72>=0 libboost_math_tr11.72>=0
+ libboost_math_c99l1.72>=0 boost-python1.72>=0 libboost_contract1.72>=0
+ libboost_date_time1.72>=0 libboost_log1.72>=0 libboost_random1.72>=0
+ libboost_thread1.72>=0 libboost_container1.72>=0
+ libboost_wserialization1.72>=0 libboost_context1.72>=0
+ libboost_stacktrace_addr2line1.72>=0"
+
+subpackages="libboost_program_options1.80 libboost_math_c99f1.80
+ libboost_stacktrace_basic1.80 libboost_stacktrace_noop1.80
+ libboost_iostreams1.80 libboost_math_tr1l1.80 libboost_filesystem1.80
+ libboost_chrono1.80 libboost_math_tr1f1.80 libboost_wave1.80
+ libboost_graph1.80 libboost_locale1.80 libboost_regex1.80
+ libboost_fiber1.80 libboost_type_erasure1.80 libboost_coroutine1.80
+ libboost_atomic1.80 libboost_prg_exec_monitor1.80 libboost_math_c991.80
+ boost-python3-1.80 libboost_log_setup1.80 boost-devel libboost_json1.80
+ libboost_timer1.80 libboost_system1.80 libboost_unit_test_framework1.80
+ libboost_serialization1.80 libboost_math_tr11.80 boost-build
+ libboost_math_c99l1.80 libboost_contract1.80 libboost_nowide1.80
+ libboost_date_time1.80 libboost_log1.80 libboost_random1.80
+ libboost_thread1.80 libboost_container1.80 boost-jam
+ libboost_wserialization1.80 libboost_context1.80"
if [ -z "$CROSS_BUILD" ]; then
- subpackages+=" libboost_stacktrace_addr2line1.72"
+ subpackages+=" libboost_stacktrace_addr2line1.80"
fi
case "$XBPS_TARGET_MACHINE" in
@@ -60,38 +59,40 @@ case "$XBPS_TARGET_MACHINE" in
esac
do_build() {
- CXX=${BUILD_CXX} CXXFLAGS=${BUILD_CXXFLAGS} ./bootstrap.sh \
- --prefix=${DESTDIR}/usr --with-python=${XBPS_CROSS_BASE}/usr/bin/python3 \
+ # bootstrap.sh will reset CXX and CXXFLAGS (L229)
+ ./bootstrap.sh --with-toolset=gcc \
+ --prefix=${DESTDIR}/usr --with-python=/usr/bin/python3 \
--with-python-root=${XBPS_CROSS_BASE}/usr
(
# Rebuild bjam for target
cd tools/build/src/engine
- ./build.sh gcc
+ CXXFLAGS="$CXXFLAGS -fdebug-prefix-map=$PWD=."
+ # toolset gcc will force gcc -x c++ -O2 -s
+ # toolset cxx will use CXX and CXXFLAGS
+ CXX_VERSION_OPT=--version ./build.sh cxx
)
cat > user-config.jam <<-__EOF
using gcc : : ${CXX} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
- using python : 2.7 : ${XBPS_CROSS_BASE}/usr/bin/python2 : ${XBPS_CROSS_BASE}/usr/include/python2.7 : ${XBPS_CROSS_BASE}/usr/lib/python2.7 ;
- using python : ${py3_ver} : ${XBPS_CROSS_BASE}/usr/bin/python3 : ${XBPS_CROSS_BASE}/${py3_inc} : ${XBPS_CROSS_BASE}/${py3_lib} ;
+ using python : ${py3_ver} : /usr/bin/python3 : ${XBPS_CROSS_BASE}/${py3_inc} : ${XBPS_CROSS_BASE}/${py3_lib} ;
__EOF
- # --no-cmake-config should be removed with boost-1.71 or later
./b2 ${makejobs} \
--user-config=${wrksrc}/user-config.jam --debug-building \
- --no-cmake-config \
- --toolset=gcc abi=${_abi} architecture=${_arch} python=2.7,${py3_ver} \
+ --toolset=gcc abi=${_abi} architecture=${_arch} python=${py3_ver} \
threading=multi runtime-link=shared link=shared,static
}
do_install() {
# Install bjam
# XXX: make bjam a symlink to b2
- for _b in bjam b2; do
+ for _b in b2; do
vbin tools/build/src/engine/${_b}
done
+ ln -sf b2 "$DESTDIR/usr/bin/bjam"
# Install headers/libs
./b2 --prefix=${DESTDIR}/usr abi=${_abi} architecture=${_arch} \
- --user-config=${wrksrc}/user-config.jam --no-cmake-config \
- python=2.7,${py3_ver} threading=multi runtime-link=shared link=shared,static \
+ --user-config=${wrksrc}/user-config.jam \
+ python=${py3_ver} threading=multi runtime-link=shared link=shared,static \
install
# Install Boost.Build stuff.
@@ -119,15 +120,7 @@ boost-jam_package() {
vmove usr/bin/b2
}
}
-boost-python1.72_package() {
- depends="boost python"
- replaces="boost-python>=0"
- short_desc+=" - Python bindings"
- pkg_install() {
- vmove "usr/lib/libboost_python2*.so.*"
- }
-}
-boost-python3-1.72_package() {
+boost-python3-1.80_package() {
depends="boost python3"
replaces="boost-python3>=0"
short_desc+=" - Python3 bindings"
@@ -149,12 +142,13 @@ boost-devel_package() {
short_desc+=" - development files"
pkg_install() {
vmove usr/include
+ vmove usr/lib/cmake
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
}
}
-libboost_atomic1.72_package() {
+libboost_atomic1.80_package() {
depends="boost"
short_desc+=" - libboost_atomic"
pkg_install() {
@@ -162,7 +156,7 @@ libboost_atomic1.72_package() {
}
}
-libboost_chrono1.72_package() {
+libboost_chrono1.80_package() {
depends="boost"
short_desc+=" - libboost_chrono"
pkg_install() {
@@ -170,7 +164,7 @@ libboost_chrono1.72_package() {
}
}
-libboost_container1.72_package() {
+libboost_container1.80_package() {
depends="boost"
short_desc+=" - libboost_container"
pkg_install() {
@@ -178,7 +172,7 @@ libboost_container1.72_package() {
}
}
-libboost_context1.72_package() {
+libboost_context1.80_package() {
depends="boost"
short_desc+=" - libboost_context"
pkg_install() {
@@ -186,7 +180,7 @@ libboost_context1.72_package() {
}
}
-libboost_contract1.72_package() {
+libboost_contract1.80_package() {
depends="boost"
short_desc+=" - libboost_contract"
pkg_install() {
@@ -194,7 +188,7 @@ libboost_contract1.72_package() {
}
}
-libboost_coroutine1.72_package() {
+libboost_coroutine1.80_package() {
depends="boost"
short_desc+=" - libboost_coroutine"
pkg_install() {
@@ -202,7 +196,7 @@ libboost_coroutine1.72_package() {
}
}
-libboost_date_time1.72_package() {
+libboost_date_time1.80_package() {
depends="boost"
short_desc+=" - libboost_date_time"
pkg_install() {
@@ -210,7 +204,7 @@ libboost_date_time1.72_package() {
}
}
-libboost_fiber1.72_package() {
+libboost_fiber1.80_package() {
depends="boost"
short_desc+=" - libboost_fiber"
pkg_install() {
@@ -218,7 +212,7 @@ libboost_fiber1.72_package() {
}
}
-libboost_filesystem1.72_package() {
+libboost_filesystem1.80_package() {
depends="boost"
short_desc+=" - libboost_filesystem"
pkg_install() {
@@ -226,7 +220,7 @@ libboost_filesystem1.72_package() {
}
}
-libboost_graph1.72_package() {
+libboost_graph1.80_package() {
depends="boost"
short_desc+=" - libboost_graph"
pkg_install() {
@@ -234,7 +228,7 @@ libboost_graph1.72_package() {
}
}
-libboost_iostreams1.72_package() {
+libboost_iostreams1.80_package() {
depends="boost"
short_desc+=" - libboost_iostreams"
pkg_install() {
@@ -242,7 +236,7 @@ libboost_iostreams1.72_package() {
}
}
-libboost_locale1.72_package() {
+libboost_locale1.80_package() {
depends="boost"
short_desc+=" - libboost_locale"
pkg_install() {
@@ -250,7 +244,7 @@ libboost_locale1.72_package() {
}
}
-libboost_log1.72_package() {
+libboost_log1.80_package() {
depends="boost"
short_desc+=" - libboost_log"
pkg_install() {
@@ -258,7 +252,7 @@ libboost_log1.72_package() {
}
}
-libboost_log_setup1.72_package() {
+libboost_log_setup1.80_package() {
depends="boost"
short_desc+=" - libboost_log_setup"
pkg_install() {
@@ -266,7 +260,7 @@ libboost_log_setup1.72_package() {
}
}
-libboost_math_c991.72_package() {
+libboost_math_c991.80_package() {
depends="boost"
short_desc+=" - libboost_math_c99"
pkg_install() {
@@ -274,7 +268,7 @@ libboost_math_c991.72_package() {
}
}
-libboost_math_c99f1.72_package() {
+libboost_math_c99f1.80_package() {
depends="boost"
short_desc+=" - libboost_math_c99f"
pkg_install() {
@@ -282,7 +276,7 @@ libboost_math_c99f1.72_package() {
}
}
-libboost_math_c99l1.72_package() {
+libboost_math_c99l1.80_package() {
depends="boost"
short_desc+=" - libboost_math_c99l"
pkg_install() {
@@ -290,7 +284,15 @@ libboost_math_c99l1.72_package() {
}
}
-libboost_math_tr11.72_package() {
+libboost_json1.80_package() {
+ depends="boost"
+ short_desc+=" - libboost_json"
+ pkg_install() {
+ vmove usr/lib/libboost_json.so.*
+ }
+}
+
+libboost_math_tr11.80_package() {
depends="boost"
short_desc+=" - libboost_math_tr1"
pkg_install() {
@@ -298,7 +300,7 @@ libboost_math_tr11.72_package() {
}
}
-libboost_math_tr1f1.72_package() {
+libboost_math_tr1f1.80_package() {
depends="boost"
short_desc+=" - libboost_math_tr1f"
pkg_install() {
@@ -306,7 +308,7 @@ libboost_math_tr1f1.72_package() {
}
}
-libboost_math_tr1l1.72_package() {
+libboost_math_tr1l1.80_package() {
depends="boost"
short_desc+=" - libboost_math_tr1l"
pkg_install() {
@@ -314,7 +316,15 @@ libboost_math_tr1l1.72_package() {
}
}
-libboost_prg_exec_monitor1.72_package() {
+libboost_nowide1.80_package() {
+ depends="boost"
+ short_desc+=" - libboost_nowide"
+ pkg_install() {
+ vmove usr/lib/libboost_nowide.so.*
+ }
+}
+
+libboost_prg_exec_monitor1.80_package() {
depends="boost"
short_desc+=" - libboost_prg_exec_monitor"
pkg_install() {
@@ -322,7 +332,7 @@ libboost_prg_exec_monitor1.72_package() {
}
}
-libboost_program_options1.72_package() {
+libboost_program_options1.80_package() {
depends="boost"
short_desc+=" - libboost_program_options"
pkg_install() {
@@ -330,7 +340,7 @@ libboost_program_options1.72_package() {
}
}
-libboost_random1.72_package() {
+libboost_random1.80_package() {
depends="boost"
short_desc+=" - libboost_random"
pkg_install() {
@@ -338,7 +348,7 @@ libboost_random1.72_package() {
}
}
-libboost_regex1.72_package() {
+libboost_regex1.80_package() {
depends="boost"
short_desc+=" - libboost_regex"
pkg_install() {
@@ -346,7 +356,7 @@ libboost_regex1.72_package() {
}
}
-libboost_serialization1.72_package() {
+libboost_serialization1.80_package() {
depends="boost"
short_desc+=" - libboost_serialization"
pkg_install() {
@@ -354,7 +364,7 @@ libboost_serialization1.72_package() {
}
}
-libboost_stacktrace_addr2line1.72_package() {
+libboost_stacktrace_addr2line1.80_package() {
depends="boost"
short_desc+=" - libboost_stacktrace_addr2line"
pkg_install() {
@@ -362,7 +372,7 @@ libboost_stacktrace_addr2line1.72_package() {
}
}
-libboost_stacktrace_basic1.72_package() {
+libboost_stacktrace_basic1.80_package() {
depends="boost"
short_desc+=" - libboost_stacktrace_basic"
pkg_install() {
@@ -370,7 +380,7 @@ libboost_stacktrace_basic1.72_package() {
}
}
-libboost_stacktrace_noop1.72_package() {
+libboost_stacktrace_noop1.80_package() {
depends="boost"
short_desc+=" - libboost_stacktrace_noop"
pkg_install() {
@@ -378,7 +388,7 @@ libboost_stacktrace_noop1.72_package() {
}
}
-libboost_system1.72_package() {
+libboost_system1.80_package() {
depends="boost"
short_desc+=" - libboost_system"
pkg_install() {
@@ -386,7 +396,7 @@ libboost_system1.72_package() {
}
}
-libboost_thread1.72_package() {
+libboost_thread1.80_package() {
depends="boost"
short_desc+=" - libboost_thread"
pkg_install() {
@@ -394,7 +404,7 @@ libboost_thread1.72_package() {
}
}
-libboost_timer1.72_package() {
+libboost_timer1.80_package() {
depends="boost"
short_desc+=" - libboost_timer"
pkg_install() {
@@ -402,7 +412,7 @@ libboost_timer1.72_package() {
}
}
-libboost_type_erasure1.72_package() {
+libboost_type_erasure1.80_package() {
depends="boost"
short_desc+=" - libboost_type_erasure"
pkg_install() {
@@ -410,7 +420,7 @@ libboost_type_erasure1.72_package() {
}
}
-libboost_unit_test_framework1.72_package() {
+libboost_unit_test_framework1.80_package() {
depends="boost"
short_desc+=" - libboost_unit_test_framework"
pkg_install() {
@@ -418,7 +428,7 @@ libboost_unit_test_framework1.72_package() {
}
}
-libboost_wave1.72_package() {
+libboost_wave1.80_package() {
depends="boost"
short_desc+=" - libboost_wave"
pkg_install() {
@@ -426,7 +436,7 @@ libboost_wave1.72_package() {
}
}
-libboost_wserialization1.72_package() {
+libboost_wserialization1.80_package() {
depends="boost"
short_desc+=" - libboost_wserialization"
pkg_install() {
diff --git a/srcpkgs/boost-python3-1.72 b/srcpkgs/libboost_atomic1.80
similarity index 100%
rename from srcpkgs/boost-python3-1.72
rename to srcpkgs/libboost_atomic1.80
diff --git a/srcpkgs/libboost_atomic1.72 b/srcpkgs/libboost_chrono1.80
similarity index 100%
rename from srcpkgs/libboost_atomic1.72
rename to srcpkgs/libboost_chrono1.80
diff --git a/srcpkgs/libboost_chrono1.72 b/srcpkgs/libboost_container1.80
similarity index 100%
rename from srcpkgs/libboost_chrono1.72
rename to srcpkgs/libboost_container1.80
diff --git a/srcpkgs/libboost_container1.72 b/srcpkgs/libboost_context1.80
similarity index 100%
rename from srcpkgs/libboost_container1.72
rename to srcpkgs/libboost_context1.80
diff --git a/srcpkgs/libboost_context1.72 b/srcpkgs/libboost_contract1.80
similarity index 100%
rename from srcpkgs/libboost_context1.72
rename to srcpkgs/libboost_contract1.80
diff --git a/srcpkgs/libboost_contract1.72 b/srcpkgs/libboost_coroutine1.80
similarity index 100%
rename from srcpkgs/libboost_contract1.72
rename to srcpkgs/libboost_coroutine1.80
diff --git a/srcpkgs/libboost_coroutine1.72 b/srcpkgs/libboost_date_time1.80
similarity index 100%
rename from srcpkgs/libboost_coroutine1.72
rename to srcpkgs/libboost_date_time1.80
diff --git a/srcpkgs/libboost_date_time1.72 b/srcpkgs/libboost_fiber1.80
similarity index 100%
rename from srcpkgs/libboost_date_time1.72
rename to srcpkgs/libboost_fiber1.80
diff --git a/srcpkgs/libboost_fiber1.72 b/srcpkgs/libboost_filesystem1.80
similarity index 100%
rename from srcpkgs/libboost_fiber1.72
rename to srcpkgs/libboost_filesystem1.80
diff --git a/srcpkgs/libboost_filesystem1.72 b/srcpkgs/libboost_graph1.80
similarity index 100%
rename from srcpkgs/libboost_filesystem1.72
rename to srcpkgs/libboost_graph1.80
diff --git a/srcpkgs/libboost_graph1.72 b/srcpkgs/libboost_iostreams1.80
similarity index 100%
rename from srcpkgs/libboost_graph1.72
rename to srcpkgs/libboost_iostreams1.80
diff --git a/srcpkgs/libboost_iostreams1.72 b/srcpkgs/libboost_json1.80
similarity index 100%
rename from srcpkgs/libboost_iostreams1.72
rename to srcpkgs/libboost_json1.80
diff --git a/srcpkgs/libboost_locale1.72 b/srcpkgs/libboost_locale1.80
similarity index 100%
rename from srcpkgs/libboost_locale1.72
rename to srcpkgs/libboost_locale1.80
diff --git a/srcpkgs/libboost_log1.72 b/srcpkgs/libboost_log1.80
similarity index 100%
rename from srcpkgs/libboost_log1.72
rename to srcpkgs/libboost_log1.80
diff --git a/srcpkgs/libboost_log_setup1.72 b/srcpkgs/libboost_log_setup1.80
similarity index 100%
rename from srcpkgs/libboost_log_setup1.72
rename to srcpkgs/libboost_log_setup1.80
diff --git a/srcpkgs/libboost_math_c991.72 b/srcpkgs/libboost_math_c991.80
similarity index 100%
rename from srcpkgs/libboost_math_c991.72
rename to srcpkgs/libboost_math_c991.80
diff --git a/srcpkgs/libboost_math_c99f1.72 b/srcpkgs/libboost_math_c99f1.80
similarity index 100%
rename from srcpkgs/libboost_math_c99f1.72
rename to srcpkgs/libboost_math_c99f1.80
diff --git a/srcpkgs/libboost_math_c99l1.72 b/srcpkgs/libboost_math_c99l1.80
similarity index 100%
rename from srcpkgs/libboost_math_c99l1.72
rename to srcpkgs/libboost_math_c99l1.80
diff --git a/srcpkgs/libboost_math_tr11.72 b/srcpkgs/libboost_math_tr11.80
similarity index 100%
rename from srcpkgs/libboost_math_tr11.72
rename to srcpkgs/libboost_math_tr11.80
diff --git a/srcpkgs/libboost_math_tr1f1.72 b/srcpkgs/libboost_math_tr1f1.80
similarity index 100%
rename from srcpkgs/libboost_math_tr1f1.72
rename to srcpkgs/libboost_math_tr1f1.80
diff --git a/srcpkgs/libboost_math_tr1l1.72 b/srcpkgs/libboost_math_tr1l1.80
similarity index 100%
rename from srcpkgs/libboost_math_tr1l1.72
rename to srcpkgs/libboost_math_tr1l1.80
diff --git a/srcpkgs/libboost_prg_exec_monitor1.72 b/srcpkgs/libboost_nowide1.80
similarity index 100%
rename from srcpkgs/libboost_prg_exec_monitor1.72
rename to srcpkgs/libboost_nowide1.80
diff --git a/srcpkgs/libboost_program_options1.72 b/srcpkgs/libboost_prg_exec_monitor1.80
similarity index 100%
rename from srcpkgs/libboost_program_options1.72
rename to srcpkgs/libboost_prg_exec_monitor1.80
diff --git a/srcpkgs/libboost_random1.72 b/srcpkgs/libboost_program_options1.80
similarity index 100%
rename from srcpkgs/libboost_random1.72
rename to srcpkgs/libboost_program_options1.80
diff --git a/srcpkgs/libboost_regex1.72 b/srcpkgs/libboost_random1.80
similarity index 100%
rename from srcpkgs/libboost_regex1.72
rename to srcpkgs/libboost_random1.80
diff --git a/srcpkgs/libboost_serialization1.72 b/srcpkgs/libboost_regex1.80
similarity index 100%
rename from srcpkgs/libboost_serialization1.72
rename to srcpkgs/libboost_regex1.80
diff --git a/srcpkgs/libboost_stacktrace_addr2line1.72 b/srcpkgs/libboost_serialization1.80
similarity index 100%
rename from srcpkgs/libboost_stacktrace_addr2line1.72
rename to srcpkgs/libboost_serialization1.80
diff --git a/srcpkgs/libboost_stacktrace_basic1.72 b/srcpkgs/libboost_stacktrace_addr2line1.80
similarity index 100%
rename from srcpkgs/libboost_stacktrace_basic1.72
rename to srcpkgs/libboost_stacktrace_addr2line1.80
diff --git a/srcpkgs/libboost_stacktrace_noop1.72 b/srcpkgs/libboost_stacktrace_basic1.80
similarity index 100%
rename from srcpkgs/libboost_stacktrace_noop1.72
rename to srcpkgs/libboost_stacktrace_basic1.80
diff --git a/srcpkgs/libboost_system1.72 b/srcpkgs/libboost_stacktrace_noop1.80
similarity index 100%
rename from srcpkgs/libboost_system1.72
rename to srcpkgs/libboost_stacktrace_noop1.80
diff --git a/srcpkgs/libboost_thread1.72 b/srcpkgs/libboost_system1.80
similarity index 100%
rename from srcpkgs/libboost_thread1.72
rename to srcpkgs/libboost_system1.80
diff --git a/srcpkgs/libboost_timer1.72 b/srcpkgs/libboost_thread1.80
similarity index 100%
rename from srcpkgs/libboost_timer1.72
rename to srcpkgs/libboost_thread1.80
diff --git a/srcpkgs/libboost_type_erasure1.72 b/srcpkgs/libboost_timer1.80
similarity index 100%
rename from srcpkgs/libboost_type_erasure1.72
rename to srcpkgs/libboost_timer1.80
diff --git a/srcpkgs/libboost_unit_test_framework1.72 b/srcpkgs/libboost_type_erasure1.80
similarity index 100%
rename from srcpkgs/libboost_unit_test_framework1.72
rename to srcpkgs/libboost_type_erasure1.80
diff --git a/srcpkgs/libboost_wave1.72 b/srcpkgs/libboost_unit_test_framework1.80
similarity index 100%
rename from srcpkgs/libboost_wave1.72
rename to srcpkgs/libboost_unit_test_framework1.80
diff --git a/srcpkgs/libboost_wserialization1.72 b/srcpkgs/libboost_wave1.80
similarity index 100%
rename from srcpkgs/libboost_wserialization1.72
rename to srcpkgs/libboost_wave1.80
diff --git a/srcpkgs/libboost_wserialization1.80 b/srcpkgs/libboost_wserialization1.80
new file mode 120000
index 000000000000..baef819c48f6
--- /dev/null
+++ b/srcpkgs/libboost_wserialization1.80
@@ -0,0 +1 @@
+boost
\ No newline at end of file
From aac5b0c320076e9b5fbc5a3aaa59019ffb7f6f4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 16:51:50 +0700
Subject: [PATCH 002/107] TSC: rebuild for boost-1.80
---
srcpkgs/TSC/patches/boost-1.80.patch | 11 +++++++++++
srcpkgs/TSC/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/TSC/patches/boost-1.80.patch
diff --git a/srcpkgs/TSC/patches/boost-1.80.patch b/srcpkgs/TSC/patches/boost-1.80.patch
new file mode 100644
index 000000000000..19f9ee57bad5
--- /dev/null
+++ b/srcpkgs/TSC/patches/boost-1.80.patch
@@ -0,0 +1,11 @@
+--- a/tsc/scrdg/scrdg.cpp
++++ b/tsc/scrdg/scrdg.cpp
+@@ -15,6 +15,8 @@
+ */
+
+ #include "scrdg.hpp"
++#include <algorithm>
++#include <fstream>
+ #include <iostream>
+ #include <sstream>
+ #include <cstdio>
diff --git a/srcpkgs/TSC/template b/srcpkgs/TSC/template
index 71534315cf7c..469f6d859bc7 100644
--- a/srcpkgs/TSC/template
+++ b/srcpkgs/TSC/template
@@ -1,7 +1,7 @@
# Template file for 'TSC'
pkgname=TSC
version=2.1.0
-revision=2
+revision=3
build_wrksrc=tsc
build_style=cmake
build_helper="qemu"
From f9bc12dd232e66d9f8ddcd00ea62e28eae430313 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:27 +0700
Subject: [PATCH 003/107] 0ad: rebuild for boost-1.80
---
srcpkgs/0ad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 552d2728a7a0..b9f0751c4836 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
# Template file for '0ad'
pkgname=0ad
version=0.0.25b
-revision=3
+revision=4
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
wrksrc="${pkgname}-${version}-alpha"
hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang"
From 307ee123ed00c0f62aa3306bdf1033e4b27f1e30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:27 +0700
Subject: [PATCH 004/107] Aegisub: rebuild for boost-1.80
---
srcpkgs/Aegisub/patches/link-icu18n.patch | 15 +++++++++++++++
srcpkgs/Aegisub/template | 2 +-
2 files changed, 16 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/Aegisub/patches/link-icu18n.patch
diff --git a/srcpkgs/Aegisub/patches/link-icu18n.patch b/srcpkgs/Aegisub/patches/link-icu18n.patch
new file mode 100644
index 000000000000..e5c037ca1f68
--- /dev/null
+++ b/srcpkgs/Aegisub/patches/link-icu18n.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -347,9 +347,9 @@ target_link_libraries(Aegisub PRIVATE "O
+ find_package(Iconv REQUIRED)
+ target_link_libraries(libaegisub PRIVATE "Iconv::Iconv")
+
+-find_package(ICU REQUIRED uc)
+-target_link_libraries(libaegisub PRIVATE "ICU::uc")
+-target_link_libraries(Aegisub PRIVATE "ICU::uc")
++find_package(ICU REQUIRED uc i18n)
++target_link_libraries(libaegisub PRIVATE "ICU::uc" ICU::i18n)
++target_link_libraries(Aegisub PRIVATE "ICU::uc" ICU::i18n)
+
+ find_package(wxWidgets REQUIRED adv base core gl stc xml)
+ include(${wxWidgets_USE_FILE})
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index ff34249aaee4..a68e1ab43089 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
# Template file for 'Aegisub'
pkgname=Aegisub
version=3.3.2
-revision=4
+revision=5
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
cmake_builddir="BUILD"
From 2153123eb7caf8e181bbfedd0de4a6707bf1133b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:27 +0700
Subject: [PATCH 005/107] Field3D: rebuild for boost-1.80
---
srcpkgs/Field3D/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 62f0589e9e0b..9a5af0034d14 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,7 +1,7 @@
# Template file for 'Field3D'
pkgname=Field3D
version=1.7.3
-revision=2
+revision=3
build_style=cmake
makedepends="boost-devel hdf5-devel ilmbase-devel"
short_desc="Library for storing voxel data on disk and in memory"
From aad0918e20e9c119e9436867c7144af472a9785a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:28 +0700
Subject: [PATCH 006/107] LGOGDownloader: rebuild for boost-1.80
---
srcpkgs/LGOGDownloader/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6e7e5c685f83..0778374ad224 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,7 +1,7 @@
# Template file for 'LGOGDownloader'
pkgname=LGOGDownloader
version=3.9
-revision=1
+revision=2
wrksrc="lgogdownloader-${version}"
build_style=cmake
hostmakedepends="pkg-config"
From dbbee38ed589982cc77139c7cb9c0254b2df8ebb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:28 +0700
Subject: [PATCH 007/107] Lucene++: rebuild for boost-1.80
---
srcpkgs/Lucene++/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Lucene++/template b/srcpkgs/Lucene++/template
index 3873189f2dfc..34b6e05393fe 100644
--- a/srcpkgs/Lucene++/template
+++ b/srcpkgs/Lucene++/template
@@ -1,7 +1,7 @@
# Template file for 'Lucene++'
pkgname=Lucene++
version=3.0.7
-revision=11
+revision=12
wrksrc=LucenePlusPlus-rel_$version
build_style=cmake
configure_args="-Wno-dev"
From 94522d0cfa73e0fdef24dfaf6eb1cef069249eba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:28 +0700
Subject: [PATCH 008/107] PrusaSlicer: rebuild for boost-1.80
---
srcpkgs/PrusaSlicer/patches/fstream.patch | 20 ++++++++++++++++++++
srcpkgs/PrusaSlicer/template | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/PrusaSlicer/patches/fstream.patch
diff --git a/srcpkgs/PrusaSlicer/patches/fstream.patch b/srcpkgs/PrusaSlicer/patches/fstream.patch
new file mode 100644
index 000000000000..a766c747f704
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/fstream.patch
@@ -0,0 +1,20 @@
+--- a/src/hints/HintsToPot.cpp
++++ b/src/hints/HintsToPot.cpp
+@@ -2,6 +2,7 @@
+ #include <vector>
+ #include <string>
+ #include <boost/filesystem.hpp>
++#include <boost/filesystem/fstream.hpp>
+ #include <boost/dll.hpp>
+ #include <boost/property_tree/ini_parser.hpp>
+ #include <boost/nowide/fstream.hpp>
+--- a/tests/fff_print/test_data.cpp
++++ b/tests/fff_print/test_data.cpp
+@@ -8,6 +8,7 @@
+ #include "libslic3r/Format/STL.hpp"
+
+ #include <cstdlib>
++#include <fstream>
+ #include <string>
+
+ #include <boost/nowide/cstdio.hpp>
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 931ac73e5c94..29f1f641a488 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
version=2.4.2
-revision=1
+revision=2
wrksrc="PrusaSlicer-version_${version}"
build_style=cmake
build_helper="qemu"
From e88806483836aa572cdfa7d5ebba255b55ef250f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:28 +0700
Subject: [PATCH 009/107] astroid: rebuild for boost-1.80
---
srcpkgs/astroid/template | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/astroid/template b/srcpkgs/astroid/template
index 8ee0e729e134..91e3ca400acd 100644
--- a/srcpkgs/astroid/template
+++ b/srcpkgs/astroid/template
@@ -1,8 +1,9 @@
# Template file for 'astroid'
pkgname=astroid
version=0.16
-revision=5
+revision=6
build_style=cmake
+build_helper=gir
hostmakedepends="pkg-config scdoc protobuf gobject-introspection"
makedepends="libnotmuch-devel gtkmm-devel webkit2gtk-devel libsass-devel
gmime3-devel boost-devel protobuf-devel vte3-devel gobject-introspection
@@ -15,10 +16,6 @@ homepage="http://astroidmail.github.io/"
distfiles="https://github.com/astroidmail/astroid/archive/v${version}.tar.gz"
checksum=32ecb8c2fafe67f70c7d5f2bc60bda1796d98a56a75f7868c7c1ca50cd7baf5e
-if [ -n "$CROSS_BUILD" ]; then
- hostmakedepends+=" qemu-user-static prelink-cross"
-fi
-
do_check() {
cd build
xvfb-run ctest
From 2ba7dd3ae22250df49762551027fac115dc6d205 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:28 +0700
Subject: [PATCH 010/107] bitcoin: rebuild for boost-1.80
---
srcpkgs/bitcoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index ccc9c4cc5f10..9ae457ecb9c5 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=22.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
From e391c1b51dffc38da0271dd1e2dbb3398cb5d616 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:29 +0700
Subject: [PATCH 011/107] blender: rebuild for boost-1.80
---
srcpkgs/blender/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 91799f04fba5..28befed1faf8 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
version=3.0.0
-revision=4
+revision=5
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
From 96fa058277489e7841c4c3767a4b7b97d0d6c118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:29 +0700
Subject: [PATCH 012/107] cclive: rebuild for boost-1.80
---
srcpkgs/cclive/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cclive/template b/srcpkgs/cclive/template
index c43dbb94209c..936be99b866c 100644
--- a/srcpkgs/cclive/template
+++ b/srcpkgs/cclive/template
@@ -1,7 +1,7 @@
# Template file for 'cclive'
pkgname=cclive
version=0.9.3
-revision=5
+revision=6
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="boost-devel pcre-devel libcurl-devel libquvi-devel glibmm-devel"
From 666745c9b9beff31a2305561182257b12d1b402b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:29 +0700
Subject: [PATCH 013/107] cgal: rebuild for boost-1.80
---
srcpkgs/cgal/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cgal/template b/srcpkgs/cgal/template
index 7e28c2b28dfd..d448e8dd3c63 100644
--- a/srcpkgs/cgal/template
+++ b/srcpkgs/cgal/template
@@ -1,7 +1,7 @@
# Template file for 'cgal'
pkgname=cgal
version=4.14
-revision=3
+revision=4
wrksrc="CGAL-${version}"
build_style=cmake
build_helper="qemu"
From cb6a9e7c75676563c13e16bed26c6e4adeff17ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:29 +0700
Subject: [PATCH 014/107] codeblocks: rebuild for boost-1.80
---
.../patches/cross-autorevision.patch | 51 +++++++++++++++++++
srcpkgs/codeblocks/template | 19 +------
2 files changed, 53 insertions(+), 17 deletions(-)
create mode 100644 srcpkgs/codeblocks/patches/cross-autorevision.patch
diff --git a/srcpkgs/codeblocks/patches/cross-autorevision.patch b/srcpkgs/codeblocks/patches/cross-autorevision.patch
new file mode 100644
index 000000000000..7d3ef3acfd29
--- /dev/null
+++ b/srcpkgs/codeblocks/patches/cross-autorevision.patch
@@ -0,0 +1,51 @@
+--- a/src/build_tools/autorevision/Makefile.am
++++ b/src/build_tools/autorevision/Makefile.am
+@@ -1,3 +1,10 @@
++CC = cc
++CXX = g++
++LD = g++
++CFLAGS = -O2 -pipe
++CXXFLAGS = -O2 -pipe
++LDFLAGS = -s
++
+ noinst_PROGRAMS = auto_revision
+ auto_revision_SOURCES = autorevision.cpp
+
+--- a/src/build_tools/autorevision/Makefile.in
++++ b/src/build_tools/autorevision/Makefile.in
+@@ -240,17 +240,17 @@ CB_SQUIRREL_CFLAGS = @CB_SQUIRREL_CFLAGS
+ CB_SQUIRREL_LIBS = @CB_SQUIRREL_LIBS@
+ CB_TINYXML_CFLAGS = @CB_TINYXML_CFLAGS@
+ CB_TINYXML_LIBS = @CB_TINYXML_LIBS@
+-CC = @CC@
++CC = cc
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
++CFLAGS = -O2 -pipe
+ CODEBLOCKS_PLATFORM = @CODEBLOCKS_PLATFORM@
+ CODEBLOCKS_VERSION_INFO = @CODEBLOCKS_VERSION_INFO@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+-CXX = @CXX@
+-CXXCPP = @CXXCPP@
++CPP = cpp
++CPPFLAGS :=
++CXX = g++
++CXXCPP = g++
+ CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
++CXXFLAGS = -O2 -pipe
+ CYGPATH_W = @CYGPATH_W@
+ DATE = @DATE@
+ DEFS = @DEFS@
+@@ -288,8 +288,8 @@ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+-LD = @LD@
+-LDFLAGS = @LDFLAGS@
++LD = g++
++LDFLAGS = -s
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
diff --git a/srcpkgs/codeblocks/template b/srcpkgs/codeblocks/template
index 33b9b9a77853..26487b40f796 100644
--- a/srcpkgs/codeblocks/template
+++ b/srcpkgs/codeblocks/template
@@ -1,11 +1,11 @@
# Template file for 'codeblocks'
pkgname=codeblocks
version=20.03
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-wx-config=wx-config-gtk3 --with-contrib-plugins
--with-boost=${XBPS_CROSS_BASE}/usr --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake libtool pkg-config zip"
+hostmakedepends="libtool pkg-config zip"
makedepends="gtk+3-devel wxWidgets-gtk3-devel tinyxml-devel hunspell-devel
gamin-devel boost-devel boost-build"
short_desc="Free C, C++ and Fortran IDE"
@@ -20,21 +20,6 @@ if [ "$CROSS_BUILD" ]; then
configure_args+=" ac_cv_exeext=no --with-gnu-ld"
fi
-pre_configure() {
- ./bootstrap
- if [ "$CROSS_BUILD" ]; then
- # Patch auto_revision's Makefile.am to use the host compiler and flags
- cd src/build_tools/autorevision
- sed -i Makefile.am \
- -e "/noinst_PROGRAMS = auto_revision/a CC = gcc" \
- -e "/noinst_PROGRAMS = auto_revision/a CXX = g++" \
- -e "/noinst_PROGRAMS = auto_revision/a LD = g++" \
- -e "/noinst_PROGRAMS = auto_revision/a CFLAGS = -O2 -pipe" \
- -e "/noinst_PROGRAMS = auto_revision/a CXXFLAGS = -O2 -pipe" \
- -e "/noinst_PROGRAMS = auto_revision/a LDFLAGS = -s"
- fi
-}
-
post_install() {
vinstall debian/codeblocks.sharedmime 644 /usr/share/mime/packages codeblocks.xml
vinstall src/mime/codeblocks.desktop 644 /usr/share/applications
From 71198a0dbdac6216b30a35521a3470e9643fa74e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:29 +0700
Subject: [PATCH 015/107] colobot: rebuild for boost-1.80
---
srcpkgs/colobot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/colobot/template b/srcpkgs/colobot/template
index 1b415dd2cfad..a7613cad90b5 100644
--- a/srcpkgs/colobot/template
+++ b/srcpkgs/colobot/template
@@ -2,7 +2,7 @@
pkgname=colobot
# needs to be kept in sync with colobot-data (provides game assets)
version=0.2.0
-revision=1
+revision=2
wrksrc="colobot-colobot-gold-${version}-alpha"
build_style=cmake
configure_args="-DCOLOBOT_INSTALL_BIN_DIR=/usr/bin -DOpenGL_GL_PREFERENCE=GLVND"
From a486fbad7bdb49c3f603c9ea258a22623e924135 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Mon, 29 Aug 2022 10:56:35 +1000
Subject: [PATCH 016/107] cryfs: update to 0.11.2.
---
.../cryfs/patches/allow-build-type-none.patch | 22 ---
srcpkgs/cryfs/patches/de-vendor.patch | 134 +++++++-----------
srcpkgs/cryfs/patches/fix-test.patch | 22 ---
srcpkgs/cryfs/patches/fmt-9-fix.patch | 54 +++++++
.../rename-simple-to-basic-filesink.patch | 21 ---
srcpkgs/cryfs/patches/spdlog-include.patch | 33 -----
srcpkgs/cryfs/template | 13 +-
7 files changed, 109 insertions(+), 190 deletions(-)
delete mode 100644 srcpkgs/cryfs/patches/fix-test.patch
create mode 100644 srcpkgs/cryfs/patches/fmt-9-fix.patch
delete mode 100644 srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch
delete mode 100644 srcpkgs/cryfs/patches/spdlog-include.patch
diff --git a/srcpkgs/cryfs/patches/allow-build-type-none.patch b/srcpkgs/cryfs/patches/allow-build-type-none.patch
index e591974c05f4..ffcf0ee53320 100644
--- a/srcpkgs/cryfs/patches/allow-build-type-none.patch
+++ b/srcpkgs/cryfs/patches/allow-build-type-none.patch
@@ -9,25 +9,3 @@ Index: cryfs-0.10.2/doc/CMakeLists.txt
- CONFIGURATIONS Release
)
ENDIF(WIN32)
-Index: cryfs-0.10.2/src/cryfs-cli/CMakeLists.txt
-===================================================================
---- cryfs-0.10.2.orig/src/cryfs-cli/CMakeLists.txt
-+++ cryfs-0.10.2/src/cryfs-cli/CMakeLists.txt
-@@ -27,6 +27,5 @@ target_enable_style_warnings(${PROJECT_N
- target_activate_cpp14(${PROJECT_NAME}_bin)
-
- install(TARGETS ${PROJECT_NAME}_bin
-- CONFIGURATIONS Debug Release RelWithDebInfo
- DESTINATION ${CMAKE_INSTALL_BINDIR}
- )
-Index: cryfs-0.10.2/src/cryfs-unmount/CMakeLists.txt
-===================================================================
---- cryfs-0.10.2.orig/src/cryfs-unmount/CMakeLists.txt
-+++ cryfs-0.10.2/src/cryfs-unmount/CMakeLists.txt
-@@ -19,6 +19,5 @@ target_enable_style_warnings(${PROJECT_N
- target_activate_cpp14(${PROJECT_NAME}_bin)
-
- install(TARGETS ${PROJECT_NAME}_bin
-- CONFIGURATIONS Debug Release RelWithDebInfo
- DESTINATION ${CMAKE_INSTALL_BINDIR}
- )
diff --git a/srcpkgs/cryfs/patches/de-vendor.patch b/srcpkgs/cryfs/patches/de-vendor.patch
index 4909cad7b84a..09e51f0aa7fc 100644
--- a/srcpkgs/cryfs/patches/de-vendor.patch
+++ b/srcpkgs/cryfs/patches/de-vendor.patch
@@ -1,32 +1,14 @@
-Index: cryfs-0.10.2/src/blockstore/implementations/compressing/compressors/Gzip.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/blockstore/implementations/compressing/compressors/Gzip.cpp
-+++ cryfs-0.10.2/src/blockstore/implementations/compressing/compressors/Gzip.cpp
-@@ -1,6 +1,6 @@
- #include "cpp-utils/crypto/cryptopp_byte.h"
+--- a/src/blockstore/implementations/compressing/compressors/Gzip.cpp 2022-08-25 22:14:05.481898162 +0400
++++ b/src/blockstore/implementations/compressing/compressors/Gzip.cpp 2022-08-25 22:17:49.606653292 +0400
+@@ -1,5 +1,5 @@
#include "Gzip.h"
-#include <vendor_cryptopp/gzip.h>
+#include <cryptopp/gzip.h>
using cpputils::Data;
-Index: cryfs-0.10.2/src/cpp-utils/crypto/cryptopp_byte.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/cryptopp_byte.h
-+++ cryfs-0.10.2/src/cpp-utils/crypto/cryptopp_byte.h
-@@ -2,7 +2,7 @@
- #ifndef _CPPUTILS_CRYPTO_CRYPTOPP_BYTE_H
- #define _CPPUTILS_CRYPTO_CRYPTOPP_BYTE_H
-
--#include <vendor_cryptopp/cryptlib.h>
-+#include <cryptopp/cryptlib.h>
-
- // If we're running an older CryptoPP version, CryptoPP::byte isn't defined yet.
- // Define it. Refer to "byte" type in the global namespace (placed by CryptoPP).
-Index: cryfs-0.10.2/src/cpp-utils/crypto/hash/Hash.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/hash/Hash.cpp
-+++ cryfs-0.10.2/src/cpp-utils/crypto/hash/Hash.cpp
+--- a/src/cpp-utils/crypto/hash/Hash.cpp 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/hash/Hash.cpp 2022-08-25 22:18:07.131800277 +0400
@@ -1,6 +1,6 @@
#include "Hash.h"
#include <cpp-utils/random/Random.h>
@@ -35,10 +17,8 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/hash/Hash.cpp
using cpputils::Random;
using CryptoPP::SHA512;
-Index: cryfs-0.10.2/src/cpp-utils/crypto/kdf/Scrypt.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/kdf/Scrypt.cpp
-+++ cryfs-0.10.2/src/cpp-utils/crypto/kdf/Scrypt.cpp
+--- a/src/cpp-utils/crypto/kdf/Scrypt.cpp 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/kdf/Scrypt.cpp 2022-08-25 22:18:17.754889373 +0400
@@ -1,5 +1,5 @@
#include "Scrypt.h"
-#include <vendor_cryptopp/scrypt.h>
@@ -46,11 +26,9 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/kdf/Scrypt.cpp
using std::string;
-Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
-+++ cryfs-0.10.2/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
-@@ -7,7 +7,7 @@
+--- a/src/cpp-utils/crypto/symmetric/CFB_Cipher.h 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/symmetric/CFB_Cipher.h 2022-08-25 22:18:28.524979704 +0400
+@@ -6,7 +6,7 @@
#include "../../data/Data.h"
#include "../../random/Random.h"
#include <boost/optional.hpp>
@@ -59,24 +37,9 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
#include "Cipher.h"
#include "EncryptionKey.h"
-Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
-+++ cryfs-0.10.2/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
-@@ -6,7 +6,7 @@
- #include "../../data/FixedSizeData.h"
- #include "../../data/Data.h"
- #include "../../random/Random.h"
--#include <vendor_cryptopp/gcm.h>
-+#include <cryptopp/gcm.h>
- #include "Cipher.h"
- #include "EncryptionKey.h"
-
-Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/ciphers.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/symmetric/ciphers.h
-+++ cryfs-0.10.2/src/cpp-utils/crypto/symmetric/ciphers.h
-@@ -2,11 +2,11 @@
+--- a/src/cpp-utils/crypto/symmetric/ciphers.h 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/symmetric/ciphers.h 2022-08-25 22:18:52.181178110 +0400
+@@ -2,12 +2,12 @@
#ifndef MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_
#define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_
@@ -85,30 +48,39 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/ciphers.h
-#include <vendor_cryptopp/serpent.h>
-#include <vendor_cryptopp/cast.h>
-#include <vendor_cryptopp/mars.h>
+-#include <vendor_cryptopp/chachapoly.h>
+#include <cryptopp/aes.h>
+#include <cryptopp/twofish.h>
+#include <cryptopp/serpent.h>
+#include <cryptopp/cast.h>
+#include <cryptopp/mars.h>
++#include <cryptopp/chachapoly.h>
#include "GCM_Cipher.h"
#include "CFB_Cipher.h"
-Index: cryfs-0.10.2/src/cpp-utils/data/Data.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/data/Data.cpp
-+++ cryfs-0.10.2/src/cpp-utils/data/Data.cpp
+--- a/src/cpp-utils/crypto/symmetric/GCM_Cipher.h 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/symmetric/GCM_Cipher.h 2022-08-25 22:18:38.836066183 +0400
+@@ -3,7 +3,7 @@
+ #define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_GCMCIPHER_H_
+
+ #include "AEAD_Cipher.h"
+-#include <vendor_cryptopp/gcm.h>
++#include <cryptopp/gcm.h>
+
+ namespace cpputils {
+
+--- a/src/cpp-utils/data/Data.cpp 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/data/Data.cpp 2022-08-25 22:19:09.349322106 +0400
@@ -1,6 +1,6 @@
#include "Data.h"
#include <stdexcept>
-#include <vendor_cryptopp/hex.h>
+#include <cryptopp/hex.h>
- #include <cpp-utils/crypto/cryptopp_byte.h>
using std::istream;
-Index: cryfs-0.10.2/src/cpp-utils/data/FixedSizeData.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/data/FixedSizeData.h
-+++ cryfs-0.10.2/src/cpp-utils/data/FixedSizeData.h
+ using std::ofstream;
+--- a/src/cpp-utils/data/FixedSizeData.h 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/data/FixedSizeData.h 2022-08-25 22:19:19.103403916 +0400
@@ -2,7 +2,7 @@
#ifndef MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_
#define MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_
@@ -116,25 +88,21 @@ Index: cryfs-0.10.2/src/cpp-utils/data/FixedSizeData.h
-#include <vendor_cryptopp/hex.h>
+#include <cryptopp/hex.h>
#include <string>
+ #include <array>
#include <cstring>
- #include "../assert/assert.h"
-Index: cryfs-0.10.2/src/cpp-utils/random/OSRandomGenerator.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/random/OSRandomGenerator.h
-+++ cryfs-0.10.2/src/cpp-utils/random/OSRandomGenerator.h
-@@ -4,7 +4,7 @@
+--- a/src/cpp-utils/random/OSRandomGenerator.h 2022-08-25 22:14:05.483898156 +0400
++++ b/src/cpp-utils/random/OSRandomGenerator.h 2022-08-25 22:19:29.602491973 +0400
+@@ -3,7 +3,7 @@
+ #define MESSMER_CPPUTILS_RANDOM_OSRANDOMGENERATOR_H
- #include "cpp-utils/crypto/cryptopp_byte.h"
#include "RandomGenerator.h"
-#include <vendor_cryptopp/osrng.h>
+#include <cryptopp/osrng.h>
namespace cpputils {
class OSRandomGenerator final : public RandomGenerator {
-Index: cryfs-0.10.2/src/cpp-utils/random/RandomGeneratorThread.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/random/RandomGeneratorThread.h
-+++ cryfs-0.10.2/src/cpp-utils/random/RandomGeneratorThread.h
+--- a/src/cpp-utils/random/RandomGeneratorThread.h 2022-08-25 22:14:05.484898153 +0400
++++ b/src/cpp-utils/random/RandomGeneratorThread.h 2022-08-25 22:19:36.713551613 +0400
@@ -4,7 +4,7 @@
#include "../thread/LoopThread.h"
@@ -144,10 +112,9 @@ Index: cryfs-0.10.2/src/cpp-utils/random/RandomGeneratorThread.h
namespace cpputils {
//TODO Test
-Index: cryfs-0.10.2/src/cryfs/localstate/BasedirMetadata.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cryfs/localstate/BasedirMetadata.cpp
-+++ cryfs-0.10.2/src/cryfs/localstate/BasedirMetadata.cpp
+diff -Naurp0 -U3 cryfs-0.11.2/src/cryfs/impl/localstate/BasedirMetadata.cpp cryfs-0.11.2-mine/src/cryfs/impl/localstate/BasedirMetadata.cpp
+--- a/src/cryfs/impl/localstate/BasedirMetadata.cpp 2022-08-25 22:14:05.487898144 +0400
++++ b/src/cryfs/impl/localstate/BasedirMetadata.cpp 2022-08-25 22:19:46.722635560 +0400
@@ -1,7 +1,7 @@
#include "BasedirMetadata.h"
#include <boost/property_tree/ptree.hpp>
@@ -157,11 +124,9 @@ Index: cryfs-0.10.2/src/cryfs/localstate/BasedirMetadata.cpp
#include <boost/filesystem/operations.hpp>
#include "LocalStateDir.h"
#include <cpp-utils/logging/logging.h>
-Index: cryfs-0.10.2/test/cryfs/config/CompatibilityTest.cpp
-===================================================================
---- cryfs-0.10.2.orig/test/cryfs/config/CompatibilityTest.cpp
-+++ cryfs-0.10.2/test/cryfs/config/CompatibilityTest.cpp
-@@ -3,7 +3,7 @@
+--- a/test/cryfs/impl/config/CompatibilityTest.cpp 2022-08-25 22:14:05.493898126 +0400
++++ b/test/cryfs/impl/config/CompatibilityTest.cpp 2022-08-25 22:19:54.589701542 +0400
+@@ -2,7 +2,7 @@
#include <vector>
#include <boost/filesystem.hpp>
#include <cpp-utils/data/Data.h>
@@ -169,12 +134,9 @@ Index: cryfs-0.10.2/test/cryfs/config/CompatibilityTest.cpp
+#include <cryptopp/hex.h>
#include <cpp-utils/crypto/symmetric/ciphers.h>
#include <cpp-utils/tempfile/TempFile.h>
- #include <cryfs/config/CryConfigFile.h>
-Index: cryfs-0.10.2/vendor/CMakeLists.txt
-===================================================================
---- cryfs-0.10.2.orig/vendor/CMakeLists.txt
-+++ cryfs-0.10.2/vendor/CMakeLists.txt
-@@ -1,3 +1 @@
+ #include <cryfs/impl/config/CryConfigFile.h>
+--- a/vendor/CMakeLists.txt 2022-08-25 22:14:05.497898115 +0400
++++ b/vendor/CMakeLists.txt 2022-08-25 22:20:11.176840657 +0400
+@@ -1,2 +1 @@
add_subdirectory(googletest)
--add_subdirectory(spdlog)
-add_subdirectory(cryptopp)
diff --git a/srcpkgs/cryfs/patches/fix-test.patch b/srcpkgs/cryfs/patches/fix-test.patch
deleted file mode 100644
index d3a5847b1a3c..000000000000
--- a/srcpkgs/cryfs/patches/fix-test.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: cryfs-0.10.2/test/cpp-utils/logging/testutils/LoggingTest.h
-===================================================================
---- cryfs-0.10.2.orig/test/cpp-utils/logging/testutils/LoggingTest.h
-+++ cryfs-0.10.2/test/cpp-utils/logging/testutils/LoggingTest.h
-@@ -11,8 +11,7 @@ class MockLogger final {
- public:
- MockLogger():
- _capturedLogData(),
-- _sink(std::make_shared<spdlog::sinks::ostream_sink<std::mutex>>(_capturedLogData, true)),
-- _logger(spdlog::create("MockLogger", {_sink})) {
-+ _logger(spdlog::create<spdlog::sinks::ostream_sink_mt>("MockLogger", _capturedLogData, true)) {
- }
-
- ~MockLogger() {
-@@ -28,7 +27,6 @@ public:
- }
- private:
- std::ostringstream _capturedLogData;
-- std::shared_ptr<spdlog::sinks::ostream_sink<std::mutex>> _sink;
- std::shared_ptr<spdlog::logger> _logger;
- };
-
diff --git a/srcpkgs/cryfs/patches/fmt-9-fix.patch b/srcpkgs/cryfs/patches/fmt-9-fix.patch
new file mode 100644
index 000000000000..6fe97eaeafa4
--- /dev/null
+++ b/srcpkgs/cryfs/patches/fmt-9-fix.patch
@@ -0,0 +1,54 @@
+From 27515e0116fd7cb034bd4e9763d1f3bfdc855a5f Mon Sep 17 00:00:00 2001
+From: Bernhard Rosenkraenzer <bero@lindev.ch>
+Date: Fri, 22 Jul 2022 14:13:38 +0200
+Subject: [PATCH] Fix build with fmt 9.0 (#433)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* Fix build with fmt 9.0
+
+Co-authored-by: Sebastian Meßmer <smessmer@users.noreply.github.com>
+---
+ ChangeLog.txt | 4 ++++
+ src/fspp/fuse/Fuse.cpp | 8 ++++----
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/src/fspp/fuse/Fuse.cpp b/src/fspp/fuse/Fuse.cpp
+index 4e9dbd7f..4b881815 100644
+--- a/src/fspp/fuse/Fuse.cpp
++++ b/src/fspp/fuse/Fuse.cpp
+@@ -603,21 +603,21 @@ int Fuse::mknod(const bf::path &path, ::mode_t mode, dev_t rdev) {
+ UNUSED(mode);
+ UNUSED(path);
+ ThreadNameForDebugging _threadName("mknod");
+- LOG(WARN, "Called non-implemented mknod({}, {}, _)", path, mode);
++ LOG(WARN, "Called non-implemented mknod({}, {}, _)", path.string(), mode);
+ return ENOSYS;
+ }
+
+ int Fuse::mkdir(const bf::path &path, ::mode_t mode) {
+ ThreadNameForDebugging _threadName("mkdir");
+ #ifdef FSPP_LOG
+- LOG(DEBUG, "mkdir({}, {})", path, mode);
++ LOG(DEBUG, "mkdir({}, {})", path.string(), mode);
+ #endif
+ try {
+ ASSERT(is_valid_fspp_path(path), "has to be an absolute path");
+ // DokanY seems to call mkdir("/"). Ignore that
+ if ("/" == path) {
+ #ifdef FSPP_LOG
+- LOG(DEBUG, "mkdir({}, {}): ignored", path, mode);
++ LOG(DEBUG, "mkdir({}, {}): ignored", path.string(), mode);
+ #endif
+ return 0;
+ }
+@@ -766,7 +766,7 @@ int Fuse::rename(const bf::path &from, const bf::path &to) {
+ //TODO
+ int Fuse::link(const bf::path &from, const bf::path &to) {
+ ThreadNameForDebugging _threadName("link");
+- LOG(WARN, "NOT IMPLEMENTED: link({}, {})", from, to);
++ LOG(WARN, "NOT IMPLEMENTED: link({}, {})", from.string(), to.string());
+ //auto real_from = _impl->RootDir() / from;
+ //auto real_to = _impl->RootDir() / to;
+ //int retstat = ::link(real_from.string().c_str(), real_to.string().c_str());
diff --git a/srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch b/srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch
deleted file mode 100644
index 08513cb4d0ca..000000000000
--- a/srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: cryfs-0.10.2/src/cryfs-cli/Cli.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cryfs-cli/Cli.cpp
-+++ cryfs-0.10.2/src/cryfs-cli/Cli.cpp
-@@ -27,6 +27,7 @@
- #include "Environment.h"
- #include <cryfs/CryfsException.h>
- #include <cpp-utils/thread/debugging.h>
-+#include <spdlog/sinks/basic_file_sink.h>
-
- //TODO Many functions accessing the ProgramOptions object. Factor out into class that stores it as a member.
- //TODO Factor out class handling askPassword
-@@ -310,7 +311,7 @@ namespace cryfs_cli {
- //TODO Test that --logfile parameter works. Should be: file if specified, otherwise stderr if foreground, else syslog.
- if (options.logFile() != none) {
- cpputils::logging::setLogger(
-- spdlog::create<spdlog::sinks::simple_file_sink<std::mutex>>("cryfs", options.logFile()->string()));
-+ spdlog::create<spdlog::sinks::basic_file_sink<std::mutex>>("cryfs", options.logFile()->string()));
- } else if (options.foreground()) {
- cpputils::logging::setLogger(spdlog::stderr_logger_mt("cryfs"));
- } else {
diff --git a/srcpkgs/cryfs/patches/spdlog-include.patch b/srcpkgs/cryfs/patches/spdlog-include.patch
deleted file mode 100644
index 2c1c5a926cf3..000000000000
--- a/srcpkgs/cryfs/patches/spdlog-include.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: cryfs-0.10.2/src/cpp-utils/logging/Logger.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/logging/Logger.h
-+++ cryfs-0.10.2/src/cpp-utils/logging/Logger.h
-@@ -7,6 +7,7 @@
- #endif
-
- #include <spdlog/spdlog.h>
-+#include <spdlog/sinks/stdout_sinks.h>
- #include "../macros.h"
-
- namespace cpputils {
-Index: cryfs-0.10.2/src/cpp-utils/logging/logging.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/logging/logging.h
-+++ cryfs-0.10.2/src/cpp-utils/logging/logging.h
-@@ -5,6 +5,7 @@
- #include "Logger.h"
- #include <stdexcept>
- #include <spdlog/fmt/ostr.h>
-+#include <spdlog/sinks/syslog_sink.h>
-
- #if defined(_MSC_VER)
- #include <spdlog/sinks/msvc_sink.h>
-@@ -75,7 +76,7 @@ namespace cpputils {
- #if defined(_MSC_VER)
- return spdlog::create<spdlog::sinks::msvc_sink_mt>(name);
- #else
-- return spdlog::syslog_logger(name, name, LOG_PID);
-+ return spdlog::syslog_logger_mt(name, name, LOG_PID);
- #endif
- }
- }
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 495c2b318a3b..1affee1d8f03 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,14 +1,15 @@
# Template file for 'cryfs'
pkgname=cryfs
-version=0.10.2
-revision=5
+version=0.11.2
+revision=1
create_wrksrc=yes
build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off
- -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
+configure_args="-DCRYFS_UPDATE_CHECKS=off -DBoost_USE_STATIC_LIBS=OFF
+ -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt
+ -DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
hostmakedepends="pkg-config python3"
makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel
- spdlog"
+ spdlog range-v3 fmt-devel"
depends="fuse"
short_desc="Cryptographic filesystem for the cloud"
maintainer="Andy Weidenbaum <atweiden@tutanota.de>"
@@ -16,7 +17,7 @@ license="LGPL-3.0-only"
homepage="https://www.cryfs.org"
changelog="https://github.com/cryfs/cryfs/raw/master/ChangeLog.txt"
distfiles="https://github.com/cryfs/cryfs/releases/download/${version}/${pkgname}-${version}.tar.gz"
-checksum=004c7fdf537062e197aaa0bcdafd2682904a279802441bb6063cb72c1fba52d2
+checksum=a89ab8fea2d494b496867107ec0a3772fe606ebd71ef12152fcd233f463a2c00
if [ "${XBPS_CHECK_PKGS}" ]; then
configure_args+=" -DBUILD_TESTING=on"
From 48099f43e3bc27b23e5e796c4ee32fd979c7bcb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:30 +0700
Subject: [PATCH 017/107] eclib: rebuild for boost-1.80
---
srcpkgs/eclib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/eclib/template b/srcpkgs/eclib/template
index 3db0bd2119b9..694a39ed4068 100644
--- a/srcpkgs/eclib/template
+++ b/srcpkgs/eclib/template
@@ -1,7 +1,7 @@
# Template file for 'eclib'
pkgname=eclib
version=20210625
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-flint --with-boost"
hostmakedepends="automake autoconf-archive libtool"
From 879c1077016aa924ab76e8806c15f73ecaff6372 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:30 +0700
Subject: [PATCH 018/107] facter: rebuild for boost-1.80
---
srcpkgs/facter/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 93d6bfc6af51..45c921a0b72d 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
# Template file for 'facter'
pkgname=facter
version=3.14.16
-revision=3
+revision=4
build_style=cmake
configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
-DENABLE_CXX_WERROR=OFF -DCMAKE_INSTALL_LIBDIR=/usr/lib"
From 78504129e91cc0d2c83c9590eb47343fc3bcfe52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:30 +0700
Subject: [PATCH 019/107] fcitx5-chinese-addons: rebuild for boost-1.80
---
srcpkgs/fcitx5-chinese-addons/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fcitx5-chinese-addons/template b/srcpkgs/fcitx5-chinese-addons/template
index d207bde9ada9..a3a1948474a7 100644
--- a/srcpkgs/fcitx5-chinese-addons/template
+++ b/srcpkgs/fcitx5-chinese-addons/template
@@ -1,7 +1,7 @@
# Template file for 'fcitx5-chinese-addons'
pkgname=fcitx5-chinese-addons
version=5.0.14
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config gettext doxygen extra-cmake-modules qt5-qmake
qt5-host-tools libime-utils"
From 89239655893d08325f75b3d81d10436198b5888d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:31 +0700
Subject: [PATCH 020/107] fifengine: rebuild for boost-1.80
---
srcpkgs/fifengine/patches/ftbfs.patch | 18 ++++++++++++++++++
srcpkgs/fifengine/template | 2 +-
2 files changed, 19 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/fifengine/patches/ftbfs.patch
diff --git a/srcpkgs/fifengine/patches/ftbfs.patch b/srcpkgs/fifengine/patches/ftbfs.patch
new file mode 100644
index 000000000000..9c205f9fe159
--- /dev/null
+++ b/srcpkgs/fifengine/patches/ftbfs.patch
@@ -0,0 +1,18 @@
+--- a/engine/core/vfs/zip/zipnode.cpp
++++ b/engine/core/vfs/zip/zipnode.cpp
+@@ -29,6 +29,8 @@
+
+ #include "zipnode.h"
+
++#include <algorithm>
++
+ namespace {
+ /** helper function to find a value in a ZipNodeContainer
+ * @param container the ZipNodeContainer to search through
+@@ -266,4 +268,4 @@ std::ostream& operator<<(std::ostream& o
+ }
+
+ return os;
+-}
+\ No newline at end of file
++}
diff --git a/srcpkgs/fifengine/template b/srcpkgs/fifengine/template
index 1987e06f7d03..24d2f8521c8d 100644
--- a/srcpkgs/fifengine/template
+++ b/srcpkgs/fifengine/template
@@ -1,7 +1,7 @@
# Template file for 'fifengine'
pkgname=fifengine
version=0.4.2
-revision=8
+revision=9
build_style=cmake
hostmakedepends="swig python3"
makedepends="SDL2-devel SDL2_image-devel SDL2_ttf-devel boost-devel
From 5699c721cebc11a4b446aa11c57a1b188237fade Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:31 +0700
Subject: [PATCH 021/107] freecad: rebuild for boost-1.80
---
srcpkgs/freecad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index e9c697adbe1a..843d2281f324 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=0.20.1
-revision=1
+revision=2
wrksrc="FreeCAD-${version}"
build_style=cmake
From 705933f6302a973ace345ee88f198c4e31cb3ba6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:31 +0700
Subject: [PATCH 022/107] freeorion: rebuild for boost-1.80
---
srcpkgs/freeorion/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freeorion/template b/srcpkgs/freeorion/template
index 20fd819e49b0..71d41f3e987b 100644
--- a/srcpkgs/freeorion/template
+++ b/srcpkgs/freeorion/template
@@ -1,7 +1,7 @@
# Template file for 'freeorion'
pkgname=freeorion
version=0.4.10.2
-revision=1
+revision=2
_release=${version}_2021-08-01.f663dad
wrksrc=src-tarball
build_style=cmake
From 1845b43fb39318d033f021537951e81e1a0a61bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:31 +0700
Subject: [PATCH 023/107] gnucash: rebuild for boost-1.80
---
srcpkgs/gnucash/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 5d403e47c02b..81627ef4f8a1 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
# Template file for 'gnucash'
pkgname=gnucash
version=4.11
-revision=1
+revision=2
wrksrc="${pkgname}-${version%b}"
build_style=cmake
make_check_target=check
From ee174390785b42c1225f9d835bc02772dd708a18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:31 +0700
Subject: [PATCH 024/107] gnuradio: rebuild for boost-1.80
---
.../gnuradio/patches/boost-1.80-fmt-9.patch | 79 +++++++++++++++++++
srcpkgs/gnuradio/template | 2 +-
2 files changed, 80 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
diff --git a/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch b/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
new file mode 100644
index 000000000000..a0c3f6d4701b
--- /dev/null
+++ b/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
@@ -0,0 +1,79 @@
+Upstream: no
+
+Honestly, I don't care much. I tries to print as much as it makes sense
+--- a/gnuradio-runtime/include/gnuradio/logger.h
++++ b/gnuradio-runtime/include/gnuradio/logger.h
+@@ -37,6 +37,9 @@ using logger_ptr = std::shared_ptr<void>
+ #include <spdlog/fmt/fmt.h>
+ #include <spdlog/fmt/ostr.h>
+ #include <memory>
++#include <string>
++#include <type_traits>
++#include <utility>
+
+ #include <spdlog/spdlog.h>
+
+@@ -285,6 +288,52 @@ struct fmt::formatter<boost::format> : f
+ }
+ };
+
++namespace fmt {
++template <typename T>
++struct formatter<
++ T,
++ typename std::enable_if<
++ std::is_convertible<
++ decltype(std::declval<T>().identifier()),
++ std::string
++ >::value,
++ char
++ >::type > : fmt::formatter<std::string> {
++ template <typename FormatCtx>
++ auto format(const T& value, FormatCtx& ctx)
++ -> decltype(fmt::formatter<std::string>::format(value.identifier(), ctx))
++ {
++ return fmt::formatter<std::string>::format(value.identifier(), ctx);
++ }
++};
++template <typename T, typename Ch>
++struct formatter<std::shared_ptr<T>, Ch> : fmt::formatter<const void *, Ch> {
++ template <typename FormatCtx>
++ auto format(const std::shared_ptr<T>& ptr, FormatCtx& ctx)
++ -> decltype(fmt::formatter<const void *, Ch>::format(fmt::ptr(ptr), ctx))
++ {
++ return fmt::formatter<const void *, Ch>::format(fmt::ptr(ptr), ctx);
++ }
++};
++template <typename T>
++struct formatter<
++ std::shared_ptr<T>,
++ typename std::enable_if<
++ std::is_convertible<
++ decltype(std::declval<T>().identifier()),
++ std::string
++ >::value,
++ char
++ >::type > : fmt::formatter<std::string> {
++ template <typename FormatCtx>
++ auto format(const std::shared_ptr<T>& ptr, FormatCtx& ctx)
++ -> decltype(fmt::formatter<std::string>::format(ptr->identifier(), ctx))
++ {
++ return fmt::formatter<std::string>::format(ptr->identifier(), ctx);
++ }
++};
++}
++
+ #endif
+
+ #endif /* INCLUDED_GR_LOGGER_H */
+--- a/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc
++++ b/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc
+@@ -15,7 +15,7 @@
+ /* BINDTOOL_GEN_AUTOMATIC(0) */
+ /* BINDTOOL_USE_PYGCCXML(0) */
+ /* BINDTOOL_HEADER_FILE(logger.h) */
+-/* BINDTOOL_HEADER_FILE_HASH(a76c325b045da079c83e294cc4abb8c6) */
++/* BINDTOOL_HEADER_FILE_HASH(0e6a6ba08242e117ab4407ef3bf7afdf) */
+ /***********************************************************************************/
+
+ #include <pybind11/complex.h>
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index 43ae4e1cb1ba..973339f92921 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
version=3.10.3.0
-revision=1
+revision=2
build_style=cmake
conf_files="/etc/gnuradio/conf.d/*"
configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax
From 69ea91fd00db7b358ffa562a6c4fe2620cf86fd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:32 +0700
Subject: [PATCH 025/107] gnuradio-osmosdr: rebuild for boost-1.80
---
srcpkgs/gnuradio-osmosdr/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template
index cdb4d27faf68..bf0696c672a9 100644
--- a/srcpkgs/gnuradio-osmosdr/template
+++ b/srcpkgs/gnuradio-osmosdr/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-osmosdr'
pkgname=gnuradio-osmosdr
version=0.2.3git20210128
-revision=1
+revision=2
_githash=a100eb024c0210b95e4738b6efd836d48225bd03
wrksrc="gr-osmosdr-${_githash}"
build_style=cmake
From 17e4f3d9a4d2be167dbd9e06ec1ea8304d96698f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:32 +0700
Subject: [PATCH 026/107] gnuradio-rds: rebuild for boost-1.80
---
srcpkgs/gnuradio-rds/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template
index 35d19fb82b11..e9e865151f7a 100644
--- a/srcpkgs/gnuradio-rds/template
+++ b/srcpkgs/gnuradio-rds/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-rds'
pkgname=gnuradio-rds
version=3.10
-revision=1
+revision=2
wrksrc="gr-rds-${version}"
build_style=cmake
configure_args="-Dpybind11_DIR=/${py3_sitelib}/pybind11/share/cmake/pybind11"
From dec86ebfd1501f89d3684b7316ae22dd9de50670 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:32 +0700
Subject: [PATCH 027/107] gource: rebuild for boost-1.80
---
srcpkgs/gource/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gource/template b/srcpkgs/gource/template
index 8ec3b05ca772..08b2e222f607 100644
--- a/srcpkgs/gource/template
+++ b/srcpkgs/gource/template
@@ -1,7 +1,7 @@
# Template file for 'gource'
pkgname=gource
version=0.51
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-tinyxml --enable-ttf-font-dir=/usr/share/fonts/TTF
--with-boost-libdir=$XBPS_CROSS_BASE/usr/lib/"
From 4affc92d01b781fe7dccdf482fa8d8453e116f73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:32 +0700
Subject: [PATCH 028/107] gpick: rebuild for boost-1.80
---
srcpkgs/gpick/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gpick/template b/srcpkgs/gpick/template
index b30108334144..7b3a4db6d69c 100644
--- a/srcpkgs/gpick/template
+++ b/srcpkgs/gpick/template
@@ -1,7 +1,7 @@
# Template file for 'gpick'
pkgname=gpick
version=0.2.6
-revision=1
+revision=2
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=cmake
hostmakedepends="gettext pkg-config ragel"
From 18b91d40b482d6df4665dc1481cd401570f06b0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:32 +0700
Subject: [PATCH 029/107] grive2: rebuild for boost-1.80
---
srcpkgs/grive2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/grive2/template b/srcpkgs/grive2/template
index 140688ee9aec..e416cdc606b5 100644
--- a/srcpkgs/grive2/template
+++ b/srcpkgs/grive2/template
@@ -1,7 +1,7 @@
# Template file for 'grive2'
pkgname=grive2
version=0.5.1
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config"
makedepends="boost-devel libcurl-devel yajl-devel libgcrypt-devel expat-devel"
From a7df4e125231b0eac6cfb9b8978f5885d6de6c32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:33 +0700
Subject: [PATCH 030/107] guitarix2: rebuild for boost-1.80
---
srcpkgs/guitarix2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/guitarix2/template b/srcpkgs/guitarix2/template
index 880814313a2b..de2edbf770b4 100644
--- a/srcpkgs/guitarix2/template
+++ b/srcpkgs/guitarix2/template
@@ -1,7 +1,7 @@
# Template file for 'guitarix2'
pkgname=guitarix2
version=0.42.1
-revision=1
+revision=2
wrksrc="guitarix-${version}"
build_style=waf3
configure_args="--cxxflags-release=-DNDEBUG --ladspa --new-ladspa --no-faust
From ab3542e43e9b8df2fc4f4657eab57396317a9ae7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:33 +0700
Subject: [PATCH 031/107] heaptrack: rebuild for boost-1.80
---
srcpkgs/heaptrack/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/heaptrack/template b/srcpkgs/heaptrack/template
index ed98a952dfdc..0ccc1e6415a7 100644
--- a/srcpkgs/heaptrack/template
+++ b/srcpkgs/heaptrack/template
@@ -1,7 +1,7 @@
# Template file for 'heaptrack'
pkgname=heaptrack
version=1.4.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DHEAPTRACK_BUILD_GUI=ON"
hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules kcoreaddons
From 4897f645752ebb52a6ea10d091602cfd883d3bc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:33 +0700
Subject: [PATCH 032/107] hugin: rebuild for boost-1.80
---
srcpkgs/hugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 7961c74632a1..87cecac02106 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
# Template file for 'hugin'
pkgname=hugin
version=2021.0.0
-revision=1
+revision=2
wrksrc="${pkgname}-${version}"
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
From daa2f3c6390125d1d5e19e880132428245501a03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:33 +0700
Subject: [PATCH 033/107] i2pd: rebuild for boost-1.80
---
srcpkgs/i2pd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index fe12bb2e19bf..522235bebc17 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,7 +1,7 @@
# Template file for 'i2pd'
pkgname=i2pd
version=2.42.1
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="USE_UPNP=yes"
makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
From 9c82c3299dfc2b69d88d757a01a1f720979ea289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:34 +0700
Subject: [PATCH 034/107] icinga2: rebuild for boost-1.80
---
srcpkgs/icinga2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index a884892fc49e..4ef7abea2fc3 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,7 +1,7 @@
# Template file for 'icinga2'
pkgname=icinga2
version=2.9.3
-revision=6
+revision=7
build_style=cmake
build_helper="qemu"
configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
From 222eeb096b5a269b0b05a241b90e6ffb8d7138ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:34 +0700
Subject: [PATCH 035/107] imagescan: rebuild for boost-1.80
---
srcpkgs/imagescan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imagescan/template b/srcpkgs/imagescan/template
index a12adfe05713..152ef2f83b33 100644
--- a/srcpkgs/imagescan/template
+++ b/srcpkgs/imagescan/template
@@ -1,7 +1,7 @@
# Template file for 'imagescan'
pkgname=imagescan
version=3.65.0
-revision=1
+revision=2
wrksrc=utsushi-0.65.0
build_style=gnu-configure
configure_args="--libexecdir=/usr/lib --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
From ecc3bc73eec5a025ad6b0b1f7df665124a04e5b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:34 +0700
Subject: [PATCH 036/107] inkscape: rebuild for boost-1.80
---
srcpkgs/inkscape/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 4d902e663f73..c77236be6848 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.1.1
-revision=4
+revision=5
wrksrc="inkscape-${version}_2021-09-20_3bf5ae0d25"
build_style=cmake
# builds executables then runs checks
From fcf71615c7c13068c66788a026752571ffe1f13d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:34 +0700
Subject: [PATCH 037/107] innoextract: rebuild for boost-1.80
---
srcpkgs/innoextract/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/innoextract/template b/srcpkgs/innoextract/template
index 079a8ce1350a..9b8e1e163e55 100644
--- a/srcpkgs/innoextract/template
+++ b/srcpkgs/innoextract/template
@@ -1,7 +1,7 @@
# Template file for 'innoextract'
pkgname=innoextract
version=1.9
-revision=1
+revision=2
build_style=cmake
configure_args="-DCMAKE_INSTALL_PREFIX=/usr"
hostmakedepends="boost extra-cmake-modules"
From 215a6c200ceb1203254b32832d183d2ec76edeab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:34 +0700
Subject: [PATCH 038/107] juCi++: rebuild for boost-1.80
---
srcpkgs/juCi++/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index 1a7604b44a00..5103324dec20 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -1,7 +1,7 @@
# Template file for 'juCi++'
pkgname=juCi++
version=1.6.2
-revision=2
+revision=3
_libclangmm_commit="b342f4dd6de4fe509a692a4b4fcfc7e24aae9590"
_tiny_commit="c9c8bf810ddad8cd17882b9a9ee628a690e779f5"
wrksrc="jucipp-v${version}"
From 267faf65eda4aad7cb647e419f785b88a594e563 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:35 +0700
Subject: [PATCH 039/107] kea: rebuild for boost-1.80
---
srcpkgs/kea/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index dc0bcc5de3fc..a55b58691de9 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -1,7 +1,7 @@
# Template file for 'kea'
pkgname=kea
version=1.9.5
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
$(vopt_if mysql --with-mysql)
From df264f9923e4d1be0f69b5200016234d58e9d240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:35 +0700
Subject: [PATCH 040/107] kig: rebuild for boost-1.80
---
srcpkgs/kig/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index 591db4bd477c..748c09f99e59 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,7 +1,7 @@
# Template file for 'kig'
pkgname=kig
version=22.04.3
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
pkg-config qt5-host-tools qt5-qmake"
From 3bffdd2db671110f2d8f3b4ad419cac5a869250a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:35 +0700
Subject: [PATCH 041/107] leatherman: rebuild for boost-1.80
---
.../leatherman/patches/reduce-vendor.patch | 128 ++++++++++++++++++
srcpkgs/leatherman/template | 7 +-
2 files changed, 134 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/leatherman/patches/reduce-vendor.patch
diff --git a/srcpkgs/leatherman/patches/reduce-vendor.patch b/srcpkgs/leatherman/patches/reduce-vendor.patch
new file mode 100644
index 000000000000..4d4dfe525e51
--- /dev/null
+++ b/srcpkgs/leatherman/patches/reduce-vendor.patch
@@ -0,0 +1,128 @@
+Still vendor rapidjson, facter depends on older API
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -66,11 +66,10 @@ file(GLOB_RECURSE ALL_LEATHERMAN_SOURCES
+ add_subdirectory(locales)
+
+ add_leatherman_dir(catch EXCLUDE_FROM_VARS)
+-add_leatherman_dir(nowide)
+ add_leatherman_dir(util)
+ add_leatherman_dir(locale)
+ add_leatherman_dir(logging)
+ add_leatherman_dir(rapidjson)
+ add_leatherman_dir(json_container)
+ add_leatherman_dir(file_util)
+ add_leatherman_dir(curl)
+--- a/util/CMakeLists.txt
++++ b/util/CMakeLists.txt
+@@ -1,10 +1,8 @@
+-find_package(Boost 1.54 REQUIRED date_time chrono system)
++find_package(Boost 1.54 REQUIRED date_time chrono system nowide)
+
+ add_leatherman_deps(${Boost_LIBRARIES})
+ add_leatherman_includes("${Boost_INCLUDE_DIRS}")
+
+-leatherman_dependency(nowide)
+-
+ if(WIN32)
+ set(PLATFORM_SRCS "src/windows/time.cc" "src/windows/environment.cc" "src/windows/scoped_handle.cc")
+ set(PLATFORM_TESTS "tests/windows/environment.cc")
+--- a/json_container/CMakeLists.txt
++++ b/json_container/CMakeLists.txt
+@@ -1,11 +1,11 @@
+-find_package(Boost 1.54 REQUIRED COMPONENTS regex)
++find_package(Boost 1.54 REQUIRED COMPONENTS regex nowide)
+
+ add_leatherman_deps("${Boost_LIBRARIES}")
+ add_leatherman_includes("${Boost_INCLUDE_DIRS}")
+
+ leatherman_dependency(rapidjson)
+ leatherman_dependency(locale)
+
+ add_leatherman_library("src/json_container.cc")
+ add_leatherman_headers("inc/leatherman")
+-add_leatherman_test("tests/json_container_test.cc")
+\ No newline at end of file
++add_leatherman_test("tests/json_container_test.cc")
+--- a/logging/CMakeLists.txt
++++ b/logging/CMakeLists.txt
+@@ -1,10 +1,10 @@
+-find_package(Boost 1.54 REQUIRED COMPONENTS log log_setup thread date_time filesystem system chrono regex)
++find_package(Boost 1.54 REQUIRED COMPONENTS log log_setup thread date_time
++ filesystem system chrono regex nowide)
+ find_package(Threads)
+
+ add_leatherman_deps(${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+ add_leatherman_includes("${Boost_INCLUDE_DIRS}")
+
+-leatherman_dependency(nowide)
+ leatherman_dependency(locale)
+
+ if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "SunOS")
+--- a/execution/CMakeLists.txt
++++ b/execution/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system)
++find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system nowide)
+
+ add_leatherman_deps("${Boost_LIBRARIES}")
+ if ("${CMAKE_SYSTEM_NAME}" MATCHES "SunOS")
+@@ -10,7 +10,6 @@ endif()
+ add_leatherman_includes("${Boost_INCLUDE_DIRS}")
+
+ leatherman_dependency(util)
+-leatherman_dependency(nowide)
+ leatherman_dependency(locale)
+ leatherman_dependency(logging)
+ leatherman_dependency(file_util)
+--- a/file_util/CMakeLists.txt
++++ b/file_util/CMakeLists.txt
+@@ -1,9 +1,8 @@
+-find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system)
++find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system nowide)
+
+ add_leatherman_deps("${Boost_LIBRARIES}")
+ add_leatherman_includes("${Boost_INCLUDE_DIRS}")
+
+-leatherman_dependency(nowide)
+ leatherman_dependency(locale)
+ leatherman_dependency(logging)
+ leatherman_dependency(util)
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -1,4 +1,5 @@
+-set(BOOST_REQUIRED_COMPONENTS system date_time chrono log log_setup thread filesystem regex)
++set(BOOST_REQUIRED_COMPONENTS system date_time chrono log log_setup thread
++ filesystem regex nowide)
+ if (LEATHERMAN_USE_LOCALES)
+ set(BOOST_REQUIRED_COMPONENTS ${BOOST_REQUIRED_COMPONENTS} locale)
+ endif()
+--- a/file_util/src/file.cc
++++ b/file_util/src/file.cc
+@@ -1,6 +1,6 @@
+ #include <leatherman/file_util/file.hpp>
+ #include <boost/nowide/fstream.hpp>
+-#include <boost/nowide/cenv.hpp>
++#include <boost/nowide/cstdlib.hpp>
+ #include <boost/filesystem.hpp>
+ #include <sstream>
+ #include <leatherman/logging/logging.hpp>
+--- a/util/src/environment.cc
++++ b/util/src/environment.cc
+@@ -1,5 +1,5 @@
+ #include <leatherman/util/environment.hpp>
+-#include <boost/nowide/cenv.hpp>
++#include <boost/nowide/cstdlib.hpp>
+ #include <stdexcept>
+
+ using namespace std;
+--- a/util/tests/environment.cc
++++ b/util/tests/environment.cc
+@@ -1,6 +1,6 @@
+ #include <catch.hpp>
+ #include <leatherman/util/environment.hpp>
+-#include <boost/nowide/cenv.hpp>
++#include <boost/nowide/cstdlib.hpp>
+
+ using namespace std;
+ using namespace leatherman::util;
diff --git a/srcpkgs/leatherman/template b/srcpkgs/leatherman/template
index b61fcd5dc205..3f9d08752dd2 100644
--- a/srcpkgs/leatherman/template
+++ b/srcpkgs/leatherman/template
@@ -1,7 +1,7 @@
# Template file for 'leatherman'
pkgname=leatherman
version=1.12.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DLEATHERMAN_SHARED=ON"
hostmakedepends="pkg-config python3"
@@ -16,6 +16,11 @@ python_version=3
CXXFLAGS="-Wno-ignored-qualifiers -Wno-class-memaccess -Wno-catch-value -Wno-deprecated-copy -Wno-type-limits"
+do_check() {
+ cd build
+ ctest -V
+}
+
leatherman-devel_package() {
short_desc+=" - development files"
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 24fd9ef7028e9a3e5769026ab6d0f8071a976903 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:35 +0700
Subject: [PATCH 042/107] ledger: rebuild for boost-1.80
---
srcpkgs/ledger/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ledger/template b/srcpkgs/ledger/template
index c94b72709dea..130c727e7768 100644
--- a/srcpkgs/ledger/template
+++ b/srcpkgs/ledger/template
@@ -1,7 +1,7 @@
# Template file for 'ledger'
pkgname=ledger
version=3.2.1
-revision=1
+revision=2
build_style=cmake
makedepends="boost-devel gmp-devel mpfr-devel gettext-devel libedit-devel"
short_desc="Double-entry accounting system with a command-line reporting interface"
From 9e6cc3fa2b81646490a3af7987ea25e3fe3f6330 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:36 +0700
Subject: [PATCH 043/107] libbitcoin-blockchain: rebuild for boost-1.80
---
srcpkgs/libbitcoin-blockchain/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index e43ab8b9ede1..09a126e75356 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-blockchain'
pkgname=libbitcoin-blockchain
version=3.6.0
-revision=6
+revision=7
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
From f786b33e6d52ed78c844aab1c7b0613097d6b7db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:36 +0700
Subject: [PATCH 044/107] libbitcoin-client: rebuild for boost-1.80
---
srcpkgs/libbitcoin-client/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index 17849cd906d0..35f17b74ae00 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-client'
pkgname=libbitcoin-client
version=3.6.0
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"
From 5431740b27bde0a7b25030cd5ef27e37f18e6b42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:36 +0700
Subject: [PATCH 045/107] libbitcoin-database: rebuild for boost-1.80
---
srcpkgs/libbitcoin-database/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index a3c48226ba2d..13cec4fdc3dd 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-database'
pkgname=libbitcoin-database
version=3.6.0
-revision=6
+revision=7
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
From 88b56891fbfa52d7de041e194fe4690d839d549a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:36 +0700
Subject: [PATCH 046/107] libbitcoin-explorer: rebuild for boost-1.80
---
srcpkgs/libbitcoin-explorer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index a1929f350269..7a5f8368b271 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-explorer'
pkgname=libbitcoin-explorer
version=3.6.0
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
From d51aa3749198eb16544e2a2241ddb25f3ebeb720 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:36 +0700
Subject: [PATCH 047/107] libbitcoin-network: rebuild for boost-1.80
---
srcpkgs/libbitcoin-network/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index d130facc40de..4f730a814242 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-network'
pkgname=libbitcoin-network
version=3.6.0
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
From 454c3afc7be6609dc8601f9994c0e2ea8c74c303 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:37 +0700
Subject: [PATCH 048/107] libbitcoin-node: rebuild for boost-1.80
---
srcpkgs/libbitcoin-node/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 23e32624b5cc..ead87310627b 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-node'
pkgname=libbitcoin-node
version=3.6.0
-revision=6
+revision=7
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
From 1392111cbf2ea30ea3e4fb7f1ef02686dacaad51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:37 +0700
Subject: [PATCH 049/107] libbitcoin-protocol: rebuild for boost-1.80
---
srcpkgs/libbitcoin-protocol/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 838d62cc9ecd..53e2e6520f6a 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-protocol'
pkgname=libbitcoin-protocol
version=3.6.0
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
From 4ac925e0558eb662b84e0cc1b1c70ff793136c5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:37 +0700
Subject: [PATCH 050/107] libbitcoin-server: rebuild for boost-1.80
---
srcpkgs/libbitcoin-server/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index fc4988deac2b..70d4c492c5bb 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-server'
pkgname=libbitcoin-server
version=3.6.0
-revision=6
+revision=7
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
From a2f6c025e1a0cddc0ed7656ac51c3c2effb51203 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:37 +0700
Subject: [PATCH 051/107] libbitcoin-system: rebuild for boost-1.80
---
srcpkgs/libbitcoin-system/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index 8b03fb248c42..8e6790c3ba66 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-system'
pkgname=libbitcoin-system
version=3.6.0
-revision=6
+revision=7
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
From 58cef6a5f03dab3303d4e8c50c2d66d4292ee866 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:38 +0700
Subject: [PATCH 052/107] libcmis: rebuild for boost-1.80
---
srcpkgs/libcmis/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libcmis/template b/srcpkgs/libcmis/template
index fac133d5e4d9..43dd0a856122 100644
--- a/srcpkgs/libcmis/template
+++ b/srcpkgs/libcmis/template
@@ -1,7 +1,7 @@
# Template file for 'libcmis'
pkgname=libcmis
version=0.5.2
-revision=4
+revision=5
build_style=gnu-configure
configure_args="DOCBOOK2MAN=docbook2man --disable-werror"
hostmakedepends="pkg-config docbook2x"
From 3574e12591a7db4cdb041245d355b690d8d1610b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:38 +0700
Subject: [PATCH 053/107] libime: rebuild for boost-1.80
---
srcpkgs/libime/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libime/template b/srcpkgs/libime/template
index a37db9885a48..363bdd93b16d 100644
--- a/srcpkgs/libime/template
+++ b/srcpkgs/libime/template
@@ -1,7 +1,7 @@
# Template file for 'libime'
pkgname=libime
version=1.0.13
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config gettext extra-cmake-modules python3"
From 21c540c05728b398e44b4ee50aceb19997b63445 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:38 +0700
Subject: [PATCH 054/107] libime-jyutping: rebuild for boost-1.80
---
srcpkgs/libime-jyutping/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libime-jyutping/template b/srcpkgs/libime-jyutping/template
index 3c33940ca368..6ae0855c3d7a 100644
--- a/srcpkgs/libime-jyutping/template
+++ b/srcpkgs/libime-jyutping/template
@@ -1,7 +1,7 @@
# Template file for 'libime-jyutping'
pkgname=libime-jyutping
version=1.0.4
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config gettext extra-cmake-modules python3 libime-utils"
From e455e42515a96aeb3b7b159f6cbbd4d8dd0d16c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:38 +0700
Subject: [PATCH 055/107] libixion: rebuild for boost-1.80
---
srcpkgs/libixion/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libixion/template b/srcpkgs/libixion/template
index 37298a8b9427..ef1a00100f53 100644
--- a/srcpkgs/libixion/template
+++ b/srcpkgs/libixion/template
@@ -1,7 +1,7 @@
# Template file for 'libixion'
pkgname=libixion
version=0.17.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config python3"
makedepends="boost-devel fmt-devel mdds python3-devel spdlog"
From d933a5b2bd0b44298facd896b417d7e8b2c39104 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:38 +0700
Subject: [PATCH 056/107] liborcus: rebuild for boost-1.80
---
srcpkgs/liborcus/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/liborcus/template b/srcpkgs/liborcus/template
index cf4b938fe37a..7b6b21a26dca 100644
--- a/srcpkgs/liborcus/template
+++ b/srcpkgs/liborcus/template
@@ -1,7 +1,7 @@
# Template file for 'liborcus'
pkgname=liborcus
version=0.17.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config python3"
makedepends="boost-devel mdds libixion-devel python3-devel zlib-devel"
From a03218d5ab4f965d6f0bb49bbe6a1fb441318d45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:39 +0700
Subject: [PATCH 057/107] libphonenumber: rebuild for boost-1.80
---
srcpkgs/libphonenumber/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libphonenumber/template b/srcpkgs/libphonenumber/template
index 9bef2825781c..05f28c4f5579 100644
--- a/srcpkgs/libphonenumber/template
+++ b/srcpkgs/libphonenumber/template
@@ -1,7 +1,7 @@
# Template file for 'libphonenumber'
pkgname=libphonenumber
version=8.12.39
-revision=6
+revision=7
build_wrksrc=cpp
build_style=cmake
build_helper=qemu
From 630160c700ea688f0dfbd608f84d082b383de5d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:39 +0700
Subject: [PATCH 058/107] librime: rebuild for boost-1.80
---
srcpkgs/librime/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/librime/template b/srcpkgs/librime/template
index 5f734c200bd7..7110eeffd3f9 100644
--- a/srcpkgs/librime/template
+++ b/srcpkgs/librime/template
@@ -1,7 +1,7 @@
# Template file for 'librime'
pkgname=librime
version=1.7.3
-revision=3
+revision=4
build_style=cmake
configure_args="-DCMAKE_BUILD_TYPE=None -DENABLE_LOGGING=OFF -DBUILD_TEST=ON
-DCAPNP_EXECUTABLE=/usr/bin/capnp -DCAPNPC_CXX_EXECUTABLE=/usr/bin/capnpc-c++"
From b65bfba315bcb38bed781729e2333e6d4454a6b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:39 +0700
Subject: [PATCH 059/107] libtorrent-rasterbar: rebuild for boost-1.80
---
srcpkgs/libtorrent-rasterbar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index b1ceddc95282..5aceddec5646 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,7 +2,7 @@
# Breaks ABI/API without changing soname, revbump all dependants
pkgname=libtorrent-rasterbar
version=1.2.14
-revision=2
+revision=3
build_style=cmake
configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
-Dpython-bindings=ON"
From c203ce1cdadef4f55464c60dde568c70341f7e0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:40 +0700
Subject: [PATCH 060/107] linssid: rebuild for boost-1.80
---
srcpkgs/linssid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linssid/template b/srcpkgs/linssid/template
index 937c8a0745e0..09206656186e 100644
--- a/srcpkgs/linssid/template
+++ b/srcpkgs/linssid/template
@@ -1,7 +1,7 @@
# Template file for 'linssid'
pkgname=linssid
version=3.6
-revision=4
+revision=5
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools"
makedepends="boost-devel qwt-devel"
From b47c629c4e4fed3cdc550818d67ee78b15db4fdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:40 +0700
Subject: [PATCH 061/107] litecoin: rebuild for boost-1.80
---
srcpkgs/litecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 3c33d9b0eb8a..7a188c3c9af8 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.18.1
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
--disable-tests --with-openssl"
From f19e8ce3cf9307eb23ded16e5071390b24548ad5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:40 +0700
Subject: [PATCH 062/107] monero: rebuild for boost-1.80
---
srcpkgs/monero/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index bff62347ebd6..eebce3d0a551 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
# Template file for 'monero'
pkgname=monero
version=0.17.2.3
-revision=2
+revision=3
_randomx_version="1.1.9"
# the revision monero uses as a submodule for the specific version
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
From 08bcef9c95ebdb11930a192a1241c1fb53f9b8ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:40 +0700
Subject: [PATCH 063/107] monero-gui: rebuild for boost-1.80
---
srcpkgs/monero-gui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 67ed3273defa..61e5dd9da1b7 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
# Template file for 'monero-gui'
pkgname=monero-gui
version=0.17.2.3
-revision=1
+revision=2
_monero_version=0.17.2.3
_randomx_version="1.1.9"
# the revision monero uses as a submodule for the specific version
From cdc4e6a5d90b9e768bbc3bb3324595ec3373393f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:40 +0700
Subject: [PATCH 064/107] mupen64plus: rebuild for boost-1.80
---
srcpkgs/mupen64plus/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mupen64plus/template b/srcpkgs/mupen64plus/template
index 4984a7f4a777..f4a58a4749cb 100644
--- a/srcpkgs/mupen64plus/template
+++ b/srcpkgs/mupen64plus/template
@@ -1,7 +1,7 @@
# Template file for 'mupen64plus'
pkgname=mupen64plus
version=2.5.9
-revision=1
+revision=2
archs="x86_64* i686*"
wrksrc="mupen64plus-bundle-src-${version}"
hostmakedepends="pkg-config which nasm"
From f5e60ae0bd2a0976c21503d44a6ff3a3dede2062 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:41 +0700
Subject: [PATCH 065/107] musikcube: rebuild for boost-1.80
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index 2b75cbd976ea..11a3df3dc0aa 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=0.98.0
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1 -DENABLE_BUNDLED_TAGLIB=false"
From 9c5a8d5ee4706c32cce025a8f01c7658db4a5cca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:41 +0700
Subject: [PATCH 066/107] namecoin: rebuild for boost-1.80
---
srcpkgs/namecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index e4cfb3777b71..7839d4008cd3 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
# Template file for 'namecoin'
pkgname=namecoin
version=0.18.1
-revision=5
+revision=6
wrksrc="${pkgname}-core-nc${version}"
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-static
From 119c4f173a0b8c6bb1ca1cef63af3a9d5ba48939 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:41 +0700
Subject: [PATCH 067/107] ncmpcpp: rebuild for boost-1.80
---
srcpkgs/ncmpcpp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 773deb4917d4..72a0d35e5e7f 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
--enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
From d29238442d4d8698a77d9f2f70080845eef6c555 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:41 +0700
Subject: [PATCH 068/107] nix: rebuild for boost-1.80
---
srcpkgs/nix/template | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index bb585b6d7d54..e21c94aa2759 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,23 +1,25 @@
# Template file for 'nix'
pkgname=nix
-version=2.8.1
-revision=1
+version=2.10.3
+revision=2
build_style=gnu-configure
# Use /nix/var as suggested by the official Manual.
-configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
-hostmakedepends="curl pkg-config flex tar xz automake autoconf-archive mdBook jq"
+configure_args="--localstatedir=/nix/var
+ --with-sandbox-shell=/usr/bin/busybox.static"
+hostmakedepends="curl pkg-config flex tar xz automake autoconf-archive mdBook jq
+ busybox-static"
makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
liblzma-devel openssl-devel libsodium-devel sqlite-devel
libseccomp-devel editline-devel jq-devel libarchive-devel
gtest-devel lowdown-devel json-c++"
-depends="curl tar xz"
+depends="curl tar xz busybox-static"
short_desc="Purely functional package manager"
-maintainer="Juan RP <xtraeme@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://nixos.org/nix/"
changelog="https://nixos.org/releases/${pkgname}/${pkgname}-${version}/manual/#sec-relnotes"
distfiles="https://github.com/NixOS/nix/archive/refs/tags/${version}.tar.gz"
-checksum=6f19455775523fca4ae4096e6a6fc493f577198b968811f7fa77eb1fa5213b43
+checksum=5a8d79714bf04c425f41fdd22e67d4704d2e44c7a760c6c144e5767c6d662413
disable_parallel_build=yes
nocross="cross build populates /usr/lib32 with libraries and tries to link against them"
From ebd2c14f4b5b19d7ea2a74da1d3b7e89d8f5dc04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:42 +0700
Subject: [PATCH 069/107] opencamlib: rebuild for boost-1.80
---
srcpkgs/opencamlib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencamlib/template b/srcpkgs/opencamlib/template
index 8722aaf9ee64..140315ef3467 100644
--- a/srcpkgs/opencamlib/template
+++ b/srcpkgs/opencamlib/template
@@ -1,7 +1,7 @@
# Template file for 'opencamlib'
pkgname=opencamlib
version=2019.07
-revision=3
+revision=4
build_style=cmake
configure_args="-DBUILD_PY_LIB=ON -DUSE_PY_3=ON -DVERSION_STRING=${version}"
hostmakedepends="python3"
From c18299ac0ff2c047908754d2a8b9df3cbf944af4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:42 +0700
Subject: [PATCH 070/107] openimageio: rebuild for boost-1.80
---
srcpkgs/openimageio/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index 8abf3b05d6a3..bae68ead21e6 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,11 +1,11 @@
# Template file for 'openimageio'
pkgname=openimageio
version=2.2.15.1
-revision=3
+revision=4
wrksrc="oiio-Release-${version}"
build_style=cmake
configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0"
+ -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
hostmakedepends="pkg-config git"
makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
From 1838fb1a258e050896aa459a8dcf814bdbb574bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:42 +0700
Subject: [PATCH 071/107] openmw: rebuild for boost-1.80
---
srcpkgs/openmw/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openmw/template b/srcpkgs/openmw/template
index 581e2cbb081e..9a263c9eae45 100644
--- a/srcpkgs/openmw/template
+++ b/srcpkgs/openmw/template
@@ -1,7 +1,7 @@
# Template file for 'openmw'
pkgname=openmw
version=0.47.0
-revision=1
+revision=2
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=cmake
# System bullet doesn't use double precision (double precision would break vdrift)
From 4a278349d38eb466b119ece40db00d5eab5f5218 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:42 +0700
Subject: [PATCH 072/107] openscad: rebuild for boost-1.80
---
srcpkgs/openscad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index 60d45d60615f..a3951a1a2201 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -1,7 +1,7 @@
# Template file for 'openscad'
pkgname=openscad
version=2021.01
-revision=2
+revision=3
build_style=qmake
hostmakedepends="bison flex pkg-config gettext qt5-qmake qt5-host-tools"
makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
From b57a0a61c17a6687cb31a7c52073a6af3d26c3d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:42 +0700
Subject: [PATCH 073/107] openvdb: rebuild for boost-1.80
---
srcpkgs/openvdb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 4957f642552a..24bc2253828b 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,7 +1,7 @@
# Template file for 'openvdb'
pkgname=openvdb
version=9.0.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
hostmakedepends="pkg-config"
From ca9b90e34351c7c8f274d4c5d0dc93ca3bfbc118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:43 +0700
Subject: [PATCH 074/107] osm2pgsql: rebuild for boost-1.80
---
srcpkgs/osm2pgsql/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index 1c53c4505047..1d5f71b70140 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,7 +1,7 @@
# Template file for 'osm2pgsql'
pkgname=osm2pgsql
version=1.6.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="boost"
makedepends="expat-devel proj-devel bzip2-devel zlib-devel boost-devel
From e4772544c2a4c7c8ccb09772f8d19a7841d4589c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:43 +0700
Subject: [PATCH 075/107] poedit: rebuild for boost-1.80
---
srcpkgs/poedit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index f10aaf4c88a2..15cd4b6bae20 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
# Template file for 'poedit'
pkgname=poedit
version=3.0.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-wx-config=wx-config-gtk3"
hostmakedepends="pkg-config"
From ab927ec9fd5180b1597c5dd7b1baf44eeb006148 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:43 +0700
Subject: [PATCH 076/107] povray: rebuild for boost-1.80
---
srcpkgs/povray/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/povray/template b/srcpkgs/povray/template
index 30a2baab2039..93ab71f8e0db 100644
--- a/srcpkgs/povray/template
+++ b/srcpkgs/povray/template
@@ -1,7 +1,7 @@
# Template file for 'povray'
pkgname=povray
version=3.7.0.8
-revision=5
+revision=6
build_style=gnu-configure
_v=${version%.*.*}
configure_args="COMPILED_BY=Void --disable-optimiz-arch"
From 8b50f6993c8679b1fcc89f37cee6f003c34cdb41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:43 +0700
Subject: [PATCH 077/107] pulseeffects-legacy: rebuild for boost-1.80
---
srcpkgs/pulseeffects-legacy/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pulseeffects-legacy/template b/srcpkgs/pulseeffects-legacy/template
index 585f25a55c8f..121e90e7f7dc 100644
--- a/srcpkgs/pulseeffects-legacy/template
+++ b/srcpkgs/pulseeffects-legacy/template
@@ -1,7 +1,7 @@
# Template file for 'pulseeffects-legacy'
pkgname=pulseeffects-legacy
version=4.8.5
-revision=3
+revision=4
wrksrc="easyeffects-${version}"
build_style=meson
hostmakedepends="itstool pkg-config gettext glib-devel"
From 0e18abf4441c8eb300e9cb628733123562e11ce8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:44 +0700
Subject: [PATCH 078/107] pulseview: rebuild for boost-1.80
---
srcpkgs/pulseview/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pulseview/template b/srcpkgs/pulseview/template
index 83ce80bc39d9..e24c6cd30e88 100644
--- a/srcpkgs/pulseview/template
+++ b/srcpkgs/pulseview/template
@@ -1,7 +1,7 @@
# Template file for 'pulseview'
pkgname=pulseview
version=0.4.2
-revision=1
+revision=2
build_style=cmake
configure_args="-DDISABLE_WERROR=TRUE"
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From faa84e592854ee37e0e752bf8aa41c969d8ba5c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:44 +0700
Subject: [PATCH 079/107] remwharead: rebuild for boost-1.80
---
srcpkgs/remwharead/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index 3e52473f86ce..cd36bd3b9849 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -1,7 +1,7 @@
# Template file for 'remwharead'
pkgname=remwharead
version=0.10.0
-revision=2
+revision=3
build_style=cmake
hostmakedepends="poco-devel asciidoc pkg-config"
makedepends="poco-devel boost-devel"
From ec9447213f4da87f0632d7265cb3f8d008406a5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:44 +0700
Subject: [PATCH 080/107] rstudio: rebuild for boost-1.80
---
srcpkgs/rstudio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index ad7c1e85cce7..c0354b8130cc 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
# Template file for 'rstudio'
pkgname=rstudio
version=1.4.1717
-revision=3
+revision=4
build_style=cmake
configure_args="-DRSTUDIO_TARGET=Desktop
-DRSTUDIO_USE_SYSTEM_BOOST=ON
From e2fa33406e71c9add0dc1fe1a9f380fe14c8af5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 20 Aug 2022 15:51:41 +0700
Subject: [PATCH 081/107] schroot: update to 1.6.12.
---
.../patches/{musl.patch => sbuild-i18n.patch} | 1 +
srcpkgs/schroot/patches/schroot-cppunit.patch | 11 -----
srcpkgs/schroot/patches/test-chown.patch | 8 ++++
srcpkgs/schroot/template | 47 ++++++++++++-------
4 files changed, 38 insertions(+), 29 deletions(-)
rename srcpkgs/schroot/patches/{musl.patch => sbuild-i18n.patch} (99%)
delete mode 100644 srcpkgs/schroot/patches/schroot-cppunit.patch
create mode 100644 srcpkgs/schroot/patches/test-chown.patch
diff --git a/srcpkgs/schroot/patches/musl.patch b/srcpkgs/schroot/patches/sbuild-i18n.patch
similarity index 99%
rename from srcpkgs/schroot/patches/musl.patch
rename to srcpkgs/schroot/patches/sbuild-i18n.patch
index e0dcaf3bae01..ff69d554cd9a 100644
--- a/srcpkgs/schroot/patches/musl.patch
+++ b/srcpkgs/schroot/patches/sbuild-i18n.patch
@@ -28,3 +28,4 @@
+#include "sbuild-i18n.h"
using namespace sbuild;
+
diff --git a/srcpkgs/schroot/patches/schroot-cppunit.patch b/srcpkgs/schroot/patches/schroot-cppunit.patch
deleted file mode 100644
index 3e11c73fd40b..000000000000
--- a/srcpkgs/schroot/patches/schroot-cppunit.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac 2017-05-20 09:50:30.146864516 +0000
-+++ b/configure.ac 2017-05-20 09:51:26.216792794 +0000
-@@ -336,7 +336,7 @@
- [HAVE_UUID=yes],
- [HAVE_UUID=no])
-
--AM_PATH_CPPUNIT([1.10.0], [HAVE_CPPUNIT=yes])
-+PKG_CHECK_MODULES([CPPUNIT], [cppunit], [HAVE_CPPUNIT=yes], [HAVE_CPPUNIT=no])
- AM_CONDITIONAL([USE_UNIT_TESTS], [test -n "$HAVE_CPPUNIT"])
-
- SCHROOT_CFLAGS="$UUID_CFLAGS"
diff --git a/srcpkgs/schroot/patches/test-chown.patch b/srcpkgs/schroot/patches/test-chown.patch
new file mode 100644
index 000000000000..c9d4e3919428
--- /dev/null
+++ b/srcpkgs/schroot/patches/test-chown.patch
@@ -0,0 +1,8 @@
+--- a/test/setup-test-data.cmake
++++ b/test/setup-test-data.cmake
+@@ -5,4 +5,4 @@ rm -rf test/testdata
+ mkdir test/testdata
+ cp -r ${PROJECT_SOURCE_DIR}/test/*.ex* test/testdata
+ mkdir test/testdata/run-parts.ex2
+-chown -R root:root test/testdata
++# chown -R root:root test/testdata
diff --git a/srcpkgs/schroot/template b/srcpkgs/schroot/template
index fd9ff15c7140..d73a149920a7 100644
--- a/srcpkgs/schroot/template
+++ b/srcpkgs/schroot/template
@@ -1,21 +1,25 @@
# Template file for 'schroot'
pkgname=schroot
reverts="1.7.2_9"
-version=1.6.10
-revision=12
-_debian_version=12+deb11u1
+version=1.6.12
+revision=1
+_debian_version=2
build_style=cmake
configure_args="
+ -DSCHROOT_LIBEXEC_DIR=/usr/libexec/schroot
+ -Ddebug=OFF
-Ddchroot=ON
-Dlvm-snapshot=ON
-Dbtrfs-snapshot=ON
+ -Dzfs-snapshot=ON
-Dblock-device=ON
-Dloopback=ON
+ -DLOSETUP_EXECUTABLE=/usr/sbin/losetup
-Duuid=ON
- -DBTRFS_EXECUTABLE=/usr/bin/btrfs
+ -DBTRFS_EXECUTABLE=/usr/sbin/btrfs
-DLVCREATE_EXECUTABLE=/usr/sbin/lvcreate
-DLVREMOVE_EXECUTABLE=/usr/sbin/lvremove
- -DZFS_EXECUTABLE=/usr/bin/zfs
+ -DZFS_EXECUTABLE=/usr/sbin/zfs
-Dbash_completion_dir=/usr/share/bash-completion/completions"
conf_files="
/etc/schroot/minimal/nssdatabases
@@ -41,27 +45,34 @@ make_dirs="
/var/lib/schroot/session 0755 root root
/var/lib/schroot/mount 0755 root root
/etc/schroot/chroot.d 0755 root root"
-hostmakedepends="pkg-config libtool gettext xz po4a groff"
-makedepends="boost-devel pam-devel lockdev-devel libuuid-devel e2fsprogs-devel
- gettext-devel libcppunit-devel"
+hostmakedepends="pkg-config gettext xz po4a groff"
+makedepends="boost-devel pam-devel lockdev-devel libuuid-devel
+ e2fsprogs-devel gettext-devel libcppunit-devel"
short_desc="Allows users to execute commands in different chroots"
maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
license="GPL-3.0-only"
homepage="https://wiki.debian.org/Schroot"
-distfiles="
- ${DEBIAN_SITE}/main/s/${pkgname}/${pkgname}_${version}.orig.tar.xz
- http://security.debian.org/debian-security/pool/main/s/${pkgname}/${pkgname}_${version}-${_debian_version}.debian.tar.xz"
-checksum="
- 3ce8dfd9cb97b099e4b6d4ccec421d6cc8c9ef84574681e928a12badb5643d0b
- 7bd4e0c2709979362c86a86c10d2b23d290d26e1a2d301a602e829327f483ec1"
-nocross=yes
+distfiles="${DEBIAN_SITE}/main/s/${pkgname}/${pkgname}_${version}.orig.tar.xz
+ ${DEBIAN_SITE}/main/s/${pkgname}/${pkgname}_${version}-${_debian_version}.debian.tar.xz"
+checksum="0bed8a069856a82261046b2e549af60ee32b79ebcdbf642424f378ec7aea6b77
+ 8ff03534007c6d55eb4032b637232954eaddba5cf18c91b42ff3016697ba0f93"
+skip_extraction="${pkgname}_${version}-${_debian_version}.debian.tar.xz"
-pre_configure() {
- cat ../debian/patches/series | while read p; do
- patch -p1 -i ../debian/patches/$p
+pre_patch() {
+ rm -rf debian
+ bsdtar -xf "$XBPS_SRCDISTDIR/$pkgname-$version/$skip_extraction"
+ grep '^[^#]' debian/patches/series | while read p; do
+ msg_normal "Patching (Debian): $p\n"
+ patch -Np1 -s -F0 -i debian/patches/$p
done
}
+do_check() {
+ # expect to be run with root
+ cd build
+ ctest -E "(sbuild-chroot-config)"
+}
+
post_install() {
# Remove development files
rm -rf ${DESTDIR}/usr/include \
From 3216fc9ed9ea4913bb30e5204b18e6ea14468c06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:44 +0700
Subject: [PATCH 082/107] snapper: rebuild for boost-1.80
---
srcpkgs/snapper/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template
index bc7bbe5cf84b..85697667ff77 100644
--- a/srcpkgs/snapper/template
+++ b/srcpkgs/snapper/template
@@ -1,7 +1,7 @@
# Template file for 'snapper'
pkgname=snapper
version=0.10.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-zypp --disable-systemd --with-conf=/etc/conf.d"
conf_files="/etc/conf.d/snapper"
From 188a99f31d08b7d7eb4a4f1140d502bcdf410eb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:45 +0700
Subject: [PATCH 083/107] source-highlight: rebuild for boost-1.80
---
srcpkgs/source-highlight/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/source-highlight/template b/srcpkgs/source-highlight/template
index ab56401c64a0..f76c987335af 100644
--- a/srcpkgs/source-highlight/template
+++ b/srcpkgs/source-highlight/template
@@ -1,7 +1,7 @@
# Template file for 'source-highlight'
pkgname=source-highlight
version=3.1.9
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--with-boost=${XBPS_CROSS_BASE}/usr
--with-bash-completion=/usr/share/bash-completion/completions"
From 206309c33d12c92417275d33f9cc5a095b5ce592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:45 +0700
Subject: [PATCH 084/107] supercollider: rebuild for boost-1.80
---
srcpkgs/supercollider/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/supercollider/template b/srcpkgs/supercollider/template
index 35f6d9dfb7c2..b0b8278470ef 100644
--- a/srcpkgs/supercollider/template
+++ b/srcpkgs/supercollider/template
@@ -1,7 +1,7 @@
# Template file for 'supercollider'
pkgname=supercollider
version=3.11.1
-revision=3
+revision=4
wrksrc="SuperCollider-${version}-Source"
build_style=cmake
make_cmd=make
From a5d3521d4496ce3ffce951bc80c819f2e7602518 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:45 +0700
Subject: [PATCH 085/107] supertux2: rebuild for boost-1.80
---
srcpkgs/supertux2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/supertux2/template b/srcpkgs/supertux2/template
index 56057f5837d5..fce60e205a59 100644
--- a/srcpkgs/supertux2/template
+++ b/srcpkgs/supertux2/template
@@ -1,7 +1,7 @@
# Template file for 'supertux2'
pkgname=supertux2
version=0.6.3
-revision=1
+revision=2
wrksrc="SuperTux-v${version}-Source"
build_style=cmake
configure_args="
From 4e26a15fa3215a7c0b6112ab097a5e9299dab82c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:45 +0700
Subject: [PATCH 086/107] swiften: rebuild for boost-1.80
---
srcpkgs/swiften/patches/boost-endian.patch | 15 +++++++++++++++
srcpkgs/swiften/patches/std.patch | 11 +++++++++++
srcpkgs/swiften/template | 4 ++--
3 files changed, 28 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/swiften/patches/boost-endian.patch
create mode 100644 srcpkgs/swiften/patches/std.patch
diff --git a/srcpkgs/swiften/patches/boost-endian.patch b/srcpkgs/swiften/patches/boost-endian.patch
new file mode 100644
index 000000000000..1cd2c2fb4816
--- /dev/null
+++ b/srcpkgs/swiften/patches/boost-endian.patch
@@ -0,0 +1,15 @@
+--- a/Swiften/Base/Platform.h
++++ b/Swiften/Base/Platform.h
+@@ -43,9 +43,9 @@
+ #endif
+
+ // Endianness
+-#include <boost/detail/endian.hpp>
+-#if defined(BOOST_LITTLE_ENDIAN)
++#include <boost/predef/other/endian.h>
++#if BOOST_ENDIAN_LITTLE_BYTE
+ #define SWIFTEN_LITTLE_ENDIAN
+-#elif defined(BOOST_BIG_ENDIAN)
++#elif BOOST_ENDIAN_BIG_BYTE
+ #define SWIFTEN_BIG_ENDIAN
+ #endif
diff --git a/srcpkgs/swiften/patches/std.patch b/srcpkgs/swiften/patches/std.patch
new file mode 100644
index 000000000000..9534e8a321d2
--- /dev/null
+++ b/srcpkgs/swiften/patches/std.patch
@@ -0,0 +1,11 @@
+--- a/Swift/Controllers/ShowProfileController.h
++++ b/Swift/Controllers/ShowProfileController.h
+@@ -18,6 +18,8 @@
+
+ #include <Swift/Controllers/UIEvents/UIEvent.h>
+
++#include <map>
++
+ namespace Swift {
+ class VCardManager;
+ class ProfileWindow;
diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 969ef1eb5d78..9014153a8818 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,11 +1,11 @@
# Template file for 'swiften'
pkgname=swiften
version=4.0.3
-revision=2
+revision=3
wrksrc="swift-${version}"
hostmakedepends="scons pkg-config"
makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
- lua51-devel miniupnpc-devel sqlite-devel"
+ lua51-devel miniupnpc-devel sqlite-devel hunspell-devel"
short_desc="XMPP library for C++"
maintainer="John Regan <john@jrjrtech.com>"
license="GPL-3.0-only"
From edd8b3c806ee1c47b02c9eacd7cc6c95d20ec0d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:46 +0700
Subject: [PATCH 087/107] syncthingtray: rebuild for boost-1.80
---
srcpkgs/syncthingtray/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/syncthingtray/template b/srcpkgs/syncthingtray/template
index 4f338f2cc200..f445aa92db1e 100644
--- a/srcpkgs/syncthingtray/template
+++ b/srcpkgs/syncthingtray/template
@@ -1,7 +1,7 @@
# Template file for 'syncthingtray'
pkgname=syncthingtray
version=1.2.2
-revision=1
+revision=2
build_style=cmake
configure_args="-DJS_PROVIDER=qml -DBUILTIN_TRANSLATIONS=ON -DSYSTEMD_SUPPORT=OFF
-DBUILD_SHARED_LIBS=ON -DWEBVIEW_PROVIDER=$(vopt_if webengine webengine none)"
From cc5b33361a1f37eec06d14f6d0c68a9fa6aac3bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:46 +0700
Subject: [PATCH 088/107] tmfs: rebuild for boost-1.80
---
srcpkgs/tmfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tmfs/template b/srcpkgs/tmfs/template
index 1dbed3e0eb72..ed4fb5fed836 100644
--- a/srcpkgs/tmfs/template
+++ b/srcpkgs/tmfs/template
@@ -1,7 +1,7 @@
# Template file for 'tmfs'
pkgname=tmfs
version=r5
-revision=7
+revision=8
build_style=cmake
hostmakedepends="pkg-config"
makedepends="fuse-devel boost-devel"
From 2e412f81af27018666b32ad656a0d3f81e795f62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:46 +0700
Subject: [PATCH 089/107] tomahawk: rebuild for boost-1.80
---
srcpkgs/tomahawk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tomahawk/template b/srcpkgs/tomahawk/template
index 0edbacc5f8ad..b66b9a876a5c 100644
--- a/srcpkgs/tomahawk/template
+++ b/srcpkgs/tomahawk/template
@@ -1,7 +1,7 @@
# Template file for 'tomahawk'
pkgname=tomahawk
version=0.8.4
-revision=21
+revision=22
wrksrc=${pkgname}-${_commit}
_commit=90ec6f0dc701cba0533c66abdcb904e29f02a66f
build_style=cmake
From 97d52557e2fd010da4702d6510ca1f279fcd84de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:46 +0700
Subject: [PATCH 090/107] uhd: rebuild for boost-1.80
---
srcpkgs/uhd/patches/boost-math.patch | 31 +++++++++++++++++++++++++++
srcpkgs/uhd/patches/std-complex.patch | 10 +++++++++
srcpkgs/uhd/template | 2 +-
3 files changed, 42 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/uhd/patches/boost-math.patch
create mode 100644 srcpkgs/uhd/patches/std-complex.patch
diff --git a/srcpkgs/uhd/patches/boost-math.patch b/srcpkgs/uhd/patches/boost-math.patch
new file mode 100644
index 000000000000..9ac6dae1df9d
--- /dev/null
+++ b/srcpkgs/uhd/patches/boost-math.patch
@@ -0,0 +1,31 @@
+--- a/host/lib/usrp/usrp2/usrp2_impl.cpp
++++ b/host/lib/usrp/usrp2/usrp2_impl.cpp
+@@ -18,6 +18,8 @@
+ #include <boost/asio.hpp> //used for htonl and ntohl
+ #include <boost/asio/ip/address_v4.hpp>
+ #include <boost/format.hpp>
++#include <boost/math/special_functions/round.hpp>
++#include <boost/math/special_functions/sign.hpp>
+ #include <boost/thread.hpp>
+ #include <functional>
+
+--- a/host/lib/usrp/cores/rx_frontend_core_3000.cpp
++++ b/host/lib/usrp/cores/rx_frontend_core_3000.cpp
+@@ -12,6 +12,7 @@
+ #include <uhdlib/usrp/cores/rx_frontend_core_3000.hpp>
+ #include <boost/assign/list_of.hpp>
+ #include <boost/math/special_functions/round.hpp>
++#include <boost/math/special_functions/sign.hpp>
+ #include <functional>
+
+ using namespace uhd;
+--- a/host/lib/usrp/cores/rx_dsp_core_3000.cpp
++++ b/host/lib/usrp/cores/rx_dsp_core_3000.cpp
+@@ -14,6 +14,7 @@
+ #include <uhdlib/usrp/cores/rx_dsp_core_3000.hpp>
+ #include <boost/assign/list_of.hpp>
+ #include <boost/math/special_functions/round.hpp>
++#include <boost/math/special_functions/sign.hpp>
+ #include <algorithm>
+ #include <cmath>
+ #include <functional>
diff --git a/srcpkgs/uhd/patches/std-complex.patch b/srcpkgs/uhd/patches/std-complex.patch
new file mode 100644
index 000000000000..c7573bf4ade2
--- /dev/null
+++ b/srcpkgs/uhd/patches/std-complex.patch
@@ -0,0 +1,10 @@
+--- a/host/tests/tx_streamer_test.cpp
++++ b/host/tests/tx_streamer_test.cpp
+@@ -7,6 +7,7 @@
+ #include "../common/mock_link.hpp"
+ #include <uhdlib/transport/tx_streamer_impl.hpp>
+ #include <boost/test/unit_test.hpp>
++#include <complex>
+ #include <iostream>
+ #include <memory>
+
diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template
index 5f043162d7dc..170e12670c2c 100644
--- a/srcpkgs/uhd/template
+++ b/srcpkgs/uhd/template
@@ -1,7 +1,7 @@
# Template file for 'uhd'
pkgname=uhd
version=4.0.0.0
-revision=1
+revision=2
build_wrksrc=host
build_style=cmake
configure_args="-DCMAKE_BUILD_TYPE=None"
From c47c4da8fb1acdd2ca9df9b98837d5ad7375d617 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:47 +0700
Subject: [PATCH 091/107] wesnoth: rebuild for boost-1.80
---
srcpkgs/wesnoth/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 0fcc09b29c10..4d55d20b5959 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,7 +1,7 @@
# Template file for 'wesnoth'
pkgname=wesnoth
version=1.14.17
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_OMP=1"
hostmakedepends="pkg-config gettext"
@@ -18,7 +18,7 @@ checksum=3646cba604e09c12d6900a733bcb78cbf05f2f75f05346630d6529c220f584e1
replaces="wesnoth-data>=0"
CFLAGS="-UNDEBUG"
-CXXFLAGS="-UNDEBUG"
+CXXFLAGS="-UNDEBUG -std=c++14"
post_install() {
# runit service
From 180dcdba5f54c8462639b0d46db234e56ed591a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:47 +0700
Subject: [PATCH 092/107] wsjtx: rebuild for boost-1.80
---
srcpkgs/wsjtx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wsjtx/template b/srcpkgs/wsjtx/template
index c1838dd7cf51..7324d85bd64d 100644
--- a/srcpkgs/wsjtx/template
+++ b/srcpkgs/wsjtx/template
@@ -1,7 +1,7 @@
# Template file for 'wsjtx'
pkgname=wsjtx
version=2.5.4
-revision=1
+revision=2
build_wrksrc=wsjtx
build_style=cmake
configure_args="-DRIGCTLCOM_EXE= -DRIGCTL_EXE= -DRIGCTLD_EXE="
From 121a92784c49feb97819a02015b42f97330d9178 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:39 +0700
Subject: [PATCH 093/107] libreoffice: update to 7.4.0.3.
---
srcpkgs/libreoffice/template | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 158df0f30ebc..00ceb97950ff 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
-version=7.3.3.2
-revision=3
+version=7.4.0.3
+revision=1
build_style=meta
make_build_target="build-nocheck"
nocross="Several dependencies are nocross=yes"
@@ -9,7 +9,7 @@ nocross="Several dependencies are nocross=yes"
hostmakedepends="automake flex git gperf hyphen icu libtool openldap which gettext xz
perl-Archive-Zip pkg-config qt5-qmake sane ucpp unzip zip python3-setuptools
fontforge python3-lxml"
-makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
+makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel icu-devel
frameworkintegration-devel glyphy-devel gpgmepp-devel gst-plugins-base1-devel
gtk+-devel gtk+3-devel hunspell-devel hyphen-devel libXt-devel libabw-devel
libatomic_ops-devel libbluetooth-devel libcdr-devel libe-book-devel
@@ -111,10 +111,10 @@ distfiles="
${_addurl}/Scheherazade-2.100.zip
${_addurl}/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz
"
-checksum="ee12bdbe1621c20e2744bc5b6c5967810f25a5760b98ac5812d550ab00968685
- a6f67d5a20fe656c909b16c338759c187cf7e5e7f463d33d8d58a8bbe0280323
- 688634eccb802c156496124b394c0ec5e21059a9b6cd0095930f9e76f9eefe9b
- b91b0a482fa42d59e1605f39a3917166e7ff76bfa8e9b62d6eef0a9b04b3351c
+checksum="acc383a4386e1ceb74266a2f6406dee4b3a78576bda6bc71630f629ea20e3c19
+ 7d0b2927051111acdf99c9e805078cf5fb7f90f855b6182a225d4319bb0419ad
+ aa1922940b1742a833f34efc2cc2267dd592363530764dcfd352112c9b329547
+ e6fc4b8b4adf6c3b23f555f0a245ef535ad1771a386480ec14cab71e70179d8c
1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66
From 72070aeb8585ce7f5aaf6787ec06c2672dda6709 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 20:49:38 +0400
Subject: [PATCH 094/107] fmt: update to 9.0.0.
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index b91133da6484..dbc48a29aad1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3540,7 +3540,7 @@ libcotp.so.12 libcotp-1.2.1_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.8 fmt-8.0.1_1
+libfmt.so.9 fmt-9.0.0_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.25 libtls-3.5.2_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index 35a914c75eab..6fa037dfbaab 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=8.1.1
+version=9.0.0
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,7 +10,7 @@ license="BSD-2-Clause"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=3d794d3cf67633b34b2771eb9f073bde87e846e0d395d254df7b211ef1ec7346
+checksum=9a1e0e9e843a356d65c7604e2c8bf9402b50fe294c355de0095ebd42fb9bd2c5
post_install() {
vlicense LICENSE.rst LICENSE
From 15303d1f05ed9c68b0f343c5b71c393cfa28bfbe Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:33 +0400
Subject: [PATCH 095/107] Bear: update to 3.0.20.
---
srcpkgs/Bear/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index fce6309ca6fa..c6c1fb6e9c38 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
-version=3.0.19
-revision=2
+version=3.0.20
+revision=1
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-3.0-or-later"
homepage="https://github.com/rizsotto/Bear"
distfiles="https://github.com/rizsotto/Bear/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=2fcfe2c6e029182cfc54ed26b3505c0ef12b0f43df03fb587f335afdc2ca9431
+checksum=45cfcdab07f824f6c06c9776701156f7a04b23eadd25ecbc88c188789a447cc7
conflicts="interception-tools>=0" # /usr/bin/intercept
if [ -z "$XBPS_CHECK_PKGS" ]; then
From cd36ee768ff142d8cd2dadf06ee19abd6fb59d0c Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:33 +0400
Subject: [PATCH 096/107] cherrytree: revbump for fmt 9.0
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 55512e3b5ef7..e52a677a47b5 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=0.99.39
-revision=2
+revision=3
wrksrc="${pkgname}_${version}"
build_style=cmake
hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
From e5905296eda92a54678b9667ed414820e77d9c07 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:33 +0400
Subject: [PATCH 097/107] coeurl: revbump for fmt 9.0
---
srcpkgs/coeurl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index d0dbcbc60ba0..a9f2dfbbc123 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,7 +1,7 @@
# Template file for 'coeurl'
pkgname=coeurl
version=0.1.1
-revision=1
+revision=2
wrksrc=coeurl-v${version}
build_style=meson
hostmakedepends="pkg-config"
From 529c6b532e4c4902fdbdf0a2757976bdb4efef90 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:34 +0400
Subject: [PATCH 098/107] easyeffects: revbump for fmt 9.0
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index ac84ce15b068..0ddfb1b5833d 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=6.2.4
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel"
makedepends="gtkmm4-devel pipewire-devel zita-convolver-devel lilv-devel
From 70ccf37568e00c2439ef8f6c8b35da6557af0176 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:34 +0400
Subject: [PATCH 099/107] gerbera: revbump for fmt 9.0, add patch
---
srcpkgs/gerbera/patches/fmt-9-fix.patch | 32 +++++++++++++++++++++++++
srcpkgs/gerbera/template | 2 +-
2 files changed, 33 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/gerbera/patches/fmt-9-fix.patch
diff --git a/srcpkgs/gerbera/patches/fmt-9-fix.patch b/srcpkgs/gerbera/patches/fmt-9-fix.patch
new file mode 100644
index 000000000000..7adedf9005db
--- /dev/null
+++ b/srcpkgs/gerbera/patches/fmt-9-fix.patch
@@ -0,0 +1,32 @@
+From d7b8fafbc94405c20753fed569abd8878cccde89 Mon Sep 17 00:00:00 2001
+From: Felix Yan <felixonmars@archlinux.org>
+Date: Fri, 19 Aug 2022 15:22:10 +0300
+Subject: [PATCH] Fix build with fmt 9.0
+
+Fixes #2681
+---
+ src/database/sql_format.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/database/sql_format.h b/src/database/sql_format.h
+index 32dc00efa..e4e1909a8 100644
+--- a/src/database/sql_format.h
++++ b/src/database/sql_format.h
+@@ -42,7 +42,7 @@ struct SQLIdentifier {
+ template <>
+ struct fmt::formatter<SQLIdentifier> : formatter<std::string_view> {
+ template <typename FormatContext>
+- auto format(const SQLIdentifier& tn, FormatContext& ctx) -> decltype(ctx.out())
++ auto format(const SQLIdentifier& tn, FormatContext& ctx) const -> decltype(ctx.out())
+ {
+ return format_to(ctx.out(), "{}{}{}", tn.quote_begin, tn.name, tn.quote_end);
+ }
+@@ -61,7 +61,7 @@ struct ColumnUpdate {
+ template <>
+ struct fmt::formatter<ColumnUpdate> : formatter<std::string_view> {
+ template <typename FormatContext>
+- auto format(const ColumnUpdate& a, FormatContext& ctx) -> decltype(ctx.out())
++ auto format(const ColumnUpdate& a, FormatContext& ctx) const -> decltype(ctx.out())
+ {
+ return format_to(ctx.out(), "{} = {}", a.column, a.value);
+ }
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 35136708b3e5..100b94a7acbe 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.11.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 438c09ff9f4f64b0fb556e694e6414e228e28530 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:34 +0400
Subject: [PATCH 100/107] kodi: revbump for fmt 9.0
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index d3e9a13afdd5..4b6c9e1ade0c 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=19.4
-revision=3
+revision=4
_codename="Matrix"
wrksrc="xbmc-${version}-${_codename}"
build_style=cmake
From 4e75f6afed57ffb2f08c6d864881a60854c85f23 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:34 +0400
Subject: [PATCH 101/107] MangoHud: revbump for fmt 9.0
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index a9973bcad30a..fb0e18c1a1f4 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -2,7 +2,7 @@
pkgname=MangoHud
version=0.6.7.1
_version="${version%.*}-${version##*.}"
-revision=2
+revision=3
wrksrc="MangoHud-v${_version}"
build_style=meson
configure_args="-Duse_system_vulkan=enabled -Dwith_xnvctrl=disabled
From 812e7e8c2c357691ddba700fb25e0c2091ff9286 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 102/107] mkvtoolnix: revbump for fmt 9.0
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index a1d2adbc4b3f..d98022773c0a 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=70.0.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
From 91c3e33aa0ca5f40b3971e9e2d626e4e9e4b7b27 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 103/107] mpd: revbump for fmt 9.0
---
srcpkgs/mpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 98195b80a38d..b43c83fbb0f7 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,7 +1,7 @@
# Template file for 'mpd'
pkgname=mpd
version=0.23.8
-revision=1
+revision=2
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
-Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
From d15816366cdbf7662b95e6c1472c40657390c16f Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 104/107] mtxclient: revbump for fmt 9.0
---
srcpkgs/mtxclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 4ec895656749..12fea54d3fd5 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.8.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From 8d343119d69cc581cc6f90bebd971cb55a311610 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 105/107] nheko: revbump for fmt 9.0
---
srcpkgs/nheko/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index f35fd3942116..8e41e9e1f2f0 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.10.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative asciidoc"
makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
From 40eca4d4a219b3117623f3eec1e8b203d39241ee Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 106/107] spdlog: revbump for fmt 9.0
---
srcpkgs/spdlog/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 187ec0d0eb6e..ef1ee76ffcca 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
# Template file for 'spdlog'
pkgname=spdlog
version=1.10.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
-DSPDLOG_BUILD_SHARED=ON"
From d5b9fb2a6e5e64d63d05025fe4746d5f953459a7 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 107/107] Waybar: revbump for fmt 9.0
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 8ac3d4290b39..e40288e00b75 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.9.13
-revision=1
+revision=2
_date_version=3.0.0
build_style=meson
configure_args="-Dgtk-layer-shell=enabled -Dlibudev=enabled -Dman-pages=enabled
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Updated] [WIP] boost 1.80
2022-08-27 18:49 [PR PATCH] [WIP] boost 1.80 sgn
` (4 preceding siblings ...)
2022-08-30 12:56 ` sgn
@ 2022-08-30 14:56 ` sgn
2022-08-31 18:24 ` sgn
2022-09-01 1:37 ` [PR PATCH] [Closed]: " sgn
7 siblings, 0 replies; 9+ messages in thread
From: sgn @ 2022-08-30 14:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1251 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages boost-1.80
https://github.com/void-linux/void-packages/pull/38949
[WIP] boost 1.80
<!-- Uncomment relevant sections and delete options which are not applicable -->
[ci skip]
#### Testing the changes
- I tested the changes in this PR: **NO**
Close #38916
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38949.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boost-1.80-38949.patch --]
[-- Type: text/x-diff, Size: 173172 bytes --]
From 14e25aa9402c6ffb54303894a60b2e0fbe0a6c74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 15:21:49 +0700
Subject: [PATCH 001/111] boost: update to 1.80.0.
---
common/shlibs | 65 +++---
.../{boost-python1.72 => boost-python3-1.80} | 0
.../patches/0001-compat-glibc-2.34.patch | 23 --
.../patches/0002-compat-glibc-2.34.patch | 30 ---
srcpkgs/boost/patches/exec_file.patch | 45 ----
.../boost/patches/install-strip-destdir.patch | 27 +++
srcpkgs/boost/patches/mips.patch | 11 -
srcpkgs/boost/template | 196 +++++++++---------
...boost-python3-1.72 => libboost_atomic1.80} | 0
...ibboost_atomic1.72 => libboost_chrono1.80} | 0
...oost_chrono1.72 => libboost_container1.80} | 0
...ost_container1.72 => libboost_context1.80} | 0
...oost_context1.72 => libboost_contract1.80} | 0
...st_contract1.72 => libboost_coroutine1.80} | 0
...t_coroutine1.72 => libboost_date_time1.80} | 0
...boost_date_time1.72 => libboost_fiber1.80} | 0
...oost_fiber1.72 => libboost_filesystem1.80} | 0
...oost_filesystem1.72 => libboost_graph1.80} | 0
...boost_graph1.72 => libboost_iostreams1.80} | 0
...bboost_iostreams1.72 => libboost_json1.80} | 0
...ibboost_locale1.72 => libboost_locale1.80} | 0
.../{libboost_log1.72 => libboost_log1.80} | 0
...t_log_setup1.72 => libboost_log_setup1.80} | 0
...ost_math_c991.72 => libboost_math_c991.80} | 0
...t_math_c99f1.72 => libboost_math_c99f1.80} | 0
...t_math_c99l1.72 => libboost_math_c99l1.80} | 0
...ost_math_tr11.72 => libboost_math_tr11.80} | 0
...t_math_tr1f1.72 => libboost_math_tr1f1.80} | 0
...t_math_tr1l1.72 => libboost_math_tr1l1.80} | 0
...g_exec_monitor1.72 => libboost_nowide1.80} | 0
...ions1.72 => libboost_prg_exec_monitor1.80} | 0
...andom1.72 => libboost_program_options1.80} | 0
...libboost_regex1.72 => libboost_random1.80} | 0
...t_serialization1.72 => libboost_regex1.80} | 0
...dr2line1.72 => libboost_serialization1.80} | 0
...1.72 => libboost_stacktrace_addr2line1.80} | 0
...noop1.72 => libboost_stacktrace_basic1.80} | 0
...ystem1.72 => libboost_stacktrace_noop1.80} | 0
...ibboost_thread1.72 => libboost_system1.80} | 0
...libboost_timer1.72 => libboost_thread1.80} | 0
...st_type_erasure1.72 => libboost_timer1.80} | 0
...ramework1.72 => libboost_type_erasure1.80} | 0
...e1.72 => libboost_unit_test_framework1.80} | 0
...t_wserialization1.72 => libboost_wave1.80} | 0
srcpkgs/libboost_wserialization1.80 | 1 +
45 files changed, 164 insertions(+), 234 deletions(-)
rename srcpkgs/{boost-python1.72 => boost-python3-1.80} (100%)
delete mode 100644 srcpkgs/boost/patches/0001-compat-glibc-2.34.patch
delete mode 100644 srcpkgs/boost/patches/0002-compat-glibc-2.34.patch
delete mode 100644 srcpkgs/boost/patches/exec_file.patch
create mode 100644 srcpkgs/boost/patches/install-strip-destdir.patch
delete mode 100644 srcpkgs/boost/patches/mips.patch
rename srcpkgs/{boost-python3-1.72 => libboost_atomic1.80} (100%)
rename srcpkgs/{libboost_atomic1.72 => libboost_chrono1.80} (100%)
rename srcpkgs/{libboost_chrono1.72 => libboost_container1.80} (100%)
rename srcpkgs/{libboost_container1.72 => libboost_context1.80} (100%)
rename srcpkgs/{libboost_context1.72 => libboost_contract1.80} (100%)
rename srcpkgs/{libboost_contract1.72 => libboost_coroutine1.80} (100%)
rename srcpkgs/{libboost_coroutine1.72 => libboost_date_time1.80} (100%)
rename srcpkgs/{libboost_date_time1.72 => libboost_fiber1.80} (100%)
rename srcpkgs/{libboost_fiber1.72 => libboost_filesystem1.80} (100%)
rename srcpkgs/{libboost_filesystem1.72 => libboost_graph1.80} (100%)
rename srcpkgs/{libboost_graph1.72 => libboost_iostreams1.80} (100%)
rename srcpkgs/{libboost_iostreams1.72 => libboost_json1.80} (100%)
rename srcpkgs/{libboost_locale1.72 => libboost_locale1.80} (100%)
rename srcpkgs/{libboost_log1.72 => libboost_log1.80} (100%)
rename srcpkgs/{libboost_log_setup1.72 => libboost_log_setup1.80} (100%)
rename srcpkgs/{libboost_math_c991.72 => libboost_math_c991.80} (100%)
rename srcpkgs/{libboost_math_c99f1.72 => libboost_math_c99f1.80} (100%)
rename srcpkgs/{libboost_math_c99l1.72 => libboost_math_c99l1.80} (100%)
rename srcpkgs/{libboost_math_tr11.72 => libboost_math_tr11.80} (100%)
rename srcpkgs/{libboost_math_tr1f1.72 => libboost_math_tr1f1.80} (100%)
rename srcpkgs/{libboost_math_tr1l1.72 => libboost_math_tr1l1.80} (100%)
rename srcpkgs/{libboost_prg_exec_monitor1.72 => libboost_nowide1.80} (100%)
rename srcpkgs/{libboost_program_options1.72 => libboost_prg_exec_monitor1.80} (100%)
rename srcpkgs/{libboost_random1.72 => libboost_program_options1.80} (100%)
rename srcpkgs/{libboost_regex1.72 => libboost_random1.80} (100%)
rename srcpkgs/{libboost_serialization1.72 => libboost_regex1.80} (100%)
rename srcpkgs/{libboost_stacktrace_addr2line1.72 => libboost_serialization1.80} (100%)
rename srcpkgs/{libboost_stacktrace_basic1.72 => libboost_stacktrace_addr2line1.80} (100%)
rename srcpkgs/{libboost_stacktrace_noop1.72 => libboost_stacktrace_basic1.80} (100%)
rename srcpkgs/{libboost_system1.72 => libboost_stacktrace_noop1.80} (100%)
rename srcpkgs/{libboost_thread1.72 => libboost_system1.80} (100%)
rename srcpkgs/{libboost_timer1.72 => libboost_thread1.80} (100%)
rename srcpkgs/{libboost_type_erasure1.72 => libboost_timer1.80} (100%)
rename srcpkgs/{libboost_unit_test_framework1.72 => libboost_type_erasure1.80} (100%)
rename srcpkgs/{libboost_wave1.72 => libboost_unit_test_framework1.80} (100%)
rename srcpkgs/{libboost_wserialization1.72 => libboost_wave1.80} (100%)
create mode 120000 srcpkgs/libboost_wserialization1.80
diff --git a/common/shlibs b/common/shlibs
index 48c63f2d0735..b91133da6484 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -620,38 +620,39 @@ libip4tc.so.2 iptables-1.8.3_1
libipq.so.0 iptables-1.4.7_1
libnm.so.0 libnm-1.0.0_1
libKF5ItemModels.so.5 kitemmodels-5.26.0_1
-libboost_context.so.1.72.0 libboost_context1.72-1.72.0_1
-libboost_coroutine.so.1.72.0 libboost_coroutine1.72-1.72.0_1
-libboost_container.so.1.72.0 libboost_container1.72-1.72.0_1
-libboost_prg_exec_monitor.so.1.72.0 libboost_prg_exec_monitor1.72-1.72.0_1
-libboost_timer.so.1.72.0 libboost_timer1.72-1.72.0_1
-libboost_random.so.1.72.0 libboost_random1.72-1.72.0_1
-libboost_filesystem.so.1.72.0 libboost_filesystem1.72-1.72.0_1
-libboost_unit_test_framework.so.1.72.0 libboost_unit_test_framework1.72-1.72.0_1
-libboost_math_c99.so.1.72.0 libboost_math_c991.72-1.72.0_1
-libboost_math_tr1.so.1.72.0 libboost_math_tr11.72-1.72.0_1
-libboost_regex.so.1.72.0 libboost_regex1.72-1.72.0_1
-libboost_serialization.so.1.72.0 libboost_serialization1.72-1.72.0_1
-libboost_chrono.so.1.72.0 libboost_chrono1.72-1.72.0_1
-libboost_wserialization.so.1.72.0 libboost_wserialization1.72-1.72.0_1
-libboost_graph.so.1.72.0 libboost_graph1.72-1.72.0_1
-libboost_log.so.1.72.0 libboost_log1.72-1.72.0_1
-libboost_locale.so.1.72.0 libboost_locale1.72-1.72.0_1
-libboost_program_options.so.1.72.0 libboost_program_options1.72-1.72.0_1
-libboost_iostreams.so.1.72.0 libboost_iostreams1.72-1.72.0_1
-libboost_system.so.1.72.0 libboost_system1.72-1.72.0_1
-libboost_thread.so.1.72.0 libboost_thread1.72-1.72.0_1
-libboost_log_setup.so.1.72.0 libboost_log_setup1.72-1.72.0_1
-libboost_date_time.so.1.72.0 libboost_date_time1.72-1.72.0_1
-libboost_wave.so.1.72.0 libboost_wave1.72-1.72.0_1
-libboost_atomic.so.1.72.0 libboost_atomic1.72-1.72.0_1
-libboost_type_erasure.so.1.72.0 libboost_type_erasure1.72-1.72.0_1
-libboost_fiber.so.1.72.0 libboost_fiber1.72-1.72.0_1
-libboost_stacktrace_noop.so.1.72.0 libboost_stacktrace_noop1.72-1.72.0_1
-libboost_stacktrace_addr2line.so.1.72.0 libboost_stacktrace_addr2line1.72-1.72.0_1
-libboost_stacktrace_basic.so.1.72.0 libboost_stacktrace_basic1.72-1.72.0_1
-libboost_python27.so.1.72.0 boost-python1.72-1.72.0_1
-libboost_python310.so.1.72.0 boost-python3-1.72-1.72.0_6
+libboost_context.so.1.80.0 libboost_context1.80-1.80.0_1
+libboost_coroutine.so.1.80.0 libboost_coroutine1.80-1.80.0_1
+libboost_container.so.1.80.0 libboost_container1.80-1.80.0_1
+libboost_prg_exec_monitor.so.1.80.0 libboost_prg_exec_monitor1.80-1.80.0_1
+libboost_timer.so.1.80.0 libboost_timer1.80-1.80.0_1
+libboost_random.so.1.80.0 libboost_random1.80-1.80.0_1
+libboost_filesystem.so.1.80.0 libboost_filesystem1.80-1.80.0_1
+libboost_unit_test_framework.so.1.80.0 libboost_unit_test_framework1.80-1.80.0_1
+libboost_math_c99.so.1.80.0 libboost_math_c991.80-1.80.0_1
+libboost_math_tr1.so.1.80.0 libboost_math_tr11.80-1.80.0_1
+libboost_nowide.so.1.80.0 libboost_nowide1.80-1.80.0_1
+libboost_json.so.1.80.0 libboost_json1.80-1.80.0_1
+libboost_regex.so.1.80.0 libboost_regex1.80-1.80.0_1
+libboost_serialization.so.1.80.0 libboost_serialization1.80-1.80.0_1
+libboost_chrono.so.1.80.0 libboost_chrono1.80-1.80.0_1
+libboost_wserialization.so.1.80.0 libboost_wserialization1.80-1.80.0_1
+libboost_graph.so.1.80.0 libboost_graph1.80-1.80.0_1
+libboost_log.so.1.80.0 libboost_log1.80-1.80.0_1
+libboost_locale.so.1.80.0 libboost_locale1.80-1.80.0_1
+libboost_program_options.so.1.80.0 libboost_program_options1.80-1.80.0_1
+libboost_iostreams.so.1.80.0 libboost_iostreams1.80-1.80.0_1
+libboost_system.so.1.80.0 libboost_system1.80-1.80.0_1
+libboost_thread.so.1.80.0 libboost_thread1.80-1.80.0_1
+libboost_log_setup.so.1.80.0 libboost_log_setup1.80-1.80.0_1
+libboost_date_time.so.1.80.0 libboost_date_time1.80-1.80.0_1
+libboost_wave.so.1.80.0 libboost_wave1.80-1.80.0_1
+libboost_atomic.so.1.80.0 libboost_atomic1.80-1.80.0_1
+libboost_type_erasure.so.1.80.0 libboost_type_erasure1.80-1.80.0_1
+libboost_fiber.so.1.80.0 libboost_fiber1.80-1.80.0_1
+libboost_stacktrace_noop.so.1.80.0 libboost_stacktrace_noop1.80-1.80.0_1
+libboost_stacktrace_addr2line.so.1.80.0 libboost_stacktrace_addr2line1.80-1.80.0_1
+libboost_stacktrace_basic.so.1.80.0 libboost_stacktrace_basic1.80-1.80.0_1
+libboost_python310.so.1.80.0 boost-python3-1.80-1.80.0_6
libexempi.so.8 exempi-2.5.0_1
libatasmart.so.4 libatasmart-0.17_1
libsgutils2-1.45.so.2 libsgutils-1.45_1
diff --git a/srcpkgs/boost-python1.72 b/srcpkgs/boost-python3-1.80
similarity index 100%
rename from srcpkgs/boost-python1.72
rename to srcpkgs/boost-python3-1.80
diff --git a/srcpkgs/boost/patches/0001-compat-glibc-2.34.patch b/srcpkgs/boost/patches/0001-compat-glibc-2.34.patch
deleted file mode 100644
index e1e5711e59f2..000000000000
--- a/srcpkgs/boost/patches/0001-compat-glibc-2.34.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 74fb0a26099bc51d717f5f154b37231ce7df3e98 Mon Sep 17 00:00:00 2001
-From: Rob Boehne <robb@datalogics.com>
-Date: Wed, 20 Nov 2019 11:25:20 -0600
-Subject: [PATCH] Revert change to elide a warning that caused Solaris builds
- to fail.
-
----
- include/boost/thread/pthread/thread_data.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/boost/thread/pthread/thread_data.hpp b/include/boost/thread/pthread/thread_data.hpp
-index aefbeb43c..bc9b1367a 100644
---- a/boost/thread/pthread/thread_data.hpp
-+++ b/boost/thread/pthread/thread_data.hpp
-@@ -57,7 +57,7 @@ namespace boost
- #else
- std::size_t page_size = ::sysconf( _SC_PAGESIZE);
- #endif
--#if PTHREAD_STACK_MIN > 0
-+#ifdef PTHREAD_STACK_MIN
- if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
- #endif
- size = ((size+page_size-1)/page_size)*page_size;
diff --git a/srcpkgs/boost/patches/0002-compat-glibc-2.34.patch b/srcpkgs/boost/patches/0002-compat-glibc-2.34.patch
deleted file mode 100644
index baf7c517f8b4..000000000000
--- a/srcpkgs/boost/patches/0002-compat-glibc-2.34.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f9d0e594d43afcb4ab0043117249feb266ba4515 Mon Sep 17 00:00:00 2001
-From: Romain Geissler <romain.geissler@amadeus.com>
-Date: Tue, 10 Aug 2021 14:22:28 +0000
-Subject: [PATCH] Fix -Wsign-compare warning with glibc 2.34 on Linux
- platforms.
-
-In file included from /data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/thread_only.hpp:17,
- from /data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/thread.hpp:12,
- from src/GetTest.cpp:12:
-/data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/pthread/thread_data.hpp: In member function 'void boost::thread_attributes::set_stack_size(std::size_t)':
-/data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/pthread/thread_data.hpp:61:19: error: comparison of integer expressions of different signedness: 'std::size_t' {aka 'long unsigned int'} and 'long int' [-Werror=sign-compare]
- 61 | if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
- | ^
----
- include/boost/thread/pthread/thread_data.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/boost/thread/pthread/thread_data.hpp b/include/boost/thread/pthread/thread_data.hpp
-index bc9b1367a..c43b276d1 100644
---- a/boost/thread/pthread/thread_data.hpp
-+++ b/boost/thread/pthread/thread_data.hpp
-@@ -58,7 +58,7 @@ namespace boost
- std::size_t page_size = ::sysconf( _SC_PAGESIZE);
- #endif
- #ifdef PTHREAD_STACK_MIN
-- if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
-+ if (size<static_cast<std::size_t>(PTHREAD_STACK_MIN)) size=PTHREAD_STACK_MIN;
- #endif
- size = ((size+page_size-1)/page_size)*page_size;
- int res = pthread_attr_setstacksize(&val_, size);
diff --git a/srcpkgs/boost/patches/exec_file.patch b/srcpkgs/boost/patches/exec_file.patch
deleted file mode 100644
index b1b0ef969c4d..000000000000
--- a/srcpkgs/boost/patches/exec_file.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From d9f06052e28873037db7f98629bce72182a42410 Mon Sep 17 00:00:00 2001
-From: Pat Riehecky <riehecky@fnal.gov>
-Date: Mon, 29 Jun 2020 10:51:58 -0500
-Subject: [PATCH] Convert Python 3.1+ to use public C API for filenames
-
- [
- Ed.: Paths were adapted from upstream commit
- https://github.com/boostorg/python/commit/d9f06052e28873037db7f98629bce72182a42410
- ]
-
----
- src/exec.cpp | 16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/libs/python/src/exec.cpp b/libs/python/src/exec.cpp
-index 171c6f4189..b2eabe59f6 100644
---- a/libs/python/src/exec.cpp
-+++ b/libs/python/src/exec.cpp
-@@ -104,14 +104,22 @@ object BOOST_PYTHON_DECL exec_file(char const *filename, object global, object l
- if (local.is_none()) local = global;
- // should be 'char const *' but older python versions don't use 'const' yet.
- char *f = const_cast<char *>(filename);
-- // Let python open the file to avoid potential binary incompatibilities.
--#if PY_VERSION_HEX >= 0x03040000
-- FILE *fs = _Py_fopen(f, "r");
-+#if PY_VERSION_HEX >= 0x03010000
-+ // Let python manage any UTF bits to avoid potential incompatibilities.
-+ PyObject *fo = Py_BuildValue("s", f);
-+ PyObject *fb = Py_None;
-+ PyUnicode_FSConverter(fo, &fb);
-+ f = PyBytes_AsString(fb);
-+ FILE *fs = fopen(f, "r");
-+ Py_DECREF(fo);
-+ Py_DECREF(fb);
- #elif PY_VERSION_HEX >= 0x03000000
-+ // Let python open the file to avoid potential binary incompatibilities.
- PyObject *fo = Py_BuildValue("s", f);
-- FILE *fs = _Py_fopen(fo, "r");
-+ FILE *fs = _Py_fopen(fo, "r"); // Private CPython API
- Py_DECREF(fo);
- #else
-+ // Let python open the file to avoid potential binary incompatibilities.
- PyObject *pyfile = PyFile_FromString(f, const_cast<char*>("r"));
- if (!pyfile) throw std::invalid_argument(std::string(f) + " : no such file");
- python::handle<> file(pyfile);
diff --git a/srcpkgs/boost/patches/install-strip-destdir.patch b/srcpkgs/boost/patches/install-strip-destdir.patch
new file mode 100644
index 000000000000..61047c5967b1
--- /dev/null
+++ b/srcpkgs/boost/patches/install-strip-destdir.patch
@@ -0,0 +1,27 @@
+--- a/tools/boost_install/boost-install.jam
++++ b/tools/boost_install/boost-install.jam
+@@ -678,6 +678,16 @@ local rule path-native-fwd ( path )
+ return $(path) ;
+ }
+
++local rule path-strip-destdir ( path )
++{
++ local parts = [ MATCH "^(/destdir(/[^/]+)?/boost-[0-9.]+)(/.*)" : $(path) ] ;
++ if $(parts)
++ {
++ path = $(parts[3]) ;
++ }
++ return $(path) ;
++}
++
+ local rule get-dir ( name : dir )
+ {
+ if [ path.is-rooted $(dir) ]
+@@ -756,6 +766,7 @@ rule generate-cmake-config- ( target : s
+ if [ path.is-rooted $(cmakedir) ]
+ {
+ local cmakedir-native = [ path-native-fwd $(cmakedir) ] ;
++ cmakedir-native = [ path-strip-destdir $(cmakedir-native) ] ;
+
+ print.text
+
diff --git a/srcpkgs/boost/patches/mips.patch b/srcpkgs/boost/patches/mips.patch
deleted file mode 100644
index a10a2122d9c7..000000000000
--- a/srcpkgs/boost/patches/mips.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/boost/fiber/detail/cpu_relax.hpp 2017-09-02 11:56:11.000000000 +0200
-+++ b/boost/fiber/detail/cpu_relax.hpp 2017-11-09 17:25:40.258995963 +0100
-@@ -48,7 +48,7 @@
- # define cpu_relax() asm volatile ("nop" ::: "memory");
- # endif
- #elif BOOST_ARCH_MIPS
--# define cpu_relax() asm volatile ("pause" ::: "memory");
-+# define cpu_relax() asm volatile ("nop" ::: "memory");
- #elif BOOST_ARCH_PPC
- // http://code.metager.de/source/xref/gnu/glibc/sysdeps/powerpc/sys/platform/ppc.h
- // http://stackoverflow.com/questions/5425506/equivalent-of-x86-pause-instruction-for-ppc
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index f0c5afcec9e8..0d103e335b52 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,53 +1,52 @@
# Template file for 'boost'
pkgname=boost
-version=1.72.0
-revision=9
+version=1.80.0
+revision=1
wrksrc="${pkgname}_${version//\./_}"
-hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
-makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
+hostmakedepends="which bzip2-devel icu-devel python3-devel pkg-config"
+makedepends="zlib-devel bzip2-devel icu-devel python3-devel liblzma-devel
+ libzstd-devel"
short_desc="Free peer-reviewed portable C++ source libraries"
maintainer="John <me@johnnynator.dev>"
license="BSL-1.0"
homepage="http://www.boost.org/"
distfiles="https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${version//./_}.tar.bz2"
-checksum=59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722
+checksum=1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0
python_version=3
-CXXFLAGS="-std=c++14"
-
-replaces="libboost_program_options1.69>=0 libboost_math_c99f1.69>=0
- libboost_stacktrace_basic1.69>=0 libboost_stacktrace_noop1.69>=0
- libboost_iostreams1.69>=0 libboost_math_tr1l1.69>=0 libboost_filesystem1.69>=0
- libboost_chrono1.69>=0 libboost_math_tr1f1.69>=0 libboost_wave1.69>=0
- libboost_graph1.69>=0 libboost_locale1.69>=0 libboost_regex1.69>=0
- libboost_fiber1.69>=0 libboost_type_erasure1.69>=0 libboost_coroutine1.69>=0
- libboost_atomic1.69>=0 libboost_prg_exec_monitor1.69>=0 libboost_math_c991.69>=0
- boost-python3-1.69>=0 libboost_log_setup1.69>=0 boost1.69>=0-devel
- libboost_timer1.69>=0 libboost_system1.69>=0 libboost_unit_test_framework1.69>=0
- libboost_serialization1.69>=0 libboost_math_tr11.69>=0 boost1.69>=0-build
- libboost_math_c99l1.69>=0 boost-python1.69>=0 libboost_contract1.69>=0
- libboost_date_time1.69>=0 libboost_log1.69>=0 libboost_random1.69>=0
- libboost_thread1.69>=0 libboost_container1.69>=0 boost1.69>=0-jam
- libboost_wserialization1.69>=0 libboost_context1.69>=0
- libboost_stacktrace_addr2line1.69>=0"
-
-subpackages="libboost_program_options1.72 libboost_math_c99f1.72
- libboost_stacktrace_basic1.72 libboost_stacktrace_noop1.72
- libboost_iostreams1.72 libboost_math_tr1l1.72 libboost_filesystem1.72
- libboost_chrono1.72 libboost_math_tr1f1.72 libboost_wave1.72
- libboost_graph1.72 libboost_locale1.72 libboost_regex1.72
- libboost_fiber1.72 libboost_type_erasure1.72 libboost_coroutine1.72
- libboost_atomic1.72 libboost_prg_exec_monitor1.72 libboost_math_c991.72
- boost-python3-1.72 libboost_log_setup1.72 boost-devel
- libboost_timer1.72 libboost_system1.72 libboost_unit_test_framework1.72
- libboost_serialization1.72 libboost_math_tr11.72 boost-build
- libboost_math_c99l1.72 boost-python1.72 libboost_contract1.72
- libboost_date_time1.72 libboost_log1.72 libboost_random1.72
- libboost_thread1.72 libboost_container1.72 boost-jam
- libboost_wserialization1.72 libboost_context1.72"
+replaces="libboost_program_options1.72>=0 libboost_math_c99f1.72>=0
+ libboost_stacktrace_basic1.72>=0 libboost_stacktrace_noop1.72>=0
+ libboost_iostreams1.72>=0 libboost_math_tr1l1.72>=0 libboost_filesystem1.72>=0
+ libboost_chrono1.72>=0 libboost_math_tr1f1.72>=0 libboost_wave1.72>=0
+ libboost_graph1.72>=0 libboost_locale1.72>=0 libboost_regex1.72>=0
+ libboost_fiber1.72>=0 libboost_type_erasure1.72>=0 libboost_coroutine1.72>=0
+ libboost_atomic1.72>=0 libboost_prg_exec_monitor1.72>=0 libboost_math_c991.72>=0
+ boost-python3-1.72>=0 libboost_log_setup1.72>=0
+ libboost_timer1.72>=0 libboost_system1.72>=0 libboost_unit_test_framework1.72>=0
+ libboost_serialization1.72>=0 libboost_math_tr11.72>=0
+ libboost_math_c99l1.72>=0 boost-python1.72>=0 libboost_contract1.72>=0
+ libboost_date_time1.72>=0 libboost_log1.72>=0 libboost_random1.72>=0
+ libboost_thread1.72>=0 libboost_container1.72>=0
+ libboost_wserialization1.72>=0 libboost_context1.72>=0
+ libboost_stacktrace_addr2line1.72>=0"
+
+subpackages="libboost_program_options1.80 libboost_math_c99f1.80
+ libboost_stacktrace_basic1.80 libboost_stacktrace_noop1.80
+ libboost_iostreams1.80 libboost_math_tr1l1.80 libboost_filesystem1.80
+ libboost_chrono1.80 libboost_math_tr1f1.80 libboost_wave1.80
+ libboost_graph1.80 libboost_locale1.80 libboost_regex1.80
+ libboost_fiber1.80 libboost_type_erasure1.80 libboost_coroutine1.80
+ libboost_atomic1.80 libboost_prg_exec_monitor1.80 libboost_math_c991.80
+ boost-python3-1.80 libboost_log_setup1.80 boost-devel libboost_json1.80
+ libboost_timer1.80 libboost_system1.80 libboost_unit_test_framework1.80
+ libboost_serialization1.80 libboost_math_tr11.80 boost-build
+ libboost_math_c99l1.80 libboost_contract1.80 libboost_nowide1.80
+ libboost_date_time1.80 libboost_log1.80 libboost_random1.80
+ libboost_thread1.80 libboost_container1.80 boost-jam
+ libboost_wserialization1.80 libboost_context1.80"
if [ -z "$CROSS_BUILD" ]; then
- subpackages+=" libboost_stacktrace_addr2line1.72"
+ subpackages+=" libboost_stacktrace_addr2line1.80"
fi
case "$XBPS_TARGET_MACHINE" in
@@ -60,38 +59,40 @@ case "$XBPS_TARGET_MACHINE" in
esac
do_build() {
- CXX=${BUILD_CXX} CXXFLAGS=${BUILD_CXXFLAGS} ./bootstrap.sh \
- --prefix=${DESTDIR}/usr --with-python=${XBPS_CROSS_BASE}/usr/bin/python3 \
+ # bootstrap.sh will reset CXX and CXXFLAGS (L229)
+ ./bootstrap.sh --with-toolset=gcc \
+ --prefix=${DESTDIR}/usr --with-python=/usr/bin/python3 \
--with-python-root=${XBPS_CROSS_BASE}/usr
(
# Rebuild bjam for target
cd tools/build/src/engine
- ./build.sh gcc
+ CXXFLAGS="$CXXFLAGS -fdebug-prefix-map=$PWD=."
+ # toolset gcc will force gcc -x c++ -O2 -s
+ # toolset cxx will use CXX and CXXFLAGS
+ CXX_VERSION_OPT=--version ./build.sh cxx
)
cat > user-config.jam <<-__EOF
using gcc : : ${CXX} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
- using python : 2.7 : ${XBPS_CROSS_BASE}/usr/bin/python2 : ${XBPS_CROSS_BASE}/usr/include/python2.7 : ${XBPS_CROSS_BASE}/usr/lib/python2.7 ;
- using python : ${py3_ver} : ${XBPS_CROSS_BASE}/usr/bin/python3 : ${XBPS_CROSS_BASE}/${py3_inc} : ${XBPS_CROSS_BASE}/${py3_lib} ;
+ using python : ${py3_ver} : /usr/bin/python3 : ${XBPS_CROSS_BASE}/${py3_inc} : ${XBPS_CROSS_BASE}/${py3_lib} ;
__EOF
- # --no-cmake-config should be removed with boost-1.71 or later
./b2 ${makejobs} \
--user-config=${wrksrc}/user-config.jam --debug-building \
- --no-cmake-config \
- --toolset=gcc abi=${_abi} architecture=${_arch} python=2.7,${py3_ver} \
+ --toolset=gcc abi=${_abi} architecture=${_arch} python=${py3_ver} \
threading=multi runtime-link=shared link=shared,static
}
do_install() {
# Install bjam
# XXX: make bjam a symlink to b2
- for _b in bjam b2; do
+ for _b in b2; do
vbin tools/build/src/engine/${_b}
done
+ ln -sf b2 "$DESTDIR/usr/bin/bjam"
# Install headers/libs
./b2 --prefix=${DESTDIR}/usr abi=${_abi} architecture=${_arch} \
- --user-config=${wrksrc}/user-config.jam --no-cmake-config \
- python=2.7,${py3_ver} threading=multi runtime-link=shared link=shared,static \
+ --user-config=${wrksrc}/user-config.jam \
+ python=${py3_ver} threading=multi runtime-link=shared link=shared,static \
install
# Install Boost.Build stuff.
@@ -119,15 +120,7 @@ boost-jam_package() {
vmove usr/bin/b2
}
}
-boost-python1.72_package() {
- depends="boost python"
- replaces="boost-python>=0"
- short_desc+=" - Python bindings"
- pkg_install() {
- vmove "usr/lib/libboost_python2*.so.*"
- }
-}
-boost-python3-1.72_package() {
+boost-python3-1.80_package() {
depends="boost python3"
replaces="boost-python3>=0"
short_desc+=" - Python3 bindings"
@@ -149,12 +142,13 @@ boost-devel_package() {
short_desc+=" - development files"
pkg_install() {
vmove usr/include
+ vmove usr/lib/cmake
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
}
}
-libboost_atomic1.72_package() {
+libboost_atomic1.80_package() {
depends="boost"
short_desc+=" - libboost_atomic"
pkg_install() {
@@ -162,7 +156,7 @@ libboost_atomic1.72_package() {
}
}
-libboost_chrono1.72_package() {
+libboost_chrono1.80_package() {
depends="boost"
short_desc+=" - libboost_chrono"
pkg_install() {
@@ -170,7 +164,7 @@ libboost_chrono1.72_package() {
}
}
-libboost_container1.72_package() {
+libboost_container1.80_package() {
depends="boost"
short_desc+=" - libboost_container"
pkg_install() {
@@ -178,7 +172,7 @@ libboost_container1.72_package() {
}
}
-libboost_context1.72_package() {
+libboost_context1.80_package() {
depends="boost"
short_desc+=" - libboost_context"
pkg_install() {
@@ -186,7 +180,7 @@ libboost_context1.72_package() {
}
}
-libboost_contract1.72_package() {
+libboost_contract1.80_package() {
depends="boost"
short_desc+=" - libboost_contract"
pkg_install() {
@@ -194,7 +188,7 @@ libboost_contract1.72_package() {
}
}
-libboost_coroutine1.72_package() {
+libboost_coroutine1.80_package() {
depends="boost"
short_desc+=" - libboost_coroutine"
pkg_install() {
@@ -202,7 +196,7 @@ libboost_coroutine1.72_package() {
}
}
-libboost_date_time1.72_package() {
+libboost_date_time1.80_package() {
depends="boost"
short_desc+=" - libboost_date_time"
pkg_install() {
@@ -210,7 +204,7 @@ libboost_date_time1.72_package() {
}
}
-libboost_fiber1.72_package() {
+libboost_fiber1.80_package() {
depends="boost"
short_desc+=" - libboost_fiber"
pkg_install() {
@@ -218,7 +212,7 @@ libboost_fiber1.72_package() {
}
}
-libboost_filesystem1.72_package() {
+libboost_filesystem1.80_package() {
depends="boost"
short_desc+=" - libboost_filesystem"
pkg_install() {
@@ -226,7 +220,7 @@ libboost_filesystem1.72_package() {
}
}
-libboost_graph1.72_package() {
+libboost_graph1.80_package() {
depends="boost"
short_desc+=" - libboost_graph"
pkg_install() {
@@ -234,7 +228,7 @@ libboost_graph1.72_package() {
}
}
-libboost_iostreams1.72_package() {
+libboost_iostreams1.80_package() {
depends="boost"
short_desc+=" - libboost_iostreams"
pkg_install() {
@@ -242,7 +236,7 @@ libboost_iostreams1.72_package() {
}
}
-libboost_locale1.72_package() {
+libboost_locale1.80_package() {
depends="boost"
short_desc+=" - libboost_locale"
pkg_install() {
@@ -250,7 +244,7 @@ libboost_locale1.72_package() {
}
}
-libboost_log1.72_package() {
+libboost_log1.80_package() {
depends="boost"
short_desc+=" - libboost_log"
pkg_install() {
@@ -258,7 +252,7 @@ libboost_log1.72_package() {
}
}
-libboost_log_setup1.72_package() {
+libboost_log_setup1.80_package() {
depends="boost"
short_desc+=" - libboost_log_setup"
pkg_install() {
@@ -266,7 +260,7 @@ libboost_log_setup1.72_package() {
}
}
-libboost_math_c991.72_package() {
+libboost_math_c991.80_package() {
depends="boost"
short_desc+=" - libboost_math_c99"
pkg_install() {
@@ -274,7 +268,7 @@ libboost_math_c991.72_package() {
}
}
-libboost_math_c99f1.72_package() {
+libboost_math_c99f1.80_package() {
depends="boost"
short_desc+=" - libboost_math_c99f"
pkg_install() {
@@ -282,7 +276,7 @@ libboost_math_c99f1.72_package() {
}
}
-libboost_math_c99l1.72_package() {
+libboost_math_c99l1.80_package() {
depends="boost"
short_desc+=" - libboost_math_c99l"
pkg_install() {
@@ -290,7 +284,15 @@ libboost_math_c99l1.72_package() {
}
}
-libboost_math_tr11.72_package() {
+libboost_json1.80_package() {
+ depends="boost"
+ short_desc+=" - libboost_json"
+ pkg_install() {
+ vmove usr/lib/libboost_json.so.*
+ }
+}
+
+libboost_math_tr11.80_package() {
depends="boost"
short_desc+=" - libboost_math_tr1"
pkg_install() {
@@ -298,7 +300,7 @@ libboost_math_tr11.72_package() {
}
}
-libboost_math_tr1f1.72_package() {
+libboost_math_tr1f1.80_package() {
depends="boost"
short_desc+=" - libboost_math_tr1f"
pkg_install() {
@@ -306,7 +308,7 @@ libboost_math_tr1f1.72_package() {
}
}
-libboost_math_tr1l1.72_package() {
+libboost_math_tr1l1.80_package() {
depends="boost"
short_desc+=" - libboost_math_tr1l"
pkg_install() {
@@ -314,7 +316,15 @@ libboost_math_tr1l1.72_package() {
}
}
-libboost_prg_exec_monitor1.72_package() {
+libboost_nowide1.80_package() {
+ depends="boost"
+ short_desc+=" - libboost_nowide"
+ pkg_install() {
+ vmove usr/lib/libboost_nowide.so.*
+ }
+}
+
+libboost_prg_exec_monitor1.80_package() {
depends="boost"
short_desc+=" - libboost_prg_exec_monitor"
pkg_install() {
@@ -322,7 +332,7 @@ libboost_prg_exec_monitor1.72_package() {
}
}
-libboost_program_options1.72_package() {
+libboost_program_options1.80_package() {
depends="boost"
short_desc+=" - libboost_program_options"
pkg_install() {
@@ -330,7 +340,7 @@ libboost_program_options1.72_package() {
}
}
-libboost_random1.72_package() {
+libboost_random1.80_package() {
depends="boost"
short_desc+=" - libboost_random"
pkg_install() {
@@ -338,7 +348,7 @@ libboost_random1.72_package() {
}
}
-libboost_regex1.72_package() {
+libboost_regex1.80_package() {
depends="boost"
short_desc+=" - libboost_regex"
pkg_install() {
@@ -346,7 +356,7 @@ libboost_regex1.72_package() {
}
}
-libboost_serialization1.72_package() {
+libboost_serialization1.80_package() {
depends="boost"
short_desc+=" - libboost_serialization"
pkg_install() {
@@ -354,7 +364,7 @@ libboost_serialization1.72_package() {
}
}
-libboost_stacktrace_addr2line1.72_package() {
+libboost_stacktrace_addr2line1.80_package() {
depends="boost"
short_desc+=" - libboost_stacktrace_addr2line"
pkg_install() {
@@ -362,7 +372,7 @@ libboost_stacktrace_addr2line1.72_package() {
}
}
-libboost_stacktrace_basic1.72_package() {
+libboost_stacktrace_basic1.80_package() {
depends="boost"
short_desc+=" - libboost_stacktrace_basic"
pkg_install() {
@@ -370,7 +380,7 @@ libboost_stacktrace_basic1.72_package() {
}
}
-libboost_stacktrace_noop1.72_package() {
+libboost_stacktrace_noop1.80_package() {
depends="boost"
short_desc+=" - libboost_stacktrace_noop"
pkg_install() {
@@ -378,7 +388,7 @@ libboost_stacktrace_noop1.72_package() {
}
}
-libboost_system1.72_package() {
+libboost_system1.80_package() {
depends="boost"
short_desc+=" - libboost_system"
pkg_install() {
@@ -386,7 +396,7 @@ libboost_system1.72_package() {
}
}
-libboost_thread1.72_package() {
+libboost_thread1.80_package() {
depends="boost"
short_desc+=" - libboost_thread"
pkg_install() {
@@ -394,7 +404,7 @@ libboost_thread1.72_package() {
}
}
-libboost_timer1.72_package() {
+libboost_timer1.80_package() {
depends="boost"
short_desc+=" - libboost_timer"
pkg_install() {
@@ -402,7 +412,7 @@ libboost_timer1.72_package() {
}
}
-libboost_type_erasure1.72_package() {
+libboost_type_erasure1.80_package() {
depends="boost"
short_desc+=" - libboost_type_erasure"
pkg_install() {
@@ -410,7 +420,7 @@ libboost_type_erasure1.72_package() {
}
}
-libboost_unit_test_framework1.72_package() {
+libboost_unit_test_framework1.80_package() {
depends="boost"
short_desc+=" - libboost_unit_test_framework"
pkg_install() {
@@ -418,7 +428,7 @@ libboost_unit_test_framework1.72_package() {
}
}
-libboost_wave1.72_package() {
+libboost_wave1.80_package() {
depends="boost"
short_desc+=" - libboost_wave"
pkg_install() {
@@ -426,7 +436,7 @@ libboost_wave1.72_package() {
}
}
-libboost_wserialization1.72_package() {
+libboost_wserialization1.80_package() {
depends="boost"
short_desc+=" - libboost_wserialization"
pkg_install() {
diff --git a/srcpkgs/boost-python3-1.72 b/srcpkgs/libboost_atomic1.80
similarity index 100%
rename from srcpkgs/boost-python3-1.72
rename to srcpkgs/libboost_atomic1.80
diff --git a/srcpkgs/libboost_atomic1.72 b/srcpkgs/libboost_chrono1.80
similarity index 100%
rename from srcpkgs/libboost_atomic1.72
rename to srcpkgs/libboost_chrono1.80
diff --git a/srcpkgs/libboost_chrono1.72 b/srcpkgs/libboost_container1.80
similarity index 100%
rename from srcpkgs/libboost_chrono1.72
rename to srcpkgs/libboost_container1.80
diff --git a/srcpkgs/libboost_container1.72 b/srcpkgs/libboost_context1.80
similarity index 100%
rename from srcpkgs/libboost_container1.72
rename to srcpkgs/libboost_context1.80
diff --git a/srcpkgs/libboost_context1.72 b/srcpkgs/libboost_contract1.80
similarity index 100%
rename from srcpkgs/libboost_context1.72
rename to srcpkgs/libboost_contract1.80
diff --git a/srcpkgs/libboost_contract1.72 b/srcpkgs/libboost_coroutine1.80
similarity index 100%
rename from srcpkgs/libboost_contract1.72
rename to srcpkgs/libboost_coroutine1.80
diff --git a/srcpkgs/libboost_coroutine1.72 b/srcpkgs/libboost_date_time1.80
similarity index 100%
rename from srcpkgs/libboost_coroutine1.72
rename to srcpkgs/libboost_date_time1.80
diff --git a/srcpkgs/libboost_date_time1.72 b/srcpkgs/libboost_fiber1.80
similarity index 100%
rename from srcpkgs/libboost_date_time1.72
rename to srcpkgs/libboost_fiber1.80
diff --git a/srcpkgs/libboost_fiber1.72 b/srcpkgs/libboost_filesystem1.80
similarity index 100%
rename from srcpkgs/libboost_fiber1.72
rename to srcpkgs/libboost_filesystem1.80
diff --git a/srcpkgs/libboost_filesystem1.72 b/srcpkgs/libboost_graph1.80
similarity index 100%
rename from srcpkgs/libboost_filesystem1.72
rename to srcpkgs/libboost_graph1.80
diff --git a/srcpkgs/libboost_graph1.72 b/srcpkgs/libboost_iostreams1.80
similarity index 100%
rename from srcpkgs/libboost_graph1.72
rename to srcpkgs/libboost_iostreams1.80
diff --git a/srcpkgs/libboost_iostreams1.72 b/srcpkgs/libboost_json1.80
similarity index 100%
rename from srcpkgs/libboost_iostreams1.72
rename to srcpkgs/libboost_json1.80
diff --git a/srcpkgs/libboost_locale1.72 b/srcpkgs/libboost_locale1.80
similarity index 100%
rename from srcpkgs/libboost_locale1.72
rename to srcpkgs/libboost_locale1.80
diff --git a/srcpkgs/libboost_log1.72 b/srcpkgs/libboost_log1.80
similarity index 100%
rename from srcpkgs/libboost_log1.72
rename to srcpkgs/libboost_log1.80
diff --git a/srcpkgs/libboost_log_setup1.72 b/srcpkgs/libboost_log_setup1.80
similarity index 100%
rename from srcpkgs/libboost_log_setup1.72
rename to srcpkgs/libboost_log_setup1.80
diff --git a/srcpkgs/libboost_math_c991.72 b/srcpkgs/libboost_math_c991.80
similarity index 100%
rename from srcpkgs/libboost_math_c991.72
rename to srcpkgs/libboost_math_c991.80
diff --git a/srcpkgs/libboost_math_c99f1.72 b/srcpkgs/libboost_math_c99f1.80
similarity index 100%
rename from srcpkgs/libboost_math_c99f1.72
rename to srcpkgs/libboost_math_c99f1.80
diff --git a/srcpkgs/libboost_math_c99l1.72 b/srcpkgs/libboost_math_c99l1.80
similarity index 100%
rename from srcpkgs/libboost_math_c99l1.72
rename to srcpkgs/libboost_math_c99l1.80
diff --git a/srcpkgs/libboost_math_tr11.72 b/srcpkgs/libboost_math_tr11.80
similarity index 100%
rename from srcpkgs/libboost_math_tr11.72
rename to srcpkgs/libboost_math_tr11.80
diff --git a/srcpkgs/libboost_math_tr1f1.72 b/srcpkgs/libboost_math_tr1f1.80
similarity index 100%
rename from srcpkgs/libboost_math_tr1f1.72
rename to srcpkgs/libboost_math_tr1f1.80
diff --git a/srcpkgs/libboost_math_tr1l1.72 b/srcpkgs/libboost_math_tr1l1.80
similarity index 100%
rename from srcpkgs/libboost_math_tr1l1.72
rename to srcpkgs/libboost_math_tr1l1.80
diff --git a/srcpkgs/libboost_prg_exec_monitor1.72 b/srcpkgs/libboost_nowide1.80
similarity index 100%
rename from srcpkgs/libboost_prg_exec_monitor1.72
rename to srcpkgs/libboost_nowide1.80
diff --git a/srcpkgs/libboost_program_options1.72 b/srcpkgs/libboost_prg_exec_monitor1.80
similarity index 100%
rename from srcpkgs/libboost_program_options1.72
rename to srcpkgs/libboost_prg_exec_monitor1.80
diff --git a/srcpkgs/libboost_random1.72 b/srcpkgs/libboost_program_options1.80
similarity index 100%
rename from srcpkgs/libboost_random1.72
rename to srcpkgs/libboost_program_options1.80
diff --git a/srcpkgs/libboost_regex1.72 b/srcpkgs/libboost_random1.80
similarity index 100%
rename from srcpkgs/libboost_regex1.72
rename to srcpkgs/libboost_random1.80
diff --git a/srcpkgs/libboost_serialization1.72 b/srcpkgs/libboost_regex1.80
similarity index 100%
rename from srcpkgs/libboost_serialization1.72
rename to srcpkgs/libboost_regex1.80
diff --git a/srcpkgs/libboost_stacktrace_addr2line1.72 b/srcpkgs/libboost_serialization1.80
similarity index 100%
rename from srcpkgs/libboost_stacktrace_addr2line1.72
rename to srcpkgs/libboost_serialization1.80
diff --git a/srcpkgs/libboost_stacktrace_basic1.72 b/srcpkgs/libboost_stacktrace_addr2line1.80
similarity index 100%
rename from srcpkgs/libboost_stacktrace_basic1.72
rename to srcpkgs/libboost_stacktrace_addr2line1.80
diff --git a/srcpkgs/libboost_stacktrace_noop1.72 b/srcpkgs/libboost_stacktrace_basic1.80
similarity index 100%
rename from srcpkgs/libboost_stacktrace_noop1.72
rename to srcpkgs/libboost_stacktrace_basic1.80
diff --git a/srcpkgs/libboost_system1.72 b/srcpkgs/libboost_stacktrace_noop1.80
similarity index 100%
rename from srcpkgs/libboost_system1.72
rename to srcpkgs/libboost_stacktrace_noop1.80
diff --git a/srcpkgs/libboost_thread1.72 b/srcpkgs/libboost_system1.80
similarity index 100%
rename from srcpkgs/libboost_thread1.72
rename to srcpkgs/libboost_system1.80
diff --git a/srcpkgs/libboost_timer1.72 b/srcpkgs/libboost_thread1.80
similarity index 100%
rename from srcpkgs/libboost_timer1.72
rename to srcpkgs/libboost_thread1.80
diff --git a/srcpkgs/libboost_type_erasure1.72 b/srcpkgs/libboost_timer1.80
similarity index 100%
rename from srcpkgs/libboost_type_erasure1.72
rename to srcpkgs/libboost_timer1.80
diff --git a/srcpkgs/libboost_unit_test_framework1.72 b/srcpkgs/libboost_type_erasure1.80
similarity index 100%
rename from srcpkgs/libboost_unit_test_framework1.72
rename to srcpkgs/libboost_type_erasure1.80
diff --git a/srcpkgs/libboost_wave1.72 b/srcpkgs/libboost_unit_test_framework1.80
similarity index 100%
rename from srcpkgs/libboost_wave1.72
rename to srcpkgs/libboost_unit_test_framework1.80
diff --git a/srcpkgs/libboost_wserialization1.72 b/srcpkgs/libboost_wave1.80
similarity index 100%
rename from srcpkgs/libboost_wserialization1.72
rename to srcpkgs/libboost_wave1.80
diff --git a/srcpkgs/libboost_wserialization1.80 b/srcpkgs/libboost_wserialization1.80
new file mode 120000
index 000000000000..baef819c48f6
--- /dev/null
+++ b/srcpkgs/libboost_wserialization1.80
@@ -0,0 +1 @@
+boost
\ No newline at end of file
From aac5b0c320076e9b5fbc5a3aaa59019ffb7f6f4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 16:51:50 +0700
Subject: [PATCH 002/111] TSC: rebuild for boost-1.80
---
srcpkgs/TSC/patches/boost-1.80.patch | 11 +++++++++++
srcpkgs/TSC/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/TSC/patches/boost-1.80.patch
diff --git a/srcpkgs/TSC/patches/boost-1.80.patch b/srcpkgs/TSC/patches/boost-1.80.patch
new file mode 100644
index 000000000000..19f9ee57bad5
--- /dev/null
+++ b/srcpkgs/TSC/patches/boost-1.80.patch
@@ -0,0 +1,11 @@
+--- a/tsc/scrdg/scrdg.cpp
++++ b/tsc/scrdg/scrdg.cpp
+@@ -15,6 +15,8 @@
+ */
+
+ #include "scrdg.hpp"
++#include <algorithm>
++#include <fstream>
+ #include <iostream>
+ #include <sstream>
+ #include <cstdio>
diff --git a/srcpkgs/TSC/template b/srcpkgs/TSC/template
index 71534315cf7c..469f6d859bc7 100644
--- a/srcpkgs/TSC/template
+++ b/srcpkgs/TSC/template
@@ -1,7 +1,7 @@
# Template file for 'TSC'
pkgname=TSC
version=2.1.0
-revision=2
+revision=3
build_wrksrc=tsc
build_style=cmake
build_helper="qemu"
From f9bc12dd232e66d9f8ddcd00ea62e28eae430313 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:27 +0700
Subject: [PATCH 003/111] 0ad: rebuild for boost-1.80
---
srcpkgs/0ad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 552d2728a7a0..b9f0751c4836 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
# Template file for '0ad'
pkgname=0ad
version=0.0.25b
-revision=3
+revision=4
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
wrksrc="${pkgname}-${version}-alpha"
hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang"
From 307ee123ed00c0f62aa3306bdf1033e4b27f1e30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:27 +0700
Subject: [PATCH 004/111] Aegisub: rebuild for boost-1.80
---
srcpkgs/Aegisub/patches/link-icu18n.patch | 15 +++++++++++++++
srcpkgs/Aegisub/template | 2 +-
2 files changed, 16 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/Aegisub/patches/link-icu18n.patch
diff --git a/srcpkgs/Aegisub/patches/link-icu18n.patch b/srcpkgs/Aegisub/patches/link-icu18n.patch
new file mode 100644
index 000000000000..e5c037ca1f68
--- /dev/null
+++ b/srcpkgs/Aegisub/patches/link-icu18n.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -347,9 +347,9 @@ target_link_libraries(Aegisub PRIVATE "O
+ find_package(Iconv REQUIRED)
+ target_link_libraries(libaegisub PRIVATE "Iconv::Iconv")
+
+-find_package(ICU REQUIRED uc)
+-target_link_libraries(libaegisub PRIVATE "ICU::uc")
+-target_link_libraries(Aegisub PRIVATE "ICU::uc")
++find_package(ICU REQUIRED uc i18n)
++target_link_libraries(libaegisub PRIVATE "ICU::uc" ICU::i18n)
++target_link_libraries(Aegisub PRIVATE "ICU::uc" ICU::i18n)
+
+ find_package(wxWidgets REQUIRED adv base core gl stc xml)
+ include(${wxWidgets_USE_FILE})
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index ff34249aaee4..a68e1ab43089 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
# Template file for 'Aegisub'
pkgname=Aegisub
version=3.3.2
-revision=4
+revision=5
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
cmake_builddir="BUILD"
From 2153123eb7caf8e181bbfedd0de4a6707bf1133b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:27 +0700
Subject: [PATCH 005/111] Field3D: rebuild for boost-1.80
---
srcpkgs/Field3D/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 62f0589e9e0b..9a5af0034d14 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,7 +1,7 @@
# Template file for 'Field3D'
pkgname=Field3D
version=1.7.3
-revision=2
+revision=3
build_style=cmake
makedepends="boost-devel hdf5-devel ilmbase-devel"
short_desc="Library for storing voxel data on disk and in memory"
From aad0918e20e9c119e9436867c7144af472a9785a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:28 +0700
Subject: [PATCH 006/111] LGOGDownloader: rebuild for boost-1.80
---
srcpkgs/LGOGDownloader/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6e7e5c685f83..0778374ad224 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,7 +1,7 @@
# Template file for 'LGOGDownloader'
pkgname=LGOGDownloader
version=3.9
-revision=1
+revision=2
wrksrc="lgogdownloader-${version}"
build_style=cmake
hostmakedepends="pkg-config"
From dbbee38ed589982cc77139c7cb9c0254b2df8ebb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:28 +0700
Subject: [PATCH 007/111] Lucene++: rebuild for boost-1.80
---
srcpkgs/Lucene++/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Lucene++/template b/srcpkgs/Lucene++/template
index 3873189f2dfc..34b6e05393fe 100644
--- a/srcpkgs/Lucene++/template
+++ b/srcpkgs/Lucene++/template
@@ -1,7 +1,7 @@
# Template file for 'Lucene++'
pkgname=Lucene++
version=3.0.7
-revision=11
+revision=12
wrksrc=LucenePlusPlus-rel_$version
build_style=cmake
configure_args="-Wno-dev"
From 94522d0cfa73e0fdef24dfaf6eb1cef069249eba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:28 +0700
Subject: [PATCH 008/111] PrusaSlicer: rebuild for boost-1.80
---
srcpkgs/PrusaSlicer/patches/fstream.patch | 20 ++++++++++++++++++++
srcpkgs/PrusaSlicer/template | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/PrusaSlicer/patches/fstream.patch
diff --git a/srcpkgs/PrusaSlicer/patches/fstream.patch b/srcpkgs/PrusaSlicer/patches/fstream.patch
new file mode 100644
index 000000000000..a766c747f704
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/fstream.patch
@@ -0,0 +1,20 @@
+--- a/src/hints/HintsToPot.cpp
++++ b/src/hints/HintsToPot.cpp
+@@ -2,6 +2,7 @@
+ #include <vector>
+ #include <string>
+ #include <boost/filesystem.hpp>
++#include <boost/filesystem/fstream.hpp>
+ #include <boost/dll.hpp>
+ #include <boost/property_tree/ini_parser.hpp>
+ #include <boost/nowide/fstream.hpp>
+--- a/tests/fff_print/test_data.cpp
++++ b/tests/fff_print/test_data.cpp
+@@ -8,6 +8,7 @@
+ #include "libslic3r/Format/STL.hpp"
+
+ #include <cstdlib>
++#include <fstream>
+ #include <string>
+
+ #include <boost/nowide/cstdio.hpp>
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 931ac73e5c94..29f1f641a488 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
version=2.4.2
-revision=1
+revision=2
wrksrc="PrusaSlicer-version_${version}"
build_style=cmake
build_helper="qemu"
From e88806483836aa572cdfa7d5ebba255b55ef250f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:28 +0700
Subject: [PATCH 009/111] astroid: rebuild for boost-1.80
---
srcpkgs/astroid/template | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/astroid/template b/srcpkgs/astroid/template
index 8ee0e729e134..91e3ca400acd 100644
--- a/srcpkgs/astroid/template
+++ b/srcpkgs/astroid/template
@@ -1,8 +1,9 @@
# Template file for 'astroid'
pkgname=astroid
version=0.16
-revision=5
+revision=6
build_style=cmake
+build_helper=gir
hostmakedepends="pkg-config scdoc protobuf gobject-introspection"
makedepends="libnotmuch-devel gtkmm-devel webkit2gtk-devel libsass-devel
gmime3-devel boost-devel protobuf-devel vte3-devel gobject-introspection
@@ -15,10 +16,6 @@ homepage="http://astroidmail.github.io/"
distfiles="https://github.com/astroidmail/astroid/archive/v${version}.tar.gz"
checksum=32ecb8c2fafe67f70c7d5f2bc60bda1796d98a56a75f7868c7c1ca50cd7baf5e
-if [ -n "$CROSS_BUILD" ]; then
- hostmakedepends+=" qemu-user-static prelink-cross"
-fi
-
do_check() {
cd build
xvfb-run ctest
From 2ba7dd3ae22250df49762551027fac115dc6d205 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:28 +0700
Subject: [PATCH 010/111] bitcoin: rebuild for boost-1.80
---
srcpkgs/bitcoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index ccc9c4cc5f10..9ae457ecb9c5 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=22.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
From e391c1b51dffc38da0271dd1e2dbb3398cb5d616 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:29 +0700
Subject: [PATCH 011/111] blender: rebuild for boost-1.80
---
srcpkgs/blender/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 91799f04fba5..28befed1faf8 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
version=3.0.0
-revision=4
+revision=5
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
From 96fa058277489e7841c4c3767a4b7b97d0d6c118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:29 +0700
Subject: [PATCH 012/111] cclive: rebuild for boost-1.80
---
srcpkgs/cclive/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cclive/template b/srcpkgs/cclive/template
index c43dbb94209c..936be99b866c 100644
--- a/srcpkgs/cclive/template
+++ b/srcpkgs/cclive/template
@@ -1,7 +1,7 @@
# Template file for 'cclive'
pkgname=cclive
version=0.9.3
-revision=5
+revision=6
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="boost-devel pcre-devel libcurl-devel libquvi-devel glibmm-devel"
From 666745c9b9beff31a2305561182257b12d1b402b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:29 +0700
Subject: [PATCH 013/111] cgal: rebuild for boost-1.80
---
srcpkgs/cgal/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cgal/template b/srcpkgs/cgal/template
index 7e28c2b28dfd..d448e8dd3c63 100644
--- a/srcpkgs/cgal/template
+++ b/srcpkgs/cgal/template
@@ -1,7 +1,7 @@
# Template file for 'cgal'
pkgname=cgal
version=4.14
-revision=3
+revision=4
wrksrc="CGAL-${version}"
build_style=cmake
build_helper="qemu"
From cb6a9e7c75676563c13e16bed26c6e4adeff17ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:29 +0700
Subject: [PATCH 014/111] codeblocks: rebuild for boost-1.80
---
.../patches/cross-autorevision.patch | 51 +++++++++++++++++++
srcpkgs/codeblocks/template | 19 +------
2 files changed, 53 insertions(+), 17 deletions(-)
create mode 100644 srcpkgs/codeblocks/patches/cross-autorevision.patch
diff --git a/srcpkgs/codeblocks/patches/cross-autorevision.patch b/srcpkgs/codeblocks/patches/cross-autorevision.patch
new file mode 100644
index 000000000000..7d3ef3acfd29
--- /dev/null
+++ b/srcpkgs/codeblocks/patches/cross-autorevision.patch
@@ -0,0 +1,51 @@
+--- a/src/build_tools/autorevision/Makefile.am
++++ b/src/build_tools/autorevision/Makefile.am
+@@ -1,3 +1,10 @@
++CC = cc
++CXX = g++
++LD = g++
++CFLAGS = -O2 -pipe
++CXXFLAGS = -O2 -pipe
++LDFLAGS = -s
++
+ noinst_PROGRAMS = auto_revision
+ auto_revision_SOURCES = autorevision.cpp
+
+--- a/src/build_tools/autorevision/Makefile.in
++++ b/src/build_tools/autorevision/Makefile.in
+@@ -240,17 +240,17 @@ CB_SQUIRREL_CFLAGS = @CB_SQUIRREL_CFLAGS
+ CB_SQUIRREL_LIBS = @CB_SQUIRREL_LIBS@
+ CB_TINYXML_CFLAGS = @CB_TINYXML_CFLAGS@
+ CB_TINYXML_LIBS = @CB_TINYXML_LIBS@
+-CC = @CC@
++CC = cc
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
++CFLAGS = -O2 -pipe
+ CODEBLOCKS_PLATFORM = @CODEBLOCKS_PLATFORM@
+ CODEBLOCKS_VERSION_INFO = @CODEBLOCKS_VERSION_INFO@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+-CXX = @CXX@
+-CXXCPP = @CXXCPP@
++CPP = cpp
++CPPFLAGS :=
++CXX = g++
++CXXCPP = g++
+ CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
++CXXFLAGS = -O2 -pipe
+ CYGPATH_W = @CYGPATH_W@
+ DATE = @DATE@
+ DEFS = @DEFS@
+@@ -288,8 +288,8 @@ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+-LD = @LD@
+-LDFLAGS = @LDFLAGS@
++LD = g++
++LDFLAGS = -s
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
diff --git a/srcpkgs/codeblocks/template b/srcpkgs/codeblocks/template
index 33b9b9a77853..26487b40f796 100644
--- a/srcpkgs/codeblocks/template
+++ b/srcpkgs/codeblocks/template
@@ -1,11 +1,11 @@
# Template file for 'codeblocks'
pkgname=codeblocks
version=20.03
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-wx-config=wx-config-gtk3 --with-contrib-plugins
--with-boost=${XBPS_CROSS_BASE}/usr --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake libtool pkg-config zip"
+hostmakedepends="libtool pkg-config zip"
makedepends="gtk+3-devel wxWidgets-gtk3-devel tinyxml-devel hunspell-devel
gamin-devel boost-devel boost-build"
short_desc="Free C, C++ and Fortran IDE"
@@ -20,21 +20,6 @@ if [ "$CROSS_BUILD" ]; then
configure_args+=" ac_cv_exeext=no --with-gnu-ld"
fi
-pre_configure() {
- ./bootstrap
- if [ "$CROSS_BUILD" ]; then
- # Patch auto_revision's Makefile.am to use the host compiler and flags
- cd src/build_tools/autorevision
- sed -i Makefile.am \
- -e "/noinst_PROGRAMS = auto_revision/a CC = gcc" \
- -e "/noinst_PROGRAMS = auto_revision/a CXX = g++" \
- -e "/noinst_PROGRAMS = auto_revision/a LD = g++" \
- -e "/noinst_PROGRAMS = auto_revision/a CFLAGS = -O2 -pipe" \
- -e "/noinst_PROGRAMS = auto_revision/a CXXFLAGS = -O2 -pipe" \
- -e "/noinst_PROGRAMS = auto_revision/a LDFLAGS = -s"
- fi
-}
-
post_install() {
vinstall debian/codeblocks.sharedmime 644 /usr/share/mime/packages codeblocks.xml
vinstall src/mime/codeblocks.desktop 644 /usr/share/applications
From 71198a0dbdac6216b30a35521a3470e9643fa74e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:29 +0700
Subject: [PATCH 015/111] colobot: rebuild for boost-1.80
---
srcpkgs/colobot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/colobot/template b/srcpkgs/colobot/template
index 1b415dd2cfad..a7613cad90b5 100644
--- a/srcpkgs/colobot/template
+++ b/srcpkgs/colobot/template
@@ -2,7 +2,7 @@
pkgname=colobot
# needs to be kept in sync with colobot-data (provides game assets)
version=0.2.0
-revision=1
+revision=2
wrksrc="colobot-colobot-gold-${version}-alpha"
build_style=cmake
configure_args="-DCOLOBOT_INSTALL_BIN_DIR=/usr/bin -DOpenGL_GL_PREFERENCE=GLVND"
From a486fbad7bdb49c3f603c9ea258a22623e924135 Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Mon, 29 Aug 2022 10:56:35 +1000
Subject: [PATCH 016/111] cryfs: update to 0.11.2.
---
.../cryfs/patches/allow-build-type-none.patch | 22 ---
srcpkgs/cryfs/patches/de-vendor.patch | 134 +++++++-----------
srcpkgs/cryfs/patches/fix-test.patch | 22 ---
srcpkgs/cryfs/patches/fmt-9-fix.patch | 54 +++++++
.../rename-simple-to-basic-filesink.patch | 21 ---
srcpkgs/cryfs/patches/spdlog-include.patch | 33 -----
srcpkgs/cryfs/template | 13 +-
7 files changed, 109 insertions(+), 190 deletions(-)
delete mode 100644 srcpkgs/cryfs/patches/fix-test.patch
create mode 100644 srcpkgs/cryfs/patches/fmt-9-fix.patch
delete mode 100644 srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch
delete mode 100644 srcpkgs/cryfs/patches/spdlog-include.patch
diff --git a/srcpkgs/cryfs/patches/allow-build-type-none.patch b/srcpkgs/cryfs/patches/allow-build-type-none.patch
index e591974c05f4..ffcf0ee53320 100644
--- a/srcpkgs/cryfs/patches/allow-build-type-none.patch
+++ b/srcpkgs/cryfs/patches/allow-build-type-none.patch
@@ -9,25 +9,3 @@ Index: cryfs-0.10.2/doc/CMakeLists.txt
- CONFIGURATIONS Release
)
ENDIF(WIN32)
-Index: cryfs-0.10.2/src/cryfs-cli/CMakeLists.txt
-===================================================================
---- cryfs-0.10.2.orig/src/cryfs-cli/CMakeLists.txt
-+++ cryfs-0.10.2/src/cryfs-cli/CMakeLists.txt
-@@ -27,6 +27,5 @@ target_enable_style_warnings(${PROJECT_N
- target_activate_cpp14(${PROJECT_NAME}_bin)
-
- install(TARGETS ${PROJECT_NAME}_bin
-- CONFIGURATIONS Debug Release RelWithDebInfo
- DESTINATION ${CMAKE_INSTALL_BINDIR}
- )
-Index: cryfs-0.10.2/src/cryfs-unmount/CMakeLists.txt
-===================================================================
---- cryfs-0.10.2.orig/src/cryfs-unmount/CMakeLists.txt
-+++ cryfs-0.10.2/src/cryfs-unmount/CMakeLists.txt
-@@ -19,6 +19,5 @@ target_enable_style_warnings(${PROJECT_N
- target_activate_cpp14(${PROJECT_NAME}_bin)
-
- install(TARGETS ${PROJECT_NAME}_bin
-- CONFIGURATIONS Debug Release RelWithDebInfo
- DESTINATION ${CMAKE_INSTALL_BINDIR}
- )
diff --git a/srcpkgs/cryfs/patches/de-vendor.patch b/srcpkgs/cryfs/patches/de-vendor.patch
index 4909cad7b84a..09e51f0aa7fc 100644
--- a/srcpkgs/cryfs/patches/de-vendor.patch
+++ b/srcpkgs/cryfs/patches/de-vendor.patch
@@ -1,32 +1,14 @@
-Index: cryfs-0.10.2/src/blockstore/implementations/compressing/compressors/Gzip.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/blockstore/implementations/compressing/compressors/Gzip.cpp
-+++ cryfs-0.10.2/src/blockstore/implementations/compressing/compressors/Gzip.cpp
-@@ -1,6 +1,6 @@
- #include "cpp-utils/crypto/cryptopp_byte.h"
+--- a/src/blockstore/implementations/compressing/compressors/Gzip.cpp 2022-08-25 22:14:05.481898162 +0400
++++ b/src/blockstore/implementations/compressing/compressors/Gzip.cpp 2022-08-25 22:17:49.606653292 +0400
+@@ -1,5 +1,5 @@
#include "Gzip.h"
-#include <vendor_cryptopp/gzip.h>
+#include <cryptopp/gzip.h>
using cpputils::Data;
-Index: cryfs-0.10.2/src/cpp-utils/crypto/cryptopp_byte.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/cryptopp_byte.h
-+++ cryfs-0.10.2/src/cpp-utils/crypto/cryptopp_byte.h
-@@ -2,7 +2,7 @@
- #ifndef _CPPUTILS_CRYPTO_CRYPTOPP_BYTE_H
- #define _CPPUTILS_CRYPTO_CRYPTOPP_BYTE_H
-
--#include <vendor_cryptopp/cryptlib.h>
-+#include <cryptopp/cryptlib.h>
-
- // If we're running an older CryptoPP version, CryptoPP::byte isn't defined yet.
- // Define it. Refer to "byte" type in the global namespace (placed by CryptoPP).
-Index: cryfs-0.10.2/src/cpp-utils/crypto/hash/Hash.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/hash/Hash.cpp
-+++ cryfs-0.10.2/src/cpp-utils/crypto/hash/Hash.cpp
+--- a/src/cpp-utils/crypto/hash/Hash.cpp 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/hash/Hash.cpp 2022-08-25 22:18:07.131800277 +0400
@@ -1,6 +1,6 @@
#include "Hash.h"
#include <cpp-utils/random/Random.h>
@@ -35,10 +17,8 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/hash/Hash.cpp
using cpputils::Random;
using CryptoPP::SHA512;
-Index: cryfs-0.10.2/src/cpp-utils/crypto/kdf/Scrypt.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/kdf/Scrypt.cpp
-+++ cryfs-0.10.2/src/cpp-utils/crypto/kdf/Scrypt.cpp
+--- a/src/cpp-utils/crypto/kdf/Scrypt.cpp 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/kdf/Scrypt.cpp 2022-08-25 22:18:17.754889373 +0400
@@ -1,5 +1,5 @@
#include "Scrypt.h"
-#include <vendor_cryptopp/scrypt.h>
@@ -46,11 +26,9 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/kdf/Scrypt.cpp
using std::string;
-Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
-+++ cryfs-0.10.2/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
-@@ -7,7 +7,7 @@
+--- a/src/cpp-utils/crypto/symmetric/CFB_Cipher.h 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/symmetric/CFB_Cipher.h 2022-08-25 22:18:28.524979704 +0400
+@@ -6,7 +6,7 @@
#include "../../data/Data.h"
#include "../../random/Random.h"
#include <boost/optional.hpp>
@@ -59,24 +37,9 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
#include "Cipher.h"
#include "EncryptionKey.h"
-Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
-+++ cryfs-0.10.2/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
-@@ -6,7 +6,7 @@
- #include "../../data/FixedSizeData.h"
- #include "../../data/Data.h"
- #include "../../random/Random.h"
--#include <vendor_cryptopp/gcm.h>
-+#include <cryptopp/gcm.h>
- #include "Cipher.h"
- #include "EncryptionKey.h"
-
-Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/ciphers.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/symmetric/ciphers.h
-+++ cryfs-0.10.2/src/cpp-utils/crypto/symmetric/ciphers.h
-@@ -2,11 +2,11 @@
+--- a/src/cpp-utils/crypto/symmetric/ciphers.h 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/symmetric/ciphers.h 2022-08-25 22:18:52.181178110 +0400
+@@ -2,12 +2,12 @@
#ifndef MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_
#define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_
@@ -85,30 +48,39 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/ciphers.h
-#include <vendor_cryptopp/serpent.h>
-#include <vendor_cryptopp/cast.h>
-#include <vendor_cryptopp/mars.h>
+-#include <vendor_cryptopp/chachapoly.h>
+#include <cryptopp/aes.h>
+#include <cryptopp/twofish.h>
+#include <cryptopp/serpent.h>
+#include <cryptopp/cast.h>
+#include <cryptopp/mars.h>
++#include <cryptopp/chachapoly.h>
#include "GCM_Cipher.h"
#include "CFB_Cipher.h"
-Index: cryfs-0.10.2/src/cpp-utils/data/Data.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/data/Data.cpp
-+++ cryfs-0.10.2/src/cpp-utils/data/Data.cpp
+--- a/src/cpp-utils/crypto/symmetric/GCM_Cipher.h 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/symmetric/GCM_Cipher.h 2022-08-25 22:18:38.836066183 +0400
+@@ -3,7 +3,7 @@
+ #define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_GCMCIPHER_H_
+
+ #include "AEAD_Cipher.h"
+-#include <vendor_cryptopp/gcm.h>
++#include <cryptopp/gcm.h>
+
+ namespace cpputils {
+
+--- a/src/cpp-utils/data/Data.cpp 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/data/Data.cpp 2022-08-25 22:19:09.349322106 +0400
@@ -1,6 +1,6 @@
#include "Data.h"
#include <stdexcept>
-#include <vendor_cryptopp/hex.h>
+#include <cryptopp/hex.h>
- #include <cpp-utils/crypto/cryptopp_byte.h>
using std::istream;
-Index: cryfs-0.10.2/src/cpp-utils/data/FixedSizeData.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/data/FixedSizeData.h
-+++ cryfs-0.10.2/src/cpp-utils/data/FixedSizeData.h
+ using std::ofstream;
+--- a/src/cpp-utils/data/FixedSizeData.h 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/data/FixedSizeData.h 2022-08-25 22:19:19.103403916 +0400
@@ -2,7 +2,7 @@
#ifndef MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_
#define MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_
@@ -116,25 +88,21 @@ Index: cryfs-0.10.2/src/cpp-utils/data/FixedSizeData.h
-#include <vendor_cryptopp/hex.h>
+#include <cryptopp/hex.h>
#include <string>
+ #include <array>
#include <cstring>
- #include "../assert/assert.h"
-Index: cryfs-0.10.2/src/cpp-utils/random/OSRandomGenerator.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/random/OSRandomGenerator.h
-+++ cryfs-0.10.2/src/cpp-utils/random/OSRandomGenerator.h
-@@ -4,7 +4,7 @@
+--- a/src/cpp-utils/random/OSRandomGenerator.h 2022-08-25 22:14:05.483898156 +0400
++++ b/src/cpp-utils/random/OSRandomGenerator.h 2022-08-25 22:19:29.602491973 +0400
+@@ -3,7 +3,7 @@
+ #define MESSMER_CPPUTILS_RANDOM_OSRANDOMGENERATOR_H
- #include "cpp-utils/crypto/cryptopp_byte.h"
#include "RandomGenerator.h"
-#include <vendor_cryptopp/osrng.h>
+#include <cryptopp/osrng.h>
namespace cpputils {
class OSRandomGenerator final : public RandomGenerator {
-Index: cryfs-0.10.2/src/cpp-utils/random/RandomGeneratorThread.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/random/RandomGeneratorThread.h
-+++ cryfs-0.10.2/src/cpp-utils/random/RandomGeneratorThread.h
+--- a/src/cpp-utils/random/RandomGeneratorThread.h 2022-08-25 22:14:05.484898153 +0400
++++ b/src/cpp-utils/random/RandomGeneratorThread.h 2022-08-25 22:19:36.713551613 +0400
@@ -4,7 +4,7 @@
#include "../thread/LoopThread.h"
@@ -144,10 +112,9 @@ Index: cryfs-0.10.2/src/cpp-utils/random/RandomGeneratorThread.h
namespace cpputils {
//TODO Test
-Index: cryfs-0.10.2/src/cryfs/localstate/BasedirMetadata.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cryfs/localstate/BasedirMetadata.cpp
-+++ cryfs-0.10.2/src/cryfs/localstate/BasedirMetadata.cpp
+diff -Naurp0 -U3 cryfs-0.11.2/src/cryfs/impl/localstate/BasedirMetadata.cpp cryfs-0.11.2-mine/src/cryfs/impl/localstate/BasedirMetadata.cpp
+--- a/src/cryfs/impl/localstate/BasedirMetadata.cpp 2022-08-25 22:14:05.487898144 +0400
++++ b/src/cryfs/impl/localstate/BasedirMetadata.cpp 2022-08-25 22:19:46.722635560 +0400
@@ -1,7 +1,7 @@
#include "BasedirMetadata.h"
#include <boost/property_tree/ptree.hpp>
@@ -157,11 +124,9 @@ Index: cryfs-0.10.2/src/cryfs/localstate/BasedirMetadata.cpp
#include <boost/filesystem/operations.hpp>
#include "LocalStateDir.h"
#include <cpp-utils/logging/logging.h>
-Index: cryfs-0.10.2/test/cryfs/config/CompatibilityTest.cpp
-===================================================================
---- cryfs-0.10.2.orig/test/cryfs/config/CompatibilityTest.cpp
-+++ cryfs-0.10.2/test/cryfs/config/CompatibilityTest.cpp
-@@ -3,7 +3,7 @@
+--- a/test/cryfs/impl/config/CompatibilityTest.cpp 2022-08-25 22:14:05.493898126 +0400
++++ b/test/cryfs/impl/config/CompatibilityTest.cpp 2022-08-25 22:19:54.589701542 +0400
+@@ -2,7 +2,7 @@
#include <vector>
#include <boost/filesystem.hpp>
#include <cpp-utils/data/Data.h>
@@ -169,12 +134,9 @@ Index: cryfs-0.10.2/test/cryfs/config/CompatibilityTest.cpp
+#include <cryptopp/hex.h>
#include <cpp-utils/crypto/symmetric/ciphers.h>
#include <cpp-utils/tempfile/TempFile.h>
- #include <cryfs/config/CryConfigFile.h>
-Index: cryfs-0.10.2/vendor/CMakeLists.txt
-===================================================================
---- cryfs-0.10.2.orig/vendor/CMakeLists.txt
-+++ cryfs-0.10.2/vendor/CMakeLists.txt
-@@ -1,3 +1 @@
+ #include <cryfs/impl/config/CryConfigFile.h>
+--- a/vendor/CMakeLists.txt 2022-08-25 22:14:05.497898115 +0400
++++ b/vendor/CMakeLists.txt 2022-08-25 22:20:11.176840657 +0400
+@@ -1,2 +1 @@
add_subdirectory(googletest)
--add_subdirectory(spdlog)
-add_subdirectory(cryptopp)
diff --git a/srcpkgs/cryfs/patches/fix-test.patch b/srcpkgs/cryfs/patches/fix-test.patch
deleted file mode 100644
index d3a5847b1a3c..000000000000
--- a/srcpkgs/cryfs/patches/fix-test.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: cryfs-0.10.2/test/cpp-utils/logging/testutils/LoggingTest.h
-===================================================================
---- cryfs-0.10.2.orig/test/cpp-utils/logging/testutils/LoggingTest.h
-+++ cryfs-0.10.2/test/cpp-utils/logging/testutils/LoggingTest.h
-@@ -11,8 +11,7 @@ class MockLogger final {
- public:
- MockLogger():
- _capturedLogData(),
-- _sink(std::make_shared<spdlog::sinks::ostream_sink<std::mutex>>(_capturedLogData, true)),
-- _logger(spdlog::create("MockLogger", {_sink})) {
-+ _logger(spdlog::create<spdlog::sinks::ostream_sink_mt>("MockLogger", _capturedLogData, true)) {
- }
-
- ~MockLogger() {
-@@ -28,7 +27,6 @@ public:
- }
- private:
- std::ostringstream _capturedLogData;
-- std::shared_ptr<spdlog::sinks::ostream_sink<std::mutex>> _sink;
- std::shared_ptr<spdlog::logger> _logger;
- };
-
diff --git a/srcpkgs/cryfs/patches/fmt-9-fix.patch b/srcpkgs/cryfs/patches/fmt-9-fix.patch
new file mode 100644
index 000000000000..6fe97eaeafa4
--- /dev/null
+++ b/srcpkgs/cryfs/patches/fmt-9-fix.patch
@@ -0,0 +1,54 @@
+From 27515e0116fd7cb034bd4e9763d1f3bfdc855a5f Mon Sep 17 00:00:00 2001
+From: Bernhard Rosenkraenzer <bero@lindev.ch>
+Date: Fri, 22 Jul 2022 14:13:38 +0200
+Subject: [PATCH] Fix build with fmt 9.0 (#433)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* Fix build with fmt 9.0
+
+Co-authored-by: Sebastian Meßmer <smessmer@users.noreply.github.com>
+---
+ ChangeLog.txt | 4 ++++
+ src/fspp/fuse/Fuse.cpp | 8 ++++----
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/src/fspp/fuse/Fuse.cpp b/src/fspp/fuse/Fuse.cpp
+index 4e9dbd7f..4b881815 100644
+--- a/src/fspp/fuse/Fuse.cpp
++++ b/src/fspp/fuse/Fuse.cpp
+@@ -603,21 +603,21 @@ int Fuse::mknod(const bf::path &path, ::mode_t mode, dev_t rdev) {
+ UNUSED(mode);
+ UNUSED(path);
+ ThreadNameForDebugging _threadName("mknod");
+- LOG(WARN, "Called non-implemented mknod({}, {}, _)", path, mode);
++ LOG(WARN, "Called non-implemented mknod({}, {}, _)", path.string(), mode);
+ return ENOSYS;
+ }
+
+ int Fuse::mkdir(const bf::path &path, ::mode_t mode) {
+ ThreadNameForDebugging _threadName("mkdir");
+ #ifdef FSPP_LOG
+- LOG(DEBUG, "mkdir({}, {})", path, mode);
++ LOG(DEBUG, "mkdir({}, {})", path.string(), mode);
+ #endif
+ try {
+ ASSERT(is_valid_fspp_path(path), "has to be an absolute path");
+ // DokanY seems to call mkdir("/"). Ignore that
+ if ("/" == path) {
+ #ifdef FSPP_LOG
+- LOG(DEBUG, "mkdir({}, {}): ignored", path, mode);
++ LOG(DEBUG, "mkdir({}, {}): ignored", path.string(), mode);
+ #endif
+ return 0;
+ }
+@@ -766,7 +766,7 @@ int Fuse::rename(const bf::path &from, const bf::path &to) {
+ //TODO
+ int Fuse::link(const bf::path &from, const bf::path &to) {
+ ThreadNameForDebugging _threadName("link");
+- LOG(WARN, "NOT IMPLEMENTED: link({}, {})", from, to);
++ LOG(WARN, "NOT IMPLEMENTED: link({}, {})", from.string(), to.string());
+ //auto real_from = _impl->RootDir() / from;
+ //auto real_to = _impl->RootDir() / to;
+ //int retstat = ::link(real_from.string().c_str(), real_to.string().c_str());
diff --git a/srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch b/srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch
deleted file mode 100644
index 08513cb4d0ca..000000000000
--- a/srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: cryfs-0.10.2/src/cryfs-cli/Cli.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cryfs-cli/Cli.cpp
-+++ cryfs-0.10.2/src/cryfs-cli/Cli.cpp
-@@ -27,6 +27,7 @@
- #include "Environment.h"
- #include <cryfs/CryfsException.h>
- #include <cpp-utils/thread/debugging.h>
-+#include <spdlog/sinks/basic_file_sink.h>
-
- //TODO Many functions accessing the ProgramOptions object. Factor out into class that stores it as a member.
- //TODO Factor out class handling askPassword
-@@ -310,7 +311,7 @@ namespace cryfs_cli {
- //TODO Test that --logfile parameter works. Should be: file if specified, otherwise stderr if foreground, else syslog.
- if (options.logFile() != none) {
- cpputils::logging::setLogger(
-- spdlog::create<spdlog::sinks::simple_file_sink<std::mutex>>("cryfs", options.logFile()->string()));
-+ spdlog::create<spdlog::sinks::basic_file_sink<std::mutex>>("cryfs", options.logFile()->string()));
- } else if (options.foreground()) {
- cpputils::logging::setLogger(spdlog::stderr_logger_mt("cryfs"));
- } else {
diff --git a/srcpkgs/cryfs/patches/spdlog-include.patch b/srcpkgs/cryfs/patches/spdlog-include.patch
deleted file mode 100644
index 2c1c5a926cf3..000000000000
--- a/srcpkgs/cryfs/patches/spdlog-include.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: cryfs-0.10.2/src/cpp-utils/logging/Logger.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/logging/Logger.h
-+++ cryfs-0.10.2/src/cpp-utils/logging/Logger.h
-@@ -7,6 +7,7 @@
- #endif
-
- #include <spdlog/spdlog.h>
-+#include <spdlog/sinks/stdout_sinks.h>
- #include "../macros.h"
-
- namespace cpputils {
-Index: cryfs-0.10.2/src/cpp-utils/logging/logging.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/logging/logging.h
-+++ cryfs-0.10.2/src/cpp-utils/logging/logging.h
-@@ -5,6 +5,7 @@
- #include "Logger.h"
- #include <stdexcept>
- #include <spdlog/fmt/ostr.h>
-+#include <spdlog/sinks/syslog_sink.h>
-
- #if defined(_MSC_VER)
- #include <spdlog/sinks/msvc_sink.h>
-@@ -75,7 +76,7 @@ namespace cpputils {
- #if defined(_MSC_VER)
- return spdlog::create<spdlog::sinks::msvc_sink_mt>(name);
- #else
-- return spdlog::syslog_logger(name, name, LOG_PID);
-+ return spdlog::syslog_logger_mt(name, name, LOG_PID);
- #endif
- }
- }
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 495c2b318a3b..1affee1d8f03 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,14 +1,15 @@
# Template file for 'cryfs'
pkgname=cryfs
-version=0.10.2
-revision=5
+version=0.11.2
+revision=1
create_wrksrc=yes
build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off
- -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
+configure_args="-DCRYFS_UPDATE_CHECKS=off -DBoost_USE_STATIC_LIBS=OFF
+ -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt
+ -DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
hostmakedepends="pkg-config python3"
makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel
- spdlog"
+ spdlog range-v3 fmt-devel"
depends="fuse"
short_desc="Cryptographic filesystem for the cloud"
maintainer="Andy Weidenbaum <atweiden@tutanota.de>"
@@ -16,7 +17,7 @@ license="LGPL-3.0-only"
homepage="https://www.cryfs.org"
changelog="https://github.com/cryfs/cryfs/raw/master/ChangeLog.txt"
distfiles="https://github.com/cryfs/cryfs/releases/download/${version}/${pkgname}-${version}.tar.gz"
-checksum=004c7fdf537062e197aaa0bcdafd2682904a279802441bb6063cb72c1fba52d2
+checksum=a89ab8fea2d494b496867107ec0a3772fe606ebd71ef12152fcd233f463a2c00
if [ "${XBPS_CHECK_PKGS}" ]; then
configure_args+=" -DBUILD_TESTING=on"
From 48099f43e3bc27b23e5e796c4ee32fd979c7bcb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:30 +0700
Subject: [PATCH 017/111] eclib: rebuild for boost-1.80
---
srcpkgs/eclib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/eclib/template b/srcpkgs/eclib/template
index 3db0bd2119b9..694a39ed4068 100644
--- a/srcpkgs/eclib/template
+++ b/srcpkgs/eclib/template
@@ -1,7 +1,7 @@
# Template file for 'eclib'
pkgname=eclib
version=20210625
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-flint --with-boost"
hostmakedepends="automake autoconf-archive libtool"
From 879c1077016aa924ab76e8806c15f73ecaff6372 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:30 +0700
Subject: [PATCH 018/111] facter: rebuild for boost-1.80
---
srcpkgs/facter/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 93d6bfc6af51..45c921a0b72d 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
# Template file for 'facter'
pkgname=facter
version=3.14.16
-revision=3
+revision=4
build_style=cmake
configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
-DENABLE_CXX_WERROR=OFF -DCMAKE_INSTALL_LIBDIR=/usr/lib"
From 78504129e91cc0d2c83c9590eb47343fc3bcfe52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:30 +0700
Subject: [PATCH 019/111] fcitx5-chinese-addons: rebuild for boost-1.80
---
srcpkgs/fcitx5-chinese-addons/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fcitx5-chinese-addons/template b/srcpkgs/fcitx5-chinese-addons/template
index d207bde9ada9..a3a1948474a7 100644
--- a/srcpkgs/fcitx5-chinese-addons/template
+++ b/srcpkgs/fcitx5-chinese-addons/template
@@ -1,7 +1,7 @@
# Template file for 'fcitx5-chinese-addons'
pkgname=fcitx5-chinese-addons
version=5.0.14
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config gettext doxygen extra-cmake-modules qt5-qmake
qt5-host-tools libime-utils"
From 89239655893d08325f75b3d81d10436198b5888d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:31 +0700
Subject: [PATCH 020/111] fifengine: rebuild for boost-1.80
---
srcpkgs/fifengine/patches/ftbfs.patch | 18 ++++++++++++++++++
srcpkgs/fifengine/template | 2 +-
2 files changed, 19 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/fifengine/patches/ftbfs.patch
diff --git a/srcpkgs/fifengine/patches/ftbfs.patch b/srcpkgs/fifengine/patches/ftbfs.patch
new file mode 100644
index 000000000000..9c205f9fe159
--- /dev/null
+++ b/srcpkgs/fifengine/patches/ftbfs.patch
@@ -0,0 +1,18 @@
+--- a/engine/core/vfs/zip/zipnode.cpp
++++ b/engine/core/vfs/zip/zipnode.cpp
+@@ -29,6 +29,8 @@
+
+ #include "zipnode.h"
+
++#include <algorithm>
++
+ namespace {
+ /** helper function to find a value in a ZipNodeContainer
+ * @param container the ZipNodeContainer to search through
+@@ -266,4 +268,4 @@ std::ostream& operator<<(std::ostream& o
+ }
+
+ return os;
+-}
+\ No newline at end of file
++}
diff --git a/srcpkgs/fifengine/template b/srcpkgs/fifengine/template
index 1987e06f7d03..24d2f8521c8d 100644
--- a/srcpkgs/fifengine/template
+++ b/srcpkgs/fifengine/template
@@ -1,7 +1,7 @@
# Template file for 'fifengine'
pkgname=fifengine
version=0.4.2
-revision=8
+revision=9
build_style=cmake
hostmakedepends="swig python3"
makedepends="SDL2-devel SDL2_image-devel SDL2_ttf-devel boost-devel
From 5699c721cebc11a4b446aa11c57a1b188237fade Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:31 +0700
Subject: [PATCH 021/111] freecad: rebuild for boost-1.80
---
srcpkgs/freecad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index e9c697adbe1a..843d2281f324 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=0.20.1
-revision=1
+revision=2
wrksrc="FreeCAD-${version}"
build_style=cmake
From 705933f6302a973ace345ee88f198c4e31cb3ba6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:31 +0700
Subject: [PATCH 022/111] freeorion: rebuild for boost-1.80
---
srcpkgs/freeorion/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freeorion/template b/srcpkgs/freeorion/template
index 20fd819e49b0..71d41f3e987b 100644
--- a/srcpkgs/freeorion/template
+++ b/srcpkgs/freeorion/template
@@ -1,7 +1,7 @@
# Template file for 'freeorion'
pkgname=freeorion
version=0.4.10.2
-revision=1
+revision=2
_release=${version}_2021-08-01.f663dad
wrksrc=src-tarball
build_style=cmake
From 1845b43fb39318d033f021537951e81e1a0a61bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:31 +0700
Subject: [PATCH 023/111] gnucash: rebuild for boost-1.80
---
srcpkgs/gnucash/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 5d403e47c02b..81627ef4f8a1 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
# Template file for 'gnucash'
pkgname=gnucash
version=4.11
-revision=1
+revision=2
wrksrc="${pkgname}-${version%b}"
build_style=cmake
make_check_target=check
From ee174390785b42c1225f9d835bc02772dd708a18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:31 +0700
Subject: [PATCH 024/111] gnuradio: rebuild for boost-1.80
---
.../gnuradio/patches/boost-1.80-fmt-9.patch | 79 +++++++++++++++++++
srcpkgs/gnuradio/template | 2 +-
2 files changed, 80 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
diff --git a/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch b/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
new file mode 100644
index 000000000000..a0c3f6d4701b
--- /dev/null
+++ b/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
@@ -0,0 +1,79 @@
+Upstream: no
+
+Honestly, I don't care much. I tries to print as much as it makes sense
+--- a/gnuradio-runtime/include/gnuradio/logger.h
++++ b/gnuradio-runtime/include/gnuradio/logger.h
+@@ -37,6 +37,9 @@ using logger_ptr = std::shared_ptr<void>
+ #include <spdlog/fmt/fmt.h>
+ #include <spdlog/fmt/ostr.h>
+ #include <memory>
++#include <string>
++#include <type_traits>
++#include <utility>
+
+ #include <spdlog/spdlog.h>
+
+@@ -285,6 +288,52 @@ struct fmt::formatter<boost::format> : f
+ }
+ };
+
++namespace fmt {
++template <typename T>
++struct formatter<
++ T,
++ typename std::enable_if<
++ std::is_convertible<
++ decltype(std::declval<T>().identifier()),
++ std::string
++ >::value,
++ char
++ >::type > : fmt::formatter<std::string> {
++ template <typename FormatCtx>
++ auto format(const T& value, FormatCtx& ctx)
++ -> decltype(fmt::formatter<std::string>::format(value.identifier(), ctx))
++ {
++ return fmt::formatter<std::string>::format(value.identifier(), ctx);
++ }
++};
++template <typename T, typename Ch>
++struct formatter<std::shared_ptr<T>, Ch> : fmt::formatter<const void *, Ch> {
++ template <typename FormatCtx>
++ auto format(const std::shared_ptr<T>& ptr, FormatCtx& ctx)
++ -> decltype(fmt::formatter<const void *, Ch>::format(fmt::ptr(ptr), ctx))
++ {
++ return fmt::formatter<const void *, Ch>::format(fmt::ptr(ptr), ctx);
++ }
++};
++template <typename T>
++struct formatter<
++ std::shared_ptr<T>,
++ typename std::enable_if<
++ std::is_convertible<
++ decltype(std::declval<T>().identifier()),
++ std::string
++ >::value,
++ char
++ >::type > : fmt::formatter<std::string> {
++ template <typename FormatCtx>
++ auto format(const std::shared_ptr<T>& ptr, FormatCtx& ctx)
++ -> decltype(fmt::formatter<std::string>::format(ptr->identifier(), ctx))
++ {
++ return fmt::formatter<std::string>::format(ptr->identifier(), ctx);
++ }
++};
++}
++
+ #endif
+
+ #endif /* INCLUDED_GR_LOGGER_H */
+--- a/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc
++++ b/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc
+@@ -15,7 +15,7 @@
+ /* BINDTOOL_GEN_AUTOMATIC(0) */
+ /* BINDTOOL_USE_PYGCCXML(0) */
+ /* BINDTOOL_HEADER_FILE(logger.h) */
+-/* BINDTOOL_HEADER_FILE_HASH(a76c325b045da079c83e294cc4abb8c6) */
++/* BINDTOOL_HEADER_FILE_HASH(0e6a6ba08242e117ab4407ef3bf7afdf) */
+ /***********************************************************************************/
+
+ #include <pybind11/complex.h>
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index 43ae4e1cb1ba..973339f92921 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
version=3.10.3.0
-revision=1
+revision=2
build_style=cmake
conf_files="/etc/gnuradio/conf.d/*"
configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax
From 69ea91fd00db7b358ffa562a6c4fe2620cf86fd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:32 +0700
Subject: [PATCH 025/111] gnuradio-osmosdr: rebuild for boost-1.80
---
srcpkgs/gnuradio-osmosdr/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template
index cdb4d27faf68..bf0696c672a9 100644
--- a/srcpkgs/gnuradio-osmosdr/template
+++ b/srcpkgs/gnuradio-osmosdr/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-osmosdr'
pkgname=gnuradio-osmosdr
version=0.2.3git20210128
-revision=1
+revision=2
_githash=a100eb024c0210b95e4738b6efd836d48225bd03
wrksrc="gr-osmosdr-${_githash}"
build_style=cmake
From 17e4f3d9a4d2be167dbd9e06ec1ea8304d96698f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:32 +0700
Subject: [PATCH 026/111] gnuradio-rds: rebuild for boost-1.80
---
srcpkgs/gnuradio-rds/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template
index 35d19fb82b11..e9e865151f7a 100644
--- a/srcpkgs/gnuradio-rds/template
+++ b/srcpkgs/gnuradio-rds/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-rds'
pkgname=gnuradio-rds
version=3.10
-revision=1
+revision=2
wrksrc="gr-rds-${version}"
build_style=cmake
configure_args="-Dpybind11_DIR=/${py3_sitelib}/pybind11/share/cmake/pybind11"
From dec86ebfd1501f89d3684b7316ae22dd9de50670 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:32 +0700
Subject: [PATCH 027/111] gource: rebuild for boost-1.80
---
srcpkgs/gource/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gource/template b/srcpkgs/gource/template
index 8ec3b05ca772..08b2e222f607 100644
--- a/srcpkgs/gource/template
+++ b/srcpkgs/gource/template
@@ -1,7 +1,7 @@
# Template file for 'gource'
pkgname=gource
version=0.51
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-tinyxml --enable-ttf-font-dir=/usr/share/fonts/TTF
--with-boost-libdir=$XBPS_CROSS_BASE/usr/lib/"
From 4affc92d01b781fe7dccdf482fa8d8453e116f73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:32 +0700
Subject: [PATCH 028/111] gpick: rebuild for boost-1.80
---
srcpkgs/gpick/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gpick/template b/srcpkgs/gpick/template
index b30108334144..7b3a4db6d69c 100644
--- a/srcpkgs/gpick/template
+++ b/srcpkgs/gpick/template
@@ -1,7 +1,7 @@
# Template file for 'gpick'
pkgname=gpick
version=0.2.6
-revision=1
+revision=2
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=cmake
hostmakedepends="gettext pkg-config ragel"
From 18b91d40b482d6df4665dc1481cd401570f06b0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:32 +0700
Subject: [PATCH 029/111] grive2: rebuild for boost-1.80
---
srcpkgs/grive2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/grive2/template b/srcpkgs/grive2/template
index 140688ee9aec..e416cdc606b5 100644
--- a/srcpkgs/grive2/template
+++ b/srcpkgs/grive2/template
@@ -1,7 +1,7 @@
# Template file for 'grive2'
pkgname=grive2
version=0.5.1
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config"
makedepends="boost-devel libcurl-devel yajl-devel libgcrypt-devel expat-devel"
From a7df4e125231b0eac6cfb9b8978f5885d6de6c32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:33 +0700
Subject: [PATCH 030/111] guitarix2: rebuild for boost-1.80
---
srcpkgs/guitarix2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/guitarix2/template b/srcpkgs/guitarix2/template
index 880814313a2b..de2edbf770b4 100644
--- a/srcpkgs/guitarix2/template
+++ b/srcpkgs/guitarix2/template
@@ -1,7 +1,7 @@
# Template file for 'guitarix2'
pkgname=guitarix2
version=0.42.1
-revision=1
+revision=2
wrksrc="guitarix-${version}"
build_style=waf3
configure_args="--cxxflags-release=-DNDEBUG --ladspa --new-ladspa --no-faust
From ab3542e43e9b8df2fc4f4657eab57396317a9ae7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:33 +0700
Subject: [PATCH 031/111] heaptrack: rebuild for boost-1.80
---
srcpkgs/heaptrack/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/heaptrack/template b/srcpkgs/heaptrack/template
index ed98a952dfdc..0ccc1e6415a7 100644
--- a/srcpkgs/heaptrack/template
+++ b/srcpkgs/heaptrack/template
@@ -1,7 +1,7 @@
# Template file for 'heaptrack'
pkgname=heaptrack
version=1.4.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DHEAPTRACK_BUILD_GUI=ON"
hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules kcoreaddons
From 4897f645752ebb52a6ea10d091602cfd883d3bc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:33 +0700
Subject: [PATCH 032/111] hugin: rebuild for boost-1.80
---
srcpkgs/hugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 7961c74632a1..87cecac02106 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
# Template file for 'hugin'
pkgname=hugin
version=2021.0.0
-revision=1
+revision=2
wrksrc="${pkgname}-${version}"
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
From daa2f3c6390125d1d5e19e880132428245501a03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:33 +0700
Subject: [PATCH 033/111] i2pd: rebuild for boost-1.80
---
srcpkgs/i2pd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index fe12bb2e19bf..522235bebc17 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,7 +1,7 @@
# Template file for 'i2pd'
pkgname=i2pd
version=2.42.1
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="USE_UPNP=yes"
makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
From 9c82c3299dfc2b69d88d757a01a1f720979ea289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:34 +0700
Subject: [PATCH 034/111] icinga2: rebuild for boost-1.80
---
srcpkgs/icinga2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index a884892fc49e..4ef7abea2fc3 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,7 +1,7 @@
# Template file for 'icinga2'
pkgname=icinga2
version=2.9.3
-revision=6
+revision=7
build_style=cmake
build_helper="qemu"
configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
From 222eeb096b5a269b0b05a241b90e6ffb8d7138ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:34 +0700
Subject: [PATCH 035/111] imagescan: rebuild for boost-1.80
---
srcpkgs/imagescan/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imagescan/template b/srcpkgs/imagescan/template
index a12adfe05713..152ef2f83b33 100644
--- a/srcpkgs/imagescan/template
+++ b/srcpkgs/imagescan/template
@@ -1,7 +1,7 @@
# Template file for 'imagescan'
pkgname=imagescan
version=3.65.0
-revision=1
+revision=2
wrksrc=utsushi-0.65.0
build_style=gnu-configure
configure_args="--libexecdir=/usr/lib --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
From ecc3bc73eec5a025ad6b0b1f7df665124a04e5b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:34 +0700
Subject: [PATCH 036/111] inkscape: rebuild for boost-1.80
---
srcpkgs/inkscape/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 4d902e663f73..c77236be6848 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.1.1
-revision=4
+revision=5
wrksrc="inkscape-${version}_2021-09-20_3bf5ae0d25"
build_style=cmake
# builds executables then runs checks
From fcf71615c7c13068c66788a026752571ffe1f13d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:34 +0700
Subject: [PATCH 037/111] innoextract: rebuild for boost-1.80
---
srcpkgs/innoextract/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/innoextract/template b/srcpkgs/innoextract/template
index 079a8ce1350a..9b8e1e163e55 100644
--- a/srcpkgs/innoextract/template
+++ b/srcpkgs/innoextract/template
@@ -1,7 +1,7 @@
# Template file for 'innoextract'
pkgname=innoextract
version=1.9
-revision=1
+revision=2
build_style=cmake
configure_args="-DCMAKE_INSTALL_PREFIX=/usr"
hostmakedepends="boost extra-cmake-modules"
From 215a6c200ceb1203254b32832d183d2ec76edeab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:34 +0700
Subject: [PATCH 038/111] juCi++: rebuild for boost-1.80
---
srcpkgs/juCi++/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index 1a7604b44a00..5103324dec20 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -1,7 +1,7 @@
# Template file for 'juCi++'
pkgname=juCi++
version=1.6.2
-revision=2
+revision=3
_libclangmm_commit="b342f4dd6de4fe509a692a4b4fcfc7e24aae9590"
_tiny_commit="c9c8bf810ddad8cd17882b9a9ee628a690e779f5"
wrksrc="jucipp-v${version}"
From 267faf65eda4aad7cb647e419f785b88a594e563 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:35 +0700
Subject: [PATCH 039/111] kea: rebuild for boost-1.80
---
srcpkgs/kea/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index dc0bcc5de3fc..a55b58691de9 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -1,7 +1,7 @@
# Template file for 'kea'
pkgname=kea
version=1.9.5
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
$(vopt_if mysql --with-mysql)
From df264f9923e4d1be0f69b5200016234d58e9d240 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:35 +0700
Subject: [PATCH 040/111] kig: rebuild for boost-1.80
---
srcpkgs/kig/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index 591db4bd477c..748c09f99e59 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,7 +1,7 @@
# Template file for 'kig'
pkgname=kig
version=22.04.3
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
pkg-config qt5-host-tools qt5-qmake"
From 3bffdd2db671110f2d8f3b4ad419cac5a869250a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:35 +0700
Subject: [PATCH 041/111] leatherman: rebuild for boost-1.80
---
.../leatherman/patches/reduce-vendor.patch | 128 ++++++++++++++++++
srcpkgs/leatherman/template | 7 +-
2 files changed, 134 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/leatherman/patches/reduce-vendor.patch
diff --git a/srcpkgs/leatherman/patches/reduce-vendor.patch b/srcpkgs/leatherman/patches/reduce-vendor.patch
new file mode 100644
index 000000000000..4d4dfe525e51
--- /dev/null
+++ b/srcpkgs/leatherman/patches/reduce-vendor.patch
@@ -0,0 +1,128 @@
+Still vendor rapidjson, facter depends on older API
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -66,11 +66,10 @@ file(GLOB_RECURSE ALL_LEATHERMAN_SOURCES
+ add_subdirectory(locales)
+
+ add_leatherman_dir(catch EXCLUDE_FROM_VARS)
+-add_leatherman_dir(nowide)
+ add_leatherman_dir(util)
+ add_leatherman_dir(locale)
+ add_leatherman_dir(logging)
+ add_leatherman_dir(rapidjson)
+ add_leatherman_dir(json_container)
+ add_leatherman_dir(file_util)
+ add_leatherman_dir(curl)
+--- a/util/CMakeLists.txt
++++ b/util/CMakeLists.txt
+@@ -1,10 +1,8 @@
+-find_package(Boost 1.54 REQUIRED date_time chrono system)
++find_package(Boost 1.54 REQUIRED date_time chrono system nowide)
+
+ add_leatherman_deps(${Boost_LIBRARIES})
+ add_leatherman_includes("${Boost_INCLUDE_DIRS}")
+
+-leatherman_dependency(nowide)
+-
+ if(WIN32)
+ set(PLATFORM_SRCS "src/windows/time.cc" "src/windows/environment.cc" "src/windows/scoped_handle.cc")
+ set(PLATFORM_TESTS "tests/windows/environment.cc")
+--- a/json_container/CMakeLists.txt
++++ b/json_container/CMakeLists.txt
+@@ -1,11 +1,11 @@
+-find_package(Boost 1.54 REQUIRED COMPONENTS regex)
++find_package(Boost 1.54 REQUIRED COMPONENTS regex nowide)
+
+ add_leatherman_deps("${Boost_LIBRARIES}")
+ add_leatherman_includes("${Boost_INCLUDE_DIRS}")
+
+ leatherman_dependency(rapidjson)
+ leatherman_dependency(locale)
+
+ add_leatherman_library("src/json_container.cc")
+ add_leatherman_headers("inc/leatherman")
+-add_leatherman_test("tests/json_container_test.cc")
+\ No newline at end of file
++add_leatherman_test("tests/json_container_test.cc")
+--- a/logging/CMakeLists.txt
++++ b/logging/CMakeLists.txt
+@@ -1,10 +1,10 @@
+-find_package(Boost 1.54 REQUIRED COMPONENTS log log_setup thread date_time filesystem system chrono regex)
++find_package(Boost 1.54 REQUIRED COMPONENTS log log_setup thread date_time
++ filesystem system chrono regex nowide)
+ find_package(Threads)
+
+ add_leatherman_deps(${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+ add_leatherman_includes("${Boost_INCLUDE_DIRS}")
+
+-leatherman_dependency(nowide)
+ leatherman_dependency(locale)
+
+ if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "SunOS")
+--- a/execution/CMakeLists.txt
++++ b/execution/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system)
++find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system nowide)
+
+ add_leatherman_deps("${Boost_LIBRARIES}")
+ if ("${CMAKE_SYSTEM_NAME}" MATCHES "SunOS")
+@@ -10,7 +10,6 @@ endif()
+ add_leatherman_includes("${Boost_INCLUDE_DIRS}")
+
+ leatherman_dependency(util)
+-leatherman_dependency(nowide)
+ leatherman_dependency(locale)
+ leatherman_dependency(logging)
+ leatherman_dependency(file_util)
+--- a/file_util/CMakeLists.txt
++++ b/file_util/CMakeLists.txt
+@@ -1,9 +1,8 @@
+-find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system)
++find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system nowide)
+
+ add_leatherman_deps("${Boost_LIBRARIES}")
+ add_leatherman_includes("${Boost_INCLUDE_DIRS}")
+
+-leatherman_dependency(nowide)
+ leatherman_dependency(locale)
+ leatherman_dependency(logging)
+ leatherman_dependency(util)
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -1,4 +1,5 @@
+-set(BOOST_REQUIRED_COMPONENTS system date_time chrono log log_setup thread filesystem regex)
++set(BOOST_REQUIRED_COMPONENTS system date_time chrono log log_setup thread
++ filesystem regex nowide)
+ if (LEATHERMAN_USE_LOCALES)
+ set(BOOST_REQUIRED_COMPONENTS ${BOOST_REQUIRED_COMPONENTS} locale)
+ endif()
+--- a/file_util/src/file.cc
++++ b/file_util/src/file.cc
+@@ -1,6 +1,6 @@
+ #include <leatherman/file_util/file.hpp>
+ #include <boost/nowide/fstream.hpp>
+-#include <boost/nowide/cenv.hpp>
++#include <boost/nowide/cstdlib.hpp>
+ #include <boost/filesystem.hpp>
+ #include <sstream>
+ #include <leatherman/logging/logging.hpp>
+--- a/util/src/environment.cc
++++ b/util/src/environment.cc
+@@ -1,5 +1,5 @@
+ #include <leatherman/util/environment.hpp>
+-#include <boost/nowide/cenv.hpp>
++#include <boost/nowide/cstdlib.hpp>
+ #include <stdexcept>
+
+ using namespace std;
+--- a/util/tests/environment.cc
++++ b/util/tests/environment.cc
+@@ -1,6 +1,6 @@
+ #include <catch.hpp>
+ #include <leatherman/util/environment.hpp>
+-#include <boost/nowide/cenv.hpp>
++#include <boost/nowide/cstdlib.hpp>
+
+ using namespace std;
+ using namespace leatherman::util;
diff --git a/srcpkgs/leatherman/template b/srcpkgs/leatherman/template
index b61fcd5dc205..3f9d08752dd2 100644
--- a/srcpkgs/leatherman/template
+++ b/srcpkgs/leatherman/template
@@ -1,7 +1,7 @@
# Template file for 'leatherman'
pkgname=leatherman
version=1.12.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DLEATHERMAN_SHARED=ON"
hostmakedepends="pkg-config python3"
@@ -16,6 +16,11 @@ python_version=3
CXXFLAGS="-Wno-ignored-qualifiers -Wno-class-memaccess -Wno-catch-value -Wno-deprecated-copy -Wno-type-limits"
+do_check() {
+ cd build
+ ctest -V
+}
+
leatherman-devel_package() {
short_desc+=" - development files"
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 24fd9ef7028e9a3e5769026ab6d0f8071a976903 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:35 +0700
Subject: [PATCH 042/111] ledger: rebuild for boost-1.80
---
srcpkgs/ledger/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ledger/template b/srcpkgs/ledger/template
index c94b72709dea..130c727e7768 100644
--- a/srcpkgs/ledger/template
+++ b/srcpkgs/ledger/template
@@ -1,7 +1,7 @@
# Template file for 'ledger'
pkgname=ledger
version=3.2.1
-revision=1
+revision=2
build_style=cmake
makedepends="boost-devel gmp-devel mpfr-devel gettext-devel libedit-devel"
short_desc="Double-entry accounting system with a command-line reporting interface"
From 9e6cc3fa2b81646490a3af7987ea25e3fe3f6330 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:36 +0700
Subject: [PATCH 043/111] libbitcoin-blockchain: rebuild for boost-1.80
---
srcpkgs/libbitcoin-blockchain/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index e43ab8b9ede1..09a126e75356 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-blockchain'
pkgname=libbitcoin-blockchain
version=3.6.0
-revision=6
+revision=7
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
From f786b33e6d52ed78c844aab1c7b0613097d6b7db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:36 +0700
Subject: [PATCH 044/111] libbitcoin-client: rebuild for boost-1.80
---
srcpkgs/libbitcoin-client/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index 17849cd906d0..35f17b74ae00 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-client'
pkgname=libbitcoin-client
version=3.6.0
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"
From 5431740b27bde0a7b25030cd5ef27e37f18e6b42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:36 +0700
Subject: [PATCH 045/111] libbitcoin-database: rebuild for boost-1.80
---
srcpkgs/libbitcoin-database/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index a3c48226ba2d..13cec4fdc3dd 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-database'
pkgname=libbitcoin-database
version=3.6.0
-revision=6
+revision=7
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
From 88b56891fbfa52d7de041e194fe4690d839d549a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:36 +0700
Subject: [PATCH 046/111] libbitcoin-explorer: rebuild for boost-1.80
---
srcpkgs/libbitcoin-explorer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index a1929f350269..7a5f8368b271 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-explorer'
pkgname=libbitcoin-explorer
version=3.6.0
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
From d51aa3749198eb16544e2a2241ddb25f3ebeb720 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:36 +0700
Subject: [PATCH 047/111] libbitcoin-network: rebuild for boost-1.80
---
srcpkgs/libbitcoin-network/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index d130facc40de..4f730a814242 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-network'
pkgname=libbitcoin-network
version=3.6.0
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
From 454c3afc7be6609dc8601f9994c0e2ea8c74c303 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:37 +0700
Subject: [PATCH 048/111] libbitcoin-node: rebuild for boost-1.80
---
srcpkgs/libbitcoin-node/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 23e32624b5cc..ead87310627b 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-node'
pkgname=libbitcoin-node
version=3.6.0
-revision=6
+revision=7
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
From 1392111cbf2ea30ea3e4fb7f1ef02686dacaad51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:37 +0700
Subject: [PATCH 049/111] libbitcoin-protocol: rebuild for boost-1.80
---
srcpkgs/libbitcoin-protocol/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 838d62cc9ecd..53e2e6520f6a 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-protocol'
pkgname=libbitcoin-protocol
version=3.6.0
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
From 4ac925e0558eb662b84e0cc1b1c70ff793136c5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:37 +0700
Subject: [PATCH 050/111] libbitcoin-server: rebuild for boost-1.80
---
srcpkgs/libbitcoin-server/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index fc4988deac2b..70d4c492c5bb 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-server'
pkgname=libbitcoin-server
version=3.6.0
-revision=6
+revision=7
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
From a2f6c025e1a0cddc0ed7656ac51c3c2effb51203 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:37 +0700
Subject: [PATCH 051/111] libbitcoin-system: rebuild for boost-1.80
---
srcpkgs/libbitcoin-system/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index 8b03fb248c42..8e6790c3ba66 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-system'
pkgname=libbitcoin-system
version=3.6.0
-revision=6
+revision=7
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
From 58cef6a5f03dab3303d4e8c50c2d66d4292ee866 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:38 +0700
Subject: [PATCH 052/111] libcmis: rebuild for boost-1.80
---
srcpkgs/libcmis/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libcmis/template b/srcpkgs/libcmis/template
index fac133d5e4d9..43dd0a856122 100644
--- a/srcpkgs/libcmis/template
+++ b/srcpkgs/libcmis/template
@@ -1,7 +1,7 @@
# Template file for 'libcmis'
pkgname=libcmis
version=0.5.2
-revision=4
+revision=5
build_style=gnu-configure
configure_args="DOCBOOK2MAN=docbook2man --disable-werror"
hostmakedepends="pkg-config docbook2x"
From 3574e12591a7db4cdb041245d355b690d8d1610b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:38 +0700
Subject: [PATCH 053/111] libime: rebuild for boost-1.80
---
srcpkgs/libime/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libime/template b/srcpkgs/libime/template
index a37db9885a48..363bdd93b16d 100644
--- a/srcpkgs/libime/template
+++ b/srcpkgs/libime/template
@@ -1,7 +1,7 @@
# Template file for 'libime'
pkgname=libime
version=1.0.13
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config gettext extra-cmake-modules python3"
From 21c540c05728b398e44b4ee50aceb19997b63445 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:38 +0700
Subject: [PATCH 054/111] libime-jyutping: rebuild for boost-1.80
---
srcpkgs/libime-jyutping/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libime-jyutping/template b/srcpkgs/libime-jyutping/template
index 3c33940ca368..6ae0855c3d7a 100644
--- a/srcpkgs/libime-jyutping/template
+++ b/srcpkgs/libime-jyutping/template
@@ -1,7 +1,7 @@
# Template file for 'libime-jyutping'
pkgname=libime-jyutping
version=1.0.4
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config gettext extra-cmake-modules python3 libime-utils"
From e455e42515a96aeb3b7b159f6cbbd4d8dd0d16c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:38 +0700
Subject: [PATCH 055/111] libixion: rebuild for boost-1.80
---
srcpkgs/libixion/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libixion/template b/srcpkgs/libixion/template
index 37298a8b9427..ef1a00100f53 100644
--- a/srcpkgs/libixion/template
+++ b/srcpkgs/libixion/template
@@ -1,7 +1,7 @@
# Template file for 'libixion'
pkgname=libixion
version=0.17.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config python3"
makedepends="boost-devel fmt-devel mdds python3-devel spdlog"
From d933a5b2bd0b44298facd896b417d7e8b2c39104 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:38 +0700
Subject: [PATCH 056/111] liborcus: rebuild for boost-1.80
---
srcpkgs/liborcus/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/liborcus/template b/srcpkgs/liborcus/template
index cf4b938fe37a..7b6b21a26dca 100644
--- a/srcpkgs/liborcus/template
+++ b/srcpkgs/liborcus/template
@@ -1,7 +1,7 @@
# Template file for 'liborcus'
pkgname=liborcus
version=0.17.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config python3"
makedepends="boost-devel mdds libixion-devel python3-devel zlib-devel"
From a03218d5ab4f965d6f0bb49bbe6a1fb441318d45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:39 +0700
Subject: [PATCH 057/111] libphonenumber: rebuild for boost-1.80
---
srcpkgs/libphonenumber/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libphonenumber/template b/srcpkgs/libphonenumber/template
index 9bef2825781c..05f28c4f5579 100644
--- a/srcpkgs/libphonenumber/template
+++ b/srcpkgs/libphonenumber/template
@@ -1,7 +1,7 @@
# Template file for 'libphonenumber'
pkgname=libphonenumber
version=8.12.39
-revision=6
+revision=7
build_wrksrc=cpp
build_style=cmake
build_helper=qemu
From 630160c700ea688f0dfbd608f84d082b383de5d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:39 +0700
Subject: [PATCH 058/111] librime: rebuild for boost-1.80
---
srcpkgs/librime/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/librime/template b/srcpkgs/librime/template
index 5f734c200bd7..7110eeffd3f9 100644
--- a/srcpkgs/librime/template
+++ b/srcpkgs/librime/template
@@ -1,7 +1,7 @@
# Template file for 'librime'
pkgname=librime
version=1.7.3
-revision=3
+revision=4
build_style=cmake
configure_args="-DCMAKE_BUILD_TYPE=None -DENABLE_LOGGING=OFF -DBUILD_TEST=ON
-DCAPNP_EXECUTABLE=/usr/bin/capnp -DCAPNPC_CXX_EXECUTABLE=/usr/bin/capnpc-c++"
From b65bfba315bcb38bed781729e2333e6d4454a6b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:39 +0700
Subject: [PATCH 059/111] libtorrent-rasterbar: rebuild for boost-1.80
---
srcpkgs/libtorrent-rasterbar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index b1ceddc95282..5aceddec5646 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,7 +2,7 @@
# Breaks ABI/API without changing soname, revbump all dependants
pkgname=libtorrent-rasterbar
version=1.2.14
-revision=2
+revision=3
build_style=cmake
configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
-Dpython-bindings=ON"
From c203ce1cdadef4f55464c60dde568c70341f7e0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:40 +0700
Subject: [PATCH 060/111] linssid: rebuild for boost-1.80
---
srcpkgs/linssid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linssid/template b/srcpkgs/linssid/template
index 937c8a0745e0..09206656186e 100644
--- a/srcpkgs/linssid/template
+++ b/srcpkgs/linssid/template
@@ -1,7 +1,7 @@
# Template file for 'linssid'
pkgname=linssid
version=3.6
-revision=4
+revision=5
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools"
makedepends="boost-devel qwt-devel"
From b47c629c4e4fed3cdc550818d67ee78b15db4fdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:40 +0700
Subject: [PATCH 061/111] litecoin: rebuild for boost-1.80
---
srcpkgs/litecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 3c33d9b0eb8a..7a188c3c9af8 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.18.1
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
--disable-tests --with-openssl"
From f19e8ce3cf9307eb23ded16e5071390b24548ad5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:40 +0700
Subject: [PATCH 062/111] monero: rebuild for boost-1.80
---
srcpkgs/monero/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index bff62347ebd6..eebce3d0a551 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
# Template file for 'monero'
pkgname=monero
version=0.17.2.3
-revision=2
+revision=3
_randomx_version="1.1.9"
# the revision monero uses as a submodule for the specific version
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
From 08bcef9c95ebdb11930a192a1241c1fb53f9b8ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:40 +0700
Subject: [PATCH 063/111] monero-gui: rebuild for boost-1.80
---
srcpkgs/monero-gui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 67ed3273defa..61e5dd9da1b7 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
# Template file for 'monero-gui'
pkgname=monero-gui
version=0.17.2.3
-revision=1
+revision=2
_monero_version=0.17.2.3
_randomx_version="1.1.9"
# the revision monero uses as a submodule for the specific version
From cdc4e6a5d90b9e768bbc3bb3324595ec3373393f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:40 +0700
Subject: [PATCH 064/111] mupen64plus: rebuild for boost-1.80
---
srcpkgs/mupen64plus/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mupen64plus/template b/srcpkgs/mupen64plus/template
index 4984a7f4a777..f4a58a4749cb 100644
--- a/srcpkgs/mupen64plus/template
+++ b/srcpkgs/mupen64plus/template
@@ -1,7 +1,7 @@
# Template file for 'mupen64plus'
pkgname=mupen64plus
version=2.5.9
-revision=1
+revision=2
archs="x86_64* i686*"
wrksrc="mupen64plus-bundle-src-${version}"
hostmakedepends="pkg-config which nasm"
From f5e60ae0bd2a0976c21503d44a6ff3a3dede2062 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:41 +0700
Subject: [PATCH 065/111] musikcube: rebuild for boost-1.80
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index 2b75cbd976ea..11a3df3dc0aa 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=0.98.0
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1 -DENABLE_BUNDLED_TAGLIB=false"
From 9c5a8d5ee4706c32cce025a8f01c7658db4a5cca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:41 +0700
Subject: [PATCH 066/111] namecoin: rebuild for boost-1.80
---
srcpkgs/namecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index e4cfb3777b71..7839d4008cd3 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
# Template file for 'namecoin'
pkgname=namecoin
version=0.18.1
-revision=5
+revision=6
wrksrc="${pkgname}-core-nc${version}"
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-static
From 119c4f173a0b8c6bb1ca1cef63af3a9d5ba48939 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:41 +0700
Subject: [PATCH 067/111] ncmpcpp: rebuild for boost-1.80
---
srcpkgs/ncmpcpp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 773deb4917d4..72a0d35e5e7f 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
--enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
From d29238442d4d8698a77d9f2f70080845eef6c555 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:41 +0700
Subject: [PATCH 068/111] nix: rebuild for boost-1.80
---
srcpkgs/nix/template | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index bb585b6d7d54..e21c94aa2759 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,23 +1,25 @@
# Template file for 'nix'
pkgname=nix
-version=2.8.1
-revision=1
+version=2.10.3
+revision=2
build_style=gnu-configure
# Use /nix/var as suggested by the official Manual.
-configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
-hostmakedepends="curl pkg-config flex tar xz automake autoconf-archive mdBook jq"
+configure_args="--localstatedir=/nix/var
+ --with-sandbox-shell=/usr/bin/busybox.static"
+hostmakedepends="curl pkg-config flex tar xz automake autoconf-archive mdBook jq
+ busybox-static"
makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
liblzma-devel openssl-devel libsodium-devel sqlite-devel
libseccomp-devel editline-devel jq-devel libarchive-devel
gtest-devel lowdown-devel json-c++"
-depends="curl tar xz"
+depends="curl tar xz busybox-static"
short_desc="Purely functional package manager"
-maintainer="Juan RP <xtraeme@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://nixos.org/nix/"
changelog="https://nixos.org/releases/${pkgname}/${pkgname}-${version}/manual/#sec-relnotes"
distfiles="https://github.com/NixOS/nix/archive/refs/tags/${version}.tar.gz"
-checksum=6f19455775523fca4ae4096e6a6fc493f577198b968811f7fa77eb1fa5213b43
+checksum=5a8d79714bf04c425f41fdd22e67d4704d2e44c7a760c6c144e5767c6d662413
disable_parallel_build=yes
nocross="cross build populates /usr/lib32 with libraries and tries to link against them"
From ebd2c14f4b5b19d7ea2a74da1d3b7e89d8f5dc04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:42 +0700
Subject: [PATCH 069/111] opencamlib: rebuild for boost-1.80
---
srcpkgs/opencamlib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencamlib/template b/srcpkgs/opencamlib/template
index 8722aaf9ee64..140315ef3467 100644
--- a/srcpkgs/opencamlib/template
+++ b/srcpkgs/opencamlib/template
@@ -1,7 +1,7 @@
# Template file for 'opencamlib'
pkgname=opencamlib
version=2019.07
-revision=3
+revision=4
build_style=cmake
configure_args="-DBUILD_PY_LIB=ON -DUSE_PY_3=ON -DVERSION_STRING=${version}"
hostmakedepends="python3"
From c18299ac0ff2c047908754d2a8b9df3cbf944af4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:42 +0700
Subject: [PATCH 070/111] openimageio: rebuild for boost-1.80
---
srcpkgs/openimageio/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index 8abf3b05d6a3..bae68ead21e6 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,11 +1,11 @@
# Template file for 'openimageio'
pkgname=openimageio
version=2.2.15.1
-revision=3
+revision=4
wrksrc="oiio-Release-${version}"
build_style=cmake
configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0"
+ -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
hostmakedepends="pkg-config git"
makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
From 1838fb1a258e050896aa459a8dcf814bdbb574bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:42 +0700
Subject: [PATCH 071/111] openmw: rebuild for boost-1.80
---
srcpkgs/openmw/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openmw/template b/srcpkgs/openmw/template
index 581e2cbb081e..9a263c9eae45 100644
--- a/srcpkgs/openmw/template
+++ b/srcpkgs/openmw/template
@@ -1,7 +1,7 @@
# Template file for 'openmw'
pkgname=openmw
version=0.47.0
-revision=1
+revision=2
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=cmake
# System bullet doesn't use double precision (double precision would break vdrift)
From 4a278349d38eb466b119ece40db00d5eab5f5218 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:42 +0700
Subject: [PATCH 072/111] openscad: rebuild for boost-1.80
---
srcpkgs/openscad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index 60d45d60615f..a3951a1a2201 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -1,7 +1,7 @@
# Template file for 'openscad'
pkgname=openscad
version=2021.01
-revision=2
+revision=3
build_style=qmake
hostmakedepends="bison flex pkg-config gettext qt5-qmake qt5-host-tools"
makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
From b57a0a61c17a6687cb31a7c52073a6af3d26c3d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:42 +0700
Subject: [PATCH 073/111] openvdb: rebuild for boost-1.80
---
srcpkgs/openvdb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 4957f642552a..24bc2253828b 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,7 +1,7 @@
# Template file for 'openvdb'
pkgname=openvdb
version=9.0.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
hostmakedepends="pkg-config"
From ca9b90e34351c7c8f274d4c5d0dc93ca3bfbc118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:43 +0700
Subject: [PATCH 074/111] osm2pgsql: rebuild for boost-1.80
---
srcpkgs/osm2pgsql/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index 1c53c4505047..1d5f71b70140 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,7 +1,7 @@
# Template file for 'osm2pgsql'
pkgname=osm2pgsql
version=1.6.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="boost"
makedepends="expat-devel proj-devel bzip2-devel zlib-devel boost-devel
From e4772544c2a4c7c8ccb09772f8d19a7841d4589c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:43 +0700
Subject: [PATCH 075/111] poedit: rebuild for boost-1.80
---
srcpkgs/poedit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index f10aaf4c88a2..15cd4b6bae20 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
# Template file for 'poedit'
pkgname=poedit
version=3.0.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-wx-config=wx-config-gtk3"
hostmakedepends="pkg-config"
From ab927ec9fd5180b1597c5dd7b1baf44eeb006148 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:43 +0700
Subject: [PATCH 076/111] povray: rebuild for boost-1.80
---
srcpkgs/povray/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/povray/template b/srcpkgs/povray/template
index 30a2baab2039..93ab71f8e0db 100644
--- a/srcpkgs/povray/template
+++ b/srcpkgs/povray/template
@@ -1,7 +1,7 @@
# Template file for 'povray'
pkgname=povray
version=3.7.0.8
-revision=5
+revision=6
build_style=gnu-configure
_v=${version%.*.*}
configure_args="COMPILED_BY=Void --disable-optimiz-arch"
From 8b50f6993c8679b1fcc89f37cee6f003c34cdb41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:43 +0700
Subject: [PATCH 077/111] pulseeffects-legacy: rebuild for boost-1.80
---
srcpkgs/pulseeffects-legacy/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pulseeffects-legacy/template b/srcpkgs/pulseeffects-legacy/template
index 585f25a55c8f..121e90e7f7dc 100644
--- a/srcpkgs/pulseeffects-legacy/template
+++ b/srcpkgs/pulseeffects-legacy/template
@@ -1,7 +1,7 @@
# Template file for 'pulseeffects-legacy'
pkgname=pulseeffects-legacy
version=4.8.5
-revision=3
+revision=4
wrksrc="easyeffects-${version}"
build_style=meson
hostmakedepends="itstool pkg-config gettext glib-devel"
From 0e18abf4441c8eb300e9cb628733123562e11ce8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:44 +0700
Subject: [PATCH 078/111] pulseview: rebuild for boost-1.80
---
srcpkgs/pulseview/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pulseview/template b/srcpkgs/pulseview/template
index 83ce80bc39d9..e24c6cd30e88 100644
--- a/srcpkgs/pulseview/template
+++ b/srcpkgs/pulseview/template
@@ -1,7 +1,7 @@
# Template file for 'pulseview'
pkgname=pulseview
version=0.4.2
-revision=1
+revision=2
build_style=cmake
configure_args="-DDISABLE_WERROR=TRUE"
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From faa84e592854ee37e0e752bf8aa41c969d8ba5c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:44 +0700
Subject: [PATCH 079/111] remwharead: rebuild for boost-1.80
---
srcpkgs/remwharead/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index 3e52473f86ce..cd36bd3b9849 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -1,7 +1,7 @@
# Template file for 'remwharead'
pkgname=remwharead
version=0.10.0
-revision=2
+revision=3
build_style=cmake
hostmakedepends="poco-devel asciidoc pkg-config"
makedepends="poco-devel boost-devel"
From ec9447213f4da87f0632d7265cb3f8d008406a5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:44 +0700
Subject: [PATCH 080/111] rstudio: rebuild for boost-1.80
---
srcpkgs/rstudio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index ad7c1e85cce7..c0354b8130cc 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
# Template file for 'rstudio'
pkgname=rstudio
version=1.4.1717
-revision=3
+revision=4
build_style=cmake
configure_args="-DRSTUDIO_TARGET=Desktop
-DRSTUDIO_USE_SYSTEM_BOOST=ON
From e2fa33406e71c9add0dc1fe1a9f380fe14c8af5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 20 Aug 2022 15:51:41 +0700
Subject: [PATCH 081/111] schroot: update to 1.6.12.
---
.../patches/{musl.patch => sbuild-i18n.patch} | 1 +
srcpkgs/schroot/patches/schroot-cppunit.patch | 11 -----
srcpkgs/schroot/patches/test-chown.patch | 8 ++++
srcpkgs/schroot/template | 47 ++++++++++++-------
4 files changed, 38 insertions(+), 29 deletions(-)
rename srcpkgs/schroot/patches/{musl.patch => sbuild-i18n.patch} (99%)
delete mode 100644 srcpkgs/schroot/patches/schroot-cppunit.patch
create mode 100644 srcpkgs/schroot/patches/test-chown.patch
diff --git a/srcpkgs/schroot/patches/musl.patch b/srcpkgs/schroot/patches/sbuild-i18n.patch
similarity index 99%
rename from srcpkgs/schroot/patches/musl.patch
rename to srcpkgs/schroot/patches/sbuild-i18n.patch
index e0dcaf3bae01..ff69d554cd9a 100644
--- a/srcpkgs/schroot/patches/musl.patch
+++ b/srcpkgs/schroot/patches/sbuild-i18n.patch
@@ -28,3 +28,4 @@
+#include "sbuild-i18n.h"
using namespace sbuild;
+
diff --git a/srcpkgs/schroot/patches/schroot-cppunit.patch b/srcpkgs/schroot/patches/schroot-cppunit.patch
deleted file mode 100644
index 3e11c73fd40b..000000000000
--- a/srcpkgs/schroot/patches/schroot-cppunit.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac 2017-05-20 09:50:30.146864516 +0000
-+++ b/configure.ac 2017-05-20 09:51:26.216792794 +0000
-@@ -336,7 +336,7 @@
- [HAVE_UUID=yes],
- [HAVE_UUID=no])
-
--AM_PATH_CPPUNIT([1.10.0], [HAVE_CPPUNIT=yes])
-+PKG_CHECK_MODULES([CPPUNIT], [cppunit], [HAVE_CPPUNIT=yes], [HAVE_CPPUNIT=no])
- AM_CONDITIONAL([USE_UNIT_TESTS], [test -n "$HAVE_CPPUNIT"])
-
- SCHROOT_CFLAGS="$UUID_CFLAGS"
diff --git a/srcpkgs/schroot/patches/test-chown.patch b/srcpkgs/schroot/patches/test-chown.patch
new file mode 100644
index 000000000000..c9d4e3919428
--- /dev/null
+++ b/srcpkgs/schroot/patches/test-chown.patch
@@ -0,0 +1,8 @@
+--- a/test/setup-test-data.cmake
++++ b/test/setup-test-data.cmake
+@@ -5,4 +5,4 @@ rm -rf test/testdata
+ mkdir test/testdata
+ cp -r ${PROJECT_SOURCE_DIR}/test/*.ex* test/testdata
+ mkdir test/testdata/run-parts.ex2
+-chown -R root:root test/testdata
++# chown -R root:root test/testdata
diff --git a/srcpkgs/schroot/template b/srcpkgs/schroot/template
index fd9ff15c7140..d73a149920a7 100644
--- a/srcpkgs/schroot/template
+++ b/srcpkgs/schroot/template
@@ -1,21 +1,25 @@
# Template file for 'schroot'
pkgname=schroot
reverts="1.7.2_9"
-version=1.6.10
-revision=12
-_debian_version=12+deb11u1
+version=1.6.12
+revision=1
+_debian_version=2
build_style=cmake
configure_args="
+ -DSCHROOT_LIBEXEC_DIR=/usr/libexec/schroot
+ -Ddebug=OFF
-Ddchroot=ON
-Dlvm-snapshot=ON
-Dbtrfs-snapshot=ON
+ -Dzfs-snapshot=ON
-Dblock-device=ON
-Dloopback=ON
+ -DLOSETUP_EXECUTABLE=/usr/sbin/losetup
-Duuid=ON
- -DBTRFS_EXECUTABLE=/usr/bin/btrfs
+ -DBTRFS_EXECUTABLE=/usr/sbin/btrfs
-DLVCREATE_EXECUTABLE=/usr/sbin/lvcreate
-DLVREMOVE_EXECUTABLE=/usr/sbin/lvremove
- -DZFS_EXECUTABLE=/usr/bin/zfs
+ -DZFS_EXECUTABLE=/usr/sbin/zfs
-Dbash_completion_dir=/usr/share/bash-completion/completions"
conf_files="
/etc/schroot/minimal/nssdatabases
@@ -41,27 +45,34 @@ make_dirs="
/var/lib/schroot/session 0755 root root
/var/lib/schroot/mount 0755 root root
/etc/schroot/chroot.d 0755 root root"
-hostmakedepends="pkg-config libtool gettext xz po4a groff"
-makedepends="boost-devel pam-devel lockdev-devel libuuid-devel e2fsprogs-devel
- gettext-devel libcppunit-devel"
+hostmakedepends="pkg-config gettext xz po4a groff"
+makedepends="boost-devel pam-devel lockdev-devel libuuid-devel
+ e2fsprogs-devel gettext-devel libcppunit-devel"
short_desc="Allows users to execute commands in different chroots"
maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
license="GPL-3.0-only"
homepage="https://wiki.debian.org/Schroot"
-distfiles="
- ${DEBIAN_SITE}/main/s/${pkgname}/${pkgname}_${version}.orig.tar.xz
- http://security.debian.org/debian-security/pool/main/s/${pkgname}/${pkgname}_${version}-${_debian_version}.debian.tar.xz"
-checksum="
- 3ce8dfd9cb97b099e4b6d4ccec421d6cc8c9ef84574681e928a12badb5643d0b
- 7bd4e0c2709979362c86a86c10d2b23d290d26e1a2d301a602e829327f483ec1"
-nocross=yes
+distfiles="${DEBIAN_SITE}/main/s/${pkgname}/${pkgname}_${version}.orig.tar.xz
+ ${DEBIAN_SITE}/main/s/${pkgname}/${pkgname}_${version}-${_debian_version}.debian.tar.xz"
+checksum="0bed8a069856a82261046b2e549af60ee32b79ebcdbf642424f378ec7aea6b77
+ 8ff03534007c6d55eb4032b637232954eaddba5cf18c91b42ff3016697ba0f93"
+skip_extraction="${pkgname}_${version}-${_debian_version}.debian.tar.xz"
-pre_configure() {
- cat ../debian/patches/series | while read p; do
- patch -p1 -i ../debian/patches/$p
+pre_patch() {
+ rm -rf debian
+ bsdtar -xf "$XBPS_SRCDISTDIR/$pkgname-$version/$skip_extraction"
+ grep '^[^#]' debian/patches/series | while read p; do
+ msg_normal "Patching (Debian): $p\n"
+ patch -Np1 -s -F0 -i debian/patches/$p
done
}
+do_check() {
+ # expect to be run with root
+ cd build
+ ctest -E "(sbuild-chroot-config)"
+}
+
post_install() {
# Remove development files
rm -rf ${DESTDIR}/usr/include \
From 3216fc9ed9ea4913bb30e5204b18e6ea14468c06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:44 +0700
Subject: [PATCH 082/111] snapper: rebuild for boost-1.80
---
srcpkgs/snapper/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template
index bc7bbe5cf84b..85697667ff77 100644
--- a/srcpkgs/snapper/template
+++ b/srcpkgs/snapper/template
@@ -1,7 +1,7 @@
# Template file for 'snapper'
pkgname=snapper
version=0.10.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-zypp --disable-systemd --with-conf=/etc/conf.d"
conf_files="/etc/conf.d/snapper"
From 188a99f31d08b7d7eb4a4f1140d502bcdf410eb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:45 +0700
Subject: [PATCH 083/111] source-highlight: rebuild for boost-1.80
---
srcpkgs/source-highlight/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/source-highlight/template b/srcpkgs/source-highlight/template
index ab56401c64a0..f76c987335af 100644
--- a/srcpkgs/source-highlight/template
+++ b/srcpkgs/source-highlight/template
@@ -1,7 +1,7 @@
# Template file for 'source-highlight'
pkgname=source-highlight
version=3.1.9
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--with-boost=${XBPS_CROSS_BASE}/usr
--with-bash-completion=/usr/share/bash-completion/completions"
From 206309c33d12c92417275d33f9cc5a095b5ce592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:45 +0700
Subject: [PATCH 084/111] supercollider: rebuild for boost-1.80
---
srcpkgs/supercollider/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/supercollider/template b/srcpkgs/supercollider/template
index 35f6d9dfb7c2..b0b8278470ef 100644
--- a/srcpkgs/supercollider/template
+++ b/srcpkgs/supercollider/template
@@ -1,7 +1,7 @@
# Template file for 'supercollider'
pkgname=supercollider
version=3.11.1
-revision=3
+revision=4
wrksrc="SuperCollider-${version}-Source"
build_style=cmake
make_cmd=make
From a5d3521d4496ce3ffce951bc80c819f2e7602518 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:45 +0700
Subject: [PATCH 085/111] supertux2: rebuild for boost-1.80
---
srcpkgs/supertux2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/supertux2/template b/srcpkgs/supertux2/template
index 56057f5837d5..fce60e205a59 100644
--- a/srcpkgs/supertux2/template
+++ b/srcpkgs/supertux2/template
@@ -1,7 +1,7 @@
# Template file for 'supertux2'
pkgname=supertux2
version=0.6.3
-revision=1
+revision=2
wrksrc="SuperTux-v${version}-Source"
build_style=cmake
configure_args="
From 4e26a15fa3215a7c0b6112ab097a5e9299dab82c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:45 +0700
Subject: [PATCH 086/111] swiften: rebuild for boost-1.80
---
srcpkgs/swiften/patches/boost-endian.patch | 15 +++++++++++++++
srcpkgs/swiften/patches/std.patch | 11 +++++++++++
srcpkgs/swiften/template | 4 ++--
3 files changed, 28 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/swiften/patches/boost-endian.patch
create mode 100644 srcpkgs/swiften/patches/std.patch
diff --git a/srcpkgs/swiften/patches/boost-endian.patch b/srcpkgs/swiften/patches/boost-endian.patch
new file mode 100644
index 000000000000..1cd2c2fb4816
--- /dev/null
+++ b/srcpkgs/swiften/patches/boost-endian.patch
@@ -0,0 +1,15 @@
+--- a/Swiften/Base/Platform.h
++++ b/Swiften/Base/Platform.h
+@@ -43,9 +43,9 @@
+ #endif
+
+ // Endianness
+-#include <boost/detail/endian.hpp>
+-#if defined(BOOST_LITTLE_ENDIAN)
++#include <boost/predef/other/endian.h>
++#if BOOST_ENDIAN_LITTLE_BYTE
+ #define SWIFTEN_LITTLE_ENDIAN
+-#elif defined(BOOST_BIG_ENDIAN)
++#elif BOOST_ENDIAN_BIG_BYTE
+ #define SWIFTEN_BIG_ENDIAN
+ #endif
diff --git a/srcpkgs/swiften/patches/std.patch b/srcpkgs/swiften/patches/std.patch
new file mode 100644
index 000000000000..9534e8a321d2
--- /dev/null
+++ b/srcpkgs/swiften/patches/std.patch
@@ -0,0 +1,11 @@
+--- a/Swift/Controllers/ShowProfileController.h
++++ b/Swift/Controllers/ShowProfileController.h
+@@ -18,6 +18,8 @@
+
+ #include <Swift/Controllers/UIEvents/UIEvent.h>
+
++#include <map>
++
+ namespace Swift {
+ class VCardManager;
+ class ProfileWindow;
diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 969ef1eb5d78..9014153a8818 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,11 +1,11 @@
# Template file for 'swiften'
pkgname=swiften
version=4.0.3
-revision=2
+revision=3
wrksrc="swift-${version}"
hostmakedepends="scons pkg-config"
makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
- lua51-devel miniupnpc-devel sqlite-devel"
+ lua51-devel miniupnpc-devel sqlite-devel hunspell-devel"
short_desc="XMPP library for C++"
maintainer="John Regan <john@jrjrtech.com>"
license="GPL-3.0-only"
From edd8b3c806ee1c47b02c9eacd7cc6c95d20ec0d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:46 +0700
Subject: [PATCH 087/111] syncthingtray: rebuild for boost-1.80
---
srcpkgs/syncthingtray/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/syncthingtray/template b/srcpkgs/syncthingtray/template
index 4f338f2cc200..f445aa92db1e 100644
--- a/srcpkgs/syncthingtray/template
+++ b/srcpkgs/syncthingtray/template
@@ -1,7 +1,7 @@
# Template file for 'syncthingtray'
pkgname=syncthingtray
version=1.2.2
-revision=1
+revision=2
build_style=cmake
configure_args="-DJS_PROVIDER=qml -DBUILTIN_TRANSLATIONS=ON -DSYSTEMD_SUPPORT=OFF
-DBUILD_SHARED_LIBS=ON -DWEBVIEW_PROVIDER=$(vopt_if webengine webengine none)"
From cc5b33361a1f37eec06d14f6d0c68a9fa6aac3bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:46 +0700
Subject: [PATCH 088/111] tmfs: rebuild for boost-1.80
---
srcpkgs/tmfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tmfs/template b/srcpkgs/tmfs/template
index 1dbed3e0eb72..ed4fb5fed836 100644
--- a/srcpkgs/tmfs/template
+++ b/srcpkgs/tmfs/template
@@ -1,7 +1,7 @@
# Template file for 'tmfs'
pkgname=tmfs
version=r5
-revision=7
+revision=8
build_style=cmake
hostmakedepends="pkg-config"
makedepends="fuse-devel boost-devel"
From 2e412f81af27018666b32ad656a0d3f81e795f62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:46 +0700
Subject: [PATCH 089/111] tomahawk: rebuild for boost-1.80
---
srcpkgs/tomahawk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tomahawk/template b/srcpkgs/tomahawk/template
index 0edbacc5f8ad..b66b9a876a5c 100644
--- a/srcpkgs/tomahawk/template
+++ b/srcpkgs/tomahawk/template
@@ -1,7 +1,7 @@
# Template file for 'tomahawk'
pkgname=tomahawk
version=0.8.4
-revision=21
+revision=22
wrksrc=${pkgname}-${_commit}
_commit=90ec6f0dc701cba0533c66abdcb904e29f02a66f
build_style=cmake
From 97d52557e2fd010da4702d6510ca1f279fcd84de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:46 +0700
Subject: [PATCH 090/111] uhd: rebuild for boost-1.80
---
srcpkgs/uhd/patches/boost-math.patch | 31 +++++++++++++++++++++++++++
srcpkgs/uhd/patches/std-complex.patch | 10 +++++++++
srcpkgs/uhd/template | 2 +-
3 files changed, 42 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/uhd/patches/boost-math.patch
create mode 100644 srcpkgs/uhd/patches/std-complex.patch
diff --git a/srcpkgs/uhd/patches/boost-math.patch b/srcpkgs/uhd/patches/boost-math.patch
new file mode 100644
index 000000000000..9ac6dae1df9d
--- /dev/null
+++ b/srcpkgs/uhd/patches/boost-math.patch
@@ -0,0 +1,31 @@
+--- a/host/lib/usrp/usrp2/usrp2_impl.cpp
++++ b/host/lib/usrp/usrp2/usrp2_impl.cpp
+@@ -18,6 +18,8 @@
+ #include <boost/asio.hpp> //used for htonl and ntohl
+ #include <boost/asio/ip/address_v4.hpp>
+ #include <boost/format.hpp>
++#include <boost/math/special_functions/round.hpp>
++#include <boost/math/special_functions/sign.hpp>
+ #include <boost/thread.hpp>
+ #include <functional>
+
+--- a/host/lib/usrp/cores/rx_frontend_core_3000.cpp
++++ b/host/lib/usrp/cores/rx_frontend_core_3000.cpp
+@@ -12,6 +12,7 @@
+ #include <uhdlib/usrp/cores/rx_frontend_core_3000.hpp>
+ #include <boost/assign/list_of.hpp>
+ #include <boost/math/special_functions/round.hpp>
++#include <boost/math/special_functions/sign.hpp>
+ #include <functional>
+
+ using namespace uhd;
+--- a/host/lib/usrp/cores/rx_dsp_core_3000.cpp
++++ b/host/lib/usrp/cores/rx_dsp_core_3000.cpp
+@@ -14,6 +14,7 @@
+ #include <uhdlib/usrp/cores/rx_dsp_core_3000.hpp>
+ #include <boost/assign/list_of.hpp>
+ #include <boost/math/special_functions/round.hpp>
++#include <boost/math/special_functions/sign.hpp>
+ #include <algorithm>
+ #include <cmath>
+ #include <functional>
diff --git a/srcpkgs/uhd/patches/std-complex.patch b/srcpkgs/uhd/patches/std-complex.patch
new file mode 100644
index 000000000000..c7573bf4ade2
--- /dev/null
+++ b/srcpkgs/uhd/patches/std-complex.patch
@@ -0,0 +1,10 @@
+--- a/host/tests/tx_streamer_test.cpp
++++ b/host/tests/tx_streamer_test.cpp
+@@ -7,6 +7,7 @@
+ #include "../common/mock_link.hpp"
+ #include <uhdlib/transport/tx_streamer_impl.hpp>
+ #include <boost/test/unit_test.hpp>
++#include <complex>
+ #include <iostream>
+ #include <memory>
+
diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template
index 5f043162d7dc..170e12670c2c 100644
--- a/srcpkgs/uhd/template
+++ b/srcpkgs/uhd/template
@@ -1,7 +1,7 @@
# Template file for 'uhd'
pkgname=uhd
version=4.0.0.0
-revision=1
+revision=2
build_wrksrc=host
build_style=cmake
configure_args="-DCMAKE_BUILD_TYPE=None"
From c47c4da8fb1acdd2ca9df9b98837d5ad7375d617 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:47 +0700
Subject: [PATCH 091/111] wesnoth: rebuild for boost-1.80
---
srcpkgs/wesnoth/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 0fcc09b29c10..4d55d20b5959 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,7 +1,7 @@
# Template file for 'wesnoth'
pkgname=wesnoth
version=1.14.17
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_OMP=1"
hostmakedepends="pkg-config gettext"
@@ -18,7 +18,7 @@ checksum=3646cba604e09c12d6900a733bcb78cbf05f2f75f05346630d6529c220f584e1
replaces="wesnoth-data>=0"
CFLAGS="-UNDEBUG"
-CXXFLAGS="-UNDEBUG"
+CXXFLAGS="-UNDEBUG -std=c++14"
post_install() {
# runit service
From 180dcdba5f54c8462639b0d46db234e56ed591a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:47 +0700
Subject: [PATCH 092/111] wsjtx: rebuild for boost-1.80
---
srcpkgs/wsjtx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wsjtx/template b/srcpkgs/wsjtx/template
index c1838dd7cf51..7324d85bd64d 100644
--- a/srcpkgs/wsjtx/template
+++ b/srcpkgs/wsjtx/template
@@ -1,7 +1,7 @@
# Template file for 'wsjtx'
pkgname=wsjtx
version=2.5.4
-revision=1
+revision=2
build_wrksrc=wsjtx
build_style=cmake
configure_args="-DRIGCTLCOM_EXE= -DRIGCTL_EXE= -DRIGCTLD_EXE="
From 121a92784c49feb97819a02015b42f97330d9178 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:39 +0700
Subject: [PATCH 093/111] libreoffice: update to 7.4.0.3.
---
srcpkgs/libreoffice/template | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 158df0f30ebc..00ceb97950ff 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
-version=7.3.3.2
-revision=3
+version=7.4.0.3
+revision=1
build_style=meta
make_build_target="build-nocheck"
nocross="Several dependencies are nocross=yes"
@@ -9,7 +9,7 @@ nocross="Several dependencies are nocross=yes"
hostmakedepends="automake flex git gperf hyphen icu libtool openldap which gettext xz
perl-Archive-Zip pkg-config qt5-qmake sane ucpp unzip zip python3-setuptools
fontforge python3-lxml"
-makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel
+makedepends="CoinMP-devel apr-devel avahi-libs-devel clucene-devel icu-devel
frameworkintegration-devel glyphy-devel gpgmepp-devel gst-plugins-base1-devel
gtk+-devel gtk+3-devel hunspell-devel hyphen-devel libXt-devel libabw-devel
libatomic_ops-devel libbluetooth-devel libcdr-devel libe-book-devel
@@ -111,10 +111,10 @@ distfiles="
${_addurl}/Scheherazade-2.100.zip
${_addurl}/libcuckoo-93217f8d391718380c508a722ab9acd5e9081233.tar.gz
"
-checksum="ee12bdbe1621c20e2744bc5b6c5967810f25a5760b98ac5812d550ab00968685
- a6f67d5a20fe656c909b16c338759c187cf7e5e7f463d33d8d58a8bbe0280323
- 688634eccb802c156496124b394c0ec5e21059a9b6cd0095930f9e76f9eefe9b
- b91b0a482fa42d59e1605f39a3917166e7ff76bfa8e9b62d6eef0a9b04b3351c
+checksum="acc383a4386e1ceb74266a2f6406dee4b3a78576bda6bc71630f629ea20e3c19
+ 7d0b2927051111acdf99c9e805078cf5fb7f90f855b6182a225d4319bb0419ad
+ aa1922940b1742a833f34efc2cc2267dd592363530764dcfd352112c9b329547
+ e6fc4b8b4adf6c3b23f555f0a245ef535ad1771a386480ec14cab71e70179d8c
1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753
75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
7d2797fe9f79a77009721e3f14fa4a1dec17a6d706bdc93f85f1f01d124fab66
From 72070aeb8585ce7f5aaf6787ec06c2672dda6709 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 20:49:38 +0400
Subject: [PATCH 094/111] fmt: update to 9.0.0.
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index b91133da6484..dbc48a29aad1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3540,7 +3540,7 @@ libcotp.so.12 libcotp-1.2.1_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.8 fmt-8.0.1_1
+libfmt.so.9 fmt-9.0.0_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.25 libtls-3.5.2_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index 35a914c75eab..6fa037dfbaab 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=8.1.1
+version=9.0.0
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,7 +10,7 @@ license="BSD-2-Clause"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=3d794d3cf67633b34b2771eb9f073bde87e846e0d395d254df7b211ef1ec7346
+checksum=9a1e0e9e843a356d65c7604e2c8bf9402b50fe294c355de0095ebd42fb9bd2c5
post_install() {
vlicense LICENSE.rst LICENSE
From 15303d1f05ed9c68b0f343c5b71c393cfa28bfbe Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:33 +0400
Subject: [PATCH 095/111] Bear: update to 3.0.20.
---
srcpkgs/Bear/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index fce6309ca6fa..c6c1fb6e9c38 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
-version=3.0.19
-revision=2
+version=3.0.20
+revision=1
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-3.0-or-later"
homepage="https://github.com/rizsotto/Bear"
distfiles="https://github.com/rizsotto/Bear/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=2fcfe2c6e029182cfc54ed26b3505c0ef12b0f43df03fb587f335afdc2ca9431
+checksum=45cfcdab07f824f6c06c9776701156f7a04b23eadd25ecbc88c188789a447cc7
conflicts="interception-tools>=0" # /usr/bin/intercept
if [ -z "$XBPS_CHECK_PKGS" ]; then
From cd36ee768ff142d8cd2dadf06ee19abd6fb59d0c Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:33 +0400
Subject: [PATCH 096/111] cherrytree: revbump for fmt 9.0
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 55512e3b5ef7..e52a677a47b5 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=0.99.39
-revision=2
+revision=3
wrksrc="${pkgname}_${version}"
build_style=cmake
hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
From e5905296eda92a54678b9667ed414820e77d9c07 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:33 +0400
Subject: [PATCH 097/111] coeurl: revbump for fmt 9.0
---
srcpkgs/coeurl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index d0dbcbc60ba0..a9f2dfbbc123 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,7 +1,7 @@
# Template file for 'coeurl'
pkgname=coeurl
version=0.1.1
-revision=1
+revision=2
wrksrc=coeurl-v${version}
build_style=meson
hostmakedepends="pkg-config"
From 529c6b532e4c4902fdbdf0a2757976bdb4efef90 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:34 +0400
Subject: [PATCH 098/111] easyeffects: revbump for fmt 9.0
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index ac84ce15b068..0ddfb1b5833d 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=6.2.4
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel"
makedepends="gtkmm4-devel pipewire-devel zita-convolver-devel lilv-devel
From 70ccf37568e00c2439ef8f6c8b35da6557af0176 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:34 +0400
Subject: [PATCH 099/111] gerbera: revbump for fmt 9.0, add patch
---
srcpkgs/gerbera/patches/fmt-9-fix.patch | 32 +++++++++++++++++++++++++
srcpkgs/gerbera/template | 2 +-
2 files changed, 33 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/gerbera/patches/fmt-9-fix.patch
diff --git a/srcpkgs/gerbera/patches/fmt-9-fix.patch b/srcpkgs/gerbera/patches/fmt-9-fix.patch
new file mode 100644
index 000000000000..7adedf9005db
--- /dev/null
+++ b/srcpkgs/gerbera/patches/fmt-9-fix.patch
@@ -0,0 +1,32 @@
+From d7b8fafbc94405c20753fed569abd8878cccde89 Mon Sep 17 00:00:00 2001
+From: Felix Yan <felixonmars@archlinux.org>
+Date: Fri, 19 Aug 2022 15:22:10 +0300
+Subject: [PATCH] Fix build with fmt 9.0
+
+Fixes #2681
+---
+ src/database/sql_format.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/database/sql_format.h b/src/database/sql_format.h
+index 32dc00efa..e4e1909a8 100644
+--- a/src/database/sql_format.h
++++ b/src/database/sql_format.h
+@@ -42,7 +42,7 @@ struct SQLIdentifier {
+ template <>
+ struct fmt::formatter<SQLIdentifier> : formatter<std::string_view> {
+ template <typename FormatContext>
+- auto format(const SQLIdentifier& tn, FormatContext& ctx) -> decltype(ctx.out())
++ auto format(const SQLIdentifier& tn, FormatContext& ctx) const -> decltype(ctx.out())
+ {
+ return format_to(ctx.out(), "{}{}{}", tn.quote_begin, tn.name, tn.quote_end);
+ }
+@@ -61,7 +61,7 @@ struct ColumnUpdate {
+ template <>
+ struct fmt::formatter<ColumnUpdate> : formatter<std::string_view> {
+ template <typename FormatContext>
+- auto format(const ColumnUpdate& a, FormatContext& ctx) -> decltype(ctx.out())
++ auto format(const ColumnUpdate& a, FormatContext& ctx) const -> decltype(ctx.out())
+ {
+ return format_to(ctx.out(), "{} = {}", a.column, a.value);
+ }
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 35136708b3e5..100b94a7acbe 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.11.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 438c09ff9f4f64b0fb556e694e6414e228e28530 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:34 +0400
Subject: [PATCH 100/111] kodi: revbump for fmt 9.0
---
srcpkgs/kodi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index d3e9a13afdd5..4b6c9e1ade0c 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=19.4
-revision=3
+revision=4
_codename="Matrix"
wrksrc="xbmc-${version}-${_codename}"
build_style=cmake
From 4e75f6afed57ffb2f08c6d864881a60854c85f23 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:34 +0400
Subject: [PATCH 101/111] MangoHud: revbump for fmt 9.0
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index a9973bcad30a..fb0e18c1a1f4 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -2,7 +2,7 @@
pkgname=MangoHud
version=0.6.7.1
_version="${version%.*}-${version##*.}"
-revision=2
+revision=3
wrksrc="MangoHud-v${_version}"
build_style=meson
configure_args="-Duse_system_vulkan=enabled -Dwith_xnvctrl=disabled
From 812e7e8c2c357691ddba700fb25e0c2091ff9286 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 102/111] mkvtoolnix: revbump for fmt 9.0
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index a1d2adbc4b3f..d98022773c0a 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=70.0.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
From 91c3e33aa0ca5f40b3971e9e2d626e4e9e4b7b27 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 103/111] mpd: revbump for fmt 9.0
---
srcpkgs/mpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 98195b80a38d..b43c83fbb0f7 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,7 +1,7 @@
# Template file for 'mpd'
pkgname=mpd
version=0.23.8
-revision=1
+revision=2
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
-Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
From d15816366cdbf7662b95e6c1472c40657390c16f Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 104/111] mtxclient: revbump for fmt 9.0
---
srcpkgs/mtxclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 4ec895656749..12fea54d3fd5 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.8.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From 8d343119d69cc581cc6f90bebd971cb55a311610 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 105/111] nheko: revbump for fmt 9.0
---
srcpkgs/nheko/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index f35fd3942116..8e41e9e1f2f0 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.10.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative asciidoc"
makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
From 40eca4d4a219b3117623f3eec1e8b203d39241ee Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 106/111] spdlog: revbump for fmt 9.0
---
srcpkgs/spdlog/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 187ec0d0eb6e..ef1ee76ffcca 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
# Template file for 'spdlog'
pkgname=spdlog
version=1.10.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
-DSPDLOG_BUILD_SHARED=ON"
From d5b9fb2a6e5e64d63d05025fe4746d5f953459a7 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 107/111] Waybar: revbump for fmt 9.0
---
srcpkgs/Waybar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 8ac3d4290b39..e40288e00b75 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.9.13
-revision=1
+revision=2
_date_version=3.0.0
build_style=meson
configure_args="-Dgtk-layer-shell=enabled -Dlibudev=enabled -Dman-pages=enabled
From 388ddc2edf4291c373b1dd32c530da021c53a7b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 30 Aug 2022 20:18:16 +0700
Subject: [PATCH 108/111] fixup! icinga2
---
srcpkgs/icinga2/patches/cmake-3.15.patch | 45 ++++++++++++++++++++++++
1 file changed, 45 insertions(+)
create mode 100644 srcpkgs/icinga2/patches/cmake-3.15.patch
diff --git a/srcpkgs/icinga2/patches/cmake-3.15.patch b/srcpkgs/icinga2/patches/cmake-3.15.patch
new file mode 100644
index 000000000000..5c99e60370cb
--- /dev/null
+++ b/srcpkgs/icinga2/patches/cmake-3.15.patch
@@ -0,0 +1,45 @@
+CMake 3.15 Boost_VERSION to Boost_VERSION_MACRO
+and define Boost_VERSION to have dot
+--- a/third-party/cmake/BoostTestTargets.cmake
++++ b/third-party/cmake/BoostTestTargets.cmake
+@@ -47,11 +47,11 @@ set(BOOST_TEST_TARGET_PREFIX "boosttest"
+ if(NOT Boost_FOUND)
+ find_package(Boost 1.34.0 QUIET)
+ endif()
+-if("${Boost_VERSION}0" LESS "1034000")
++if("${Boost_VERSION_MACRO}0" LESS "1034000")
+ set(_shared_msg
+ "NOTE: boost::test-based targets and tests cannot "
+ "be added: boost >= 1.34.0 required but not found. "
+- "(found: '${Boost_VERSION}'; want >=103400) ")
++ "(found: '${Boost_VERSION_MACRO}'; want >=103400) ")
+ if(BUILD_TESTING)
+ message(FATAL_ERROR
+ ${_shared_msg}
+@@ -67,7 +67,7 @@ endif()
+ include(GetForceIncludeDefinitions)
+ include(CopyResourcesToBuildTree)
+
+-if(Boost_FOUND AND NOT "${Boost_VERSION}0" LESS "1034000")
++if(Boost_FOUND AND NOT "${Boost_VERSION_MACRO}0" LESS "1034000")
+ set(_boosttesttargets_libs)
+ set(_boostConfig "BoostTestTargetsIncluded.h")
+ if(NOT Boost_UNIT_TEST_FRAMEWORK_LIBRARY)
+@@ -144,7 +144,7 @@ function(add_boost_test _name)
+ "Syntax error in use of add_boost_test: at least one source file required!")
+ endif()
+
+- if(Boost_FOUND AND NOT "${Boost_VERSION}0" LESS "1034000")
++ if(Boost_FOUND AND NOT "${Boost_VERSION_MACRO}0" LESS "1034000")
+
+ include_directories(${Boost_INCLUDE_DIRS})
+
+@@ -236,7 +236,7 @@ function(add_boost_test _name)
+ set(_test_command ${_target_name})
+ endif()
+
+- if(TESTS AND "${Boost_VERSION}" VERSION_GREATER "103799")
++ if(TESTS AND "${Boost_VERSION_MACRO}" VERSION_GREATER "103799")
+ foreach(_test ${TESTS})
+ add_test(NAME
+ ${_name}-${_test}
From 682ccb493e7ea189ebd0b14fd62c56acf9026b3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 30 Aug 2022 20:46:52 +0700
Subject: [PATCH 109/111] fixup! imagescan
---
srcpkgs/imagescan/patches/boost-1.80.patch | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 srcpkgs/imagescan/patches/boost-1.80.patch
diff --git a/srcpkgs/imagescan/patches/boost-1.80.patch b/srcpkgs/imagescan/patches/boost-1.80.patch
new file mode 100644
index 000000000000..4425d84a34a5
--- /dev/null
+++ b/srcpkgs/imagescan/patches/boost-1.80.patch
@@ -0,0 +1,15 @@
+_1 should be looked up via ADL, don't know
+--- a/utsushi/functional.hpp
++++ b/utsushi/functional.hpp
+@@ -59,6 +59,11 @@ using NAMESPACE::function;
+ using NAMESPACE::ref;
+ using NAMESPACE::reference_wrapper;
+
++#if __cplusplus >= 201103L && !WITH_INCLUDED_BOOST
++using std::placeholders::_1;
++using std::placeholders::_2;
++#endif
++
+ } // namespace utsushi
+
+ #undef NAMESPACE
From b68cfcffcc5a5cc59bcf5107134a8a96b14b51d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 30 Aug 2022 19:48:32 +0700
Subject: [PATCH 110/111] fixup! guitarix2
---
srcpkgs/guitarix2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/guitarix2/template b/srcpkgs/guitarix2/template
index de2edbf770b4..90010b5a2be8 100644
--- a/srcpkgs/guitarix2/template
+++ b/srcpkgs/guitarix2/template
@@ -12,7 +12,7 @@ makedepends="boost-devel eigen fftw-devel gtkmm-devel jack-devel
ladspa-sdk liblrdf-devel libsndfile-devel lilv-devel lv2 sratom-devel
zita-convolver-devel zita-resampler-devel
$(vopt_if avahi avahi-glib-libs-devel) $(vopt_if bluez libbluetooth-devel)"
-depends="desktop-file-utils"
+depends="desktop-file-utils fonts-roboto-ttf"
short_desc="Virtual guitar amplifier running on Jack Audio Connection Kit"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
From efe078f13abd4c6d663bae18d1249cd2959c87c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 30 Aug 2022 21:06:32 +0700
Subject: [PATCH 111/111] fixup! imagescan
---
srcpkgs/imagescan/patches/sane.patch | 11 +++++++++++
1 file changed, 11 insertions(+)
create mode 100644 srcpkgs/imagescan/patches/sane.patch
diff --git a/srcpkgs/imagescan/patches/sane.patch b/srcpkgs/imagescan/patches/sane.patch
new file mode 100644
index 000000000000..58e220ba786d
--- /dev/null
+++ b/srcpkgs/imagescan/patches/sane.patch
@@ -0,0 +1,11 @@
+--- a/sane/version.hpp
++++ b/sane/version.hpp
+@@ -37,7 +37,7 @@ extern "C" { // neede
+ #include <sane/sane.h>
+ }
+
+-#if !((SANE_MAJOR == SANE_CURRENT_MAJOR) && (SANE_MINOR == 0))
++#if !((SANE_MAJOR == SANE_CURRENT_MAJOR) && (SANE_CURRENT_MINOR == 0))
+ #error "SANE installation violates versioning portability constraints."
+ #endif
+
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Updated] [WIP] boost 1.80
2022-08-27 18:49 [PR PATCH] [WIP] boost 1.80 sgn
` (5 preceding siblings ...)
2022-08-30 14:56 ` sgn
@ 2022-08-31 18:24 ` sgn
2022-09-01 1:37 ` [PR PATCH] [Closed]: " sgn
7 siblings, 0 replies; 9+ messages in thread
From: sgn @ 2022-08-31 18:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1251 bytes --]
There is an updated pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages boost-1.80
https://github.com/void-linux/void-packages/pull/38949
[WIP] boost 1.80
<!-- Uncomment relevant sections and delete options which are not applicable -->
[ci skip]
#### Testing the changes
- I tested the changes in this PR: **NO**
Close #38916
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/38949.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boost-1.80-38949.patch --]
[-- Type: text/x-diff, Size: 197706 bytes --]
From b37cf8da24ce2f633cb40037b6aa152efdd0851a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 15:21:49 +0700
Subject: [PATCH 001/107] boost: update to 1.80.0.
---
common/shlibs | 65 +++---
.../{boost-python1.72 => boost-python3-1.80} | 0
.../patches/0001-compat-glibc-2.34.patch | 23 --
.../patches/0002-compat-glibc-2.34.patch | 30 ---
srcpkgs/boost/patches/exec_file.patch | 45 ----
.../boost/patches/install-strip-destdir.patch | 27 +++
srcpkgs/boost/patches/mips.patch | 11 -
srcpkgs/boost/template | 196 +++++++++---------
...boost-python3-1.72 => libboost_atomic1.80} | 0
...ibboost_atomic1.72 => libboost_chrono1.80} | 0
...oost_chrono1.72 => libboost_container1.80} | 0
...ost_container1.72 => libboost_context1.80} | 0
...oost_context1.72 => libboost_contract1.80} | 0
...st_contract1.72 => libboost_coroutine1.80} | 0
...t_coroutine1.72 => libboost_date_time1.80} | 0
...boost_date_time1.72 => libboost_fiber1.80} | 0
...oost_fiber1.72 => libboost_filesystem1.80} | 0
...oost_filesystem1.72 => libboost_graph1.80} | 0
...boost_graph1.72 => libboost_iostreams1.80} | 0
...bboost_iostreams1.72 => libboost_json1.80} | 0
...ibboost_locale1.72 => libboost_locale1.80} | 0
.../{libboost_log1.72 => libboost_log1.80} | 0
...t_log_setup1.72 => libboost_log_setup1.80} | 0
...ost_math_c991.72 => libboost_math_c991.80} | 0
...t_math_c99f1.72 => libboost_math_c99f1.80} | 0
...t_math_c99l1.72 => libboost_math_c99l1.80} | 0
...ost_math_tr11.72 => libboost_math_tr11.80} | 0
...t_math_tr1f1.72 => libboost_math_tr1f1.80} | 0
...t_math_tr1l1.72 => libboost_math_tr1l1.80} | 0
...g_exec_monitor1.72 => libboost_nowide1.80} | 0
...ions1.72 => libboost_prg_exec_monitor1.80} | 0
...andom1.72 => libboost_program_options1.80} | 0
...libboost_regex1.72 => libboost_random1.80} | 0
...t_serialization1.72 => libboost_regex1.80} | 0
...dr2line1.72 => libboost_serialization1.80} | 0
...1.72 => libboost_stacktrace_addr2line1.80} | 0
...noop1.72 => libboost_stacktrace_basic1.80} | 0
...ystem1.72 => libboost_stacktrace_noop1.80} | 0
...ibboost_thread1.72 => libboost_system1.80} | 0
...libboost_timer1.72 => libboost_thread1.80} | 0
...st_type_erasure1.72 => libboost_timer1.80} | 0
...ramework1.72 => libboost_type_erasure1.80} | 0
...e1.72 => libboost_unit_test_framework1.80} | 0
...t_wserialization1.72 => libboost_wave1.80} | 0
srcpkgs/libboost_wserialization1.80 | 1 +
45 files changed, 164 insertions(+), 234 deletions(-)
rename srcpkgs/{boost-python1.72 => boost-python3-1.80} (100%)
delete mode 100644 srcpkgs/boost/patches/0001-compat-glibc-2.34.patch
delete mode 100644 srcpkgs/boost/patches/0002-compat-glibc-2.34.patch
delete mode 100644 srcpkgs/boost/patches/exec_file.patch
create mode 100644 srcpkgs/boost/patches/install-strip-destdir.patch
delete mode 100644 srcpkgs/boost/patches/mips.patch
rename srcpkgs/{boost-python3-1.72 => libboost_atomic1.80} (100%)
rename srcpkgs/{libboost_atomic1.72 => libboost_chrono1.80} (100%)
rename srcpkgs/{libboost_chrono1.72 => libboost_container1.80} (100%)
rename srcpkgs/{libboost_container1.72 => libboost_context1.80} (100%)
rename srcpkgs/{libboost_context1.72 => libboost_contract1.80} (100%)
rename srcpkgs/{libboost_contract1.72 => libboost_coroutine1.80} (100%)
rename srcpkgs/{libboost_coroutine1.72 => libboost_date_time1.80} (100%)
rename srcpkgs/{libboost_date_time1.72 => libboost_fiber1.80} (100%)
rename srcpkgs/{libboost_fiber1.72 => libboost_filesystem1.80} (100%)
rename srcpkgs/{libboost_filesystem1.72 => libboost_graph1.80} (100%)
rename srcpkgs/{libboost_graph1.72 => libboost_iostreams1.80} (100%)
rename srcpkgs/{libboost_iostreams1.72 => libboost_json1.80} (100%)
rename srcpkgs/{libboost_locale1.72 => libboost_locale1.80} (100%)
rename srcpkgs/{libboost_log1.72 => libboost_log1.80} (100%)
rename srcpkgs/{libboost_log_setup1.72 => libboost_log_setup1.80} (100%)
rename srcpkgs/{libboost_math_c991.72 => libboost_math_c991.80} (100%)
rename srcpkgs/{libboost_math_c99f1.72 => libboost_math_c99f1.80} (100%)
rename srcpkgs/{libboost_math_c99l1.72 => libboost_math_c99l1.80} (100%)
rename srcpkgs/{libboost_math_tr11.72 => libboost_math_tr11.80} (100%)
rename srcpkgs/{libboost_math_tr1f1.72 => libboost_math_tr1f1.80} (100%)
rename srcpkgs/{libboost_math_tr1l1.72 => libboost_math_tr1l1.80} (100%)
rename srcpkgs/{libboost_prg_exec_monitor1.72 => libboost_nowide1.80} (100%)
rename srcpkgs/{libboost_program_options1.72 => libboost_prg_exec_monitor1.80} (100%)
rename srcpkgs/{libboost_random1.72 => libboost_program_options1.80} (100%)
rename srcpkgs/{libboost_regex1.72 => libboost_random1.80} (100%)
rename srcpkgs/{libboost_serialization1.72 => libboost_regex1.80} (100%)
rename srcpkgs/{libboost_stacktrace_addr2line1.72 => libboost_serialization1.80} (100%)
rename srcpkgs/{libboost_stacktrace_basic1.72 => libboost_stacktrace_addr2line1.80} (100%)
rename srcpkgs/{libboost_stacktrace_noop1.72 => libboost_stacktrace_basic1.80} (100%)
rename srcpkgs/{libboost_system1.72 => libboost_stacktrace_noop1.80} (100%)
rename srcpkgs/{libboost_thread1.72 => libboost_system1.80} (100%)
rename srcpkgs/{libboost_timer1.72 => libboost_thread1.80} (100%)
rename srcpkgs/{libboost_type_erasure1.72 => libboost_timer1.80} (100%)
rename srcpkgs/{libboost_unit_test_framework1.72 => libboost_type_erasure1.80} (100%)
rename srcpkgs/{libboost_wave1.72 => libboost_unit_test_framework1.80} (100%)
rename srcpkgs/{libboost_wserialization1.72 => libboost_wave1.80} (100%)
create mode 120000 srcpkgs/libboost_wserialization1.80
diff --git a/common/shlibs b/common/shlibs
index 48c63f2d0735..b91133da6484 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -620,38 +620,39 @@ libip4tc.so.2 iptables-1.8.3_1
libipq.so.0 iptables-1.4.7_1
libnm.so.0 libnm-1.0.0_1
libKF5ItemModels.so.5 kitemmodels-5.26.0_1
-libboost_context.so.1.72.0 libboost_context1.72-1.72.0_1
-libboost_coroutine.so.1.72.0 libboost_coroutine1.72-1.72.0_1
-libboost_container.so.1.72.0 libboost_container1.72-1.72.0_1
-libboost_prg_exec_monitor.so.1.72.0 libboost_prg_exec_monitor1.72-1.72.0_1
-libboost_timer.so.1.72.0 libboost_timer1.72-1.72.0_1
-libboost_random.so.1.72.0 libboost_random1.72-1.72.0_1
-libboost_filesystem.so.1.72.0 libboost_filesystem1.72-1.72.0_1
-libboost_unit_test_framework.so.1.72.0 libboost_unit_test_framework1.72-1.72.0_1
-libboost_math_c99.so.1.72.0 libboost_math_c991.72-1.72.0_1
-libboost_math_tr1.so.1.72.0 libboost_math_tr11.72-1.72.0_1
-libboost_regex.so.1.72.0 libboost_regex1.72-1.72.0_1
-libboost_serialization.so.1.72.0 libboost_serialization1.72-1.72.0_1
-libboost_chrono.so.1.72.0 libboost_chrono1.72-1.72.0_1
-libboost_wserialization.so.1.72.0 libboost_wserialization1.72-1.72.0_1
-libboost_graph.so.1.72.0 libboost_graph1.72-1.72.0_1
-libboost_log.so.1.72.0 libboost_log1.72-1.72.0_1
-libboost_locale.so.1.72.0 libboost_locale1.72-1.72.0_1
-libboost_program_options.so.1.72.0 libboost_program_options1.72-1.72.0_1
-libboost_iostreams.so.1.72.0 libboost_iostreams1.72-1.72.0_1
-libboost_system.so.1.72.0 libboost_system1.72-1.72.0_1
-libboost_thread.so.1.72.0 libboost_thread1.72-1.72.0_1
-libboost_log_setup.so.1.72.0 libboost_log_setup1.72-1.72.0_1
-libboost_date_time.so.1.72.0 libboost_date_time1.72-1.72.0_1
-libboost_wave.so.1.72.0 libboost_wave1.72-1.72.0_1
-libboost_atomic.so.1.72.0 libboost_atomic1.72-1.72.0_1
-libboost_type_erasure.so.1.72.0 libboost_type_erasure1.72-1.72.0_1
-libboost_fiber.so.1.72.0 libboost_fiber1.72-1.72.0_1
-libboost_stacktrace_noop.so.1.72.0 libboost_stacktrace_noop1.72-1.72.0_1
-libboost_stacktrace_addr2line.so.1.72.0 libboost_stacktrace_addr2line1.72-1.72.0_1
-libboost_stacktrace_basic.so.1.72.0 libboost_stacktrace_basic1.72-1.72.0_1
-libboost_python27.so.1.72.0 boost-python1.72-1.72.0_1
-libboost_python310.so.1.72.0 boost-python3-1.72-1.72.0_6
+libboost_context.so.1.80.0 libboost_context1.80-1.80.0_1
+libboost_coroutine.so.1.80.0 libboost_coroutine1.80-1.80.0_1
+libboost_container.so.1.80.0 libboost_container1.80-1.80.0_1
+libboost_prg_exec_monitor.so.1.80.0 libboost_prg_exec_monitor1.80-1.80.0_1
+libboost_timer.so.1.80.0 libboost_timer1.80-1.80.0_1
+libboost_random.so.1.80.0 libboost_random1.80-1.80.0_1
+libboost_filesystem.so.1.80.0 libboost_filesystem1.80-1.80.0_1
+libboost_unit_test_framework.so.1.80.0 libboost_unit_test_framework1.80-1.80.0_1
+libboost_math_c99.so.1.80.0 libboost_math_c991.80-1.80.0_1
+libboost_math_tr1.so.1.80.0 libboost_math_tr11.80-1.80.0_1
+libboost_nowide.so.1.80.0 libboost_nowide1.80-1.80.0_1
+libboost_json.so.1.80.0 libboost_json1.80-1.80.0_1
+libboost_regex.so.1.80.0 libboost_regex1.80-1.80.0_1
+libboost_serialization.so.1.80.0 libboost_serialization1.80-1.80.0_1
+libboost_chrono.so.1.80.0 libboost_chrono1.80-1.80.0_1
+libboost_wserialization.so.1.80.0 libboost_wserialization1.80-1.80.0_1
+libboost_graph.so.1.80.0 libboost_graph1.80-1.80.0_1
+libboost_log.so.1.80.0 libboost_log1.80-1.80.0_1
+libboost_locale.so.1.80.0 libboost_locale1.80-1.80.0_1
+libboost_program_options.so.1.80.0 libboost_program_options1.80-1.80.0_1
+libboost_iostreams.so.1.80.0 libboost_iostreams1.80-1.80.0_1
+libboost_system.so.1.80.0 libboost_system1.80-1.80.0_1
+libboost_thread.so.1.80.0 libboost_thread1.80-1.80.0_1
+libboost_log_setup.so.1.80.0 libboost_log_setup1.80-1.80.0_1
+libboost_date_time.so.1.80.0 libboost_date_time1.80-1.80.0_1
+libboost_wave.so.1.80.0 libboost_wave1.80-1.80.0_1
+libboost_atomic.so.1.80.0 libboost_atomic1.80-1.80.0_1
+libboost_type_erasure.so.1.80.0 libboost_type_erasure1.80-1.80.0_1
+libboost_fiber.so.1.80.0 libboost_fiber1.80-1.80.0_1
+libboost_stacktrace_noop.so.1.80.0 libboost_stacktrace_noop1.80-1.80.0_1
+libboost_stacktrace_addr2line.so.1.80.0 libboost_stacktrace_addr2line1.80-1.80.0_1
+libboost_stacktrace_basic.so.1.80.0 libboost_stacktrace_basic1.80-1.80.0_1
+libboost_python310.so.1.80.0 boost-python3-1.80-1.80.0_6
libexempi.so.8 exempi-2.5.0_1
libatasmart.so.4 libatasmart-0.17_1
libsgutils2-1.45.so.2 libsgutils-1.45_1
diff --git a/srcpkgs/boost-python1.72 b/srcpkgs/boost-python3-1.80
similarity index 100%
rename from srcpkgs/boost-python1.72
rename to srcpkgs/boost-python3-1.80
diff --git a/srcpkgs/boost/patches/0001-compat-glibc-2.34.patch b/srcpkgs/boost/patches/0001-compat-glibc-2.34.patch
deleted file mode 100644
index e1e5711e59f2..000000000000
--- a/srcpkgs/boost/patches/0001-compat-glibc-2.34.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 74fb0a26099bc51d717f5f154b37231ce7df3e98 Mon Sep 17 00:00:00 2001
-From: Rob Boehne <robb@datalogics.com>
-Date: Wed, 20 Nov 2019 11:25:20 -0600
-Subject: [PATCH] Revert change to elide a warning that caused Solaris builds
- to fail.
-
----
- include/boost/thread/pthread/thread_data.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/boost/thread/pthread/thread_data.hpp b/include/boost/thread/pthread/thread_data.hpp
-index aefbeb43c..bc9b1367a 100644
---- a/boost/thread/pthread/thread_data.hpp
-+++ b/boost/thread/pthread/thread_data.hpp
-@@ -57,7 +57,7 @@ namespace boost
- #else
- std::size_t page_size = ::sysconf( _SC_PAGESIZE);
- #endif
--#if PTHREAD_STACK_MIN > 0
-+#ifdef PTHREAD_STACK_MIN
- if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
- #endif
- size = ((size+page_size-1)/page_size)*page_size;
diff --git a/srcpkgs/boost/patches/0002-compat-glibc-2.34.patch b/srcpkgs/boost/patches/0002-compat-glibc-2.34.patch
deleted file mode 100644
index baf7c517f8b4..000000000000
--- a/srcpkgs/boost/patches/0002-compat-glibc-2.34.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f9d0e594d43afcb4ab0043117249feb266ba4515 Mon Sep 17 00:00:00 2001
-From: Romain Geissler <romain.geissler@amadeus.com>
-Date: Tue, 10 Aug 2021 14:22:28 +0000
-Subject: [PATCH] Fix -Wsign-compare warning with glibc 2.34 on Linux
- platforms.
-
-In file included from /data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/thread_only.hpp:17,
- from /data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/thread.hpp:12,
- from src/GetTest.cpp:12:
-/data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/pthread/thread_data.hpp: In member function 'void boost::thread_attributes::set_stack_size(std::size_t)':
-/data/mwrep/res/osp/Boost/21-0-0-0/include/boost/thread/pthread/thread_data.hpp:61:19: error: comparison of integer expressions of different signedness: 'std::size_t' {aka 'long unsigned int'} and 'long int' [-Werror=sign-compare]
- 61 | if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
- | ^
----
- include/boost/thread/pthread/thread_data.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/include/boost/thread/pthread/thread_data.hpp b/include/boost/thread/pthread/thread_data.hpp
-index bc9b1367a..c43b276d1 100644
---- a/boost/thread/pthread/thread_data.hpp
-+++ b/boost/thread/pthread/thread_data.hpp
-@@ -58,7 +58,7 @@ namespace boost
- std::size_t page_size = ::sysconf( _SC_PAGESIZE);
- #endif
- #ifdef PTHREAD_STACK_MIN
-- if (size<PTHREAD_STACK_MIN) size=PTHREAD_STACK_MIN;
-+ if (size<static_cast<std::size_t>(PTHREAD_STACK_MIN)) size=PTHREAD_STACK_MIN;
- #endif
- size = ((size+page_size-1)/page_size)*page_size;
- int res = pthread_attr_setstacksize(&val_, size);
diff --git a/srcpkgs/boost/patches/exec_file.patch b/srcpkgs/boost/patches/exec_file.patch
deleted file mode 100644
index b1b0ef969c4d..000000000000
--- a/srcpkgs/boost/patches/exec_file.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From d9f06052e28873037db7f98629bce72182a42410 Mon Sep 17 00:00:00 2001
-From: Pat Riehecky <riehecky@fnal.gov>
-Date: Mon, 29 Jun 2020 10:51:58 -0500
-Subject: [PATCH] Convert Python 3.1+ to use public C API for filenames
-
- [
- Ed.: Paths were adapted from upstream commit
- https://github.com/boostorg/python/commit/d9f06052e28873037db7f98629bce72182a42410
- ]
-
----
- src/exec.cpp | 16 ++++++++++++----
- 1 file changed, 12 insertions(+), 4 deletions(-)
-
-diff --git a/libs/python/src/exec.cpp b/libs/python/src/exec.cpp
-index 171c6f4189..b2eabe59f6 100644
---- a/libs/python/src/exec.cpp
-+++ b/libs/python/src/exec.cpp
-@@ -104,14 +104,22 @@ object BOOST_PYTHON_DECL exec_file(char const *filename, object global, object l
- if (local.is_none()) local = global;
- // should be 'char const *' but older python versions don't use 'const' yet.
- char *f = const_cast<char *>(filename);
-- // Let python open the file to avoid potential binary incompatibilities.
--#if PY_VERSION_HEX >= 0x03040000
-- FILE *fs = _Py_fopen(f, "r");
-+#if PY_VERSION_HEX >= 0x03010000
-+ // Let python manage any UTF bits to avoid potential incompatibilities.
-+ PyObject *fo = Py_BuildValue("s", f);
-+ PyObject *fb = Py_None;
-+ PyUnicode_FSConverter(fo, &fb);
-+ f = PyBytes_AsString(fb);
-+ FILE *fs = fopen(f, "r");
-+ Py_DECREF(fo);
-+ Py_DECREF(fb);
- #elif PY_VERSION_HEX >= 0x03000000
-+ // Let python open the file to avoid potential binary incompatibilities.
- PyObject *fo = Py_BuildValue("s", f);
-- FILE *fs = _Py_fopen(fo, "r");
-+ FILE *fs = _Py_fopen(fo, "r"); // Private CPython API
- Py_DECREF(fo);
- #else
-+ // Let python open the file to avoid potential binary incompatibilities.
- PyObject *pyfile = PyFile_FromString(f, const_cast<char*>("r"));
- if (!pyfile) throw std::invalid_argument(std::string(f) + " : no such file");
- python::handle<> file(pyfile);
diff --git a/srcpkgs/boost/patches/install-strip-destdir.patch b/srcpkgs/boost/patches/install-strip-destdir.patch
new file mode 100644
index 000000000000..61047c5967b1
--- /dev/null
+++ b/srcpkgs/boost/patches/install-strip-destdir.patch
@@ -0,0 +1,27 @@
+--- a/tools/boost_install/boost-install.jam
++++ b/tools/boost_install/boost-install.jam
+@@ -678,6 +678,16 @@ local rule path-native-fwd ( path )
+ return $(path) ;
+ }
+
++local rule path-strip-destdir ( path )
++{
++ local parts = [ MATCH "^(/destdir(/[^/]+)?/boost-[0-9.]+)(/.*)" : $(path) ] ;
++ if $(parts)
++ {
++ path = $(parts[3]) ;
++ }
++ return $(path) ;
++}
++
+ local rule get-dir ( name : dir )
+ {
+ if [ path.is-rooted $(dir) ]
+@@ -756,6 +766,7 @@ rule generate-cmake-config- ( target : s
+ if [ path.is-rooted $(cmakedir) ]
+ {
+ local cmakedir-native = [ path-native-fwd $(cmakedir) ] ;
++ cmakedir-native = [ path-strip-destdir $(cmakedir-native) ] ;
+
+ print.text
+
diff --git a/srcpkgs/boost/patches/mips.patch b/srcpkgs/boost/patches/mips.patch
deleted file mode 100644
index a10a2122d9c7..000000000000
--- a/srcpkgs/boost/patches/mips.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/boost/fiber/detail/cpu_relax.hpp 2017-09-02 11:56:11.000000000 +0200
-+++ b/boost/fiber/detail/cpu_relax.hpp 2017-11-09 17:25:40.258995963 +0100
-@@ -48,7 +48,7 @@
- # define cpu_relax() asm volatile ("nop" ::: "memory");
- # endif
- #elif BOOST_ARCH_MIPS
--# define cpu_relax() asm volatile ("pause" ::: "memory");
-+# define cpu_relax() asm volatile ("nop" ::: "memory");
- #elif BOOST_ARCH_PPC
- // http://code.metager.de/source/xref/gnu/glibc/sysdeps/powerpc/sys/platform/ppc.h
- // http://stackoverflow.com/questions/5425506/equivalent-of-x86-pause-instruction-for-ppc
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index f0c5afcec9e8..0d103e335b52 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,53 +1,52 @@
# Template file for 'boost'
pkgname=boost
-version=1.72.0
-revision=9
+version=1.80.0
+revision=1
wrksrc="${pkgname}_${version//\./_}"
-hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
-makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
+hostmakedepends="which bzip2-devel icu-devel python3-devel pkg-config"
+makedepends="zlib-devel bzip2-devel icu-devel python3-devel liblzma-devel
+ libzstd-devel"
short_desc="Free peer-reviewed portable C++ source libraries"
maintainer="John <me@johnnynator.dev>"
license="BSL-1.0"
homepage="http://www.boost.org/"
distfiles="https://boostorg.jfrog.io/artifactory/main/release/${version}/source/boost_${version//./_}.tar.bz2"
-checksum=59c9b274bc451cf91a9ba1dd2c7fdcaf5d60b1b3aa83f2c9fa143417cc660722
+checksum=1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0
python_version=3
-CXXFLAGS="-std=c++14"
-
-replaces="libboost_program_options1.69>=0 libboost_math_c99f1.69>=0
- libboost_stacktrace_basic1.69>=0 libboost_stacktrace_noop1.69>=0
- libboost_iostreams1.69>=0 libboost_math_tr1l1.69>=0 libboost_filesystem1.69>=0
- libboost_chrono1.69>=0 libboost_math_tr1f1.69>=0 libboost_wave1.69>=0
- libboost_graph1.69>=0 libboost_locale1.69>=0 libboost_regex1.69>=0
- libboost_fiber1.69>=0 libboost_type_erasure1.69>=0 libboost_coroutine1.69>=0
- libboost_atomic1.69>=0 libboost_prg_exec_monitor1.69>=0 libboost_math_c991.69>=0
- boost-python3-1.69>=0 libboost_log_setup1.69>=0 boost1.69>=0-devel
- libboost_timer1.69>=0 libboost_system1.69>=0 libboost_unit_test_framework1.69>=0
- libboost_serialization1.69>=0 libboost_math_tr11.69>=0 boost1.69>=0-build
- libboost_math_c99l1.69>=0 boost-python1.69>=0 libboost_contract1.69>=0
- libboost_date_time1.69>=0 libboost_log1.69>=0 libboost_random1.69>=0
- libboost_thread1.69>=0 libboost_container1.69>=0 boost1.69>=0-jam
- libboost_wserialization1.69>=0 libboost_context1.69>=0
- libboost_stacktrace_addr2line1.69>=0"
-
-subpackages="libboost_program_options1.72 libboost_math_c99f1.72
- libboost_stacktrace_basic1.72 libboost_stacktrace_noop1.72
- libboost_iostreams1.72 libboost_math_tr1l1.72 libboost_filesystem1.72
- libboost_chrono1.72 libboost_math_tr1f1.72 libboost_wave1.72
- libboost_graph1.72 libboost_locale1.72 libboost_regex1.72
- libboost_fiber1.72 libboost_type_erasure1.72 libboost_coroutine1.72
- libboost_atomic1.72 libboost_prg_exec_monitor1.72 libboost_math_c991.72
- boost-python3-1.72 libboost_log_setup1.72 boost-devel
- libboost_timer1.72 libboost_system1.72 libboost_unit_test_framework1.72
- libboost_serialization1.72 libboost_math_tr11.72 boost-build
- libboost_math_c99l1.72 boost-python1.72 libboost_contract1.72
- libboost_date_time1.72 libboost_log1.72 libboost_random1.72
- libboost_thread1.72 libboost_container1.72 boost-jam
- libboost_wserialization1.72 libboost_context1.72"
+replaces="libboost_program_options1.72>=0 libboost_math_c99f1.72>=0
+ libboost_stacktrace_basic1.72>=0 libboost_stacktrace_noop1.72>=0
+ libboost_iostreams1.72>=0 libboost_math_tr1l1.72>=0 libboost_filesystem1.72>=0
+ libboost_chrono1.72>=0 libboost_math_tr1f1.72>=0 libboost_wave1.72>=0
+ libboost_graph1.72>=0 libboost_locale1.72>=0 libboost_regex1.72>=0
+ libboost_fiber1.72>=0 libboost_type_erasure1.72>=0 libboost_coroutine1.72>=0
+ libboost_atomic1.72>=0 libboost_prg_exec_monitor1.72>=0 libboost_math_c991.72>=0
+ boost-python3-1.72>=0 libboost_log_setup1.72>=0
+ libboost_timer1.72>=0 libboost_system1.72>=0 libboost_unit_test_framework1.72>=0
+ libboost_serialization1.72>=0 libboost_math_tr11.72>=0
+ libboost_math_c99l1.72>=0 boost-python1.72>=0 libboost_contract1.72>=0
+ libboost_date_time1.72>=0 libboost_log1.72>=0 libboost_random1.72>=0
+ libboost_thread1.72>=0 libboost_container1.72>=0
+ libboost_wserialization1.72>=0 libboost_context1.72>=0
+ libboost_stacktrace_addr2line1.72>=0"
+
+subpackages="libboost_program_options1.80 libboost_math_c99f1.80
+ libboost_stacktrace_basic1.80 libboost_stacktrace_noop1.80
+ libboost_iostreams1.80 libboost_math_tr1l1.80 libboost_filesystem1.80
+ libboost_chrono1.80 libboost_math_tr1f1.80 libboost_wave1.80
+ libboost_graph1.80 libboost_locale1.80 libboost_regex1.80
+ libboost_fiber1.80 libboost_type_erasure1.80 libboost_coroutine1.80
+ libboost_atomic1.80 libboost_prg_exec_monitor1.80 libboost_math_c991.80
+ boost-python3-1.80 libboost_log_setup1.80 boost-devel libboost_json1.80
+ libboost_timer1.80 libboost_system1.80 libboost_unit_test_framework1.80
+ libboost_serialization1.80 libboost_math_tr11.80 boost-build
+ libboost_math_c99l1.80 libboost_contract1.80 libboost_nowide1.80
+ libboost_date_time1.80 libboost_log1.80 libboost_random1.80
+ libboost_thread1.80 libboost_container1.80 boost-jam
+ libboost_wserialization1.80 libboost_context1.80"
if [ -z "$CROSS_BUILD" ]; then
- subpackages+=" libboost_stacktrace_addr2line1.72"
+ subpackages+=" libboost_stacktrace_addr2line1.80"
fi
case "$XBPS_TARGET_MACHINE" in
@@ -60,38 +59,40 @@ case "$XBPS_TARGET_MACHINE" in
esac
do_build() {
- CXX=${BUILD_CXX} CXXFLAGS=${BUILD_CXXFLAGS} ./bootstrap.sh \
- --prefix=${DESTDIR}/usr --with-python=${XBPS_CROSS_BASE}/usr/bin/python3 \
+ # bootstrap.sh will reset CXX and CXXFLAGS (L229)
+ ./bootstrap.sh --with-toolset=gcc \
+ --prefix=${DESTDIR}/usr --with-python=/usr/bin/python3 \
--with-python-root=${XBPS_CROSS_BASE}/usr
(
# Rebuild bjam for target
cd tools/build/src/engine
- ./build.sh gcc
+ CXXFLAGS="$CXXFLAGS -fdebug-prefix-map=$PWD=."
+ # toolset gcc will force gcc -x c++ -O2 -s
+ # toolset cxx will use CXX and CXXFLAGS
+ CXX_VERSION_OPT=--version ./build.sh cxx
)
cat > user-config.jam <<-__EOF
using gcc : : ${CXX} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
- using python : 2.7 : ${XBPS_CROSS_BASE}/usr/bin/python2 : ${XBPS_CROSS_BASE}/usr/include/python2.7 : ${XBPS_CROSS_BASE}/usr/lib/python2.7 ;
- using python : ${py3_ver} : ${XBPS_CROSS_BASE}/usr/bin/python3 : ${XBPS_CROSS_BASE}/${py3_inc} : ${XBPS_CROSS_BASE}/${py3_lib} ;
+ using python : ${py3_ver} : /usr/bin/python3 : ${XBPS_CROSS_BASE}/${py3_inc} : ${XBPS_CROSS_BASE}/${py3_lib} ;
__EOF
- # --no-cmake-config should be removed with boost-1.71 or later
./b2 ${makejobs} \
--user-config=${wrksrc}/user-config.jam --debug-building \
- --no-cmake-config \
- --toolset=gcc abi=${_abi} architecture=${_arch} python=2.7,${py3_ver} \
+ --toolset=gcc abi=${_abi} architecture=${_arch} python=${py3_ver} \
threading=multi runtime-link=shared link=shared,static
}
do_install() {
# Install bjam
# XXX: make bjam a symlink to b2
- for _b in bjam b2; do
+ for _b in b2; do
vbin tools/build/src/engine/${_b}
done
+ ln -sf b2 "$DESTDIR/usr/bin/bjam"
# Install headers/libs
./b2 --prefix=${DESTDIR}/usr abi=${_abi} architecture=${_arch} \
- --user-config=${wrksrc}/user-config.jam --no-cmake-config \
- python=2.7,${py3_ver} threading=multi runtime-link=shared link=shared,static \
+ --user-config=${wrksrc}/user-config.jam \
+ python=${py3_ver} threading=multi runtime-link=shared link=shared,static \
install
# Install Boost.Build stuff.
@@ -119,15 +120,7 @@ boost-jam_package() {
vmove usr/bin/b2
}
}
-boost-python1.72_package() {
- depends="boost python"
- replaces="boost-python>=0"
- short_desc+=" - Python bindings"
- pkg_install() {
- vmove "usr/lib/libboost_python2*.so.*"
- }
-}
-boost-python3-1.72_package() {
+boost-python3-1.80_package() {
depends="boost python3"
replaces="boost-python3>=0"
short_desc+=" - Python3 bindings"
@@ -149,12 +142,13 @@ boost-devel_package() {
short_desc+=" - development files"
pkg_install() {
vmove usr/include
+ vmove usr/lib/cmake
vmove "usr/lib/*.a"
vmove "usr/lib/*.so"
}
}
-libboost_atomic1.72_package() {
+libboost_atomic1.80_package() {
depends="boost"
short_desc+=" - libboost_atomic"
pkg_install() {
@@ -162,7 +156,7 @@ libboost_atomic1.72_package() {
}
}
-libboost_chrono1.72_package() {
+libboost_chrono1.80_package() {
depends="boost"
short_desc+=" - libboost_chrono"
pkg_install() {
@@ -170,7 +164,7 @@ libboost_chrono1.72_package() {
}
}
-libboost_container1.72_package() {
+libboost_container1.80_package() {
depends="boost"
short_desc+=" - libboost_container"
pkg_install() {
@@ -178,7 +172,7 @@ libboost_container1.72_package() {
}
}
-libboost_context1.72_package() {
+libboost_context1.80_package() {
depends="boost"
short_desc+=" - libboost_context"
pkg_install() {
@@ -186,7 +180,7 @@ libboost_context1.72_package() {
}
}
-libboost_contract1.72_package() {
+libboost_contract1.80_package() {
depends="boost"
short_desc+=" - libboost_contract"
pkg_install() {
@@ -194,7 +188,7 @@ libboost_contract1.72_package() {
}
}
-libboost_coroutine1.72_package() {
+libboost_coroutine1.80_package() {
depends="boost"
short_desc+=" - libboost_coroutine"
pkg_install() {
@@ -202,7 +196,7 @@ libboost_coroutine1.72_package() {
}
}
-libboost_date_time1.72_package() {
+libboost_date_time1.80_package() {
depends="boost"
short_desc+=" - libboost_date_time"
pkg_install() {
@@ -210,7 +204,7 @@ libboost_date_time1.72_package() {
}
}
-libboost_fiber1.72_package() {
+libboost_fiber1.80_package() {
depends="boost"
short_desc+=" - libboost_fiber"
pkg_install() {
@@ -218,7 +212,7 @@ libboost_fiber1.72_package() {
}
}
-libboost_filesystem1.72_package() {
+libboost_filesystem1.80_package() {
depends="boost"
short_desc+=" - libboost_filesystem"
pkg_install() {
@@ -226,7 +220,7 @@ libboost_filesystem1.72_package() {
}
}
-libboost_graph1.72_package() {
+libboost_graph1.80_package() {
depends="boost"
short_desc+=" - libboost_graph"
pkg_install() {
@@ -234,7 +228,7 @@ libboost_graph1.72_package() {
}
}
-libboost_iostreams1.72_package() {
+libboost_iostreams1.80_package() {
depends="boost"
short_desc+=" - libboost_iostreams"
pkg_install() {
@@ -242,7 +236,7 @@ libboost_iostreams1.72_package() {
}
}
-libboost_locale1.72_package() {
+libboost_locale1.80_package() {
depends="boost"
short_desc+=" - libboost_locale"
pkg_install() {
@@ -250,7 +244,7 @@ libboost_locale1.72_package() {
}
}
-libboost_log1.72_package() {
+libboost_log1.80_package() {
depends="boost"
short_desc+=" - libboost_log"
pkg_install() {
@@ -258,7 +252,7 @@ libboost_log1.72_package() {
}
}
-libboost_log_setup1.72_package() {
+libboost_log_setup1.80_package() {
depends="boost"
short_desc+=" - libboost_log_setup"
pkg_install() {
@@ -266,7 +260,7 @@ libboost_log_setup1.72_package() {
}
}
-libboost_math_c991.72_package() {
+libboost_math_c991.80_package() {
depends="boost"
short_desc+=" - libboost_math_c99"
pkg_install() {
@@ -274,7 +268,7 @@ libboost_math_c991.72_package() {
}
}
-libboost_math_c99f1.72_package() {
+libboost_math_c99f1.80_package() {
depends="boost"
short_desc+=" - libboost_math_c99f"
pkg_install() {
@@ -282,7 +276,7 @@ libboost_math_c99f1.72_package() {
}
}
-libboost_math_c99l1.72_package() {
+libboost_math_c99l1.80_package() {
depends="boost"
short_desc+=" - libboost_math_c99l"
pkg_install() {
@@ -290,7 +284,15 @@ libboost_math_c99l1.72_package() {
}
}
-libboost_math_tr11.72_package() {
+libboost_json1.80_package() {
+ depends="boost"
+ short_desc+=" - libboost_json"
+ pkg_install() {
+ vmove usr/lib/libboost_json.so.*
+ }
+}
+
+libboost_math_tr11.80_package() {
depends="boost"
short_desc+=" - libboost_math_tr1"
pkg_install() {
@@ -298,7 +300,7 @@ libboost_math_tr11.72_package() {
}
}
-libboost_math_tr1f1.72_package() {
+libboost_math_tr1f1.80_package() {
depends="boost"
short_desc+=" - libboost_math_tr1f"
pkg_install() {
@@ -306,7 +308,7 @@ libboost_math_tr1f1.72_package() {
}
}
-libboost_math_tr1l1.72_package() {
+libboost_math_tr1l1.80_package() {
depends="boost"
short_desc+=" - libboost_math_tr1l"
pkg_install() {
@@ -314,7 +316,15 @@ libboost_math_tr1l1.72_package() {
}
}
-libboost_prg_exec_monitor1.72_package() {
+libboost_nowide1.80_package() {
+ depends="boost"
+ short_desc+=" - libboost_nowide"
+ pkg_install() {
+ vmove usr/lib/libboost_nowide.so.*
+ }
+}
+
+libboost_prg_exec_monitor1.80_package() {
depends="boost"
short_desc+=" - libboost_prg_exec_monitor"
pkg_install() {
@@ -322,7 +332,7 @@ libboost_prg_exec_monitor1.72_package() {
}
}
-libboost_program_options1.72_package() {
+libboost_program_options1.80_package() {
depends="boost"
short_desc+=" - libboost_program_options"
pkg_install() {
@@ -330,7 +340,7 @@ libboost_program_options1.72_package() {
}
}
-libboost_random1.72_package() {
+libboost_random1.80_package() {
depends="boost"
short_desc+=" - libboost_random"
pkg_install() {
@@ -338,7 +348,7 @@ libboost_random1.72_package() {
}
}
-libboost_regex1.72_package() {
+libboost_regex1.80_package() {
depends="boost"
short_desc+=" - libboost_regex"
pkg_install() {
@@ -346,7 +356,7 @@ libboost_regex1.72_package() {
}
}
-libboost_serialization1.72_package() {
+libboost_serialization1.80_package() {
depends="boost"
short_desc+=" - libboost_serialization"
pkg_install() {
@@ -354,7 +364,7 @@ libboost_serialization1.72_package() {
}
}
-libboost_stacktrace_addr2line1.72_package() {
+libboost_stacktrace_addr2line1.80_package() {
depends="boost"
short_desc+=" - libboost_stacktrace_addr2line"
pkg_install() {
@@ -362,7 +372,7 @@ libboost_stacktrace_addr2line1.72_package() {
}
}
-libboost_stacktrace_basic1.72_package() {
+libboost_stacktrace_basic1.80_package() {
depends="boost"
short_desc+=" - libboost_stacktrace_basic"
pkg_install() {
@@ -370,7 +380,7 @@ libboost_stacktrace_basic1.72_package() {
}
}
-libboost_stacktrace_noop1.72_package() {
+libboost_stacktrace_noop1.80_package() {
depends="boost"
short_desc+=" - libboost_stacktrace_noop"
pkg_install() {
@@ -378,7 +388,7 @@ libboost_stacktrace_noop1.72_package() {
}
}
-libboost_system1.72_package() {
+libboost_system1.80_package() {
depends="boost"
short_desc+=" - libboost_system"
pkg_install() {
@@ -386,7 +396,7 @@ libboost_system1.72_package() {
}
}
-libboost_thread1.72_package() {
+libboost_thread1.80_package() {
depends="boost"
short_desc+=" - libboost_thread"
pkg_install() {
@@ -394,7 +404,7 @@ libboost_thread1.72_package() {
}
}
-libboost_timer1.72_package() {
+libboost_timer1.80_package() {
depends="boost"
short_desc+=" - libboost_timer"
pkg_install() {
@@ -402,7 +412,7 @@ libboost_timer1.72_package() {
}
}
-libboost_type_erasure1.72_package() {
+libboost_type_erasure1.80_package() {
depends="boost"
short_desc+=" - libboost_type_erasure"
pkg_install() {
@@ -410,7 +420,7 @@ libboost_type_erasure1.72_package() {
}
}
-libboost_unit_test_framework1.72_package() {
+libboost_unit_test_framework1.80_package() {
depends="boost"
short_desc+=" - libboost_unit_test_framework"
pkg_install() {
@@ -418,7 +428,7 @@ libboost_unit_test_framework1.72_package() {
}
}
-libboost_wave1.72_package() {
+libboost_wave1.80_package() {
depends="boost"
short_desc+=" - libboost_wave"
pkg_install() {
@@ -426,7 +436,7 @@ libboost_wave1.72_package() {
}
}
-libboost_wserialization1.72_package() {
+libboost_wserialization1.80_package() {
depends="boost"
short_desc+=" - libboost_wserialization"
pkg_install() {
diff --git a/srcpkgs/boost-python3-1.72 b/srcpkgs/libboost_atomic1.80
similarity index 100%
rename from srcpkgs/boost-python3-1.72
rename to srcpkgs/libboost_atomic1.80
diff --git a/srcpkgs/libboost_atomic1.72 b/srcpkgs/libboost_chrono1.80
similarity index 100%
rename from srcpkgs/libboost_atomic1.72
rename to srcpkgs/libboost_chrono1.80
diff --git a/srcpkgs/libboost_chrono1.72 b/srcpkgs/libboost_container1.80
similarity index 100%
rename from srcpkgs/libboost_chrono1.72
rename to srcpkgs/libboost_container1.80
diff --git a/srcpkgs/libboost_container1.72 b/srcpkgs/libboost_context1.80
similarity index 100%
rename from srcpkgs/libboost_container1.72
rename to srcpkgs/libboost_context1.80
diff --git a/srcpkgs/libboost_context1.72 b/srcpkgs/libboost_contract1.80
similarity index 100%
rename from srcpkgs/libboost_context1.72
rename to srcpkgs/libboost_contract1.80
diff --git a/srcpkgs/libboost_contract1.72 b/srcpkgs/libboost_coroutine1.80
similarity index 100%
rename from srcpkgs/libboost_contract1.72
rename to srcpkgs/libboost_coroutine1.80
diff --git a/srcpkgs/libboost_coroutine1.72 b/srcpkgs/libboost_date_time1.80
similarity index 100%
rename from srcpkgs/libboost_coroutine1.72
rename to srcpkgs/libboost_date_time1.80
diff --git a/srcpkgs/libboost_date_time1.72 b/srcpkgs/libboost_fiber1.80
similarity index 100%
rename from srcpkgs/libboost_date_time1.72
rename to srcpkgs/libboost_fiber1.80
diff --git a/srcpkgs/libboost_fiber1.72 b/srcpkgs/libboost_filesystem1.80
similarity index 100%
rename from srcpkgs/libboost_fiber1.72
rename to srcpkgs/libboost_filesystem1.80
diff --git a/srcpkgs/libboost_filesystem1.72 b/srcpkgs/libboost_graph1.80
similarity index 100%
rename from srcpkgs/libboost_filesystem1.72
rename to srcpkgs/libboost_graph1.80
diff --git a/srcpkgs/libboost_graph1.72 b/srcpkgs/libboost_iostreams1.80
similarity index 100%
rename from srcpkgs/libboost_graph1.72
rename to srcpkgs/libboost_iostreams1.80
diff --git a/srcpkgs/libboost_iostreams1.72 b/srcpkgs/libboost_json1.80
similarity index 100%
rename from srcpkgs/libboost_iostreams1.72
rename to srcpkgs/libboost_json1.80
diff --git a/srcpkgs/libboost_locale1.72 b/srcpkgs/libboost_locale1.80
similarity index 100%
rename from srcpkgs/libboost_locale1.72
rename to srcpkgs/libboost_locale1.80
diff --git a/srcpkgs/libboost_log1.72 b/srcpkgs/libboost_log1.80
similarity index 100%
rename from srcpkgs/libboost_log1.72
rename to srcpkgs/libboost_log1.80
diff --git a/srcpkgs/libboost_log_setup1.72 b/srcpkgs/libboost_log_setup1.80
similarity index 100%
rename from srcpkgs/libboost_log_setup1.72
rename to srcpkgs/libboost_log_setup1.80
diff --git a/srcpkgs/libboost_math_c991.72 b/srcpkgs/libboost_math_c991.80
similarity index 100%
rename from srcpkgs/libboost_math_c991.72
rename to srcpkgs/libboost_math_c991.80
diff --git a/srcpkgs/libboost_math_c99f1.72 b/srcpkgs/libboost_math_c99f1.80
similarity index 100%
rename from srcpkgs/libboost_math_c99f1.72
rename to srcpkgs/libboost_math_c99f1.80
diff --git a/srcpkgs/libboost_math_c99l1.72 b/srcpkgs/libboost_math_c99l1.80
similarity index 100%
rename from srcpkgs/libboost_math_c99l1.72
rename to srcpkgs/libboost_math_c99l1.80
diff --git a/srcpkgs/libboost_math_tr11.72 b/srcpkgs/libboost_math_tr11.80
similarity index 100%
rename from srcpkgs/libboost_math_tr11.72
rename to srcpkgs/libboost_math_tr11.80
diff --git a/srcpkgs/libboost_math_tr1f1.72 b/srcpkgs/libboost_math_tr1f1.80
similarity index 100%
rename from srcpkgs/libboost_math_tr1f1.72
rename to srcpkgs/libboost_math_tr1f1.80
diff --git a/srcpkgs/libboost_math_tr1l1.72 b/srcpkgs/libboost_math_tr1l1.80
similarity index 100%
rename from srcpkgs/libboost_math_tr1l1.72
rename to srcpkgs/libboost_math_tr1l1.80
diff --git a/srcpkgs/libboost_prg_exec_monitor1.72 b/srcpkgs/libboost_nowide1.80
similarity index 100%
rename from srcpkgs/libboost_prg_exec_monitor1.72
rename to srcpkgs/libboost_nowide1.80
diff --git a/srcpkgs/libboost_program_options1.72 b/srcpkgs/libboost_prg_exec_monitor1.80
similarity index 100%
rename from srcpkgs/libboost_program_options1.72
rename to srcpkgs/libboost_prg_exec_monitor1.80
diff --git a/srcpkgs/libboost_random1.72 b/srcpkgs/libboost_program_options1.80
similarity index 100%
rename from srcpkgs/libboost_random1.72
rename to srcpkgs/libboost_program_options1.80
diff --git a/srcpkgs/libboost_regex1.72 b/srcpkgs/libboost_random1.80
similarity index 100%
rename from srcpkgs/libboost_regex1.72
rename to srcpkgs/libboost_random1.80
diff --git a/srcpkgs/libboost_serialization1.72 b/srcpkgs/libboost_regex1.80
similarity index 100%
rename from srcpkgs/libboost_serialization1.72
rename to srcpkgs/libboost_regex1.80
diff --git a/srcpkgs/libboost_stacktrace_addr2line1.72 b/srcpkgs/libboost_serialization1.80
similarity index 100%
rename from srcpkgs/libboost_stacktrace_addr2line1.72
rename to srcpkgs/libboost_serialization1.80
diff --git a/srcpkgs/libboost_stacktrace_basic1.72 b/srcpkgs/libboost_stacktrace_addr2line1.80
similarity index 100%
rename from srcpkgs/libboost_stacktrace_basic1.72
rename to srcpkgs/libboost_stacktrace_addr2line1.80
diff --git a/srcpkgs/libboost_stacktrace_noop1.72 b/srcpkgs/libboost_stacktrace_basic1.80
similarity index 100%
rename from srcpkgs/libboost_stacktrace_noop1.72
rename to srcpkgs/libboost_stacktrace_basic1.80
diff --git a/srcpkgs/libboost_system1.72 b/srcpkgs/libboost_stacktrace_noop1.80
similarity index 100%
rename from srcpkgs/libboost_system1.72
rename to srcpkgs/libboost_stacktrace_noop1.80
diff --git a/srcpkgs/libboost_thread1.72 b/srcpkgs/libboost_system1.80
similarity index 100%
rename from srcpkgs/libboost_thread1.72
rename to srcpkgs/libboost_system1.80
diff --git a/srcpkgs/libboost_timer1.72 b/srcpkgs/libboost_thread1.80
similarity index 100%
rename from srcpkgs/libboost_timer1.72
rename to srcpkgs/libboost_thread1.80
diff --git a/srcpkgs/libboost_type_erasure1.72 b/srcpkgs/libboost_timer1.80
similarity index 100%
rename from srcpkgs/libboost_type_erasure1.72
rename to srcpkgs/libboost_timer1.80
diff --git a/srcpkgs/libboost_unit_test_framework1.72 b/srcpkgs/libboost_type_erasure1.80
similarity index 100%
rename from srcpkgs/libboost_unit_test_framework1.72
rename to srcpkgs/libboost_type_erasure1.80
diff --git a/srcpkgs/libboost_wave1.72 b/srcpkgs/libboost_unit_test_framework1.80
similarity index 100%
rename from srcpkgs/libboost_wave1.72
rename to srcpkgs/libboost_unit_test_framework1.80
diff --git a/srcpkgs/libboost_wserialization1.72 b/srcpkgs/libboost_wave1.80
similarity index 100%
rename from srcpkgs/libboost_wserialization1.72
rename to srcpkgs/libboost_wave1.80
diff --git a/srcpkgs/libboost_wserialization1.80 b/srcpkgs/libboost_wserialization1.80
new file mode 120000
index 000000000000..baef819c48f6
--- /dev/null
+++ b/srcpkgs/libboost_wserialization1.80
@@ -0,0 +1 @@
+boost
\ No newline at end of file
From dde32617761c921670786dd60ad29f31521f503a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 16:51:50 +0700
Subject: [PATCH 002/107] TSC: rebuild for boost-1.80
---
srcpkgs/TSC/patches/boost-1.80.patch | 11 +++++++++++
srcpkgs/TSC/template | 2 +-
2 files changed, 12 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/TSC/patches/boost-1.80.patch
diff --git a/srcpkgs/TSC/patches/boost-1.80.patch b/srcpkgs/TSC/patches/boost-1.80.patch
new file mode 100644
index 000000000000..19f9ee57bad5
--- /dev/null
+++ b/srcpkgs/TSC/patches/boost-1.80.patch
@@ -0,0 +1,11 @@
+--- a/tsc/scrdg/scrdg.cpp
++++ b/tsc/scrdg/scrdg.cpp
+@@ -15,6 +15,8 @@
+ */
+
+ #include "scrdg.hpp"
++#include <algorithm>
++#include <fstream>
+ #include <iostream>
+ #include <sstream>
+ #include <cstdio>
diff --git a/srcpkgs/TSC/template b/srcpkgs/TSC/template
index 71534315cf7c..469f6d859bc7 100644
--- a/srcpkgs/TSC/template
+++ b/srcpkgs/TSC/template
@@ -1,7 +1,7 @@
# Template file for 'TSC'
pkgname=TSC
version=2.1.0
-revision=2
+revision=3
build_wrksrc=tsc
build_style=cmake
build_helper="qemu"
From 0376cd07357836acb2528df49b43bd76d8dbdb86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:27 +0700
Subject: [PATCH 003/107] 0ad: rebuild for boost-1.80
---
srcpkgs/0ad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index 552d2728a7a0..b9f0751c4836 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
# Template file for '0ad'
pkgname=0ad
version=0.0.25b
-revision=3
+revision=4
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
wrksrc="${pkgname}-${version}-alpha"
hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang"
From 450e9ed042deeda98754bc49c590cb171c92505b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:27 +0700
Subject: [PATCH 004/107] Aegisub: rebuild for boost-1.80
---
srcpkgs/Aegisub/patches/link-icu18n.patch | 15 +++++++++++++++
srcpkgs/Aegisub/template | 2 +-
2 files changed, 16 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/Aegisub/patches/link-icu18n.patch
diff --git a/srcpkgs/Aegisub/patches/link-icu18n.patch b/srcpkgs/Aegisub/patches/link-icu18n.patch
new file mode 100644
index 000000000000..e5c037ca1f68
--- /dev/null
+++ b/srcpkgs/Aegisub/patches/link-icu18n.patch
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -347,9 +347,9 @@ target_link_libraries(Aegisub PRIVATE "O
+ find_package(Iconv REQUIRED)
+ target_link_libraries(libaegisub PRIVATE "Iconv::Iconv")
+
+-find_package(ICU REQUIRED uc)
+-target_link_libraries(libaegisub PRIVATE "ICU::uc")
+-target_link_libraries(Aegisub PRIVATE "ICU::uc")
++find_package(ICU REQUIRED uc i18n)
++target_link_libraries(libaegisub PRIVATE "ICU::uc" ICU::i18n)
++target_link_libraries(Aegisub PRIVATE "ICU::uc" ICU::i18n)
+
+ find_package(wxWidgets REQUIRED adv base core gl stc xml)
+ include(${wxWidgets_USE_FILE})
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index ff34249aaee4..a68e1ab43089 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
# Template file for 'Aegisub'
pkgname=Aegisub
version=3.3.2
-revision=4
+revision=5
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
cmake_builddir="BUILD"
From 7d186131bffc3fc9eab1b9dc483b09904bcc4c3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:27 +0700
Subject: [PATCH 005/107] Field3D: rebuild for boost-1.80
---
srcpkgs/Field3D/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Field3D/template b/srcpkgs/Field3D/template
index 62f0589e9e0b..9a5af0034d14 100644
--- a/srcpkgs/Field3D/template
+++ b/srcpkgs/Field3D/template
@@ -1,7 +1,7 @@
# Template file for 'Field3D'
pkgname=Field3D
version=1.7.3
-revision=2
+revision=3
build_style=cmake
makedepends="boost-devel hdf5-devel ilmbase-devel"
short_desc="Library for storing voxel data on disk and in memory"
From bcc56398d013249947e70ba1b16fa76518ae538e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:28 +0700
Subject: [PATCH 006/107] LGOGDownloader: rebuild for boost-1.80
---
srcpkgs/LGOGDownloader/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/LGOGDownloader/template b/srcpkgs/LGOGDownloader/template
index 6e7e5c685f83..0778374ad224 100644
--- a/srcpkgs/LGOGDownloader/template
+++ b/srcpkgs/LGOGDownloader/template
@@ -1,7 +1,7 @@
# Template file for 'LGOGDownloader'
pkgname=LGOGDownloader
version=3.9
-revision=1
+revision=2
wrksrc="lgogdownloader-${version}"
build_style=cmake
hostmakedepends="pkg-config"
From 90768bdc465828781100ea99aa13a8c02e3988ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:28 +0700
Subject: [PATCH 007/107] Lucene++: rebuild for boost-1.80
---
srcpkgs/Lucene++/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Lucene++/template b/srcpkgs/Lucene++/template
index 3873189f2dfc..34b6e05393fe 100644
--- a/srcpkgs/Lucene++/template
+++ b/srcpkgs/Lucene++/template
@@ -1,7 +1,7 @@
# Template file for 'Lucene++'
pkgname=Lucene++
version=3.0.7
-revision=11
+revision=12
wrksrc=LucenePlusPlus-rel_$version
build_style=cmake
configure_args="-Wno-dev"
From bc2f81318a459e290d8dd661c454aa5066865c7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:28 +0700
Subject: [PATCH 008/107] PrusaSlicer: rebuild for boost-1.80
---
srcpkgs/PrusaSlicer/patches/fstream.patch | 20 ++++++++++++++++++++
srcpkgs/PrusaSlicer/template | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/PrusaSlicer/patches/fstream.patch
diff --git a/srcpkgs/PrusaSlicer/patches/fstream.patch b/srcpkgs/PrusaSlicer/patches/fstream.patch
new file mode 100644
index 000000000000..a766c747f704
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/fstream.patch
@@ -0,0 +1,20 @@
+--- a/src/hints/HintsToPot.cpp
++++ b/src/hints/HintsToPot.cpp
+@@ -2,6 +2,7 @@
+ #include <vector>
+ #include <string>
+ #include <boost/filesystem.hpp>
++#include <boost/filesystem/fstream.hpp>
+ #include <boost/dll.hpp>
+ #include <boost/property_tree/ini_parser.hpp>
+ #include <boost/nowide/fstream.hpp>
+--- a/tests/fff_print/test_data.cpp
++++ b/tests/fff_print/test_data.cpp
+@@ -8,6 +8,7 @@
+ #include "libslic3r/Format/STL.hpp"
+
+ #include <cstdlib>
++#include <fstream>
+ #include <string>
+
+ #include <boost/nowide/cstdio.hpp>
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 931ac73e5c94..29f1f641a488 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
version=2.4.2
-revision=1
+revision=2
wrksrc="PrusaSlicer-version_${version}"
build_style=cmake
build_helper="qemu"
From cbda9c0bc81b09dd30e7fa5e0843fb724fba47f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:28 +0700
Subject: [PATCH 009/107] astroid: rebuild for boost-1.80
---
srcpkgs/astroid/template | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/astroid/template b/srcpkgs/astroid/template
index 8ee0e729e134..91e3ca400acd 100644
--- a/srcpkgs/astroid/template
+++ b/srcpkgs/astroid/template
@@ -1,8 +1,9 @@
# Template file for 'astroid'
pkgname=astroid
version=0.16
-revision=5
+revision=6
build_style=cmake
+build_helper=gir
hostmakedepends="pkg-config scdoc protobuf gobject-introspection"
makedepends="libnotmuch-devel gtkmm-devel webkit2gtk-devel libsass-devel
gmime3-devel boost-devel protobuf-devel vte3-devel gobject-introspection
@@ -15,10 +16,6 @@ homepage="http://astroidmail.github.io/"
distfiles="https://github.com/astroidmail/astroid/archive/v${version}.tar.gz"
checksum=32ecb8c2fafe67f70c7d5f2bc60bda1796d98a56a75f7868c7c1ca50cd7baf5e
-if [ -n "$CROSS_BUILD" ]; then
- hostmakedepends+=" qemu-user-static prelink-cross"
-fi
-
do_check() {
cd build
xvfb-run ctest
From 7610b9dc048b1c12a602e3b533cd43d2f1fbd7d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:28 +0700
Subject: [PATCH 010/107] bitcoin: rebuild for boost-1.80
---
srcpkgs/bitcoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bitcoin/template b/srcpkgs/bitcoin/template
index ccc9c4cc5f10..9ae457ecb9c5 100644
--- a/srcpkgs/bitcoin/template
+++ b/srcpkgs/bitcoin/template
@@ -1,7 +1,7 @@
# Template file for 'bitcoin'
pkgname=bitcoin
version=22.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-ccache --disable-static
--enable-hardening --with-boost=${XBPS_CROSS_BASE}/usr --with-gui"
From c6dbb10c7b7575e2a3cc951846d2a1539cea0fdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:29 +0700
Subject: [PATCH 011/107] blender: rebuild for boost-1.80
---
srcpkgs/blender/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 91799f04fba5..28befed1faf8 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
# Template file for 'blender'
pkgname=blender
version=3.0.0
-revision=4
+revision=5
archs="x86_64* ppc64*"
build_style="cmake"
pycompile_dirs="/usr/share/blender/${version%.*}/scripts"
From 6a757961c248998088180eac34fbbe32aeb6c963 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:29 +0700
Subject: [PATCH 012/107] cclive: rebuild for boost-1.80
---
srcpkgs/cclive/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cclive/template b/srcpkgs/cclive/template
index c43dbb94209c..936be99b866c 100644
--- a/srcpkgs/cclive/template
+++ b/srcpkgs/cclive/template
@@ -1,7 +1,7 @@
# Template file for 'cclive'
pkgname=cclive
version=0.9.3
-revision=5
+revision=6
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="boost-devel pcre-devel libcurl-devel libquvi-devel glibmm-devel"
From 1f14593730bb8fccb5bf7d795f4cb57c14dfa87a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:29 +0700
Subject: [PATCH 013/107] cgal: rebuild for boost-1.80
---
srcpkgs/cgal/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cgal/template b/srcpkgs/cgal/template
index 7e28c2b28dfd..d448e8dd3c63 100644
--- a/srcpkgs/cgal/template
+++ b/srcpkgs/cgal/template
@@ -1,7 +1,7 @@
# Template file for 'cgal'
pkgname=cgal
version=4.14
-revision=3
+revision=4
wrksrc="CGAL-${version}"
build_style=cmake
build_helper="qemu"
From 10c739283cc3f1f9c7ed73de36f471c6ea09edf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:29 +0700
Subject: [PATCH 014/107] codeblocks: rebuild for boost-1.80
---
.../patches/cross-autorevision.patch | 51 +++++++++++++++++++
srcpkgs/codeblocks/template | 19 +------
2 files changed, 53 insertions(+), 17 deletions(-)
create mode 100644 srcpkgs/codeblocks/patches/cross-autorevision.patch
diff --git a/srcpkgs/codeblocks/patches/cross-autorevision.patch b/srcpkgs/codeblocks/patches/cross-autorevision.patch
new file mode 100644
index 000000000000..7d3ef3acfd29
--- /dev/null
+++ b/srcpkgs/codeblocks/patches/cross-autorevision.patch
@@ -0,0 +1,51 @@
+--- a/src/build_tools/autorevision/Makefile.am
++++ b/src/build_tools/autorevision/Makefile.am
+@@ -1,3 +1,10 @@
++CC = cc
++CXX = g++
++LD = g++
++CFLAGS = -O2 -pipe
++CXXFLAGS = -O2 -pipe
++LDFLAGS = -s
++
+ noinst_PROGRAMS = auto_revision
+ auto_revision_SOURCES = autorevision.cpp
+
+--- a/src/build_tools/autorevision/Makefile.in
++++ b/src/build_tools/autorevision/Makefile.in
+@@ -240,17 +240,17 @@ CB_SQUIRREL_CFLAGS = @CB_SQUIRREL_CFLAGS
+ CB_SQUIRREL_LIBS = @CB_SQUIRREL_LIBS@
+ CB_TINYXML_CFLAGS = @CB_TINYXML_CFLAGS@
+ CB_TINYXML_LIBS = @CB_TINYXML_LIBS@
+-CC = @CC@
++CC = cc
+ CCDEPMODE = @CCDEPMODE@
+-CFLAGS = @CFLAGS@
++CFLAGS = -O2 -pipe
+ CODEBLOCKS_PLATFORM = @CODEBLOCKS_PLATFORM@
+ CODEBLOCKS_VERSION_INFO = @CODEBLOCKS_VERSION_INFO@
+-CPP = @CPP@
+-CPPFLAGS = @CPPFLAGS@
+-CXX = @CXX@
+-CXXCPP = @CXXCPP@
++CPP = cpp
++CPPFLAGS :=
++CXX = g++
++CXXCPP = g++
+ CXXDEPMODE = @CXXDEPMODE@
+-CXXFLAGS = @CXXFLAGS@
++CXXFLAGS = -O2 -pipe
+ CYGPATH_W = @CYGPATH_W@
+ DATE = @DATE@
+ DEFS = @DEFS@
+@@ -288,8 +288,8 @@ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+-LD = @LD@
+-LDFLAGS = @LDFLAGS@
++LD = g++
++LDFLAGS = -s
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+ LIBTOOL = @LIBTOOL@
diff --git a/srcpkgs/codeblocks/template b/srcpkgs/codeblocks/template
index 33b9b9a77853..26487b40f796 100644
--- a/srcpkgs/codeblocks/template
+++ b/srcpkgs/codeblocks/template
@@ -1,11 +1,11 @@
# Template file for 'codeblocks'
pkgname=codeblocks
version=20.03
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-wx-config=wx-config-gtk3 --with-contrib-plugins
--with-boost=${XBPS_CROSS_BASE}/usr --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib"
-hostmakedepends="automake libtool pkg-config zip"
+hostmakedepends="libtool pkg-config zip"
makedepends="gtk+3-devel wxWidgets-gtk3-devel tinyxml-devel hunspell-devel
gamin-devel boost-devel boost-build"
short_desc="Free C, C++ and Fortran IDE"
@@ -20,21 +20,6 @@ if [ "$CROSS_BUILD" ]; then
configure_args+=" ac_cv_exeext=no --with-gnu-ld"
fi
-pre_configure() {
- ./bootstrap
- if [ "$CROSS_BUILD" ]; then
- # Patch auto_revision's Makefile.am to use the host compiler and flags
- cd src/build_tools/autorevision
- sed -i Makefile.am \
- -e "/noinst_PROGRAMS = auto_revision/a CC = gcc" \
- -e "/noinst_PROGRAMS = auto_revision/a CXX = g++" \
- -e "/noinst_PROGRAMS = auto_revision/a LD = g++" \
- -e "/noinst_PROGRAMS = auto_revision/a CFLAGS = -O2 -pipe" \
- -e "/noinst_PROGRAMS = auto_revision/a CXXFLAGS = -O2 -pipe" \
- -e "/noinst_PROGRAMS = auto_revision/a LDFLAGS = -s"
- fi
-}
-
post_install() {
vinstall debian/codeblocks.sharedmime 644 /usr/share/mime/packages codeblocks.xml
vinstall src/mime/codeblocks.desktop 644 /usr/share/applications
From 49dca05f9e2bd84ca37aa3adf2f1ce3b96efffd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:29 +0700
Subject: [PATCH 015/107] colobot: rebuild for boost-1.80
---
srcpkgs/colobot/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/colobot/template b/srcpkgs/colobot/template
index 1b415dd2cfad..a7613cad90b5 100644
--- a/srcpkgs/colobot/template
+++ b/srcpkgs/colobot/template
@@ -2,7 +2,7 @@
pkgname=colobot
# needs to be kept in sync with colobot-data (provides game assets)
version=0.2.0
-revision=1
+revision=2
wrksrc="colobot-colobot-gold-${version}-alpha"
build_style=cmake
configure_args="-DCOLOBOT_INSTALL_BIN_DIR=/usr/bin -DOpenGL_GL_PREFERENCE=GLVND"
From 39367518625d00a29e462f76ba83e01512da10ce Mon Sep 17 00:00:00 2001
From: Andy Weidenbaum <atweiden@ioiojo.com>
Date: Mon, 29 Aug 2022 10:56:35 +1000
Subject: [PATCH 016/107] cryfs: update to 0.11.2.
---
.../cryfs/patches/allow-build-type-none.patch | 22 ---
srcpkgs/cryfs/patches/de-vendor.patch | 134 +++++++-----------
srcpkgs/cryfs/patches/fix-test.patch | 22 ---
srcpkgs/cryfs/patches/fmt-9-fix.patch | 54 +++++++
.../rename-simple-to-basic-filesink.patch | 21 ---
srcpkgs/cryfs/patches/spdlog-include.patch | 33 -----
srcpkgs/cryfs/template | 13 +-
7 files changed, 109 insertions(+), 190 deletions(-)
delete mode 100644 srcpkgs/cryfs/patches/fix-test.patch
create mode 100644 srcpkgs/cryfs/patches/fmt-9-fix.patch
delete mode 100644 srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch
delete mode 100644 srcpkgs/cryfs/patches/spdlog-include.patch
diff --git a/srcpkgs/cryfs/patches/allow-build-type-none.patch b/srcpkgs/cryfs/patches/allow-build-type-none.patch
index e591974c05f4..ffcf0ee53320 100644
--- a/srcpkgs/cryfs/patches/allow-build-type-none.patch
+++ b/srcpkgs/cryfs/patches/allow-build-type-none.patch
@@ -9,25 +9,3 @@ Index: cryfs-0.10.2/doc/CMakeLists.txt
- CONFIGURATIONS Release
)
ENDIF(WIN32)
-Index: cryfs-0.10.2/src/cryfs-cli/CMakeLists.txt
-===================================================================
---- cryfs-0.10.2.orig/src/cryfs-cli/CMakeLists.txt
-+++ cryfs-0.10.2/src/cryfs-cli/CMakeLists.txt
-@@ -27,6 +27,5 @@ target_enable_style_warnings(${PROJECT_N
- target_activate_cpp14(${PROJECT_NAME}_bin)
-
- install(TARGETS ${PROJECT_NAME}_bin
-- CONFIGURATIONS Debug Release RelWithDebInfo
- DESTINATION ${CMAKE_INSTALL_BINDIR}
- )
-Index: cryfs-0.10.2/src/cryfs-unmount/CMakeLists.txt
-===================================================================
---- cryfs-0.10.2.orig/src/cryfs-unmount/CMakeLists.txt
-+++ cryfs-0.10.2/src/cryfs-unmount/CMakeLists.txt
-@@ -19,6 +19,5 @@ target_enable_style_warnings(${PROJECT_N
- target_activate_cpp14(${PROJECT_NAME}_bin)
-
- install(TARGETS ${PROJECT_NAME}_bin
-- CONFIGURATIONS Debug Release RelWithDebInfo
- DESTINATION ${CMAKE_INSTALL_BINDIR}
- )
diff --git a/srcpkgs/cryfs/patches/de-vendor.patch b/srcpkgs/cryfs/patches/de-vendor.patch
index 4909cad7b84a..09e51f0aa7fc 100644
--- a/srcpkgs/cryfs/patches/de-vendor.patch
+++ b/srcpkgs/cryfs/patches/de-vendor.patch
@@ -1,32 +1,14 @@
-Index: cryfs-0.10.2/src/blockstore/implementations/compressing/compressors/Gzip.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/blockstore/implementations/compressing/compressors/Gzip.cpp
-+++ cryfs-0.10.2/src/blockstore/implementations/compressing/compressors/Gzip.cpp
-@@ -1,6 +1,6 @@
- #include "cpp-utils/crypto/cryptopp_byte.h"
+--- a/src/blockstore/implementations/compressing/compressors/Gzip.cpp 2022-08-25 22:14:05.481898162 +0400
++++ b/src/blockstore/implementations/compressing/compressors/Gzip.cpp 2022-08-25 22:17:49.606653292 +0400
+@@ -1,5 +1,5 @@
#include "Gzip.h"
-#include <vendor_cryptopp/gzip.h>
+#include <cryptopp/gzip.h>
using cpputils::Data;
-Index: cryfs-0.10.2/src/cpp-utils/crypto/cryptopp_byte.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/cryptopp_byte.h
-+++ cryfs-0.10.2/src/cpp-utils/crypto/cryptopp_byte.h
-@@ -2,7 +2,7 @@
- #ifndef _CPPUTILS_CRYPTO_CRYPTOPP_BYTE_H
- #define _CPPUTILS_CRYPTO_CRYPTOPP_BYTE_H
-
--#include <vendor_cryptopp/cryptlib.h>
-+#include <cryptopp/cryptlib.h>
-
- // If we're running an older CryptoPP version, CryptoPP::byte isn't defined yet.
- // Define it. Refer to "byte" type in the global namespace (placed by CryptoPP).
-Index: cryfs-0.10.2/src/cpp-utils/crypto/hash/Hash.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/hash/Hash.cpp
-+++ cryfs-0.10.2/src/cpp-utils/crypto/hash/Hash.cpp
+--- a/src/cpp-utils/crypto/hash/Hash.cpp 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/hash/Hash.cpp 2022-08-25 22:18:07.131800277 +0400
@@ -1,6 +1,6 @@
#include "Hash.h"
#include <cpp-utils/random/Random.h>
@@ -35,10 +17,8 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/hash/Hash.cpp
using cpputils::Random;
using CryptoPP::SHA512;
-Index: cryfs-0.10.2/src/cpp-utils/crypto/kdf/Scrypt.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/kdf/Scrypt.cpp
-+++ cryfs-0.10.2/src/cpp-utils/crypto/kdf/Scrypt.cpp
+--- a/src/cpp-utils/crypto/kdf/Scrypt.cpp 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/kdf/Scrypt.cpp 2022-08-25 22:18:17.754889373 +0400
@@ -1,5 +1,5 @@
#include "Scrypt.h"
-#include <vendor_cryptopp/scrypt.h>
@@ -46,11 +26,9 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/kdf/Scrypt.cpp
using std::string;
-Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
-+++ cryfs-0.10.2/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
-@@ -7,7 +7,7 @@
+--- a/src/cpp-utils/crypto/symmetric/CFB_Cipher.h 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/symmetric/CFB_Cipher.h 2022-08-25 22:18:28.524979704 +0400
+@@ -6,7 +6,7 @@
#include "../../data/Data.h"
#include "../../random/Random.h"
#include <boost/optional.hpp>
@@ -59,24 +37,9 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/CFB_Cipher.h
#include "Cipher.h"
#include "EncryptionKey.h"
-Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
-+++ cryfs-0.10.2/src/cpp-utils/crypto/symmetric/GCM_Cipher.h
-@@ -6,7 +6,7 @@
- #include "../../data/FixedSizeData.h"
- #include "../../data/Data.h"
- #include "../../random/Random.h"
--#include <vendor_cryptopp/gcm.h>
-+#include <cryptopp/gcm.h>
- #include "Cipher.h"
- #include "EncryptionKey.h"
-
-Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/ciphers.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/crypto/symmetric/ciphers.h
-+++ cryfs-0.10.2/src/cpp-utils/crypto/symmetric/ciphers.h
-@@ -2,11 +2,11 @@
+--- a/src/cpp-utils/crypto/symmetric/ciphers.h 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/symmetric/ciphers.h 2022-08-25 22:18:52.181178110 +0400
+@@ -2,12 +2,12 @@
#ifndef MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_
#define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_CIPHERS_H_
@@ -85,30 +48,39 @@ Index: cryfs-0.10.2/src/cpp-utils/crypto/symmetric/ciphers.h
-#include <vendor_cryptopp/serpent.h>
-#include <vendor_cryptopp/cast.h>
-#include <vendor_cryptopp/mars.h>
+-#include <vendor_cryptopp/chachapoly.h>
+#include <cryptopp/aes.h>
+#include <cryptopp/twofish.h>
+#include <cryptopp/serpent.h>
+#include <cryptopp/cast.h>
+#include <cryptopp/mars.h>
++#include <cryptopp/chachapoly.h>
#include "GCM_Cipher.h"
#include "CFB_Cipher.h"
-Index: cryfs-0.10.2/src/cpp-utils/data/Data.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/data/Data.cpp
-+++ cryfs-0.10.2/src/cpp-utils/data/Data.cpp
+--- a/src/cpp-utils/crypto/symmetric/GCM_Cipher.h 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/crypto/symmetric/GCM_Cipher.h 2022-08-25 22:18:38.836066183 +0400
+@@ -3,7 +3,7 @@
+ #define MESSMER_CPPUTILS_CRYPTO_SYMMETRIC_GCMCIPHER_H_
+
+ #include "AEAD_Cipher.h"
+-#include <vendor_cryptopp/gcm.h>
++#include <cryptopp/gcm.h>
+
+ namespace cpputils {
+
+--- a/src/cpp-utils/data/Data.cpp 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/data/Data.cpp 2022-08-25 22:19:09.349322106 +0400
@@ -1,6 +1,6 @@
#include "Data.h"
#include <stdexcept>
-#include <vendor_cryptopp/hex.h>
+#include <cryptopp/hex.h>
- #include <cpp-utils/crypto/cryptopp_byte.h>
using std::istream;
-Index: cryfs-0.10.2/src/cpp-utils/data/FixedSizeData.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/data/FixedSizeData.h
-+++ cryfs-0.10.2/src/cpp-utils/data/FixedSizeData.h
+ using std::ofstream;
+--- a/src/cpp-utils/data/FixedSizeData.h 2022-08-25 22:14:05.482898159 +0400
++++ b/src/cpp-utils/data/FixedSizeData.h 2022-08-25 22:19:19.103403916 +0400
@@ -2,7 +2,7 @@
#ifndef MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_
#define MESSMER_CPPUTILS_DATA_FIXEDSIZEDATA_H_
@@ -116,25 +88,21 @@ Index: cryfs-0.10.2/src/cpp-utils/data/FixedSizeData.h
-#include <vendor_cryptopp/hex.h>
+#include <cryptopp/hex.h>
#include <string>
+ #include <array>
#include <cstring>
- #include "../assert/assert.h"
-Index: cryfs-0.10.2/src/cpp-utils/random/OSRandomGenerator.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/random/OSRandomGenerator.h
-+++ cryfs-0.10.2/src/cpp-utils/random/OSRandomGenerator.h
-@@ -4,7 +4,7 @@
+--- a/src/cpp-utils/random/OSRandomGenerator.h 2022-08-25 22:14:05.483898156 +0400
++++ b/src/cpp-utils/random/OSRandomGenerator.h 2022-08-25 22:19:29.602491973 +0400
+@@ -3,7 +3,7 @@
+ #define MESSMER_CPPUTILS_RANDOM_OSRANDOMGENERATOR_H
- #include "cpp-utils/crypto/cryptopp_byte.h"
#include "RandomGenerator.h"
-#include <vendor_cryptopp/osrng.h>
+#include <cryptopp/osrng.h>
namespace cpputils {
class OSRandomGenerator final : public RandomGenerator {
-Index: cryfs-0.10.2/src/cpp-utils/random/RandomGeneratorThread.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/random/RandomGeneratorThread.h
-+++ cryfs-0.10.2/src/cpp-utils/random/RandomGeneratorThread.h
+--- a/src/cpp-utils/random/RandomGeneratorThread.h 2022-08-25 22:14:05.484898153 +0400
++++ b/src/cpp-utils/random/RandomGeneratorThread.h 2022-08-25 22:19:36.713551613 +0400
@@ -4,7 +4,7 @@
#include "../thread/LoopThread.h"
@@ -144,10 +112,9 @@ Index: cryfs-0.10.2/src/cpp-utils/random/RandomGeneratorThread.h
namespace cpputils {
//TODO Test
-Index: cryfs-0.10.2/src/cryfs/localstate/BasedirMetadata.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cryfs/localstate/BasedirMetadata.cpp
-+++ cryfs-0.10.2/src/cryfs/localstate/BasedirMetadata.cpp
+diff -Naurp0 -U3 cryfs-0.11.2/src/cryfs/impl/localstate/BasedirMetadata.cpp cryfs-0.11.2-mine/src/cryfs/impl/localstate/BasedirMetadata.cpp
+--- a/src/cryfs/impl/localstate/BasedirMetadata.cpp 2022-08-25 22:14:05.487898144 +0400
++++ b/src/cryfs/impl/localstate/BasedirMetadata.cpp 2022-08-25 22:19:46.722635560 +0400
@@ -1,7 +1,7 @@
#include "BasedirMetadata.h"
#include <boost/property_tree/ptree.hpp>
@@ -157,11 +124,9 @@ Index: cryfs-0.10.2/src/cryfs/localstate/BasedirMetadata.cpp
#include <boost/filesystem/operations.hpp>
#include "LocalStateDir.h"
#include <cpp-utils/logging/logging.h>
-Index: cryfs-0.10.2/test/cryfs/config/CompatibilityTest.cpp
-===================================================================
---- cryfs-0.10.2.orig/test/cryfs/config/CompatibilityTest.cpp
-+++ cryfs-0.10.2/test/cryfs/config/CompatibilityTest.cpp
-@@ -3,7 +3,7 @@
+--- a/test/cryfs/impl/config/CompatibilityTest.cpp 2022-08-25 22:14:05.493898126 +0400
++++ b/test/cryfs/impl/config/CompatibilityTest.cpp 2022-08-25 22:19:54.589701542 +0400
+@@ -2,7 +2,7 @@
#include <vector>
#include <boost/filesystem.hpp>
#include <cpp-utils/data/Data.h>
@@ -169,12 +134,9 @@ Index: cryfs-0.10.2/test/cryfs/config/CompatibilityTest.cpp
+#include <cryptopp/hex.h>
#include <cpp-utils/crypto/symmetric/ciphers.h>
#include <cpp-utils/tempfile/TempFile.h>
- #include <cryfs/config/CryConfigFile.h>
-Index: cryfs-0.10.2/vendor/CMakeLists.txt
-===================================================================
---- cryfs-0.10.2.orig/vendor/CMakeLists.txt
-+++ cryfs-0.10.2/vendor/CMakeLists.txt
-@@ -1,3 +1 @@
+ #include <cryfs/impl/config/CryConfigFile.h>
+--- a/vendor/CMakeLists.txt 2022-08-25 22:14:05.497898115 +0400
++++ b/vendor/CMakeLists.txt 2022-08-25 22:20:11.176840657 +0400
+@@ -1,2 +1 @@
add_subdirectory(googletest)
--add_subdirectory(spdlog)
-add_subdirectory(cryptopp)
diff --git a/srcpkgs/cryfs/patches/fix-test.patch b/srcpkgs/cryfs/patches/fix-test.patch
deleted file mode 100644
index d3a5847b1a3c..000000000000
--- a/srcpkgs/cryfs/patches/fix-test.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Index: cryfs-0.10.2/test/cpp-utils/logging/testutils/LoggingTest.h
-===================================================================
---- cryfs-0.10.2.orig/test/cpp-utils/logging/testutils/LoggingTest.h
-+++ cryfs-0.10.2/test/cpp-utils/logging/testutils/LoggingTest.h
-@@ -11,8 +11,7 @@ class MockLogger final {
- public:
- MockLogger():
- _capturedLogData(),
-- _sink(std::make_shared<spdlog::sinks::ostream_sink<std::mutex>>(_capturedLogData, true)),
-- _logger(spdlog::create("MockLogger", {_sink})) {
-+ _logger(spdlog::create<spdlog::sinks::ostream_sink_mt>("MockLogger", _capturedLogData, true)) {
- }
-
- ~MockLogger() {
-@@ -28,7 +27,6 @@ public:
- }
- private:
- std::ostringstream _capturedLogData;
-- std::shared_ptr<spdlog::sinks::ostream_sink<std::mutex>> _sink;
- std::shared_ptr<spdlog::logger> _logger;
- };
-
diff --git a/srcpkgs/cryfs/patches/fmt-9-fix.patch b/srcpkgs/cryfs/patches/fmt-9-fix.patch
new file mode 100644
index 000000000000..6fe97eaeafa4
--- /dev/null
+++ b/srcpkgs/cryfs/patches/fmt-9-fix.patch
@@ -0,0 +1,54 @@
+From 27515e0116fd7cb034bd4e9763d1f3bfdc855a5f Mon Sep 17 00:00:00 2001
+From: Bernhard Rosenkraenzer <bero@lindev.ch>
+Date: Fri, 22 Jul 2022 14:13:38 +0200
+Subject: [PATCH] Fix build with fmt 9.0 (#433)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+* Fix build with fmt 9.0
+
+Co-authored-by: Sebastian Meßmer <smessmer@users.noreply.github.com>
+---
+ ChangeLog.txt | 4 ++++
+ src/fspp/fuse/Fuse.cpp | 8 ++++----
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/src/fspp/fuse/Fuse.cpp b/src/fspp/fuse/Fuse.cpp
+index 4e9dbd7f..4b881815 100644
+--- a/src/fspp/fuse/Fuse.cpp
++++ b/src/fspp/fuse/Fuse.cpp
+@@ -603,21 +603,21 @@ int Fuse::mknod(const bf::path &path, ::mode_t mode, dev_t rdev) {
+ UNUSED(mode);
+ UNUSED(path);
+ ThreadNameForDebugging _threadName("mknod");
+- LOG(WARN, "Called non-implemented mknod({}, {}, _)", path, mode);
++ LOG(WARN, "Called non-implemented mknod({}, {}, _)", path.string(), mode);
+ return ENOSYS;
+ }
+
+ int Fuse::mkdir(const bf::path &path, ::mode_t mode) {
+ ThreadNameForDebugging _threadName("mkdir");
+ #ifdef FSPP_LOG
+- LOG(DEBUG, "mkdir({}, {})", path, mode);
++ LOG(DEBUG, "mkdir({}, {})", path.string(), mode);
+ #endif
+ try {
+ ASSERT(is_valid_fspp_path(path), "has to be an absolute path");
+ // DokanY seems to call mkdir("/"). Ignore that
+ if ("/" == path) {
+ #ifdef FSPP_LOG
+- LOG(DEBUG, "mkdir({}, {}): ignored", path, mode);
++ LOG(DEBUG, "mkdir({}, {}): ignored", path.string(), mode);
+ #endif
+ return 0;
+ }
+@@ -766,7 +766,7 @@ int Fuse::rename(const bf::path &from, const bf::path &to) {
+ //TODO
+ int Fuse::link(const bf::path &from, const bf::path &to) {
+ ThreadNameForDebugging _threadName("link");
+- LOG(WARN, "NOT IMPLEMENTED: link({}, {})", from, to);
++ LOG(WARN, "NOT IMPLEMENTED: link({}, {})", from.string(), to.string());
+ //auto real_from = _impl->RootDir() / from;
+ //auto real_to = _impl->RootDir() / to;
+ //int retstat = ::link(real_from.string().c_str(), real_to.string().c_str());
diff --git a/srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch b/srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch
deleted file mode 100644
index 08513cb4d0ca..000000000000
--- a/srcpkgs/cryfs/patches/rename-simple-to-basic-filesink.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: cryfs-0.10.2/src/cryfs-cli/Cli.cpp
-===================================================================
---- cryfs-0.10.2.orig/src/cryfs-cli/Cli.cpp
-+++ cryfs-0.10.2/src/cryfs-cli/Cli.cpp
-@@ -27,6 +27,7 @@
- #include "Environment.h"
- #include <cryfs/CryfsException.h>
- #include <cpp-utils/thread/debugging.h>
-+#include <spdlog/sinks/basic_file_sink.h>
-
- //TODO Many functions accessing the ProgramOptions object. Factor out into class that stores it as a member.
- //TODO Factor out class handling askPassword
-@@ -310,7 +311,7 @@ namespace cryfs_cli {
- //TODO Test that --logfile parameter works. Should be: file if specified, otherwise stderr if foreground, else syslog.
- if (options.logFile() != none) {
- cpputils::logging::setLogger(
-- spdlog::create<spdlog::sinks::simple_file_sink<std::mutex>>("cryfs", options.logFile()->string()));
-+ spdlog::create<spdlog::sinks::basic_file_sink<std::mutex>>("cryfs", options.logFile()->string()));
- } else if (options.foreground()) {
- cpputils::logging::setLogger(spdlog::stderr_logger_mt("cryfs"));
- } else {
diff --git a/srcpkgs/cryfs/patches/spdlog-include.patch b/srcpkgs/cryfs/patches/spdlog-include.patch
deleted file mode 100644
index 2c1c5a926cf3..000000000000
--- a/srcpkgs/cryfs/patches/spdlog-include.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Index: cryfs-0.10.2/src/cpp-utils/logging/Logger.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/logging/Logger.h
-+++ cryfs-0.10.2/src/cpp-utils/logging/Logger.h
-@@ -7,6 +7,7 @@
- #endif
-
- #include <spdlog/spdlog.h>
-+#include <spdlog/sinks/stdout_sinks.h>
- #include "../macros.h"
-
- namespace cpputils {
-Index: cryfs-0.10.2/src/cpp-utils/logging/logging.h
-===================================================================
---- cryfs-0.10.2.orig/src/cpp-utils/logging/logging.h
-+++ cryfs-0.10.2/src/cpp-utils/logging/logging.h
-@@ -5,6 +5,7 @@
- #include "Logger.h"
- #include <stdexcept>
- #include <spdlog/fmt/ostr.h>
-+#include <spdlog/sinks/syslog_sink.h>
-
- #if defined(_MSC_VER)
- #include <spdlog/sinks/msvc_sink.h>
-@@ -75,7 +76,7 @@ namespace cpputils {
- #if defined(_MSC_VER)
- return spdlog::create<spdlog::sinks::msvc_sink_mt>(name);
- #else
-- return spdlog::syslog_logger(name, name, LOG_PID);
-+ return spdlog::syslog_logger_mt(name, name, LOG_PID);
- #endif
- }
- }
diff --git a/srcpkgs/cryfs/template b/srcpkgs/cryfs/template
index 495c2b318a3b..1affee1d8f03 100644
--- a/srcpkgs/cryfs/template
+++ b/srcpkgs/cryfs/template
@@ -1,14 +1,15 @@
# Template file for 'cryfs'
pkgname=cryfs
-version=0.10.2
-revision=5
+version=0.11.2
+revision=1
create_wrksrc=yes
build_style=cmake
-configure_args="-DCRYFS_UPDATE_CHECKS=off
- -DBoost_USE_STATIC_LIBS=OFF -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt"
+configure_args="-DCRYFS_UPDATE_CHECKS=off -DBoost_USE_STATIC_LIBS=OFF
+ -DCMAKE_CXX_STANDARD_LIBRARIES=-lfmt
+ -DDEPENDENCY_CONFIG=../cmake-utils/DependenciesFromLocalSystem.cmake"
hostmakedepends="pkg-config python3"
makedepends="boost-devel fuse-devel libcurl-devel libgomp-devel crypto++-devel
- spdlog"
+ spdlog range-v3 fmt-devel"
depends="fuse"
short_desc="Cryptographic filesystem for the cloud"
maintainer="Andy Weidenbaum <atweiden@tutanota.de>"
@@ -16,7 +17,7 @@ license="LGPL-3.0-only"
homepage="https://www.cryfs.org"
changelog="https://github.com/cryfs/cryfs/raw/master/ChangeLog.txt"
distfiles="https://github.com/cryfs/cryfs/releases/download/${version}/${pkgname}-${version}.tar.gz"
-checksum=004c7fdf537062e197aaa0bcdafd2682904a279802441bb6063cb72c1fba52d2
+checksum=a89ab8fea2d494b496867107ec0a3772fe606ebd71ef12152fcd233f463a2c00
if [ "${XBPS_CHECK_PKGS}" ]; then
configure_args+=" -DBUILD_TESTING=on"
From e40fa6d2f9698746bfc17d0ffe9fc2477e8bfd39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:30 +0700
Subject: [PATCH 017/107] eclib: rebuild for boost-1.80
---
srcpkgs/eclib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/eclib/template b/srcpkgs/eclib/template
index 3db0bd2119b9..694a39ed4068 100644
--- a/srcpkgs/eclib/template
+++ b/srcpkgs/eclib/template
@@ -1,7 +1,7 @@
# Template file for 'eclib'
pkgname=eclib
version=20210625
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-flint --with-boost"
hostmakedepends="automake autoconf-archive libtool"
From c8b182a95725a48f191cc313eb763fdda329a8b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:30 +0700
Subject: [PATCH 018/107] facter: rebuild for boost-1.80
---
srcpkgs/facter/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template
index 93d6bfc6af51..45c921a0b72d 100644
--- a/srcpkgs/facter/template
+++ b/srcpkgs/facter/template
@@ -1,7 +1,7 @@
# Template file for 'facter'
pkgname=facter
version=3.14.16
-revision=3
+revision=4
build_style=cmake
configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
-DENABLE_CXX_WERROR=OFF -DCMAKE_INSTALL_LIBDIR=/usr/lib"
From 4c13dbf86147e8e0ad29d27886a549d92d4d4a44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:30 +0700
Subject: [PATCH 019/107] fcitx5-chinese-addons: rebuild for boost-1.80
---
srcpkgs/fcitx5-chinese-addons/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/fcitx5-chinese-addons/template b/srcpkgs/fcitx5-chinese-addons/template
index d207bde9ada9..a3a1948474a7 100644
--- a/srcpkgs/fcitx5-chinese-addons/template
+++ b/srcpkgs/fcitx5-chinese-addons/template
@@ -1,7 +1,7 @@
# Template file for 'fcitx5-chinese-addons'
pkgname=fcitx5-chinese-addons
version=5.0.14
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config gettext doxygen extra-cmake-modules qt5-qmake
qt5-host-tools libime-utils"
From 978200753909c6effca0ae7be03b293ddab71c17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:31 +0700
Subject: [PATCH 020/107] fifengine: rebuild for boost-1.80
---
srcpkgs/fifengine/patches/ftbfs.patch | 18 ++++++++++++++++++
srcpkgs/fifengine/template | 2 +-
2 files changed, 19 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/fifengine/patches/ftbfs.patch
diff --git a/srcpkgs/fifengine/patches/ftbfs.patch b/srcpkgs/fifengine/patches/ftbfs.patch
new file mode 100644
index 000000000000..9c205f9fe159
--- /dev/null
+++ b/srcpkgs/fifengine/patches/ftbfs.patch
@@ -0,0 +1,18 @@
+--- a/engine/core/vfs/zip/zipnode.cpp
++++ b/engine/core/vfs/zip/zipnode.cpp
+@@ -29,6 +29,8 @@
+
+ #include "zipnode.h"
+
++#include <algorithm>
++
+ namespace {
+ /** helper function to find a value in a ZipNodeContainer
+ * @param container the ZipNodeContainer to search through
+@@ -266,4 +268,4 @@ std::ostream& operator<<(std::ostream& o
+ }
+
+ return os;
+-}
+\ No newline at end of file
++}
diff --git a/srcpkgs/fifengine/template b/srcpkgs/fifengine/template
index 1987e06f7d03..24d2f8521c8d 100644
--- a/srcpkgs/fifengine/template
+++ b/srcpkgs/fifengine/template
@@ -1,7 +1,7 @@
# Template file for 'fifengine'
pkgname=fifengine
version=0.4.2
-revision=8
+revision=9
build_style=cmake
hostmakedepends="swig python3"
makedepends="SDL2-devel SDL2_image-devel SDL2_ttf-devel boost-devel
From 53488264ffe9ff1cc23f2c5da7e6436e9dc8dc29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:31 +0700
Subject: [PATCH 021/107] freecad: rebuild for boost-1.80
---
srcpkgs/freecad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freecad/template b/srcpkgs/freecad/template
index e9c697adbe1a..843d2281f324 100644
--- a/srcpkgs/freecad/template
+++ b/srcpkgs/freecad/template
@@ -1,7 +1,7 @@
# Template file for 'freecad'
pkgname=freecad
version=0.20.1
-revision=1
+revision=2
wrksrc="FreeCAD-${version}"
build_style=cmake
From 14240b020cf02fd16c815e12776b7c96e4285469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:31 +0700
Subject: [PATCH 022/107] freeorion: rebuild for boost-1.80
---
srcpkgs/freeorion/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freeorion/template b/srcpkgs/freeorion/template
index 20fd819e49b0..71d41f3e987b 100644
--- a/srcpkgs/freeorion/template
+++ b/srcpkgs/freeorion/template
@@ -1,7 +1,7 @@
# Template file for 'freeorion'
pkgname=freeorion
version=0.4.10.2
-revision=1
+revision=2
_release=${version}_2021-08-01.f663dad
wrksrc=src-tarball
build_style=cmake
From d126a7814da608e45bee6eae1a02417eaa61643a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:31 +0700
Subject: [PATCH 023/107] gnucash: rebuild for boost-1.80
---
srcpkgs/gnucash/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 5d403e47c02b..81627ef4f8a1 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
# Template file for 'gnucash'
pkgname=gnucash
version=4.11
-revision=1
+revision=2
wrksrc="${pkgname}-${version%b}"
build_style=cmake
make_check_target=check
From c041d6c04e247cd446ac4843f947e119ed9c4626 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:31 +0700
Subject: [PATCH 024/107] gnuradio: rebuild for boost-1.80
---
.../gnuradio/patches/boost-1.80-fmt-9.patch | 79 +++++++++++++++++++
srcpkgs/gnuradio/template | 2 +-
2 files changed, 80 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
diff --git a/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch b/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
new file mode 100644
index 000000000000..a0c3f6d4701b
--- /dev/null
+++ b/srcpkgs/gnuradio/patches/boost-1.80-fmt-9.patch
@@ -0,0 +1,79 @@
+Upstream: no
+
+Honestly, I don't care much. I tries to print as much as it makes sense
+--- a/gnuradio-runtime/include/gnuradio/logger.h
++++ b/gnuradio-runtime/include/gnuradio/logger.h
+@@ -37,6 +37,9 @@ using logger_ptr = std::shared_ptr<void>
+ #include <spdlog/fmt/fmt.h>
+ #include <spdlog/fmt/ostr.h>
+ #include <memory>
++#include <string>
++#include <type_traits>
++#include <utility>
+
+ #include <spdlog/spdlog.h>
+
+@@ -285,6 +288,52 @@ struct fmt::formatter<boost::format> : f
+ }
+ };
+
++namespace fmt {
++template <typename T>
++struct formatter<
++ T,
++ typename std::enable_if<
++ std::is_convertible<
++ decltype(std::declval<T>().identifier()),
++ std::string
++ >::value,
++ char
++ >::type > : fmt::formatter<std::string> {
++ template <typename FormatCtx>
++ auto format(const T& value, FormatCtx& ctx)
++ -> decltype(fmt::formatter<std::string>::format(value.identifier(), ctx))
++ {
++ return fmt::formatter<std::string>::format(value.identifier(), ctx);
++ }
++};
++template <typename T, typename Ch>
++struct formatter<std::shared_ptr<T>, Ch> : fmt::formatter<const void *, Ch> {
++ template <typename FormatCtx>
++ auto format(const std::shared_ptr<T>& ptr, FormatCtx& ctx)
++ -> decltype(fmt::formatter<const void *, Ch>::format(fmt::ptr(ptr), ctx))
++ {
++ return fmt::formatter<const void *, Ch>::format(fmt::ptr(ptr), ctx);
++ }
++};
++template <typename T>
++struct formatter<
++ std::shared_ptr<T>,
++ typename std::enable_if<
++ std::is_convertible<
++ decltype(std::declval<T>().identifier()),
++ std::string
++ >::value,
++ char
++ >::type > : fmt::formatter<std::string> {
++ template <typename FormatCtx>
++ auto format(const std::shared_ptr<T>& ptr, FormatCtx& ctx)
++ -> decltype(fmt::formatter<std::string>::format(ptr->identifier(), ctx))
++ {
++ return fmt::formatter<std::string>::format(ptr->identifier(), ctx);
++ }
++};
++}
++
+ #endif
+
+ #endif /* INCLUDED_GR_LOGGER_H */
+--- a/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc
++++ b/gnuradio-runtime/python/gnuradio/gr/bindings/logger_python.cc
+@@ -15,7 +15,7 @@
+ /* BINDTOOL_GEN_AUTOMATIC(0) */
+ /* BINDTOOL_USE_PYGCCXML(0) */
+ /* BINDTOOL_HEADER_FILE(logger.h) */
+-/* BINDTOOL_HEADER_FILE_HASH(a76c325b045da079c83e294cc4abb8c6) */
++/* BINDTOOL_HEADER_FILE_HASH(0e6a6ba08242e117ab4407ef3bf7afdf) */
+ /***********************************************************************************/
+
+ #include <pybind11/complex.h>
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index 43ae4e1cb1ba..973339f92921 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio'
pkgname=gnuradio
version=3.10.3.0
-revision=1
+revision=2
build_style=cmake
conf_files="/etc/gnuradio/conf.d/*"
configure_args="-DMATHJAX2_USE_ROOT=/usr/share/mathjax
From f17b2c094a725836d20fe998d6efee7d3981d6e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:32 +0700
Subject: [PATCH 025/107] gnuradio-osmosdr: rebuild for boost-1.80
---
srcpkgs/gnuradio-osmosdr/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-osmosdr/template b/srcpkgs/gnuradio-osmosdr/template
index cdb4d27faf68..bf0696c672a9 100644
--- a/srcpkgs/gnuradio-osmosdr/template
+++ b/srcpkgs/gnuradio-osmosdr/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-osmosdr'
pkgname=gnuradio-osmosdr
version=0.2.3git20210128
-revision=1
+revision=2
_githash=a100eb024c0210b95e4738b6efd836d48225bd03
wrksrc="gr-osmosdr-${_githash}"
build_style=cmake
From 0c5f319f39226a4a3e614787547164b902f44ba8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:32 +0700
Subject: [PATCH 026/107] gnuradio-rds: rebuild for boost-1.80
---
srcpkgs/gnuradio-rds/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnuradio-rds/template b/srcpkgs/gnuradio-rds/template
index 35d19fb82b11..e9e865151f7a 100644
--- a/srcpkgs/gnuradio-rds/template
+++ b/srcpkgs/gnuradio-rds/template
@@ -1,7 +1,7 @@
# Template file for 'gnuradio-rds'
pkgname=gnuradio-rds
version=3.10
-revision=1
+revision=2
wrksrc="gr-rds-${version}"
build_style=cmake
configure_args="-Dpybind11_DIR=/${py3_sitelib}/pybind11/share/cmake/pybind11"
From 22db3872edd2a4ed12e0a55f27412e65ebff0eda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:32 +0700
Subject: [PATCH 027/107] gource: rebuild for boost-1.80
---
srcpkgs/gource/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gource/template b/srcpkgs/gource/template
index 8ec3b05ca772..08b2e222f607 100644
--- a/srcpkgs/gource/template
+++ b/srcpkgs/gource/template
@@ -1,7 +1,7 @@
# Template file for 'gource'
pkgname=gource
version=0.51
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-tinyxml --enable-ttf-font-dir=/usr/share/fonts/TTF
--with-boost-libdir=$XBPS_CROSS_BASE/usr/lib/"
From dca17bdbb739aa68dcd1c1be85b1d7e95e59b28a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:32 +0700
Subject: [PATCH 028/107] gpick: rebuild for boost-1.80
---
srcpkgs/gpick/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gpick/template b/srcpkgs/gpick/template
index b30108334144..7b3a4db6d69c 100644
--- a/srcpkgs/gpick/template
+++ b/srcpkgs/gpick/template
@@ -1,7 +1,7 @@
# Template file for 'gpick'
pkgname=gpick
version=0.2.6
-revision=1
+revision=2
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=cmake
hostmakedepends="gettext pkg-config ragel"
From a6fe1cc4ce3ca082559f6f7e8e5b6cef06bc98bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:32 +0700
Subject: [PATCH 029/107] grive2: rebuild for boost-1.80
---
srcpkgs/grive2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/grive2/template b/srcpkgs/grive2/template
index 140688ee9aec..e416cdc606b5 100644
--- a/srcpkgs/grive2/template
+++ b/srcpkgs/grive2/template
@@ -1,7 +1,7 @@
# Template file for 'grive2'
pkgname=grive2
version=0.5.1
-revision=2
+revision=3
build_style=cmake
hostmakedepends="pkg-config"
makedepends="boost-devel libcurl-devel yajl-devel libgcrypt-devel expat-devel"
From ffb799c6150ff7cbb7ba87032567324e6ddb67be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:33 +0700
Subject: [PATCH 030/107] guitarix2: rebuild for boost-1.80
---
srcpkgs/guitarix2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/guitarix2/template b/srcpkgs/guitarix2/template
index 880814313a2b..90010b5a2be8 100644
--- a/srcpkgs/guitarix2/template
+++ b/srcpkgs/guitarix2/template
@@ -1,7 +1,7 @@
# Template file for 'guitarix2'
pkgname=guitarix2
version=0.42.1
-revision=1
+revision=2
wrksrc="guitarix-${version}"
build_style=waf3
configure_args="--cxxflags-release=-DNDEBUG --ladspa --new-ladspa --no-faust
@@ -12,7 +12,7 @@ makedepends="boost-devel eigen fftw-devel gtkmm-devel jack-devel
ladspa-sdk liblrdf-devel libsndfile-devel lilv-devel lv2 sratom-devel
zita-convolver-devel zita-resampler-devel
$(vopt_if avahi avahi-glib-libs-devel) $(vopt_if bluez libbluetooth-devel)"
-depends="desktop-file-utils"
+depends="desktop-file-utils fonts-roboto-ttf"
short_desc="Virtual guitar amplifier running on Jack Audio Connection Kit"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
From 34a06958ecc1de3e8b7b4cd460f8050a1887eff7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:33 +0700
Subject: [PATCH 031/107] heaptrack: rebuild for boost-1.80
---
srcpkgs/heaptrack/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/heaptrack/template b/srcpkgs/heaptrack/template
index ed98a952dfdc..0ccc1e6415a7 100644
--- a/srcpkgs/heaptrack/template
+++ b/srcpkgs/heaptrack/template
@@ -1,7 +1,7 @@
# Template file for 'heaptrack'
pkgname=heaptrack
version=1.4.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DHEAPTRACK_BUILD_GUI=ON"
hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules kcoreaddons
From 4ce8e9a1c386d2d337d4c06e0394a289f7a8294a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:33 +0700
Subject: [PATCH 032/107] hugin: rebuild for boost-1.80
---
srcpkgs/hugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/hugin/template b/srcpkgs/hugin/template
index 73a0822f4e25..72e1439d9933 100644
--- a/srcpkgs/hugin/template
+++ b/srcpkgs/hugin/template
@@ -1,7 +1,7 @@
# Template file for 'hugin'
pkgname=hugin
version=2021.0.0
-revision=2
+revision=3
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
pycompile_dirs="usr/share/hugin/data/plugins usr/share/hugin/data/plugins-templates"
From 5b6106f2bf7b3e3cdefcdda54733a53c623dbfeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:33 +0700
Subject: [PATCH 033/107] i2pd: rebuild for boost-1.80
---
srcpkgs/i2pd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/i2pd/template b/srcpkgs/i2pd/template
index fe12bb2e19bf..522235bebc17 100644
--- a/srcpkgs/i2pd/template
+++ b/srcpkgs/i2pd/template
@@ -1,7 +1,7 @@
# Template file for 'i2pd'
pkgname=i2pd
version=2.42.1
-revision=1
+revision=2
build_style=gnu-makefile
make_build_args="USE_UPNP=yes"
makedepends="zlib-devel boost-devel openssl-devel miniupnpc-devel
From d3fbd846a1bb0be56740231fa1270885e39b10d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:34 +0700
Subject: [PATCH 034/107] icinga2: rebuild for boost-1.80
---
srcpkgs/icinga2/patches/cmake-3.15.patch | 45 ++++++++++++++++++++++++
srcpkgs/icinga2/template | 2 +-
2 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/icinga2/patches/cmake-3.15.patch
diff --git a/srcpkgs/icinga2/patches/cmake-3.15.patch b/srcpkgs/icinga2/patches/cmake-3.15.patch
new file mode 100644
index 000000000000..5c99e60370cb
--- /dev/null
+++ b/srcpkgs/icinga2/patches/cmake-3.15.patch
@@ -0,0 +1,45 @@
+CMake 3.15 Boost_VERSION to Boost_VERSION_MACRO
+and define Boost_VERSION to have dot
+--- a/third-party/cmake/BoostTestTargets.cmake
++++ b/third-party/cmake/BoostTestTargets.cmake
+@@ -47,11 +47,11 @@ set(BOOST_TEST_TARGET_PREFIX "boosttest"
+ if(NOT Boost_FOUND)
+ find_package(Boost 1.34.0 QUIET)
+ endif()
+-if("${Boost_VERSION}0" LESS "1034000")
++if("${Boost_VERSION_MACRO}0" LESS "1034000")
+ set(_shared_msg
+ "NOTE: boost::test-based targets and tests cannot "
+ "be added: boost >= 1.34.0 required but not found. "
+- "(found: '${Boost_VERSION}'; want >=103400) ")
++ "(found: '${Boost_VERSION_MACRO}'; want >=103400) ")
+ if(BUILD_TESTING)
+ message(FATAL_ERROR
+ ${_shared_msg}
+@@ -67,7 +67,7 @@ endif()
+ include(GetForceIncludeDefinitions)
+ include(CopyResourcesToBuildTree)
+
+-if(Boost_FOUND AND NOT "${Boost_VERSION}0" LESS "1034000")
++if(Boost_FOUND AND NOT "${Boost_VERSION_MACRO}0" LESS "1034000")
+ set(_boosttesttargets_libs)
+ set(_boostConfig "BoostTestTargetsIncluded.h")
+ if(NOT Boost_UNIT_TEST_FRAMEWORK_LIBRARY)
+@@ -144,7 +144,7 @@ function(add_boost_test _name)
+ "Syntax error in use of add_boost_test: at least one source file required!")
+ endif()
+
+- if(Boost_FOUND AND NOT "${Boost_VERSION}0" LESS "1034000")
++ if(Boost_FOUND AND NOT "${Boost_VERSION_MACRO}0" LESS "1034000")
+
+ include_directories(${Boost_INCLUDE_DIRS})
+
+@@ -236,7 +236,7 @@ function(add_boost_test _name)
+ set(_test_command ${_target_name})
+ endif()
+
+- if(TESTS AND "${Boost_VERSION}" VERSION_GREATER "103799")
++ if(TESTS AND "${Boost_VERSION_MACRO}" VERSION_GREATER "103799")
+ foreach(_test ${TESTS})
+ add_test(NAME
+ ${_name}-${_test}
diff --git a/srcpkgs/icinga2/template b/srcpkgs/icinga2/template
index a884892fc49e..4ef7abea2fc3 100644
--- a/srcpkgs/icinga2/template
+++ b/srcpkgs/icinga2/template
@@ -1,7 +1,7 @@
# Template file for 'icinga2'
pkgname=icinga2
version=2.9.3
-revision=6
+revision=7
build_style=cmake
build_helper="qemu"
configure_args="-DCMAKE_INSTALL_SYSCONFDIR=/etc
From ad7fb86a38d0397a92bb586a65f6d3a9465d6378 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:34 +0700
Subject: [PATCH 035/107] imagescan: rebuild for boost-1.80
---
srcpkgs/imagescan/patches/boost-1.80.patch | 15 +++++++++++++++
srcpkgs/imagescan/patches/sane.patch | 11 +++++++++++
srcpkgs/imagescan/template | 2 +-
3 files changed, 27 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/imagescan/patches/boost-1.80.patch
create mode 100644 srcpkgs/imagescan/patches/sane.patch
diff --git a/srcpkgs/imagescan/patches/boost-1.80.patch b/srcpkgs/imagescan/patches/boost-1.80.patch
new file mode 100644
index 000000000000..4425d84a34a5
--- /dev/null
+++ b/srcpkgs/imagescan/patches/boost-1.80.patch
@@ -0,0 +1,15 @@
+_1 should be looked up via ADL, don't know
+--- a/utsushi/functional.hpp
++++ b/utsushi/functional.hpp
+@@ -59,6 +59,11 @@ using NAMESPACE::function;
+ using NAMESPACE::ref;
+ using NAMESPACE::reference_wrapper;
+
++#if __cplusplus >= 201103L && !WITH_INCLUDED_BOOST
++using std::placeholders::_1;
++using std::placeholders::_2;
++#endif
++
+ } // namespace utsushi
+
+ #undef NAMESPACE
diff --git a/srcpkgs/imagescan/patches/sane.patch b/srcpkgs/imagescan/patches/sane.patch
new file mode 100644
index 000000000000..58e220ba786d
--- /dev/null
+++ b/srcpkgs/imagescan/patches/sane.patch
@@ -0,0 +1,11 @@
+--- a/sane/version.hpp
++++ b/sane/version.hpp
+@@ -37,7 +37,7 @@ extern "C" { // neede
+ #include <sane/sane.h>
+ }
+
+-#if !((SANE_MAJOR == SANE_CURRENT_MAJOR) && (SANE_MINOR == 0))
++#if !((SANE_MAJOR == SANE_CURRENT_MAJOR) && (SANE_CURRENT_MINOR == 0))
+ #error "SANE installation violates versioning portability constraints."
+ #endif
+
diff --git a/srcpkgs/imagescan/template b/srcpkgs/imagescan/template
index a12adfe05713..152ef2f83b33 100644
--- a/srcpkgs/imagescan/template
+++ b/srcpkgs/imagescan/template
@@ -1,7 +1,7 @@
# Template file for 'imagescan'
pkgname=imagescan
version=3.65.0
-revision=1
+revision=2
wrksrc=utsushi-0.65.0
build_style=gnu-configure
configure_args="--libexecdir=/usr/lib --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
From 1b7c6347908f6c39f736a6d917fe300b3edef8b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:34 +0700
Subject: [PATCH 036/107] inkscape: rebuild for boost-1.80
---
srcpkgs/inkscape/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/inkscape/template b/srcpkgs/inkscape/template
index 4d902e663f73..c77236be6848 100644
--- a/srcpkgs/inkscape/template
+++ b/srcpkgs/inkscape/template
@@ -1,7 +1,7 @@
# Template file for 'inkscape'
pkgname=inkscape
version=1.1.1
-revision=4
+revision=5
wrksrc="inkscape-${version}_2021-09-20_3bf5ae0d25"
build_style=cmake
# builds executables then runs checks
From f50a4851f838259b0d30bad6c840e3a7ebf19aa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:34 +0700
Subject: [PATCH 037/107] innoextract: rebuild for boost-1.80
---
srcpkgs/innoextract/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/innoextract/template b/srcpkgs/innoextract/template
index 079a8ce1350a..9b8e1e163e55 100644
--- a/srcpkgs/innoextract/template
+++ b/srcpkgs/innoextract/template
@@ -1,7 +1,7 @@
# Template file for 'innoextract'
pkgname=innoextract
version=1.9
-revision=1
+revision=2
build_style=cmake
configure_args="-DCMAKE_INSTALL_PREFIX=/usr"
hostmakedepends="boost extra-cmake-modules"
From 10321199354168990d125318a5f39699ed2e6baa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:34 +0700
Subject: [PATCH 038/107] juCi++: rebuild for boost-1.80
---
srcpkgs/juCi++/template | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index 1a7604b44a00..6f3474154e27 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -1,7 +1,7 @@
# Template file for 'juCi++'
pkgname=juCi++
version=1.6.2
-revision=2
+revision=3
_libclangmm_commit="b342f4dd6de4fe509a692a4b4fcfc7e24aae9590"
_tiny_commit="c9c8bf810ddad8cd17882b9a9ee628a690e779f5"
wrksrc="jucipp-v${version}"
@@ -27,7 +27,9 @@ esac
post_extract() {
mv ${wrksrc}/../libclangmm-${_libclangmm_commit}/* ${wrksrc}/lib/libclangmm/
+ rm -rf ${wrksrc}/../libclangmm-${_libclangmm_commit}
mv ${wrksrc}/../tiny-process-library-${_tiny_commit}/* ${wrksrc}/lib/tiny-process-library
+ rm -rf ${wrksrc}/../tiny-process-library-${_tiny_commit}/*
}
post_install() {
From ebda818ecdee93ef438a3479f9cc059f37b96375 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:35 +0700
Subject: [PATCH 039/107] kea: rebuild for boost-1.80
---
srcpkgs/kea/patches/std.patch | 12 ++++++++++++
srcpkgs/kea/template | 2 +-
2 files changed, 13 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/kea/patches/std.patch
diff --git a/srcpkgs/kea/patches/std.patch b/srcpkgs/kea/patches/std.patch
new file mode 100644
index 000000000000..a8ccafef6bb9
--- /dev/null
+++ b/srcpkgs/kea/patches/std.patch
@@ -0,0 +1,12 @@
+--- a/src/lib/dhcpsrv/timer_mgr.cc
++++ b/src/lib/dhcpsrv/timer_mgr.cc
+@@ -14,7 +14,9 @@
+
+ #include <boost/scoped_ptr.hpp>
+
++#include <map>
+ #include <functional>
++#include <string>
+ #include <utility>
+
+ using namespace isc;
diff --git a/srcpkgs/kea/template b/srcpkgs/kea/template
index dc0bcc5de3fc..a55b58691de9 100644
--- a/srcpkgs/kea/template
+++ b/srcpkgs/kea/template
@@ -1,7 +1,7 @@
# Template file for 'kea'
pkgname=kea
version=1.9.5
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--enable-generate-docs --with-openssl=${XBPS_CROSS_BASE}/usr
$(vopt_if mysql --with-mysql)
From 7930ad5a93b1bbf32639ee4221a75d4e527d747f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:35 +0700
Subject: [PATCH 040/107] kig: rebuild for boost-1.80
---
srcpkgs/kig/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kig/template b/srcpkgs/kig/template
index 591db4bd477c..748c09f99e59 100644
--- a/srcpkgs/kig/template
+++ b/srcpkgs/kig/template
@@ -1,7 +1,7 @@
# Template file for 'kig'
pkgname=kig
version=22.04.3
-revision=1
+revision=2
build_style=cmake
hostmakedepends="extra-cmake-modules kcoreaddons kdoctools gettext
pkg-config qt5-host-tools qt5-qmake"
From 751b370f3c5990ae7f24b6e6a57733eedd9f0489 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:35 +0700
Subject: [PATCH 041/107] leatherman: rebuild for boost-1.80
---
.../leatherman/patches/reduce-vendor.patch | 128 ++++++++++++++++++
srcpkgs/leatherman/template | 7 +-
2 files changed, 134 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/leatherman/patches/reduce-vendor.patch
diff --git a/srcpkgs/leatherman/patches/reduce-vendor.patch b/srcpkgs/leatherman/patches/reduce-vendor.patch
new file mode 100644
index 000000000000..4d4dfe525e51
--- /dev/null
+++ b/srcpkgs/leatherman/patches/reduce-vendor.patch
@@ -0,0 +1,128 @@
+Still vendor rapidjson, facter depends on older API
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -66,11 +66,10 @@ file(GLOB_RECURSE ALL_LEATHERMAN_SOURCES
+ add_subdirectory(locales)
+
+ add_leatherman_dir(catch EXCLUDE_FROM_VARS)
+-add_leatherman_dir(nowide)
+ add_leatherman_dir(util)
+ add_leatherman_dir(locale)
+ add_leatherman_dir(logging)
+ add_leatherman_dir(rapidjson)
+ add_leatherman_dir(json_container)
+ add_leatherman_dir(file_util)
+ add_leatherman_dir(curl)
+--- a/util/CMakeLists.txt
++++ b/util/CMakeLists.txt
+@@ -1,10 +1,8 @@
+-find_package(Boost 1.54 REQUIRED date_time chrono system)
++find_package(Boost 1.54 REQUIRED date_time chrono system nowide)
+
+ add_leatherman_deps(${Boost_LIBRARIES})
+ add_leatherman_includes("${Boost_INCLUDE_DIRS}")
+
+-leatherman_dependency(nowide)
+-
+ if(WIN32)
+ set(PLATFORM_SRCS "src/windows/time.cc" "src/windows/environment.cc" "src/windows/scoped_handle.cc")
+ set(PLATFORM_TESTS "tests/windows/environment.cc")
+--- a/json_container/CMakeLists.txt
++++ b/json_container/CMakeLists.txt
+@@ -1,11 +1,11 @@
+-find_package(Boost 1.54 REQUIRED COMPONENTS regex)
++find_package(Boost 1.54 REQUIRED COMPONENTS regex nowide)
+
+ add_leatherman_deps("${Boost_LIBRARIES}")
+ add_leatherman_includes("${Boost_INCLUDE_DIRS}")
+
+ leatherman_dependency(rapidjson)
+ leatherman_dependency(locale)
+
+ add_leatherman_library("src/json_container.cc")
+ add_leatherman_headers("inc/leatherman")
+-add_leatherman_test("tests/json_container_test.cc")
+\ No newline at end of file
++add_leatherman_test("tests/json_container_test.cc")
+--- a/logging/CMakeLists.txt
++++ b/logging/CMakeLists.txt
+@@ -1,10 +1,10 @@
+-find_package(Boost 1.54 REQUIRED COMPONENTS log log_setup thread date_time filesystem system chrono regex)
++find_package(Boost 1.54 REQUIRED COMPONENTS log log_setup thread date_time
++ filesystem system chrono regex nowide)
+ find_package(Threads)
+
+ add_leatherman_deps(${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+ add_leatherman_includes("${Boost_INCLUDE_DIRS}")
+
+-leatherman_dependency(nowide)
+ leatherman_dependency(locale)
+
+ if (CMAKE_SYSTEM_NAME MATCHES "Linux" OR CMAKE_SYSTEM_NAME MATCHES "SunOS")
+--- a/execution/CMakeLists.txt
++++ b/execution/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system)
++find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system nowide)
+
+ add_leatherman_deps("${Boost_LIBRARIES}")
+ if ("${CMAKE_SYSTEM_NAME}" MATCHES "SunOS")
+@@ -10,7 +10,6 @@ endif()
+ add_leatherman_includes("${Boost_INCLUDE_DIRS}")
+
+ leatherman_dependency(util)
+-leatherman_dependency(nowide)
+ leatherman_dependency(locale)
+ leatherman_dependency(logging)
+ leatherman_dependency(file_util)
+--- a/file_util/CMakeLists.txt
++++ b/file_util/CMakeLists.txt
+@@ -1,9 +1,8 @@
+-find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system)
++find_package(Boost 1.54 REQUIRED COMPONENTS regex filesystem system nowide)
+
+ add_leatherman_deps("${Boost_LIBRARIES}")
+ add_leatherman_includes("${Boost_INCLUDE_DIRS}")
+
+-leatherman_dependency(nowide)
+ leatherman_dependency(locale)
+ leatherman_dependency(logging)
+ leatherman_dependency(util)
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -1,4 +1,5 @@
+-set(BOOST_REQUIRED_COMPONENTS system date_time chrono log log_setup thread filesystem regex)
++set(BOOST_REQUIRED_COMPONENTS system date_time chrono log log_setup thread
++ filesystem regex nowide)
+ if (LEATHERMAN_USE_LOCALES)
+ set(BOOST_REQUIRED_COMPONENTS ${BOOST_REQUIRED_COMPONENTS} locale)
+ endif()
+--- a/file_util/src/file.cc
++++ b/file_util/src/file.cc
+@@ -1,6 +1,6 @@
+ #include <leatherman/file_util/file.hpp>
+ #include <boost/nowide/fstream.hpp>
+-#include <boost/nowide/cenv.hpp>
++#include <boost/nowide/cstdlib.hpp>
+ #include <boost/filesystem.hpp>
+ #include <sstream>
+ #include <leatherman/logging/logging.hpp>
+--- a/util/src/environment.cc
++++ b/util/src/environment.cc
+@@ -1,5 +1,5 @@
+ #include <leatherman/util/environment.hpp>
+-#include <boost/nowide/cenv.hpp>
++#include <boost/nowide/cstdlib.hpp>
+ #include <stdexcept>
+
+ using namespace std;
+--- a/util/tests/environment.cc
++++ b/util/tests/environment.cc
+@@ -1,6 +1,6 @@
+ #include <catch.hpp>
+ #include <leatherman/util/environment.hpp>
+-#include <boost/nowide/cenv.hpp>
++#include <boost/nowide/cstdlib.hpp>
+
+ using namespace std;
+ using namespace leatherman::util;
diff --git a/srcpkgs/leatherman/template b/srcpkgs/leatherman/template
index b61fcd5dc205..3f9d08752dd2 100644
--- a/srcpkgs/leatherman/template
+++ b/srcpkgs/leatherman/template
@@ -1,7 +1,7 @@
# Template file for 'leatherman'
pkgname=leatherman
version=1.12.4
-revision=1
+revision=2
build_style=cmake
configure_args="-DLEATHERMAN_SHARED=ON"
hostmakedepends="pkg-config python3"
@@ -16,6 +16,11 @@ python_version=3
CXXFLAGS="-Wno-ignored-qualifiers -Wno-class-memaccess -Wno-catch-value -Wno-deprecated-copy -Wno-type-limits"
+do_check() {
+ cd build
+ ctest -V
+}
+
leatherman-devel_package() {
short_desc+=" - development files"
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
From 16907d043f53ba87582106132b7ce2ddc2da327d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:35 +0700
Subject: [PATCH 042/107] ledger: rebuild for boost-1.80
---
srcpkgs/ledger/patches/boost-1.80.patch | 30 +++++++++++++++++++++++++
srcpkgs/ledger/template | 2 +-
2 files changed, 31 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/ledger/patches/boost-1.80.patch
diff --git a/srcpkgs/ledger/patches/boost-1.80.patch b/srcpkgs/ledger/patches/boost-1.80.patch
new file mode 100644
index 000000000000..b59161388490
--- /dev/null
+++ b/srcpkgs/ledger/patches/boost-1.80.patch
@@ -0,0 +1,30 @@
+--- a/src/system.hh.in
++++ b/src/system.hh.in
+@@ -134,7 +134,7 @@
+
+ #include <boost/algorithm/string.hpp>
+ #include <boost/any.hpp>
+-#include <boost/bind.hpp>
++#include <boost/bind/bind.hpp>
+ #include <boost/cast.hpp>
+ #include <boost/current_function.hpp>
+
+@@ -184,6 +184,8 @@
+ #include <boost/regex.hpp>
+ #endif // HAVE_BOOST_REGEX_UNICODE
+
++#include <boost/scoped_ptr.hpp>
++
+ #include <boost/tokenizer.hpp>
+
+ #include <boost/tuple/tuple.hpp>
+--- a/src/utils.h
++++ b/src/utils.h
+@@ -81,6 +81,7 @@
+
+ namespace ledger {
+ using namespace boost;
++ using namespace boost::placeholders;
+
+ typedef std::string string;
+ typedef std::list<string> strings_list;
diff --git a/srcpkgs/ledger/template b/srcpkgs/ledger/template
index c94b72709dea..130c727e7768 100644
--- a/srcpkgs/ledger/template
+++ b/srcpkgs/ledger/template
@@ -1,7 +1,7 @@
# Template file for 'ledger'
pkgname=ledger
version=3.2.1
-revision=1
+revision=2
build_style=cmake
makedepends="boost-devel gmp-devel mpfr-devel gettext-devel libedit-devel"
short_desc="Double-entry accounting system with a command-line reporting interface"
From 97d4630c5b937c63301f8dbf166c72ad81f73408 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:36 +0700
Subject: [PATCH 043/107] libbitcoin-blockchain: rebuild for boost-1.80
---
srcpkgs/libbitcoin-blockchain/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index e43ab8b9ede1..09a126e75356 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-blockchain'
pkgname=libbitcoin-blockchain
version=3.6.0
-revision=6
+revision=7
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
From 9b4a83cb1fffa91714dd4abdbff5dd8d98008afa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:36 +0700
Subject: [PATCH 044/107] libbitcoin-client: rebuild for boost-1.80
---
srcpkgs/libbitcoin-client/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index 17849cd906d0..35f17b74ae00 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-client'
pkgname=libbitcoin-client
version=3.6.0
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"
From 73a714b943bf7f80fb83177d7a07bed389924eee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:36 +0700
Subject: [PATCH 045/107] libbitcoin-database: rebuild for boost-1.80
---
srcpkgs/libbitcoin-database/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index a3c48226ba2d..13cec4fdc3dd 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-database'
pkgname=libbitcoin-database
version=3.6.0
-revision=6
+revision=7
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
From bc9a3eb67ac9a88ef910cc3fe3e277897b63960f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:36 +0700
Subject: [PATCH 046/107] libbitcoin-explorer: rebuild for boost-1.80
---
srcpkgs/libbitcoin-explorer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index a1929f350269..7a5f8368b271 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-explorer'
pkgname=libbitcoin-explorer
version=3.6.0
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
From d0c6354278142a934aafcaf011e3b792f1760db8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:36 +0700
Subject: [PATCH 047/107] libbitcoin-network: rebuild for boost-1.80
---
.../patches/boost-1.80.patch | 76 +++++++++++++++++++
srcpkgs/libbitcoin-network/template | 2 +-
2 files changed, 77 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/libbitcoin-network/patches/boost-1.80.patch
diff --git a/srcpkgs/libbitcoin-network/patches/boost-1.80.patch b/srcpkgs/libbitcoin-network/patches/boost-1.80.patch
new file mode 100644
index 000000000000..fb59ac61723d
--- /dev/null
+++ b/srcpkgs/libbitcoin-network/patches/boost-1.80.patch
@@ -0,0 +1,76 @@
+--- a/src/channel.cpp
++++ b/src/channel.cpp
+@@ -147,7 +147,7 @@ void channel::handle_expiration(const co
+ LOG_DEBUG(LOG_NETWORK)
+ << "Channel lifetime expired [" << authority() << "]";
+
+- stop(error::channel_timeout);
++ stop(error::make_error_code(error::channel_timeout));
+ }
+
+ void channel::start_inactivity()
+@@ -168,7 +168,7 @@ void channel::handle_inactivity(const co
+ LOG_DEBUG(LOG_NETWORK)
+ << "Channel inactivity timeout [" << authority() << "]";
+
+- stop(error::channel_timeout);
++ stop(error::make_error_code(error::channel_timeout));
+ }
+
+ } // namespace network
+--- a/src/proxy.cpp
++++ b/src/proxy.cpp
+@@ -150,7 +150,7 @@ void proxy::handle_read_heading(const bo
+ {
+ LOG_WARNING(LOG_NETWORK)
+ << "Invalid heading from [" << authority() << "]";
+- stop(error::bad_stream);
++ stop(error::make_error_code(error::bad_stream));
+ return;
+ }
+
+@@ -160,7 +160,7 @@ void proxy::handle_read_heading(const bo
+ LOG_DEBUG(LOG_NETWORK)
+ << "Invalid heading magic (" << head.magic() << ") from ["
+ << authority() << "]";
+- stop(error::bad_stream);
++ stop(error::make_error_code(error::bad_stream));
+ return;
+ }
+
+@@ -170,7 +170,7 @@ void proxy::handle_read_heading(const bo
+ << "Oversized payload indicated by " << head.command()
+ << " heading from [" << authority() << "] ("
+ << head.payload_size() << " bytes)";
+- stop(error::bad_stream);
++ stop(error::make_error_code(error::bad_stream));
+ return;
+ }
+
+@@ -212,7 +212,7 @@ void proxy::handle_read_payload(const bo
+ LOG_WARNING(LOG_NETWORK)
+ << "Invalid " << head.command() << " payload from [" << authority()
+ << "] bad checksum.";
+- stop(error::bad_stream);
++ stop(error::make_error_code(error::bad_stream));
+ return;
+ }
+
+@@ -250,7 +250,7 @@ void proxy::handle_read_payload(const bo
+ LOG_WARNING(LOG_NETWORK)
+ << "Invalid " << head.command() << " payload from [" << authority()
+ << "] trailing bytes.";
+- stop(error::bad_stream);
++ stop(make_error_code(error::bad_stream));
+ return;
+ }
+
+@@ -333,7 +333,7 @@ void proxy::stop(const code& ec)
+
+ void proxy::stop(const boost_code& ec)
+ {
+- stop(error::boost_to_error_code(ec));
++ stop(error::make_error_code(error::boost_to_error_code(ec)));
+ }
+
+ bool proxy::stopped() const
diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index d130facc40de..4f730a814242 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-network'
pkgname=libbitcoin-network
version=3.6.0
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
From 4be725accdd44e6c8846ba41d880c1c522850f53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:37 +0700
Subject: [PATCH 048/107] libbitcoin-node: rebuild for boost-1.80
---
srcpkgs/libbitcoin-node/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 23e32624b5cc..ead87310627b 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-node'
pkgname=libbitcoin-node
version=3.6.0
-revision=6
+revision=7
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
From 0e8cd386d4a9ba94b619c021bd7885943d85b7f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:37 +0700
Subject: [PATCH 049/107] libbitcoin-protocol: rebuild for boost-1.80
---
srcpkgs/libbitcoin-protocol/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 838d62cc9ecd..53e2e6520f6a 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-protocol'
pkgname=libbitcoin-protocol
version=3.6.0
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
From 703f6747a3e92f5abd9e67d288f8e6a2da2a660d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:37 +0700
Subject: [PATCH 050/107] libbitcoin-server: rebuild for boost-1.80
---
srcpkgs/libbitcoin-server/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index fc4988deac2b..70d4c492c5bb 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-server'
pkgname=libbitcoin-server
version=3.6.0
-revision=6
+revision=7
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
From a694eea7e0248483e2cd5200ad880e8e9be20bf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:37 +0700
Subject: [PATCH 051/107] libbitcoin-system: rebuild for boost-1.80
---
.../patches/boost-1.80.patch | 79 +++++++++++++++++++
srcpkgs/libbitcoin-system/template | 2 +-
2 files changed, 80 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/libbitcoin-system/patches/boost-1.80.patch
diff --git a/srcpkgs/libbitcoin-system/patches/boost-1.80.patch b/srcpkgs/libbitcoin-system/patches/boost-1.80.patch
new file mode 100644
index 000000000000..2d44e24ea5ab
--- /dev/null
+++ b/srcpkgs/libbitcoin-system/patches/boost-1.80.patch
@@ -0,0 +1,79 @@
+--- 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 <string>
+-#include <boost/interprocess/detail/config_begin.hpp>
+-#include <boost/interprocess/detail/workaround.hpp>
++#include <boost/date_time/posix_time/posix_time_types.hpp>
+ #include <boost/interprocess/exceptions.hpp>
+-#include <boost/interprocess/detail/os_file_functions.hpp>
+-#include <boost/interprocess/detail/os_thread_functions.hpp>
+-#include <boost/interprocess/detail/posix_time_types_wrk.hpp>
+-#include <boost/interprocess/sync/detail/common_algorithms.hpp>
+-#include <boost/interprocess/sync/detail/locks.hpp>
++#include <boost/interprocess/file_mapping.hpp>
++#include <boost/interprocess/sync/interprocess_mutex.hpp>
++#include <boost/interprocess/sync/file_lock.hpp>
+ #include <boost/move/move.hpp>
+
+ // Includes <windows.h> from bitcoin/unicode.hpp under _MSC_VER.
diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index 8b03fb248c42..8e6790c3ba66 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-system'
pkgname=libbitcoin-system
version=3.6.0
-revision=6
+revision=7
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
From 5f7543adcc1cf5049b57890e479fe8e9beed5e61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:38 +0700
Subject: [PATCH 052/107] libcmis: rebuild for boost-1.80
---
srcpkgs/libcmis/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libcmis/template b/srcpkgs/libcmis/template
index fac133d5e4d9..43dd0a856122 100644
--- a/srcpkgs/libcmis/template
+++ b/srcpkgs/libcmis/template
@@ -1,7 +1,7 @@
# Template file for 'libcmis'
pkgname=libcmis
version=0.5.2
-revision=4
+revision=5
build_style=gnu-configure
configure_args="DOCBOOK2MAN=docbook2man --disable-werror"
hostmakedepends="pkg-config docbook2x"
From 13c0879eeb2d740a2dc90f78fa80e4c3e029e798 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:38 +0700
Subject: [PATCH 053/107] libime: rebuild for boost-1.80
---
srcpkgs/libime/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libime/template b/srcpkgs/libime/template
index a37db9885a48..363bdd93b16d 100644
--- a/srcpkgs/libime/template
+++ b/srcpkgs/libime/template
@@ -1,7 +1,7 @@
# Template file for 'libime'
pkgname=libime
version=1.0.13
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config gettext extra-cmake-modules python3"
From af7ce38a05b34ed9fdaa3c22e30968d28de642c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:38 +0700
Subject: [PATCH 054/107] libime-jyutping: rebuild for boost-1.80
---
srcpkgs/libime-jyutping/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libime-jyutping/template b/srcpkgs/libime-jyutping/template
index 3c33940ca368..6ae0855c3d7a 100644
--- a/srcpkgs/libime-jyutping/template
+++ b/srcpkgs/libime-jyutping/template
@@ -1,7 +1,7 @@
# Template file for 'libime-jyutping'
pkgname=libime-jyutping
version=1.0.4
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="pkg-config gettext extra-cmake-modules python3 libime-utils"
From f85915972f04c97acdf41d2d4b05d88265d64738 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:38 +0700
Subject: [PATCH 055/107] libixion: rebuild for boost-1.80
---
srcpkgs/libixion/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libixion/template b/srcpkgs/libixion/template
index 37298a8b9427..ef1a00100f53 100644
--- a/srcpkgs/libixion/template
+++ b/srcpkgs/libixion/template
@@ -1,7 +1,7 @@
# Template file for 'libixion'
pkgname=libixion
version=0.17.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config python3"
makedepends="boost-devel fmt-devel mdds python3-devel spdlog"
From 69463921f594c9960b0f85e21bb8a4abeeacd45e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:38 +0700
Subject: [PATCH 056/107] liborcus: rebuild for boost-1.80
---
srcpkgs/liborcus/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/liborcus/template b/srcpkgs/liborcus/template
index cf4b938fe37a..7b6b21a26dca 100644
--- a/srcpkgs/liborcus/template
+++ b/srcpkgs/liborcus/template
@@ -1,7 +1,7 @@
# Template file for 'liborcus'
pkgname=liborcus
version=0.17.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config python3"
makedepends="boost-devel mdds libixion-devel python3-devel zlib-devel"
From 8018331490e178a8c26f83e0510e66401d93304c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:39 +0700
Subject: [PATCH 057/107] libphonenumber: rebuild for boost-1.80
---
srcpkgs/libphonenumber/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libphonenumber/template b/srcpkgs/libphonenumber/template
index 9bef2825781c..05f28c4f5579 100644
--- a/srcpkgs/libphonenumber/template
+++ b/srcpkgs/libphonenumber/template
@@ -1,7 +1,7 @@
# Template file for 'libphonenumber'
pkgname=libphonenumber
version=8.12.39
-revision=6
+revision=7
build_wrksrc=cpp
build_style=cmake
build_helper=qemu
From 5ce8a62e15b5b249991969563ee035edaa3f0045 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:39 +0700
Subject: [PATCH 058/107] librime: rebuild for boost-1.80
---
srcpkgs/librime/patches/boost-1.76.patch | 111 +++++++++++++++++++++++
srcpkgs/librime/template | 2 +-
2 files changed, 112 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/librime/patches/boost-1.76.patch
diff --git a/srcpkgs/librime/patches/boost-1.76.patch b/srcpkgs/librime/patches/boost-1.76.patch
new file mode 100644
index 000000000000..9c8d75aa5161
--- /dev/null
+++ b/srcpkgs/librime/patches/boost-1.76.patch
@@ -0,0 +1,111 @@
+From 57cffcd02ac70148e21ce982be834876b3df87db Mon Sep 17 00:00:00 2001
+From: HanatoK <summersnow9403@gmail.com>
+Date: Sat, 1 May 2021 01:04:38 -0500
+Subject: [PATCH] Fix FTBFS.
+
+Previous boost library (1.75) may implicitly include cmath, but the
+latest version (1.76) does not, so the calls to exp are undefined. This
+commit include cmath in script_translator.cc and table_translator.cc to
+fix the issue (#462).
+---
+ src/rime/gear/script_translator.cc | 1 +
+ src/rime/gear/table_translator.cc | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/rime/gear/script_translator.cc b/src/rime/gear/script_translator.cc
+index 4a45f05e6..250616593 100644
+--- a/src/rime/gear/script_translator.cc
++++ b/src/rime/gear/script_translator.cc
+@@ -8,6 +8,7 @@
+ //
+ #include <algorithm>
+ #include <stack>
++#include <cmath>
+ #include <boost/algorithm/string/join.hpp>
+ #include <boost/range/adaptor/reversed.hpp>
+ #include <rime/composition.h>
+diff --git a/src/rime/gear/table_translator.cc b/src/rime/gear/table_translator.cc
+index 162ac0244..c95e5e24b 100644
+--- a/src/rime/gear/table_translator.cc
++++ b/src/rime/gear/table_translator.cc
+@@ -6,6 +6,7 @@
+ //
+ #include <boost/algorithm/string.hpp>
+ #include <boost/range/adaptor/reversed.hpp>
++#include <cmath>
+ #include <utf8.h>
+ #include <rime/candidate.h>
+ #include <rime/common.h>
+From bc589fd45eca349b7ca408f9b85a85474745abb0 Mon Sep 17 00:00:00 2001
+From: Chen Gong <chen.sst@gmail.com>
+Date: Sun, 16 Jan 2022 01:06:29 +0800
+Subject: [PATCH] fix: qualify std::exp after including <cmath>
+
+As noted in #462, including <cmath> only guarantees that std::exp is
+declared, so calling exp(double) unqualified is not portable.
+
+Squashed commit with a style change to the original PR:
+
+commit 8b9d48c0340f3fb82de59a6f7ec71ddfd86a602f
+Author: Chen Gong <chen.sst@gmail.com>
+Date: Sun Jan 16 00:49:47 2022 +0800
+
+commit df4fe3ea11e0222426b98e489db36d32856b3361
+Author: Jonathan Wakely <jwakely@redhat.com>
+Date: Tue Aug 10 10:18:38 2021 +0100
+
+Closes #476
+---
+ src/rime/gear/script_translator.cc | 12 ++++++------
+ src/rime/gear/table_translator.cc | 8 ++++----
+ 2 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/src/rime/gear/script_translator.cc b/src/rime/gear/script_translator.cc
+index 250616593..e220aed9c 100644
+--- a/src/rime/gear/script_translator.cc
++++ b/src/rime/gear/script_translator.cc
+@@ -488,9 +488,9 @@ void ScriptTranslation::PrepareCandidate() {
+ start_,
+ start_ + user_phrase_code_length,
+ entry);
+- cand->set_quality(exp(entry->weight) +
+- translator_->initial_quality() +
+- (IsNormalSpelling() ? 0.5 : -0.5));
++ cand->set_quality(std::exp(entry->weight) +
++ translator_->initial_quality() +
++ (IsNormalSpelling() ? 0.5 : -0.5));
+ }
+ else if (phrase_code_length > 0) {
+ DictEntryIterator& iter = phrase_iter_->second;
+@@ -502,9 +502,9 @@ void ScriptTranslation::PrepareCandidate() {
+ start_,
+ start_ + phrase_code_length,
+ entry);
+- cand->set_quality(exp(entry->weight) +
+- translator_->initial_quality() +
+- (IsNormalSpelling() ? 0 : -1));
++ cand->set_quality(std::exp(entry->weight) +
++ translator_->initial_quality() +
++ (IsNormalSpelling() ? 0 : -1));
+ }
+ candidate_ = cand;
+ }
+diff --git a/src/rime/gear/table_translator.cc b/src/rime/gear/table_translator.cc
+index c95e5e24b..97cfc96e5 100644
+--- a/src/rime/gear/table_translator.cc
++++ b/src/rime/gear/table_translator.cc
+@@ -81,10 +81,10 @@ an<Candidate> TableTranslation::Peek() {
+ if (phrase) {
+ phrase->set_comment(comment);
+ phrase->set_preedit(preedit_);
+- phrase->set_quality(exp(e->weight) +
+- options_->initial_quality() +
+- (incomplete ? -1 : 0) +
+- (is_user_phrase ? 0.5 : 0));
++ phrase->set_quality(std::exp(e->weight) +
++ options_->initial_quality() +
++ (incomplete ? -1 : 0) +
++ (is_user_phrase ? 0.5 : 0));
+ }
+ return phrase;
+ }
diff --git a/srcpkgs/librime/template b/srcpkgs/librime/template
index 5f734c200bd7..7110eeffd3f9 100644
--- a/srcpkgs/librime/template
+++ b/srcpkgs/librime/template
@@ -1,7 +1,7 @@
# Template file for 'librime'
pkgname=librime
version=1.7.3
-revision=3
+revision=4
build_style=cmake
configure_args="-DCMAKE_BUILD_TYPE=None -DENABLE_LOGGING=OFF -DBUILD_TEST=ON
-DCAPNP_EXECUTABLE=/usr/bin/capnp -DCAPNPC_CXX_EXECUTABLE=/usr/bin/capnpc-c++"
From 44ab6f81989385637cce1208f92e872c08a6e6ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:39 +0700
Subject: [PATCH 059/107] libtorrent-rasterbar: rebuild for boost-1.80
---
srcpkgs/libtorrent-rasterbar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index b1ceddc95282..5aceddec5646 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -2,7 +2,7 @@
# Breaks ABI/API without changing soname, revbump all dependants
pkgname=libtorrent-rasterbar
version=1.2.14
-revision=2
+revision=3
build_style=cmake
configure_args="-DCMAKE_CXX_STANDARD=11 -Dbuild_examples=ON -Dbuild_tools=ON
-Dpython-bindings=ON"
From 1b1125cdd0a82019b92c118d45fbe8efb68d213d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:40 +0700
Subject: [PATCH 060/107] linssid: rebuild for boost-1.80
---
srcpkgs/linssid/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/linssid/template b/srcpkgs/linssid/template
index 937c8a0745e0..09206656186e 100644
--- a/srcpkgs/linssid/template
+++ b/srcpkgs/linssid/template
@@ -1,7 +1,7 @@
# Template file for 'linssid'
pkgname=linssid
version=3.6
-revision=4
+revision=5
build_style=qmake
hostmakedepends="qt5-qmake qt5-host-tools"
makedepends="boost-devel qwt-devel"
From c3cf62538331454aab0baae465f45d7c79fd02ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:40 +0700
Subject: [PATCH 061/107] litecoin: rebuild for boost-1.80
---
srcpkgs/litecoin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/litecoin/template b/srcpkgs/litecoin/template
index 3c33d9b0eb8a..7a188c3c9af8 100644
--- a/srcpkgs/litecoin/template
+++ b/srcpkgs/litecoin/template
@@ -1,7 +1,7 @@
# Template file for 'litecoin'
pkgname=litecoin
version=0.18.1
-revision=7
+revision=8
build_style=gnu-configure
configure_args="--with-incompatible-bdb --with-gui=qt5 --disable-static
--disable-tests --with-openssl"
From fe8ad0c7bd25abae7b57b60f3db5781eb962445c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:40 +0700
Subject: [PATCH 062/107] monero: rebuild for boost-1.80
---
srcpkgs/monero/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero/template b/srcpkgs/monero/template
index bff62347ebd6..eebce3d0a551 100644
--- a/srcpkgs/monero/template
+++ b/srcpkgs/monero/template
@@ -1,7 +1,7 @@
# Template file for 'monero'
pkgname=monero
version=0.17.2.3
-revision=2
+revision=3
_randomx_version="1.1.9"
# the revision monero uses as a submodule for the specific version
_rapidjson_gitrev="129d19ba7f496df5e33658527a7158c79b99c21c"
From f8eff0549426fffd24b36781a867fd55a82113fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:40 +0700
Subject: [PATCH 063/107] monero-gui: rebuild for boost-1.80
---
srcpkgs/monero-gui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/monero-gui/template b/srcpkgs/monero-gui/template
index 67ed3273defa..61e5dd9da1b7 100644
--- a/srcpkgs/monero-gui/template
+++ b/srcpkgs/monero-gui/template
@@ -1,7 +1,7 @@
# Template file for 'monero-gui'
pkgname=monero-gui
version=0.17.2.3
-revision=1
+revision=2
_monero_version=0.17.2.3
_randomx_version="1.1.9"
# the revision monero uses as a submodule for the specific version
From eedf5b3c426c8843607406fa9ff905ca2121b141 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:40 +0700
Subject: [PATCH 064/107] mupen64plus: rebuild for boost-1.80
---
srcpkgs/mupen64plus/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mupen64plus/template b/srcpkgs/mupen64plus/template
index 4984a7f4a777..f4a58a4749cb 100644
--- a/srcpkgs/mupen64plus/template
+++ b/srcpkgs/mupen64plus/template
@@ -1,7 +1,7 @@
# Template file for 'mupen64plus'
pkgname=mupen64plus
version=2.5.9
-revision=1
+revision=2
archs="x86_64* i686*"
wrksrc="mupen64plus-bundle-src-${version}"
hostmakedepends="pkg-config which nasm"
From 589fda1ccb146ab0f9600ea44c933d84c0a85cf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:41 +0700
Subject: [PATCH 065/107] musikcube: rebuild for boost-1.80
---
srcpkgs/musikcube/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/musikcube/template b/srcpkgs/musikcube/template
index 2b75cbd976ea..11a3df3dc0aa 100644
--- a/srcpkgs/musikcube/template
+++ b/srcpkgs/musikcube/template
@@ -1,7 +1,7 @@
# Template file for 'musikcube'
pkgname=musikcube
version=0.98.0
-revision=1
+revision=2
build_style=cmake
make_cmd=make
configure_args="-DNO_NCURSESW=1 -DENABLE_BUNDLED_TAGLIB=false"
From 10b40fd42ad890de86de2750e05ac0acebf39f89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:41 +0700
Subject: [PATCH 066/107] namecoin: rebuild for boost-1.80
---
srcpkgs/namecoin/patches/boost-1.80.patch | 57 +++++++++++++++++++++++
srcpkgs/namecoin/template | 4 +-
2 files changed, 60 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/namecoin/patches/boost-1.80.patch
diff --git a/srcpkgs/namecoin/patches/boost-1.80.patch b/srcpkgs/namecoin/patches/boost-1.80.patch
new file mode 100644
index 000000000000..5a250af68487
--- /dev/null
+++ b/srcpkgs/namecoin/patches/boost-1.80.patch
@@ -0,0 +1,57 @@
+--- a/src/names/main.cpp
++++ b/src/names/main.cpp
+@@ -365,12 +365,14 @@ ConflictTrackerNotifyEntryRemoved (CName
+ CNameConflictTracker::CNameConflictTracker (CTxMemPool &p)
+ : txNameConflicts(std::make_shared<std::vector<CTransactionRef>>()), pool(p)
+ {
++ using namespace boost::placeholders;
+ pool.NotifyEntryRemoved.connect (
+ boost::bind (&ConflictTrackerNotifyEntryRemoved, this, _1, _2));
+ }
+
+ CNameConflictTracker::~CNameConflictTracker ()
+ {
++ using namespace boost::placeholders;
+ pool.NotifyEntryRemoved.disconnect (
+ boost::bind (&ConflictTrackerNotifyEntryRemoved, this, _1, _2));
+ }
+--- a/src/wallet/test/init_test_fixture.cpp
++++ b/src/wallet/test/init_test_fixture.cpp
+@@ -29,7 +29,7 @@ InitWalletDirTestingSetup::InitWalletDir
+ fs::create_directories(m_walletdir_path_cases["default"]);
+ fs::create_directories(m_walletdir_path_cases["custom"]);
+ fs::create_directories(m_walletdir_path_cases["relative"]);
+- std::ofstream f(m_walletdir_path_cases["file"].BOOST_FILESYSTEM_C_STR);
++ std::ofstream f(BOOST_FILESYSTEM_C_STR(m_walletdir_path_cases["file"]));
+ f.close();
+ }
+
+@@ -41,4 +41,4 @@ InitWalletDirTestingSetup::~InitWalletDi
+ void InitWalletDirTestingSetup::SetWalletDir(const fs::path& walletdir_path)
+ {
+ gArgs.ForceSetArg("-walletdir", walletdir_path.string());
+-}
+\ No newline at end of file
++}
+--- a/src/wallet/test/db_tests.cpp
++++ b/src/wallet/test/db_tests.cpp
+@@ -18,7 +18,7 @@ BOOST_AUTO_TEST_CASE(getwalletenv_file)
+ std::string test_name = "test_name.dat";
+ fs::path datadir = SetDataDir("tempdir");
+ fs::path file_path = datadir / test_name;
+- std::ofstream f(file_path.BOOST_FILESYSTEM_C_STR);
++ std::ofstream f(BOOST_FILESYSTEM_C_STR(file_path));
+ f.close();
+
+ std::string filename;
+--- a/src/fs.cpp
++++ b/src/fs.cpp
+@@ -206,7 +206,7 @@ void ofstream::close()
+ }
+ #else // __GLIBCXX__
+
+-static_assert(sizeof(*fs::path().BOOST_FILESYSTEM_C_STR) == sizeof(wchar_t),
++static_assert(sizeof(BOOST_FILESYSTEM_C_STR(*fs::path())) == sizeof(wchar_t),
+ "Warning: This build is using boost::filesystem ofstream and ifstream "
+ "implementations which will fail to open paths containing multibyte "
+ "characters. You should delete this static_assert to ignore this warning, "
diff --git a/srcpkgs/namecoin/template b/srcpkgs/namecoin/template
index e4cfb3777b71..710cb2c4ceb3 100644
--- a/srcpkgs/namecoin/template
+++ b/srcpkgs/namecoin/template
@@ -1,7 +1,7 @@
# Template file for 'namecoin'
pkgname=namecoin
version=0.18.1
-revision=5
+revision=6
wrksrc="${pkgname}-core-nc${version}"
build_style=gnu-configure
configure_args="--with-incompatible-bdb --disable-static
@@ -28,4 +28,6 @@ pre_configure() {
post_install() {
vlicense COPYING
+ # They don't bother to rename from bitcoin
+ rm -rf $DESTDIR/usr/share/man/man1
}
From 6f0e86f0a47a34ffeb54bd966d39dac4c9e54759 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:41 +0700
Subject: [PATCH 067/107] ncmpcpp: rebuild for boost-1.80
---
srcpkgs/ncmpcpp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 773deb4917d4..72a0d35e5e7f 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=5
+revision=6
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
--enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
From 00a7735d1c8537ea8fa96ce1654515bf1927987b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:41 +0700
Subject: [PATCH 068/107] nix: rebuild for boost-1.80
---
srcpkgs/nix/template | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/nix/template b/srcpkgs/nix/template
index bb585b6d7d54..e21c94aa2759 100644
--- a/srcpkgs/nix/template
+++ b/srcpkgs/nix/template
@@ -1,23 +1,25 @@
# Template file for 'nix'
pkgname=nix
-version=2.8.1
-revision=1
+version=2.10.3
+revision=2
build_style=gnu-configure
# Use /nix/var as suggested by the official Manual.
-configure_args="--localstatedir=/nix/var --with-sandbox-shell=/bin/sh"
-hostmakedepends="curl pkg-config flex tar xz automake autoconf-archive mdBook jq"
+configure_args="--localstatedir=/nix/var
+ --with-sandbox-shell=/usr/bin/busybox.static"
+hostmakedepends="curl pkg-config flex tar xz automake autoconf-archive mdBook jq
+ busybox-static"
makedepends="boost-devel brotli-devel bzip2-devel gc-devel libcurl-devel
liblzma-devel openssl-devel libsodium-devel sqlite-devel
libseccomp-devel editline-devel jq-devel libarchive-devel
gtest-devel lowdown-devel json-c++"
-depends="curl tar xz"
+depends="curl tar xz busybox-static"
short_desc="Purely functional package manager"
-maintainer="Juan RP <xtraeme@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://nixos.org/nix/"
changelog="https://nixos.org/releases/${pkgname}/${pkgname}-${version}/manual/#sec-relnotes"
distfiles="https://github.com/NixOS/nix/archive/refs/tags/${version}.tar.gz"
-checksum=6f19455775523fca4ae4096e6a6fc493f577198b968811f7fa77eb1fa5213b43
+checksum=5a8d79714bf04c425f41fdd22e67d4704d2e44c7a760c6c144e5767c6d662413
disable_parallel_build=yes
nocross="cross build populates /usr/lib32 with libraries and tries to link against them"
From da1acf7ad6b6057bd2883cc2ff8d829ffdc3d4bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:42 +0700
Subject: [PATCH 069/107] opencamlib: rebuild for boost-1.80
---
srcpkgs/opencamlib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/opencamlib/template b/srcpkgs/opencamlib/template
index 8722aaf9ee64..140315ef3467 100644
--- a/srcpkgs/opencamlib/template
+++ b/srcpkgs/opencamlib/template
@@ -1,7 +1,7 @@
# Template file for 'opencamlib'
pkgname=opencamlib
version=2019.07
-revision=3
+revision=4
build_style=cmake
configure_args="-DBUILD_PY_LIB=ON -DUSE_PY_3=ON -DVERSION_STRING=${version}"
hostmakedepends="python3"
From 49c1a7ac104f70645a5b7d5e52f23e29d8b29652 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:42 +0700
Subject: [PATCH 070/107] openimageio: rebuild for boost-1.80
---
srcpkgs/openimageio/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index 8abf3b05d6a3..bae68ead21e6 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -1,11 +1,11 @@
# Template file for 'openimageio'
pkgname=openimageio
version=2.2.15.1
-revision=3
+revision=4
wrksrc="oiio-Release-${version}"
build_style=cmake
configure_args="-DUSE_OPENGL=0 -DUSE_QT=0 -DUSE_PYTHON=0 -DOIIO_BUILD_TESTS=1
- -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0"
+ -DSTOP_ON_WARNING=0 -DUSE_STD_REGEX_EXITCODE=0 -DCMAKE_CXX_STANDARD=14"
hostmakedepends="pkg-config git"
makedepends="boost-devel giflib-devel libraw-devel libopenjpeg-devel libwebp-devel
libjpeg-turbo-devel tiff-devel libpng-devel libopenexr-devel freetype-devel
From 03c133a06b686cc07052e551452c9c24c94bd36c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:42 +0700
Subject: [PATCH 071/107] openmw: rebuild for boost-1.80
---
srcpkgs/openmw/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openmw/template b/srcpkgs/openmw/template
index 581e2cbb081e..9a263c9eae45 100644
--- a/srcpkgs/openmw/template
+++ b/srcpkgs/openmw/template
@@ -1,7 +1,7 @@
# Template file for 'openmw'
pkgname=openmw
version=0.47.0
-revision=1
+revision=2
wrksrc="${pkgname}-${pkgname}-${version}"
build_style=cmake
# System bullet doesn't use double precision (double precision would break vdrift)
From 048c6141dd16f9b85cbd82298681f8a03f0128e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:42 +0700
Subject: [PATCH 072/107] openscad: rebuild for boost-1.80
---
srcpkgs/openscad/patches/boost-1.80.patch | 16 ++++++++++++++++
srcpkgs/openscad/template | 2 +-
2 files changed, 17 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/openscad/patches/boost-1.80.patch
diff --git a/srcpkgs/openscad/patches/boost-1.80.patch b/srcpkgs/openscad/patches/boost-1.80.patch
new file mode 100644
index 000000000000..5ff43f54c700
--- /dev/null
+++ b/srcpkgs/openscad/patches/boost-1.80.patch
@@ -0,0 +1,16 @@
+--- a/openscad.pro
++++ b/openscad.pro
+@@ -178,9 +178,13 @@ skip-version-check {
+
+ isEmpty(PKG_CONFIG):PKG_CONFIG = pkg-config
+
++
+ # Application configuration
+ CONFIG += c++std
+ CONFIG += cgal
++
++LIBS += -lCGAL -lCGAL_Core -lCGAL_ImageIO
++
+ CONFIG += opencsg
+ CONFIG += glew
+ CONFIG += boost
diff --git a/srcpkgs/openscad/template b/srcpkgs/openscad/template
index 60d45d60615f..a3951a1a2201 100644
--- a/srcpkgs/openscad/template
+++ b/srcpkgs/openscad/template
@@ -1,7 +1,7 @@
# Template file for 'openscad'
pkgname=openscad
version=2021.01
-revision=2
+revision=3
build_style=qmake
hostmakedepends="bison flex pkg-config gettext qt5-qmake qt5-host-tools"
makedepends="cgal-devel harfbuzz-devel opencsg-devel qscintilla-qt5-devel
From f4e122e00455519d2c311e6005512b73aa6a2407 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:42 +0700
Subject: [PATCH 073/107] openvdb: rebuild for boost-1.80
---
srcpkgs/openvdb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openvdb/template b/srcpkgs/openvdb/template
index 4957f642552a..24bc2253828b 100644
--- a/srcpkgs/openvdb/template
+++ b/srcpkgs/openvdb/template
@@ -1,7 +1,7 @@
# Template file for 'openvdb'
pkgname=openvdb
version=9.0.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DOPENVDB_BUILD_VDB_VIEW=1"
hostmakedepends="pkg-config"
From 5138a2a7ca9dc09acfc1871cc9e458ed6de04fe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:43 +0700
Subject: [PATCH 074/107] osm2pgsql: rebuild for boost-1.80
---
srcpkgs/osm2pgsql/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/osm2pgsql/template b/srcpkgs/osm2pgsql/template
index 1c53c4505047..1d5f71b70140 100644
--- a/srcpkgs/osm2pgsql/template
+++ b/srcpkgs/osm2pgsql/template
@@ -1,7 +1,7 @@
# Template file for 'osm2pgsql'
pkgname=osm2pgsql
version=1.6.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="boost"
makedepends="expat-devel proj-devel bzip2-devel zlib-devel boost-devel
From 755e15dbb034f2b5fa51c5eb7ce9b79ded7bdbb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:43 +0700
Subject: [PATCH 075/107] poedit: rebuild for boost-1.80
---
srcpkgs/poedit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index f10aaf4c88a2..15cd4b6bae20 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
# Template file for 'poedit'
pkgname=poedit
version=3.0.1
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-wx-config=wx-config-gtk3"
hostmakedepends="pkg-config"
From 65380e7cc3d11dc8fa93e29edc289e3a6a48f261 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:43 +0700
Subject: [PATCH 076/107] povray: rebuild for boost-1.80
---
srcpkgs/povray/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/povray/template b/srcpkgs/povray/template
index 30a2baab2039..93ab71f8e0db 100644
--- a/srcpkgs/povray/template
+++ b/srcpkgs/povray/template
@@ -1,7 +1,7 @@
# Template file for 'povray'
pkgname=povray
version=3.7.0.8
-revision=5
+revision=6
build_style=gnu-configure
_v=${version%.*.*}
configure_args="COMPILED_BY=Void --disable-optimiz-arch"
From ab6b29ac6e2d912bd60ecb40f07c5dcf89240d80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:43 +0700
Subject: [PATCH 077/107] pulseeffects-legacy: rebuild for boost-1.80
---
.../patches/boost-1.80.patch | 19 +++++++++++++++++++
srcpkgs/pulseeffects-legacy/template | 2 +-
2 files changed, 20 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/pulseeffects-legacy/patches/boost-1.80.patch
diff --git a/srcpkgs/pulseeffects-legacy/patches/boost-1.80.patch b/srcpkgs/pulseeffects-legacy/patches/boost-1.80.patch
new file mode 100644
index 000000000000..9b96f4ad359a
--- /dev/null
+++ b/srcpkgs/pulseeffects-legacy/patches/boost-1.80.patch
@@ -0,0 +1,19 @@
+--- a/src/general_settings_ui.cpp
++++ b/src/general_settings_ui.cpp
+@@ -20,6 +20,7 @@
+ #include "general_settings_ui.hpp"
+ #include <giomm/file.h>
+ #include <glibmm.h>
++#include <fstream>
+ #include <boost/filesystem.hpp>
+ #include "util.hpp"
+
+@@ -176,7 +177,7 @@ auto GeneralSettingsUi::on_enable_autost
+
+ if (state) {
+ if (!boost::filesystem::exists(autostart_file)) {
+- boost::filesystem::ofstream ofs{autostart_file};
++ std::ofstream ofs{autostart_file.native()};
+
+ ofs << "[Desktop Entry]\n";
+ ofs << "Name=PulseEffects\n";
diff --git a/srcpkgs/pulseeffects-legacy/template b/srcpkgs/pulseeffects-legacy/template
index 585f25a55c8f..121e90e7f7dc 100644
--- a/srcpkgs/pulseeffects-legacy/template
+++ b/srcpkgs/pulseeffects-legacy/template
@@ -1,7 +1,7 @@
# Template file for 'pulseeffects-legacy'
pkgname=pulseeffects-legacy
version=4.8.5
-revision=3
+revision=4
wrksrc="easyeffects-${version}"
build_style=meson
hostmakedepends="itstool pkg-config gettext glib-devel"
From c86ecae79500b7df332b0c927627de7fc992fa25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:44 +0700
Subject: [PATCH 078/107] pulseview: rebuild for boost-1.80
---
srcpkgs/pulseview/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/pulseview/template b/srcpkgs/pulseview/template
index aaaf69757e0a..1651792206e2 100644
--- a/srcpkgs/pulseview/template
+++ b/srcpkgs/pulseview/template
@@ -1,7 +1,7 @@
# Template file for 'pulseview'
pkgname=pulseview
version=0.4.2
-revision=2
+revision=3
build_style=cmake
configure_args="-DDISABLE_WERROR=TRUE"
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
From 7a2784dc1be09d3b884be0641e999e9855bbdf0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:44 +0700
Subject: [PATCH 079/107] remwharead: rebuild for boost-1.80
---
srcpkgs/remwharead/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/remwharead/template b/srcpkgs/remwharead/template
index 3e52473f86ce..cd36bd3b9849 100644
--- a/srcpkgs/remwharead/template
+++ b/srcpkgs/remwharead/template
@@ -1,7 +1,7 @@
# Template file for 'remwharead'
pkgname=remwharead
version=0.10.0
-revision=2
+revision=3
build_style=cmake
hostmakedepends="poco-devel asciidoc pkg-config"
makedepends="poco-devel boost-devel"
From 5153d77ae54656f329ec64aeccf8fa3d1f293368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:44 +0700
Subject: [PATCH 080/107] rstudio: rebuild for boost-1.80
---
srcpkgs/rstudio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index ad7c1e85cce7..c0354b8130cc 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -1,7 +1,7 @@
# Template file for 'rstudio'
pkgname=rstudio
version=1.4.1717
-revision=3
+revision=4
build_style=cmake
configure_args="-DRSTUDIO_TARGET=Desktop
-DRSTUDIO_USE_SYSTEM_BOOST=ON
From 43c79144d858f4494198f756f45375ff0863f4f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Sat, 20 Aug 2022 15:51:41 +0700
Subject: [PATCH 081/107] schroot: update to 1.6.12.
---
.../patches/{musl.patch => sbuild-i18n.patch} | 1 +
srcpkgs/schroot/patches/schroot-cppunit.patch | 11 -----
srcpkgs/schroot/patches/test-chown.patch | 8 ++++
srcpkgs/schroot/template | 47 ++++++++++++-------
4 files changed, 38 insertions(+), 29 deletions(-)
rename srcpkgs/schroot/patches/{musl.patch => sbuild-i18n.patch} (99%)
delete mode 100644 srcpkgs/schroot/patches/schroot-cppunit.patch
create mode 100644 srcpkgs/schroot/patches/test-chown.patch
diff --git a/srcpkgs/schroot/patches/musl.patch b/srcpkgs/schroot/patches/sbuild-i18n.patch
similarity index 99%
rename from srcpkgs/schroot/patches/musl.patch
rename to srcpkgs/schroot/patches/sbuild-i18n.patch
index e0dcaf3bae01..ff69d554cd9a 100644
--- a/srcpkgs/schroot/patches/musl.patch
+++ b/srcpkgs/schroot/patches/sbuild-i18n.patch
@@ -28,3 +28,4 @@
+#include "sbuild-i18n.h"
using namespace sbuild;
+
diff --git a/srcpkgs/schroot/patches/schroot-cppunit.patch b/srcpkgs/schroot/patches/schroot-cppunit.patch
deleted file mode 100644
index 3e11c73fd40b..000000000000
--- a/srcpkgs/schroot/patches/schroot-cppunit.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac 2017-05-20 09:50:30.146864516 +0000
-+++ b/configure.ac 2017-05-20 09:51:26.216792794 +0000
-@@ -336,7 +336,7 @@
- [HAVE_UUID=yes],
- [HAVE_UUID=no])
-
--AM_PATH_CPPUNIT([1.10.0], [HAVE_CPPUNIT=yes])
-+PKG_CHECK_MODULES([CPPUNIT], [cppunit], [HAVE_CPPUNIT=yes], [HAVE_CPPUNIT=no])
- AM_CONDITIONAL([USE_UNIT_TESTS], [test -n "$HAVE_CPPUNIT"])
-
- SCHROOT_CFLAGS="$UUID_CFLAGS"
diff --git a/srcpkgs/schroot/patches/test-chown.patch b/srcpkgs/schroot/patches/test-chown.patch
new file mode 100644
index 000000000000..c9d4e3919428
--- /dev/null
+++ b/srcpkgs/schroot/patches/test-chown.patch
@@ -0,0 +1,8 @@
+--- a/test/setup-test-data.cmake
++++ b/test/setup-test-data.cmake
+@@ -5,4 +5,4 @@ rm -rf test/testdata
+ mkdir test/testdata
+ cp -r ${PROJECT_SOURCE_DIR}/test/*.ex* test/testdata
+ mkdir test/testdata/run-parts.ex2
+-chown -R root:root test/testdata
++# chown -R root:root test/testdata
diff --git a/srcpkgs/schroot/template b/srcpkgs/schroot/template
index fd9ff15c7140..d73a149920a7 100644
--- a/srcpkgs/schroot/template
+++ b/srcpkgs/schroot/template
@@ -1,21 +1,25 @@
# Template file for 'schroot'
pkgname=schroot
reverts="1.7.2_9"
-version=1.6.10
-revision=12
-_debian_version=12+deb11u1
+version=1.6.12
+revision=1
+_debian_version=2
build_style=cmake
configure_args="
+ -DSCHROOT_LIBEXEC_DIR=/usr/libexec/schroot
+ -Ddebug=OFF
-Ddchroot=ON
-Dlvm-snapshot=ON
-Dbtrfs-snapshot=ON
+ -Dzfs-snapshot=ON
-Dblock-device=ON
-Dloopback=ON
+ -DLOSETUP_EXECUTABLE=/usr/sbin/losetup
-Duuid=ON
- -DBTRFS_EXECUTABLE=/usr/bin/btrfs
+ -DBTRFS_EXECUTABLE=/usr/sbin/btrfs
-DLVCREATE_EXECUTABLE=/usr/sbin/lvcreate
-DLVREMOVE_EXECUTABLE=/usr/sbin/lvremove
- -DZFS_EXECUTABLE=/usr/bin/zfs
+ -DZFS_EXECUTABLE=/usr/sbin/zfs
-Dbash_completion_dir=/usr/share/bash-completion/completions"
conf_files="
/etc/schroot/minimal/nssdatabases
@@ -41,27 +45,34 @@ make_dirs="
/var/lib/schroot/session 0755 root root
/var/lib/schroot/mount 0755 root root
/etc/schroot/chroot.d 0755 root root"
-hostmakedepends="pkg-config libtool gettext xz po4a groff"
-makedepends="boost-devel pam-devel lockdev-devel libuuid-devel e2fsprogs-devel
- gettext-devel libcppunit-devel"
+hostmakedepends="pkg-config gettext xz po4a groff"
+makedepends="boost-devel pam-devel lockdev-devel libuuid-devel
+ e2fsprogs-devel gettext-devel libcppunit-devel"
short_desc="Allows users to execute commands in different chroots"
maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
license="GPL-3.0-only"
homepage="https://wiki.debian.org/Schroot"
-distfiles="
- ${DEBIAN_SITE}/main/s/${pkgname}/${pkgname}_${version}.orig.tar.xz
- http://security.debian.org/debian-security/pool/main/s/${pkgname}/${pkgname}_${version}-${_debian_version}.debian.tar.xz"
-checksum="
- 3ce8dfd9cb97b099e4b6d4ccec421d6cc8c9ef84574681e928a12badb5643d0b
- 7bd4e0c2709979362c86a86c10d2b23d290d26e1a2d301a602e829327f483ec1"
-nocross=yes
+distfiles="${DEBIAN_SITE}/main/s/${pkgname}/${pkgname}_${version}.orig.tar.xz
+ ${DEBIAN_SITE}/main/s/${pkgname}/${pkgname}_${version}-${_debian_version}.debian.tar.xz"
+checksum="0bed8a069856a82261046b2e549af60ee32b79ebcdbf642424f378ec7aea6b77
+ 8ff03534007c6d55eb4032b637232954eaddba5cf18c91b42ff3016697ba0f93"
+skip_extraction="${pkgname}_${version}-${_debian_version}.debian.tar.xz"
-pre_configure() {
- cat ../debian/patches/series | while read p; do
- patch -p1 -i ../debian/patches/$p
+pre_patch() {
+ rm -rf debian
+ bsdtar -xf "$XBPS_SRCDISTDIR/$pkgname-$version/$skip_extraction"
+ grep '^[^#]' debian/patches/series | while read p; do
+ msg_normal "Patching (Debian): $p\n"
+ patch -Np1 -s -F0 -i debian/patches/$p
done
}
+do_check() {
+ # expect to be run with root
+ cd build
+ ctest -E "(sbuild-chroot-config)"
+}
+
post_install() {
# Remove development files
rm -rf ${DESTDIR}/usr/include \
From bf2cf7a640735a10a7ffeb3dfd6fc951ee5c1085 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:44 +0700
Subject: [PATCH 082/107] snapper: rebuild for boost-1.80
---
srcpkgs/snapper/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/snapper/template b/srcpkgs/snapper/template
index bc7bbe5cf84b..85697667ff77 100644
--- a/srcpkgs/snapper/template
+++ b/srcpkgs/snapper/template
@@ -1,7 +1,7 @@
# Template file for 'snapper'
pkgname=snapper
version=0.10.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-zypp --disable-systemd --with-conf=/etc/conf.d"
conf_files="/etc/conf.d/snapper"
From cfe619284f46d0d940dd1c13e58348912fe181f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:45 +0700
Subject: [PATCH 083/107] source-highlight: rebuild for boost-1.80
---
srcpkgs/source-highlight/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/source-highlight/template b/srcpkgs/source-highlight/template
index ab56401c64a0..f76c987335af 100644
--- a/srcpkgs/source-highlight/template
+++ b/srcpkgs/source-highlight/template
@@ -1,7 +1,7 @@
# Template file for 'source-highlight'
pkgname=source-highlight
version=3.1.9
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--with-boost=${XBPS_CROSS_BASE}/usr
--with-bash-completion=/usr/share/bash-completion/completions"
From 9fbbacf6151b5fa11212be76920b5fed2703c818 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:45 +0700
Subject: [PATCH 084/107] supercollider: rebuild for boost-1.80
---
srcpkgs/supercollider/patches/boost.patch | 39 +++++++++++++++++++++++
srcpkgs/supercollider/template | 2 +-
2 files changed, 40 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/supercollider/patches/boost.patch
diff --git a/srcpkgs/supercollider/patches/boost.patch b/srcpkgs/supercollider/patches/boost.patch
new file mode 100644
index 000000000000..db5c874dc463
--- /dev/null
+++ b/srcpkgs/supercollider/patches/boost.patch
@@ -0,0 +1,39 @@
+From cc873049ff9249a33567e4cbcdeffeb6806a30d6 Mon Sep 17 00:00:00 2001
+From: brianlheim <self@brianlheim.com>
+Date: Tue, 25 Aug 2020 17:14:29 -0500
+Subject: [PATCH] remove workarounds for old boost versions
+
+we don't need to support boost pre-1.70 anymore, and tcp::socket::executor_type was always the right typealias to use
+---
+ server/supernova/sc/sc_osc_handler.hpp | 10 +---------
+ 1 file changed, 1 insertion(+), 9 deletions(-)
+
+diff --git a/server/supernova/sc/sc_osc_handler.hpp b/server/supernova/sc/sc_osc_handler.hpp
+index f17e99a5573..676c94dbf15 100644
+--- a/server/supernova/sc/sc_osc_handler.hpp
++++ b/server/supernova/sc/sc_osc_handler.hpp
+@@ -234,11 +234,7 @@ class sc_osc_handler : private detail::network_thread, public sc_notify_observer
+ class tcp_connection : public nova_endpoint {
+ public:
+ using pointer = std::shared_ptr<tcp_connection>;
+-#if BOOST_VERSION >= 107000
+- using executor = boost::asio::executor;
+-#else
+- using executor = boost::asio::io_context::executor_type;
+-#endif
++ using executor = tcp::socket::executor_type;
+
+ static pointer create(const executor& executor) { return pointer(new tcp_connection(executor)); }
+
+@@ -249,11 +245,7 @@ class sc_osc_handler : private detail::network_thread, public sc_notify_observer
+ bool operator==(tcp_connection const& rhs) const { return &rhs == this; }
+
+ private:
+-#if BOOST_VERSION >= 107000
+ tcp_connection(const executor& executor): socket_(executor) {}
+-#else
+- tcp_connection(const executor& executor): socket_(executor.context()) {}
+-#endif
+
+ void send(const char* data, size_t length) override final;
+
diff --git a/srcpkgs/supercollider/template b/srcpkgs/supercollider/template
index 35f6d9dfb7c2..b0b8278470ef 100644
--- a/srcpkgs/supercollider/template
+++ b/srcpkgs/supercollider/template
@@ -1,7 +1,7 @@
# Template file for 'supercollider'
pkgname=supercollider
version=3.11.1
-revision=3
+revision=4
wrksrc="SuperCollider-${version}-Source"
build_style=cmake
make_cmd=make
From e420d777ee94aa0b932f68e6bc99fc8948221669 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:45 +0700
Subject: [PATCH 085/107] supertux2: rebuild for boost-1.80
---
srcpkgs/supertux2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/supertux2/template b/srcpkgs/supertux2/template
index 56057f5837d5..fce60e205a59 100644
--- a/srcpkgs/supertux2/template
+++ b/srcpkgs/supertux2/template
@@ -1,7 +1,7 @@
# Template file for 'supertux2'
pkgname=supertux2
version=0.6.3
-revision=1
+revision=2
wrksrc="SuperTux-v${version}-Source"
build_style=cmake
configure_args="
From 4ae364cd1533f534e78e381c5927f06d66614238 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:45 +0700
Subject: [PATCH 086/107] swiften: rebuild for boost-1.80
---
srcpkgs/swiften/patches/boost-endian.patch | 15 +++++++++++++++
srcpkgs/swiften/patches/std.patch | 11 +++++++++++
srcpkgs/swiften/template | 4 ++--
3 files changed, 28 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/swiften/patches/boost-endian.patch
create mode 100644 srcpkgs/swiften/patches/std.patch
diff --git a/srcpkgs/swiften/patches/boost-endian.patch b/srcpkgs/swiften/patches/boost-endian.patch
new file mode 100644
index 000000000000..1cd2c2fb4816
--- /dev/null
+++ b/srcpkgs/swiften/patches/boost-endian.patch
@@ -0,0 +1,15 @@
+--- a/Swiften/Base/Platform.h
++++ b/Swiften/Base/Platform.h
+@@ -43,9 +43,9 @@
+ #endif
+
+ // Endianness
+-#include <boost/detail/endian.hpp>
+-#if defined(BOOST_LITTLE_ENDIAN)
++#include <boost/predef/other/endian.h>
++#if BOOST_ENDIAN_LITTLE_BYTE
+ #define SWIFTEN_LITTLE_ENDIAN
+-#elif defined(BOOST_BIG_ENDIAN)
++#elif BOOST_ENDIAN_BIG_BYTE
+ #define SWIFTEN_BIG_ENDIAN
+ #endif
diff --git a/srcpkgs/swiften/patches/std.patch b/srcpkgs/swiften/patches/std.patch
new file mode 100644
index 000000000000..9534e8a321d2
--- /dev/null
+++ b/srcpkgs/swiften/patches/std.patch
@@ -0,0 +1,11 @@
+--- a/Swift/Controllers/ShowProfileController.h
++++ b/Swift/Controllers/ShowProfileController.h
+@@ -18,6 +18,8 @@
+
+ #include <Swift/Controllers/UIEvents/UIEvent.h>
+
++#include <map>
++
+ namespace Swift {
+ class VCardManager;
+ class ProfileWindow;
diff --git a/srcpkgs/swiften/template b/srcpkgs/swiften/template
index 969ef1eb5d78..9014153a8818 100644
--- a/srcpkgs/swiften/template
+++ b/srcpkgs/swiften/template
@@ -1,11 +1,11 @@
# Template file for 'swiften'
pkgname=swiften
version=4.0.3
-revision=2
+revision=3
wrksrc="swift-${version}"
hostmakedepends="scons pkg-config"
makedepends="boost-devel openssl-devel libxml2-devel libidn-devel
- lua51-devel miniupnpc-devel sqlite-devel"
+ lua51-devel miniupnpc-devel sqlite-devel hunspell-devel"
short_desc="XMPP library for C++"
maintainer="John Regan <john@jrjrtech.com>"
license="GPL-3.0-only"
From 620c2066968e15226f597bce87c3b4cc140f8f95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:46 +0700
Subject: [PATCH 087/107] syncthingtray: rebuild for boost-1.80
---
srcpkgs/syncthingtray/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/syncthingtray/template b/srcpkgs/syncthingtray/template
index 4f338f2cc200..f445aa92db1e 100644
--- a/srcpkgs/syncthingtray/template
+++ b/srcpkgs/syncthingtray/template
@@ -1,7 +1,7 @@
# Template file for 'syncthingtray'
pkgname=syncthingtray
version=1.2.2
-revision=1
+revision=2
build_style=cmake
configure_args="-DJS_PROVIDER=qml -DBUILTIN_TRANSLATIONS=ON -DSYSTEMD_SUPPORT=OFF
-DBUILD_SHARED_LIBS=ON -DWEBVIEW_PROVIDER=$(vopt_if webengine webengine none)"
From 807ce3e00f96a560e568d2c88acbafe548f7a925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:46 +0700
Subject: [PATCH 088/107] tmfs: rebuild for boost-1.80
---
srcpkgs/tmfs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tmfs/template b/srcpkgs/tmfs/template
index 1dbed3e0eb72..ed4fb5fed836 100644
--- a/srcpkgs/tmfs/template
+++ b/srcpkgs/tmfs/template
@@ -1,7 +1,7 @@
# Template file for 'tmfs'
pkgname=tmfs
version=r5
-revision=7
+revision=8
build_style=cmake
hostmakedepends="pkg-config"
makedepends="fuse-devel boost-devel"
From 2ef96d708c931aa17997c6569f015166ed4467a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:46 +0700
Subject: [PATCH 089/107] tomahawk: rebuild for boost-1.80
---
srcpkgs/tomahawk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tomahawk/template b/srcpkgs/tomahawk/template
index 0edbacc5f8ad..b66b9a876a5c 100644
--- a/srcpkgs/tomahawk/template
+++ b/srcpkgs/tomahawk/template
@@ -1,7 +1,7 @@
# Template file for 'tomahawk'
pkgname=tomahawk
version=0.8.4
-revision=21
+revision=22
wrksrc=${pkgname}-${_commit}
_commit=90ec6f0dc701cba0533c66abdcb904e29f02a66f
build_style=cmake
From 5457db6d929fc954416337f1d6d8249fe984b199 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:46 +0700
Subject: [PATCH 090/107] uhd: rebuild for boost-1.80
---
srcpkgs/uhd/patches/boost-math.patch | 31 +++++++++++++++++++++++++++
srcpkgs/uhd/patches/std-complex.patch | 10 +++++++++
srcpkgs/uhd/template | 2 +-
3 files changed, 42 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/uhd/patches/boost-math.patch
create mode 100644 srcpkgs/uhd/patches/std-complex.patch
diff --git a/srcpkgs/uhd/patches/boost-math.patch b/srcpkgs/uhd/patches/boost-math.patch
new file mode 100644
index 000000000000..9ac6dae1df9d
--- /dev/null
+++ b/srcpkgs/uhd/patches/boost-math.patch
@@ -0,0 +1,31 @@
+--- a/host/lib/usrp/usrp2/usrp2_impl.cpp
++++ b/host/lib/usrp/usrp2/usrp2_impl.cpp
+@@ -18,6 +18,8 @@
+ #include <boost/asio.hpp> //used for htonl and ntohl
+ #include <boost/asio/ip/address_v4.hpp>
+ #include <boost/format.hpp>
++#include <boost/math/special_functions/round.hpp>
++#include <boost/math/special_functions/sign.hpp>
+ #include <boost/thread.hpp>
+ #include <functional>
+
+--- a/host/lib/usrp/cores/rx_frontend_core_3000.cpp
++++ b/host/lib/usrp/cores/rx_frontend_core_3000.cpp
+@@ -12,6 +12,7 @@
+ #include <uhdlib/usrp/cores/rx_frontend_core_3000.hpp>
+ #include <boost/assign/list_of.hpp>
+ #include <boost/math/special_functions/round.hpp>
++#include <boost/math/special_functions/sign.hpp>
+ #include <functional>
+
+ using namespace uhd;
+--- a/host/lib/usrp/cores/rx_dsp_core_3000.cpp
++++ b/host/lib/usrp/cores/rx_dsp_core_3000.cpp
+@@ -14,6 +14,7 @@
+ #include <uhdlib/usrp/cores/rx_dsp_core_3000.hpp>
+ #include <boost/assign/list_of.hpp>
+ #include <boost/math/special_functions/round.hpp>
++#include <boost/math/special_functions/sign.hpp>
+ #include <algorithm>
+ #include <cmath>
+ #include <functional>
diff --git a/srcpkgs/uhd/patches/std-complex.patch b/srcpkgs/uhd/patches/std-complex.patch
new file mode 100644
index 000000000000..c7573bf4ade2
--- /dev/null
+++ b/srcpkgs/uhd/patches/std-complex.patch
@@ -0,0 +1,10 @@
+--- a/host/tests/tx_streamer_test.cpp
++++ b/host/tests/tx_streamer_test.cpp
+@@ -7,6 +7,7 @@
+ #include "../common/mock_link.hpp"
+ #include <uhdlib/transport/tx_streamer_impl.hpp>
+ #include <boost/test/unit_test.hpp>
++#include <complex>
+ #include <iostream>
+ #include <memory>
+
diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template
index 5f043162d7dc..170e12670c2c 100644
--- a/srcpkgs/uhd/template
+++ b/srcpkgs/uhd/template
@@ -1,7 +1,7 @@
# Template file for 'uhd'
pkgname=uhd
version=4.0.0.0
-revision=1
+revision=2
build_wrksrc=host
build_style=cmake
configure_args="-DCMAKE_BUILD_TYPE=None"
From 64995b7e1099206982c6ee288c365a51a5445191 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:47 +0700
Subject: [PATCH 091/107] wesnoth: rebuild for boost-1.80
---
srcpkgs/wesnoth/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/wesnoth/template b/srcpkgs/wesnoth/template
index 0fcc09b29c10..4d55d20b5959 100644
--- a/srcpkgs/wesnoth/template
+++ b/srcpkgs/wesnoth/template
@@ -1,7 +1,7 @@
# Template file for 'wesnoth'
pkgname=wesnoth
version=1.14.17
-revision=1
+revision=2
build_style=cmake
configure_args="-DENABLE_OMP=1"
hostmakedepends="pkg-config gettext"
@@ -18,7 +18,7 @@ checksum=3646cba604e09c12d6900a733bcb78cbf05f2f75f05346630d6529c220f584e1
replaces="wesnoth-data>=0"
CFLAGS="-UNDEBUG"
-CXXFLAGS="-UNDEBUG"
+CXXFLAGS="-UNDEBUG -std=c++14"
post_install() {
# runit service
From 3f67819bb48de256df14563a7f4b67b5036b087a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Fri, 26 Aug 2022 17:00:47 +0700
Subject: [PATCH 092/107] wsjtx: rebuild for boost-1.80
---
srcpkgs/wsjtx/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/wsjtx/template b/srcpkgs/wsjtx/template
index c1838dd7cf51..7324d85bd64d 100644
--- a/srcpkgs/wsjtx/template
+++ b/srcpkgs/wsjtx/template
@@ -1,7 +1,7 @@
# Template file for 'wsjtx'
pkgname=wsjtx
version=2.5.4
-revision=1
+revision=2
build_wrksrc=wsjtx
build_style=cmake
configure_args="-DRIGCTLCOM_EXE= -DRIGCTL_EXE= -DRIGCTLD_EXE="
From b082baef63fb37c9940545a42a930604a529cffc Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 20:49:38 +0400
Subject: [PATCH 093/107] fmt: update to 9.0.0.
---
common/shlibs | 2 +-
srcpkgs/fmt/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index b91133da6484..dbc48a29aad1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3540,7 +3540,7 @@ libcotp.so.12 libcotp-1.2.1_1
libunarr.so.1 libunarr-1.0.1_1
libretro-gtk-1.so.0 retro-gtk-1.0.0_1
libmanette-0.2.so.0 libmanette-0.2.1_1
-libfmt.so.8 fmt-8.0.1_1
+libfmt.so.9 fmt-9.0.0_1
libelementary-calendar.so.0 libio.elementary.calendar-4.2.3_1
libolm.so.3 olm-3.0.0_1
libtls.so.25 libtls-3.5.2_1
diff --git a/srcpkgs/fmt/template b/srcpkgs/fmt/template
index 35a914c75eab..6fa037dfbaab 100644
--- a/srcpkgs/fmt/template
+++ b/srcpkgs/fmt/template
@@ -1,6 +1,6 @@
# Template file for 'fmt'
pkgname=fmt
-version=8.1.1
+version=9.0.0
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON -DFMT_DOC=OFF -DFMT_TEST=OFF"
@@ -10,7 +10,7 @@ license="BSD-2-Clause"
homepage="https://github.com/fmtlib/fmt"
changelog="https://raw.githubusercontent.com/fmtlib/fmt/master/ChangeLog.rst"
distfiles="https://github.com/fmtlib/fmt/archive/${version}.tar.gz"
-checksum=3d794d3cf67633b34b2771eb9f073bde87e846e0d395d254df7b211ef1ec7346
+checksum=9a1e0e9e843a356d65c7604e2c8bf9402b50fe294c355de0095ebd42fb9bd2c5
post_install() {
vlicense LICENSE.rst LICENSE
From 2218b624d1350cbdb27fe2be69ff420e969ed964 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:33 +0400
Subject: [PATCH 094/107] Bear: update to 3.0.20.
---
srcpkgs/Bear/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/Bear/template b/srcpkgs/Bear/template
index fce6309ca6fa..c6c1fb6e9c38 100644
--- a/srcpkgs/Bear/template
+++ b/srcpkgs/Bear/template
@@ -1,7 +1,7 @@
# Template file for 'Bear'
pkgname=Bear
-version=3.0.19
-revision=2
+version=3.0.20
+revision=1
build_style=cmake
hostmakedepends="pkg-config protobuf protobuf-devel grpc"
makedepends="json-c++ spdlog grpc-devel protobuf-devel gtest-devel"
@@ -11,7 +11,7 @@ maintainer="John <me@johnnynator.dev>"
license="GPL-3.0-or-later"
homepage="https://github.com/rizsotto/Bear"
distfiles="https://github.com/rizsotto/Bear/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=2fcfe2c6e029182cfc54ed26b3505c0ef12b0f43df03fb587f335afdc2ca9431
+checksum=45cfcdab07f824f6c06c9776701156f7a04b23eadd25ecbc88c188789a447cc7
conflicts="interception-tools>=0" # /usr/bin/intercept
if [ -z "$XBPS_CHECK_PKGS" ]; then
From b80a869b93d806829a507c7f8620908ccd9d8f27 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:33 +0400
Subject: [PATCH 095/107] cherrytree: revbump for fmt 9.0
---
srcpkgs/cherrytree/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/cherrytree/template b/srcpkgs/cherrytree/template
index 55512e3b5ef7..e52a677a47b5 100644
--- a/srcpkgs/cherrytree/template
+++ b/srcpkgs/cherrytree/template
@@ -1,7 +1,7 @@
# Template file for 'cherrytree'
pkgname=cherrytree
version=0.99.39
-revision=2
+revision=3
wrksrc="${pkgname}_${version}"
build_style=cmake
hostmakedepends="gettext pkg-config desktop-file-utils python3 glib-devel"
From 2375800215f84f6092b3ef063bea422880fa4f9f Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:33 +0400
Subject: [PATCH 096/107] coeurl: revbump for fmt 9.0
---
srcpkgs/coeurl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/coeurl/template b/srcpkgs/coeurl/template
index d0dbcbc60ba0..a9f2dfbbc123 100644
--- a/srcpkgs/coeurl/template
+++ b/srcpkgs/coeurl/template
@@ -1,7 +1,7 @@
# Template file for 'coeurl'
pkgname=coeurl
version=0.1.1
-revision=1
+revision=2
wrksrc=coeurl-v${version}
build_style=meson
hostmakedepends="pkg-config"
From db05047eb96d30c75ca1e77438448076044feaaa Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:34 +0400
Subject: [PATCH 097/107] easyeffects: revbump for fmt 9.0
---
srcpkgs/easyeffects/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/easyeffects/template b/srcpkgs/easyeffects/template
index ac84ce15b068..0ddfb1b5833d 100644
--- a/srcpkgs/easyeffects/template
+++ b/srcpkgs/easyeffects/template
@@ -1,7 +1,7 @@
# Template file for 'easyeffects'
pkgname=easyeffects
version=6.2.4
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel"
makedepends="gtkmm4-devel pipewire-devel zita-convolver-devel lilv-devel
From f95844be678980d0c09802bd5fd1ef43e3aef8e6 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:34 +0400
Subject: [PATCH 098/107] gerbera: revbump for fmt 9.0, add patch
---
srcpkgs/gerbera/patches/fmt-9-fix.patch | 32 +++++++++++++++++++++++++
srcpkgs/gerbera/template | 2 +-
2 files changed, 33 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/gerbera/patches/fmt-9-fix.patch
diff --git a/srcpkgs/gerbera/patches/fmt-9-fix.patch b/srcpkgs/gerbera/patches/fmt-9-fix.patch
new file mode 100644
index 000000000000..7adedf9005db
--- /dev/null
+++ b/srcpkgs/gerbera/patches/fmt-9-fix.patch
@@ -0,0 +1,32 @@
+From d7b8fafbc94405c20753fed569abd8878cccde89 Mon Sep 17 00:00:00 2001
+From: Felix Yan <felixonmars@archlinux.org>
+Date: Fri, 19 Aug 2022 15:22:10 +0300
+Subject: [PATCH] Fix build with fmt 9.0
+
+Fixes #2681
+---
+ src/database/sql_format.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/database/sql_format.h b/src/database/sql_format.h
+index 32dc00efa..e4e1909a8 100644
+--- a/src/database/sql_format.h
++++ b/src/database/sql_format.h
+@@ -42,7 +42,7 @@ struct SQLIdentifier {
+ template <>
+ struct fmt::formatter<SQLIdentifier> : formatter<std::string_view> {
+ template <typename FormatContext>
+- auto format(const SQLIdentifier& tn, FormatContext& ctx) -> decltype(ctx.out())
++ auto format(const SQLIdentifier& tn, FormatContext& ctx) const -> decltype(ctx.out())
+ {
+ return format_to(ctx.out(), "{}{}{}", tn.quote_begin, tn.name, tn.quote_end);
+ }
+@@ -61,7 +61,7 @@ struct ColumnUpdate {
+ template <>
+ struct fmt::formatter<ColumnUpdate> : formatter<std::string_view> {
+ template <typename FormatContext>
+- auto format(const ColumnUpdate& a, FormatContext& ctx) -> decltype(ctx.out())
++ auto format(const ColumnUpdate& a, FormatContext& ctx) const -> decltype(ctx.out())
+ {
+ return format_to(ctx.out(), "{} = {}", a.column, a.value);
+ }
diff --git a/srcpkgs/gerbera/template b/srcpkgs/gerbera/template
index 35136708b3e5..100b94a7acbe 100644
--- a/srcpkgs/gerbera/template
+++ b/srcpkgs/gerbera/template
@@ -1,7 +1,7 @@
# Template file for 'gerbera'
pkgname=gerbera
version=1.11.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DWITH_SYSTEMD=0 -DWITH_AVCODEC=1"
hostmakedepends="pkg-config"
From 1d58d916d4aa438ac0929015f7b70136dcf30e4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 1 Sep 2022 01:19:36 +0700
Subject: [PATCH 099/107] kodi: revbump for fmt 9.0
---
srcpkgs/kodi/patches/fmt-9.patch | 44 ++++++++++++++++++++++++++++++++
srcpkgs/kodi/template | 2 +-
2 files changed, 45 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/kodi/patches/fmt-9.patch
diff --git a/srcpkgs/kodi/patches/fmt-9.patch b/srcpkgs/kodi/patches/fmt-9.patch
new file mode 100644
index 000000000000..aba5f9b67b56
--- /dev/null
+++ b/srcpkgs/kodi/patches/fmt-9.patch
@@ -0,0 +1,44 @@
+The original type is const unsigned char *
+--- a/xbmc/windowing/X11/WinSystemX11.cpp
++++ b/xbmc/windowing/X11/WinSystemX11.cpp
+@@ -1038,7 +1038,7 @@ bool CWinSystemX11::HasWindowManager()
+
+ if(status == Success && items_read)
+ {
+- CLog::Log(LOGDEBUG,"Window Manager Name: %s", data);
++ CLog::Log(LOGDEBUG,"Window Manager Name: %s", (char *)data);
+ }
+ else
+ CLog::Log(LOGDEBUG,"Window Manager Name: ");
+--- a/xbmc/utils/GLUtils.cpp
++++ b/xbmc/utils/GLUtils.cpp
+@@ -152,25 +152,25 @@ void LogGraphicsInfo()
+
+ s = glGetString(GL_VENDOR);
+ if (s)
+- CLog::Log(LOGINFO, "GL_VENDOR = %s", s);
++ CLog::Log(LOGINFO, "GL_VENDOR = %s", (char *)(s));
+ else
+ CLog::Log(LOGINFO, "GL_VENDOR = NULL");
+
+ s = glGetString(GL_RENDERER);
+ if (s)
+- CLog::Log(LOGINFO, "GL_RENDERER = %s", s);
++ CLog::Log(LOGINFO, "GL_RENDERER = %s", (char *)(s));
+ else
+ CLog::Log(LOGINFO, "GL_RENDERER = NULL");
+
+ s = glGetString(GL_VERSION);
+ if (s)
+- CLog::Log(LOGINFO, "GL_VERSION = %s", s);
++ CLog::Log(LOGINFO, "GL_VERSION = %s", (char *)(s));
+ else
+ CLog::Log(LOGINFO, "GL_VERSION = NULL");
+
+ s = glGetString(GL_SHADING_LANGUAGE_VERSION);
+ if (s)
+- CLog::Log(LOGINFO, "GL_SHADING_LANGUAGE_VERSION = %s", s);
++ CLog::Log(LOGINFO, "GL_SHADING_LANGUAGE_VERSION = %s", (char *)(s));
+ else
+ CLog::Log(LOGINFO, "GL_SHADING_LANGUAGE_VERSION = NULL");
+
diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index d3e9a13afdd5..4b6c9e1ade0c 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
# Template file for 'kodi'
pkgname=kodi
version=19.4
-revision=3
+revision=4
_codename="Matrix"
wrksrc="xbmc-${version}-${_codename}"
build_style=cmake
From 3c31c141d5a2bbd884f6f2aa0a05c75bf4d3ec0b Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:34 +0400
Subject: [PATCH 100/107] MangoHud: revbump for fmt 9.0
---
srcpkgs/MangoHud/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/MangoHud/template b/srcpkgs/MangoHud/template
index a9973bcad30a..fb0e18c1a1f4 100644
--- a/srcpkgs/MangoHud/template
+++ b/srcpkgs/MangoHud/template
@@ -2,7 +2,7 @@
pkgname=MangoHud
version=0.6.7.1
_version="${version%.*}-${version##*.}"
-revision=2
+revision=3
wrksrc="MangoHud-v${_version}"
build_style=meson
configure_args="-Duse_system_vulkan=enabled -Dwith_xnvctrl=disabled
From c12363069c5eb00fe5ef8d86345c37119875ba43 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 101/107] mkvtoolnix: revbump for fmt 9.0
---
srcpkgs/mkvtoolnix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mkvtoolnix/template b/srcpkgs/mkvtoolnix/template
index a1d2adbc4b3f..d98022773c0a 100644
--- a/srcpkgs/mkvtoolnix/template
+++ b/srcpkgs/mkvtoolnix/template
@@ -1,7 +1,7 @@
# Template file for 'mkvtoolnix'
pkgname=mkvtoolnix
version=70.0.0
-revision=1
+revision=2
build_style=gnu-configure
build_helper=qmake
configure_args="--with-docbook-xsl-root=/usr/share/xsl/docbook --enable-qt
From f4cd5b0d8d4fd905f0a864330f4f328c50a28edb Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 102/107] mpd: revbump for fmt 9.0
---
srcpkgs/mpd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 98195b80a38d..b43c83fbb0f7 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,7 +1,7 @@
# Template file for 'mpd'
pkgname=mpd
version=0.23.8
-revision=1
+revision=2
build_style=meson
configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
-Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
From a9e7e7f43922b7aa961842d426cad240fadc2822 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 103/107] mtxclient: revbump for fmt 9.0
---
srcpkgs/mtxclient/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mtxclient/template b/srcpkgs/mtxclient/template
index 4ec895656749..12fea54d3fd5 100644
--- a/srcpkgs/mtxclient/template
+++ b/srcpkgs/mtxclient/template
@@ -1,7 +1,7 @@
# Template file for 'mtxclient'
pkgname=mtxclient
version=0.8.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_LIB_TESTS=OFF -DBUILD_LIB_EXAMPLES=OFF"
hostmakedepends="pkg-config"
From 78735e793622eb8c6ca78bb066b816f358e99de6 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 104/107] nheko: revbump for fmt 9.0
---
srcpkgs/nheko/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nheko/template b/srcpkgs/nheko/template
index f35fd3942116..8e41e9e1f2f0 100644
--- a/srcpkgs/nheko/template
+++ b/srcpkgs/nheko/template
@@ -1,7 +1,7 @@
# Template file for 'nheko'
pkgname=nheko
version=0.10.0
-revision=1
+revision=2
build_style=cmake
hostmakedepends="qt5-host-tools qt5-qmake pkg-config qt5-declarative asciidoc"
makedepends="qt5-multimedia-devel qt5-svg-devel qt5-tools-devel fmt-devel
From 0bb83756f2ad2fbe9b33c59328a2243f1eea5970 Mon Sep 17 00:00:00 2001
From: skmpz <dem.procopiou@gmail.com>
Date: Thu, 25 Aug 2022 19:55:35 +0400
Subject: [PATCH 105/107] spdlog: revbump for fmt 9.0
---
srcpkgs/spdlog/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/spdlog/template b/srcpkgs/spdlog/template
index 187ec0d0eb6e..ef1ee76ffcca 100644
--- a/srcpkgs/spdlog/template
+++ b/srcpkgs/spdlog/template
@@ -1,7 +1,7 @@
# Template file for 'spdlog'
pkgname=spdlog
version=1.10.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DSPDLOG_BUILD_EXAMPLE=OFF -DSPDLOG_FMT_EXTERNAL=ON
-DSPDLOG_BUILD_SHARED=ON"
From 4d70f9148dadd64b484a119ac5d8f3da7a5451cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 1 Sep 2022 01:20:15 +0700
Subject: [PATCH 106/107] Waybar: revbump for fmt 9.0
---
srcpkgs/Waybar/patches/fmt-9.patch | 180 +++++++++++++++++++++++++++++
srcpkgs/Waybar/template | 2 +-
2 files changed, 181 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/Waybar/patches/fmt-9.patch
diff --git a/srcpkgs/Waybar/patches/fmt-9.patch b/srcpkgs/Waybar/patches/fmt-9.patch
new file mode 100644
index 000000000000..d9a6aae3edf1
--- /dev/null
+++ b/srcpkgs/Waybar/patches/fmt-9.patch
@@ -0,0 +1,180 @@
+From 24a8332b62b5c1c8d480116655ce9c582d1f4516 Mon Sep 17 00:00:00 2001
+From: Aleksei Bavshin <alebastr89@gmail.com>
+Date: Mon, 11 Jul 2022 22:52:33 -0700
+Subject: [PATCH 1/3] fix: adapt to fmt 9.0.0 breaking changes
+
+---
+ include/util/json.hpp | 8 ++++++++
+ src/client.cpp | 2 +-
+ src/config.cpp | 1 -
+ src/modules/sni/host.cpp | 1 -
+ src/modules/sway/bar.cpp | 1 -
+ 5 files changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/include/util/json.hpp b/include/util/json.hpp
+index cc514e139..7cd43552b 100644
+--- a/include/util/json.hpp
++++ b/include/util/json.hpp
+@@ -1,7 +1,15 @@
+ #pragma once
+
++#include <fmt/ostream.h>
+ #include <json/json.h>
+
++#if (FMT_VERSION >= 90000)
++
++template <>
++struct fmt::formatter<Json::Value> : ostream_formatter {};
++
++#endif
++
+ namespace waybar::util {
+
+ struct JsonParser {
+diff --git a/src/client.cpp b/src/client.cpp
+index be2ec9178..a815e2fe1 100644
+--- a/src/client.cpp
++++ b/src/client.cpp
+@@ -1,12 +1,12 @@
+ #include "client.hpp"
+
+-#include <fmt/ostream.h>
+ #include <spdlog/spdlog.h>
+
+ #include <iostream>
+
+ #include "idle-inhibit-unstable-v1-client-protocol.h"
+ #include "util/clara.hpp"
++#include "util/format.hpp"
+ #include "wlr-layer-shell-unstable-v1-client-protocol.h"
+
+ waybar::Client *waybar::Client::inst() {
+diff --git a/src/config.cpp b/src/config.cpp
+index 5894cb6b1..dec3b50b2 100644
+--- a/src/config.cpp
++++ b/src/config.cpp
+@@ -1,6 +1,5 @@
+ #include "config.hpp"
+
+-#include <fmt/ostream.h>
+ #include <spdlog/spdlog.h>
+ #include <unistd.h>
+ #include <wordexp.h>
+diff --git a/src/modules/sni/host.cpp b/src/modules/sni/host.cpp
+index 560d7368b..007862dcc 100644
+--- a/src/modules/sni/host.cpp
++++ b/src/modules/sni/host.cpp
+@@ -1,6 +1,5 @@
+ #include "modules/sni/host.hpp"
+
+-#include <fmt/ostream.h>
+ #include <spdlog/spdlog.h>
+
+ namespace waybar::modules::SNI {
+diff --git a/src/modules/sway/bar.cpp b/src/modules/sway/bar.cpp
+index 26234e3b5..f28b05025 100644
+--- a/src/modules/sway/bar.cpp
++++ b/src/modules/sway/bar.cpp
+@@ -1,6 +1,5 @@
+ #include "modules/sway/bar.hpp"
+
+-#include <fmt/ostream.h>
+ #include <spdlog/spdlog.h>
+
+ #include <sstream>
+
+From 3117aefdf3e0bcae6671ab4669241c934bc9ec50 Mon Sep 17 00:00:00 2001
+From: Aleksei Bavshin <alebastr89@gmail.com>
+Date: Tue, 12 Jul 2022 22:20:49 -0700
+Subject: [PATCH 2/3] fix: drop conditionals for ancient fmt versions
+
+---
+ include/modules/keyboard_state.hpp | 5 -----
+ include/modules/simpleclock.hpp | 6 +-----
+ src/modules/clock.cpp | 9 ++-------
+ 3 files changed, 3 insertions(+), 17 deletions(-)
+
+diff --git a/include/modules/keyboard_state.hpp b/include/modules/keyboard_state.hpp
+index 6af19d145..05fbec131 100644
+--- a/include/modules/keyboard_state.hpp
++++ b/include/modules/keyboard_state.hpp
+@@ -1,11 +1,6 @@
+ #pragma once
+
+-#include <fmt/format.h>
+-#if FMT_VERSION < 60000
+-#include <fmt/time.h>
+-#else
+ #include <fmt/chrono.h>
+-#endif
+ #include <gtkmm/label.h>
+
+ #include "AModule.hpp"
+diff --git a/include/modules/simpleclock.hpp b/include/modules/simpleclock.hpp
+index aa9a0a224..5cbee4c6c 100644
+--- a/include/modules/simpleclock.hpp
++++ b/include/modules/simpleclock.hpp
+@@ -1,11 +1,7 @@
+ #pragma once
+
+-#include <fmt/format.h>
+-#if FMT_VERSION < 60000
+-#include <fmt/time.h>
+-#else
+ #include <fmt/chrono.h>
+-#endif
++
+ #include "ALabel.hpp"
+ #include "util/sleeper_thread.hpp"
+
+diff --git a/src/modules/clock.cpp b/src/modules/clock.cpp
+index 959cad903..467536e1e 100644
+--- a/src/modules/clock.cpp
++++ b/src/modules/clock.cpp
+@@ -1,15 +1,10 @@
+ #include "modules/clock.hpp"
+
+-#include <spdlog/spdlog.h>
+-
+-#include <iomanip>
+-#if FMT_VERSION < 60000
+-#include <fmt/time.h>
+-#else
+ #include <fmt/chrono.h>
+-#endif
++#include <spdlog/spdlog.h>
+
+ #include <ctime>
++#include <iomanip>
+ #include <sstream>
+ #include <type_traits>
+
+
+From a44622aa9ff4b85c5eeb54663ecf9d7fe617bc08 Mon Sep 17 00:00:00 2001
+From: Aleksei Bavshin <alebastr89@gmail.com>
+Date: Wed, 13 Jul 2022 22:34:29 -0700
+Subject: [PATCH 3/3] fix: fmt 9.x deprecation warning for implicit enum
+ conversions
+
+---
+ src/modules/mpd/state.cpp | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/src/modules/mpd/state.cpp b/src/modules/mpd/state.cpp
+index 4d1e8c91b..aa1a18f8e 100644
+--- a/src/modules/mpd/state.cpp
++++ b/src/modules/mpd/state.cpp
+@@ -10,6 +10,13 @@ namespace waybar::modules {
+ } // namespace waybar::modules
+ #endif
+
++#if FMT_VERSION >= 90000
++/* Satisfy fmt 9.x deprecation of implicit conversion of enums to int */
++auto format_as(enum mpd_idle val) {
++ return static_cast<std::underlying_type_t<enum mpd_idle>>(val);
++}
++#endif
++
+ namespace waybar::modules::detail {
+
+ #define IDLE_RUN_NOIDLE_AND_CMD(...) \
diff --git a/srcpkgs/Waybar/template b/srcpkgs/Waybar/template
index 8ac3d4290b39..e40288e00b75 100644
--- a/srcpkgs/Waybar/template
+++ b/srcpkgs/Waybar/template
@@ -1,7 +1,7 @@
# Template file for 'Waybar'
pkgname=Waybar
version=0.9.13
-revision=1
+revision=2
_date_version=3.0.0
build_style=meson
configure_args="-Dgtk-layer-shell=enabled -Dlibudev=enabled -Dman-pages=enabled
From cfa66d9f3b48d9162ffddd78dd01eba1d40bc3ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 30 Aug 2022 22:35:02 +0700
Subject: [PATCH 107/107] libreoffice: rebuild for boost-1.80
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 158df0f30ebc..cc00e88157d0 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.3.3.2
-revision=3
+revision=4
build_style=meta
make_build_target="build-nocheck"
nocross="Several dependencies are nocross=yes"
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PR PATCH] [Closed]: [WIP] boost 1.80
2022-08-27 18:49 [PR PATCH] [WIP] boost 1.80 sgn
` (6 preceding siblings ...)
2022-08-31 18:24 ` sgn
@ 2022-09-01 1:37 ` sgn
7 siblings, 0 replies; 9+ messages in thread
From: sgn @ 2022-09-01 1:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1100 bytes --]
There's a closed pull request on the void-packages repository
[WIP] boost 1.80
https://github.com/void-linux/void-packages/pull/38949
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
[ci skip]
#### Testing the changes
- I tested the changes in this PR: **NO**
Close #38916
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 9+ messages in thread