[PR PATCH] boost: update to 1.79.0.b1.

Github messages for voidlinux
 help / color / mirror / Atom feed

* [PR PATCH] boost: update to 1.79.0.b1.
@ 2022-03-18 14:28 JamiKettunen
  2022-03-18 14:32 ` [PR REVIEW] " ahesford
                   ` (28 more replies)
  0 siblings, 29 replies; 30+ messages in thread
From: JamiKettunen @ 2022-03-18 14:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3799 bytes --]

There is a new pull request by JamiKettunen against master on the void-packages repository

https://github.com/JamiKettunen/void-packages boost-1.79.0
https://github.com/void-linux/void-packages/pull/36204

boost: update to 1.79.0.b1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Current issues
Cross-compilation fails due to `bjam` building for the host instead of the target:
```
$ ./xbps-src pkg -a aarch64-musl boost
...
=> boost-1.79.0.b1_1: running post-install hook: 06-strip-and-debug-pkgs ...
   Stripped library: /usr/lib/libboost_json.so.1.79.0
   Stripped library: /usr/lib/libboost_nowide.so.1.79.0
/usr/bin/aarch64-linux-musl-strip: Unable to recognise the format of the input file `/destdir/aarch64-linux-musl/boost-1.79.0.b1/usr/bin/bjam'
=> ERROR: boost-1.79.0.b1_1: failed to strip /usr/bin/bjam
=> ERROR: boost-1.79.0.b1_1: post-install_06-strip-and-debug-pkgs: 'find ${PKGDESTDIR} -type f' exited with 1
=> ERROR:   in hook() at common/hooks/post-install/06-strip-and-debug-pkgs.sh:68
=> ERROR:   in run_func() at common/xbps-src/shutils/common.sh:21
=> ERROR:   in run_pkg_hooks() at common/xbps-src/shutils/common.sh:245
=> ERROR:   in main() at common/xbps-src/libexec/xbps-src-doinstall.sh:66
$ file masterdir/destdir/aarch64-linux-musl/boost-jam-1.79.0.b1/usr/bin/bjam 
masterdir/destdir/aarch64-linux-musl/boost-jam-1.79.0.b1/usr/bin/bjam: ELF 64-bit LSB pie executable, x86-64, version 1 (SYSV), dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, BuildID[sha1]=861bc7f944396eb219efdc4e618e58125088d6aa, for GNU/Linux 3.2.0, stripped
```
Attempting to build any software against the newly built `boost-devel` package causes e.g. the following:
```
$ ./xbps-src pkg gnuradio
...
=> gnuradio-3.8.0.0_10: installing target dependencies: SDL-devel-1.2.15_12 boost-devel-1.79.0.b1_1 fftw-devel-3.3.10_1 gsl-devel-2.7.1_1 jack-devel-1.9.20_1 libgsm-devel-1.0.19_1 libusb-devel-1.0.25_1 volk-devel-2.5.1_1 uhd-devel-4.0.0.0_1 gtk+3-devel-3.24.31_1 python3-devel-3.10.3_1 python3-gobject-devel-3.42.0_1 log4cpp-devel-1.1.3_2 gmpxx-devel-6.2.1_1 mpir-devel-3.0.0_1 ...
=> gnuradio-3.8.0.0_10: removing autodeps, please wait...
=> ERROR: gnuradio-3.8.0.0_10: failed to install target dependencies! (error 40)
=> ERROR: Please see above for the real error, exiting...
```

Additionally a few shared objects aren't built anymore for some reason, namely `libboost_stacktrace_{addr2line,basic,noop}.so.*` & `libboost_fiber.so.*`, so I dropped their subpackages for now.

#### Modified patches
`exec_file.patch`: Removed due to being upstream as https://github.com/boostorg/python/commit/d9f06052e28873037db7f98629bce72182a42410
`mips.patch`: Updated to apply on top of https://github.com/boostorg/fiber/commit/5dc9dabc5d5ff8da53ec897c265c9cba1b6ed0df, not sure if this can be removed now(?)

#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36204.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boost-1.79.0-36204.patch --]
[-- Type: text/x-diff, Size: 30333 bytes --]

From 5e1c0524dd510406a1da8007a32327b5fc587447 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 15:28:37 +0200
Subject: [PATCH] boost: update to 1.79.0.b1.

[ci skip] this doesn't even build locally correctly yet
---
 common/shlibs                                 |  60 ++++----
 .../{boost-python1.72 => boost-python1.79}    |   0
 ...{boost-python3-1.72 => boost-python3-1.79} |   0
 srcpkgs/boost/patches/exec_file.patch         |  45 ------
 srcpkgs/boost/patches/mips.patch              |   2 +-
 srcpkgs/boost/template                        | 142 +++++++-----------
 ...ibboost_atomic1.72 => libboost_atomic1.79} |   0
 ...ibboost_chrono1.72 => libboost_chrono1.79} |   0
 ...t_container1.72 => libboost_container1.79} |   0
 ...boost_context1.72 => libboost_context1.79} |   0
 ...ost_contract1.72 => libboost_contract1.79} |   0
 ...t_coroutine1.72 => libboost_coroutine1.79} |   0
 ...t_date_time1.72 => libboost_date_time1.79} |   0
 ...oost_fiber1.72 => libboost_filesystem1.79} |   0
 ...oost_filesystem1.72 => libboost_graph1.79} |   0
 ...boost_graph1.72 => libboost_iostreams1.79} |   0
 ...oost_iostreams1.72 => libboost_locale1.79} |   0
 .../{libboost_locale1.72 => libboost_log1.79} |   0
 ...ibboost_log1.72 => libboost_log_setup1.79} |   0
 ...st_log_setup1.72 => libboost_math_c991.79} |   0
 ...st_math_c991.72 => libboost_math_c99f1.79} |   0
 ...t_math_c99f1.72 => libboost_math_c99l1.79} |   0
 ...st_math_c99l1.72 => libboost_math_tr11.79} |   0
 ...st_math_tr11.72 => libboost_math_tr1f1.79} |   0
 ...t_math_tr1f1.72 => libboost_math_tr1l1.79} |   0
 ...tr1l1.72 => libboost_prg_exec_monitor1.79} |   0
 ...nitor1.72 => libboost_program_options1.79} |   0
 ...rogram_options1.72 => libboost_random1.79} |   0
 ...libboost_random1.72 => libboost_regex1.79} |   0
 ...t_regex1.72 => libboost_serialization1.79} |   0
 ..._serialization1.72 => libboost_system1.79} |   0
 ...race_addr2line1.72 => libboost_thread1.79} |   0
 ...tacktrace_basic1.72 => libboost_timer1.79} |   0
 srcpkgs/libboost_type_erasure1.72             |   1 -
 ...ace_noop1.72 => libboost_type_erasure1.79} |   0
 srcpkgs/libboost_unit_test_framework1.72      |   1 -
 ...m1.72 => libboost_unit_test_framework1.79} |   0
 srcpkgs/libboost_wave1.72                     |   1 -
 ...{libboost_thread1.72 => libboost_wave1.79} |   0
 srcpkgs/libboost_wserialization1.72           |   1 -
 ..._timer1.72 => libboost_wserialization1.79} |   0
 41 files changed, 81 insertions(+), 172 deletions(-)
 rename srcpkgs/{boost-python1.72 => boost-python1.79} (100%)
 rename srcpkgs/{boost-python3-1.72 => boost-python3-1.79} (100%)
 delete mode 100644 srcpkgs/boost/patches/exec_file.patch
 rename srcpkgs/{libboost_atomic1.72 => libboost_atomic1.79} (100%)
 rename srcpkgs/{libboost_chrono1.72 => libboost_chrono1.79} (100%)
 rename srcpkgs/{libboost_container1.72 => libboost_container1.79} (100%)
 rename srcpkgs/{libboost_context1.72 => libboost_context1.79} (100%)
 rename srcpkgs/{libboost_contract1.72 => libboost_contract1.79} (100%)
 rename srcpkgs/{libboost_coroutine1.72 => libboost_coroutine1.79} (100%)
 rename srcpkgs/{libboost_date_time1.72 => libboost_date_time1.79} (100%)
 rename srcpkgs/{libboost_fiber1.72 => libboost_filesystem1.79} (100%)
 rename srcpkgs/{libboost_filesystem1.72 => libboost_graph1.79} (100%)
 rename srcpkgs/{libboost_graph1.72 => libboost_iostreams1.79} (100%)
 rename srcpkgs/{libboost_iostreams1.72 => libboost_locale1.79} (100%)
 rename srcpkgs/{libboost_locale1.72 => libboost_log1.79} (100%)
 rename srcpkgs/{libboost_log1.72 => libboost_log_setup1.79} (100%)
 rename srcpkgs/{libboost_log_setup1.72 => libboost_math_c991.79} (100%)
 rename srcpkgs/{libboost_math_c991.72 => libboost_math_c99f1.79} (100%)
 rename srcpkgs/{libboost_math_c99f1.72 => libboost_math_c99l1.79} (100%)
 rename srcpkgs/{libboost_math_c99l1.72 => libboost_math_tr11.79} (100%)
 rename srcpkgs/{libboost_math_tr11.72 => libboost_math_tr1f1.79} (100%)
 rename srcpkgs/{libboost_math_tr1f1.72 => libboost_math_tr1l1.79} (100%)
 rename srcpkgs/{libboost_math_tr1l1.72 => libboost_prg_exec_monitor1.79} (100%)
 rename srcpkgs/{libboost_prg_exec_monitor1.72 => libboost_program_options1.79} (100%)
 rename srcpkgs/{libboost_program_options1.72 => libboost_random1.79} (100%)
 rename srcpkgs/{libboost_random1.72 => libboost_regex1.79} (100%)
 rename srcpkgs/{libboost_regex1.72 => libboost_serialization1.79} (100%)
 rename srcpkgs/{libboost_serialization1.72 => libboost_system1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_addr2line1.72 => libboost_thread1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_basic1.72 => libboost_timer1.79} (100%)
 delete mode 120000 srcpkgs/libboost_type_erasure1.72
 rename srcpkgs/{libboost_stacktrace_noop1.72 => libboost_type_erasure1.79} (100%)
 delete mode 120000 srcpkgs/libboost_unit_test_framework1.72
 rename srcpkgs/{libboost_system1.72 => libboost_unit_test_framework1.79} (100%)
 delete mode 120000 srcpkgs/libboost_wave1.72
 rename srcpkgs/{libboost_thread1.72 => libboost_wave1.79} (100%)
 delete mode 120000 srcpkgs/libboost_wserialization1.72
 rename srcpkgs/{libboost_timer1.72 => libboost_wserialization1.79} (100%)

diff --git a/common/shlibs b/common/shlibs
index 83b5783cb026..9bc15791e719 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -620,38 +620,34 @@ 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.79.0 libboost_context1.79-1.79.0.b1_1
+libboost_coroutine.so.1.79.0 libboost_coroutine1.79-1.79.0.b1_1
+libboost_container.so.1.79.0 libboost_container1.79-1.79.0.b1_1
+libboost_prg_exec_monitor.so.1.79.0 libboost_prg_exec_monitor1.79-1.79.0.b1_1
+libboost_timer.so.1.79.0 libboost_timer1.79-1.79.0.b1_1
+libboost_random.so.1.79.0 libboost_random1.79-1.79.0.b1_1
+libboost_filesystem.so.1.79.0 libboost_filesystem1.79-1.79.0.b1_1
+libboost_unit_test_framework.so.1.79.0 libboost_unit_test_framework1.79-1.79.0.b1_1
+libboost_math_c99.so.1.79.0 libboost_math_c991.79-1.79.0.b1_1
+libboost_math_tr1.so.1.79.0 libboost_math_tr11.79-1.79.0.b1_1
+libboost_regex.so.1.79.0 libboost_regex1.79-1.79.0.b1_1
+libboost_serialization.so.1.79.0 libboost_serialization1.79-1.79.0.b1_1
+libboost_chrono.so.1.79.0 libboost_chrono1.79-1.79.0.b1_1
+libboost_wserialization.so.1.79.0 libboost_wserialization1.79-1.79.0.b1_1
+libboost_graph.so.1.79.0 libboost_graph1.79-1.79.0.b1_1
+libboost_log.so.1.79.0 libboost_log1.79-1.79.0.b1_1
+libboost_locale.so.1.79.0 libboost_locale1.79-1.79.0.b1_1
+libboost_program_options.so.1.79.0 libboost_program_options1.79-1.79.0.b1_1
+libboost_iostreams.so.1.79.0 libboost_iostreams1.79-1.79.0.b1_1
+libboost_system.so.1.79.0 libboost_system1.79-1.79.0.b1_1
+libboost_thread.so.1.79.0 libboost_thread1.79-1.79.0.b1_1
+libboost_log_setup.so.1.79.0 libboost_log_setup1.79-1.79.0.b1_1
+libboost_date_time.so.1.79.0 libboost_date_time1.79-1.79.0.b1_1
+libboost_wave.so.1.79.0 libboost_wave1.79-1.79.0.b1_1
+libboost_atomic.so.1.79.0 libboost_atomic1.79-1.79.0.b1_1
+libboost_type_erasure.so.1.79.0 libboost_type_erasure1.79-1.79.0.b1_1
+libboost_python27.so.1.79.0 boost-python1.79-1.79.0.b1_1
+libboost_python310.so.1.79.0 boost-python3-1.79-1.79.0.b1_1
 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-python1.79
similarity index 100%
rename from srcpkgs/boost-python1.72
rename to srcpkgs/boost-python1.79
diff --git a/srcpkgs/boost-python3-1.72 b/srcpkgs/boost-python3-1.79
similarity index 100%
rename from srcpkgs/boost-python3-1.72
rename to srcpkgs/boost-python3-1.79
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/mips.patch b/srcpkgs/boost/patches/mips.patch
index a10a2122d9c7..8d253fc7c286 100644
--- a/srcpkgs/boost/patches/mips.patch
+++ b/srcpkgs/boost/patches/mips.patch
@@ -3,7 +3,7 @@
 @@ -48,7 +48,7 @@
  #  define cpu_relax() asm volatile ("nop" ::: "memory");
  # endif
- #elif BOOST_ARCH_MIPS
+ #elif BOOST_ARCH_MIPS && (((__mips_isa_rev > 1) && defined(__mips32)) || ((__mips_isa_rev > 2)  && defined(__mips64)))
 -# define cpu_relax() asm volatile ("pause" ::: "memory");
 +# define cpu_relax() asm volatile ("nop" ::: "memory");
  #elif BOOST_ARCH_PPC
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 126c50770b50..07ea6cfecc54 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,16 +1,17 @@
 # Template file for 'boost'
 pkgname=boost
-version=1.72.0
-revision=7
-wrksrc="${pkgname}_${version//\./_}"
+version=1.79.0.b1
+revision=1
+wrksrc="${pkgname}_${version%.*}"
+wrksrc="${wrksrc//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-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
+distfiles="https://boostorg.jfrog.io/artifactory/main/beta/${version/b1/beta1}/source/boost_${version//./_}.tar.bz2"
+checksum=8985105623f48d55be01076d98ca4e7a8cb548a8d7f9ad0e1fc3c710d2c75fcf
 python_version=3
 
 CXXFLAGS="-std=c++14"
@@ -31,24 +32,19 @@ replaces="libboost_program_options1.69>=0 libboost_math_c99f1.69>=0
  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"
-
-if [ -z "$CROSS_BUILD" ]; then
-	subpackages+=" libboost_stacktrace_addr2line1.72"
-fi
+subpackages="libboost_program_options1.79 libboost_math_c99f1.79
+ libboost_iostreams1.79 libboost_math_tr1l1.79 libboost_filesystem1.79
+ libboost_chrono1.79 libboost_math_tr1f1.79 libboost_wave1.79
+ libboost_graph1.79 libboost_locale1.79 libboost_regex1.79
+ libboost_type_erasure1.79 libboost_coroutine1.79
+ libboost_atomic1.79 libboost_prg_exec_monitor1.79 libboost_math_c991.79
+ boost-python3-1.79 libboost_log_setup1.79 boost-devel
+ libboost_timer1.79 libboost_system1.79 libboost_unit_test_framework1.79
+ libboost_serialization1.79 libboost_math_tr11.79 boost-build
+ libboost_math_c99l1.79 boost-python1.79 libboost_contract1.79
+ libboost_date_time1.79 libboost_log1.79 libboost_random1.79
+ libboost_thread1.79 libboost_container1.79 boost-jam
+ libboost_wserialization1.79 libboost_context1.79"
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*)    _arch=x86;      _abi=sysv  ;;
@@ -74,10 +70,8 @@ do_build() {
 	using python : ${py3_ver} : ${XBPS_CROSS_BASE}/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} \
 		threading=multi runtime-link=shared link=shared,static
 }
@@ -119,7 +113,7 @@ boost-jam_package() {
 		vmove usr/bin/b2
 	}
 }
-boost-python1.72_package() {
+boost-python1.79_package() {
 	depends="boost python"
 	replaces="boost-python>=0"
 	short_desc+=" - Python bindings"
@@ -127,7 +121,7 @@ boost-python1.72_package() {
 		vmove "usr/lib/libboost_python2*.so.*"
 	}
 }
-boost-python3-1.72_package() {
+boost-python3-1.79_package() {
 	depends="boost python3"
 	replaces="boost-python3>=0"
 	short_desc+=" - Python3 bindings"
@@ -154,7 +148,7 @@ boost-devel_package() {
 	}
 }
 
-libboost_atomic1.72_package() {
+libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
@@ -162,7 +156,7 @@ libboost_atomic1.72_package() {
 	}
 }
 
-libboost_chrono1.72_package() {
+libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
@@ -170,7 +164,7 @@ libboost_chrono1.72_package() {
 	}
 }
 
-libboost_container1.72_package() {
+libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
@@ -178,7 +172,7 @@ libboost_container1.72_package() {
 	}
 }
 
-libboost_context1.72_package() {
+libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
@@ -186,7 +180,7 @@ libboost_context1.72_package() {
 	}
 }
 
-libboost_contract1.72_package() {
+libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
@@ -194,7 +188,7 @@ libboost_contract1.72_package() {
 	}
 }
 
-libboost_coroutine1.72_package() {
+libboost_coroutine1.79_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.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
@@ -210,15 +204,7 @@ libboost_date_time1.72_package() {
 	}
 }
 
-libboost_fiber1.72_package() {
-	depends="boost"
-	short_desc+=" - libboost_fiber"
-	pkg_install() {
-		vmove usr/lib/libboost_fiber.so.*
-	}
-}
-
-libboost_filesystem1.72_package() {
+libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
@@ -226,7 +212,7 @@ libboost_filesystem1.72_package() {
 	}
 }
 
-libboost_graph1.72_package() {
+libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
@@ -234,7 +220,7 @@ libboost_graph1.72_package() {
 	}
 }
 
-libboost_iostreams1.72_package() {
+libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
@@ -242,7 +228,7 @@ libboost_iostreams1.72_package() {
 	}
 }
 
-libboost_locale1.72_package() {
+libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
@@ -250,7 +236,7 @@ libboost_locale1.72_package() {
 	}
 }
 
-libboost_log1.72_package() {
+libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
@@ -258,7 +244,7 @@ libboost_log1.72_package() {
 	}
 }
 
-libboost_log_setup1.72_package() {
+libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
@@ -266,7 +252,7 @@ libboost_log_setup1.72_package() {
 	}
 }
 
-libboost_math_c991.72_package() {
+libboost_math_c991.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
@@ -274,7 +260,7 @@ libboost_math_c991.72_package() {
 	}
 }
 
-libboost_math_c99f1.72_package() {
+libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
@@ -282,7 +268,7 @@ libboost_math_c99f1.72_package() {
 	}
 }
 
-libboost_math_c99l1.72_package() {
+libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
@@ -290,7 +276,7 @@ libboost_math_c99l1.72_package() {
 	}
 }
 
-libboost_math_tr11.72_package() {
+libboost_math_tr11.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
@@ -298,7 +284,7 @@ libboost_math_tr11.72_package() {
 	}
 }
 
-libboost_math_tr1f1.72_package() {
+libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
@@ -306,7 +292,7 @@ libboost_math_tr1f1.72_package() {
 	}
 }
 
-libboost_math_tr1l1.72_package() {
+libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
@@ -314,7 +300,7 @@ libboost_math_tr1l1.72_package() {
 	}
 }
 
-libboost_prg_exec_monitor1.72_package() {
+libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
@@ -322,7 +308,7 @@ libboost_prg_exec_monitor1.72_package() {
 	}
 }
 
-libboost_program_options1.72_package() {
+libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
@@ -330,7 +316,7 @@ libboost_program_options1.72_package() {
 	}
 }
 
-libboost_random1.72_package() {
+libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
@@ -338,7 +324,7 @@ libboost_random1.72_package() {
 	}
 }
 
-libboost_regex1.72_package() {
+libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
@@ -346,7 +332,7 @@ libboost_regex1.72_package() {
 	}
 }
 
-libboost_serialization1.72_package() {
+libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
@@ -354,31 +340,7 @@ libboost_serialization1.72_package() {
 	}
 }
 
-libboost_stacktrace_addr2line1.72_package() {
-	depends="boost"
-	short_desc+=" - libboost_stacktrace_addr2line"
-	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_addr2line.so.*
-	}
-}
-
-libboost_stacktrace_basic1.72_package() {
-	depends="boost"
-	short_desc+=" - libboost_stacktrace_basic"
-	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_basic.so.*
-	}
-}
-
-libboost_stacktrace_noop1.72_package() {
-	depends="boost"
-	short_desc+=" - libboost_stacktrace_noop"
-	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_noop.so.*
-	}
-}
-
-libboost_system1.72_package() {
+libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
@@ -386,7 +348,7 @@ libboost_system1.72_package() {
 	}
 }
 
-libboost_thread1.72_package() {
+libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
@@ -394,7 +356,7 @@ libboost_thread1.72_package() {
 	}
 }
 
-libboost_timer1.72_package() {
+libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
@@ -402,7 +364,7 @@ libboost_timer1.72_package() {
 	}
 }
 
-libboost_type_erasure1.72_package() {
+libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
@@ -410,7 +372,7 @@ libboost_type_erasure1.72_package() {
 	}
 }
 
-libboost_unit_test_framework1.72_package() {
+libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
@@ -418,7 +380,7 @@ libboost_unit_test_framework1.72_package() {
 	}
 }
 
-libboost_wave1.72_package() {
+libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
@@ -426,7 +388,7 @@ libboost_wave1.72_package() {
 	}
 }
 
-libboost_wserialization1.72_package() {
+libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
diff --git a/srcpkgs/libboost_atomic1.72 b/srcpkgs/libboost_atomic1.79
similarity index 100%
rename from srcpkgs/libboost_atomic1.72
rename to srcpkgs/libboost_atomic1.79
diff --git a/srcpkgs/libboost_chrono1.72 b/srcpkgs/libboost_chrono1.79
similarity index 100%
rename from srcpkgs/libboost_chrono1.72
rename to srcpkgs/libboost_chrono1.79
diff --git a/srcpkgs/libboost_container1.72 b/srcpkgs/libboost_container1.79
similarity index 100%
rename from srcpkgs/libboost_container1.72
rename to srcpkgs/libboost_container1.79
diff --git a/srcpkgs/libboost_context1.72 b/srcpkgs/libboost_context1.79
similarity index 100%
rename from srcpkgs/libboost_context1.72
rename to srcpkgs/libboost_context1.79
diff --git a/srcpkgs/libboost_contract1.72 b/srcpkgs/libboost_contract1.79
similarity index 100%
rename from srcpkgs/libboost_contract1.72
rename to srcpkgs/libboost_contract1.79
diff --git a/srcpkgs/libboost_coroutine1.72 b/srcpkgs/libboost_coroutine1.79
similarity index 100%
rename from srcpkgs/libboost_coroutine1.72
rename to srcpkgs/libboost_coroutine1.79
diff --git a/srcpkgs/libboost_date_time1.72 b/srcpkgs/libboost_date_time1.79
similarity index 100%
rename from srcpkgs/libboost_date_time1.72
rename to srcpkgs/libboost_date_time1.79
diff --git a/srcpkgs/libboost_fiber1.72 b/srcpkgs/libboost_filesystem1.79
similarity index 100%
rename from srcpkgs/libboost_fiber1.72
rename to srcpkgs/libboost_filesystem1.79
diff --git a/srcpkgs/libboost_filesystem1.72 b/srcpkgs/libboost_graph1.79
similarity index 100%
rename from srcpkgs/libboost_filesystem1.72
rename to srcpkgs/libboost_graph1.79
diff --git a/srcpkgs/libboost_graph1.72 b/srcpkgs/libboost_iostreams1.79
similarity index 100%
rename from srcpkgs/libboost_graph1.72
rename to srcpkgs/libboost_iostreams1.79
diff --git a/srcpkgs/libboost_iostreams1.72 b/srcpkgs/libboost_locale1.79
similarity index 100%
rename from srcpkgs/libboost_iostreams1.72
rename to srcpkgs/libboost_locale1.79
diff --git a/srcpkgs/libboost_locale1.72 b/srcpkgs/libboost_log1.79
similarity index 100%
rename from srcpkgs/libboost_locale1.72
rename to srcpkgs/libboost_log1.79
diff --git a/srcpkgs/libboost_log1.72 b/srcpkgs/libboost_log_setup1.79
similarity index 100%
rename from srcpkgs/libboost_log1.72
rename to srcpkgs/libboost_log_setup1.79
diff --git a/srcpkgs/libboost_log_setup1.72 b/srcpkgs/libboost_math_c991.79
similarity index 100%
rename from srcpkgs/libboost_log_setup1.72
rename to srcpkgs/libboost_math_c991.79
diff --git a/srcpkgs/libboost_math_c991.72 b/srcpkgs/libboost_math_c99f1.79
similarity index 100%
rename from srcpkgs/libboost_math_c991.72
rename to srcpkgs/libboost_math_c99f1.79
diff --git a/srcpkgs/libboost_math_c99f1.72 b/srcpkgs/libboost_math_c99l1.79
similarity index 100%
rename from srcpkgs/libboost_math_c99f1.72
rename to srcpkgs/libboost_math_c99l1.79
diff --git a/srcpkgs/libboost_math_c99l1.72 b/srcpkgs/libboost_math_tr11.79
similarity index 100%
rename from srcpkgs/libboost_math_c99l1.72
rename to srcpkgs/libboost_math_tr11.79
diff --git a/srcpkgs/libboost_math_tr11.72 b/srcpkgs/libboost_math_tr1f1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr11.72
rename to srcpkgs/libboost_math_tr1f1.79
diff --git a/srcpkgs/libboost_math_tr1f1.72 b/srcpkgs/libboost_math_tr1l1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1f1.72
rename to srcpkgs/libboost_math_tr1l1.79
diff --git a/srcpkgs/libboost_math_tr1l1.72 b/srcpkgs/libboost_prg_exec_monitor1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1l1.72
rename to srcpkgs/libboost_prg_exec_monitor1.79
diff --git a/srcpkgs/libboost_prg_exec_monitor1.72 b/srcpkgs/libboost_program_options1.79
similarity index 100%
rename from srcpkgs/libboost_prg_exec_monitor1.72
rename to srcpkgs/libboost_program_options1.79
diff --git a/srcpkgs/libboost_program_options1.72 b/srcpkgs/libboost_random1.79
similarity index 100%
rename from srcpkgs/libboost_program_options1.72
rename to srcpkgs/libboost_random1.79
diff --git a/srcpkgs/libboost_random1.72 b/srcpkgs/libboost_regex1.79
similarity index 100%
rename from srcpkgs/libboost_random1.72
rename to srcpkgs/libboost_regex1.79
diff --git a/srcpkgs/libboost_regex1.72 b/srcpkgs/libboost_serialization1.79
similarity index 100%
rename from srcpkgs/libboost_regex1.72
rename to srcpkgs/libboost_serialization1.79
diff --git a/srcpkgs/libboost_serialization1.72 b/srcpkgs/libboost_system1.79
similarity index 100%
rename from srcpkgs/libboost_serialization1.72
rename to srcpkgs/libboost_system1.79
diff --git a/srcpkgs/libboost_stacktrace_addr2line1.72 b/srcpkgs/libboost_thread1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_addr2line1.72
rename to srcpkgs/libboost_thread1.79
diff --git a/srcpkgs/libboost_stacktrace_basic1.72 b/srcpkgs/libboost_timer1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_basic1.72
rename to srcpkgs/libboost_timer1.79
diff --git a/srcpkgs/libboost_type_erasure1.72 b/srcpkgs/libboost_type_erasure1.72
deleted file mode 120000
index baef819c48f6..000000000000
--- a/srcpkgs/libboost_type_erasure1.72
+++ /dev/null
@@ -1 +0,0 @@
-boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_stacktrace_noop1.72 b/srcpkgs/libboost_type_erasure1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_noop1.72
rename to srcpkgs/libboost_type_erasure1.79
diff --git a/srcpkgs/libboost_unit_test_framework1.72 b/srcpkgs/libboost_unit_test_framework1.72
deleted file mode 120000
index baef819c48f6..000000000000
--- a/srcpkgs/libboost_unit_test_framework1.72
+++ /dev/null
@@ -1 +0,0 @@
-boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_system1.72 b/srcpkgs/libboost_unit_test_framework1.79
similarity index 100%
rename from srcpkgs/libboost_system1.72
rename to srcpkgs/libboost_unit_test_framework1.79
diff --git a/srcpkgs/libboost_wave1.72 b/srcpkgs/libboost_wave1.72
deleted file mode 120000
index baef819c48f6..000000000000
--- a/srcpkgs/libboost_wave1.72
+++ /dev/null
@@ -1 +0,0 @@
-boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_thread1.72 b/srcpkgs/libboost_wave1.79
similarity index 100%
rename from srcpkgs/libboost_thread1.72
rename to srcpkgs/libboost_wave1.79
diff --git a/srcpkgs/libboost_wserialization1.72 b/srcpkgs/libboost_wserialization1.72
deleted file mode 120000
index baef819c48f6..000000000000
--- a/srcpkgs/libboost_wserialization1.72
+++ /dev/null
@@ -1 +0,0 @@
-boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_timer1.72 b/srcpkgs/libboost_wserialization1.79
similarity index 100%
rename from srcpkgs/libboost_timer1.72
rename to srcpkgs/libboost_wserialization1.79

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR REVIEW] boost: update to 1.79.0.b1.
  2022-03-18 14:28 [PR PATCH] boost: update to 1.79.0.b1 JamiKettunen
@ 2022-03-18 14:32 ` ahesford
  2022-03-18 14:32 ` ahesford
                   ` (27 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: ahesford @ 2022-03-18 14:32 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 287 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/36204#discussion_r830057554

Comment:
If you're dropping the no-cross `libboost_stacktrace_addr2line1.72`,  you should be able to just drop the entier `subpackages` declaration.

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR REVIEW] boost: update to 1.79.0.b1.
  2022-03-18 14:28 [PR PATCH] boost: update to 1.79.0.b1 JamiKettunen
  2022-03-18 14:32 ` [PR REVIEW] " ahesford
@ 2022-03-18 14:32 ` ahesford
  2022-03-18 14:37 ` Johnnynator
                   ` (26 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: ahesford @ 2022-03-18 14:32 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 287 bytes --]

New review comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/36204#discussion_r830057554

Comment:
If you're dropping the no-cross `libboost_stacktrace_addr2line1.72`,  you should be able to just drop the entire `subpackages` declaration.

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR REVIEW] boost: update to 1.79.0.b1.
  2022-03-18 14:28 [PR PATCH] boost: update to 1.79.0.b1 JamiKettunen
  2022-03-18 14:32 ` [PR REVIEW] " ahesford
  2022-03-18 14:32 ` ahesford
@ 2022-03-18 14:37 ` Johnnynator
  2022-03-18 14:38 ` [PR PATCH] [Updated] " JamiKettunen
                   ` (25 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: Johnnynator @ 2022-03-18 14:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 276 bytes --]

New review comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/36204#discussion_r830061987

Comment:
subpackages is currently abused  in `boost-devel` as a list of deps, so you would have to move the list of packages to there.

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] boost: update to 1.79.0.b1.
  2022-03-18 14:28 [PR PATCH] boost: update to 1.79.0.b1 JamiKettunen
                   ` (2 preceding siblings ...)
  2022-03-18 14:37 ` Johnnynator
@ 2022-03-18 14:38 ` JamiKettunen
  2022-03-18 16:32 ` JamiKettunen
                   ` (24 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: JamiKettunen @ 2022-03-18 14:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3804 bytes --]

There is an updated pull request by JamiKettunen against master on the void-packages repository

https://github.com/JamiKettunen/void-packages boost-1.79.0
https://github.com/void-linux/void-packages/pull/36204

boost: update to 1.79.0.b1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Current issues
Cross-compilation fails due to `bjam` building for the host instead of the target:
```
$ ./xbps-src pkg -a aarch64-musl boost
...
=> boost-1.79.0.b1_1: running post-install hook: 06-strip-and-debug-pkgs ...
   Stripped library: /usr/lib/libboost_json.so.1.79.0
   Stripped library: /usr/lib/libboost_nowide.so.1.79.0
/usr/bin/aarch64-linux-musl-strip: Unable to recognise the format of the input file `/destdir/aarch64-linux-musl/boost-1.79.0.b1/usr/bin/bjam'
=> ERROR: boost-1.79.0.b1_1: failed to strip /usr/bin/bjam
=> ERROR: boost-1.79.0.b1_1: post-install_06-strip-and-debug-pkgs: 'find ${PKGDESTDIR} -type f' exited with 1
=> ERROR:   in hook() at common/hooks/post-install/06-strip-and-debug-pkgs.sh:68
=> ERROR:   in run_func() at common/xbps-src/shutils/common.sh:21
=> ERROR:   in run_pkg_hooks() at common/xbps-src/shutils/common.sh:245
=> ERROR:   in main() at common/xbps-src/libexec/xbps-src-doinstall.sh:66
$ file masterdir/destdir/aarch64-linux-musl/boost-jam-1.79.0.b1/usr/bin/bjam 
masterdir/destdir/aarch64-linux-musl/boost-jam-1.79.0.b1/usr/bin/bjam: ELF 64-bit LSB pie executable, x86-64, version 1 (SYSV), dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, BuildID[sha1]=861bc7f944396eb219efdc4e618e58125088d6aa, for GNU/Linux 3.2.0, stripped
```
Attempting to build any software against the newly built `boost-devel` package causes e.g. the following:
```
$ ./xbps-src pkg gnuradio
...
=> gnuradio-3.8.0.0_10: installing target dependencies: SDL-devel-1.2.15_12 boost-devel-1.79.0.b1_1 fftw-devel-3.3.10_1 gsl-devel-2.7.1_1 jack-devel-1.9.20_1 libgsm-devel-1.0.19_1 libusb-devel-1.0.25_1 volk-devel-2.5.1_1 uhd-devel-4.0.0.0_1 gtk+3-devel-3.24.31_1 python3-devel-3.10.3_1 python3-gobject-devel-3.42.0_1 log4cpp-devel-1.1.3_2 gmpxx-devel-6.2.1_1 mpir-devel-3.0.0_1 ...
=> gnuradio-3.8.0.0_10: removing autodeps, please wait...
=> ERROR: gnuradio-3.8.0.0_10: failed to install target dependencies! (error 40)
=> ERROR: Please see above for the real error, exiting...
```

Additionally a few shared objects aren't built anymore for some reason, namely `libboost_stacktrace_{addr2line,basic,noop}.so.*` & `libboost_fiber.so.*`, so I dropped their subpackages for now.

#### Modified patches
`exec_file.patch`: Removed due to being upstream as https://github.com/boostorg/python/commit/d9f06052e28873037db7f98629bce72182a42410
`mips.patch`: Updated to apply on top of https://github.com/boostorg/fiber/commit/5dc9dabc5d5ff8da53ec897c265c9cba1b6ed0df, not sure if this can be removed now(?)

#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36204.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boost-1.79.0-36204.patch --]
[-- Type: text/x-diff, Size: 29561 bytes --]

From 587100ba76a237f5ad2774b959e89d4cddece328 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 15:28:37 +0200
Subject: [PATCH] boost: update to 1.79.0.b1.

[ci skip] this doesn't even build locally correctly yet
---
 common/shlibs                                 |  60 ++++----
 .../{boost-python1.72 => boost-python1.79}    |   0
 ...{boost-python3-1.72 => boost-python3-1.79} |   0
 srcpkgs/boost/patches/exec_file.patch         |  45 ------
 srcpkgs/boost/patches/mips.patch              |   2 +-
 srcpkgs/boost/template                        | 130 ++++++------------
 ...ibboost_atomic1.72 => libboost_atomic1.79} |   0
 ...ibboost_chrono1.72 => libboost_chrono1.79} |   0
 ...t_container1.72 => libboost_container1.79} |   0
 ...boost_context1.72 => libboost_context1.79} |   0
 ...ost_contract1.72 => libboost_contract1.79} |   0
 ...t_coroutine1.72 => libboost_coroutine1.79} |   0
 ...t_date_time1.72 => libboost_date_time1.79} |   0
 ...oost_fiber1.72 => libboost_filesystem1.79} |   0
 ...oost_filesystem1.72 => libboost_graph1.79} |   0
 ...boost_graph1.72 => libboost_iostreams1.79} |   0
 ...oost_iostreams1.72 => libboost_locale1.79} |   0
 .../{libboost_locale1.72 => libboost_log1.79} |   0
 ...ibboost_log1.72 => libboost_log_setup1.79} |   0
 ...st_log_setup1.72 => libboost_math_c991.79} |   0
 ...st_math_c991.72 => libboost_math_c99f1.79} |   0
 ...t_math_c99f1.72 => libboost_math_c99l1.79} |   0
 ...st_math_c99l1.72 => libboost_math_tr11.79} |   0
 ...st_math_tr11.72 => libboost_math_tr1f1.79} |   0
 ...t_math_tr1f1.72 => libboost_math_tr1l1.79} |   0
 ...tr1l1.72 => libboost_prg_exec_monitor1.79} |   0
 ...nitor1.72 => libboost_program_options1.79} |   0
 ...rogram_options1.72 => libboost_random1.79} |   0
 ...libboost_random1.72 => libboost_regex1.79} |   0
 ...t_regex1.72 => libboost_serialization1.79} |   0
 ..._serialization1.72 => libboost_system1.79} |   0
 ...race_addr2line1.72 => libboost_thread1.79} |   0
 ...tacktrace_basic1.72 => libboost_timer1.79} |   0
 srcpkgs/libboost_type_erasure1.72             |   1 -
 ...ace_noop1.72 => libboost_type_erasure1.79} |   0
 srcpkgs/libboost_unit_test_framework1.72      |   1 -
 ...m1.72 => libboost_unit_test_framework1.79} |   0
 srcpkgs/libboost_wave1.72                     |   1 -
 ...{libboost_thread1.72 => libboost_wave1.79} |   0
 srcpkgs/libboost_wserialization1.72           |   1 -
 ..._timer1.72 => libboost_wserialization1.79} |   0
 41 files changed, 68 insertions(+), 173 deletions(-)
 rename srcpkgs/{boost-python1.72 => boost-python1.79} (100%)
 rename srcpkgs/{boost-python3-1.72 => boost-python3-1.79} (100%)
 delete mode 100644 srcpkgs/boost/patches/exec_file.patch
 rename srcpkgs/{libboost_atomic1.72 => libboost_atomic1.79} (100%)
 rename srcpkgs/{libboost_chrono1.72 => libboost_chrono1.79} (100%)
 rename srcpkgs/{libboost_container1.72 => libboost_container1.79} (100%)
 rename srcpkgs/{libboost_context1.72 => libboost_context1.79} (100%)
 rename srcpkgs/{libboost_contract1.72 => libboost_contract1.79} (100%)
 rename srcpkgs/{libboost_coroutine1.72 => libboost_coroutine1.79} (100%)
 rename srcpkgs/{libboost_date_time1.72 => libboost_date_time1.79} (100%)
 rename srcpkgs/{libboost_fiber1.72 => libboost_filesystem1.79} (100%)
 rename srcpkgs/{libboost_filesystem1.72 => libboost_graph1.79} (100%)
 rename srcpkgs/{libboost_graph1.72 => libboost_iostreams1.79} (100%)
 rename srcpkgs/{libboost_iostreams1.72 => libboost_locale1.79} (100%)
 rename srcpkgs/{libboost_locale1.72 => libboost_log1.79} (100%)
 rename srcpkgs/{libboost_log1.72 => libboost_log_setup1.79} (100%)
 rename srcpkgs/{libboost_log_setup1.72 => libboost_math_c991.79} (100%)
 rename srcpkgs/{libboost_math_c991.72 => libboost_math_c99f1.79} (100%)
 rename srcpkgs/{libboost_math_c99f1.72 => libboost_math_c99l1.79} (100%)
 rename srcpkgs/{libboost_math_c99l1.72 => libboost_math_tr11.79} (100%)
 rename srcpkgs/{libboost_math_tr11.72 => libboost_math_tr1f1.79} (100%)
 rename srcpkgs/{libboost_math_tr1f1.72 => libboost_math_tr1l1.79} (100%)
 rename srcpkgs/{libboost_math_tr1l1.72 => libboost_prg_exec_monitor1.79} (100%)
 rename srcpkgs/{libboost_prg_exec_monitor1.72 => libboost_program_options1.79} (100%)
 rename srcpkgs/{libboost_program_options1.72 => libboost_random1.79} (100%)
 rename srcpkgs/{libboost_random1.72 => libboost_regex1.79} (100%)
 rename srcpkgs/{libboost_regex1.72 => libboost_serialization1.79} (100%)
 rename srcpkgs/{libboost_serialization1.72 => libboost_system1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_addr2line1.72 => libboost_thread1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_basic1.72 => libboost_timer1.79} (100%)
 delete mode 120000 srcpkgs/libboost_type_erasure1.72
 rename srcpkgs/{libboost_stacktrace_noop1.72 => libboost_type_erasure1.79} (100%)
 delete mode 120000 srcpkgs/libboost_unit_test_framework1.72
 rename srcpkgs/{libboost_system1.72 => libboost_unit_test_framework1.79} (100%)
 delete mode 120000 srcpkgs/libboost_wave1.72
 rename srcpkgs/{libboost_thread1.72 => libboost_wave1.79} (100%)
 delete mode 120000 srcpkgs/libboost_wserialization1.72
 rename srcpkgs/{libboost_timer1.72 => libboost_wserialization1.79} (100%)

diff --git a/common/shlibs b/common/shlibs
index 83b5783cb026..9bc15791e719 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -620,38 +620,34 @@ 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.79.0 libboost_context1.79-1.79.0.b1_1
+libboost_coroutine.so.1.79.0 libboost_coroutine1.79-1.79.0.b1_1
+libboost_container.so.1.79.0 libboost_container1.79-1.79.0.b1_1
+libboost_prg_exec_monitor.so.1.79.0 libboost_prg_exec_monitor1.79-1.79.0.b1_1
+libboost_timer.so.1.79.0 libboost_timer1.79-1.79.0.b1_1
+libboost_random.so.1.79.0 libboost_random1.79-1.79.0.b1_1
+libboost_filesystem.so.1.79.0 libboost_filesystem1.79-1.79.0.b1_1
+libboost_unit_test_framework.so.1.79.0 libboost_unit_test_framework1.79-1.79.0.b1_1
+libboost_math_c99.so.1.79.0 libboost_math_c991.79-1.79.0.b1_1
+libboost_math_tr1.so.1.79.0 libboost_math_tr11.79-1.79.0.b1_1
+libboost_regex.so.1.79.0 libboost_regex1.79-1.79.0.b1_1
+libboost_serialization.so.1.79.0 libboost_serialization1.79-1.79.0.b1_1
+libboost_chrono.so.1.79.0 libboost_chrono1.79-1.79.0.b1_1
+libboost_wserialization.so.1.79.0 libboost_wserialization1.79-1.79.0.b1_1
+libboost_graph.so.1.79.0 libboost_graph1.79-1.79.0.b1_1
+libboost_log.so.1.79.0 libboost_log1.79-1.79.0.b1_1
+libboost_locale.so.1.79.0 libboost_locale1.79-1.79.0.b1_1
+libboost_program_options.so.1.79.0 libboost_program_options1.79-1.79.0.b1_1
+libboost_iostreams.so.1.79.0 libboost_iostreams1.79-1.79.0.b1_1
+libboost_system.so.1.79.0 libboost_system1.79-1.79.0.b1_1
+libboost_thread.so.1.79.0 libboost_thread1.79-1.79.0.b1_1
+libboost_log_setup.so.1.79.0 libboost_log_setup1.79-1.79.0.b1_1
+libboost_date_time.so.1.79.0 libboost_date_time1.79-1.79.0.b1_1
+libboost_wave.so.1.79.0 libboost_wave1.79-1.79.0.b1_1
+libboost_atomic.so.1.79.0 libboost_atomic1.79-1.79.0.b1_1
+libboost_type_erasure.so.1.79.0 libboost_type_erasure1.79-1.79.0.b1_1
+libboost_python27.so.1.79.0 boost-python1.79-1.79.0.b1_1
+libboost_python310.so.1.79.0 boost-python3-1.79-1.79.0.b1_1
 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-python1.79
similarity index 100%
rename from srcpkgs/boost-python1.72
rename to srcpkgs/boost-python1.79
diff --git a/srcpkgs/boost-python3-1.72 b/srcpkgs/boost-python3-1.79
similarity index 100%
rename from srcpkgs/boost-python3-1.72
rename to srcpkgs/boost-python3-1.79
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/mips.patch b/srcpkgs/boost/patches/mips.patch
index a10a2122d9c7..8d253fc7c286 100644
--- a/srcpkgs/boost/patches/mips.patch
+++ b/srcpkgs/boost/patches/mips.patch
@@ -3,7 +3,7 @@
 @@ -48,7 +48,7 @@
  #  define cpu_relax() asm volatile ("nop" ::: "memory");
  # endif
- #elif BOOST_ARCH_MIPS
+ #elif BOOST_ARCH_MIPS && (((__mips_isa_rev > 1) && defined(__mips32)) || ((__mips_isa_rev > 2)  && defined(__mips64)))
 -# define cpu_relax() asm volatile ("pause" ::: "memory");
 +# define cpu_relax() asm volatile ("nop" ::: "memory");
  #elif BOOST_ARCH_PPC
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 126c50770b50..4865a1290811 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,16 +1,17 @@
 # Template file for 'boost'
 pkgname=boost
-version=1.72.0
-revision=7
-wrksrc="${pkgname}_${version//\./_}"
+version=1.79.0.b1
+revision=1
+wrksrc="${pkgname}_${version%.*}"
+wrksrc="${wrksrc//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-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
+distfiles="https://boostorg.jfrog.io/artifactory/main/beta/${version/b1/beta1}/source/boost_${version//./_}.tar.bz2"
+checksum=8985105623f48d55be01076d98ca4e7a8cb548a8d7f9ad0e1fc3c710d2c75fcf
 python_version=3
 
 CXXFLAGS="-std=c++14"
@@ -31,25 +32,6 @@ replaces="libboost_program_options1.69>=0 libboost_math_c99f1.69>=0
  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"
-
-if [ -z "$CROSS_BUILD" ]; then
-	subpackages+=" libboost_stacktrace_addr2line1.72"
-fi
-
 case "$XBPS_TARGET_MACHINE" in
 	i686*)    _arch=x86;      _abi=sysv  ;;
 	x86_64*)  _arch=x86;      _abi=sysv  ;;
@@ -74,10 +56,8 @@ do_build() {
 	using python : ${py3_ver} : ${XBPS_CROSS_BASE}/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} \
 		threading=multi runtime-link=shared link=shared,static
 }
@@ -119,7 +99,7 @@ boost-jam_package() {
 		vmove usr/bin/b2
 	}
 }
-boost-python1.72_package() {
+boost-python1.79_package() {
 	depends="boost python"
 	replaces="boost-python>=0"
 	short_desc+=" - Python bindings"
@@ -127,7 +107,7 @@ boost-python1.72_package() {
 		vmove "usr/lib/libboost_python2*.so.*"
 	}
 }
-boost-python3-1.72_package() {
+boost-python3-1.79_package() {
 	depends="boost python3"
 	replaces="boost-python3>=0"
 	short_desc+=" - Python3 bindings"
@@ -154,7 +134,7 @@ boost-devel_package() {
 	}
 }
 
-libboost_atomic1.72_package() {
+libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
@@ -162,7 +142,7 @@ libboost_atomic1.72_package() {
 	}
 }
 
-libboost_chrono1.72_package() {
+libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
@@ -170,7 +150,7 @@ libboost_chrono1.72_package() {
 	}
 }
 
-libboost_container1.72_package() {
+libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
@@ -178,7 +158,7 @@ libboost_container1.72_package() {
 	}
 }
 
-libboost_context1.72_package() {
+libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
@@ -186,7 +166,7 @@ libboost_context1.72_package() {
 	}
 }
 
-libboost_contract1.72_package() {
+libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
@@ -194,7 +174,7 @@ libboost_contract1.72_package() {
 	}
 }
 
-libboost_coroutine1.72_package() {
+libboost_coroutine1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
@@ -202,7 +182,7 @@ libboost_coroutine1.72_package() {
 	}
 }
 
-libboost_date_time1.72_package() {
+libboost_date_time1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
@@ -210,15 +190,7 @@ libboost_date_time1.72_package() {
 	}
 }
 
-libboost_fiber1.72_package() {
-	depends="boost"
-	short_desc+=" - libboost_fiber"
-	pkg_install() {
-		vmove usr/lib/libboost_fiber.so.*
-	}
-}
-
-libboost_filesystem1.72_package() {
+libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
@@ -226,7 +198,7 @@ libboost_filesystem1.72_package() {
 	}
 }
 
-libboost_graph1.72_package() {
+libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
@@ -234,7 +206,7 @@ libboost_graph1.72_package() {
 	}
 }
 
-libboost_iostreams1.72_package() {
+libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
@@ -242,7 +214,7 @@ libboost_iostreams1.72_package() {
 	}
 }
 
-libboost_locale1.72_package() {
+libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
@@ -250,7 +222,7 @@ libboost_locale1.72_package() {
 	}
 }
 
-libboost_log1.72_package() {
+libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
@@ -258,7 +230,7 @@ libboost_log1.72_package() {
 	}
 }
 
-libboost_log_setup1.72_package() {
+libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
@@ -266,7 +238,7 @@ libboost_log_setup1.72_package() {
 	}
 }
 
-libboost_math_c991.72_package() {
+libboost_math_c991.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
@@ -274,7 +246,7 @@ libboost_math_c991.72_package() {
 	}
 }
 
-libboost_math_c99f1.72_package() {
+libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
@@ -282,7 +254,7 @@ libboost_math_c99f1.72_package() {
 	}
 }
 
-libboost_math_c99l1.72_package() {
+libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
@@ -290,7 +262,7 @@ libboost_math_c99l1.72_package() {
 	}
 }
 
-libboost_math_tr11.72_package() {
+libboost_math_tr11.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
@@ -298,7 +270,7 @@ libboost_math_tr11.72_package() {
 	}
 }
 
-libboost_math_tr1f1.72_package() {
+libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
@@ -306,7 +278,7 @@ libboost_math_tr1f1.72_package() {
 	}
 }
 
-libboost_math_tr1l1.72_package() {
+libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
@@ -314,7 +286,7 @@ libboost_math_tr1l1.72_package() {
 	}
 }
 
-libboost_prg_exec_monitor1.72_package() {
+libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
@@ -322,7 +294,7 @@ libboost_prg_exec_monitor1.72_package() {
 	}
 }
 
-libboost_program_options1.72_package() {
+libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
@@ -330,7 +302,7 @@ libboost_program_options1.72_package() {
 	}
 }
 
-libboost_random1.72_package() {
+libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
@@ -338,7 +310,7 @@ libboost_random1.72_package() {
 	}
 }
 
-libboost_regex1.72_package() {
+libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
@@ -346,7 +318,7 @@ libboost_regex1.72_package() {
 	}
 }
 
-libboost_serialization1.72_package() {
+libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
@@ -354,31 +326,7 @@ libboost_serialization1.72_package() {
 	}
 }
 
-libboost_stacktrace_addr2line1.72_package() {
-	depends="boost"
-	short_desc+=" - libboost_stacktrace_addr2line"
-	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_addr2line.so.*
-	}
-}
-
-libboost_stacktrace_basic1.72_package() {
-	depends="boost"
-	short_desc+=" - libboost_stacktrace_basic"
-	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_basic.so.*
-	}
-}
-
-libboost_stacktrace_noop1.72_package() {
-	depends="boost"
-	short_desc+=" - libboost_stacktrace_noop"
-	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_noop.so.*
-	}
-}
-
-libboost_system1.72_package() {
+libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
@@ -386,7 +334,7 @@ libboost_system1.72_package() {
 	}
 }
 
-libboost_thread1.72_package() {
+libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
@@ -394,7 +342,7 @@ libboost_thread1.72_package() {
 	}
 }
 
-libboost_timer1.72_package() {
+libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
@@ -402,7 +350,7 @@ libboost_timer1.72_package() {
 	}
 }
 
-libboost_type_erasure1.72_package() {
+libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
@@ -410,7 +358,7 @@ libboost_type_erasure1.72_package() {
 	}
 }
 
-libboost_unit_test_framework1.72_package() {
+libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
@@ -418,7 +366,7 @@ libboost_unit_test_framework1.72_package() {
 	}
 }
 
-libboost_wave1.72_package() {
+libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
@@ -426,7 +374,7 @@ libboost_wave1.72_package() {
 	}
 }
 
-libboost_wserialization1.72_package() {
+libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
diff --git a/srcpkgs/libboost_atomic1.72 b/srcpkgs/libboost_atomic1.79
similarity index 100%
rename from srcpkgs/libboost_atomic1.72
rename to srcpkgs/libboost_atomic1.79
diff --git a/srcpkgs/libboost_chrono1.72 b/srcpkgs/libboost_chrono1.79
similarity index 100%
rename from srcpkgs/libboost_chrono1.72
rename to srcpkgs/libboost_chrono1.79
diff --git a/srcpkgs/libboost_container1.72 b/srcpkgs/libboost_container1.79
similarity index 100%
rename from srcpkgs/libboost_container1.72
rename to srcpkgs/libboost_container1.79
diff --git a/srcpkgs/libboost_context1.72 b/srcpkgs/libboost_context1.79
similarity index 100%
rename from srcpkgs/libboost_context1.72
rename to srcpkgs/libboost_context1.79
diff --git a/srcpkgs/libboost_contract1.72 b/srcpkgs/libboost_contract1.79
similarity index 100%
rename from srcpkgs/libboost_contract1.72
rename to srcpkgs/libboost_contract1.79
diff --git a/srcpkgs/libboost_coroutine1.72 b/srcpkgs/libboost_coroutine1.79
similarity index 100%
rename from srcpkgs/libboost_coroutine1.72
rename to srcpkgs/libboost_coroutine1.79
diff --git a/srcpkgs/libboost_date_time1.72 b/srcpkgs/libboost_date_time1.79
similarity index 100%
rename from srcpkgs/libboost_date_time1.72
rename to srcpkgs/libboost_date_time1.79
diff --git a/srcpkgs/libboost_fiber1.72 b/srcpkgs/libboost_filesystem1.79
similarity index 100%
rename from srcpkgs/libboost_fiber1.72
rename to srcpkgs/libboost_filesystem1.79
diff --git a/srcpkgs/libboost_filesystem1.72 b/srcpkgs/libboost_graph1.79
similarity index 100%
rename from srcpkgs/libboost_filesystem1.72
rename to srcpkgs/libboost_graph1.79
diff --git a/srcpkgs/libboost_graph1.72 b/srcpkgs/libboost_iostreams1.79
similarity index 100%
rename from srcpkgs/libboost_graph1.72
rename to srcpkgs/libboost_iostreams1.79
diff --git a/srcpkgs/libboost_iostreams1.72 b/srcpkgs/libboost_locale1.79
similarity index 100%
rename from srcpkgs/libboost_iostreams1.72
rename to srcpkgs/libboost_locale1.79
diff --git a/srcpkgs/libboost_locale1.72 b/srcpkgs/libboost_log1.79
similarity index 100%
rename from srcpkgs/libboost_locale1.72
rename to srcpkgs/libboost_log1.79
diff --git a/srcpkgs/libboost_log1.72 b/srcpkgs/libboost_log_setup1.79
similarity index 100%
rename from srcpkgs/libboost_log1.72
rename to srcpkgs/libboost_log_setup1.79
diff --git a/srcpkgs/libboost_log_setup1.72 b/srcpkgs/libboost_math_c991.79
similarity index 100%
rename from srcpkgs/libboost_log_setup1.72
rename to srcpkgs/libboost_math_c991.79
diff --git a/srcpkgs/libboost_math_c991.72 b/srcpkgs/libboost_math_c99f1.79
similarity index 100%
rename from srcpkgs/libboost_math_c991.72
rename to srcpkgs/libboost_math_c99f1.79
diff --git a/srcpkgs/libboost_math_c99f1.72 b/srcpkgs/libboost_math_c99l1.79
similarity index 100%
rename from srcpkgs/libboost_math_c99f1.72
rename to srcpkgs/libboost_math_c99l1.79
diff --git a/srcpkgs/libboost_math_c99l1.72 b/srcpkgs/libboost_math_tr11.79
similarity index 100%
rename from srcpkgs/libboost_math_c99l1.72
rename to srcpkgs/libboost_math_tr11.79
diff --git a/srcpkgs/libboost_math_tr11.72 b/srcpkgs/libboost_math_tr1f1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr11.72
rename to srcpkgs/libboost_math_tr1f1.79
diff --git a/srcpkgs/libboost_math_tr1f1.72 b/srcpkgs/libboost_math_tr1l1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1f1.72
rename to srcpkgs/libboost_math_tr1l1.79
diff --git a/srcpkgs/libboost_math_tr1l1.72 b/srcpkgs/libboost_prg_exec_monitor1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1l1.72
rename to srcpkgs/libboost_prg_exec_monitor1.79
diff --git a/srcpkgs/libboost_prg_exec_monitor1.72 b/srcpkgs/libboost_program_options1.79
similarity index 100%
rename from srcpkgs/libboost_prg_exec_monitor1.72
rename to srcpkgs/libboost_program_options1.79
diff --git a/srcpkgs/libboost_program_options1.72 b/srcpkgs/libboost_random1.79
similarity index 100%
rename from srcpkgs/libboost_program_options1.72
rename to srcpkgs/libboost_random1.79
diff --git a/srcpkgs/libboost_random1.72 b/srcpkgs/libboost_regex1.79
similarity index 100%
rename from srcpkgs/libboost_random1.72
rename to srcpkgs/libboost_regex1.79
diff --git a/srcpkgs/libboost_regex1.72 b/srcpkgs/libboost_serialization1.79
similarity index 100%
rename from srcpkgs/libboost_regex1.72
rename to srcpkgs/libboost_serialization1.79
diff --git a/srcpkgs/libboost_serialization1.72 b/srcpkgs/libboost_system1.79
similarity index 100%
rename from srcpkgs/libboost_serialization1.72
rename to srcpkgs/libboost_system1.79
diff --git a/srcpkgs/libboost_stacktrace_addr2line1.72 b/srcpkgs/libboost_thread1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_addr2line1.72
rename to srcpkgs/libboost_thread1.79
diff --git a/srcpkgs/libboost_stacktrace_basic1.72 b/srcpkgs/libboost_timer1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_basic1.72
rename to srcpkgs/libboost_timer1.79
diff --git a/srcpkgs/libboost_type_erasure1.72 b/srcpkgs/libboost_type_erasure1.72
deleted file mode 120000
index baef819c48f6..000000000000
--- a/srcpkgs/libboost_type_erasure1.72
+++ /dev/null
@@ -1 +0,0 @@
-boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_stacktrace_noop1.72 b/srcpkgs/libboost_type_erasure1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_noop1.72
rename to srcpkgs/libboost_type_erasure1.79
diff --git a/srcpkgs/libboost_unit_test_framework1.72 b/srcpkgs/libboost_unit_test_framework1.72
deleted file mode 120000
index baef819c48f6..000000000000
--- a/srcpkgs/libboost_unit_test_framework1.72
+++ /dev/null
@@ -1 +0,0 @@
-boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_system1.72 b/srcpkgs/libboost_unit_test_framework1.79
similarity index 100%
rename from srcpkgs/libboost_system1.72
rename to srcpkgs/libboost_unit_test_framework1.79
diff --git a/srcpkgs/libboost_wave1.72 b/srcpkgs/libboost_wave1.72
deleted file mode 120000
index baef819c48f6..000000000000
--- a/srcpkgs/libboost_wave1.72
+++ /dev/null
@@ -1 +0,0 @@
-boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_thread1.72 b/srcpkgs/libboost_wave1.79
similarity index 100%
rename from srcpkgs/libboost_thread1.72
rename to srcpkgs/libboost_wave1.79
diff --git a/srcpkgs/libboost_wserialization1.72 b/srcpkgs/libboost_wserialization1.72
deleted file mode 120000
index baef819c48f6..000000000000
--- a/srcpkgs/libboost_wserialization1.72
+++ /dev/null
@@ -1 +0,0 @@
-boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_timer1.72 b/srcpkgs/libboost_wserialization1.79
similarity index 100%
rename from srcpkgs/libboost_timer1.72
rename to srcpkgs/libboost_wserialization1.79

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] boost: update to 1.79.0.b1.
  2022-03-18 14:28 [PR PATCH] boost: update to 1.79.0.b1 JamiKettunen
                   ` (3 preceding siblings ...)
  2022-03-18 14:38 ` [PR PATCH] [Updated] " JamiKettunen
@ 2022-03-18 16:32 ` JamiKettunen
  2022-03-18 16:33 ` [PR REVIEW] " JamiKettunen
                   ` (23 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: JamiKettunen @ 2022-03-18 16:32 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3804 bytes --]

There is an updated pull request by JamiKettunen against master on the void-packages repository

https://github.com/JamiKettunen/void-packages boost-1.79.0
https://github.com/void-linux/void-packages/pull/36204

boost: update to 1.79.0.b1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Current issues
Cross-compilation fails due to `bjam` building for the host instead of the target:
```
$ ./xbps-src pkg -a aarch64-musl boost
...
=> boost-1.79.0.b1_1: running post-install hook: 06-strip-and-debug-pkgs ...
   Stripped library: /usr/lib/libboost_json.so.1.79.0
   Stripped library: /usr/lib/libboost_nowide.so.1.79.0
/usr/bin/aarch64-linux-musl-strip: Unable to recognise the format of the input file `/destdir/aarch64-linux-musl/boost-1.79.0.b1/usr/bin/bjam'
=> ERROR: boost-1.79.0.b1_1: failed to strip /usr/bin/bjam
=> ERROR: boost-1.79.0.b1_1: post-install_06-strip-and-debug-pkgs: 'find ${PKGDESTDIR} -type f' exited with 1
=> ERROR:   in hook() at common/hooks/post-install/06-strip-and-debug-pkgs.sh:68
=> ERROR:   in run_func() at common/xbps-src/shutils/common.sh:21
=> ERROR:   in run_pkg_hooks() at common/xbps-src/shutils/common.sh:245
=> ERROR:   in main() at common/xbps-src/libexec/xbps-src-doinstall.sh:66
$ file masterdir/destdir/aarch64-linux-musl/boost-jam-1.79.0.b1/usr/bin/bjam 
masterdir/destdir/aarch64-linux-musl/boost-jam-1.79.0.b1/usr/bin/bjam: ELF 64-bit LSB pie executable, x86-64, version 1 (SYSV), dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, BuildID[sha1]=861bc7f944396eb219efdc4e618e58125088d6aa, for GNU/Linux 3.2.0, stripped
```
Attempting to build any software against the newly built `boost-devel` package causes e.g. the following:
```
$ ./xbps-src pkg gnuradio
...
=> gnuradio-3.8.0.0_10: installing target dependencies: SDL-devel-1.2.15_12 boost-devel-1.79.0.b1_1 fftw-devel-3.3.10_1 gsl-devel-2.7.1_1 jack-devel-1.9.20_1 libgsm-devel-1.0.19_1 libusb-devel-1.0.25_1 volk-devel-2.5.1_1 uhd-devel-4.0.0.0_1 gtk+3-devel-3.24.31_1 python3-devel-3.10.3_1 python3-gobject-devel-3.42.0_1 log4cpp-devel-1.1.3_2 gmpxx-devel-6.2.1_1 mpir-devel-3.0.0_1 ...
=> gnuradio-3.8.0.0_10: removing autodeps, please wait...
=> ERROR: gnuradio-3.8.0.0_10: failed to install target dependencies! (error 40)
=> ERROR: Please see above for the real error, exiting...
```

Additionally a few shared objects aren't built anymore for some reason, namely `libboost_stacktrace_{addr2line,basic,noop}.so.*` & `libboost_fiber.so.*`, so I dropped their subpackages for now.

#### Modified patches
`exec_file.patch`: Removed due to being upstream as https://github.com/boostorg/python/commit/d9f06052e28873037db7f98629bce72182a42410
`mips.patch`: Updated to apply on top of https://github.com/boostorg/fiber/commit/5dc9dabc5d5ff8da53ec897c265c9cba1b6ed0df, not sure if this can be removed now(?)

#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36204.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boost-1.79.0-36204.patch --]
[-- Type: text/x-diff, Size: 37930 bytes --]

From 333df119519e0760210422c1ba46273969fb2e69 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 15:28:37 +0200
Subject: [PATCH 1/2] boost: update to 1.79.0.b1.

[ci skip] this doesn't even build locally correctly yet
---
 common/shlibs                                 |  60 ++++----
 .../{boost-python1.72 => boost-python1.79}    |   0
 ...{boost-python3-1.72 => boost-python3-1.79} |   0
 srcpkgs/boost/patches/exec_file.patch         |  45 ------
 srcpkgs/boost/patches/mips.patch              |   2 +-
 srcpkgs/boost/template                        | 144 +++++++-----------
 ...ibboost_atomic1.72 => libboost_atomic1.79} |   0
 ...ibboost_chrono1.72 => libboost_chrono1.79} |   0
 ...t_container1.72 => libboost_container1.79} |   0
 ...boost_context1.72 => libboost_context1.79} |   0
 ...ost_contract1.72 => libboost_contract1.79} |   0
 ...t_coroutine1.72 => libboost_coroutine1.79} |   0
 ...t_date_time1.72 => libboost_date_time1.79} |   0
 ...oost_fiber1.72 => libboost_filesystem1.79} |   0
 ...oost_filesystem1.72 => libboost_graph1.79} |   0
 ...boost_graph1.72 => libboost_iostreams1.79} |   0
 ...oost_iostreams1.72 => libboost_locale1.79} |   0
 .../{libboost_locale1.72 => libboost_log1.79} |   0
 ...ibboost_log1.72 => libboost_log_setup1.79} |   0
 ...st_log_setup1.72 => libboost_math_c991.79} |   0
 ...st_math_c991.72 => libboost_math_c99f1.79} |   0
 ...t_math_c99f1.72 => libboost_math_c99l1.79} |   0
 ...st_math_c99l1.72 => libboost_math_tr11.79} |   0
 ...st_math_tr11.72 => libboost_math_tr1f1.79} |   0
 ...t_math_tr1f1.72 => libboost_math_tr1l1.79} |   0
 ...tr1l1.72 => libboost_prg_exec_monitor1.79} |   0
 ...nitor1.72 => libboost_program_options1.79} |   0
 ...rogram_options1.72 => libboost_random1.79} |   0
 ...libboost_random1.72 => libboost_regex1.79} |   0
 ...t_regex1.72 => libboost_serialization1.79} |   0
 ..._serialization1.72 => libboost_system1.79} |   0
 ...race_addr2line1.72 => libboost_thread1.79} |   0
 ...tacktrace_basic1.72 => libboost_timer1.79} |   0
 srcpkgs/libboost_type_erasure1.72             |   1 -
 ...ace_noop1.72 => libboost_type_erasure1.79} |   0
 srcpkgs/libboost_unit_test_framework1.72      |   1 -
 ...m1.72 => libboost_unit_test_framework1.79} |   0
 srcpkgs/libboost_wave1.72                     |   1 -
 ...{libboost_thread1.72 => libboost_wave1.79} |   0
 srcpkgs/libboost_wserialization1.72           |   1 -
 ..._timer1.72 => libboost_wserialization1.79} |   0
 41 files changed, 81 insertions(+), 174 deletions(-)
 rename srcpkgs/{boost-python1.72 => boost-python1.79} (100%)
 rename srcpkgs/{boost-python3-1.72 => boost-python3-1.79} (100%)
 delete mode 100644 srcpkgs/boost/patches/exec_file.patch
 rename srcpkgs/{libboost_atomic1.72 => libboost_atomic1.79} (100%)
 rename srcpkgs/{libboost_chrono1.72 => libboost_chrono1.79} (100%)
 rename srcpkgs/{libboost_container1.72 => libboost_container1.79} (100%)
 rename srcpkgs/{libboost_context1.72 => libboost_context1.79} (100%)
 rename srcpkgs/{libboost_contract1.72 => libboost_contract1.79} (100%)
 rename srcpkgs/{libboost_coroutine1.72 => libboost_coroutine1.79} (100%)
 rename srcpkgs/{libboost_date_time1.72 => libboost_date_time1.79} (100%)
 rename srcpkgs/{libboost_fiber1.72 => libboost_filesystem1.79} (100%)
 rename srcpkgs/{libboost_filesystem1.72 => libboost_graph1.79} (100%)
 rename srcpkgs/{libboost_graph1.72 => libboost_iostreams1.79} (100%)
 rename srcpkgs/{libboost_iostreams1.72 => libboost_locale1.79} (100%)
 rename srcpkgs/{libboost_locale1.72 => libboost_log1.79} (100%)
 rename srcpkgs/{libboost_log1.72 => libboost_log_setup1.79} (100%)
 rename srcpkgs/{libboost_log_setup1.72 => libboost_math_c991.79} (100%)
 rename srcpkgs/{libboost_math_c991.72 => libboost_math_c99f1.79} (100%)
 rename srcpkgs/{libboost_math_c99f1.72 => libboost_math_c99l1.79} (100%)
 rename srcpkgs/{libboost_math_c99l1.72 => libboost_math_tr11.79} (100%)
 rename srcpkgs/{libboost_math_tr11.72 => libboost_math_tr1f1.79} (100%)
 rename srcpkgs/{libboost_math_tr1f1.72 => libboost_math_tr1l1.79} (100%)
 rename srcpkgs/{libboost_math_tr1l1.72 => libboost_prg_exec_monitor1.79} (100%)
 rename srcpkgs/{libboost_prg_exec_monitor1.72 => libboost_program_options1.79} (100%)
 rename srcpkgs/{libboost_program_options1.72 => libboost_random1.79} (100%)
 rename srcpkgs/{libboost_random1.72 => libboost_regex1.79} (100%)
 rename srcpkgs/{libboost_regex1.72 => libboost_serialization1.79} (100%)
 rename srcpkgs/{libboost_serialization1.72 => libboost_system1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_addr2line1.72 => libboost_thread1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_basic1.72 => libboost_timer1.79} (100%)
 delete mode 120000 srcpkgs/libboost_type_erasure1.72
 rename srcpkgs/{libboost_stacktrace_noop1.72 => libboost_type_erasure1.79} (100%)
 delete mode 120000 srcpkgs/libboost_unit_test_framework1.72
 rename srcpkgs/{libboost_system1.72 => libboost_unit_test_framework1.79} (100%)
 delete mode 120000 srcpkgs/libboost_wave1.72
 rename srcpkgs/{libboost_thread1.72 => libboost_wave1.79} (100%)
 delete mode 120000 srcpkgs/libboost_wserialization1.72
 rename srcpkgs/{libboost_timer1.72 => libboost_wserialization1.79} (100%)

diff --git a/common/shlibs b/common/shlibs
index 83b5783cb026..9bc15791e719 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -620,38 +620,34 @@ 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.79.0 libboost_context1.79-1.79.0.b1_1
+libboost_coroutine.so.1.79.0 libboost_coroutine1.79-1.79.0.b1_1
+libboost_container.so.1.79.0 libboost_container1.79-1.79.0.b1_1
+libboost_prg_exec_monitor.so.1.79.0 libboost_prg_exec_monitor1.79-1.79.0.b1_1
+libboost_timer.so.1.79.0 libboost_timer1.79-1.79.0.b1_1
+libboost_random.so.1.79.0 libboost_random1.79-1.79.0.b1_1
+libboost_filesystem.so.1.79.0 libboost_filesystem1.79-1.79.0.b1_1
+libboost_unit_test_framework.so.1.79.0 libboost_unit_test_framework1.79-1.79.0.b1_1
+libboost_math_c99.so.1.79.0 libboost_math_c991.79-1.79.0.b1_1
+libboost_math_tr1.so.1.79.0 libboost_math_tr11.79-1.79.0.b1_1
+libboost_regex.so.1.79.0 libboost_regex1.79-1.79.0.b1_1
+libboost_serialization.so.1.79.0 libboost_serialization1.79-1.79.0.b1_1
+libboost_chrono.so.1.79.0 libboost_chrono1.79-1.79.0.b1_1
+libboost_wserialization.so.1.79.0 libboost_wserialization1.79-1.79.0.b1_1
+libboost_graph.so.1.79.0 libboost_graph1.79-1.79.0.b1_1
+libboost_log.so.1.79.0 libboost_log1.79-1.79.0.b1_1
+libboost_locale.so.1.79.0 libboost_locale1.79-1.79.0.b1_1
+libboost_program_options.so.1.79.0 libboost_program_options1.79-1.79.0.b1_1
+libboost_iostreams.so.1.79.0 libboost_iostreams1.79-1.79.0.b1_1
+libboost_system.so.1.79.0 libboost_system1.79-1.79.0.b1_1
+libboost_thread.so.1.79.0 libboost_thread1.79-1.79.0.b1_1
+libboost_log_setup.so.1.79.0 libboost_log_setup1.79-1.79.0.b1_1
+libboost_date_time.so.1.79.0 libboost_date_time1.79-1.79.0.b1_1
+libboost_wave.so.1.79.0 libboost_wave1.79-1.79.0.b1_1
+libboost_atomic.so.1.79.0 libboost_atomic1.79-1.79.0.b1_1
+libboost_type_erasure.so.1.79.0 libboost_type_erasure1.79-1.79.0.b1_1
+libboost_python27.so.1.79.0 boost-python1.79-1.79.0.b1_1
+libboost_python310.so.1.79.0 boost-python3-1.79-1.79.0.b1_1
 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-python1.79
similarity index 100%
rename from srcpkgs/boost-python1.72
rename to srcpkgs/boost-python1.79
diff --git a/srcpkgs/boost-python3-1.72 b/srcpkgs/boost-python3-1.79
similarity index 100%
rename from srcpkgs/boost-python3-1.72
rename to srcpkgs/boost-python3-1.79
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/mips.patch b/srcpkgs/boost/patches/mips.patch
index a10a2122d9c7..8d253fc7c286 100644
--- a/srcpkgs/boost/patches/mips.patch
+++ b/srcpkgs/boost/patches/mips.patch
@@ -3,7 +3,7 @@
 @@ -48,7 +48,7 @@
  #  define cpu_relax() asm volatile ("nop" ::: "memory");
  # endif
- #elif BOOST_ARCH_MIPS
+ #elif BOOST_ARCH_MIPS && (((__mips_isa_rev > 1) && defined(__mips32)) || ((__mips_isa_rev > 2)  && defined(__mips64)))
 -# define cpu_relax() asm volatile ("pause" ::: "memory");
 +# define cpu_relax() asm volatile ("nop" ::: "memory");
  #elif BOOST_ARCH_PPC
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 126c50770b50..f8100f1cb3c2 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,16 +1,17 @@
 # Template file for 'boost'
 pkgname=boost
-version=1.72.0
-revision=7
-wrksrc="${pkgname}_${version//\./_}"
+version=1.79.0.b1
+revision=1
+wrksrc="${pkgname}_${version%.*}"
+wrksrc="${wrksrc//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-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
+distfiles="https://boostorg.jfrog.io/artifactory/main/beta/${version/b1/beta1}/source/boost_${version//./_}.tar.bz2"
+checksum=8985105623f48d55be01076d98ca4e7a8cb548a8d7f9ad0e1fc3c710d2c75fcf
 python_version=3
 
 CXXFLAGS="-std=c++14"
@@ -31,25 +32,6 @@ replaces="libboost_program_options1.69>=0 libboost_math_c99f1.69>=0
  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"
-
-if [ -z "$CROSS_BUILD" ]; then
-	subpackages+=" libboost_stacktrace_addr2line1.72"
-fi
-
 case "$XBPS_TARGET_MACHINE" in
 	i686*)    _arch=x86;      _abi=sysv  ;;
 	x86_64*)  _arch=x86;      _abi=sysv  ;;
@@ -74,10 +56,8 @@ do_build() {
 	using python : ${py3_ver} : ${XBPS_CROSS_BASE}/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} \
 		threading=multi runtime-link=shared link=shared,static
 }
@@ -119,7 +99,7 @@ boost-jam_package() {
 		vmove usr/bin/b2
 	}
 }
-boost-python1.72_package() {
+boost-python1.79_package() {
 	depends="boost python"
 	replaces="boost-python>=0"
 	short_desc+=" - Python bindings"
@@ -127,7 +107,7 @@ boost-python1.72_package() {
 		vmove "usr/lib/libboost_python2*.so.*"
 	}
 }
-boost-python3-1.72_package() {
+boost-python3-1.79_package() {
 	depends="boost python3"
 	replaces="boost-python3>=0"
 	short_desc+=" - Python3 bindings"
@@ -145,7 +125,19 @@ boost-build_package() {
 }
 boost-devel_package() {
 	noverifyrdeps=yes
-	depends="boost ${subpackages/boost-devel}"
+	depends="boost libboost_program_options1.79 libboost_math_c99f1.79
+ libboost_iostreams1.79 libboost_math_tr1l1.79 libboost_filesystem1.79
+ libboost_chrono1.79 libboost_math_tr1f1.79 libboost_wave1.79
+ libboost_graph1.79 libboost_locale1.79 libboost_regex1.79
+ libboost_type_erasure1.79 libboost_coroutine1.79
+ libboost_atomic1.79 libboost_prg_exec_monitor1.79 libboost_math_c991.79
+ boost-python3-1.79 libboost_log_setup1.79
+ libboost_timer1.79 libboost_system1.79 libboost_unit_test_framework1.79
+ libboost_serialization1.79 libboost_math_tr11.79 boost-build
+ libboost_math_c99l1.79 boost-python1.79 libboost_contract1.79
+ libboost_date_time1.79 libboost_log1.79 libboost_random1.79
+ libboost_thread1.79 libboost_container1.79 boost-jam
+ libboost_wserialization1.79 libboost_context1.79"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -154,7 +146,7 @@ boost-devel_package() {
 	}
 }
 
-libboost_atomic1.72_package() {
+libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
@@ -162,7 +154,7 @@ libboost_atomic1.72_package() {
 	}
 }
 
-libboost_chrono1.72_package() {
+libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
@@ -170,7 +162,7 @@ libboost_chrono1.72_package() {
 	}
 }
 
-libboost_container1.72_package() {
+libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
@@ -178,7 +170,7 @@ libboost_container1.72_package() {
 	}
 }
 
-libboost_context1.72_package() {
+libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
@@ -186,7 +178,7 @@ libboost_context1.72_package() {
 	}
 }
 
-libboost_contract1.72_package() {
+libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
@@ -194,7 +186,7 @@ libboost_contract1.72_package() {
 	}
 }
 
-libboost_coroutine1.72_package() {
+libboost_coroutine1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
@@ -202,7 +194,7 @@ libboost_coroutine1.72_package() {
 	}
 }
 
-libboost_date_time1.72_package() {
+libboost_date_time1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
@@ -210,15 +202,7 @@ libboost_date_time1.72_package() {
 	}
 }
 
-libboost_fiber1.72_package() {
-	depends="boost"
-	short_desc+=" - libboost_fiber"
-	pkg_install() {
-		vmove usr/lib/libboost_fiber.so.*
-	}
-}
-
-libboost_filesystem1.72_package() {
+libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
@@ -226,7 +210,7 @@ libboost_filesystem1.72_package() {
 	}
 }
 
-libboost_graph1.72_package() {
+libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
@@ -234,7 +218,7 @@ libboost_graph1.72_package() {
 	}
 }
 
-libboost_iostreams1.72_package() {
+libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
@@ -242,7 +226,7 @@ libboost_iostreams1.72_package() {
 	}
 }
 
-libboost_locale1.72_package() {
+libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
@@ -250,7 +234,7 @@ libboost_locale1.72_package() {
 	}
 }
 
-libboost_log1.72_package() {
+libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
@@ -258,7 +242,7 @@ libboost_log1.72_package() {
 	}
 }
 
-libboost_log_setup1.72_package() {
+libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
@@ -266,7 +250,7 @@ libboost_log_setup1.72_package() {
 	}
 }
 
-libboost_math_c991.72_package() {
+libboost_math_c991.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
@@ -274,7 +258,7 @@ libboost_math_c991.72_package() {
 	}
 }
 
-libboost_math_c99f1.72_package() {
+libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
@@ -282,7 +266,7 @@ libboost_math_c99f1.72_package() {
 	}
 }
 
-libboost_math_c99l1.72_package() {
+libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
@@ -290,7 +274,7 @@ libboost_math_c99l1.72_package() {
 	}
 }
 
-libboost_math_tr11.72_package() {
+libboost_math_tr11.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
@@ -298,7 +282,7 @@ libboost_math_tr11.72_package() {
 	}
 }
 
-libboost_math_tr1f1.72_package() {
+libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
@@ -306,7 +290,7 @@ libboost_math_tr1f1.72_package() {
 	}
 }
 
-libboost_math_tr1l1.72_package() {
+libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
@@ -314,7 +298,7 @@ libboost_math_tr1l1.72_package() {
 	}
 }
 
-libboost_prg_exec_monitor1.72_package() {
+libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
@@ -322,7 +306,7 @@ libboost_prg_exec_monitor1.72_package() {
 	}
 }
 
-libboost_program_options1.72_package() {
+libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
@@ -330,7 +314,7 @@ libboost_program_options1.72_package() {
 	}
 }
 
-libboost_random1.72_package() {
+libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
@@ -338,7 +322,7 @@ libboost_random1.72_package() {
 	}
 }
 
-libboost_regex1.72_package() {
+libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
@@ -346,7 +330,7 @@ libboost_regex1.72_package() {
 	}
 }
 
-libboost_serialization1.72_package() {
+libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
@@ -354,31 +338,7 @@ libboost_serialization1.72_package() {
 	}
 }
 
-libboost_stacktrace_addr2line1.72_package() {
-	depends="boost"
-	short_desc+=" - libboost_stacktrace_addr2line"
-	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_addr2line.so.*
-	}
-}
-
-libboost_stacktrace_basic1.72_package() {
-	depends="boost"
-	short_desc+=" - libboost_stacktrace_basic"
-	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_basic.so.*
-	}
-}
-
-libboost_stacktrace_noop1.72_package() {
-	depends="boost"
-	short_desc+=" - libboost_stacktrace_noop"
-	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_noop.so.*
-	}
-}
-
-libboost_system1.72_package() {
+libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
@@ -386,7 +346,7 @@ libboost_system1.72_package() {
 	}
 }
 
-libboost_thread1.72_package() {
+libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
@@ -394,7 +354,7 @@ libboost_thread1.72_package() {
 	}
 }
 
-libboost_timer1.72_package() {
+libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
@@ -402,7 +362,7 @@ libboost_timer1.72_package() {
 	}
 }
 
-libboost_type_erasure1.72_package() {
+libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
@@ -410,7 +370,7 @@ libboost_type_erasure1.72_package() {
 	}
 }
 
-libboost_unit_test_framework1.72_package() {
+libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
@@ -418,7 +378,7 @@ libboost_unit_test_framework1.72_package() {
 	}
 }
 
-libboost_wave1.72_package() {
+libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
@@ -426,7 +386,7 @@ libboost_wave1.72_package() {
 	}
 }
 
-libboost_wserialization1.72_package() {
+libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
diff --git a/srcpkgs/libboost_atomic1.72 b/srcpkgs/libboost_atomic1.79
similarity index 100%
rename from srcpkgs/libboost_atomic1.72
rename to srcpkgs/libboost_atomic1.79
diff --git a/srcpkgs/libboost_chrono1.72 b/srcpkgs/libboost_chrono1.79
similarity index 100%
rename from srcpkgs/libboost_chrono1.72
rename to srcpkgs/libboost_chrono1.79
diff --git a/srcpkgs/libboost_container1.72 b/srcpkgs/libboost_container1.79
similarity index 100%
rename from srcpkgs/libboost_container1.72
rename to srcpkgs/libboost_container1.79
diff --git a/srcpkgs/libboost_context1.72 b/srcpkgs/libboost_context1.79
similarity index 100%
rename from srcpkgs/libboost_context1.72
rename to srcpkgs/libboost_context1.79
diff --git a/srcpkgs/libboost_contract1.72 b/srcpkgs/libboost_contract1.79
similarity index 100%
rename from srcpkgs/libboost_contract1.72
rename to srcpkgs/libboost_contract1.79
diff --git a/srcpkgs/libboost_coroutine1.72 b/srcpkgs/libboost_coroutine1.79
similarity index 100%
rename from srcpkgs/libboost_coroutine1.72
rename to srcpkgs/libboost_coroutine1.79
diff --git a/srcpkgs/libboost_date_time1.72 b/srcpkgs/libboost_date_time1.79
similarity index 100%
rename from srcpkgs/libboost_date_time1.72
rename to srcpkgs/libboost_date_time1.79
diff --git a/srcpkgs/libboost_fiber1.72 b/srcpkgs/libboost_filesystem1.79
similarity index 100%
rename from srcpkgs/libboost_fiber1.72
rename to srcpkgs/libboost_filesystem1.79
diff --git a/srcpkgs/libboost_filesystem1.72 b/srcpkgs/libboost_graph1.79
similarity index 100%
rename from srcpkgs/libboost_filesystem1.72
rename to srcpkgs/libboost_graph1.79
diff --git a/srcpkgs/libboost_graph1.72 b/srcpkgs/libboost_iostreams1.79
similarity index 100%
rename from srcpkgs/libboost_graph1.72
rename to srcpkgs/libboost_iostreams1.79
diff --git a/srcpkgs/libboost_iostreams1.72 b/srcpkgs/libboost_locale1.79
similarity index 100%
rename from srcpkgs/libboost_iostreams1.72
rename to srcpkgs/libboost_locale1.79
diff --git a/srcpkgs/libboost_locale1.72 b/srcpkgs/libboost_log1.79
similarity index 100%
rename from srcpkgs/libboost_locale1.72
rename to srcpkgs/libboost_log1.79
diff --git a/srcpkgs/libboost_log1.72 b/srcpkgs/libboost_log_setup1.79
similarity index 100%
rename from srcpkgs/libboost_log1.72
rename to srcpkgs/libboost_log_setup1.79
diff --git a/srcpkgs/libboost_log_setup1.72 b/srcpkgs/libboost_math_c991.79
similarity index 100%
rename from srcpkgs/libboost_log_setup1.72
rename to srcpkgs/libboost_math_c991.79
diff --git a/srcpkgs/libboost_math_c991.72 b/srcpkgs/libboost_math_c99f1.79
similarity index 100%
rename from srcpkgs/libboost_math_c991.72
rename to srcpkgs/libboost_math_c99f1.79
diff --git a/srcpkgs/libboost_math_c99f1.72 b/srcpkgs/libboost_math_c99l1.79
similarity index 100%
rename from srcpkgs/libboost_math_c99f1.72
rename to srcpkgs/libboost_math_c99l1.79
diff --git a/srcpkgs/libboost_math_c99l1.72 b/srcpkgs/libboost_math_tr11.79
similarity index 100%
rename from srcpkgs/libboost_math_c99l1.72
rename to srcpkgs/libboost_math_tr11.79
diff --git a/srcpkgs/libboost_math_tr11.72 b/srcpkgs/libboost_math_tr1f1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr11.72
rename to srcpkgs/libboost_math_tr1f1.79
diff --git a/srcpkgs/libboost_math_tr1f1.72 b/srcpkgs/libboost_math_tr1l1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1f1.72
rename to srcpkgs/libboost_math_tr1l1.79
diff --git a/srcpkgs/libboost_math_tr1l1.72 b/srcpkgs/libboost_prg_exec_monitor1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1l1.72
rename to srcpkgs/libboost_prg_exec_monitor1.79
diff --git a/srcpkgs/libboost_prg_exec_monitor1.72 b/srcpkgs/libboost_program_options1.79
similarity index 100%
rename from srcpkgs/libboost_prg_exec_monitor1.72
rename to srcpkgs/libboost_program_options1.79
diff --git a/srcpkgs/libboost_program_options1.72 b/srcpkgs/libboost_random1.79
similarity index 100%
rename from srcpkgs/libboost_program_options1.72
rename to srcpkgs/libboost_random1.79
diff --git a/srcpkgs/libboost_random1.72 b/srcpkgs/libboost_regex1.79
similarity index 100%
rename from srcpkgs/libboost_random1.72
rename to srcpkgs/libboost_regex1.79
diff --git a/srcpkgs/libboost_regex1.72 b/srcpkgs/libboost_serialization1.79
similarity index 100%
rename from srcpkgs/libboost_regex1.72
rename to srcpkgs/libboost_serialization1.79
diff --git a/srcpkgs/libboost_serialization1.72 b/srcpkgs/libboost_system1.79
similarity index 100%
rename from srcpkgs/libboost_serialization1.72
rename to srcpkgs/libboost_system1.79
diff --git a/srcpkgs/libboost_stacktrace_addr2line1.72 b/srcpkgs/libboost_thread1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_addr2line1.72
rename to srcpkgs/libboost_thread1.79
diff --git a/srcpkgs/libboost_stacktrace_basic1.72 b/srcpkgs/libboost_timer1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_basic1.72
rename to srcpkgs/libboost_timer1.79
diff --git a/srcpkgs/libboost_type_erasure1.72 b/srcpkgs/libboost_type_erasure1.72
deleted file mode 120000
index baef819c48f6..000000000000
--- a/srcpkgs/libboost_type_erasure1.72
+++ /dev/null
@@ -1 +0,0 @@
-boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_stacktrace_noop1.72 b/srcpkgs/libboost_type_erasure1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_noop1.72
rename to srcpkgs/libboost_type_erasure1.79
diff --git a/srcpkgs/libboost_unit_test_framework1.72 b/srcpkgs/libboost_unit_test_framework1.72
deleted file mode 120000
index baef819c48f6..000000000000
--- a/srcpkgs/libboost_unit_test_framework1.72
+++ /dev/null
@@ -1 +0,0 @@
-boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_system1.72 b/srcpkgs/libboost_unit_test_framework1.79
similarity index 100%
rename from srcpkgs/libboost_system1.72
rename to srcpkgs/libboost_unit_test_framework1.79
diff --git a/srcpkgs/libboost_wave1.72 b/srcpkgs/libboost_wave1.72
deleted file mode 120000
index baef819c48f6..000000000000
--- a/srcpkgs/libboost_wave1.72
+++ /dev/null
@@ -1 +0,0 @@
-boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_thread1.72 b/srcpkgs/libboost_wave1.79
similarity index 100%
rename from srcpkgs/libboost_thread1.72
rename to srcpkgs/libboost_wave1.79
diff --git a/srcpkgs/libboost_wserialization1.72 b/srcpkgs/libboost_wserialization1.72
deleted file mode 120000
index baef819c48f6..000000000000
--- a/srcpkgs/libboost_wserialization1.72
+++ /dev/null
@@ -1 +0,0 @@
-boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_timer1.72 b/srcpkgs/libboost_wserialization1.79
similarity index 100%
rename from srcpkgs/libboost_timer1.72
rename to srcpkgs/libboost_wserialization1.79

From de57df84c700749ab5bcd51d41530bc3fc865349 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 18:29:05 +0200
Subject: [PATCH 2/2] boost: quote all vmove's with a glob.

---
 srcpkgs/boost/template | 62 +++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index f8100f1cb3c2..9e3d6aec031e 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -150,7 +150,7 @@ libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
-		vmove usr/lib/libboost_atomic.so.*
+		vmove "usr/lib/libboost_atomic.so.*"
 	}
 }
 
@@ -158,7 +158,7 @@ libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
-		vmove usr/lib/libboost_chrono.so.*
+		vmove "usr/lib/libboost_chrono.so.*"
 	}
 }
 
@@ -166,7 +166,7 @@ libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
-		vmove usr/lib/libboost_container.so.*
+		vmove "usr/lib/libboost_container.so.*"
 	}
 }
 
@@ -174,7 +174,7 @@ libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
-		vmove usr/lib/libboost_context.so.*
+		vmove "usr/lib/libboost_context.so.*"
 	}
 }
 
@@ -182,7 +182,7 @@ libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
-		vmove usr/lib/libboost_contract.so.*
+		vmove "usr/lib/libboost_contract.so.*"
 	}
 }
 
@@ -190,7 +190,7 @@ libboost_coroutine1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
-		vmove usr/lib/libboost_coroutine.so.*
+		vmove "usr/lib/libboost_coroutine.so.*"
 	}
 }
 
@@ -198,7 +198,7 @@ libboost_date_time1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
-		vmove usr/lib/libboost_date_time.so.*
+		vmove "usr/lib/libboost_date_time.so.*"
 	}
 }
 
@@ -206,7 +206,7 @@ libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
-		vmove usr/lib/libboost_filesystem.so.*
+		vmove "usr/lib/libboost_filesystem.so.*"
 	}
 }
 
@@ -214,7 +214,7 @@ libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
-		vmove usr/lib/libboost_graph.so.*
+		vmove "usr/lib/libboost_graph.so.*"
 	}
 }
 
@@ -222,7 +222,7 @@ libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
-		vmove usr/lib/libboost_iostreams.so.*
+		vmove "usr/lib/libboost_iostreams.so.*"
 	}
 }
 
@@ -230,7 +230,7 @@ libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
-		vmove usr/lib/libboost_locale.so.*
+		vmove "usr/lib/libboost_locale.so.*"
 	}
 }
 
@@ -238,7 +238,7 @@ libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
-		vmove usr/lib/libboost_log.so.*
+		vmove "usr/lib/libboost_log.so.*"
 	}
 }
 
@@ -246,7 +246,7 @@ libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
-		vmove usr/lib/libboost_log_setup.so.*
+		vmove "usr/lib/libboost_log_setup.so.*"
 	}
 }
 
@@ -254,7 +254,7 @@ libboost_math_c991.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99.so.*
+		vmove "usr/lib/libboost_math_c99.so.*"
 	}
 }
 
@@ -262,7 +262,7 @@ libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99f.so.*
+		vmove "usr/lib/libboost_math_c99f.so.*"
 	}
 }
 
@@ -270,7 +270,7 @@ libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99l.so.*
+		vmove "usr/lib/libboost_math_c99l.so.*"
 	}
 }
 
@@ -278,7 +278,7 @@ libboost_math_tr11.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1.so.*
+		vmove "usr/lib/libboost_math_tr1.so.*"
 	}
 }
 
@@ -286,7 +286,7 @@ libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1f.so.*
+		vmove "usr/lib/libboost_math_tr1f.so.*"
 	}
 }
 
@@ -294,7 +294,7 @@ libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1l.so.*
+		vmove "usr/lib/libboost_math_tr1l.so.*"
 	}
 }
 
@@ -302,7 +302,7 @@ libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
-		vmove usr/lib/libboost_prg_exec_monitor.so.*
+		vmove "usr/lib/libboost_prg_exec_monitor.so.*"
 	}
 }
 
@@ -310,7 +310,7 @@ libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
-		vmove usr/lib/libboost_program_options.so.*
+		vmove "usr/lib/libboost_program_options.so.*"
 	}
 }
 
@@ -318,7 +318,7 @@ libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
-		vmove usr/lib/libboost_random.so.*
+		vmove "usr/lib/libboost_random.so.*"
 	}
 }
 
@@ -326,7 +326,7 @@ libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
-		vmove usr/lib/libboost_regex.so.*
+		vmove "usr/lib/libboost_regex.so.*"
 	}
 }
 
@@ -334,7 +334,7 @@ libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
-		vmove usr/lib/libboost_serialization.so.*
+		vmove "usr/lib/libboost_serialization.so.*"
 	}
 }
 
@@ -342,7 +342,7 @@ libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
-		vmove usr/lib/libboost_system.so.*
+		vmove "usr/lib/libboost_system.so.*"
 	}
 }
 
@@ -350,7 +350,7 @@ libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
-		vmove usr/lib/libboost_thread.so.*
+		vmove "usr/lib/libboost_thread.so.*"
 	}
 }
 
@@ -358,7 +358,7 @@ libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
-		vmove usr/lib/libboost_timer.so.*
+		vmove "usr/lib/libboost_timer.so.*"
 	}
 }
 
@@ -366,7 +366,7 @@ libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
-		vmove usr/lib/libboost_type_erasure.so.*
+		vmove "usr/lib/libboost_type_erasure.so.*"
 	}
 }
 
@@ -374,7 +374,7 @@ libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
-		vmove usr/lib/libboost_unit_test_framework.so.*
+		vmove "usr/lib/libboost_unit_test_framework.so.*"
 	}
 }
 
@@ -382,7 +382,7 @@ libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
-		vmove usr/lib/libboost_wave.so.*
+		vmove "usr/lib/libboost_wave.so.*"
 	}
 }
 
@@ -390,6 +390,6 @@ libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
-		vmove usr/lib/libboost_wserialization.so.*
+		vmove "usr/lib/libboost_wserialization.so.*"
 	}
 }

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR REVIEW] boost: update to 1.79.0.b1.
  2022-03-18 14:28 [PR PATCH] boost: update to 1.79.0.b1 JamiKettunen
                   ` (4 preceding siblings ...)
  2022-03-18 16:32 ` JamiKettunen
@ 2022-03-18 16:33 ` JamiKettunen
  2022-03-18 16:42 ` [PR PATCH] [Updated] " JamiKettunen
                   ` (22 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: JamiKettunen @ 2022-03-18 16:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 202 bytes --]

New review comment by JamiKettunen on void-packages repository

https://github.com/void-linux/void-packages/pull/36204#discussion_r830168060

Comment:
Ah I didn't see that before, fixed that up as well

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] boost: update to 1.79.0.b1.
  2022-03-18 14:28 [PR PATCH] boost: update to 1.79.0.b1 JamiKettunen
                   ` (5 preceding siblings ...)
  2022-03-18 16:33 ` [PR REVIEW] " JamiKettunen
@ 2022-03-18 16:42 ` JamiKettunen
  2022-03-18 17:58 ` JamiKettunen
                   ` (21 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: JamiKettunen @ 2022-03-18 16:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 5925 bytes --]

There is an updated pull request by JamiKettunen against master on the void-packages repository

https://github.com/JamiKettunen/void-packages boost-1.79.0
https://github.com/void-linux/void-packages/pull/36204

boost: update to 1.79.0.b1.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Current issues
Cross-compilation fails due to `bjam` building for the host instead of the target:
```
$ ./xbps-src pkg -a aarch64-musl boost
...
=> boost-1.79.0.b1_1: running post-install hook: 06-strip-and-debug-pkgs ...
   Stripped library: /usr/lib/libboost_json.so.1.79.0
   Stripped library: /usr/lib/libboost_nowide.so.1.79.0
/usr/bin/aarch64-linux-musl-strip: Unable to recognise the format of the input file `/destdir/aarch64-linux-musl/boost-1.79.0.b1/usr/bin/bjam'
=> ERROR: boost-1.79.0.b1_1: failed to strip /usr/bin/bjam
=> ERROR: boost-1.79.0.b1_1: post-install_06-strip-and-debug-pkgs: 'find ${PKGDESTDIR} -type f' exited with 1
=> ERROR:   in hook() at common/hooks/post-install/06-strip-and-debug-pkgs.sh:68
=> ERROR:   in run_func() at common/xbps-src/shutils/common.sh:21
=> ERROR:   in run_pkg_hooks() at common/xbps-src/shutils/common.sh:245
=> ERROR:   in main() at common/xbps-src/libexec/xbps-src-doinstall.sh:66
$ file masterdir/destdir/aarch64-linux-musl/boost-jam-1.79.0.b1/usr/bin/bjam 
masterdir/destdir/aarch64-linux-musl/boost-jam-1.79.0.b1/usr/bin/bjam: ELF 64-bit LSB pie executable, x86-64, version 1 (SYSV), dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, BuildID[sha1]=861bc7f944396eb219efdc4e618e58125088d6aa, for GNU/Linux 3.2.0, stripped
```
Attempting to build any software against the newly built `boost-devel` package causes e.g. the following:
```
$ ./xbps-src pkg gnuradio
...
=> gnuradio-3.8.0.0_10: installing target dependencies: SDL-devel-1.2.15_12 boost-devel-1.79.0.b1_1 fftw-devel-3.3.10_1 gsl-devel-2.7.1_1 jack-devel-1.9.20_1 libgsm-devel-1.0.19_1 libusb-devel-1.0.25_1 volk-devel-2.5.1_1 uhd-devel-4.0.0.0_1 gtk+3-devel-3.24.31_1 python3-devel-3.10.3_1 python3-gobject-devel-3.42.0_1 log4cpp-devel-1.1.3_2 gmpxx-devel-6.2.1_1 mpir-devel-3.0.0_1 ...
=> gnuradio-3.8.0.0_10: removing autodeps, please wait...
=> ERROR: gnuradio-3.8.0.0_10: failed to install target dependencies! (error 40)
=> ERROR: Please see above for the real error, exiting...
```
After applying the following patch:
```patch
diff --git a/common/xbps-src/shutils/build_dependencies.sh b/common/xbps-src/shutils/build_dependencies.sh
index e4e2210d4e..b1d6ef564b 100644
--- a/common/xbps-src/shutils/build_dependencies.sh
+++ b/common/xbps-src/shutils/build_dependencies.sh
@@ -79,7 +79,7 @@ install_pkg_from_repos() {
 
     cmd=$XBPS_INSTALL_CMD
     [[ $cross ]] && cmd=$XBPS_INSTALL_XCMD
-    $cmd -Ay "$@" >$tmplogf 2>&1
+    $cmd -Ayvd "$@" >$tmplogf 2>&1
     rval=$?
 
     case "$rval" in
```
It appears to get stuck in a loop of installing `libboost_container1.79-1.79.0.b1_1` and `boost>=0`:
```
...
[DEBUG] xbps_transaction_prepare: processing deps
[DEBUG] Finding required dependencies for 'boost-devel-1.79.0.b1_1':
[DEBUG] boost-devel-1.79.0.b1_1: requires dependency 'boost>=0': not installed.
[DEBUG] [rpool] checking `/host/binpkgs/boost-1.79.0' at index 0
[DEBUG] xbps_repo_get_pkg: found boost-1.79.0.b1_1
[DEBUG] boost-1.79.0.b1_1: finding dependencies:
[DEBUG]  boost-1.79.0.b1_1: requires dependency 'libboost_container1.79-1.79.0.b1_1': not installed.
[DEBUG] [rpool] checking `/host/binpkgs/boost-1.79.0' at index 0
[DEBUG] xbps_repo_get_pkg: found libboost_container1.79-1.79.0.b1_1
[DEBUG]  libboost_container1.79-1.79.0.b1_1: finding dependencies:
[DEBUG]   libboost_container1.79-1.79.0.b1_1: requires dependency 'boost>=0': not installed.
[DEBUG] [rpool] checking `/host/binpkgs/boost-1.79.0' at index 0
[DEBUG]   boost-1.79.0.b1_1: finding dependencies:
[DEBUG]    boost-1.79.0.b1_1: requires dependency 'libboost_container1.79-1.79.0.b1_1': not installed.
[DEBUG] [rpool] checking `/host/binpkgs/boost-1.79.0' at index 0
[DEBUG]    libboost_container1.79-1.79.0.b1_1: finding dependencies:
[DEBUG]     libboost_container1.79-1.79.0.b1_1: requires dependency 'boost>=0': not installed.
...
```
After eventually giving up with:
```
...
[DEBUG] Error checking libboost_container1.79-1.79.0.b1_1 for rundeps: Too many levels of symbolic links
[DEBUG] Error checking boost>=0 for rundeps: Too many levels of symbolic links
...
```

Additionally a few shared objects aren't built anymore for some reason, namely `libboost_stacktrace_{addr2line,basic,noop}.so.*` & `libboost_fiber.so.*`, so I dropped their subpackages for now.

#### Modified patches
`exec_file.patch`: Removed due to being upstream as https://github.com/boostorg/python/commit/d9f06052e28873037db7f98629bce72182a42410
`mips.patch`: Updated to apply on top of https://github.com/boostorg/fiber/commit/5dc9dabc5d5ff8da53ec897c265c9cba1b6ed0df, not sure if this can be removed now(?)

#### Testing the changes
- I tested the changes in this PR: **NO**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36204.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boost-1.79.0-36204.patch --]
[-- Type: text/x-diff, Size: 37930 bytes --]

From ed4dcba9a7e96346fd033c4551a528c5d2e2e5f7 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 15:28:37 +0200
Subject: [PATCH 1/2] boost: update to 1.79.0.b1.

---
 common/shlibs                                 |  60 ++++----
 .../{boost-python1.72 => boost-python1.79}    |   0
 ...{boost-python3-1.72 => boost-python3-1.79} |   0
 srcpkgs/boost/patches/exec_file.patch         |  45 ------
 srcpkgs/boost/patches/mips.patch              |   2 +-
 srcpkgs/boost/template                        | 144 +++++++-----------
 ...ibboost_atomic1.72 => libboost_atomic1.79} |   0
 ...ibboost_chrono1.72 => libboost_chrono1.79} |   0
 ...t_container1.72 => libboost_container1.79} |   0
 ...boost_context1.72 => libboost_context1.79} |   0
 ...ost_contract1.72 => libboost_contract1.79} |   0
 ...t_coroutine1.72 => libboost_coroutine1.79} |   0
 ...t_date_time1.72 => libboost_date_time1.79} |   0
 ...oost_fiber1.72 => libboost_filesystem1.79} |   0
 ...oost_filesystem1.72 => libboost_graph1.79} |   0
 ...boost_graph1.72 => libboost_iostreams1.79} |   0
 ...oost_iostreams1.72 => libboost_locale1.79} |   0
 .../{libboost_locale1.72 => libboost_log1.79} |   0
 ...ibboost_log1.72 => libboost_log_setup1.79} |   0
 ...st_log_setup1.72 => libboost_math_c991.79} |   0
 ...st_math_c991.72 => libboost_math_c99f1.79} |   0
 ...t_math_c99f1.72 => libboost_math_c99l1.79} |   0
 ...st_math_c99l1.72 => libboost_math_tr11.79} |   0
 ...st_math_tr11.72 => libboost_math_tr1f1.79} |   0
 ...t_math_tr1f1.72 => libboost_math_tr1l1.79} |   0
 ...tr1l1.72 => libboost_prg_exec_monitor1.79} |   0
 ...nitor1.72 => libboost_program_options1.79} |   0
 ...rogram_options1.72 => libboost_random1.79} |   0
 ...libboost_random1.72 => libboost_regex1.79} |   0
 ...t_regex1.72 => libboost_serialization1.79} |   0
 ..._serialization1.72 => libboost_system1.79} |   0
 ...race_addr2line1.72 => libboost_thread1.79} |   0
 ...tacktrace_basic1.72 => libboost_timer1.79} |   0
 srcpkgs/libboost_type_erasure1.72             |   1 -
 ...ace_noop1.72 => libboost_type_erasure1.79} |   0
 srcpkgs/libboost_unit_test_framework1.72      |   1 -
 ...m1.72 => libboost_unit_test_framework1.79} |   0
 srcpkgs/libboost_wave1.72                     |   1 -
 ...{libboost_thread1.72 => libboost_wave1.79} |   0
 srcpkgs/libboost_wserialization1.72           |   1 -
 ..._timer1.72 => libboost_wserialization1.79} |   0
 41 files changed, 81 insertions(+), 174 deletions(-)
 rename srcpkgs/{boost-python1.72 => boost-python1.79} (100%)
 rename srcpkgs/{boost-python3-1.72 => boost-python3-1.79} (100%)
 delete mode 100644 srcpkgs/boost/patches/exec_file.patch
 rename srcpkgs/{libboost_atomic1.72 => libboost_atomic1.79} (100%)
 rename srcpkgs/{libboost_chrono1.72 => libboost_chrono1.79} (100%)
 rename srcpkgs/{libboost_container1.72 => libboost_container1.79} (100%)
 rename srcpkgs/{libboost_context1.72 => libboost_context1.79} (100%)
 rename srcpkgs/{libboost_contract1.72 => libboost_contract1.79} (100%)
 rename srcpkgs/{libboost_coroutine1.72 => libboost_coroutine1.79} (100%)
 rename srcpkgs/{libboost_date_time1.72 => libboost_date_time1.79} (100%)
 rename srcpkgs/{libboost_fiber1.72 => libboost_filesystem1.79} (100%)
 rename srcpkgs/{libboost_filesystem1.72 => libboost_graph1.79} (100%)
 rename srcpkgs/{libboost_graph1.72 => libboost_iostreams1.79} (100%)
 rename srcpkgs/{libboost_iostreams1.72 => libboost_locale1.79} (100%)
 rename srcpkgs/{libboost_locale1.72 => libboost_log1.79} (100%)
 rename srcpkgs/{libboost_log1.72 => libboost_log_setup1.79} (100%)
 rename srcpkgs/{libboost_log_setup1.72 => libboost_math_c991.79} (100%)
 rename srcpkgs/{libboost_math_c991.72 => libboost_math_c99f1.79} (100%)
 rename srcpkgs/{libboost_math_c99f1.72 => libboost_math_c99l1.79} (100%)
 rename srcpkgs/{libboost_math_c99l1.72 => libboost_math_tr11.79} (100%)
 rename srcpkgs/{libboost_math_tr11.72 => libboost_math_tr1f1.79} (100%)
 rename srcpkgs/{libboost_math_tr1f1.72 => libboost_math_tr1l1.79} (100%)
 rename srcpkgs/{libboost_math_tr1l1.72 => libboost_prg_exec_monitor1.79} (100%)
 rename srcpkgs/{libboost_prg_exec_monitor1.72 => libboost_program_options1.79} (100%)
 rename srcpkgs/{libboost_program_options1.72 => libboost_random1.79} (100%)
 rename srcpkgs/{libboost_random1.72 => libboost_regex1.79} (100%)
 rename srcpkgs/{libboost_regex1.72 => libboost_serialization1.79} (100%)
 rename srcpkgs/{libboost_serialization1.72 => libboost_system1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_addr2line1.72 => libboost_thread1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_basic1.72 => libboost_timer1.79} (100%)
 delete mode 120000 srcpkgs/libboost_type_erasure1.72
 rename srcpkgs/{libboost_stacktrace_noop1.72 => libboost_type_erasure1.79} (100%)
 delete mode 120000 srcpkgs/libboost_unit_test_framework1.72
 rename srcpkgs/{libboost_system1.72 => libboost_unit_test_framework1.79} (100%)
 delete mode 120000 srcpkgs/libboost_wave1.72
 rename srcpkgs/{libboost_thread1.72 => libboost_wave1.79} (100%)
 delete mode 120000 srcpkgs/libboost_wserialization1.72
 rename srcpkgs/{libboost_timer1.72 => libboost_wserialization1.79} (100%)

diff --git a/common/shlibs b/common/shlibs
index 83b5783cb026..9bc15791e719 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -620,38 +620,34 @@ 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.79.0 libboost_context1.79-1.79.0.b1_1
+libboost_coroutine.so.1.79.0 libboost_coroutine1.79-1.79.0.b1_1
+libboost_container.so.1.79.0 libboost_container1.79-1.79.0.b1_1
+libboost_prg_exec_monitor.so.1.79.0 libboost_prg_exec_monitor1.79-1.79.0.b1_1
+libboost_timer.so.1.79.0 libboost_timer1.79-1.79.0.b1_1
+libboost_random.so.1.79.0 libboost_random1.79-1.79.0.b1_1
+libboost_filesystem.so.1.79.0 libboost_filesystem1.79-1.79.0.b1_1
+libboost_unit_test_framework.so.1.79.0 libboost_unit_test_framework1.79-1.79.0.b1_1
+libboost_math_c99.so.1.79.0 libboost_math_c991.79-1.79.0.b1_1
+libboost_math_tr1.so.1.79.0 libboost_math_tr11.79-1.79.0.b1_1
+libboost_regex.so.1.79.0 libboost_regex1.79-1.79.0.b1_1
+libboost_serialization.so.1.79.0 libboost_serialization1.79-1.79.0.b1_1
+libboost_chrono.so.1.79.0 libboost_chrono1.79-1.79.0.b1_1
+libboost_wserialization.so.1.79.0 libboost_wserialization1.79-1.79.0.b1_1
+libboost_graph.so.1.79.0 libboost_graph1.79-1.79.0.b1_1
+libboost_log.so.1.79.0 libboost_log1.79-1.79.0.b1_1
+libboost_locale.so.1.79.0 libboost_locale1.79-1.79.0.b1_1
+libboost_program_options.so.1.79.0 libboost_program_options1.79-1.79.0.b1_1
+libboost_iostreams.so.1.79.0 libboost_iostreams1.79-1.79.0.b1_1
+libboost_system.so.1.79.0 libboost_system1.79-1.79.0.b1_1
+libboost_thread.so.1.79.0 libboost_thread1.79-1.79.0.b1_1
+libboost_log_setup.so.1.79.0 libboost_log_setup1.79-1.79.0.b1_1
+libboost_date_time.so.1.79.0 libboost_date_time1.79-1.79.0.b1_1
+libboost_wave.so.1.79.0 libboost_wave1.79-1.79.0.b1_1
+libboost_atomic.so.1.79.0 libboost_atomic1.79-1.79.0.b1_1
+libboost_type_erasure.so.1.79.0 libboost_type_erasure1.79-1.79.0.b1_1
+libboost_python27.so.1.79.0 boost-python1.79-1.79.0.b1_1
+libboost_python310.so.1.79.0 boost-python3-1.79-1.79.0.b1_1
 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-python1.79
similarity index 100%
rename from srcpkgs/boost-python1.72
rename to srcpkgs/boost-python1.79
diff --git a/srcpkgs/boost-python3-1.72 b/srcpkgs/boost-python3-1.79
similarity index 100%
rename from srcpkgs/boost-python3-1.72
rename to srcpkgs/boost-python3-1.79
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/mips.patch b/srcpkgs/boost/patches/mips.patch
index a10a2122d9c7..8d253fc7c286 100644
--- a/srcpkgs/boost/patches/mips.patch
+++ b/srcpkgs/boost/patches/mips.patch
@@ -3,7 +3,7 @@
 @@ -48,7 +48,7 @@
  #  define cpu_relax() asm volatile ("nop" ::: "memory");
  # endif
- #elif BOOST_ARCH_MIPS
+ #elif BOOST_ARCH_MIPS && (((__mips_isa_rev > 1) && defined(__mips32)) || ((__mips_isa_rev > 2)  && defined(__mips64)))
 -# define cpu_relax() asm volatile ("pause" ::: "memory");
 +# define cpu_relax() asm volatile ("nop" ::: "memory");
  #elif BOOST_ARCH_PPC
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 126c50770b50..f8100f1cb3c2 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,16 +1,17 @@
 # Template file for 'boost'
 pkgname=boost
-version=1.72.0
-revision=7
-wrksrc="${pkgname}_${version//\./_}"
+version=1.79.0.b1
+revision=1
+wrksrc="${pkgname}_${version%.*}"
+wrksrc="${wrksrc//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-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
+distfiles="https://boostorg.jfrog.io/artifactory/main/beta/${version/b1/beta1}/source/boost_${version//./_}.tar.bz2"
+checksum=8985105623f48d55be01076d98ca4e7a8cb548a8d7f9ad0e1fc3c710d2c75fcf
 python_version=3
 
 CXXFLAGS="-std=c++14"
@@ -31,25 +32,6 @@ replaces="libboost_program_options1.69>=0 libboost_math_c99f1.69>=0
  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"
-
-if [ -z "$CROSS_BUILD" ]; then
-	subpackages+=" libboost_stacktrace_addr2line1.72"
-fi
-
 case "$XBPS_TARGET_MACHINE" in
 	i686*)    _arch=x86;      _abi=sysv  ;;
 	x86_64*)  _arch=x86;      _abi=sysv  ;;
@@ -74,10 +56,8 @@ do_build() {
 	using python : ${py3_ver} : ${XBPS_CROSS_BASE}/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} \
 		threading=multi runtime-link=shared link=shared,static
 }
@@ -119,7 +99,7 @@ boost-jam_package() {
 		vmove usr/bin/b2
 	}
 }
-boost-python1.72_package() {
+boost-python1.79_package() {
 	depends="boost python"
 	replaces="boost-python>=0"
 	short_desc+=" - Python bindings"
@@ -127,7 +107,7 @@ boost-python1.72_package() {
 		vmove "usr/lib/libboost_python2*.so.*"
 	}
 }
-boost-python3-1.72_package() {
+boost-python3-1.79_package() {
 	depends="boost python3"
 	replaces="boost-python3>=0"
 	short_desc+=" - Python3 bindings"
@@ -145,7 +125,19 @@ boost-build_package() {
 }
 boost-devel_package() {
 	noverifyrdeps=yes
-	depends="boost ${subpackages/boost-devel}"
+	depends="boost libboost_program_options1.79 libboost_math_c99f1.79
+ libboost_iostreams1.79 libboost_math_tr1l1.79 libboost_filesystem1.79
+ libboost_chrono1.79 libboost_math_tr1f1.79 libboost_wave1.79
+ libboost_graph1.79 libboost_locale1.79 libboost_regex1.79
+ libboost_type_erasure1.79 libboost_coroutine1.79
+ libboost_atomic1.79 libboost_prg_exec_monitor1.79 libboost_math_c991.79
+ boost-python3-1.79 libboost_log_setup1.79
+ libboost_timer1.79 libboost_system1.79 libboost_unit_test_framework1.79
+ libboost_serialization1.79 libboost_math_tr11.79 boost-build
+ libboost_math_c99l1.79 boost-python1.79 libboost_contract1.79
+ libboost_date_time1.79 libboost_log1.79 libboost_random1.79
+ libboost_thread1.79 libboost_container1.79 boost-jam
+ libboost_wserialization1.79 libboost_context1.79"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -154,7 +146,7 @@ boost-devel_package() {
 	}
 }
 
-libboost_atomic1.72_package() {
+libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
@@ -162,7 +154,7 @@ libboost_atomic1.72_package() {
 	}
 }
 
-libboost_chrono1.72_package() {
+libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
@@ -170,7 +162,7 @@ libboost_chrono1.72_package() {
 	}
 }
 
-libboost_container1.72_package() {
+libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
@@ -178,7 +170,7 @@ libboost_container1.72_package() {
 	}
 }
 
-libboost_context1.72_package() {
+libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
@@ -186,7 +178,7 @@ libboost_context1.72_package() {
 	}
 }
 
-libboost_contract1.72_package() {
+libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
@@ -194,7 +186,7 @@ libboost_contract1.72_package() {
 	}
 }
 
-libboost_coroutine1.72_package() {
+libboost_coroutine1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
@@ -202,7 +194,7 @@ libboost_coroutine1.72_package() {
 	}
 }
 
-libboost_date_time1.72_package() {
+libboost_date_time1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
@@ -210,15 +202,7 @@ libboost_date_time1.72_package() {
 	}
 }
 
-libboost_fiber1.72_package() {
-	depends="boost"
-	short_desc+=" - libboost_fiber"
-	pkg_install() {
-		vmove usr/lib/libboost_fiber.so.*
-	}
-}
-
-libboost_filesystem1.72_package() {
+libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
@@ -226,7 +210,7 @@ libboost_filesystem1.72_package() {
 	}
 }
 
-libboost_graph1.72_package() {
+libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
@@ -234,7 +218,7 @@ libboost_graph1.72_package() {
 	}
 }
 
-libboost_iostreams1.72_package() {
+libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
@@ -242,7 +226,7 @@ libboost_iostreams1.72_package() {
 	}
 }
 
-libboost_locale1.72_package() {
+libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
@@ -250,7 +234,7 @@ libboost_locale1.72_package() {
 	}
 }
 
-libboost_log1.72_package() {
+libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
@@ -258,7 +242,7 @@ libboost_log1.72_package() {
 	}
 }
 
-libboost_log_setup1.72_package() {
+libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
@@ -266,7 +250,7 @@ libboost_log_setup1.72_package() {
 	}
 }
 
-libboost_math_c991.72_package() {
+libboost_math_c991.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
@@ -274,7 +258,7 @@ libboost_math_c991.72_package() {
 	}
 }
 
-libboost_math_c99f1.72_package() {
+libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
@@ -282,7 +266,7 @@ libboost_math_c99f1.72_package() {
 	}
 }
 
-libboost_math_c99l1.72_package() {
+libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
@@ -290,7 +274,7 @@ libboost_math_c99l1.72_package() {
 	}
 }
 
-libboost_math_tr11.72_package() {
+libboost_math_tr11.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
@@ -298,7 +282,7 @@ libboost_math_tr11.72_package() {
 	}
 }
 
-libboost_math_tr1f1.72_package() {
+libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
@@ -306,7 +290,7 @@ libboost_math_tr1f1.72_package() {
 	}
 }
 
-libboost_math_tr1l1.72_package() {
+libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
@@ -314,7 +298,7 @@ libboost_math_tr1l1.72_package() {
 	}
 }
 
-libboost_prg_exec_monitor1.72_package() {
+libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
@@ -322,7 +306,7 @@ libboost_prg_exec_monitor1.72_package() {
 	}
 }
 
-libboost_program_options1.72_package() {
+libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
@@ -330,7 +314,7 @@ libboost_program_options1.72_package() {
 	}
 }
 
-libboost_random1.72_package() {
+libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
@@ -338,7 +322,7 @@ libboost_random1.72_package() {
 	}
 }
 
-libboost_regex1.72_package() {
+libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
@@ -346,7 +330,7 @@ libboost_regex1.72_package() {
 	}
 }
 
-libboost_serialization1.72_package() {
+libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
@@ -354,31 +338,7 @@ libboost_serialization1.72_package() {
 	}
 }
 
-libboost_stacktrace_addr2line1.72_package() {
-	depends="boost"
-	short_desc+=" - libboost_stacktrace_addr2line"
-	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_addr2line.so.*
-	}
-}
-
-libboost_stacktrace_basic1.72_package() {
-	depends="boost"
-	short_desc+=" - libboost_stacktrace_basic"
-	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_basic.so.*
-	}
-}
-
-libboost_stacktrace_noop1.72_package() {
-	depends="boost"
-	short_desc+=" - libboost_stacktrace_noop"
-	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_noop.so.*
-	}
-}
-
-libboost_system1.72_package() {
+libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
@@ -386,7 +346,7 @@ libboost_system1.72_package() {
 	}
 }
 
-libboost_thread1.72_package() {
+libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
@@ -394,7 +354,7 @@ libboost_thread1.72_package() {
 	}
 }
 
-libboost_timer1.72_package() {
+libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
@@ -402,7 +362,7 @@ libboost_timer1.72_package() {
 	}
 }
 
-libboost_type_erasure1.72_package() {
+libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
@@ -410,7 +370,7 @@ libboost_type_erasure1.72_package() {
 	}
 }
 
-libboost_unit_test_framework1.72_package() {
+libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
@@ -418,7 +378,7 @@ libboost_unit_test_framework1.72_package() {
 	}
 }
 
-libboost_wave1.72_package() {
+libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
@@ -426,7 +386,7 @@ libboost_wave1.72_package() {
 	}
 }
 
-libboost_wserialization1.72_package() {
+libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
diff --git a/srcpkgs/libboost_atomic1.72 b/srcpkgs/libboost_atomic1.79
similarity index 100%
rename from srcpkgs/libboost_atomic1.72
rename to srcpkgs/libboost_atomic1.79
diff --git a/srcpkgs/libboost_chrono1.72 b/srcpkgs/libboost_chrono1.79
similarity index 100%
rename from srcpkgs/libboost_chrono1.72
rename to srcpkgs/libboost_chrono1.79
diff --git a/srcpkgs/libboost_container1.72 b/srcpkgs/libboost_container1.79
similarity index 100%
rename from srcpkgs/libboost_container1.72
rename to srcpkgs/libboost_container1.79
diff --git a/srcpkgs/libboost_context1.72 b/srcpkgs/libboost_context1.79
similarity index 100%
rename from srcpkgs/libboost_context1.72
rename to srcpkgs/libboost_context1.79
diff --git a/srcpkgs/libboost_contract1.72 b/srcpkgs/libboost_contract1.79
similarity index 100%
rename from srcpkgs/libboost_contract1.72
rename to srcpkgs/libboost_contract1.79
diff --git a/srcpkgs/libboost_coroutine1.72 b/srcpkgs/libboost_coroutine1.79
similarity index 100%
rename from srcpkgs/libboost_coroutine1.72
rename to srcpkgs/libboost_coroutine1.79
diff --git a/srcpkgs/libboost_date_time1.72 b/srcpkgs/libboost_date_time1.79
similarity index 100%
rename from srcpkgs/libboost_date_time1.72
rename to srcpkgs/libboost_date_time1.79
diff --git a/srcpkgs/libboost_fiber1.72 b/srcpkgs/libboost_filesystem1.79
similarity index 100%
rename from srcpkgs/libboost_fiber1.72
rename to srcpkgs/libboost_filesystem1.79
diff --git a/srcpkgs/libboost_filesystem1.72 b/srcpkgs/libboost_graph1.79
similarity index 100%
rename from srcpkgs/libboost_filesystem1.72
rename to srcpkgs/libboost_graph1.79
diff --git a/srcpkgs/libboost_graph1.72 b/srcpkgs/libboost_iostreams1.79
similarity index 100%
rename from srcpkgs/libboost_graph1.72
rename to srcpkgs/libboost_iostreams1.79
diff --git a/srcpkgs/libboost_iostreams1.72 b/srcpkgs/libboost_locale1.79
similarity index 100%
rename from srcpkgs/libboost_iostreams1.72
rename to srcpkgs/libboost_locale1.79
diff --git a/srcpkgs/libboost_locale1.72 b/srcpkgs/libboost_log1.79
similarity index 100%
rename from srcpkgs/libboost_locale1.72
rename to srcpkgs/libboost_log1.79
diff --git a/srcpkgs/libboost_log1.72 b/srcpkgs/libboost_log_setup1.79
similarity index 100%
rename from srcpkgs/libboost_log1.72
rename to srcpkgs/libboost_log_setup1.79
diff --git a/srcpkgs/libboost_log_setup1.72 b/srcpkgs/libboost_math_c991.79
similarity index 100%
rename from srcpkgs/libboost_log_setup1.72
rename to srcpkgs/libboost_math_c991.79
diff --git a/srcpkgs/libboost_math_c991.72 b/srcpkgs/libboost_math_c99f1.79
similarity index 100%
rename from srcpkgs/libboost_math_c991.72
rename to srcpkgs/libboost_math_c99f1.79
diff --git a/srcpkgs/libboost_math_c99f1.72 b/srcpkgs/libboost_math_c99l1.79
similarity index 100%
rename from srcpkgs/libboost_math_c99f1.72
rename to srcpkgs/libboost_math_c99l1.79
diff --git a/srcpkgs/libboost_math_c99l1.72 b/srcpkgs/libboost_math_tr11.79
similarity index 100%
rename from srcpkgs/libboost_math_c99l1.72
rename to srcpkgs/libboost_math_tr11.79
diff --git a/srcpkgs/libboost_math_tr11.72 b/srcpkgs/libboost_math_tr1f1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr11.72
rename to srcpkgs/libboost_math_tr1f1.79
diff --git a/srcpkgs/libboost_math_tr1f1.72 b/srcpkgs/libboost_math_tr1l1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1f1.72
rename to srcpkgs/libboost_math_tr1l1.79
diff --git a/srcpkgs/libboost_math_tr1l1.72 b/srcpkgs/libboost_prg_exec_monitor1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1l1.72
rename to srcpkgs/libboost_prg_exec_monitor1.79
diff --git a/srcpkgs/libboost_prg_exec_monitor1.72 b/srcpkgs/libboost_program_options1.79
similarity index 100%
rename from srcpkgs/libboost_prg_exec_monitor1.72
rename to srcpkgs/libboost_program_options1.79
diff --git a/srcpkgs/libboost_program_options1.72 b/srcpkgs/libboost_random1.79
similarity index 100%
rename from srcpkgs/libboost_program_options1.72
rename to srcpkgs/libboost_random1.79
diff --git a/srcpkgs/libboost_random1.72 b/srcpkgs/libboost_regex1.79
similarity index 100%
rename from srcpkgs/libboost_random1.72
rename to srcpkgs/libboost_regex1.79
diff --git a/srcpkgs/libboost_regex1.72 b/srcpkgs/libboost_serialization1.79
similarity index 100%
rename from srcpkgs/libboost_regex1.72
rename to srcpkgs/libboost_serialization1.79
diff --git a/srcpkgs/libboost_serialization1.72 b/srcpkgs/libboost_system1.79
similarity index 100%
rename from srcpkgs/libboost_serialization1.72
rename to srcpkgs/libboost_system1.79
diff --git a/srcpkgs/libboost_stacktrace_addr2line1.72 b/srcpkgs/libboost_thread1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_addr2line1.72
rename to srcpkgs/libboost_thread1.79
diff --git a/srcpkgs/libboost_stacktrace_basic1.72 b/srcpkgs/libboost_timer1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_basic1.72
rename to srcpkgs/libboost_timer1.79
diff --git a/srcpkgs/libboost_type_erasure1.72 b/srcpkgs/libboost_type_erasure1.72
deleted file mode 120000
index baef819c48f6..000000000000
--- a/srcpkgs/libboost_type_erasure1.72
+++ /dev/null
@@ -1 +0,0 @@
-boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_stacktrace_noop1.72 b/srcpkgs/libboost_type_erasure1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_noop1.72
rename to srcpkgs/libboost_type_erasure1.79
diff --git a/srcpkgs/libboost_unit_test_framework1.72 b/srcpkgs/libboost_unit_test_framework1.72
deleted file mode 120000
index baef819c48f6..000000000000
--- a/srcpkgs/libboost_unit_test_framework1.72
+++ /dev/null
@@ -1 +0,0 @@
-boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_system1.72 b/srcpkgs/libboost_unit_test_framework1.79
similarity index 100%
rename from srcpkgs/libboost_system1.72
rename to srcpkgs/libboost_unit_test_framework1.79
diff --git a/srcpkgs/libboost_wave1.72 b/srcpkgs/libboost_wave1.72
deleted file mode 120000
index baef819c48f6..000000000000
--- a/srcpkgs/libboost_wave1.72
+++ /dev/null
@@ -1 +0,0 @@
-boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_thread1.72 b/srcpkgs/libboost_wave1.79
similarity index 100%
rename from srcpkgs/libboost_thread1.72
rename to srcpkgs/libboost_wave1.79
diff --git a/srcpkgs/libboost_wserialization1.72 b/srcpkgs/libboost_wserialization1.72
deleted file mode 120000
index baef819c48f6..000000000000
--- a/srcpkgs/libboost_wserialization1.72
+++ /dev/null
@@ -1 +0,0 @@
-boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_timer1.72 b/srcpkgs/libboost_wserialization1.79
similarity index 100%
rename from srcpkgs/libboost_timer1.72
rename to srcpkgs/libboost_wserialization1.79

From b5d5fc24538d86768bde127e5dc4e6d00aa9d42b Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 18:29:05 +0200
Subject: [PATCH 2/2] boost: quote all vmove's with a glob.

[ci skip] this doesn't even build locally correctly yet
---
 srcpkgs/boost/template | 62 +++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index f8100f1cb3c2..9e3d6aec031e 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -150,7 +150,7 @@ libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
-		vmove usr/lib/libboost_atomic.so.*
+		vmove "usr/lib/libboost_atomic.so.*"
 	}
 }
 
@@ -158,7 +158,7 @@ libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
-		vmove usr/lib/libboost_chrono.so.*
+		vmove "usr/lib/libboost_chrono.so.*"
 	}
 }
 
@@ -166,7 +166,7 @@ libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
-		vmove usr/lib/libboost_container.so.*
+		vmove "usr/lib/libboost_container.so.*"
 	}
 }
 
@@ -174,7 +174,7 @@ libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
-		vmove usr/lib/libboost_context.so.*
+		vmove "usr/lib/libboost_context.so.*"
 	}
 }
 
@@ -182,7 +182,7 @@ libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
-		vmove usr/lib/libboost_contract.so.*
+		vmove "usr/lib/libboost_contract.so.*"
 	}
 }
 
@@ -190,7 +190,7 @@ libboost_coroutine1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
-		vmove usr/lib/libboost_coroutine.so.*
+		vmove "usr/lib/libboost_coroutine.so.*"
 	}
 }
 
@@ -198,7 +198,7 @@ libboost_date_time1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
-		vmove usr/lib/libboost_date_time.so.*
+		vmove "usr/lib/libboost_date_time.so.*"
 	}
 }
 
@@ -206,7 +206,7 @@ libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
-		vmove usr/lib/libboost_filesystem.so.*
+		vmove "usr/lib/libboost_filesystem.so.*"
 	}
 }
 
@@ -214,7 +214,7 @@ libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
-		vmove usr/lib/libboost_graph.so.*
+		vmove "usr/lib/libboost_graph.so.*"
 	}
 }
 
@@ -222,7 +222,7 @@ libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
-		vmove usr/lib/libboost_iostreams.so.*
+		vmove "usr/lib/libboost_iostreams.so.*"
 	}
 }
 
@@ -230,7 +230,7 @@ libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
-		vmove usr/lib/libboost_locale.so.*
+		vmove "usr/lib/libboost_locale.so.*"
 	}
 }
 
@@ -238,7 +238,7 @@ libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
-		vmove usr/lib/libboost_log.so.*
+		vmove "usr/lib/libboost_log.so.*"
 	}
 }
 
@@ -246,7 +246,7 @@ libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
-		vmove usr/lib/libboost_log_setup.so.*
+		vmove "usr/lib/libboost_log_setup.so.*"
 	}
 }
 
@@ -254,7 +254,7 @@ libboost_math_c991.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99.so.*
+		vmove "usr/lib/libboost_math_c99.so.*"
 	}
 }
 
@@ -262,7 +262,7 @@ libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99f.so.*
+		vmove "usr/lib/libboost_math_c99f.so.*"
 	}
 }
 
@@ -270,7 +270,7 @@ libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99l.so.*
+		vmove "usr/lib/libboost_math_c99l.so.*"
 	}
 }
 
@@ -278,7 +278,7 @@ libboost_math_tr11.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1.so.*
+		vmove "usr/lib/libboost_math_tr1.so.*"
 	}
 }
 
@@ -286,7 +286,7 @@ libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1f.so.*
+		vmove "usr/lib/libboost_math_tr1f.so.*"
 	}
 }
 
@@ -294,7 +294,7 @@ libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1l.so.*
+		vmove "usr/lib/libboost_math_tr1l.so.*"
 	}
 }
 
@@ -302,7 +302,7 @@ libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
-		vmove usr/lib/libboost_prg_exec_monitor.so.*
+		vmove "usr/lib/libboost_prg_exec_monitor.so.*"
 	}
 }
 
@@ -310,7 +310,7 @@ libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
-		vmove usr/lib/libboost_program_options.so.*
+		vmove "usr/lib/libboost_program_options.so.*"
 	}
 }
 
@@ -318,7 +318,7 @@ libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
-		vmove usr/lib/libboost_random.so.*
+		vmove "usr/lib/libboost_random.so.*"
 	}
 }
 
@@ -326,7 +326,7 @@ libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
-		vmove usr/lib/libboost_regex.so.*
+		vmove "usr/lib/libboost_regex.so.*"
 	}
 }
 
@@ -334,7 +334,7 @@ libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
-		vmove usr/lib/libboost_serialization.so.*
+		vmove "usr/lib/libboost_serialization.so.*"
 	}
 }
 
@@ -342,7 +342,7 @@ libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
-		vmove usr/lib/libboost_system.so.*
+		vmove "usr/lib/libboost_system.so.*"
 	}
 }
 
@@ -350,7 +350,7 @@ libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
-		vmove usr/lib/libboost_thread.so.*
+		vmove "usr/lib/libboost_thread.so.*"
 	}
 }
 
@@ -358,7 +358,7 @@ libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
-		vmove usr/lib/libboost_timer.so.*
+		vmove "usr/lib/libboost_timer.so.*"
 	}
 }
 
@@ -366,7 +366,7 @@ libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
-		vmove usr/lib/libboost_type_erasure.so.*
+		vmove "usr/lib/libboost_type_erasure.so.*"
 	}
 }
 
@@ -374,7 +374,7 @@ libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
-		vmove usr/lib/libboost_unit_test_framework.so.*
+		vmove "usr/lib/libboost_unit_test_framework.so.*"
 	}
 }
 
@@ -382,7 +382,7 @@ libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
-		vmove usr/lib/libboost_wave.so.*
+		vmove "usr/lib/libboost_wave.so.*"
 	}
 }
 
@@ -390,6 +390,6 @@ libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
-		vmove usr/lib/libboost_wserialization.so.*
+		vmove "usr/lib/libboost_wserialization.so.*"
 	}
 }

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] boost: update to 1.79.0.b1.
  2022-03-18 14:28 [PR PATCH] boost: update to 1.79.0.b1 JamiKettunen
                   ` (6 preceding siblings ...)
  2022-03-18 16:42 ` [PR PATCH] [Updated] " JamiKettunen
@ 2022-03-18 17:58 ` JamiKettunen
  2022-03-18 23:32 ` JamiKettunen
                   ` (20 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: JamiKettunen @ 2022-03-18 17:58 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3496 bytes --]

There is an updated pull request by JamiKettunen against master on the void-packages repository

https://github.com/JamiKettunen/void-packages boost-1.79.0
https://github.com/void-linux/void-packages/pull/36204

boost: update to 1.79.0.b1.
For now I've also dropped the `boost` version from all subpkg names as was previously done for `protobuf` with f38a742bec751aa8c3d9c592e020503256d27a1c, let me know if this should be kept or not; imho maintaining this would be easier if we don't gave versioned pkgnames.

#### Current issues
Cross-compilation fails due to `bjam` building for the host instead of the target:
```
$ ./xbps-src pkg -a aarch64-musl boost
...
=> boost-1.79.0.b1_1: running post-install hook: 06-strip-and-debug-pkgs ...
   Stripped library: /usr/lib/libboost_json.so.1.79.0
   Stripped library: /usr/lib/libboost_nowide.so.1.79.0
/usr/bin/aarch64-linux-musl-strip: Unable to recognise the format of the input file `/destdir/aarch64-linux-musl/boost-1.79.0.b1/usr/bin/bjam'
=> ERROR: boost-1.79.0.b1_1: failed to strip /usr/bin/bjam
=> ERROR: boost-1.79.0.b1_1: post-install_06-strip-and-debug-pkgs: 'find ${PKGDESTDIR} -type f' exited with 1
=> ERROR:   in hook() at common/hooks/post-install/06-strip-and-debug-pkgs.sh:68
=> ERROR:   in run_func() at common/xbps-src/shutils/common.sh:21
=> ERROR:   in run_pkg_hooks() at common/xbps-src/shutils/common.sh:245
=> ERROR:   in main() at common/xbps-src/libexec/xbps-src-doinstall.sh:66
$ file masterdir/destdir/aarch64-linux-musl/boost-jam-1.79.0.b1/usr/bin/bjam 
masterdir/destdir/aarch64-linux-musl/boost-jam-1.79.0.b1/usr/bin/bjam: ELF 64-bit LSB pie executable, x86-64, version 1 (SYSV), dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, BuildID[sha1]=861bc7f944396eb219efdc4e618e58125088d6aa, for GNU/Linux 3.2.0, stripped
```
Additionally a few shared objects aren't built anymore for some reason, namely `libboost_stacktrace_{addr2line,basic,noop}.so.*` & `libboost_fiber.so.*`, so I dropped their subpackages for now (is this ok?).

#### Solved issues
The `failed to install target dependencies! (error 40)` issue was fixed by making new subpackages for `libboost_json.so.*` & `libboost_nowide.so.*`; they were inside the `boost` pkg, depended on `libboost_container` which itself depends on `boost` => circular dependency.

#### Modified patches
`exec_file.patch`: Removed due to being upstream as https://github.com/boostorg/python/commit/d9f06052e28873037db7f98629bce72182a42410
`mips.patch`: Updated to apply on top of https://github.com/boostorg/fiber/commit/5dc9dabc5d5ff8da53ec897c265c9cba1b6ed0df, not sure if this can be removed now(?)

#### To-Do
- Include ~90 commits from `xrevbump 'revbump for boost-1.79.0.b1.' <xrevshlib boost output from master>`

#### Testing the changes
- I tested the changes in this PR: **NO**

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36204.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boost-1.79.0-36204.patch --]
[-- Type: text/x-diff, Size: 39742 bytes --]

From c5b747312babe166203d7a12db308c3f4b121176 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 15:28:37 +0200
Subject: [PATCH 1/3] boost: update to 1.79.0.b1.

---
 common/shlibs                                 |  60 +++---
 srcpkgs/{boost-python1.72 => boost-python}    |   0
 srcpkgs/{boost-python3-1.72 => boost-python3} |   0
 srcpkgs/boost/patches/exec_file.patch         |  45 -----
 srcpkgs/boost/patches/mips.patch              |   2 +-
 srcpkgs/boost/template                        | 189 +++++++-----------
 .../{libboost_atomic1.72 => libboost_atomic}  |   0
 .../{libboost_chrono1.72 => libboost_chrono}  |   0
 ...boost_container1.72 => libboost_container} |   0
 ...{libboost_context1.72 => libboost_context} |   0
 ...ibboost_contract1.72 => libboost_contract} |   0
 ...boost_coroutine1.72 => libboost_coroutine} |   0
 ...boost_date_time1.72 => libboost_date_time} |   0
 ...libboost_fiber1.72 => libboost_filesystem} |   0
 ...libboost_filesystem1.72 => libboost_graph} |   0
 ...{libboost_graph1.72 => libboost_iostreams} |   0
 ...libboost_iostreams1.72 => libboost_locale} |   0
 srcpkgs/{libboost_locale1.72 => libboost_log} |   0
 .../{libboost_log1.72 => libboost_log_setup}  |   0
 ...bboost_log_setup1.72 => libboost_math_c99} |   0
 ...bboost_math_c991.72 => libboost_math_c99f} |   0
 ...boost_math_c99f1.72 => libboost_math_c99l} |   0
 ...bboost_math_c99l1.72 => libboost_math_tr1} |   0
 ...bboost_math_tr11.72 => libboost_math_tr1f} |   0
 ...boost_math_tr1f1.72 => libboost_math_tr1l} |   0
 ...ath_tr1l1.72 => libboost_prg_exec_monitor} |   0
 ...c_monitor1.72 => libboost_program_options} |   0
 ...st_program_options1.72 => libboost_random} |   0
 .../{libboost_random1.72 => libboost_regex}   |   0
 ...boost_regex1.72 => libboost_serialization} |   0
 ...oost_serialization1.72 => libboost_system} |   0
 ...acktrace_addr2line1.72 => libboost_thread} |   0
 ...st_stacktrace_basic1.72 => libboost_timer} |   0
 ...cktrace_noop1.72 => libboost_type_erasure} |   0
 srcpkgs/libboost_type_erasure1.72             |   1 -
 ...ystem1.72 => libboost_unit_test_framework} |   0
 srcpkgs/libboost_unit_test_framework1.72      |   1 -
 .../{libboost_thread1.72 => libboost_wave}    |   0
 srcpkgs/libboost_wave1.72                     |   1 -
 ...oost_timer1.72 => libboost_wserialization} |   0
 srcpkgs/libboost_wserialization1.72           |   1 -
 41 files changed, 102 insertions(+), 198 deletions(-)
 rename srcpkgs/{boost-python1.72 => boost-python} (100%)
 rename srcpkgs/{boost-python3-1.72 => boost-python3} (100%)
 delete mode 100644 srcpkgs/boost/patches/exec_file.patch
 rename srcpkgs/{libboost_atomic1.72 => libboost_atomic} (100%)
 rename srcpkgs/{libboost_chrono1.72 => libboost_chrono} (100%)
 rename srcpkgs/{libboost_container1.72 => libboost_container} (100%)
 rename srcpkgs/{libboost_context1.72 => libboost_context} (100%)
 rename srcpkgs/{libboost_contract1.72 => libboost_contract} (100%)
 rename srcpkgs/{libboost_coroutine1.72 => libboost_coroutine} (100%)
 rename srcpkgs/{libboost_date_time1.72 => libboost_date_time} (100%)
 rename srcpkgs/{libboost_fiber1.72 => libboost_filesystem} (100%)
 rename srcpkgs/{libboost_filesystem1.72 => libboost_graph} (100%)
 rename srcpkgs/{libboost_graph1.72 => libboost_iostreams} (100%)
 rename srcpkgs/{libboost_iostreams1.72 => libboost_locale} (100%)
 rename srcpkgs/{libboost_locale1.72 => libboost_log} (100%)
 rename srcpkgs/{libboost_log1.72 => libboost_log_setup} (100%)
 rename srcpkgs/{libboost_log_setup1.72 => libboost_math_c99} (100%)
 rename srcpkgs/{libboost_math_c991.72 => libboost_math_c99f} (100%)
 rename srcpkgs/{libboost_math_c99f1.72 => libboost_math_c99l} (100%)
 rename srcpkgs/{libboost_math_c99l1.72 => libboost_math_tr1} (100%)
 rename srcpkgs/{libboost_math_tr11.72 => libboost_math_tr1f} (100%)
 rename srcpkgs/{libboost_math_tr1f1.72 => libboost_math_tr1l} (100%)
 rename srcpkgs/{libboost_math_tr1l1.72 => libboost_prg_exec_monitor} (100%)
 rename srcpkgs/{libboost_prg_exec_monitor1.72 => libboost_program_options} (100%)
 rename srcpkgs/{libboost_program_options1.72 => libboost_random} (100%)
 rename srcpkgs/{libboost_random1.72 => libboost_regex} (100%)
 rename srcpkgs/{libboost_regex1.72 => libboost_serialization} (100%)
 rename srcpkgs/{libboost_serialization1.72 => libboost_system} (100%)
 rename srcpkgs/{libboost_stacktrace_addr2line1.72 => libboost_thread} (100%)
 rename srcpkgs/{libboost_stacktrace_basic1.72 => libboost_timer} (100%)
 rename srcpkgs/{libboost_stacktrace_noop1.72 => libboost_type_erasure} (100%)
 delete mode 120000 srcpkgs/libboost_type_erasure1.72
 rename srcpkgs/{libboost_system1.72 => libboost_unit_test_framework} (100%)
 delete mode 120000 srcpkgs/libboost_unit_test_framework1.72
 rename srcpkgs/{libboost_thread1.72 => libboost_wave} (100%)
 delete mode 120000 srcpkgs/libboost_wave1.72
 rename srcpkgs/{libboost_timer1.72 => libboost_wserialization} (100%)
 delete mode 120000 srcpkgs/libboost_wserialization1.72

diff --git a/common/shlibs b/common/shlibs
index 83b5783cb026..4fd6c2cc428e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -620,38 +620,34 @@ 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.79.0 libboost_context-1.79.0.b1_1
+libboost_coroutine.so.1.79.0 libboost_coroutine-1.79.0.b1_1
+libboost_container.so.1.79.0 libboost_container-1.79.0.b1_1
+libboost_prg_exec_monitor.so.1.79.0 libboost_prg_exec_monitor-1.79.0.b1_1
+libboost_timer.so.1.79.0 libboost_timer-1.79.0.b1_1
+libboost_random.so.1.79.0 libboost_random-1.79.0.b1_1
+libboost_filesystem.so.1.79.0 libboost_filesystem-1.79.0.b1_1
+libboost_unit_test_framework.so.1.79.0 libboost_unit_test_framework-1.79.0.b1_1
+libboost_math_c99.so.1.79.0 libboost_math_c99-1.79.0.b1_1
+libboost_math_tr1.so.1.79.0 libboost_math_tr1-1.79.0.b1_1
+libboost_regex.so.1.79.0 libboost_regex-1.79.0.b1_1
+libboost_serialization.so.1.79.0 libboost_serialization-1.79.0.b1_1
+libboost_chrono.so.1.79.0 libboost_chrono-1.79.0.b1_1
+libboost_wserialization.so.1.79.0 libboost_wserialization-1.79.0.b1_1
+libboost_graph.so.1.79.0 libboost_graph-1.79.0.b1_1
+libboost_log.so.1.79.0 libboost_log-1.79.0.b1_1
+libboost_locale.so.1.79.0 libboost_locale-1.79.0.b1_1
+libboost_program_options.so.1.79.0 libboost_program_options-1.79.0.b1_1
+libboost_iostreams.so.1.79.0 libboost_iostreams-1.79.0.b1_1
+libboost_system.so.1.79.0 libboost_system-1.79.0.b1_1
+libboost_thread.so.1.79.0 libboost_thread-1.79.0.b1_1
+libboost_log_setup.so.1.79.0 libboost_log_setup-1.79.0.b1_1
+libboost_date_time.so.1.79.0 libboost_date_time-1.79.0.b1_1
+libboost_wave.so.1.79.0 libboost_wave-1.79.0.b1_1
+libboost_atomic.so.1.79.0 libboost_atomic-1.79.0.b1_1
+libboost_type_erasure.so.1.79.0 libboost_type_erasure-1.79.0.b1_1
+libboost_python27.so.1.79.0 boost-python-1.79.0.b1_1
+libboost_python310.so.1.79.0 boost-python3-1.79.0.b1_1
 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-python
similarity index 100%
rename from srcpkgs/boost-python1.72
rename to srcpkgs/boost-python
diff --git a/srcpkgs/boost-python3-1.72 b/srcpkgs/boost-python3
similarity index 100%
rename from srcpkgs/boost-python3-1.72
rename to srcpkgs/boost-python3
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/mips.patch b/srcpkgs/boost/patches/mips.patch
index a10a2122d9c7..8d253fc7c286 100644
--- a/srcpkgs/boost/patches/mips.patch
+++ b/srcpkgs/boost/patches/mips.patch
@@ -3,7 +3,7 @@
 @@ -48,7 +48,7 @@
  #  define cpu_relax() asm volatile ("nop" ::: "memory");
  # endif
- #elif BOOST_ARCH_MIPS
+ #elif BOOST_ARCH_MIPS && (((__mips_isa_rev > 1) && defined(__mips32)) || ((__mips_isa_rev > 2)  && defined(__mips64)))
 -# define cpu_relax() asm volatile ("pause" ::: "memory");
 +# define cpu_relax() asm volatile ("nop" ::: "memory");
  #elif BOOST_ARCH_PPC
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 126c50770b50..bc16a6841041 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,62 +1,24 @@
 # Template file for 'boost'
 pkgname=boost
-version=1.72.0
-revision=7
-wrksrc="${pkgname}_${version//\./_}"
+version=1.79.0.b1
+revision=1
+wrksrc="${pkgname}_${version%.*}"
+wrksrc="${wrksrc//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-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
+distfiles="https://boostorg.jfrog.io/artifactory/main/beta/${version/b1/beta1}/source/boost_${version//./_}.tar.bz2"
+checksum=8985105623f48d55be01076d98ca4e7a8cb548a8d7f9ad0e1fc3c710d2c75fcf
 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"
-
-if [ -z "$CROSS_BUILD" ]; then
-	subpackages+=" libboost_stacktrace_addr2line1.72"
-fi
-
 case "$XBPS_TARGET_MACHINE" in
-	i686*)    _arch=x86;      _abi=sysv  ;;
-	x86_64*)  _arch=x86;      _abi=sysv  ;;
-	arm*)     _arch=arm;      _abi=aapcs ;;
-	aarch64*) _arch=arm;      _abi=aapcs ;;
-	mips*)    _arch=mips32r2; _abi=o32   ;;
-	ppc*)     _arch=power;    _abi=sysv  ;;
+	i686*|x86_64*) _arch=x86;      _abi=sysv  ;;
+	arm*|aarch64*) _arch=arm;      _abi=aapcs ;;
+	mips*)         _arch=mips32r2; _abi=o32   ;;
+	ppc*)          _arch=power;    _abi=sysv  ;;
 esac
 
 do_build() {
@@ -74,10 +36,8 @@ do_build() {
 	using python : ${py3_ver} : ${XBPS_CROSS_BASE}/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} \
 		threading=multi runtime-link=shared link=shared,static
 }
@@ -119,7 +79,7 @@ boost-jam_package() {
 		vmove usr/bin/b2
 	}
 }
-boost-python1.72_package() {
+boost-python_package() {
 	depends="boost python"
 	replaces="boost-python>=0"
 	short_desc+=" - Python bindings"
@@ -127,7 +87,7 @@ boost-python1.72_package() {
 		vmove "usr/lib/libboost_python2*.so.*"
 	}
 }
-boost-python3-1.72_package() {
+boost-python3_package() {
 	depends="boost python3"
 	replaces="boost-python3>=0"
 	short_desc+=" - Python3 bindings"
@@ -145,7 +105,20 @@ boost-build_package() {
 }
 boost-devel_package() {
 	noverifyrdeps=yes
-	depends="boost ${subpackages/boost-devel}"
+	depends="boost libboost_program_options libboost_math_c99f
+ libboost_iostreams libboost_math_tr1l libboost_filesystem
+ libboost_chrono libboost_math_tr1f libboost_wave
+ libboost_graph libboost_locale libboost_regex
+ libboost_type_erasure libboost_coroutine
+ libboost_atomic libboost_prg_exec_monitor libboost_math_c99
+ boost-python3 libboost_log_setup
+ libboost_timer libboost_system libboost_unit_test_framework
+ libboost_serialization libboost_math_tr1 boost-build
+ libboost_math_c99l boost-python libboost_contract
+ libboost_date_time libboost_log libboost_random
+ libboost_thread libboost_container boost-jam
+ libboost_wserialization libboost_context libboost_json
+ libboost_nowide"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -154,7 +127,7 @@ boost-devel_package() {
 	}
 }
 
-libboost_atomic1.72_package() {
+libboost_atomic_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
@@ -162,7 +135,7 @@ libboost_atomic1.72_package() {
 	}
 }
 
-libboost_chrono1.72_package() {
+libboost_chrono_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
@@ -170,7 +143,7 @@ libboost_chrono1.72_package() {
 	}
 }
 
-libboost_container1.72_package() {
+libboost_container_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
@@ -178,7 +151,7 @@ libboost_container1.72_package() {
 	}
 }
 
-libboost_context1.72_package() {
+libboost_context_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
@@ -186,7 +159,7 @@ libboost_context1.72_package() {
 	}
 }
 
-libboost_contract1.72_package() {
+libboost_contract_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
@@ -194,7 +167,7 @@ libboost_contract1.72_package() {
 	}
 }
 
-libboost_coroutine1.72_package() {
+libboost_coroutine_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
@@ -202,7 +175,7 @@ libboost_coroutine1.72_package() {
 	}
 }
 
-libboost_date_time1.72_package() {
+libboost_date_time_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
@@ -210,15 +183,7 @@ libboost_date_time1.72_package() {
 	}
 }
 
-libboost_fiber1.72_package() {
-	depends="boost"
-	short_desc+=" - libboost_fiber"
-	pkg_install() {
-		vmove usr/lib/libboost_fiber.so.*
-	}
-}
-
-libboost_filesystem1.72_package() {
+libboost_filesystem_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
@@ -226,7 +191,7 @@ libboost_filesystem1.72_package() {
 	}
 }
 
-libboost_graph1.72_package() {
+libboost_graph_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
@@ -234,7 +199,7 @@ libboost_graph1.72_package() {
 	}
 }
 
-libboost_iostreams1.72_package() {
+libboost_iostreams_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
@@ -242,7 +207,7 @@ libboost_iostreams1.72_package() {
 	}
 }
 
-libboost_locale1.72_package() {
+libboost_locale_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
@@ -250,7 +215,7 @@ libboost_locale1.72_package() {
 	}
 }
 
-libboost_log1.72_package() {
+libboost_log_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
@@ -258,7 +223,7 @@ libboost_log1.72_package() {
 	}
 }
 
-libboost_log_setup1.72_package() {
+libboost_log_setup_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
@@ -266,7 +231,7 @@ libboost_log_setup1.72_package() {
 	}
 }
 
-libboost_math_c991.72_package() {
+libboost_math_c99_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
@@ -274,7 +239,7 @@ libboost_math_c991.72_package() {
 	}
 }
 
-libboost_math_c99f1.72_package() {
+libboost_math_c99f_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
@@ -282,7 +247,7 @@ libboost_math_c99f1.72_package() {
 	}
 }
 
-libboost_math_c99l1.72_package() {
+libboost_math_c99l_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
@@ -290,7 +255,7 @@ libboost_math_c99l1.72_package() {
 	}
 }
 
-libboost_math_tr11.72_package() {
+libboost_math_tr1_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
@@ -298,7 +263,7 @@ libboost_math_tr11.72_package() {
 	}
 }
 
-libboost_math_tr1f1.72_package() {
+libboost_math_tr1f_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
@@ -306,7 +271,7 @@ libboost_math_tr1f1.72_package() {
 	}
 }
 
-libboost_math_tr1l1.72_package() {
+libboost_math_tr1l_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
@@ -314,7 +279,7 @@ libboost_math_tr1l1.72_package() {
 	}
 }
 
-libboost_prg_exec_monitor1.72_package() {
+libboost_prg_exec_monitor_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
@@ -322,7 +287,7 @@ libboost_prg_exec_monitor1.72_package() {
 	}
 }
 
-libboost_program_options1.72_package() {
+libboost_program_options_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
@@ -330,7 +295,7 @@ libboost_program_options1.72_package() {
 	}
 }
 
-libboost_random1.72_package() {
+libboost_random_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
@@ -338,7 +303,7 @@ libboost_random1.72_package() {
 	}
 }
 
-libboost_regex1.72_package() {
+libboost_regex_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
@@ -346,7 +311,7 @@ libboost_regex1.72_package() {
 	}
 }
 
-libboost_serialization1.72_package() {
+libboost_serialization_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
@@ -354,31 +319,7 @@ libboost_serialization1.72_package() {
 	}
 }
 
-libboost_stacktrace_addr2line1.72_package() {
-	depends="boost"
-	short_desc+=" - libboost_stacktrace_addr2line"
-	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_addr2line.so.*
-	}
-}
-
-libboost_stacktrace_basic1.72_package() {
-	depends="boost"
-	short_desc+=" - libboost_stacktrace_basic"
-	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_basic.so.*
-	}
-}
-
-libboost_stacktrace_noop1.72_package() {
-	depends="boost"
-	short_desc+=" - libboost_stacktrace_noop"
-	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_noop.so.*
-	}
-}
-
-libboost_system1.72_package() {
+libboost_system_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
@@ -386,7 +327,7 @@ libboost_system1.72_package() {
 	}
 }
 
-libboost_thread1.72_package() {
+libboost_thread_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
@@ -394,7 +335,7 @@ libboost_thread1.72_package() {
 	}
 }
 
-libboost_timer1.72_package() {
+libboost_timer_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
@@ -402,7 +343,7 @@ libboost_timer1.72_package() {
 	}
 }
 
-libboost_type_erasure1.72_package() {
+libboost_type_erasure_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
@@ -410,7 +351,7 @@ libboost_type_erasure1.72_package() {
 	}
 }
 
-libboost_unit_test_framework1.72_package() {
+libboost_unit_test_framework_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
@@ -418,7 +359,7 @@ libboost_unit_test_framework1.72_package() {
 	}
 }
 
-libboost_wave1.72_package() {
+libboost_wave_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
@@ -426,10 +367,26 @@ libboost_wave1.72_package() {
 	}
 }
 
-libboost_wserialization1.72_package() {
+libboost_wserialization_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
 		vmove usr/lib/libboost_wserialization.so.*
 	}
 }
+
+libboost_json_package() {
+	depends="boost"
+	short_desc+=" - libboost_json"
+	pkg_install() {
+		vmove "usr/lib/libboost_json.so.*"
+	}
+}
+
+libboost_nowide_package() {
+	depends="boost"
+	short_desc+=" - libboost_nowide"
+	pkg_install() {
+		vmove "usr/lib/libboost_nowide.so.*"
+	}
+}
diff --git a/srcpkgs/libboost_atomic1.72 b/srcpkgs/libboost_atomic
similarity index 100%
rename from srcpkgs/libboost_atomic1.72
rename to srcpkgs/libboost_atomic
diff --git a/srcpkgs/libboost_chrono1.72 b/srcpkgs/libboost_chrono
similarity index 100%
rename from srcpkgs/libboost_chrono1.72
rename to srcpkgs/libboost_chrono
diff --git a/srcpkgs/libboost_container1.72 b/srcpkgs/libboost_container
similarity index 100%
rename from srcpkgs/libboost_container1.72
rename to srcpkgs/libboost_container
diff --git a/srcpkgs/libboost_context1.72 b/srcpkgs/libboost_context
similarity index 100%
rename from srcpkgs/libboost_context1.72
rename to srcpkgs/libboost_context
diff --git a/srcpkgs/libboost_contract1.72 b/srcpkgs/libboost_contract
similarity index 100%
rename from srcpkgs/libboost_contract1.72
rename to srcpkgs/libboost_contract
diff --git a/srcpkgs/libboost_coroutine1.72 b/srcpkgs/libboost_coroutine
similarity index 100%
rename from srcpkgs/libboost_coroutine1.72
rename to srcpkgs/libboost_coroutine
diff --git a/srcpkgs/libboost_date_time1.72 b/srcpkgs/libboost_date_time
similarity index 100%
rename from srcpkgs/libboost_date_time1.72
rename to srcpkgs/libboost_date_time
diff --git a/srcpkgs/libboost_fiber1.72 b/srcpkgs/libboost_filesystem
similarity index 100%
rename from srcpkgs/libboost_fiber1.72
rename to srcpkgs/libboost_filesystem
diff --git a/srcpkgs/libboost_filesystem1.72 b/srcpkgs/libboost_graph
similarity index 100%
rename from srcpkgs/libboost_filesystem1.72
rename to srcpkgs/libboost_graph
diff --git a/srcpkgs/libboost_graph1.72 b/srcpkgs/libboost_iostreams
similarity index 100%
rename from srcpkgs/libboost_graph1.72
rename to srcpkgs/libboost_iostreams
diff --git a/srcpkgs/libboost_iostreams1.72 b/srcpkgs/libboost_locale
similarity index 100%
rename from srcpkgs/libboost_iostreams1.72
rename to srcpkgs/libboost_locale
diff --git a/srcpkgs/libboost_locale1.72 b/srcpkgs/libboost_log
similarity index 100%
rename from srcpkgs/libboost_locale1.72
rename to srcpkgs/libboost_log
diff --git a/srcpkgs/libboost_log1.72 b/srcpkgs/libboost_log_setup
similarity index 100%
rename from srcpkgs/libboost_log1.72
rename to srcpkgs/libboost_log_setup
diff --git a/srcpkgs/libboost_log_setup1.72 b/srcpkgs/libboost_math_c99
similarity index 100%
rename from srcpkgs/libboost_log_setup1.72
rename to srcpkgs/libboost_math_c99
diff --git a/srcpkgs/libboost_math_c991.72 b/srcpkgs/libboost_math_c99f
similarity index 100%
rename from srcpkgs/libboost_math_c991.72
rename to srcpkgs/libboost_math_c99f
diff --git a/srcpkgs/libboost_math_c99f1.72 b/srcpkgs/libboost_math_c99l
similarity index 100%
rename from srcpkgs/libboost_math_c99f1.72
rename to srcpkgs/libboost_math_c99l
diff --git a/srcpkgs/libboost_math_c99l1.72 b/srcpkgs/libboost_math_tr1
similarity index 100%
rename from srcpkgs/libboost_math_c99l1.72
rename to srcpkgs/libboost_math_tr1
diff --git a/srcpkgs/libboost_math_tr11.72 b/srcpkgs/libboost_math_tr1f
similarity index 100%
rename from srcpkgs/libboost_math_tr11.72
rename to srcpkgs/libboost_math_tr1f
diff --git a/srcpkgs/libboost_math_tr1f1.72 b/srcpkgs/libboost_math_tr1l
similarity index 100%
rename from srcpkgs/libboost_math_tr1f1.72
rename to srcpkgs/libboost_math_tr1l
diff --git a/srcpkgs/libboost_math_tr1l1.72 b/srcpkgs/libboost_prg_exec_monitor
similarity index 100%
rename from srcpkgs/libboost_math_tr1l1.72
rename to srcpkgs/libboost_prg_exec_monitor
diff --git a/srcpkgs/libboost_prg_exec_monitor1.72 b/srcpkgs/libboost_program_options
similarity index 100%
rename from srcpkgs/libboost_prg_exec_monitor1.72
rename to srcpkgs/libboost_program_options
diff --git a/srcpkgs/libboost_program_options1.72 b/srcpkgs/libboost_random
similarity index 100%
rename from srcpkgs/libboost_program_options1.72
rename to srcpkgs/libboost_random
diff --git a/srcpkgs/libboost_random1.72 b/srcpkgs/libboost_regex
similarity index 100%
rename from srcpkgs/libboost_random1.72
rename to srcpkgs/libboost_regex
diff --git a/srcpkgs/libboost_regex1.72 b/srcpkgs/libboost_serialization
similarity index 100%
rename from srcpkgs/libboost_regex1.72
rename to srcpkgs/libboost_serialization
diff --git a/srcpkgs/libboost_serialization1.72 b/srcpkgs/libboost_system
similarity index 100%
rename from srcpkgs/libboost_serialization1.72
rename to srcpkgs/libboost_system
diff --git a/srcpkgs/libboost_stacktrace_addr2line1.72 b/srcpkgs/libboost_thread
similarity index 100%
rename from srcpkgs/libboost_stacktrace_addr2line1.72
rename to srcpkgs/libboost_thread
diff --git a/srcpkgs/libboost_stacktrace_basic1.72 b/srcpkgs/libboost_timer
similarity index 100%
rename from srcpkgs/libboost_stacktrace_basic1.72
rename to srcpkgs/libboost_timer
diff --git a/srcpkgs/libboost_stacktrace_noop1.72 b/srcpkgs/libboost_type_erasure
similarity index 100%
rename from srcpkgs/libboost_stacktrace_noop1.72
rename to srcpkgs/libboost_type_erasure
diff --git a/srcpkgs/libboost_type_erasure1.72 b/srcpkgs/libboost_type_erasure1.72
deleted file mode 120000
index baef819c48f6..000000000000
--- a/srcpkgs/libboost_type_erasure1.72
+++ /dev/null
@@ -1 +0,0 @@
-boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_system1.72 b/srcpkgs/libboost_unit_test_framework
similarity index 100%
rename from srcpkgs/libboost_system1.72
rename to srcpkgs/libboost_unit_test_framework
diff --git a/srcpkgs/libboost_unit_test_framework1.72 b/srcpkgs/libboost_unit_test_framework1.72
deleted file mode 120000
index baef819c48f6..000000000000
--- a/srcpkgs/libboost_unit_test_framework1.72
+++ /dev/null
@@ -1 +0,0 @@
-boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_thread1.72 b/srcpkgs/libboost_wave
similarity index 100%
rename from srcpkgs/libboost_thread1.72
rename to srcpkgs/libboost_wave
diff --git a/srcpkgs/libboost_wave1.72 b/srcpkgs/libboost_wave1.72
deleted file mode 120000
index baef819c48f6..000000000000
--- a/srcpkgs/libboost_wave1.72
+++ /dev/null
@@ -1 +0,0 @@
-boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_timer1.72 b/srcpkgs/libboost_wserialization
similarity index 100%
rename from srcpkgs/libboost_timer1.72
rename to srcpkgs/libboost_wserialization
diff --git a/srcpkgs/libboost_wserialization1.72 b/srcpkgs/libboost_wserialization1.72
deleted file mode 120000
index baef819c48f6..000000000000
--- a/srcpkgs/libboost_wserialization1.72
+++ /dev/null
@@ -1 +0,0 @@
-boost
\ No newline at end of file

From 5a5881be3bfaad1c3eed39411de10b7ca7ea4b78 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 18:29:05 +0200
Subject: [PATCH 2/3] boost: quote all vmove's with a glob.

---
 srcpkgs/boost/template | 62 +++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index bc16a6841041..f88d566abd55 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -131,7 +131,7 @@ libboost_atomic_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
-		vmove usr/lib/libboost_atomic.so.*
+		vmove "usr/lib/libboost_atomic.so.*"
 	}
 }
 
@@ -139,7 +139,7 @@ libboost_chrono_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
-		vmove usr/lib/libboost_chrono.so.*
+		vmove "usr/lib/libboost_chrono.so.*"
 	}
 }
 
@@ -147,7 +147,7 @@ libboost_container_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
-		vmove usr/lib/libboost_container.so.*
+		vmove "usr/lib/libboost_container.so.*"
 	}
 }
 
@@ -155,7 +155,7 @@ libboost_context_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
-		vmove usr/lib/libboost_context.so.*
+		vmove "usr/lib/libboost_context.so.*"
 	}
 }
 
@@ -163,7 +163,7 @@ libboost_contract_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
-		vmove usr/lib/libboost_contract.so.*
+		vmove "usr/lib/libboost_contract.so.*"
 	}
 }
 
@@ -171,7 +171,7 @@ libboost_coroutine_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
-		vmove usr/lib/libboost_coroutine.so.*
+		vmove "usr/lib/libboost_coroutine.so.*"
 	}
 }
 
@@ -179,7 +179,7 @@ libboost_date_time_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
-		vmove usr/lib/libboost_date_time.so.*
+		vmove "usr/lib/libboost_date_time.so.*"
 	}
 }
 
@@ -187,7 +187,7 @@ libboost_filesystem_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
-		vmove usr/lib/libboost_filesystem.so.*
+		vmove "usr/lib/libboost_filesystem.so.*"
 	}
 }
 
@@ -195,7 +195,7 @@ libboost_graph_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
-		vmove usr/lib/libboost_graph.so.*
+		vmove "usr/lib/libboost_graph.so.*"
 	}
 }
 
@@ -203,7 +203,7 @@ libboost_iostreams_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
-		vmove usr/lib/libboost_iostreams.so.*
+		vmove "usr/lib/libboost_iostreams.so.*"
 	}
 }
 
@@ -211,7 +211,7 @@ libboost_locale_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
-		vmove usr/lib/libboost_locale.so.*
+		vmove "usr/lib/libboost_locale.so.*"
 	}
 }
 
@@ -219,7 +219,7 @@ libboost_log_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
-		vmove usr/lib/libboost_log.so.*
+		vmove "usr/lib/libboost_log.so.*"
 	}
 }
 
@@ -227,7 +227,7 @@ libboost_log_setup_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
-		vmove usr/lib/libboost_log_setup.so.*
+		vmove "usr/lib/libboost_log_setup.so.*"
 	}
 }
 
@@ -235,7 +235,7 @@ libboost_math_c99_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99.so.*
+		vmove "usr/lib/libboost_math_c99.so.*"
 	}
 }
 
@@ -243,7 +243,7 @@ libboost_math_c99f_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99f.so.*
+		vmove "usr/lib/libboost_math_c99f.so.*"
 	}
 }
 
@@ -251,7 +251,7 @@ libboost_math_c99l_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99l.so.*
+		vmove "usr/lib/libboost_math_c99l.so.*"
 	}
 }
 
@@ -259,7 +259,7 @@ libboost_math_tr1_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1.so.*
+		vmove "usr/lib/libboost_math_tr1.so.*"
 	}
 }
 
@@ -267,7 +267,7 @@ libboost_math_tr1f_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1f.so.*
+		vmove "usr/lib/libboost_math_tr1f.so.*"
 	}
 }
 
@@ -275,7 +275,7 @@ libboost_math_tr1l_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1l.so.*
+		vmove "usr/lib/libboost_math_tr1l.so.*"
 	}
 }
 
@@ -283,7 +283,7 @@ libboost_prg_exec_monitor_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
-		vmove usr/lib/libboost_prg_exec_monitor.so.*
+		vmove "usr/lib/libboost_prg_exec_monitor.so.*"
 	}
 }
 
@@ -291,7 +291,7 @@ libboost_program_options_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
-		vmove usr/lib/libboost_program_options.so.*
+		vmove "usr/lib/libboost_program_options.so.*"
 	}
 }
 
@@ -299,7 +299,7 @@ libboost_random_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
-		vmove usr/lib/libboost_random.so.*
+		vmove "usr/lib/libboost_random.so.*"
 	}
 }
 
@@ -307,7 +307,7 @@ libboost_regex_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
-		vmove usr/lib/libboost_regex.so.*
+		vmove "usr/lib/libboost_regex.so.*"
 	}
 }
 
@@ -315,7 +315,7 @@ libboost_serialization_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
-		vmove usr/lib/libboost_serialization.so.*
+		vmove "usr/lib/libboost_serialization.so.*"
 	}
 }
 
@@ -323,7 +323,7 @@ libboost_system_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
-		vmove usr/lib/libboost_system.so.*
+		vmove "usr/lib/libboost_system.so.*"
 	}
 }
 
@@ -331,7 +331,7 @@ libboost_thread_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
-		vmove usr/lib/libboost_thread.so.*
+		vmove "usr/lib/libboost_thread.so.*"
 	}
 }
 
@@ -339,7 +339,7 @@ libboost_timer_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
-		vmove usr/lib/libboost_timer.so.*
+		vmove "usr/lib/libboost_timer.so.*"
 	}
 }
 
@@ -347,7 +347,7 @@ libboost_type_erasure_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
-		vmove usr/lib/libboost_type_erasure.so.*
+		vmove "usr/lib/libboost_type_erasure.so.*"
 	}
 }
 
@@ -355,7 +355,7 @@ libboost_unit_test_framework_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
-		vmove usr/lib/libboost_unit_test_framework.so.*
+		vmove "usr/lib/libboost_unit_test_framework.so.*"
 	}
 }
 
@@ -363,7 +363,7 @@ libboost_wave_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
-		vmove usr/lib/libboost_wave.so.*
+		vmove "usr/lib/libboost_wave.so.*"
 	}
 }
 
@@ -371,7 +371,7 @@ libboost_wserialization_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
-		vmove usr/lib/libboost_wserialization.so.*
+		vmove "usr/lib/libboost_wserialization.so.*"
 	}
 }
 

From ede197280d6cd313fd5641541f9ddb31aa85a184 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 19:47:24 +0200
Subject: [PATCH 3/3] opencamlib: migrate away from versioned
 libboost_program_options

[ci skip] this doesn't even build locally correctly yet
---
 srcpkgs/opencamlib/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/opencamlib/template b/srcpkgs/opencamlib/template
index f837b50c5556..07d007cf2fc9 100644
--- a/srcpkgs/opencamlib/template
+++ b/srcpkgs/opencamlib/template
@@ -1,11 +1,11 @@
 # 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"
-makedepends="python3-devel boost-devel libboost_program_options1.72 libgomp-devel"
+makedepends="python3-devel boost-devel libboost_program_options libgomp-devel"
 short_desc="Open source computer aided manufacturing algorithms library"
 maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
 license="LGPL-2.1-or-later"

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] boost: update to 1.79.0.b1.
  2022-03-18 14:28 [PR PATCH] boost: update to 1.79.0.b1 JamiKettunen
                   ` (7 preceding siblings ...)
  2022-03-18 17:58 ` JamiKettunen
@ 2022-03-18 23:32 ` JamiKettunen
  2022-03-18 23:33 ` JamiKettunen
                   ` (19 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: JamiKettunen @ 2022-03-18 23:32 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3496 bytes --]

There is an updated pull request by JamiKettunen against master on the void-packages repository

https://github.com/JamiKettunen/void-packages boost-1.79.0
https://github.com/void-linux/void-packages/pull/36204

boost: update to 1.79.0.b1.
For now I've also dropped the `boost` version from all subpkg names as was previously done for `protobuf` with f38a742bec751aa8c3d9c592e020503256d27a1c, let me know if this should be kept or not; imho maintaining this would be easier if we don't have versioned pkgnames.

#### Current issues
Cross-compilation fails due to `bjam` building for the host instead of the target:
```
$ ./xbps-src pkg -a aarch64-musl boost
...
=> boost-1.79.0.b1_1: running post-install hook: 06-strip-and-debug-pkgs ...
   Stripped library: /usr/lib/libboost_json.so.1.79.0
   Stripped library: /usr/lib/libboost_nowide.so.1.79.0
/usr/bin/aarch64-linux-musl-strip: Unable to recognise the format of the input file `/destdir/aarch64-linux-musl/boost-1.79.0.b1/usr/bin/bjam'
=> ERROR: boost-1.79.0.b1_1: failed to strip /usr/bin/bjam
=> ERROR: boost-1.79.0.b1_1: post-install_06-strip-and-debug-pkgs: 'find ${PKGDESTDIR} -type f' exited with 1
=> ERROR:   in hook() at common/hooks/post-install/06-strip-and-debug-pkgs.sh:68
=> ERROR:   in run_func() at common/xbps-src/shutils/common.sh:21
=> ERROR:   in run_pkg_hooks() at common/xbps-src/shutils/common.sh:245
=> ERROR:   in main() at common/xbps-src/libexec/xbps-src-doinstall.sh:66
$ file masterdir/destdir/aarch64-linux-musl/boost-jam-1.79.0.b1/usr/bin/bjam 
masterdir/destdir/aarch64-linux-musl/boost-jam-1.79.0.b1/usr/bin/bjam: ELF 64-bit LSB pie executable, x86-64, version 1 (SYSV), dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, BuildID[sha1]=861bc7f944396eb219efdc4e618e58125088d6aa, for GNU/Linux 3.2.0, stripped
```
Additionally a few shared objects aren't built anymore for some reason, namely `libboost_stacktrace_{addr2line,basic,noop}.so.*` & `libboost_fiber.so.*`, so I dropped their subpackages for now (is this ok?).

#### Solved issues
The `failed to install target dependencies! (error 40)` issue was fixed by making new subpackages for `libboost_json.so.*` & `libboost_nowide.so.*`; they were inside the `boost` pkg, depended on `libboost_container` which itself depends on `boost` => circular dependency.

#### Modified patches
`exec_file.patch`: Removed due to being upstream as https://github.com/boostorg/python/commit/d9f06052e28873037db7f98629bce72182a42410
`mips.patch`: Updated to apply on top of https://github.com/boostorg/fiber/commit/5dc9dabc5d5ff8da53ec897c265c9cba1b6ed0df, not sure if this can be removed now(?)

#### To-Do
- Include ~90 commits from `xrevbump 'revbump for boost-1.79.0.b1.' <xrevshlib boost output from master>`

#### Testing the changes
- I tested the changes in this PR: **NO**

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36204.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boost-1.79.0-36204.patch --]
[-- Type: text/x-diff, Size: 41286 bytes --]

From b5ee58154ff87500fbdeda3bc51691877440e5d9 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 15:28:37 +0200
Subject: [PATCH 1/3] boost: update to 1.79.0.b1.

---
 common/shlibs                                 |  60 +++---
 .../{boost-python1.72 => boost-python1.79}    |   0
 .../{boost-python3-1.72 => boost-python31.79} |   0
 srcpkgs/boost/patches/exec_file.patch         |  45 -----
 srcpkgs/boost/patches/mips.patch              |   2 +-
 srcpkgs/boost/template                        | 191 +++++++-----------
 ...ibboost_atomic1.72 => libboost_atomic1.79} |   0
 ...ibboost_chrono1.72 => libboost_chrono1.79} |   0
 ...t_container1.72 => libboost_container1.79} |   0
 ...boost_context1.72 => libboost_context1.79} |   0
 ...ost_contract1.72 => libboost_contract1.79} |   0
 ...t_coroutine1.72 => libboost_coroutine1.79} |   0
 ...t_date_time1.72 => libboost_date_time1.79} |   0
 ...oost_fiber1.72 => libboost_filesystem1.79} |   0
 ...oost_filesystem1.72 => libboost_graph1.79} |   0
 ...boost_graph1.72 => libboost_iostreams1.79} |   0
 ...bboost_iostreams1.72 => libboost_json1.79} |   0
 ...ibboost_locale1.72 => libboost_locale1.79} |   0
 .../{libboost_log1.72 => libboost_log1.79}    |   0
 ...t_log_setup1.72 => libboost_log_setup1.79} |   0
 ...ost_math_c991.72 => libboost_math_c991.79} |   0
 ...t_math_c99f1.72 => libboost_math_c99f1.79} |   0
 ...t_math_c99l1.72 => libboost_math_c99l1.79} |   0
 ...ost_math_tr11.72 => libboost_math_tr11.79} |   0
 ...t_math_tr1f1.72 => libboost_math_tr1f1.79} |   0
 ...t_math_tr1l1.72 => libboost_math_tr1l1.79} |   0
 ...g_exec_monitor1.72 => libboost_nowide1.79} |   0
 ...ions1.72 => libboost_prg_exec_monitor1.79} |   0
 ...andom1.72 => libboost_program_options1.79} |   0
 ...libboost_regex1.72 => libboost_random1.79} |   0
 ...t_serialization1.72 => libboost_regex1.79} |   0
 ...dr2line1.72 => libboost_serialization1.79} |   0
 ...acktrace_basic1.72 => libboost_system1.79} |   0
 ...tacktrace_noop1.72 => libboost_thread1.79} |   0
 ...libboost_system1.72 => libboost_timer1.79} |   0
 ...t_thread1.72 => libboost_type_erasure1.79} |   0
 ...r1.72 => libboost_unit_test_framework1.79} |   0
 srcpkgs/libboost_wave1.72                     |   1 -
 ...ost_type_erasure1.72 => libboost_wave1.79} |   0
 srcpkgs/libboost_wserialization1.72           |   1 -
 ...mework1.72 => libboost_wserialization1.79} |   0
 41 files changed, 103 insertions(+), 197 deletions(-)
 rename srcpkgs/{boost-python1.72 => boost-python1.79} (100%)
 rename srcpkgs/{boost-python3-1.72 => boost-python31.79} (100%)
 delete mode 100644 srcpkgs/boost/patches/exec_file.patch
 rename srcpkgs/{libboost_atomic1.72 => libboost_atomic1.79} (100%)
 rename srcpkgs/{libboost_chrono1.72 => libboost_chrono1.79} (100%)
 rename srcpkgs/{libboost_container1.72 => libboost_container1.79} (100%)
 rename srcpkgs/{libboost_context1.72 => libboost_context1.79} (100%)
 rename srcpkgs/{libboost_contract1.72 => libboost_contract1.79} (100%)
 rename srcpkgs/{libboost_coroutine1.72 => libboost_coroutine1.79} (100%)
 rename srcpkgs/{libboost_date_time1.72 => libboost_date_time1.79} (100%)
 rename srcpkgs/{libboost_fiber1.72 => libboost_filesystem1.79} (100%)
 rename srcpkgs/{libboost_filesystem1.72 => libboost_graph1.79} (100%)
 rename srcpkgs/{libboost_graph1.72 => libboost_iostreams1.79} (100%)
 rename srcpkgs/{libboost_iostreams1.72 => libboost_json1.79} (100%)
 rename srcpkgs/{libboost_locale1.72 => libboost_locale1.79} (100%)
 rename srcpkgs/{libboost_log1.72 => libboost_log1.79} (100%)
 rename srcpkgs/{libboost_log_setup1.72 => libboost_log_setup1.79} (100%)
 rename srcpkgs/{libboost_math_c991.72 => libboost_math_c991.79} (100%)
 rename srcpkgs/{libboost_math_c99f1.72 => libboost_math_c99f1.79} (100%)
 rename srcpkgs/{libboost_math_c99l1.72 => libboost_math_c99l1.79} (100%)
 rename srcpkgs/{libboost_math_tr11.72 => libboost_math_tr11.79} (100%)
 rename srcpkgs/{libboost_math_tr1f1.72 => libboost_math_tr1f1.79} (100%)
 rename srcpkgs/{libboost_math_tr1l1.72 => libboost_math_tr1l1.79} (100%)
 rename srcpkgs/{libboost_prg_exec_monitor1.72 => libboost_nowide1.79} (100%)
 rename srcpkgs/{libboost_program_options1.72 => libboost_prg_exec_monitor1.79} (100%)
 rename srcpkgs/{libboost_random1.72 => libboost_program_options1.79} (100%)
 rename srcpkgs/{libboost_regex1.72 => libboost_random1.79} (100%)
 rename srcpkgs/{libboost_serialization1.72 => libboost_regex1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_addr2line1.72 => libboost_serialization1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_basic1.72 => libboost_system1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_noop1.72 => libboost_thread1.79} (100%)
 rename srcpkgs/{libboost_system1.72 => libboost_timer1.79} (100%)
 rename srcpkgs/{libboost_thread1.72 => libboost_type_erasure1.79} (100%)
 rename srcpkgs/{libboost_timer1.72 => libboost_unit_test_framework1.79} (100%)
 delete mode 120000 srcpkgs/libboost_wave1.72
 rename srcpkgs/{libboost_type_erasure1.72 => libboost_wave1.79} (100%)
 delete mode 120000 srcpkgs/libboost_wserialization1.72
 rename srcpkgs/{libboost_unit_test_framework1.72 => libboost_wserialization1.79} (100%)

diff --git a/common/shlibs b/common/shlibs
index 83b5783cb026..4253ce15bf03 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -620,38 +620,34 @@ 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.79.0 libboost_context1.79-1.79.0.b1_1
+libboost_coroutine.so.1.79.0 libboost_coroutine1.79-1.79.0.b1_1
+libboost_container.so.1.79.0 libboost_container1.79-1.79.0.b1_1
+libboost_prg_exec_monitor.so.1.79.0 libboost_prg_exec_monitor1.79-1.79.0.b1_1
+libboost_timer.so.1.79.0 libboost_timer1.79-1.79.0.b1_1
+libboost_random.so.1.79.0 libboost_random1.79-1.79.0.b1_1
+libboost_filesystem.so.1.79.0 libboost_filesystem1.79-1.79.0.b1_1
+libboost_unit_test_framework.so.1.79.0 libboost_unit_test_framework1.79-1.79.0.b1_1
+libboost_math_c99.so.1.79.0 libboost_math_c99-1.79-1.79.0.b1_1
+libboost_math_tr1.so.1.79.0 libboost_math_tr1-1.79-1.79.0.b1_1
+libboost_regex.so.1.79.0 libboost_regex1.79-1.79.0.b1_1
+libboost_serialization.so.1.79.0 libboost_serialization1.79-1.79.0.b1_1
+libboost_chrono.so.1.79.0 libboost_chrono1.79-1.79.0.b1_1
+libboost_wserialization.so.1.79.0 libboost_wserialization1.79-1.79.0.b1_1
+libboost_graph.so.1.79.0 libboost_graph1.79-1.79.0.b1_1
+libboost_log.so.1.79.0 libboost_log1.79-1.79.0.b1_1
+libboost_locale.so.1.79.0 libboost_locale1.79-1.79.0.b1_1
+libboost_program_options.so.1.79.0 libboost_program_options1.79-1.79.0.b1_1
+libboost_iostreams.so.1.79.0 libboost_iostreams1.79-1.79.0.b1_1
+libboost_system.so.1.79.0 libboost_system1.79-1.79.0.b1_1
+libboost_thread.so.1.79.0 libboost_thread1.79-1.79.0.b1_1
+libboost_log_setup.so.1.79.0 libboost_log_setup1.79-1.79.0.b1_1
+libboost_date_time.so.1.79.0 libboost_date_time1.79-1.79.0.b1_1
+libboost_wave.so.1.79.0 libboost_wave1.79-1.79.0.b1_1
+libboost_atomic.so.1.79.0 libboost_atomic1.79-1.79.0.b1_1
+libboost_type_erasure.so.1.79.0 libboost_type_erasure1.79-1.79.0.b1_1
+libboost_python27.so.1.79.0 boost-python1.79-1.79.0.b1_1
+libboost_python310.so.1.79.0 boost-python3-1.79-1.79.0.b1_1
 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-python1.79
similarity index 100%
rename from srcpkgs/boost-python1.72
rename to srcpkgs/boost-python1.79
diff --git a/srcpkgs/boost-python3-1.72 b/srcpkgs/boost-python31.79
similarity index 100%
rename from srcpkgs/boost-python3-1.72
rename to srcpkgs/boost-python31.79
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/mips.patch b/srcpkgs/boost/patches/mips.patch
index a10a2122d9c7..8d253fc7c286 100644
--- a/srcpkgs/boost/patches/mips.patch
+++ b/srcpkgs/boost/patches/mips.patch
@@ -3,7 +3,7 @@
 @@ -48,7 +48,7 @@
  #  define cpu_relax() asm volatile ("nop" ::: "memory");
  # endif
- #elif BOOST_ARCH_MIPS
+ #elif BOOST_ARCH_MIPS && (((__mips_isa_rev > 1) && defined(__mips32)) || ((__mips_isa_rev > 2)  && defined(__mips64)))
 -# define cpu_relax() asm volatile ("pause" ::: "memory");
 +# define cpu_relax() asm volatile ("nop" ::: "memory");
  #elif BOOST_ARCH_PPC
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 126c50770b50..535a3516328b 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,62 +1,24 @@
 # Template file for 'boost'
 pkgname=boost
-version=1.72.0
-revision=7
-wrksrc="${pkgname}_${version//\./_}"
+version=1.79.0.b1
+revision=1
+wrksrc="${pkgname}_${version%.*}"
+wrksrc="${wrksrc//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-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
+distfiles="https://boostorg.jfrog.io/artifactory/main/beta/${version/b1/beta1}/source/boost_${version//./_}.tar.bz2"
+checksum=8985105623f48d55be01076d98ca4e7a8cb548a8d7f9ad0e1fc3c710d2c75fcf
 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"
-
-if [ -z "$CROSS_BUILD" ]; then
-	subpackages+=" libboost_stacktrace_addr2line1.72"
-fi
-
 case "$XBPS_TARGET_MACHINE" in
-	i686*)    _arch=x86;      _abi=sysv  ;;
-	x86_64*)  _arch=x86;      _abi=sysv  ;;
-	arm*)     _arch=arm;      _abi=aapcs ;;
-	aarch64*) _arch=arm;      _abi=aapcs ;;
-	mips*)    _arch=mips32r2; _abi=o32   ;;
-	ppc*)     _arch=power;    _abi=sysv  ;;
+	i686*|x86_64*) _arch=x86;      _abi=sysv  ;;
+	arm*|aarch64*) _arch=arm;      _abi=aapcs ;;
+	mips*)         _arch=mips32r2; _abi=o32   ;;
+	ppc*)          _arch=power;    _abi=sysv  ;;
 esac
 
 do_build() {
@@ -66,7 +28,7 @@ do_build() {
 	(
 	# Rebuild bjam for target
 	cd tools/build/src/engine
-	./build.sh gcc
+	./build.sh --cxx="${CXX}" --cxxflags="${CXXFLAGS}" gcc
 	)
 	cat > user-config.jam <<-__EOF
 	using gcc : : ${CXX} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
@@ -74,10 +36,8 @@ do_build() {
 	using python : ${py3_ver} : ${XBPS_CROSS_BASE}/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} \
 		threading=multi runtime-link=shared link=shared,static
 }
@@ -119,7 +79,7 @@ boost-jam_package() {
 		vmove usr/bin/b2
 	}
 }
-boost-python1.72_package() {
+boost-python1.79_package() {
 	depends="boost python"
 	replaces="boost-python>=0"
 	short_desc+=" - Python bindings"
@@ -127,7 +87,7 @@ boost-python1.72_package() {
 		vmove "usr/lib/libboost_python2*.so.*"
 	}
 }
-boost-python3-1.72_package() {
+boost-python3-1.79_package() {
 	depends="boost python3"
 	replaces="boost-python3>=0"
 	short_desc+=" - Python3 bindings"
@@ -145,7 +105,20 @@ boost-build_package() {
 }
 boost-devel_package() {
 	noverifyrdeps=yes
-	depends="boost ${subpackages/boost-devel}"
+	depends="boost libboost_program_options1.79 libboost_math_c99f1.79
+ libboost_iostreams1.79 libboost_math_tr1l1.79 libboost_filesystem1.79
+ libboost_chrono1.79 libboost_math_tr1f1.79 libboost_wave1.79
+ libboost_graph1.79 libboost_locale1.79 libboost_regex1.79
+ libboost_type_erasure1.79 libboost_coroutine1.79
+ libboost_atomic1.79 libboost_prg_exec_monitor1.79 libboost_math_c99-1.79
+ boost-python3-1.79 libboost_log_setup1.79
+ libboost_timer1.79 libboost_system1.79 libboost_unit_test_framework1.79
+ libboost_serialization1.79 libboost_math_tr1-1.79 boost-build1.79
+ libboost_math_c99l1.79 boost-python1.79 libboost_contract1.79
+ libboost_date_time1.79 libboost_log1.79 libboost_random1.79
+ libboost_thread1.79 libboost_container1.79 boost-jam1.79
+ libboost_wserialization1.79 libboost_context1.79 libboost_json1.79
+ libboost_nowide1.79"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -154,7 +127,7 @@ boost-devel_package() {
 	}
 }
 
-libboost_atomic1.72_package() {
+libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
@@ -162,7 +135,7 @@ libboost_atomic1.72_package() {
 	}
 }
 
-libboost_chrono1.72_package() {
+libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
@@ -170,7 +143,7 @@ libboost_chrono1.72_package() {
 	}
 }
 
-libboost_container1.72_package() {
+libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
@@ -178,7 +151,7 @@ libboost_container1.72_package() {
 	}
 }
 
-libboost_context1.72_package() {
+libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
@@ -186,7 +159,7 @@ libboost_context1.72_package() {
 	}
 }
 
-libboost_contract1.72_package() {
+libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
@@ -194,7 +167,7 @@ libboost_contract1.72_package() {
 	}
 }
 
-libboost_coroutine1.72_package() {
+libboost_coroutine1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
@@ -202,7 +175,7 @@ libboost_coroutine1.72_package() {
 	}
 }
 
-libboost_date_time1.72_package() {
+libboost_date_time1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
@@ -210,15 +183,7 @@ libboost_date_time1.72_package() {
 	}
 }
 
-libboost_fiber1.72_package() {
-	depends="boost"
-	short_desc+=" - libboost_fiber"
-	pkg_install() {
-		vmove usr/lib/libboost_fiber.so.*
-	}
-}
-
-libboost_filesystem1.72_package() {
+libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
@@ -226,7 +191,7 @@ libboost_filesystem1.72_package() {
 	}
 }
 
-libboost_graph1.72_package() {
+libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
@@ -234,7 +199,7 @@ libboost_graph1.72_package() {
 	}
 }
 
-libboost_iostreams1.72_package() {
+libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
@@ -242,7 +207,7 @@ libboost_iostreams1.72_package() {
 	}
 }
 
-libboost_locale1.72_package() {
+libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
@@ -250,7 +215,7 @@ libboost_locale1.72_package() {
 	}
 }
 
-libboost_log1.72_package() {
+libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
@@ -258,7 +223,7 @@ libboost_log1.72_package() {
 	}
 }
 
-libboost_log_setup1.72_package() {
+libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
@@ -266,7 +231,7 @@ libboost_log_setup1.72_package() {
 	}
 }
 
-libboost_math_c991.72_package() {
+libboost_math_c99-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
@@ -274,7 +239,7 @@ libboost_math_c991.72_package() {
 	}
 }
 
-libboost_math_c99f1.72_package() {
+libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
@@ -282,7 +247,7 @@ libboost_math_c99f1.72_package() {
 	}
 }
 
-libboost_math_c99l1.72_package() {
+libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
@@ -290,7 +255,7 @@ libboost_math_c99l1.72_package() {
 	}
 }
 
-libboost_math_tr11.72_package() {
+libboost_math_tr1-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
@@ -298,7 +263,7 @@ libboost_math_tr11.72_package() {
 	}
 }
 
-libboost_math_tr1f1.72_package() {
+libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
@@ -306,7 +271,7 @@ libboost_math_tr1f1.72_package() {
 	}
 }
 
-libboost_math_tr1l1.72_package() {
+libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
@@ -314,7 +279,7 @@ libboost_math_tr1l1.72_package() {
 	}
 }
 
-libboost_prg_exec_monitor1.72_package() {
+libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
@@ -322,7 +287,7 @@ libboost_prg_exec_monitor1.72_package() {
 	}
 }
 
-libboost_program_options1.72_package() {
+libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
@@ -330,7 +295,7 @@ libboost_program_options1.72_package() {
 	}
 }
 
-libboost_random1.72_package() {
+libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
@@ -338,7 +303,7 @@ libboost_random1.72_package() {
 	}
 }
 
-libboost_regex1.72_package() {
+libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
@@ -346,7 +311,7 @@ libboost_regex1.72_package() {
 	}
 }
 
-libboost_serialization1.72_package() {
+libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
@@ -354,31 +319,7 @@ libboost_serialization1.72_package() {
 	}
 }
 
-libboost_stacktrace_addr2line1.72_package() {
-	depends="boost"
-	short_desc+=" - libboost_stacktrace_addr2line"
-	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_addr2line.so.*
-	}
-}
-
-libboost_stacktrace_basic1.72_package() {
-	depends="boost"
-	short_desc+=" - libboost_stacktrace_basic"
-	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_basic.so.*
-	}
-}
-
-libboost_stacktrace_noop1.72_package() {
-	depends="boost"
-	short_desc+=" - libboost_stacktrace_noop"
-	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_noop.so.*
-	}
-}
-
-libboost_system1.72_package() {
+libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
@@ -386,7 +327,7 @@ libboost_system1.72_package() {
 	}
 }
 
-libboost_thread1.72_package() {
+libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
@@ -394,7 +335,7 @@ libboost_thread1.72_package() {
 	}
 }
 
-libboost_timer1.72_package() {
+libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
@@ -402,7 +343,7 @@ libboost_timer1.72_package() {
 	}
 }
 
-libboost_type_erasure1.72_package() {
+libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
@@ -410,7 +351,7 @@ libboost_type_erasure1.72_package() {
 	}
 }
 
-libboost_unit_test_framework1.72_package() {
+libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
@@ -418,7 +359,7 @@ libboost_unit_test_framework1.72_package() {
 	}
 }
 
-libboost_wave1.72_package() {
+libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
@@ -426,10 +367,26 @@ libboost_wave1.72_package() {
 	}
 }
 
-libboost_wserialization1.72_package() {
+libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
 		vmove usr/lib/libboost_wserialization.so.*
 	}
 }
+
+libboost_json1.79_package() {
+	depends="boost"
+	short_desc+=" - libboost_json"
+	pkg_install() {
+		vmove "usr/lib/libboost_json.so.*"
+	}
+}
+
+libboost_nowide1.79_package() {
+	depends="boost"
+	short_desc+=" - libboost_nowide"
+	pkg_install() {
+		vmove "usr/lib/libboost_nowide.so.*"
+	}
+}
diff --git a/srcpkgs/libboost_atomic1.72 b/srcpkgs/libboost_atomic1.79
similarity index 100%
rename from srcpkgs/libboost_atomic1.72
rename to srcpkgs/libboost_atomic1.79
diff --git a/srcpkgs/libboost_chrono1.72 b/srcpkgs/libboost_chrono1.79
similarity index 100%
rename from srcpkgs/libboost_chrono1.72
rename to srcpkgs/libboost_chrono1.79
diff --git a/srcpkgs/libboost_container1.72 b/srcpkgs/libboost_container1.79
similarity index 100%
rename from srcpkgs/libboost_container1.72
rename to srcpkgs/libboost_container1.79
diff --git a/srcpkgs/libboost_context1.72 b/srcpkgs/libboost_context1.79
similarity index 100%
rename from srcpkgs/libboost_context1.72
rename to srcpkgs/libboost_context1.79
diff --git a/srcpkgs/libboost_contract1.72 b/srcpkgs/libboost_contract1.79
similarity index 100%
rename from srcpkgs/libboost_contract1.72
rename to srcpkgs/libboost_contract1.79
diff --git a/srcpkgs/libboost_coroutine1.72 b/srcpkgs/libboost_coroutine1.79
similarity index 100%
rename from srcpkgs/libboost_coroutine1.72
rename to srcpkgs/libboost_coroutine1.79
diff --git a/srcpkgs/libboost_date_time1.72 b/srcpkgs/libboost_date_time1.79
similarity index 100%
rename from srcpkgs/libboost_date_time1.72
rename to srcpkgs/libboost_date_time1.79
diff --git a/srcpkgs/libboost_fiber1.72 b/srcpkgs/libboost_filesystem1.79
similarity index 100%
rename from srcpkgs/libboost_fiber1.72
rename to srcpkgs/libboost_filesystem1.79
diff --git a/srcpkgs/libboost_filesystem1.72 b/srcpkgs/libboost_graph1.79
similarity index 100%
rename from srcpkgs/libboost_filesystem1.72
rename to srcpkgs/libboost_graph1.79
diff --git a/srcpkgs/libboost_graph1.72 b/srcpkgs/libboost_iostreams1.79
similarity index 100%
rename from srcpkgs/libboost_graph1.72
rename to srcpkgs/libboost_iostreams1.79
diff --git a/srcpkgs/libboost_iostreams1.72 b/srcpkgs/libboost_json1.79
similarity index 100%
rename from srcpkgs/libboost_iostreams1.72
rename to srcpkgs/libboost_json1.79
diff --git a/srcpkgs/libboost_locale1.72 b/srcpkgs/libboost_locale1.79
similarity index 100%
rename from srcpkgs/libboost_locale1.72
rename to srcpkgs/libboost_locale1.79
diff --git a/srcpkgs/libboost_log1.72 b/srcpkgs/libboost_log1.79
similarity index 100%
rename from srcpkgs/libboost_log1.72
rename to srcpkgs/libboost_log1.79
diff --git a/srcpkgs/libboost_log_setup1.72 b/srcpkgs/libboost_log_setup1.79
similarity index 100%
rename from srcpkgs/libboost_log_setup1.72
rename to srcpkgs/libboost_log_setup1.79
diff --git a/srcpkgs/libboost_math_c991.72 b/srcpkgs/libboost_math_c991.79
similarity index 100%
rename from srcpkgs/libboost_math_c991.72
rename to srcpkgs/libboost_math_c991.79
diff --git a/srcpkgs/libboost_math_c99f1.72 b/srcpkgs/libboost_math_c99f1.79
similarity index 100%
rename from srcpkgs/libboost_math_c99f1.72
rename to srcpkgs/libboost_math_c99f1.79
diff --git a/srcpkgs/libboost_math_c99l1.72 b/srcpkgs/libboost_math_c99l1.79
similarity index 100%
rename from srcpkgs/libboost_math_c99l1.72
rename to srcpkgs/libboost_math_c99l1.79
diff --git a/srcpkgs/libboost_math_tr11.72 b/srcpkgs/libboost_math_tr11.79
similarity index 100%
rename from srcpkgs/libboost_math_tr11.72
rename to srcpkgs/libboost_math_tr11.79
diff --git a/srcpkgs/libboost_math_tr1f1.72 b/srcpkgs/libboost_math_tr1f1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1f1.72
rename to srcpkgs/libboost_math_tr1f1.79
diff --git a/srcpkgs/libboost_math_tr1l1.72 b/srcpkgs/libboost_math_tr1l1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1l1.72
rename to srcpkgs/libboost_math_tr1l1.79
diff --git a/srcpkgs/libboost_prg_exec_monitor1.72 b/srcpkgs/libboost_nowide1.79
similarity index 100%
rename from srcpkgs/libboost_prg_exec_monitor1.72
rename to srcpkgs/libboost_nowide1.79
diff --git a/srcpkgs/libboost_program_options1.72 b/srcpkgs/libboost_prg_exec_monitor1.79
similarity index 100%
rename from srcpkgs/libboost_program_options1.72
rename to srcpkgs/libboost_prg_exec_monitor1.79
diff --git a/srcpkgs/libboost_random1.72 b/srcpkgs/libboost_program_options1.79
similarity index 100%
rename from srcpkgs/libboost_random1.72
rename to srcpkgs/libboost_program_options1.79
diff --git a/srcpkgs/libboost_regex1.72 b/srcpkgs/libboost_random1.79
similarity index 100%
rename from srcpkgs/libboost_regex1.72
rename to srcpkgs/libboost_random1.79
diff --git a/srcpkgs/libboost_serialization1.72 b/srcpkgs/libboost_regex1.79
similarity index 100%
rename from srcpkgs/libboost_serialization1.72
rename to srcpkgs/libboost_regex1.79
diff --git a/srcpkgs/libboost_stacktrace_addr2line1.72 b/srcpkgs/libboost_serialization1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_addr2line1.72
rename to srcpkgs/libboost_serialization1.79
diff --git a/srcpkgs/libboost_stacktrace_basic1.72 b/srcpkgs/libboost_system1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_basic1.72
rename to srcpkgs/libboost_system1.79
diff --git a/srcpkgs/libboost_stacktrace_noop1.72 b/srcpkgs/libboost_thread1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_noop1.72
rename to srcpkgs/libboost_thread1.79
diff --git a/srcpkgs/libboost_system1.72 b/srcpkgs/libboost_timer1.79
similarity index 100%
rename from srcpkgs/libboost_system1.72
rename to srcpkgs/libboost_timer1.79
diff --git a/srcpkgs/libboost_thread1.72 b/srcpkgs/libboost_type_erasure1.79
similarity index 100%
rename from srcpkgs/libboost_thread1.72
rename to srcpkgs/libboost_type_erasure1.79
diff --git a/srcpkgs/libboost_timer1.72 b/srcpkgs/libboost_unit_test_framework1.79
similarity index 100%
rename from srcpkgs/libboost_timer1.72
rename to srcpkgs/libboost_unit_test_framework1.79
diff --git a/srcpkgs/libboost_wave1.72 b/srcpkgs/libboost_wave1.72
deleted file mode 120000
index baef819c48f6..000000000000
--- a/srcpkgs/libboost_wave1.72
+++ /dev/null
@@ -1 +0,0 @@
-boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_type_erasure1.72 b/srcpkgs/libboost_wave1.79
similarity index 100%
rename from srcpkgs/libboost_type_erasure1.72
rename to srcpkgs/libboost_wave1.79
diff --git a/srcpkgs/libboost_wserialization1.72 b/srcpkgs/libboost_wserialization1.72
deleted file mode 120000
index baef819c48f6..000000000000
--- a/srcpkgs/libboost_wserialization1.72
+++ /dev/null
@@ -1 +0,0 @@
-boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_unit_test_framework1.72 b/srcpkgs/libboost_wserialization1.79
similarity index 100%
rename from srcpkgs/libboost_unit_test_framework1.72
rename to srcpkgs/libboost_wserialization1.79

From d70ee6d18b1d90fd18ae42b5264e1740bacf54ff Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 18:29:05 +0200
Subject: [PATCH 2/3] boost: quote all vmove's with a glob.

---
 srcpkgs/boost/template | 62 +++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 535a3516328b..3a611fd273c2 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -131,7 +131,7 @@ libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
-		vmove usr/lib/libboost_atomic.so.*
+		vmove "usr/lib/libboost_atomic.so.*"
 	}
 }
 
@@ -139,7 +139,7 @@ libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
-		vmove usr/lib/libboost_chrono.so.*
+		vmove "usr/lib/libboost_chrono.so.*"
 	}
 }
 
@@ -147,7 +147,7 @@ libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
-		vmove usr/lib/libboost_container.so.*
+		vmove "usr/lib/libboost_container.so.*"
 	}
 }
 
@@ -155,7 +155,7 @@ libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
-		vmove usr/lib/libboost_context.so.*
+		vmove "usr/lib/libboost_context.so.*"
 	}
 }
 
@@ -163,7 +163,7 @@ libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
-		vmove usr/lib/libboost_contract.so.*
+		vmove "usr/lib/libboost_contract.so.*"
 	}
 }
 
@@ -171,7 +171,7 @@ libboost_coroutine1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
-		vmove usr/lib/libboost_coroutine.so.*
+		vmove "usr/lib/libboost_coroutine.so.*"
 	}
 }
 
@@ -179,7 +179,7 @@ libboost_date_time1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
-		vmove usr/lib/libboost_date_time.so.*
+		vmove "usr/lib/libboost_date_time.so.*"
 	}
 }
 
@@ -187,7 +187,7 @@ libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
-		vmove usr/lib/libboost_filesystem.so.*
+		vmove "usr/lib/libboost_filesystem.so.*"
 	}
 }
 
@@ -195,7 +195,7 @@ libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
-		vmove usr/lib/libboost_graph.so.*
+		vmove "usr/lib/libboost_graph.so.*"
 	}
 }
 
@@ -203,7 +203,7 @@ libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
-		vmove usr/lib/libboost_iostreams.so.*
+		vmove "usr/lib/libboost_iostreams.so.*"
 	}
 }
 
@@ -211,7 +211,7 @@ libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
-		vmove usr/lib/libboost_locale.so.*
+		vmove "usr/lib/libboost_locale.so.*"
 	}
 }
 
@@ -219,7 +219,7 @@ libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
-		vmove usr/lib/libboost_log.so.*
+		vmove "usr/lib/libboost_log.so.*"
 	}
 }
 
@@ -227,7 +227,7 @@ libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
-		vmove usr/lib/libboost_log_setup.so.*
+		vmove "usr/lib/libboost_log_setup.so.*"
 	}
 }
 
@@ -235,7 +235,7 @@ libboost_math_c99-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99.so.*
+		vmove "usr/lib/libboost_math_c99.so.*"
 	}
 }
 
@@ -243,7 +243,7 @@ libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99f.so.*
+		vmove "usr/lib/libboost_math_c99f.so.*"
 	}
 }
 
@@ -251,7 +251,7 @@ libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99l.so.*
+		vmove "usr/lib/libboost_math_c99l.so.*"
 	}
 }
 
@@ -259,7 +259,7 @@ libboost_math_tr1-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1.so.*
+		vmove "usr/lib/libboost_math_tr1.so.*"
 	}
 }
 
@@ -267,7 +267,7 @@ libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1f.so.*
+		vmove "usr/lib/libboost_math_tr1f.so.*"
 	}
 }
 
@@ -275,7 +275,7 @@ libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1l.so.*
+		vmove "usr/lib/libboost_math_tr1l.so.*"
 	}
 }
 
@@ -283,7 +283,7 @@ libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
-		vmove usr/lib/libboost_prg_exec_monitor.so.*
+		vmove "usr/lib/libboost_prg_exec_monitor.so.*"
 	}
 }
 
@@ -291,7 +291,7 @@ libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
-		vmove usr/lib/libboost_program_options.so.*
+		vmove "usr/lib/libboost_program_options.so.*"
 	}
 }
 
@@ -299,7 +299,7 @@ libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
-		vmove usr/lib/libboost_random.so.*
+		vmove "usr/lib/libboost_random.so.*"
 	}
 }
 
@@ -307,7 +307,7 @@ libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
-		vmove usr/lib/libboost_regex.so.*
+		vmove "usr/lib/libboost_regex.so.*"
 	}
 }
 
@@ -315,7 +315,7 @@ libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
-		vmove usr/lib/libboost_serialization.so.*
+		vmove "usr/lib/libboost_serialization.so.*"
 	}
 }
 
@@ -323,7 +323,7 @@ libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
-		vmove usr/lib/libboost_system.so.*
+		vmove "usr/lib/libboost_system.so.*"
 	}
 }
 
@@ -331,7 +331,7 @@ libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
-		vmove usr/lib/libboost_thread.so.*
+		vmove "usr/lib/libboost_thread.so.*"
 	}
 }
 
@@ -339,7 +339,7 @@ libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
-		vmove usr/lib/libboost_timer.so.*
+		vmove "usr/lib/libboost_timer.so.*"
 	}
 }
 
@@ -347,7 +347,7 @@ libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
-		vmove usr/lib/libboost_type_erasure.so.*
+		vmove "usr/lib/libboost_type_erasure.so.*"
 	}
 }
 
@@ -355,7 +355,7 @@ libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
-		vmove usr/lib/libboost_unit_test_framework.so.*
+		vmove "usr/lib/libboost_unit_test_framework.so.*"
 	}
 }
 
@@ -363,7 +363,7 @@ libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
-		vmove usr/lib/libboost_wave.so.*
+		vmove "usr/lib/libboost_wave.so.*"
 	}
 }
 
@@ -371,7 +371,7 @@ libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
-		vmove usr/lib/libboost_wserialization.so.*
+		vmove "usr/lib/libboost_wserialization.so.*"
 	}
 }
 

From 6af2b3df4318c69204cd7da3fc24e6359ce58f63 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Sat, 19 Mar 2022 01:30:26 +0200
Subject: [PATCH 3/3] uhd: update to 4.1.0.5.

Fixes compile against boost-1.79.
---
 common/shlibs        | 2 +-
 srcpkgs/uhd/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4253ce15bf03..d696869a0f2a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3584,7 +3584,7 @@ libbinpac.so.0 zeek-3.2.4_2
 libllhttp.so.1 llhttp-1.0.1_1
 libpinyin.so.13 libpinyin-2.2.1_1
 libzhuyin.so.13 libzhuyin-2.6.0_3
-libuhd.so.4.0.0 uhd-4.0.0.0_1
+libuhd.so.4.1.0 uhd-4.1.0.5_1
 libeditline.so.1 editline-1.16.0_1
 libgnuradio-rds.so.1 gnuradio-rds-3.8.0_1
 libgnuradio-nrsc5-1.0.0git.so.0.0.0 gnuradio-nrsc5-1.0.0_1
diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template
index 5f043162d7dc..2eecf7f0a84e 100644
--- a/srcpkgs/uhd/template
+++ b/srcpkgs/uhd/template
@@ -1,6 +1,6 @@
 # Template file for 'uhd'
 pkgname=uhd
-version=4.0.0.0
+version=4.1.0.5
 revision=1
 build_wrksrc=host
 build_style=cmake
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://files.ettus.com/manual/"
 changelog="https://raw.githubusercontent.com/EttusResearch/uhd/master/CHANGELOG"
 distfiles="https://github.com/EttusResearch/uhd/archive/v${version}.tar.gz"
-checksum=4f3513c43edf0178391ed5755266864532716b8b503bcfb9a983ae6256c51b14
+checksum=73580bb8823338dbc0ffe2840088cb15d7496ef7d402a4816df17a8e5c8d0221
 python_version=3
 
 case "${XBPS_TARGET_MACHINE}" in

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] boost: update to 1.79.0.b1.
  2022-03-18 14:28 [PR PATCH] boost: update to 1.79.0.b1 JamiKettunen
                   ` (8 preceding siblings ...)
  2022-03-18 23:32 ` JamiKettunen
@ 2022-03-18 23:33 ` JamiKettunen
  2022-03-19 12:39 ` JamiKettunen
                   ` (18 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: JamiKettunen @ 2022-03-18 23:33 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 12587 bytes --]

There is an updated pull request by JamiKettunen against master on the void-packages repository

https://github.com/JamiKettunen/void-packages boost-1.79.0
https://github.com/void-linux/void-packages/pull/36204

boost: update to 1.79.0.b1.
#### Current issues
`Aegisub` cannot be built anymore, fails with:
```
$ ./xbps-src pkg Aegisub
...
[246/246] Linking CXX executable aegisub
FAILED: aegisub 
: && /usr/bin/g++ -DNDEBUG -fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2    -fdebug-prefix-map=/builddir/Aegisub-3.3.2=. -pthread -Wl,-z,relro -Wl,-z,now -Wl,--as-needed CMakeFiles/Aegisub.dir/src/command/app.cpp.o CMakeFiles/Aegisub.dir/src/command/audio.cpp.o CMakeFiles/Aegisub.dir/src/command/automation.cpp.o CMakeFiles/Aegisub.dir/src/command/command.cpp.o CMakeFiles/Aegisub.dir/src/command/edit.cpp.o CMakeFiles/Aegisub.dir/src/command/grid.cpp.o CMakeFiles/Aegisub.dir/src/command/help.cpp.o CMakeFiles/Aegisub.dir/src/command/keyframe.cpp.o CMakeFiles/Aegisub.dir/src/command/recent.cpp.o CMakeFiles/Aegisub.dir/src/command/subtitle.cpp.o CMakeFiles/Aegisub.dir/src/command/time.cpp.o CMakeFiles/Aegisub.dir/src/command/timecode.cpp.o CMakeFiles/Aegisub.dir/src/command/tool.cpp.o CMakeFiles/Aegisub.dir/src/command/video.cpp.o CMakeFiles/Aegisub.dir/src/command/vis_tool.cpp.o CMakeFiles/Aegisub.dir/src/libresrc/bitmap.cpp.o CMakeFiles/Aegisub.dir/src/libresrc/default_config.cpp.o CMakeFiles/Aegisub.dir/src/libresrc/libresrc.cpp.o CMakeFiles/Aegisub.dir/src/dialog_about.cpp.o CMakeFiles/Aegisub.dir/src/dialog_align.cpp.o CMakeFiles/Aegisub.dir/src/dialog_attachments.cpp.o CMakeFiles/Aegisub.dir/src/dialog_automation.cpp.o CMakeFiles/Aegisub.dir/src/dialog_autosave.cpp.o CMakeFiles/Aegisub.dir/src/dialog_colorpicker.cpp.o CMakeFiles/Aegisub.dir/src/dialog_detached_video.cpp.o CMakeFiles/Aegisub.dir/src/dialog_dummy_video.cpp.o CMakeFiles/Aegisub.dir/src/dialog_export.cpp.o CMakeFiles/Aegisub.dir/src/dialog_export_ebu3264.cpp.o CMakeFiles/Aegisub.dir/src/dialog_fonts_collector.cpp.o CMakeFiles/Aegisub.dir/src/dialog_jumpto.cpp.o CMakeFiles/Aegisub.dir/src/dialog_kara_timing_copy.cpp.o CMakeFiles/Aegisub.dir/src/dialog_log.cpp.o CMakeFiles/Aegisub.dir/src/dialog_paste_over.cpp.o CMakeFiles/Aegisub.dir/src/dialog_progress.cpp.o CMakeFiles/Aegisub.dir/src/dialog_properties.cpp.o CMakeFiles/Aegisub.dir/src/dialog_resample.cpp.o CMakeFiles/Aegisub.dir/src/dialog_search_replace.cpp.o CMakeFiles/Aegisub.dir/src/dialog_selected_choices.cpp.o CMakeFiles/Aegisub.dir/src/dialog_selection.cpp.o CMakeFiles/Aegisub.dir/src/dialog_shift_times.cpp.o CMakeFiles/Aegisub.dir/src/dialog_spellchecker.cpp.o CMakeFiles/Aegisub.dir/src/dialog_style_editor.cpp.o CMakeFiles/Aegisub.dir/src/dialog_style_manager.cpp.o CMakeFiles/Aegisub.dir/src/dialog_styling_assistant.cpp.o CMakeFiles/Aegisub.dir/src/dialog_text_import.cpp.o CMakeFiles/Aegisub.dir/src/dialog_timing_processor.cpp.o CMakeFiles/Aegisub.dir/src/dialog_translation.cpp.o CMakeFiles/Aegisub.dir/src/dialog_video_details.cpp.o CMakeFiles/Aegisub.dir/src/dialog_video_properties.cpp.o CMakeFiles/Aegisub.dir/src/subtitle_format.cpp.o CMakeFiles/Aegisub.dir/src/subtitle_format_ass.cpp.o CMakeFiles/Aegisub.dir/src/subtitle_format_ebu3264.cpp.o CMakeFiles/Aegisub.dir/src/subtitle_format_encore.cpp.o CMakeFiles/Aegisub.dir/src/subtitle_format_microdvd.cpp.o CMakeFiles/Aegisub.dir/src/subtitle_format_mkv.cpp.o CMakeFiles/Aegisub.dir/src/subtitle_format_srt.cpp.o CMakeFiles/Aegisub.dir/src/subtitle_format_ssa.cpp.o CMakeFiles/Aegisub.dir/src/subtitle_format_transtation.cpp.o CMakeFiles/Aegisub.dir/src/subtitle_format_ttxt.cpp.o CMakeFiles/Aegisub.dir/src/subtitle_format_txt.cpp.o CMakeFiles/Aegisub.dir/src/visual_tool.cpp.o CMakeFiles/Aegisub.dir/src/visual_tool_clip.cpp.o CMakeFiles/Aegisub.dir/src/visual_tool_cross.cpp.o CMakeFiles/Aegisub.dir/src/visual_tool_drag.cpp.o CMakeFiles/Aegisub.dir/src/visual_tool_rotatexy.cpp.o CMakeFiles/Aegisub.dir/src/visual_tool_rotatez.cpp.o CMakeFiles/Aegisub.dir/src/visual_tool_scale.cpp.o CMakeFiles/Aegisub.dir/src/visual_tool_vector_clip.cpp.o CMakeFiles/Aegisub.dir/src/MatroskaParser.c.o CMakeFiles/Aegisub.dir/src/aegisublocale.cpp.o CMakeFiles/Aegisub.dir/src/ass_attachment.cpp.o CMakeFiles/Aegisub.dir/src/ass_dialogue.cpp.o CMakeFiles/Aegisub.dir/src/ass_entry.cpp.o CMakeFiles/Aegisub.dir/src/ass_export_filter.cpp.o CMakeFiles/Aegisub.dir/src/ass_exporter.cpp.o CMakeFiles/Aegisub.dir/src/ass_file.cpp.o CMakeFiles/Aegisub.dir/src/ass_karaoke.cpp.o CMakeFiles/Aegisub.dir/src/ass_override.cpp.o CMakeFiles/Aegisub.dir/src/ass_parser.cpp.o CMakeFiles/Aegisub.dir/src/ass_style.cpp.o CMakeFiles/Aegisub.dir/src/ass_style_storage.cpp.o CMakeFiles/Aegisub.dir/src/async_video_provider.cpp.o CMakeFiles/Aegisub.dir/src/audio_box.cpp.o CMakeFiles/Aegisub.dir/src/audio_colorscheme.cpp.o CMakeFiles/Aegisub.dir/src/audio_controller.cpp.o CMakeFiles/Aegisub.dir/src/audio_display.cpp.o CMakeFiles/Aegisub.dir/src/audio_karaoke.cpp.o CMakeFiles/Aegisub.dir/src/audio_marker.cpp.o CMakeFiles/Aegisub.dir/src/audio_player.cpp.o CMakeFiles/Aegisub.dir/src/audio_provider_factory.cpp.o CMakeFiles/Aegisub.dir/src/audio_renderer.cpp.o CMakeFiles/Aegisub.dir/src/audio_renderer_spectrum.cpp.o CMakeFiles/Aegisub.dir/src/audio_renderer_waveform.cpp.o CMakeFiles/Aegisub.dir/src/audio_timing_dialogue.cpp.o CMakeFiles/Aegisub.dir/src/audio_timing_karaoke.cpp.o CMakeFiles/Aegisub.dir/src/auto4_base.cpp.o CMakeFiles/Aegisub.dir/src/auto4_lua.cpp.o CMakeFiles/Aegisub.dir/src/auto4_lua_assfile.cpp.o CMakeFiles/Aegisub.dir/src/auto4_lua_dialog.cpp.o CMakeFiles/Aegisub.dir/src/auto4_lua_progresssink.cpp.o CMakeFiles/Aegisub.dir/src/base_grid.cpp.o CMakeFiles/Aegisub.dir/src/charset_detect.cpp.o CMakeFiles/Aegisub.dir/src/colorspace.cpp.o CMakeFiles/Aegisub.dir/src/colour_button.cpp.o CMakeFiles/Aegisub.dir/src/compat.cpp.o CMakeFiles/Aegisub.dir/src/context.cpp.o CMakeFiles/Aegisub.dir/src/export_fixstyle.cpp.o CMakeFiles/Aegisub.dir/src/export_framerate.cpp.o CMakeFiles/Aegisub.dir/src/fft.cpp.o CMakeFiles/Aegisub.dir/src/font_file_lister.cpp.o CMakeFiles/Aegisub.dir/src/frame_main.cpp.o CMakeFiles/Aegisub.dir/src/gl_text.cpp.o CMakeFiles/Aegisub.dir/src/gl_wrap.cpp.o CMakeFiles/Aegisub.dir/src/grid_column.cpp.o CMakeFiles/Aegisub.dir/src/help_button.cpp.o CMakeFiles/Aegisub.dir/src/hotkey.cpp.o CMakeFiles/Aegisub.dir/src/hotkey_data_view_model.cpp.o CMakeFiles/Aegisub.dir/src/image_position_picker.cpp.o CMakeFiles/Aegisub.dir/src/initial_line_state.cpp.o CMakeFiles/Aegisub.dir/src/main.cpp.o CMakeFiles/Aegisub.dir/src/menu.cpp.o CMakeFiles/Aegisub.dir/src/mkv_wrap.cpp.o CMakeFiles/Aegisub.dir/src/pen.cpp.o CMakeFiles/Aegisub.dir/src/persist_location.cpp.o CMakeFiles/Aegisub.dir/src/preferences.cpp.o CMakeFiles/Aegisub.dir/src/preferences_base.cpp.o CMakeFiles/Aegisub.dir/src/project.cpp.o CMakeFiles/Aegisub.dir/src/resolution_resampler.cpp.o CMakeFiles/Aegisub.dir/src/search_replace_engine.cpp.o CMakeFiles/Aegisub.dir/src/selection_controller.cpp.o CMakeFiles/Aegisub.dir/src/spellchecker.cpp.o CMakeFiles/Aegisub.dir/src/spline.cpp.o CMakeFiles/Aegisub.dir/src/spline_curve.cpp.o CMakeFiles/Aegisub.dir/src/string_codec.cpp.o CMakeFiles/Aegisub.dir/src/subs_controller.cpp.o CMakeFiles/Aegisub.dir/src/subs_edit_box.cpp.o CMakeFiles/Aegisub.dir/src/subs_edit_ctrl.cpp.o CMakeFiles/Aegisub.dir/src/subs_preview.cpp.o CMakeFiles/Aegisub.dir/src/subtitles_provider.cpp.o CMakeFiles/Aegisub.dir/src/subtitles_provider_libass.cpp.o CMakeFiles/Aegisub.dir/src/text_file_reader.cpp.o CMakeFiles/Aegisub.dir/src/text_file_writer.cpp.o CMakeFiles/Aegisub.dir/src/text_selection_controller.cpp.o CMakeFiles/Aegisub.dir/src/thesaurus.cpp.o CMakeFiles/Aegisub.dir/src/timeedit_ctrl.cpp.o CMakeFiles/Aegisub.dir/src/toggle_bitmap.cpp.o CMakeFiles/Aegisub.dir/src/toolbar.cpp.o CMakeFiles/Aegisub.dir/src/tooltip_manager.cpp.o CMakeFiles/Aegisub.dir/src/utils.cpp.o CMakeFiles/Aegisub.dir/src/validators.cpp.o CMakeFiles/Aegisub.dir/src/vector2d.cpp.o CMakeFiles/Aegisub.dir/src/version.cpp.o CMakeFiles/Aegisub.dir/src/video_box.cpp.o CMakeFiles/Aegisub.dir/src/video_controller.cpp.o CMakeFiles/Aegisub.dir/src/video_display.cpp.o CMakeFiles/Aegisub.dir/src/video_frame.cpp.o CMakeFiles/Aegisub.dir/src/video_out_gl.cpp.o CMakeFiles/Aegisub.dir/src/video_provider_cache.cpp.o CMakeFiles/Aegisub.dir/src/video_provider_dummy.cpp.o CMakeFiles/Aegisub.dir/src/video_provider_manager.cpp.o CMakeFiles/Aegisub.dir/src/video_provider_yuv4mpeg.cpp.o CMakeFiles/Aegisub.dir/src/video_slider.cpp.o CMakeFiles/Aegisub.dir/src/visual_feature.cpp.o CMakeFiles/Aegisub.dir/src/crash_writer.cpp.o CMakeFiles/Aegisub.dir/src/font_file_lister_fontconfig.cpp.o CMakeFiles/Aegisub.dir/src/audio_player_alsa.cpp.o CMakeFiles/Aegisub.dir/src/subtitles_provider_csri.cpp.o CMakeFiles/Aegisub.dir/src/audio_provider_ffmpegsource.cpp.o CMakeFiles/Aegisub.dir/src/ffmpegsource_common.cpp.o CMakeFiles/Aegisub.dir/src/video_provider_ffmpegsource.cpp.o CMakeFiles/Aegisub.dir/src/spellchecker_hunspell.cpp.o CMakeFiles/Aegisub.dir/src/audio_player_oss.cpp.o -o aegisub  -ldl  libaegisub.a  -lluajit-5.1  /usr/lib/libfontconfig.so  /usr/lib64/libass.so  /usr/lib/libboost_container.so  /usr/lib/libboost_filesystem.so  /usr/lib/libboost_locale.so  /usr/lib/libboost_regex.so  /usr/lib/libicuuc.so  -L/usr/lib64  -pthread  -lwx_gtk3u_adv-3.0  -lwx_baseu-3.0  -lwx_gtk3u_core-3.0  -lwx_gtk3u_gl-3.0  -lwx_gtk3u_stc-3.0  -lwx_baseu_xml-3.0  /usr/lib/libz.so  /usr/lib/libasound.so  vendor/csri/libcsri.a  /usr/lib/libffms2.so  /usr/lib/libfftw3.so  /usr/lib/libfftw3f.so  /usr/lib/libfftw3l.so  /usr/lib64/libhunspell-1.7.so  -ldl  vendor/luabins/libluabins.a  -lluajit-5.1  /usr/lib/libboost_thread.so  /usr/lib/libboost_chrono.so  /usr/lib/libboost_atomic.so  -lpthread  /usr/lib/libGLX.so  /usr/lib/libOpenGL.so && :
/usr/bin/ld: CMakeFiles/Aegisub.dir/src/search_replace_engine.cpp.o: undefined reference to symbol '_ZN6icu_708Collator14createInstanceERKNS_6LocaleER10UErrorCode'
/usr/bin/ld: /lib64/libicui18n.so.70: error adding symbols: DSO missing from command line
collect2: error: ld returned 1 exit status
ninja: build stopped: subcommand failed.
=> ERROR: Aegisub-3.3.2_4: do_build: '${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}' exited with 1
=> ERROR:   in do_build() at common/build-style/cmake.sh:85
```

Updating `gnuradio` to `3.10.1.1` requires dropping `conf_files` & `gnuradio-devel_package()` `vmove`s for `usr/lib/*.so` & `usr/lib/pkgconfig` which is unacceptable, need to look into this

Additionally a few shared objects aren't built anymore for some reason, namely `libboost_stacktrace_{addr2line,basic,noop}.so.*` & `libboost_fiber.so.*`, so I dropped their subpackages for now (is this ok?).

#### Solved issues
1. The `failed to install target dependencies! (error 40)` issue was fixed by making new subpackages for `libboost_json.so.*` & `libboost_nowide.so.*`; they were inside the `boost` pkg, depended on `libboost_container` which itself depends on `boost` => circular dependency.
2. Cross-compiling `bjam` required a `s:./build.sh:./build.sh --cxx="${CXX}" --cxxflags="${CXXFLAGS}":`

#### Modified patches
`exec_file.patch`: Removed due to being upstream as https://github.com/boostorg/python/commit/d9f06052e28873037db7f98629bce72182a42410
`mips.patch`: Updated to apply on top of https://github.com/boostorg/fiber/commit/5dc9dabc5d5ff8da53ec897c265c9cba1b6ed0df, not sure if this can be removed now(?)

#### Misc changes
- I've renamed all subpackages of `boost` so that the versioned name doesn't conflict with other numbers and are consistent with the previously existing `boost-python3-1.72`, e.g. `libboost_math_c991.72` is now `libboost_math_c99-1.79` (notice the `-`!)

#### To-Do
- Include ~100 commits from `xrevbump` due to `boost` & `uhd` SONAME bumps

#### Testing the changes
- I tested the changes in this PR: **NO**

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36204.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boost-1.79.0-36204.patch --]
[-- Type: text/x-diff, Size: 41317 bytes --]

From b5ee58154ff87500fbdeda3bc51691877440e5d9 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 15:28:37 +0200
Subject: [PATCH 1/3] boost: update to 1.79.0.b1.

---
 common/shlibs                                 |  60 +++---
 .../{boost-python1.72 => boost-python1.79}    |   0
 .../{boost-python3-1.72 => boost-python31.79} |   0
 srcpkgs/boost/patches/exec_file.patch         |  45 -----
 srcpkgs/boost/patches/mips.patch              |   2 +-
 srcpkgs/boost/template                        | 191 +++++++-----------
 ...ibboost_atomic1.72 => libboost_atomic1.79} |   0
 ...ibboost_chrono1.72 => libboost_chrono1.79} |   0
 ...t_container1.72 => libboost_container1.79} |   0
 ...boost_context1.72 => libboost_context1.79} |   0
 ...ost_contract1.72 => libboost_contract1.79} |   0
 ...t_coroutine1.72 => libboost_coroutine1.79} |   0
 ...t_date_time1.72 => libboost_date_time1.79} |   0
 ...oost_fiber1.72 => libboost_filesystem1.79} |   0
 ...oost_filesystem1.72 => libboost_graph1.79} |   0
 ...boost_graph1.72 => libboost_iostreams1.79} |   0
 ...bboost_iostreams1.72 => libboost_json1.79} |   0
 ...ibboost_locale1.72 => libboost_locale1.79} |   0
 .../{libboost_log1.72 => libboost_log1.79}    |   0
 ...t_log_setup1.72 => libboost_log_setup1.79} |   0
 ...ost_math_c991.72 => libboost_math_c991.79} |   0
 ...t_math_c99f1.72 => libboost_math_c99f1.79} |   0
 ...t_math_c99l1.72 => libboost_math_c99l1.79} |   0
 ...ost_math_tr11.72 => libboost_math_tr11.79} |   0
 ...t_math_tr1f1.72 => libboost_math_tr1f1.79} |   0
 ...t_math_tr1l1.72 => libboost_math_tr1l1.79} |   0
 ...g_exec_monitor1.72 => libboost_nowide1.79} |   0
 ...ions1.72 => libboost_prg_exec_monitor1.79} |   0
 ...andom1.72 => libboost_program_options1.79} |   0
 ...libboost_regex1.72 => libboost_random1.79} |   0
 ...t_serialization1.72 => libboost_regex1.79} |   0
 ...dr2line1.72 => libboost_serialization1.79} |   0
 ...acktrace_basic1.72 => libboost_system1.79} |   0
 ...tacktrace_noop1.72 => libboost_thread1.79} |   0
 ...libboost_system1.72 => libboost_timer1.79} |   0
 ...t_thread1.72 => libboost_type_erasure1.79} |   0
 ...r1.72 => libboost_unit_test_framework1.79} |   0
 srcpkgs/libboost_wave1.72                     |   1 -
 ...ost_type_erasure1.72 => libboost_wave1.79} |   0
 srcpkgs/libboost_wserialization1.72           |   1 -
 ...mework1.72 => libboost_wserialization1.79} |   0
 41 files changed, 103 insertions(+), 197 deletions(-)
 rename srcpkgs/{boost-python1.72 => boost-python1.79} (100%)
 rename srcpkgs/{boost-python3-1.72 => boost-python31.79} (100%)
 delete mode 100644 srcpkgs/boost/patches/exec_file.patch
 rename srcpkgs/{libboost_atomic1.72 => libboost_atomic1.79} (100%)
 rename srcpkgs/{libboost_chrono1.72 => libboost_chrono1.79} (100%)
 rename srcpkgs/{libboost_container1.72 => libboost_container1.79} (100%)
 rename srcpkgs/{libboost_context1.72 => libboost_context1.79} (100%)
 rename srcpkgs/{libboost_contract1.72 => libboost_contract1.79} (100%)
 rename srcpkgs/{libboost_coroutine1.72 => libboost_coroutine1.79} (100%)
 rename srcpkgs/{libboost_date_time1.72 => libboost_date_time1.79} (100%)
 rename srcpkgs/{libboost_fiber1.72 => libboost_filesystem1.79} (100%)
 rename srcpkgs/{libboost_filesystem1.72 => libboost_graph1.79} (100%)
 rename srcpkgs/{libboost_graph1.72 => libboost_iostreams1.79} (100%)
 rename srcpkgs/{libboost_iostreams1.72 => libboost_json1.79} (100%)
 rename srcpkgs/{libboost_locale1.72 => libboost_locale1.79} (100%)
 rename srcpkgs/{libboost_log1.72 => libboost_log1.79} (100%)
 rename srcpkgs/{libboost_log_setup1.72 => libboost_log_setup1.79} (100%)
 rename srcpkgs/{libboost_math_c991.72 => libboost_math_c991.79} (100%)
 rename srcpkgs/{libboost_math_c99f1.72 => libboost_math_c99f1.79} (100%)
 rename srcpkgs/{libboost_math_c99l1.72 => libboost_math_c99l1.79} (100%)
 rename srcpkgs/{libboost_math_tr11.72 => libboost_math_tr11.79} (100%)
 rename srcpkgs/{libboost_math_tr1f1.72 => libboost_math_tr1f1.79} (100%)
 rename srcpkgs/{libboost_math_tr1l1.72 => libboost_math_tr1l1.79} (100%)
 rename srcpkgs/{libboost_prg_exec_monitor1.72 => libboost_nowide1.79} (100%)
 rename srcpkgs/{libboost_program_options1.72 => libboost_prg_exec_monitor1.79} (100%)
 rename srcpkgs/{libboost_random1.72 => libboost_program_options1.79} (100%)
 rename srcpkgs/{libboost_regex1.72 => libboost_random1.79} (100%)
 rename srcpkgs/{libboost_serialization1.72 => libboost_regex1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_addr2line1.72 => libboost_serialization1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_basic1.72 => libboost_system1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_noop1.72 => libboost_thread1.79} (100%)
 rename srcpkgs/{libboost_system1.72 => libboost_timer1.79} (100%)
 rename srcpkgs/{libboost_thread1.72 => libboost_type_erasure1.79} (100%)
 rename srcpkgs/{libboost_timer1.72 => libboost_unit_test_framework1.79} (100%)
 delete mode 120000 srcpkgs/libboost_wave1.72
 rename srcpkgs/{libboost_type_erasure1.72 => libboost_wave1.79} (100%)
 delete mode 120000 srcpkgs/libboost_wserialization1.72
 rename srcpkgs/{libboost_unit_test_framework1.72 => libboost_wserialization1.79} (100%)

diff --git a/common/shlibs b/common/shlibs
index 83b5783cb026..4253ce15bf03 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -620,38 +620,34 @@ 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.79.0 libboost_context1.79-1.79.0.b1_1
+libboost_coroutine.so.1.79.0 libboost_coroutine1.79-1.79.0.b1_1
+libboost_container.so.1.79.0 libboost_container1.79-1.79.0.b1_1
+libboost_prg_exec_monitor.so.1.79.0 libboost_prg_exec_monitor1.79-1.79.0.b1_1
+libboost_timer.so.1.79.0 libboost_timer1.79-1.79.0.b1_1
+libboost_random.so.1.79.0 libboost_random1.79-1.79.0.b1_1
+libboost_filesystem.so.1.79.0 libboost_filesystem1.79-1.79.0.b1_1
+libboost_unit_test_framework.so.1.79.0 libboost_unit_test_framework1.79-1.79.0.b1_1
+libboost_math_c99.so.1.79.0 libboost_math_c99-1.79-1.79.0.b1_1
+libboost_math_tr1.so.1.79.0 libboost_math_tr1-1.79-1.79.0.b1_1
+libboost_regex.so.1.79.0 libboost_regex1.79-1.79.0.b1_1
+libboost_serialization.so.1.79.0 libboost_serialization1.79-1.79.0.b1_1
+libboost_chrono.so.1.79.0 libboost_chrono1.79-1.79.0.b1_1
+libboost_wserialization.so.1.79.0 libboost_wserialization1.79-1.79.0.b1_1
+libboost_graph.so.1.79.0 libboost_graph1.79-1.79.0.b1_1
+libboost_log.so.1.79.0 libboost_log1.79-1.79.0.b1_1
+libboost_locale.so.1.79.0 libboost_locale1.79-1.79.0.b1_1
+libboost_program_options.so.1.79.0 libboost_program_options1.79-1.79.0.b1_1
+libboost_iostreams.so.1.79.0 libboost_iostreams1.79-1.79.0.b1_1
+libboost_system.so.1.79.0 libboost_system1.79-1.79.0.b1_1
+libboost_thread.so.1.79.0 libboost_thread1.79-1.79.0.b1_1
+libboost_log_setup.so.1.79.0 libboost_log_setup1.79-1.79.0.b1_1
+libboost_date_time.so.1.79.0 libboost_date_time1.79-1.79.0.b1_1
+libboost_wave.so.1.79.0 libboost_wave1.79-1.79.0.b1_1
+libboost_atomic.so.1.79.0 libboost_atomic1.79-1.79.0.b1_1
+libboost_type_erasure.so.1.79.0 libboost_type_erasure1.79-1.79.0.b1_1
+libboost_python27.so.1.79.0 boost-python1.79-1.79.0.b1_1
+libboost_python310.so.1.79.0 boost-python3-1.79-1.79.0.b1_1
 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-python1.79
similarity index 100%
rename from srcpkgs/boost-python1.72
rename to srcpkgs/boost-python1.79
diff --git a/srcpkgs/boost-python3-1.72 b/srcpkgs/boost-python31.79
similarity index 100%
rename from srcpkgs/boost-python3-1.72
rename to srcpkgs/boost-python31.79
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/mips.patch b/srcpkgs/boost/patches/mips.patch
index a10a2122d9c7..8d253fc7c286 100644
--- a/srcpkgs/boost/patches/mips.patch
+++ b/srcpkgs/boost/patches/mips.patch
@@ -3,7 +3,7 @@
 @@ -48,7 +48,7 @@
  #  define cpu_relax() asm volatile ("nop" ::: "memory");
  # endif
- #elif BOOST_ARCH_MIPS
+ #elif BOOST_ARCH_MIPS && (((__mips_isa_rev > 1) && defined(__mips32)) || ((__mips_isa_rev > 2)  && defined(__mips64)))
 -# define cpu_relax() asm volatile ("pause" ::: "memory");
 +# define cpu_relax() asm volatile ("nop" ::: "memory");
  #elif BOOST_ARCH_PPC
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 126c50770b50..535a3516328b 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,62 +1,24 @@
 # Template file for 'boost'
 pkgname=boost
-version=1.72.0
-revision=7
-wrksrc="${pkgname}_${version//\./_}"
+version=1.79.0.b1
+revision=1
+wrksrc="${pkgname}_${version%.*}"
+wrksrc="${wrksrc//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-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
+distfiles="https://boostorg.jfrog.io/artifactory/main/beta/${version/b1/beta1}/source/boost_${version//./_}.tar.bz2"
+checksum=8985105623f48d55be01076d98ca4e7a8cb548a8d7f9ad0e1fc3c710d2c75fcf
 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"
-
-if [ -z "$CROSS_BUILD" ]; then
-	subpackages+=" libboost_stacktrace_addr2line1.72"
-fi
-
 case "$XBPS_TARGET_MACHINE" in
-	i686*)    _arch=x86;      _abi=sysv  ;;
-	x86_64*)  _arch=x86;      _abi=sysv  ;;
-	arm*)     _arch=arm;      _abi=aapcs ;;
-	aarch64*) _arch=arm;      _abi=aapcs ;;
-	mips*)    _arch=mips32r2; _abi=o32   ;;
-	ppc*)     _arch=power;    _abi=sysv  ;;
+	i686*|x86_64*) _arch=x86;      _abi=sysv  ;;
+	arm*|aarch64*) _arch=arm;      _abi=aapcs ;;
+	mips*)         _arch=mips32r2; _abi=o32   ;;
+	ppc*)          _arch=power;    _abi=sysv  ;;
 esac
 
 do_build() {
@@ -66,7 +28,7 @@ do_build() {
 	(
 	# Rebuild bjam for target
 	cd tools/build/src/engine
-	./build.sh gcc
+	./build.sh --cxx="${CXX}" --cxxflags="${CXXFLAGS}" gcc
 	)
 	cat > user-config.jam <<-__EOF
 	using gcc : : ${CXX} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
@@ -74,10 +36,8 @@ do_build() {
 	using python : ${py3_ver} : ${XBPS_CROSS_BASE}/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} \
 		threading=multi runtime-link=shared link=shared,static
 }
@@ -119,7 +79,7 @@ boost-jam_package() {
 		vmove usr/bin/b2
 	}
 }
-boost-python1.72_package() {
+boost-python1.79_package() {
 	depends="boost python"
 	replaces="boost-python>=0"
 	short_desc+=" - Python bindings"
@@ -127,7 +87,7 @@ boost-python1.72_package() {
 		vmove "usr/lib/libboost_python2*.so.*"
 	}
 }
-boost-python3-1.72_package() {
+boost-python3-1.79_package() {
 	depends="boost python3"
 	replaces="boost-python3>=0"
 	short_desc+=" - Python3 bindings"
@@ -145,7 +105,20 @@ boost-build_package() {
 }
 boost-devel_package() {
 	noverifyrdeps=yes
-	depends="boost ${subpackages/boost-devel}"
+	depends="boost libboost_program_options1.79 libboost_math_c99f1.79
+ libboost_iostreams1.79 libboost_math_tr1l1.79 libboost_filesystem1.79
+ libboost_chrono1.79 libboost_math_tr1f1.79 libboost_wave1.79
+ libboost_graph1.79 libboost_locale1.79 libboost_regex1.79
+ libboost_type_erasure1.79 libboost_coroutine1.79
+ libboost_atomic1.79 libboost_prg_exec_monitor1.79 libboost_math_c99-1.79
+ boost-python3-1.79 libboost_log_setup1.79
+ libboost_timer1.79 libboost_system1.79 libboost_unit_test_framework1.79
+ libboost_serialization1.79 libboost_math_tr1-1.79 boost-build1.79
+ libboost_math_c99l1.79 boost-python1.79 libboost_contract1.79
+ libboost_date_time1.79 libboost_log1.79 libboost_random1.79
+ libboost_thread1.79 libboost_container1.79 boost-jam1.79
+ libboost_wserialization1.79 libboost_context1.79 libboost_json1.79
+ libboost_nowide1.79"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -154,7 +127,7 @@ boost-devel_package() {
 	}
 }
 
-libboost_atomic1.72_package() {
+libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
@@ -162,7 +135,7 @@ libboost_atomic1.72_package() {
 	}
 }
 
-libboost_chrono1.72_package() {
+libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
@@ -170,7 +143,7 @@ libboost_chrono1.72_package() {
 	}
 }
 
-libboost_container1.72_package() {
+libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
@@ -178,7 +151,7 @@ libboost_container1.72_package() {
 	}
 }
 
-libboost_context1.72_package() {
+libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
@@ -186,7 +159,7 @@ libboost_context1.72_package() {
 	}
 }
 
-libboost_contract1.72_package() {
+libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
@@ -194,7 +167,7 @@ libboost_contract1.72_package() {
 	}
 }
 
-libboost_coroutine1.72_package() {
+libboost_coroutine1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
@@ -202,7 +175,7 @@ libboost_coroutine1.72_package() {
 	}
 }
 
-libboost_date_time1.72_package() {
+libboost_date_time1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
@@ -210,15 +183,7 @@ libboost_date_time1.72_package() {
 	}
 }
 
-libboost_fiber1.72_package() {
-	depends="boost"
-	short_desc+=" - libboost_fiber"
-	pkg_install() {
-		vmove usr/lib/libboost_fiber.so.*
-	}
-}
-
-libboost_filesystem1.72_package() {
+libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
@@ -226,7 +191,7 @@ libboost_filesystem1.72_package() {
 	}
 }
 
-libboost_graph1.72_package() {
+libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
@@ -234,7 +199,7 @@ libboost_graph1.72_package() {
 	}
 }
 
-libboost_iostreams1.72_package() {
+libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
@@ -242,7 +207,7 @@ libboost_iostreams1.72_package() {
 	}
 }
 
-libboost_locale1.72_package() {
+libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
@@ -250,7 +215,7 @@ libboost_locale1.72_package() {
 	}
 }
 
-libboost_log1.72_package() {
+libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
@@ -258,7 +223,7 @@ libboost_log1.72_package() {
 	}
 }
 
-libboost_log_setup1.72_package() {
+libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
@@ -266,7 +231,7 @@ libboost_log_setup1.72_package() {
 	}
 }
 
-libboost_math_c991.72_package() {
+libboost_math_c99-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
@@ -274,7 +239,7 @@ libboost_math_c991.72_package() {
 	}
 }
 
-libboost_math_c99f1.72_package() {
+libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
@@ -282,7 +247,7 @@ libboost_math_c99f1.72_package() {
 	}
 }
 
-libboost_math_c99l1.72_package() {
+libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
@@ -290,7 +255,7 @@ libboost_math_c99l1.72_package() {
 	}
 }
 
-libboost_math_tr11.72_package() {
+libboost_math_tr1-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
@@ -298,7 +263,7 @@ libboost_math_tr11.72_package() {
 	}
 }
 
-libboost_math_tr1f1.72_package() {
+libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
@@ -306,7 +271,7 @@ libboost_math_tr1f1.72_package() {
 	}
 }
 
-libboost_math_tr1l1.72_package() {
+libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
@@ -314,7 +279,7 @@ libboost_math_tr1l1.72_package() {
 	}
 }
 
-libboost_prg_exec_monitor1.72_package() {
+libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
@@ -322,7 +287,7 @@ libboost_prg_exec_monitor1.72_package() {
 	}
 }
 
-libboost_program_options1.72_package() {
+libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
@@ -330,7 +295,7 @@ libboost_program_options1.72_package() {
 	}
 }
 
-libboost_random1.72_package() {
+libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
@@ -338,7 +303,7 @@ libboost_random1.72_package() {
 	}
 }
 
-libboost_regex1.72_package() {
+libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
@@ -346,7 +311,7 @@ libboost_regex1.72_package() {
 	}
 }
 
-libboost_serialization1.72_package() {
+libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
@@ -354,31 +319,7 @@ libboost_serialization1.72_package() {
 	}
 }
 
-libboost_stacktrace_addr2line1.72_package() {
-	depends="boost"
-	short_desc+=" - libboost_stacktrace_addr2line"
-	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_addr2line.so.*
-	}
-}
-
-libboost_stacktrace_basic1.72_package() {
-	depends="boost"
-	short_desc+=" - libboost_stacktrace_basic"
-	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_basic.so.*
-	}
-}
-
-libboost_stacktrace_noop1.72_package() {
-	depends="boost"
-	short_desc+=" - libboost_stacktrace_noop"
-	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_noop.so.*
-	}
-}
-
-libboost_system1.72_package() {
+libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
@@ -386,7 +327,7 @@ libboost_system1.72_package() {
 	}
 }
 
-libboost_thread1.72_package() {
+libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
@@ -394,7 +335,7 @@ libboost_thread1.72_package() {
 	}
 }
 
-libboost_timer1.72_package() {
+libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
@@ -402,7 +343,7 @@ libboost_timer1.72_package() {
 	}
 }
 
-libboost_type_erasure1.72_package() {
+libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
@@ -410,7 +351,7 @@ libboost_type_erasure1.72_package() {
 	}
 }
 
-libboost_unit_test_framework1.72_package() {
+libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
@@ -418,7 +359,7 @@ libboost_unit_test_framework1.72_package() {
 	}
 }
 
-libboost_wave1.72_package() {
+libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
@@ -426,10 +367,26 @@ libboost_wave1.72_package() {
 	}
 }
 
-libboost_wserialization1.72_package() {
+libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
 		vmove usr/lib/libboost_wserialization.so.*
 	}
 }
+
+libboost_json1.79_package() {
+	depends="boost"
+	short_desc+=" - libboost_json"
+	pkg_install() {
+		vmove "usr/lib/libboost_json.so.*"
+	}
+}
+
+libboost_nowide1.79_package() {
+	depends="boost"
+	short_desc+=" - libboost_nowide"
+	pkg_install() {
+		vmove "usr/lib/libboost_nowide.so.*"
+	}
+}
diff --git a/srcpkgs/libboost_atomic1.72 b/srcpkgs/libboost_atomic1.79
similarity index 100%
rename from srcpkgs/libboost_atomic1.72
rename to srcpkgs/libboost_atomic1.79
diff --git a/srcpkgs/libboost_chrono1.72 b/srcpkgs/libboost_chrono1.79
similarity index 100%
rename from srcpkgs/libboost_chrono1.72
rename to srcpkgs/libboost_chrono1.79
diff --git a/srcpkgs/libboost_container1.72 b/srcpkgs/libboost_container1.79
similarity index 100%
rename from srcpkgs/libboost_container1.72
rename to srcpkgs/libboost_container1.79
diff --git a/srcpkgs/libboost_context1.72 b/srcpkgs/libboost_context1.79
similarity index 100%
rename from srcpkgs/libboost_context1.72
rename to srcpkgs/libboost_context1.79
diff --git a/srcpkgs/libboost_contract1.72 b/srcpkgs/libboost_contract1.79
similarity index 100%
rename from srcpkgs/libboost_contract1.72
rename to srcpkgs/libboost_contract1.79
diff --git a/srcpkgs/libboost_coroutine1.72 b/srcpkgs/libboost_coroutine1.79
similarity index 100%
rename from srcpkgs/libboost_coroutine1.72
rename to srcpkgs/libboost_coroutine1.79
diff --git a/srcpkgs/libboost_date_time1.72 b/srcpkgs/libboost_date_time1.79
similarity index 100%
rename from srcpkgs/libboost_date_time1.72
rename to srcpkgs/libboost_date_time1.79
diff --git a/srcpkgs/libboost_fiber1.72 b/srcpkgs/libboost_filesystem1.79
similarity index 100%
rename from srcpkgs/libboost_fiber1.72
rename to srcpkgs/libboost_filesystem1.79
diff --git a/srcpkgs/libboost_filesystem1.72 b/srcpkgs/libboost_graph1.79
similarity index 100%
rename from srcpkgs/libboost_filesystem1.72
rename to srcpkgs/libboost_graph1.79
diff --git a/srcpkgs/libboost_graph1.72 b/srcpkgs/libboost_iostreams1.79
similarity index 100%
rename from srcpkgs/libboost_graph1.72
rename to srcpkgs/libboost_iostreams1.79
diff --git a/srcpkgs/libboost_iostreams1.72 b/srcpkgs/libboost_json1.79
similarity index 100%
rename from srcpkgs/libboost_iostreams1.72
rename to srcpkgs/libboost_json1.79
diff --git a/srcpkgs/libboost_locale1.72 b/srcpkgs/libboost_locale1.79
similarity index 100%
rename from srcpkgs/libboost_locale1.72
rename to srcpkgs/libboost_locale1.79
diff --git a/srcpkgs/libboost_log1.72 b/srcpkgs/libboost_log1.79
similarity index 100%
rename from srcpkgs/libboost_log1.72
rename to srcpkgs/libboost_log1.79
diff --git a/srcpkgs/libboost_log_setup1.72 b/srcpkgs/libboost_log_setup1.79
similarity index 100%
rename from srcpkgs/libboost_log_setup1.72
rename to srcpkgs/libboost_log_setup1.79
diff --git a/srcpkgs/libboost_math_c991.72 b/srcpkgs/libboost_math_c991.79
similarity index 100%
rename from srcpkgs/libboost_math_c991.72
rename to srcpkgs/libboost_math_c991.79
diff --git a/srcpkgs/libboost_math_c99f1.72 b/srcpkgs/libboost_math_c99f1.79
similarity index 100%
rename from srcpkgs/libboost_math_c99f1.72
rename to srcpkgs/libboost_math_c99f1.79
diff --git a/srcpkgs/libboost_math_c99l1.72 b/srcpkgs/libboost_math_c99l1.79
similarity index 100%
rename from srcpkgs/libboost_math_c99l1.72
rename to srcpkgs/libboost_math_c99l1.79
diff --git a/srcpkgs/libboost_math_tr11.72 b/srcpkgs/libboost_math_tr11.79
similarity index 100%
rename from srcpkgs/libboost_math_tr11.72
rename to srcpkgs/libboost_math_tr11.79
diff --git a/srcpkgs/libboost_math_tr1f1.72 b/srcpkgs/libboost_math_tr1f1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1f1.72
rename to srcpkgs/libboost_math_tr1f1.79
diff --git a/srcpkgs/libboost_math_tr1l1.72 b/srcpkgs/libboost_math_tr1l1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1l1.72
rename to srcpkgs/libboost_math_tr1l1.79
diff --git a/srcpkgs/libboost_prg_exec_monitor1.72 b/srcpkgs/libboost_nowide1.79
similarity index 100%
rename from srcpkgs/libboost_prg_exec_monitor1.72
rename to srcpkgs/libboost_nowide1.79
diff --git a/srcpkgs/libboost_program_options1.72 b/srcpkgs/libboost_prg_exec_monitor1.79
similarity index 100%
rename from srcpkgs/libboost_program_options1.72
rename to srcpkgs/libboost_prg_exec_monitor1.79
diff --git a/srcpkgs/libboost_random1.72 b/srcpkgs/libboost_program_options1.79
similarity index 100%
rename from srcpkgs/libboost_random1.72
rename to srcpkgs/libboost_program_options1.79
diff --git a/srcpkgs/libboost_regex1.72 b/srcpkgs/libboost_random1.79
similarity index 100%
rename from srcpkgs/libboost_regex1.72
rename to srcpkgs/libboost_random1.79
diff --git a/srcpkgs/libboost_serialization1.72 b/srcpkgs/libboost_regex1.79
similarity index 100%
rename from srcpkgs/libboost_serialization1.72
rename to srcpkgs/libboost_regex1.79
diff --git a/srcpkgs/libboost_stacktrace_addr2line1.72 b/srcpkgs/libboost_serialization1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_addr2line1.72
rename to srcpkgs/libboost_serialization1.79
diff --git a/srcpkgs/libboost_stacktrace_basic1.72 b/srcpkgs/libboost_system1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_basic1.72
rename to srcpkgs/libboost_system1.79
diff --git a/srcpkgs/libboost_stacktrace_noop1.72 b/srcpkgs/libboost_thread1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_noop1.72
rename to srcpkgs/libboost_thread1.79
diff --git a/srcpkgs/libboost_system1.72 b/srcpkgs/libboost_timer1.79
similarity index 100%
rename from srcpkgs/libboost_system1.72
rename to srcpkgs/libboost_timer1.79
diff --git a/srcpkgs/libboost_thread1.72 b/srcpkgs/libboost_type_erasure1.79
similarity index 100%
rename from srcpkgs/libboost_thread1.72
rename to srcpkgs/libboost_type_erasure1.79
diff --git a/srcpkgs/libboost_timer1.72 b/srcpkgs/libboost_unit_test_framework1.79
similarity index 100%
rename from srcpkgs/libboost_timer1.72
rename to srcpkgs/libboost_unit_test_framework1.79
diff --git a/srcpkgs/libboost_wave1.72 b/srcpkgs/libboost_wave1.72
deleted file mode 120000
index baef819c48f6..000000000000
--- a/srcpkgs/libboost_wave1.72
+++ /dev/null
@@ -1 +0,0 @@
-boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_type_erasure1.72 b/srcpkgs/libboost_wave1.79
similarity index 100%
rename from srcpkgs/libboost_type_erasure1.72
rename to srcpkgs/libboost_wave1.79
diff --git a/srcpkgs/libboost_wserialization1.72 b/srcpkgs/libboost_wserialization1.72
deleted file mode 120000
index baef819c48f6..000000000000
--- a/srcpkgs/libboost_wserialization1.72
+++ /dev/null
@@ -1 +0,0 @@
-boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_unit_test_framework1.72 b/srcpkgs/libboost_wserialization1.79
similarity index 100%
rename from srcpkgs/libboost_unit_test_framework1.72
rename to srcpkgs/libboost_wserialization1.79

From d70ee6d18b1d90fd18ae42b5264e1740bacf54ff Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 18:29:05 +0200
Subject: [PATCH 2/3] boost: quote all vmove's with a glob.

---
 srcpkgs/boost/template | 62 +++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 535a3516328b..3a611fd273c2 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -131,7 +131,7 @@ libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
-		vmove usr/lib/libboost_atomic.so.*
+		vmove "usr/lib/libboost_atomic.so.*"
 	}
 }
 
@@ -139,7 +139,7 @@ libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
-		vmove usr/lib/libboost_chrono.so.*
+		vmove "usr/lib/libboost_chrono.so.*"
 	}
 }
 
@@ -147,7 +147,7 @@ libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
-		vmove usr/lib/libboost_container.so.*
+		vmove "usr/lib/libboost_container.so.*"
 	}
 }
 
@@ -155,7 +155,7 @@ libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
-		vmove usr/lib/libboost_context.so.*
+		vmove "usr/lib/libboost_context.so.*"
 	}
 }
 
@@ -163,7 +163,7 @@ libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
-		vmove usr/lib/libboost_contract.so.*
+		vmove "usr/lib/libboost_contract.so.*"
 	}
 }
 
@@ -171,7 +171,7 @@ libboost_coroutine1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
-		vmove usr/lib/libboost_coroutine.so.*
+		vmove "usr/lib/libboost_coroutine.so.*"
 	}
 }
 
@@ -179,7 +179,7 @@ libboost_date_time1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
-		vmove usr/lib/libboost_date_time.so.*
+		vmove "usr/lib/libboost_date_time.so.*"
 	}
 }
 
@@ -187,7 +187,7 @@ libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
-		vmove usr/lib/libboost_filesystem.so.*
+		vmove "usr/lib/libboost_filesystem.so.*"
 	}
 }
 
@@ -195,7 +195,7 @@ libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
-		vmove usr/lib/libboost_graph.so.*
+		vmove "usr/lib/libboost_graph.so.*"
 	}
 }
 
@@ -203,7 +203,7 @@ libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
-		vmove usr/lib/libboost_iostreams.so.*
+		vmove "usr/lib/libboost_iostreams.so.*"
 	}
 }
 
@@ -211,7 +211,7 @@ libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
-		vmove usr/lib/libboost_locale.so.*
+		vmove "usr/lib/libboost_locale.so.*"
 	}
 }
 
@@ -219,7 +219,7 @@ libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
-		vmove usr/lib/libboost_log.so.*
+		vmove "usr/lib/libboost_log.so.*"
 	}
 }
 
@@ -227,7 +227,7 @@ libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
-		vmove usr/lib/libboost_log_setup.so.*
+		vmove "usr/lib/libboost_log_setup.so.*"
 	}
 }
 
@@ -235,7 +235,7 @@ libboost_math_c99-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99.so.*
+		vmove "usr/lib/libboost_math_c99.so.*"
 	}
 }
 
@@ -243,7 +243,7 @@ libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99f.so.*
+		vmove "usr/lib/libboost_math_c99f.so.*"
 	}
 }
 
@@ -251,7 +251,7 @@ libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99l.so.*
+		vmove "usr/lib/libboost_math_c99l.so.*"
 	}
 }
 
@@ -259,7 +259,7 @@ libboost_math_tr1-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1.so.*
+		vmove "usr/lib/libboost_math_tr1.so.*"
 	}
 }
 
@@ -267,7 +267,7 @@ libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1f.so.*
+		vmove "usr/lib/libboost_math_tr1f.so.*"
 	}
 }
 
@@ -275,7 +275,7 @@ libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1l.so.*
+		vmove "usr/lib/libboost_math_tr1l.so.*"
 	}
 }
 
@@ -283,7 +283,7 @@ libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
-		vmove usr/lib/libboost_prg_exec_monitor.so.*
+		vmove "usr/lib/libboost_prg_exec_monitor.so.*"
 	}
 }
 
@@ -291,7 +291,7 @@ libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
-		vmove usr/lib/libboost_program_options.so.*
+		vmove "usr/lib/libboost_program_options.so.*"
 	}
 }
 
@@ -299,7 +299,7 @@ libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
-		vmove usr/lib/libboost_random.so.*
+		vmove "usr/lib/libboost_random.so.*"
 	}
 }
 
@@ -307,7 +307,7 @@ libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
-		vmove usr/lib/libboost_regex.so.*
+		vmove "usr/lib/libboost_regex.so.*"
 	}
 }
 
@@ -315,7 +315,7 @@ libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
-		vmove usr/lib/libboost_serialization.so.*
+		vmove "usr/lib/libboost_serialization.so.*"
 	}
 }
 
@@ -323,7 +323,7 @@ libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
-		vmove usr/lib/libboost_system.so.*
+		vmove "usr/lib/libboost_system.so.*"
 	}
 }
 
@@ -331,7 +331,7 @@ libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
-		vmove usr/lib/libboost_thread.so.*
+		vmove "usr/lib/libboost_thread.so.*"
 	}
 }
 
@@ -339,7 +339,7 @@ libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
-		vmove usr/lib/libboost_timer.so.*
+		vmove "usr/lib/libboost_timer.so.*"
 	}
 }
 
@@ -347,7 +347,7 @@ libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
-		vmove usr/lib/libboost_type_erasure.so.*
+		vmove "usr/lib/libboost_type_erasure.so.*"
 	}
 }
 
@@ -355,7 +355,7 @@ libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
-		vmove usr/lib/libboost_unit_test_framework.so.*
+		vmove "usr/lib/libboost_unit_test_framework.so.*"
 	}
 }
 
@@ -363,7 +363,7 @@ libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
-		vmove usr/lib/libboost_wave.so.*
+		vmove "usr/lib/libboost_wave.so.*"
 	}
 }
 
@@ -371,7 +371,7 @@ libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
-		vmove usr/lib/libboost_wserialization.so.*
+		vmove "usr/lib/libboost_wserialization.so.*"
 	}
 }
 

From cda05f04666be6963b1753f128489cccb7456a8d Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Sat, 19 Mar 2022 01:30:26 +0200
Subject: [PATCH 3/3] uhd: update to 4.1.0.5.

Fixes compile against boost-1.79.

[ci skip] the PR is still WIP
---
 common/shlibs        | 2 +-
 srcpkgs/uhd/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4253ce15bf03..d696869a0f2a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3584,7 +3584,7 @@ libbinpac.so.0 zeek-3.2.4_2
 libllhttp.so.1 llhttp-1.0.1_1
 libpinyin.so.13 libpinyin-2.2.1_1
 libzhuyin.so.13 libzhuyin-2.6.0_3
-libuhd.so.4.0.0 uhd-4.0.0.0_1
+libuhd.so.4.1.0 uhd-4.1.0.5_1
 libeditline.so.1 editline-1.16.0_1
 libgnuradio-rds.so.1 gnuradio-rds-3.8.0_1
 libgnuradio-nrsc5-1.0.0git.so.0.0.0 gnuradio-nrsc5-1.0.0_1
diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template
index 5f043162d7dc..2eecf7f0a84e 100644
--- a/srcpkgs/uhd/template
+++ b/srcpkgs/uhd/template
@@ -1,6 +1,6 @@
 # Template file for 'uhd'
 pkgname=uhd
-version=4.0.0.0
+version=4.1.0.5
 revision=1
 build_wrksrc=host
 build_style=cmake
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://files.ettus.com/manual/"
 changelog="https://raw.githubusercontent.com/EttusResearch/uhd/master/CHANGELOG"
 distfiles="https://github.com/EttusResearch/uhd/archive/v${version}.tar.gz"
-checksum=4f3513c43edf0178391ed5755266864532716b8b503bcfb9a983ae6256c51b14
+checksum=73580bb8823338dbc0ffe2840088cb15d7496ef7d402a4816df17a8e5c8d0221
 python_version=3
 
 case "${XBPS_TARGET_MACHINE}" in

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] boost: update to 1.79.0.b1.
  2022-03-18 14:28 [PR PATCH] boost: update to 1.79.0.b1 JamiKettunen
                   ` (9 preceding siblings ...)
  2022-03-18 23:33 ` JamiKettunen
@ 2022-03-19 12:39 ` JamiKettunen
  2022-04-08  3:00 ` q66
                   ` (17 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: JamiKettunen @ 2022-03-19 12:39 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 12587 bytes --]

There is an updated pull request by JamiKettunen against master on the void-packages repository

https://github.com/JamiKettunen/void-packages boost-1.79.0
https://github.com/void-linux/void-packages/pull/36204

boost: update to 1.79.0.b1.
#### Current issues
`Aegisub` cannot be built anymore, fails with:
```
$ ./xbps-src pkg Aegisub
...
[246/246] Linking CXX executable aegisub
FAILED: aegisub 
: && /usr/bin/g++ -DNDEBUG -fstack-clash-protection -D_FORTIFY_SOURCE=2 -mtune=generic -O2    -fdebug-prefix-map=/builddir/Aegisub-3.3.2=. -pthread -Wl,-z,relro -Wl,-z,now -Wl,--as-needed CMakeFiles/Aegisub.dir/src/command/app.cpp.o CMakeFiles/Aegisub.dir/src/command/audio.cpp.o CMakeFiles/Aegisub.dir/src/command/automation.cpp.o CMakeFiles/Aegisub.dir/src/command/command.cpp.o CMakeFiles/Aegisub.dir/src/command/edit.cpp.o CMakeFiles/Aegisub.dir/src/command/grid.cpp.o CMakeFiles/Aegisub.dir/src/command/help.cpp.o CMakeFiles/Aegisub.dir/src/command/keyframe.cpp.o CMakeFiles/Aegisub.dir/src/command/recent.cpp.o CMakeFiles/Aegisub.dir/src/command/subtitle.cpp.o CMakeFiles/Aegisub.dir/src/command/time.cpp.o CMakeFiles/Aegisub.dir/src/command/timecode.cpp.o CMakeFiles/Aegisub.dir/src/command/tool.cpp.o CMakeFiles/Aegisub.dir/src/command/video.cpp.o CMakeFiles/Aegisub.dir/src/command/vis_tool.cpp.o CMakeFiles/Aegisub.dir/src/libresrc/bitmap.cpp.o CMakeFiles/Aegisub.dir/src/libresrc/default_config.cpp.o CMakeFiles/Aegisub.dir/src/libresrc/libresrc.cpp.o CMakeFiles/Aegisub.dir/src/dialog_about.cpp.o CMakeFiles/Aegisub.dir/src/dialog_align.cpp.o CMakeFiles/Aegisub.dir/src/dialog_attachments.cpp.o CMakeFiles/Aegisub.dir/src/dialog_automation.cpp.o CMakeFiles/Aegisub.dir/src/dialog_autosave.cpp.o CMakeFiles/Aegisub.dir/src/dialog_colorpicker.cpp.o CMakeFiles/Aegisub.dir/src/dialog_detached_video.cpp.o CMakeFiles/Aegisub.dir/src/dialog_dummy_video.cpp.o CMakeFiles/Aegisub.dir/src/dialog_export.cpp.o CMakeFiles/Aegisub.dir/src/dialog_export_ebu3264.cpp.o CMakeFiles/Aegisub.dir/src/dialog_fonts_collector.cpp.o CMakeFiles/Aegisub.dir/src/dialog_jumpto.cpp.o CMakeFiles/Aegisub.dir/src/dialog_kara_timing_copy.cpp.o CMakeFiles/Aegisub.dir/src/dialog_log.cpp.o CMakeFiles/Aegisub.dir/src/dialog_paste_over.cpp.o CMakeFiles/Aegisub.dir/src/dialog_progress.cpp.o CMakeFiles/Aegisub.dir/src/dialog_properties.cpp.o CMakeFiles/Aegisub.dir/src/dialog_resample.cpp.o CMakeFiles/Aegisub.dir/src/dialog_search_replace.cpp.o CMakeFiles/Aegisub.dir/src/dialog_selected_choices.cpp.o CMakeFiles/Aegisub.dir/src/dialog_selection.cpp.o CMakeFiles/Aegisub.dir/src/dialog_shift_times.cpp.o CMakeFiles/Aegisub.dir/src/dialog_spellchecker.cpp.o CMakeFiles/Aegisub.dir/src/dialog_style_editor.cpp.o CMakeFiles/Aegisub.dir/src/dialog_style_manager.cpp.o CMakeFiles/Aegisub.dir/src/dialog_styling_assistant.cpp.o CMakeFiles/Aegisub.dir/src/dialog_text_import.cpp.o CMakeFiles/Aegisub.dir/src/dialog_timing_processor.cpp.o CMakeFiles/Aegisub.dir/src/dialog_translation.cpp.o CMakeFiles/Aegisub.dir/src/dialog_video_details.cpp.o CMakeFiles/Aegisub.dir/src/dialog_video_properties.cpp.o CMakeFiles/Aegisub.dir/src/subtitle_format.cpp.o CMakeFiles/Aegisub.dir/src/subtitle_format_ass.cpp.o CMakeFiles/Aegisub.dir/src/subtitle_format_ebu3264.cpp.o CMakeFiles/Aegisub.dir/src/subtitle_format_encore.cpp.o CMakeFiles/Aegisub.dir/src/subtitle_format_microdvd.cpp.o CMakeFiles/Aegisub.dir/src/subtitle_format_mkv.cpp.o CMakeFiles/Aegisub.dir/src/subtitle_format_srt.cpp.o CMakeFiles/Aegisub.dir/src/subtitle_format_ssa.cpp.o CMakeFiles/Aegisub.dir/src/subtitle_format_transtation.cpp.o CMakeFiles/Aegisub.dir/src/subtitle_format_ttxt.cpp.o CMakeFiles/Aegisub.dir/src/subtitle_format_txt.cpp.o CMakeFiles/Aegisub.dir/src/visual_tool.cpp.o CMakeFiles/Aegisub.dir/src/visual_tool_clip.cpp.o CMakeFiles/Aegisub.dir/src/visual_tool_cross.cpp.o CMakeFiles/Aegisub.dir/src/visual_tool_drag.cpp.o CMakeFiles/Aegisub.dir/src/visual_tool_rotatexy.cpp.o CMakeFiles/Aegisub.dir/src/visual_tool_rotatez.cpp.o CMakeFiles/Aegisub.dir/src/visual_tool_scale.cpp.o CMakeFiles/Aegisub.dir/src/visual_tool_vector_clip.cpp.o CMakeFiles/Aegisub.dir/src/MatroskaParser.c.o CMakeFiles/Aegisub.dir/src/aegisublocale.cpp.o CMakeFiles/Aegisub.dir/src/ass_attachment.cpp.o CMakeFiles/Aegisub.dir/src/ass_dialogue.cpp.o CMakeFiles/Aegisub.dir/src/ass_entry.cpp.o CMakeFiles/Aegisub.dir/src/ass_export_filter.cpp.o CMakeFiles/Aegisub.dir/src/ass_exporter.cpp.o CMakeFiles/Aegisub.dir/src/ass_file.cpp.o CMakeFiles/Aegisub.dir/src/ass_karaoke.cpp.o CMakeFiles/Aegisub.dir/src/ass_override.cpp.o CMakeFiles/Aegisub.dir/src/ass_parser.cpp.o CMakeFiles/Aegisub.dir/src/ass_style.cpp.o CMakeFiles/Aegisub.dir/src/ass_style_storage.cpp.o CMakeFiles/Aegisub.dir/src/async_video_provider.cpp.o CMakeFiles/Aegisub.dir/src/audio_box.cpp.o CMakeFiles/Aegisub.dir/src/audio_colorscheme.cpp.o CMakeFiles/Aegisub.dir/src/audio_controller.cpp.o CMakeFiles/Aegisub.dir/src/audio_display.cpp.o CMakeFiles/Aegisub.dir/src/audio_karaoke.cpp.o CMakeFiles/Aegisub.dir/src/audio_marker.cpp.o CMakeFiles/Aegisub.dir/src/audio_player.cpp.o CMakeFiles/Aegisub.dir/src/audio_provider_factory.cpp.o CMakeFiles/Aegisub.dir/src/audio_renderer.cpp.o CMakeFiles/Aegisub.dir/src/audio_renderer_spectrum.cpp.o CMakeFiles/Aegisub.dir/src/audio_renderer_waveform.cpp.o CMakeFiles/Aegisub.dir/src/audio_timing_dialogue.cpp.o CMakeFiles/Aegisub.dir/src/audio_timing_karaoke.cpp.o CMakeFiles/Aegisub.dir/src/auto4_base.cpp.o CMakeFiles/Aegisub.dir/src/auto4_lua.cpp.o CMakeFiles/Aegisub.dir/src/auto4_lua_assfile.cpp.o CMakeFiles/Aegisub.dir/src/auto4_lua_dialog.cpp.o CMakeFiles/Aegisub.dir/src/auto4_lua_progresssink.cpp.o CMakeFiles/Aegisub.dir/src/base_grid.cpp.o CMakeFiles/Aegisub.dir/src/charset_detect.cpp.o CMakeFiles/Aegisub.dir/src/colorspace.cpp.o CMakeFiles/Aegisub.dir/src/colour_button.cpp.o CMakeFiles/Aegisub.dir/src/compat.cpp.o CMakeFiles/Aegisub.dir/src/context.cpp.o CMakeFiles/Aegisub.dir/src/export_fixstyle.cpp.o CMakeFiles/Aegisub.dir/src/export_framerate.cpp.o CMakeFiles/Aegisub.dir/src/fft.cpp.o CMakeFiles/Aegisub.dir/src/font_file_lister.cpp.o CMakeFiles/Aegisub.dir/src/frame_main.cpp.o CMakeFiles/Aegisub.dir/src/gl_text.cpp.o CMakeFiles/Aegisub.dir/src/gl_wrap.cpp.o CMakeFiles/Aegisub.dir/src/grid_column.cpp.o CMakeFiles/Aegisub.dir/src/help_button.cpp.o CMakeFiles/Aegisub.dir/src/hotkey.cpp.o CMakeFiles/Aegisub.dir/src/hotkey_data_view_model.cpp.o CMakeFiles/Aegisub.dir/src/image_position_picker.cpp.o CMakeFiles/Aegisub.dir/src/initial_line_state.cpp.o CMakeFiles/Aegisub.dir/src/main.cpp.o CMakeFiles/Aegisub.dir/src/menu.cpp.o CMakeFiles/Aegisub.dir/src/mkv_wrap.cpp.o CMakeFiles/Aegisub.dir/src/pen.cpp.o CMakeFiles/Aegisub.dir/src/persist_location.cpp.o CMakeFiles/Aegisub.dir/src/preferences.cpp.o CMakeFiles/Aegisub.dir/src/preferences_base.cpp.o CMakeFiles/Aegisub.dir/src/project.cpp.o CMakeFiles/Aegisub.dir/src/resolution_resampler.cpp.o CMakeFiles/Aegisub.dir/src/search_replace_engine.cpp.o CMakeFiles/Aegisub.dir/src/selection_controller.cpp.o CMakeFiles/Aegisub.dir/src/spellchecker.cpp.o CMakeFiles/Aegisub.dir/src/spline.cpp.o CMakeFiles/Aegisub.dir/src/spline_curve.cpp.o CMakeFiles/Aegisub.dir/src/string_codec.cpp.o CMakeFiles/Aegisub.dir/src/subs_controller.cpp.o CMakeFiles/Aegisub.dir/src/subs_edit_box.cpp.o CMakeFiles/Aegisub.dir/src/subs_edit_ctrl.cpp.o CMakeFiles/Aegisub.dir/src/subs_preview.cpp.o CMakeFiles/Aegisub.dir/src/subtitles_provider.cpp.o CMakeFiles/Aegisub.dir/src/subtitles_provider_libass.cpp.o CMakeFiles/Aegisub.dir/src/text_file_reader.cpp.o CMakeFiles/Aegisub.dir/src/text_file_writer.cpp.o CMakeFiles/Aegisub.dir/src/text_selection_controller.cpp.o CMakeFiles/Aegisub.dir/src/thesaurus.cpp.o CMakeFiles/Aegisub.dir/src/timeedit_ctrl.cpp.o CMakeFiles/Aegisub.dir/src/toggle_bitmap.cpp.o CMakeFiles/Aegisub.dir/src/toolbar.cpp.o CMakeFiles/Aegisub.dir/src/tooltip_manager.cpp.o CMakeFiles/Aegisub.dir/src/utils.cpp.o CMakeFiles/Aegisub.dir/src/validators.cpp.o CMakeFiles/Aegisub.dir/src/vector2d.cpp.o CMakeFiles/Aegisub.dir/src/version.cpp.o CMakeFiles/Aegisub.dir/src/video_box.cpp.o CMakeFiles/Aegisub.dir/src/video_controller.cpp.o CMakeFiles/Aegisub.dir/src/video_display.cpp.o CMakeFiles/Aegisub.dir/src/video_frame.cpp.o CMakeFiles/Aegisub.dir/src/video_out_gl.cpp.o CMakeFiles/Aegisub.dir/src/video_provider_cache.cpp.o CMakeFiles/Aegisub.dir/src/video_provider_dummy.cpp.o CMakeFiles/Aegisub.dir/src/video_provider_manager.cpp.o CMakeFiles/Aegisub.dir/src/video_provider_yuv4mpeg.cpp.o CMakeFiles/Aegisub.dir/src/video_slider.cpp.o CMakeFiles/Aegisub.dir/src/visual_feature.cpp.o CMakeFiles/Aegisub.dir/src/crash_writer.cpp.o CMakeFiles/Aegisub.dir/src/font_file_lister_fontconfig.cpp.o CMakeFiles/Aegisub.dir/src/audio_player_alsa.cpp.o CMakeFiles/Aegisub.dir/src/subtitles_provider_csri.cpp.o CMakeFiles/Aegisub.dir/src/audio_provider_ffmpegsource.cpp.o CMakeFiles/Aegisub.dir/src/ffmpegsource_common.cpp.o CMakeFiles/Aegisub.dir/src/video_provider_ffmpegsource.cpp.o CMakeFiles/Aegisub.dir/src/spellchecker_hunspell.cpp.o CMakeFiles/Aegisub.dir/src/audio_player_oss.cpp.o -o aegisub  -ldl  libaegisub.a  -lluajit-5.1  /usr/lib/libfontconfig.so  /usr/lib64/libass.so  /usr/lib/libboost_container.so  /usr/lib/libboost_filesystem.so  /usr/lib/libboost_locale.so  /usr/lib/libboost_regex.so  /usr/lib/libicuuc.so  -L/usr/lib64  -pthread  -lwx_gtk3u_adv-3.0  -lwx_baseu-3.0  -lwx_gtk3u_core-3.0  -lwx_gtk3u_gl-3.0  -lwx_gtk3u_stc-3.0  -lwx_baseu_xml-3.0  /usr/lib/libz.so  /usr/lib/libasound.so  vendor/csri/libcsri.a  /usr/lib/libffms2.so  /usr/lib/libfftw3.so  /usr/lib/libfftw3f.so  /usr/lib/libfftw3l.so  /usr/lib64/libhunspell-1.7.so  -ldl  vendor/luabins/libluabins.a  -lluajit-5.1  /usr/lib/libboost_thread.so  /usr/lib/libboost_chrono.so  /usr/lib/libboost_atomic.so  -lpthread  /usr/lib/libGLX.so  /usr/lib/libOpenGL.so && :
/usr/bin/ld: CMakeFiles/Aegisub.dir/src/search_replace_engine.cpp.o: undefined reference to symbol '_ZN6icu_708Collator14createInstanceERKNS_6LocaleER10UErrorCode'
/usr/bin/ld: /lib64/libicui18n.so.70: error adding symbols: DSO missing from command line
collect2: error: ld returned 1 exit status
ninja: build stopped: subcommand failed.
=> ERROR: Aegisub-3.3.2_4: do_build: '${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}' exited with 1
=> ERROR:   in do_build() at common/build-style/cmake.sh:85
```

Updating `gnuradio` to `3.10.1.1` requires dropping `conf_files` & `gnuradio-devel_package()` `vmove`s for `usr/lib/*.so` & `usr/lib/pkgconfig` which is unacceptable, need to look into this

Additionally a few shared objects aren't built anymore for some reason, namely `libboost_stacktrace_{addr2line,basic,noop}.so.*` & `libboost_fiber.so.*`, so I dropped their subpackages for now (is this ok?).

#### Solved issues
1. The `failed to install target dependencies! (error 40)` issue was fixed by making new subpackages for `libboost_json.so.*` & `libboost_nowide.so.*`; they were inside the `boost` pkg, depended on `libboost_container` which itself depends on `boost` => circular dependency.
2. Cross-compiling `bjam` required a `s:./build.sh:./build.sh --cxx="${CXX}" --cxxflags="${CXXFLAGS}":`

#### Modified patches
`exec_file.patch`: Removed due to being upstream as https://github.com/boostorg/python/commit/d9f06052e28873037db7f98629bce72182a42410
`mips.patch`: Updated to apply on top of https://github.com/boostorg/fiber/commit/5dc9dabc5d5ff8da53ec897c265c9cba1b6ed0df, not sure if this can be removed now(?)

#### Misc changes
- I've renamed all subpackages of `boost` so that the versioned name doesn't conflict with other numbers and are consistent with the previously existing `boost-python3-1.72`, e.g. `libboost_math_c991.72` is now `libboost_math_c99-1.79` (notice the `-`!)

#### To-Do
- Include ~100 commits from `xrevbump` due to `boost` & `uhd` SONAME bumps

#### Testing the changes
- I tested the changes in this PR: **NO**

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36204.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boost-1.79.0-36204.patch --]
[-- Type: text/x-diff, Size: 41318 bytes --]

From f530bf503827c21a9b14b2b438566be7c93db7b0 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 15:28:37 +0200
Subject: [PATCH 1/3] boost: update to 1.79.0.b1.

---
 common/shlibs                                 |  60 +++---
 .../{boost-python1.72 => boost-python1.79}    |   0
 ...{boost-python3-1.72 => boost-python3-1.79} |   0
 srcpkgs/boost/patches/exec_file.patch         |  45 -----
 srcpkgs/boost/patches/mips.patch              |   2 +-
 srcpkgs/boost/template                        | 191 +++++++-----------
 ...ibboost_atomic1.72 => libboost_atomic1.79} |   0
 ...ibboost_chrono1.72 => libboost_chrono1.79} |   0
 ...t_container1.72 => libboost_container1.79} |   0
 ...boost_context1.72 => libboost_context1.79} |   0
 ...ost_contract1.72 => libboost_contract1.79} |   0
 ...t_coroutine1.72 => libboost_coroutine1.79} |   0
 ...t_date_time1.72 => libboost_date_time1.79} |   0
 ...oost_fiber1.72 => libboost_filesystem1.79} |   0
 ...oost_filesystem1.72 => libboost_graph1.79} |   0
 ...boost_graph1.72 => libboost_iostreams1.79} |   0
 ...bboost_iostreams1.72 => libboost_json1.79} |   0
 ...ibboost_locale1.72 => libboost_locale1.79} |   0
 .../{libboost_log1.72 => libboost_log1.79}    |   0
 ...t_log_setup1.72 => libboost_log_setup1.79} |   0
 ...st_math_c991.72 => libboost_math_c99-1.79} |   0
 ...t_math_c99f1.72 => libboost_math_c99f1.79} |   0
 ...t_math_c99l1.72 => libboost_math_c99l1.79} |   0
 ...st_math_tr11.72 => libboost_math_tr1-1.79} |   0
 ...t_math_tr1f1.72 => libboost_math_tr1f1.79} |   0
 ...t_math_tr1l1.72 => libboost_math_tr1l1.79} |   0
 ...g_exec_monitor1.72 => libboost_nowide1.79} |   0
 ...ions1.72 => libboost_prg_exec_monitor1.79} |   0
 ...andom1.72 => libboost_program_options1.79} |   0
 ...libboost_regex1.72 => libboost_random1.79} |   0
 ...t_serialization1.72 => libboost_regex1.79} |   0
 ...dr2line1.72 => libboost_serialization1.79} |   0
 ...acktrace_basic1.72 => libboost_system1.79} |   0
 ...tacktrace_noop1.72 => libboost_thread1.79} |   0
 ...libboost_system1.72 => libboost_timer1.79} |   0
 ...t_thread1.72 => libboost_type_erasure1.79} |   0
 ...r1.72 => libboost_unit_test_framework1.79} |   0
 srcpkgs/libboost_wave1.72                     |   1 -
 ...ost_type_erasure1.72 => libboost_wave1.79} |   0
 srcpkgs/libboost_wserialization1.72           |   1 -
 ...mework1.72 => libboost_wserialization1.79} |   0
 41 files changed, 103 insertions(+), 197 deletions(-)
 rename srcpkgs/{boost-python1.72 => boost-python1.79} (100%)
 rename srcpkgs/{boost-python3-1.72 => boost-python3-1.79} (100%)
 delete mode 100644 srcpkgs/boost/patches/exec_file.patch
 rename srcpkgs/{libboost_atomic1.72 => libboost_atomic1.79} (100%)
 rename srcpkgs/{libboost_chrono1.72 => libboost_chrono1.79} (100%)
 rename srcpkgs/{libboost_container1.72 => libboost_container1.79} (100%)
 rename srcpkgs/{libboost_context1.72 => libboost_context1.79} (100%)
 rename srcpkgs/{libboost_contract1.72 => libboost_contract1.79} (100%)
 rename srcpkgs/{libboost_coroutine1.72 => libboost_coroutine1.79} (100%)
 rename srcpkgs/{libboost_date_time1.72 => libboost_date_time1.79} (100%)
 rename srcpkgs/{libboost_fiber1.72 => libboost_filesystem1.79} (100%)
 rename srcpkgs/{libboost_filesystem1.72 => libboost_graph1.79} (100%)
 rename srcpkgs/{libboost_graph1.72 => libboost_iostreams1.79} (100%)
 rename srcpkgs/{libboost_iostreams1.72 => libboost_json1.79} (100%)
 rename srcpkgs/{libboost_locale1.72 => libboost_locale1.79} (100%)
 rename srcpkgs/{libboost_log1.72 => libboost_log1.79} (100%)
 rename srcpkgs/{libboost_log_setup1.72 => libboost_log_setup1.79} (100%)
 rename srcpkgs/{libboost_math_c991.72 => libboost_math_c99-1.79} (100%)
 rename srcpkgs/{libboost_math_c99f1.72 => libboost_math_c99f1.79} (100%)
 rename srcpkgs/{libboost_math_c99l1.72 => libboost_math_c99l1.79} (100%)
 rename srcpkgs/{libboost_math_tr11.72 => libboost_math_tr1-1.79} (100%)
 rename srcpkgs/{libboost_math_tr1f1.72 => libboost_math_tr1f1.79} (100%)
 rename srcpkgs/{libboost_math_tr1l1.72 => libboost_math_tr1l1.79} (100%)
 rename srcpkgs/{libboost_prg_exec_monitor1.72 => libboost_nowide1.79} (100%)
 rename srcpkgs/{libboost_program_options1.72 => libboost_prg_exec_monitor1.79} (100%)
 rename srcpkgs/{libboost_random1.72 => libboost_program_options1.79} (100%)
 rename srcpkgs/{libboost_regex1.72 => libboost_random1.79} (100%)
 rename srcpkgs/{libboost_serialization1.72 => libboost_regex1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_addr2line1.72 => libboost_serialization1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_basic1.72 => libboost_system1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_noop1.72 => libboost_thread1.79} (100%)
 rename srcpkgs/{libboost_system1.72 => libboost_timer1.79} (100%)
 rename srcpkgs/{libboost_thread1.72 => libboost_type_erasure1.79} (100%)
 rename srcpkgs/{libboost_timer1.72 => libboost_unit_test_framework1.79} (100%)
 delete mode 120000 srcpkgs/libboost_wave1.72
 rename srcpkgs/{libboost_type_erasure1.72 => libboost_wave1.79} (100%)
 delete mode 120000 srcpkgs/libboost_wserialization1.72
 rename srcpkgs/{libboost_unit_test_framework1.72 => libboost_wserialization1.79} (100%)

diff --git a/common/shlibs b/common/shlibs
index 83b5783cb026..4253ce15bf03 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -620,38 +620,34 @@ 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.79.0 libboost_context1.79-1.79.0.b1_1
+libboost_coroutine.so.1.79.0 libboost_coroutine1.79-1.79.0.b1_1
+libboost_container.so.1.79.0 libboost_container1.79-1.79.0.b1_1
+libboost_prg_exec_monitor.so.1.79.0 libboost_prg_exec_monitor1.79-1.79.0.b1_1
+libboost_timer.so.1.79.0 libboost_timer1.79-1.79.0.b1_1
+libboost_random.so.1.79.0 libboost_random1.79-1.79.0.b1_1
+libboost_filesystem.so.1.79.0 libboost_filesystem1.79-1.79.0.b1_1
+libboost_unit_test_framework.so.1.79.0 libboost_unit_test_framework1.79-1.79.0.b1_1
+libboost_math_c99.so.1.79.0 libboost_math_c99-1.79-1.79.0.b1_1
+libboost_math_tr1.so.1.79.0 libboost_math_tr1-1.79-1.79.0.b1_1
+libboost_regex.so.1.79.0 libboost_regex1.79-1.79.0.b1_1
+libboost_serialization.so.1.79.0 libboost_serialization1.79-1.79.0.b1_1
+libboost_chrono.so.1.79.0 libboost_chrono1.79-1.79.0.b1_1
+libboost_wserialization.so.1.79.0 libboost_wserialization1.79-1.79.0.b1_1
+libboost_graph.so.1.79.0 libboost_graph1.79-1.79.0.b1_1
+libboost_log.so.1.79.0 libboost_log1.79-1.79.0.b1_1
+libboost_locale.so.1.79.0 libboost_locale1.79-1.79.0.b1_1
+libboost_program_options.so.1.79.0 libboost_program_options1.79-1.79.0.b1_1
+libboost_iostreams.so.1.79.0 libboost_iostreams1.79-1.79.0.b1_1
+libboost_system.so.1.79.0 libboost_system1.79-1.79.0.b1_1
+libboost_thread.so.1.79.0 libboost_thread1.79-1.79.0.b1_1
+libboost_log_setup.so.1.79.0 libboost_log_setup1.79-1.79.0.b1_1
+libboost_date_time.so.1.79.0 libboost_date_time1.79-1.79.0.b1_1
+libboost_wave.so.1.79.0 libboost_wave1.79-1.79.0.b1_1
+libboost_atomic.so.1.79.0 libboost_atomic1.79-1.79.0.b1_1
+libboost_type_erasure.so.1.79.0 libboost_type_erasure1.79-1.79.0.b1_1
+libboost_python27.so.1.79.0 boost-python1.79-1.79.0.b1_1
+libboost_python310.so.1.79.0 boost-python3-1.79-1.79.0.b1_1
 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-python1.79
similarity index 100%
rename from srcpkgs/boost-python1.72
rename to srcpkgs/boost-python1.79
diff --git a/srcpkgs/boost-python3-1.72 b/srcpkgs/boost-python3-1.79
similarity index 100%
rename from srcpkgs/boost-python3-1.72
rename to srcpkgs/boost-python3-1.79
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/mips.patch b/srcpkgs/boost/patches/mips.patch
index a10a2122d9c7..8d253fc7c286 100644
--- a/srcpkgs/boost/patches/mips.patch
+++ b/srcpkgs/boost/patches/mips.patch
@@ -3,7 +3,7 @@
 @@ -48,7 +48,7 @@
  #  define cpu_relax() asm volatile ("nop" ::: "memory");
  # endif
- #elif BOOST_ARCH_MIPS
+ #elif BOOST_ARCH_MIPS && (((__mips_isa_rev > 1) && defined(__mips32)) || ((__mips_isa_rev > 2)  && defined(__mips64)))
 -# define cpu_relax() asm volatile ("pause" ::: "memory");
 +# define cpu_relax() asm volatile ("nop" ::: "memory");
  #elif BOOST_ARCH_PPC
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 126c50770b50..1c9788159e99 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,62 +1,24 @@
 # Template file for 'boost'
 pkgname=boost
-version=1.72.0
-revision=7
-wrksrc="${pkgname}_${version//\./_}"
+version=1.79.0.b1
+revision=1
+wrksrc="${pkgname}_${version%.*}"
+wrksrc="${wrksrc//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-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
+distfiles="https://boostorg.jfrog.io/artifactory/main/beta/${version/b1/beta1}/source/boost_${version//./_}.tar.bz2"
+checksum=8985105623f48d55be01076d98ca4e7a8cb548a8d7f9ad0e1fc3c710d2c75fcf
 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"
-
-if [ -z "$CROSS_BUILD" ]; then
-	subpackages+=" libboost_stacktrace_addr2line1.72"
-fi
-
 case "$XBPS_TARGET_MACHINE" in
-	i686*)    _arch=x86;      _abi=sysv  ;;
-	x86_64*)  _arch=x86;      _abi=sysv  ;;
-	arm*)     _arch=arm;      _abi=aapcs ;;
-	aarch64*) _arch=arm;      _abi=aapcs ;;
-	mips*)    _arch=mips32r2; _abi=o32   ;;
-	ppc*)     _arch=power;    _abi=sysv  ;;
+	i686*|x86_64*) _arch=x86;      _abi=sysv  ;;
+	arm*|aarch64*) _arch=arm;      _abi=aapcs ;;
+	mips*)         _arch=mips32r2; _abi=o32   ;;
+	ppc*)          _arch=power;    _abi=sysv  ;;
 esac
 
 do_build() {
@@ -66,7 +28,7 @@ do_build() {
 	(
 	# Rebuild bjam for target
 	cd tools/build/src/engine
-	./build.sh gcc
+	./build.sh --cxx="${CXX}" --cxxflags="${CXXFLAGS}" gcc
 	)
 	cat > user-config.jam <<-__EOF
 	using gcc : : ${CXX} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
@@ -74,10 +36,8 @@ do_build() {
 	using python : ${py3_ver} : ${XBPS_CROSS_BASE}/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} \
 		threading=multi runtime-link=shared link=shared,static
 }
@@ -119,7 +79,7 @@ boost-jam_package() {
 		vmove usr/bin/b2
 	}
 }
-boost-python1.72_package() {
+boost-python1.79_package() {
 	depends="boost python"
 	replaces="boost-python>=0"
 	short_desc+=" - Python bindings"
@@ -127,7 +87,7 @@ boost-python1.72_package() {
 		vmove "usr/lib/libboost_python2*.so.*"
 	}
 }
-boost-python3-1.72_package() {
+boost-python3-1.79_package() {
 	depends="boost python3"
 	replaces="boost-python3>=0"
 	short_desc+=" - Python3 bindings"
@@ -145,7 +105,20 @@ boost-build_package() {
 }
 boost-devel_package() {
 	noverifyrdeps=yes
-	depends="boost ${subpackages/boost-devel}"
+	depends="boost libboost_program_options1.79 libboost_math_c99f1.79
+ libboost_iostreams1.79 libboost_math_tr1l1.79 libboost_filesystem1.79
+ libboost_chrono1.79 libboost_math_tr1f1.79 libboost_wave1.79
+ libboost_graph1.79 libboost_locale1.79 libboost_regex1.79
+ libboost_type_erasure1.79 libboost_coroutine1.79
+ libboost_atomic1.79 libboost_prg_exec_monitor1.79 libboost_math_c99-1.79
+ boost-python3-1.79 libboost_log_setup1.79
+ libboost_timer1.79 libboost_system1.79 libboost_unit_test_framework1.79
+ libboost_serialization1.79 libboost_math_tr1-1.79 boost-build
+ libboost_math_c99l1.79 boost-python1.79 libboost_contract1.79
+ libboost_date_time1.79 libboost_log1.79 libboost_random1.79
+ libboost_thread1.79 libboost_container1.79 boost-jam
+ libboost_wserialization1.79 libboost_context1.79 libboost_json1.79
+ libboost_nowide1.79"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
@@ -154,7 +127,7 @@ boost-devel_package() {
 	}
 }
 
-libboost_atomic1.72_package() {
+libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
@@ -162,7 +135,7 @@ libboost_atomic1.72_package() {
 	}
 }
 
-libboost_chrono1.72_package() {
+libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
@@ -170,7 +143,7 @@ libboost_chrono1.72_package() {
 	}
 }
 
-libboost_container1.72_package() {
+libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
@@ -178,7 +151,7 @@ libboost_container1.72_package() {
 	}
 }
 
-libboost_context1.72_package() {
+libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
@@ -186,7 +159,7 @@ libboost_context1.72_package() {
 	}
 }
 
-libboost_contract1.72_package() {
+libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
@@ -194,7 +167,7 @@ libboost_contract1.72_package() {
 	}
 }
 
-libboost_coroutine1.72_package() {
+libboost_coroutine1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
@@ -202,7 +175,7 @@ libboost_coroutine1.72_package() {
 	}
 }
 
-libboost_date_time1.72_package() {
+libboost_date_time1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
@@ -210,15 +183,7 @@ libboost_date_time1.72_package() {
 	}
 }
 
-libboost_fiber1.72_package() {
-	depends="boost"
-	short_desc+=" - libboost_fiber"
-	pkg_install() {
-		vmove usr/lib/libboost_fiber.so.*
-	}
-}
-
-libboost_filesystem1.72_package() {
+libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
@@ -226,7 +191,7 @@ libboost_filesystem1.72_package() {
 	}
 }
 
-libboost_graph1.72_package() {
+libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
@@ -234,7 +199,7 @@ libboost_graph1.72_package() {
 	}
 }
 
-libboost_iostreams1.72_package() {
+libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
@@ -242,7 +207,7 @@ libboost_iostreams1.72_package() {
 	}
 }
 
-libboost_locale1.72_package() {
+libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
@@ -250,7 +215,7 @@ libboost_locale1.72_package() {
 	}
 }
 
-libboost_log1.72_package() {
+libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
@@ -258,7 +223,7 @@ libboost_log1.72_package() {
 	}
 }
 
-libboost_log_setup1.72_package() {
+libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
@@ -266,7 +231,7 @@ libboost_log_setup1.72_package() {
 	}
 }
 
-libboost_math_c991.72_package() {
+libboost_math_c99-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
@@ -274,7 +239,7 @@ libboost_math_c991.72_package() {
 	}
 }
 
-libboost_math_c99f1.72_package() {
+libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
@@ -282,7 +247,7 @@ libboost_math_c99f1.72_package() {
 	}
 }
 
-libboost_math_c99l1.72_package() {
+libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
@@ -290,7 +255,7 @@ libboost_math_c99l1.72_package() {
 	}
 }
 
-libboost_math_tr11.72_package() {
+libboost_math_tr1-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
@@ -298,7 +263,7 @@ libboost_math_tr11.72_package() {
 	}
 }
 
-libboost_math_tr1f1.72_package() {
+libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
@@ -306,7 +271,7 @@ libboost_math_tr1f1.72_package() {
 	}
 }
 
-libboost_math_tr1l1.72_package() {
+libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
@@ -314,7 +279,7 @@ libboost_math_tr1l1.72_package() {
 	}
 }
 
-libboost_prg_exec_monitor1.72_package() {
+libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
@@ -322,7 +287,7 @@ libboost_prg_exec_monitor1.72_package() {
 	}
 }
 
-libboost_program_options1.72_package() {
+libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
@@ -330,7 +295,7 @@ libboost_program_options1.72_package() {
 	}
 }
 
-libboost_random1.72_package() {
+libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
@@ -338,7 +303,7 @@ libboost_random1.72_package() {
 	}
 }
 
-libboost_regex1.72_package() {
+libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
@@ -346,7 +311,7 @@ libboost_regex1.72_package() {
 	}
 }
 
-libboost_serialization1.72_package() {
+libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
@@ -354,31 +319,7 @@ libboost_serialization1.72_package() {
 	}
 }
 
-libboost_stacktrace_addr2line1.72_package() {
-	depends="boost"
-	short_desc+=" - libboost_stacktrace_addr2line"
-	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_addr2line.so.*
-	}
-}
-
-libboost_stacktrace_basic1.72_package() {
-	depends="boost"
-	short_desc+=" - libboost_stacktrace_basic"
-	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_basic.so.*
-	}
-}
-
-libboost_stacktrace_noop1.72_package() {
-	depends="boost"
-	short_desc+=" - libboost_stacktrace_noop"
-	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_noop.so.*
-	}
-}
-
-libboost_system1.72_package() {
+libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
@@ -386,7 +327,7 @@ libboost_system1.72_package() {
 	}
 }
 
-libboost_thread1.72_package() {
+libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
@@ -394,7 +335,7 @@ libboost_thread1.72_package() {
 	}
 }
 
-libboost_timer1.72_package() {
+libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
@@ -402,7 +343,7 @@ libboost_timer1.72_package() {
 	}
 }
 
-libboost_type_erasure1.72_package() {
+libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
@@ -410,7 +351,7 @@ libboost_type_erasure1.72_package() {
 	}
 }
 
-libboost_unit_test_framework1.72_package() {
+libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
@@ -418,7 +359,7 @@ libboost_unit_test_framework1.72_package() {
 	}
 }
 
-libboost_wave1.72_package() {
+libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
@@ -426,10 +367,26 @@ libboost_wave1.72_package() {
 	}
 }
 
-libboost_wserialization1.72_package() {
+libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
 		vmove usr/lib/libboost_wserialization.so.*
 	}
 }
+
+libboost_json1.79_package() {
+	depends="boost"
+	short_desc+=" - libboost_json"
+	pkg_install() {
+		vmove "usr/lib/libboost_json.so.*"
+	}
+}
+
+libboost_nowide1.79_package() {
+	depends="boost"
+	short_desc+=" - libboost_nowide"
+	pkg_install() {
+		vmove "usr/lib/libboost_nowide.so.*"
+	}
+}
diff --git a/srcpkgs/libboost_atomic1.72 b/srcpkgs/libboost_atomic1.79
similarity index 100%
rename from srcpkgs/libboost_atomic1.72
rename to srcpkgs/libboost_atomic1.79
diff --git a/srcpkgs/libboost_chrono1.72 b/srcpkgs/libboost_chrono1.79
similarity index 100%
rename from srcpkgs/libboost_chrono1.72
rename to srcpkgs/libboost_chrono1.79
diff --git a/srcpkgs/libboost_container1.72 b/srcpkgs/libboost_container1.79
similarity index 100%
rename from srcpkgs/libboost_container1.72
rename to srcpkgs/libboost_container1.79
diff --git a/srcpkgs/libboost_context1.72 b/srcpkgs/libboost_context1.79
similarity index 100%
rename from srcpkgs/libboost_context1.72
rename to srcpkgs/libboost_context1.79
diff --git a/srcpkgs/libboost_contract1.72 b/srcpkgs/libboost_contract1.79
similarity index 100%
rename from srcpkgs/libboost_contract1.72
rename to srcpkgs/libboost_contract1.79
diff --git a/srcpkgs/libboost_coroutine1.72 b/srcpkgs/libboost_coroutine1.79
similarity index 100%
rename from srcpkgs/libboost_coroutine1.72
rename to srcpkgs/libboost_coroutine1.79
diff --git a/srcpkgs/libboost_date_time1.72 b/srcpkgs/libboost_date_time1.79
similarity index 100%
rename from srcpkgs/libboost_date_time1.72
rename to srcpkgs/libboost_date_time1.79
diff --git a/srcpkgs/libboost_fiber1.72 b/srcpkgs/libboost_filesystem1.79
similarity index 100%
rename from srcpkgs/libboost_fiber1.72
rename to srcpkgs/libboost_filesystem1.79
diff --git a/srcpkgs/libboost_filesystem1.72 b/srcpkgs/libboost_graph1.79
similarity index 100%
rename from srcpkgs/libboost_filesystem1.72
rename to srcpkgs/libboost_graph1.79
diff --git a/srcpkgs/libboost_graph1.72 b/srcpkgs/libboost_iostreams1.79
similarity index 100%
rename from srcpkgs/libboost_graph1.72
rename to srcpkgs/libboost_iostreams1.79
diff --git a/srcpkgs/libboost_iostreams1.72 b/srcpkgs/libboost_json1.79
similarity index 100%
rename from srcpkgs/libboost_iostreams1.72
rename to srcpkgs/libboost_json1.79
diff --git a/srcpkgs/libboost_locale1.72 b/srcpkgs/libboost_locale1.79
similarity index 100%
rename from srcpkgs/libboost_locale1.72
rename to srcpkgs/libboost_locale1.79
diff --git a/srcpkgs/libboost_log1.72 b/srcpkgs/libboost_log1.79
similarity index 100%
rename from srcpkgs/libboost_log1.72
rename to srcpkgs/libboost_log1.79
diff --git a/srcpkgs/libboost_log_setup1.72 b/srcpkgs/libboost_log_setup1.79
similarity index 100%
rename from srcpkgs/libboost_log_setup1.72
rename to srcpkgs/libboost_log_setup1.79
diff --git a/srcpkgs/libboost_math_c991.72 b/srcpkgs/libboost_math_c99-1.79
similarity index 100%
rename from srcpkgs/libboost_math_c991.72
rename to srcpkgs/libboost_math_c99-1.79
diff --git a/srcpkgs/libboost_math_c99f1.72 b/srcpkgs/libboost_math_c99f1.79
similarity index 100%
rename from srcpkgs/libboost_math_c99f1.72
rename to srcpkgs/libboost_math_c99f1.79
diff --git a/srcpkgs/libboost_math_c99l1.72 b/srcpkgs/libboost_math_c99l1.79
similarity index 100%
rename from srcpkgs/libboost_math_c99l1.72
rename to srcpkgs/libboost_math_c99l1.79
diff --git a/srcpkgs/libboost_math_tr11.72 b/srcpkgs/libboost_math_tr1-1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr11.72
rename to srcpkgs/libboost_math_tr1-1.79
diff --git a/srcpkgs/libboost_math_tr1f1.72 b/srcpkgs/libboost_math_tr1f1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1f1.72
rename to srcpkgs/libboost_math_tr1f1.79
diff --git a/srcpkgs/libboost_math_tr1l1.72 b/srcpkgs/libboost_math_tr1l1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1l1.72
rename to srcpkgs/libboost_math_tr1l1.79
diff --git a/srcpkgs/libboost_prg_exec_monitor1.72 b/srcpkgs/libboost_nowide1.79
similarity index 100%
rename from srcpkgs/libboost_prg_exec_monitor1.72
rename to srcpkgs/libboost_nowide1.79
diff --git a/srcpkgs/libboost_program_options1.72 b/srcpkgs/libboost_prg_exec_monitor1.79
similarity index 100%
rename from srcpkgs/libboost_program_options1.72
rename to srcpkgs/libboost_prg_exec_monitor1.79
diff --git a/srcpkgs/libboost_random1.72 b/srcpkgs/libboost_program_options1.79
similarity index 100%
rename from srcpkgs/libboost_random1.72
rename to srcpkgs/libboost_program_options1.79
diff --git a/srcpkgs/libboost_regex1.72 b/srcpkgs/libboost_random1.79
similarity index 100%
rename from srcpkgs/libboost_regex1.72
rename to srcpkgs/libboost_random1.79
diff --git a/srcpkgs/libboost_serialization1.72 b/srcpkgs/libboost_regex1.79
similarity index 100%
rename from srcpkgs/libboost_serialization1.72
rename to srcpkgs/libboost_regex1.79
diff --git a/srcpkgs/libboost_stacktrace_addr2line1.72 b/srcpkgs/libboost_serialization1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_addr2line1.72
rename to srcpkgs/libboost_serialization1.79
diff --git a/srcpkgs/libboost_stacktrace_basic1.72 b/srcpkgs/libboost_system1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_basic1.72
rename to srcpkgs/libboost_system1.79
diff --git a/srcpkgs/libboost_stacktrace_noop1.72 b/srcpkgs/libboost_thread1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_noop1.72
rename to srcpkgs/libboost_thread1.79
diff --git a/srcpkgs/libboost_system1.72 b/srcpkgs/libboost_timer1.79
similarity index 100%
rename from srcpkgs/libboost_system1.72
rename to srcpkgs/libboost_timer1.79
diff --git a/srcpkgs/libboost_thread1.72 b/srcpkgs/libboost_type_erasure1.79
similarity index 100%
rename from srcpkgs/libboost_thread1.72
rename to srcpkgs/libboost_type_erasure1.79
diff --git a/srcpkgs/libboost_timer1.72 b/srcpkgs/libboost_unit_test_framework1.79
similarity index 100%
rename from srcpkgs/libboost_timer1.72
rename to srcpkgs/libboost_unit_test_framework1.79
diff --git a/srcpkgs/libboost_wave1.72 b/srcpkgs/libboost_wave1.72
deleted file mode 120000
index baef819c48f6..000000000000
--- a/srcpkgs/libboost_wave1.72
+++ /dev/null
@@ -1 +0,0 @@
-boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_type_erasure1.72 b/srcpkgs/libboost_wave1.79
similarity index 100%
rename from srcpkgs/libboost_type_erasure1.72
rename to srcpkgs/libboost_wave1.79
diff --git a/srcpkgs/libboost_wserialization1.72 b/srcpkgs/libboost_wserialization1.72
deleted file mode 120000
index baef819c48f6..000000000000
--- a/srcpkgs/libboost_wserialization1.72
+++ /dev/null
@@ -1 +0,0 @@
-boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_unit_test_framework1.72 b/srcpkgs/libboost_wserialization1.79
similarity index 100%
rename from srcpkgs/libboost_unit_test_framework1.72
rename to srcpkgs/libboost_wserialization1.79

From 53ab62f865a1a15ce688685a644291b6c30bfae1 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 18:29:05 +0200
Subject: [PATCH 2/3] boost: quote all vmove's with a glob.

---
 srcpkgs/boost/template | 62 +++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 1c9788159e99..930692adff0e 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -131,7 +131,7 @@ libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
-		vmove usr/lib/libboost_atomic.so.*
+		vmove "usr/lib/libboost_atomic.so.*"
 	}
 }
 
@@ -139,7 +139,7 @@ libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
-		vmove usr/lib/libboost_chrono.so.*
+		vmove "usr/lib/libboost_chrono.so.*"
 	}
 }
 
@@ -147,7 +147,7 @@ libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
-		vmove usr/lib/libboost_container.so.*
+		vmove "usr/lib/libboost_container.so.*"
 	}
 }
 
@@ -155,7 +155,7 @@ libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
-		vmove usr/lib/libboost_context.so.*
+		vmove "usr/lib/libboost_context.so.*"
 	}
 }
 
@@ -163,7 +163,7 @@ libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
-		vmove usr/lib/libboost_contract.so.*
+		vmove "usr/lib/libboost_contract.so.*"
 	}
 }
 
@@ -171,7 +171,7 @@ libboost_coroutine1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
-		vmove usr/lib/libboost_coroutine.so.*
+		vmove "usr/lib/libboost_coroutine.so.*"
 	}
 }
 
@@ -179,7 +179,7 @@ libboost_date_time1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
-		vmove usr/lib/libboost_date_time.so.*
+		vmove "usr/lib/libboost_date_time.so.*"
 	}
 }
 
@@ -187,7 +187,7 @@ libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
-		vmove usr/lib/libboost_filesystem.so.*
+		vmove "usr/lib/libboost_filesystem.so.*"
 	}
 }
 
@@ -195,7 +195,7 @@ libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
-		vmove usr/lib/libboost_graph.so.*
+		vmove "usr/lib/libboost_graph.so.*"
 	}
 }
 
@@ -203,7 +203,7 @@ libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
-		vmove usr/lib/libboost_iostreams.so.*
+		vmove "usr/lib/libboost_iostreams.so.*"
 	}
 }
 
@@ -211,7 +211,7 @@ libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
-		vmove usr/lib/libboost_locale.so.*
+		vmove "usr/lib/libboost_locale.so.*"
 	}
 }
 
@@ -219,7 +219,7 @@ libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
-		vmove usr/lib/libboost_log.so.*
+		vmove "usr/lib/libboost_log.so.*"
 	}
 }
 
@@ -227,7 +227,7 @@ libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
-		vmove usr/lib/libboost_log_setup.so.*
+		vmove "usr/lib/libboost_log_setup.so.*"
 	}
 }
 
@@ -235,7 +235,7 @@ libboost_math_c99-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99.so.*
+		vmove "usr/lib/libboost_math_c99.so.*"
 	}
 }
 
@@ -243,7 +243,7 @@ libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99f.so.*
+		vmove "usr/lib/libboost_math_c99f.so.*"
 	}
 }
 
@@ -251,7 +251,7 @@ libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99l.so.*
+		vmove "usr/lib/libboost_math_c99l.so.*"
 	}
 }
 
@@ -259,7 +259,7 @@ libboost_math_tr1-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1.so.*
+		vmove "usr/lib/libboost_math_tr1.so.*"
 	}
 }
 
@@ -267,7 +267,7 @@ libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1f.so.*
+		vmove "usr/lib/libboost_math_tr1f.so.*"
 	}
 }
 
@@ -275,7 +275,7 @@ libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1l.so.*
+		vmove "usr/lib/libboost_math_tr1l.so.*"
 	}
 }
 
@@ -283,7 +283,7 @@ libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
-		vmove usr/lib/libboost_prg_exec_monitor.so.*
+		vmove "usr/lib/libboost_prg_exec_monitor.so.*"
 	}
 }
 
@@ -291,7 +291,7 @@ libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
-		vmove usr/lib/libboost_program_options.so.*
+		vmove "usr/lib/libboost_program_options.so.*"
 	}
 }
 
@@ -299,7 +299,7 @@ libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
-		vmove usr/lib/libboost_random.so.*
+		vmove "usr/lib/libboost_random.so.*"
 	}
 }
 
@@ -307,7 +307,7 @@ libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
-		vmove usr/lib/libboost_regex.so.*
+		vmove "usr/lib/libboost_regex.so.*"
 	}
 }
 
@@ -315,7 +315,7 @@ libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
-		vmove usr/lib/libboost_serialization.so.*
+		vmove "usr/lib/libboost_serialization.so.*"
 	}
 }
 
@@ -323,7 +323,7 @@ libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
-		vmove usr/lib/libboost_system.so.*
+		vmove "usr/lib/libboost_system.so.*"
 	}
 }
 
@@ -331,7 +331,7 @@ libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
-		vmove usr/lib/libboost_thread.so.*
+		vmove "usr/lib/libboost_thread.so.*"
 	}
 }
 
@@ -339,7 +339,7 @@ libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
-		vmove usr/lib/libboost_timer.so.*
+		vmove "usr/lib/libboost_timer.so.*"
 	}
 }
 
@@ -347,7 +347,7 @@ libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
-		vmove usr/lib/libboost_type_erasure.so.*
+		vmove "usr/lib/libboost_type_erasure.so.*"
 	}
 }
 
@@ -355,7 +355,7 @@ libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
-		vmove usr/lib/libboost_unit_test_framework.so.*
+		vmove "usr/lib/libboost_unit_test_framework.so.*"
 	}
 }
 
@@ -363,7 +363,7 @@ libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
-		vmove usr/lib/libboost_wave.so.*
+		vmove "usr/lib/libboost_wave.so.*"
 	}
 }
 
@@ -371,7 +371,7 @@ libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
-		vmove usr/lib/libboost_wserialization.so.*
+		vmove "usr/lib/libboost_wserialization.so.*"
 	}
 }
 

From b74d689e1a9a8407759e0caf0cd1c0aa62f4572f Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Sat, 19 Mar 2022 01:30:26 +0200
Subject: [PATCH 3/3] uhd: update to 4.1.0.5.

Fixes compile against boost-1.79.

[ci skip] the PR is still WIP
---
 common/shlibs        | 2 +-
 srcpkgs/uhd/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4253ce15bf03..d696869a0f2a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3584,7 +3584,7 @@ libbinpac.so.0 zeek-3.2.4_2
 libllhttp.so.1 llhttp-1.0.1_1
 libpinyin.so.13 libpinyin-2.2.1_1
 libzhuyin.so.13 libzhuyin-2.6.0_3
-libuhd.so.4.0.0 uhd-4.0.0.0_1
+libuhd.so.4.1.0 uhd-4.1.0.5_1
 libeditline.so.1 editline-1.16.0_1
 libgnuradio-rds.so.1 gnuradio-rds-3.8.0_1
 libgnuradio-nrsc5-1.0.0git.so.0.0.0 gnuradio-nrsc5-1.0.0_1
diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template
index 5f043162d7dc..2eecf7f0a84e 100644
--- a/srcpkgs/uhd/template
+++ b/srcpkgs/uhd/template
@@ -1,6 +1,6 @@
 # Template file for 'uhd'
 pkgname=uhd
-version=4.0.0.0
+version=4.1.0.5
 revision=1
 build_wrksrc=host
 build_style=cmake
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://files.ettus.com/manual/"
 changelog="https://raw.githubusercontent.com/EttusResearch/uhd/master/CHANGELOG"
 distfiles="https://github.com/EttusResearch/uhd/archive/v${version}.tar.gz"
-checksum=4f3513c43edf0178391ed5755266864532716b8b503bcfb9a983ae6256c51b14
+checksum=73580bb8823338dbc0ffe2840088cb15d7496ef7d402a4816df17a8e5c8d0221
 python_version=3
 
 case "${XBPS_TARGET_MACHINE}" in

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: boost: update to 1.79.0.b1.
  2022-03-18 14:28 [PR PATCH] boost: update to 1.79.0.b1 JamiKettunen
                   ` (10 preceding siblings ...)
  2022-03-19 12:39 ` JamiKettunen
@ 2022-04-08  3:00 ` q66
  2022-05-04 15:22 ` loreb
                   ` (16 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: q66 @ 2022-04-08  3:00 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 307 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/36204#issuecomment-1092394525

Comment:
It's definitely not okay to remove the subpackages, it seems this is a bug in boost. The libraries are being built, but only their headers and cmake files get installed.

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: boost: update to 1.79.0.b1.
  2022-03-18 14:28 [PR PATCH] boost: update to 1.79.0.b1 JamiKettunen
                   ` (11 preceding siblings ...)
  2022-04-08  3:00 ` q66
@ 2022-05-04 15:22 ` loreb
  2022-05-26 15:22 ` [PR PATCH] [Updated] " JamiKettunen
                   ` (15 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: loreb @ 2022-05-04 15:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 342 bytes --]

New comment by loreb on void-packages repository

https://github.com/void-linux/void-packages/pull/36204#issuecomment-1117485579

Comment:
Are the problems still there with 1.79 proper (not beta1)? A quick "diff -r" says there are plenty of differences between the two, but my laptop is almost certainly too weak to try to compile it myself.

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] boost: update to 1.79.0.b1.
  2022-03-18 14:28 [PR PATCH] boost: update to 1.79.0.b1 JamiKettunen
                   ` (12 preceding siblings ...)
  2022-05-04 15:22 ` loreb
@ 2022-05-26 15:22 ` JamiKettunen
  2022-05-26 15:29 ` [PR PATCH] [Updated] boost: update to 1.79.0 JamiKettunen
                   ` (14 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: JamiKettunen @ 2022-05-26 15:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3548 bytes --]

There is an updated pull request by JamiKettunen against master on the void-packages repository

https://github.com/JamiKettunen/void-packages boost-1.79.0
https://github.com/void-linux/void-packages/pull/36204

boost: update to 1.79.0.b1.
#### Packages to fix (as locally build-tested on `x86_64-musl`)
- [ ] Aegisub (fails on `do_build()`)
- [ ] PrusaSlicer (fails on `do_build()`)
- [ ] TSC (fails on `do_build()`)
- [ ] bitcoin (fails on `do_check()`)
- [ ] openimageio (fails on `pre_build()`, `vsed` doesn't change `src/cmake/compiler.cmake`)
  - [ ] blender (depends on `openimageio`)
- [ ] cryfs (fails on `do_build()`)
- [ ] leatherman (hangs on `do_check()`, test process pinned one core at 100% for 10 minutes)
  - [ ] facter (depends on `leatherman`)
- [ ] fifengine (fails on `do_build()`)
- [ ] uhd (fails on `do_build()`)
  - [ ] gnuradio (depends on `uhd`)
    - [ ] gnuradio-osmosdr (depends on `gnuradio`)
- [ ] imagescan (fails on `do_build()`)
- [ ] inkscape (fails on `do_check()`)
- [ ] kea (fails on `do_build()`)
- [ ] ledger (fails on `do_build()`)
- [ ] libbitcoin-system (fails on `do_build()`)
  - [ ] libbitcoin-database (depends on `libbitcoin-system`)
    - [ ] libbitcoin-blockchain (depends on `libbitcoin-database`)
      - [ ] libbitcoin-node (depends on `libbitcoin-blockchain`)
      - [ ] libbitcoin-server (depends on `libbitcoin-blockchain`)
  - [ ] libbitcoin-protocol (depends on `libbitcoin-system`)
    - [ ] libbitcoin-client (depends on `libbitcoin-protocol`)
      - [ ] libbitcoin-explorer (depends on `libbitcoin-client`)
  - [ ] libbitcoin-network (depends on `libbitcoin-system`)
- [ ] libetonyek (fails on `do_build()`, appears to need `-std=c++17` or higher? `NUM3Parser.cpp:46:8: error: 'for_each' is not a member of 'std'`)
  - [ ] libreoffice (depends on `libetonyek`)
- [ ] librime (fails on `do_build()`)
- [ ] libtorrent-rasterbar (hangs on `do_check()`, 90/97 test_web_seed_http stuck for 10 minutes)
- [ ] namecoin (fails on `do_build()`)
- [ ] pulseeffects-legacy (fails on `do_build()`)
- [ ] schroot (fails on `do_check()`)
- [ ] supercollider (fails on `do_build()`)
- [ ] swiften (do_patch, `fix-cross-build.patch` doesn't apply)

#### Modified patches
`exec_file.patch`: Removed due to being upstream as https://github.com/boostorg/python/commit/d9f06052e28873037db7f98629bce72182a42410
`mips.patch`: Updated to apply on top of https://github.com/boostorg/fiber/commit/5dc9dabc5d5ff8da53ec897c265c9cba1b6ed0df, not sure if this can be removed now(?)

#### Misc changes
- I've renamed all subpackages of `boost` so that the versioned name doesn't conflict with other numbers and are consistent with the previously existing `boost-python3-1.72`, e.g. `libboost_math_c991.72` is now `libboost_math_c99-1.79` (notice the `-`!)

#### Testing the changes
- I tested the changes in this PR: **NO**

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36204.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boost-1.79.0-36204.patch --]
[-- Type: text/x-diff, Size: 41569 bytes --]

From d806b7c68d6d8c0a4073ce607fb91e4e294027a7 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 15:28:37 +0200
Subject: [PATCH 1/2] boost: update to 1.79.0.

---
 common/shlibs                                 |  64 +++----
 .../{boost-python1.72 => boost-python1.79}    |   0
 ...{boost-python3-1.72 => boost-python3-1.79} |   0
 srcpkgs/boost/patches/exec_file.patch         |  45 -----
 srcpkgs/boost/patches/mips.patch              |   2 +-
 srcpkgs/boost/template                        | 161 +++++++++---------
 ...ibboost_atomic1.72 => libboost_atomic1.79} |   0
 ...ibboost_chrono1.72 => libboost_chrono1.79} |   0
 ...t_container1.72 => libboost_container1.79} |   0
 ...boost_context1.72 => libboost_context1.79} |   0
 ...ost_contract1.72 => libboost_contract1.79} |   0
 ...t_coroutine1.72 => libboost_coroutine1.79} |   0
 ...t_date_time1.72 => libboost_date_time1.79} |   0
 ...{libboost_fiber1.72 => libboost_fiber1.79} |   0
 ...filesystem1.72 => libboost_filesystem1.79} |   0
 ...{libboost_graph1.72 => libboost_graph1.79} |   0
 ...t_iostreams1.72 => libboost_iostreams1.79} |   0
 ...{libboost_locale1.72 => libboost_json1.79} |   0
 .../{libboost_log1.72 => libboost_locale1.79} |   0
 ...ibboost_log_setup1.72 => libboost_log1.79} |   0
 ...st_math_c991.72 => libboost_log_setup1.79} |   0
 ...t_math_c99f1.72 => libboost_math_c99-1.79} |   0
 ...t_math_c99l1.72 => libboost_math_c99f1.79} |   0
 ...st_math_tr11.72 => libboost_math_c99l1.79} |   0
 ...t_math_tr1f1.72 => libboost_math_tr1-1.79} |   0
 ...t_math_tr1l1.72 => libboost_math_tr1f1.79} |   0
 ...xec_monitor1.72 => libboost_math_tr1l1.79} |   0
 ...rogram_options1.72 => libboost_nowide1.79} |   0
 ...ndom1.72 => libboost_prg_exec_monitor1.79} |   0
 ...regex1.72 => libboost_program_options1.79} |   0
 ..._serialization1.72 => libboost_random1.79} |   0
 ...trace_addr2line1.72 => libboost_regex1.79} |   0
 ...e_basic1.72 => libboost_serialization1.79} |   0
 ...1.72 => libboost_stacktrace_addr2line1.79} |   0
 ...stem1.72 => libboost_stacktrace_basic1.79} |   0
 ...hread1.72 => libboost_stacktrace_noop1.79} |   0
 ...libboost_timer1.72 => libboost_system1.79} |   0
 ...t_type_erasure1.72 => libboost_thread1.79} |   0
 ..._test_framework1.72 => libboost_timer1.79} |   0
 ...ost_wave1.72 => libboost_type_erasure1.79} |   0
 ...n1.72 => libboost_unit_test_framework1.79} |   0
 srcpkgs/libboost_wave1.79                     |   1 +
 srcpkgs/libboost_wserialization1.79           |   1 +
 43 files changed, 113 insertions(+), 161 deletions(-)
 rename srcpkgs/{boost-python1.72 => boost-python1.79} (100%)
 rename srcpkgs/{boost-python3-1.72 => boost-python3-1.79} (100%)
 delete mode 100644 srcpkgs/boost/patches/exec_file.patch
 rename srcpkgs/{libboost_atomic1.72 => libboost_atomic1.79} (100%)
 rename srcpkgs/{libboost_chrono1.72 => libboost_chrono1.79} (100%)
 rename srcpkgs/{libboost_container1.72 => libboost_container1.79} (100%)
 rename srcpkgs/{libboost_context1.72 => libboost_context1.79} (100%)
 rename srcpkgs/{libboost_contract1.72 => libboost_contract1.79} (100%)
 rename srcpkgs/{libboost_coroutine1.72 => libboost_coroutine1.79} (100%)
 rename srcpkgs/{libboost_date_time1.72 => libboost_date_time1.79} (100%)
 rename srcpkgs/{libboost_fiber1.72 => libboost_fiber1.79} (100%)
 rename srcpkgs/{libboost_filesystem1.72 => libboost_filesystem1.79} (100%)
 rename srcpkgs/{libboost_graph1.72 => libboost_graph1.79} (100%)
 rename srcpkgs/{libboost_iostreams1.72 => libboost_iostreams1.79} (100%)
 rename srcpkgs/{libboost_locale1.72 => libboost_json1.79} (100%)
 rename srcpkgs/{libboost_log1.72 => libboost_locale1.79} (100%)
 rename srcpkgs/{libboost_log_setup1.72 => libboost_log1.79} (100%)
 rename srcpkgs/{libboost_math_c991.72 => libboost_log_setup1.79} (100%)
 rename srcpkgs/{libboost_math_c99f1.72 => libboost_math_c99-1.79} (100%)
 rename srcpkgs/{libboost_math_c99l1.72 => libboost_math_c99f1.79} (100%)
 rename srcpkgs/{libboost_math_tr11.72 => libboost_math_c99l1.79} (100%)
 rename srcpkgs/{libboost_math_tr1f1.72 => libboost_math_tr1-1.79} (100%)
 rename srcpkgs/{libboost_math_tr1l1.72 => libboost_math_tr1f1.79} (100%)
 rename srcpkgs/{libboost_prg_exec_monitor1.72 => libboost_math_tr1l1.79} (100%)
 rename srcpkgs/{libboost_program_options1.72 => libboost_nowide1.79} (100%)
 rename srcpkgs/{libboost_random1.72 => libboost_prg_exec_monitor1.79} (100%)
 rename srcpkgs/{libboost_regex1.72 => libboost_program_options1.79} (100%)
 rename srcpkgs/{libboost_serialization1.72 => libboost_random1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_addr2line1.72 => libboost_regex1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_basic1.72 => libboost_serialization1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_noop1.72 => libboost_stacktrace_addr2line1.79} (100%)
 rename srcpkgs/{libboost_system1.72 => libboost_stacktrace_basic1.79} (100%)
 rename srcpkgs/{libboost_thread1.72 => libboost_stacktrace_noop1.79} (100%)
 rename srcpkgs/{libboost_timer1.72 => libboost_system1.79} (100%)
 rename srcpkgs/{libboost_type_erasure1.72 => libboost_thread1.79} (100%)
 rename srcpkgs/{libboost_unit_test_framework1.72 => libboost_timer1.79} (100%)
 rename srcpkgs/{libboost_wave1.72 => libboost_type_erasure1.79} (100%)
 rename srcpkgs/{libboost_wserialization1.72 => libboost_unit_test_framework1.79} (100%)
 create mode 120000 srcpkgs/libboost_wave1.79
 create mode 120000 srcpkgs/libboost_wserialization1.79

diff --git a/common/shlibs b/common/shlibs
index 9fd62e7c1baf..bb418cdfc245 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -620,38 +620,38 @@ 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.79.0 libboost_context1.79-1.79.0_1
+libboost_coroutine.so.1.79.0 libboost_coroutine1.79-1.79.0_1
+libboost_container.so.1.79.0 libboost_container1.79-1.79.0_1
+libboost_prg_exec_monitor.so.1.79.0 libboost_prg_exec_monitor1.79-1.79.0_1
+libboost_timer.so.1.79.0 libboost_timer1.79-1.79.0_1
+libboost_random.so.1.79.0 libboost_random1.79-1.79.0_1
+libboost_filesystem.so.1.79.0 libboost_filesystem1.79-1.79.0_1
+libboost_unit_test_framework.so.1.79.0 libboost_unit_test_framework1.79-1.79.0_1
+libboost_math_c99.so.1.79.0 libboost_math_c99-1.79-1.79.0_1
+libboost_math_tr1.so.1.79.0 libboost_math_tr1-1.79-1.79.0_1
+libboost_regex.so.1.79.0 libboost_regex1.79-1.79.0_1
+libboost_serialization.so.1.79.0 libboost_serialization1.79-1.79.0_1
+libboost_chrono.so.1.79.0 libboost_chrono1.79-1.79.0_1
+libboost_wserialization.so.1.79.0 libboost_wserialization1.79-1.79.0_1
+libboost_graph.so.1.79.0 libboost_graph1.79-1.79.0_1
+libboost_log.so.1.79.0 libboost_log1.79-1.79.0_1
+libboost_locale.so.1.79.0 libboost_locale1.79-1.79.0_1
+libboost_program_options.so.1.79.0 libboost_program_options1.79-1.79.0_1
+libboost_iostreams.so.1.79.0 libboost_iostreams1.79-1.79.0_1
+libboost_system.so.1.79.0 libboost_system1.79-1.79.0_1
+libboost_thread.so.1.79.0 libboost_thread1.79-1.79.0_1
+libboost_log_setup.so.1.79.0 libboost_log_setup1.79-1.79.0_1
+libboost_date_time.so.1.79.0 libboost_date_time1.79-1.79.0_1
+libboost_wave.so.1.79.0 libboost_wave1.79-1.79.0_1
+libboost_atomic.so.1.79.0 libboost_atomic1.79-1.79.0_1
+libboost_type_erasure.so.1.79.0 libboost_type_erasure1.79-1.79.0_1
+libboost_fiber.so.1.79.0 libboost_fiber1.79-1.79.0_1
+libboost_stacktrace_noop.so.1.79.0 libboost_stacktrace_noop1.79-1.79.0_1
+libboost_stacktrace_addr2line.so.1.79.0 libboost_stacktrace_addr2line1.79-1.79.0_1
+libboost_stacktrace_basic.so.1.79.0 libboost_stacktrace_basic1.79-1.79.0_1
+libboost_python27.so.1.79.0 boost-python1.79-1.79.0_1
+libboost_python310.so.1.79.0 boost-python3-1.79-1.79.0_1
 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-python1.79
similarity index 100%
rename from srcpkgs/boost-python1.72
rename to srcpkgs/boost-python1.79
diff --git a/srcpkgs/boost-python3-1.72 b/srcpkgs/boost-python3-1.79
similarity index 100%
rename from srcpkgs/boost-python3-1.72
rename to srcpkgs/boost-python3-1.79
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/mips.patch b/srcpkgs/boost/patches/mips.patch
index a10a2122d9c7..8d253fc7c286 100644
--- a/srcpkgs/boost/patches/mips.patch
+++ b/srcpkgs/boost/patches/mips.patch
@@ -3,7 +3,7 @@
 @@ -48,7 +48,7 @@
  #  define cpu_relax() asm volatile ("nop" ::: "memory");
  # endif
- #elif BOOST_ARCH_MIPS
+ #elif BOOST_ARCH_MIPS && (((__mips_isa_rev > 1) && defined(__mips32)) || ((__mips_isa_rev > 2)  && defined(__mips64)))
 -# define cpu_relax() asm volatile ("pause" ::: "memory");
 +# define cpu_relax() asm volatile ("nop" ::: "memory");
  #elif BOOST_ARCH_PPC
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 126c50770b50..ad705311b867 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,8 +1,8 @@
 # Template file for 'boost'
 pkgname=boost
-version=1.72.0
-revision=7
-wrksrc="${pkgname}_${version//\./_}"
+version=1.79.0
+revision=1
+wrksrc="boost_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
 short_desc="Free peer-reviewed portable C++ source libraries"
@@ -10,53 +10,34 @@ 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=475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39
 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"
+subpackages="libboost_program_options1.79 libboost_math_c99f1.79
+ libboost_stacktrace_basic1.79 libboost_stacktrace_noop1.79
+ libboost_iostreams1.79 libboost_math_tr1l1.79 libboost_filesystem1.79
+ libboost_chrono1.79 libboost_math_tr1f1.79 libboost_wave1.79
+ libboost_graph1.79 libboost_locale1.79 libboost_regex1.79
+ libboost_fiber1.79 libboost_type_erasure1.79 libboost_coroutine1.79
+ libboost_atomic1.79 libboost_prg_exec_monitor1.79 libboost_math_c99-1.79
+ boost-python3-1.79 libboost_log_setup1.79 boost-devel
+ libboost_timer1.79 libboost_system1.79 libboost_unit_test_framework1.79
+ libboost_serialization1.79 libboost_math_tr1-1.79 boost-build
+ libboost_math_c99l1.79 boost-python1.79 libboost_contract1.79
+ libboost_date_time1.79 libboost_log1.79 libboost_random1.79
+ libboost_thread1.79 libboost_container1.79 boost-jam
+ libboost_wserialization1.79 libboost_context1.79 libboost_json1.79
+ libboost_nowide1.79"
 
 if [ -z "$CROSS_BUILD" ]; then
-	subpackages+=" libboost_stacktrace_addr2line1.72"
+	subpackages+=" libboost_stacktrace_addr2line1.79"
 fi
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*)    _arch=x86;      _abi=sysv  ;;
-	x86_64*)  _arch=x86;      _abi=sysv  ;;
-	arm*)     _arch=arm;      _abi=aapcs ;;
-	aarch64*) _arch=arm;      _abi=aapcs ;;
-	mips*)    _arch=mips32r2; _abi=o32   ;;
-	ppc*)     _arch=power;    _abi=sysv  ;;
+	i686*|x86_64*) _arch=x86;      _abi=sysv  ;;
+	arm*|aarch64*) _arch=arm;      _abi=aapcs ;;
+	mips*)         _arch=mips32r2; _abi=o32   ;;
+	ppc*)          _arch=power;    _abi=sysv  ;;
 esac
 
 do_build() {
@@ -66,7 +47,7 @@ do_build() {
 	(
 	# Rebuild bjam for target
 	cd tools/build/src/engine
-	./build.sh gcc
+	./build.sh --cxx="${CXX}" --cxxflags="${CXXFLAGS}" gcc
 	)
 	cat > user-config.jam <<-__EOF
 	using gcc : : ${CXX} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
@@ -74,10 +55,8 @@ do_build() {
 	using python : ${py3_ver} : ${XBPS_CROSS_BASE}/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} \
 		threading=multi runtime-link=shared link=shared,static
 }
@@ -119,7 +98,7 @@ boost-jam_package() {
 		vmove usr/bin/b2
 	}
 }
-boost-python1.72_package() {
+boost-python1.79_package() {
 	depends="boost python"
 	replaces="boost-python>=0"
 	short_desc+=" - Python bindings"
@@ -127,7 +106,7 @@ boost-python1.72_package() {
 		vmove "usr/lib/libboost_python2*.so.*"
 	}
 }
-boost-python3-1.72_package() {
+boost-python3-1.79_package() {
 	depends="boost python3"
 	replaces="boost-python3>=0"
 	short_desc+=" - Python3 bindings"
@@ -154,7 +133,7 @@ boost-devel_package() {
 	}
 }
 
-libboost_atomic1.72_package() {
+libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
@@ -162,7 +141,7 @@ libboost_atomic1.72_package() {
 	}
 }
 
-libboost_chrono1.72_package() {
+libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
@@ -170,7 +149,7 @@ libboost_chrono1.72_package() {
 	}
 }
 
-libboost_container1.72_package() {
+libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
@@ -178,7 +157,7 @@ libboost_container1.72_package() {
 	}
 }
 
-libboost_context1.72_package() {
+libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
@@ -186,7 +165,7 @@ libboost_context1.72_package() {
 	}
 }
 
-libboost_contract1.72_package() {
+libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
@@ -194,7 +173,7 @@ libboost_contract1.72_package() {
 	}
 }
 
-libboost_coroutine1.72_package() {
+libboost_coroutine1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
@@ -202,7 +181,7 @@ libboost_coroutine1.72_package() {
 	}
 }
 
-libboost_date_time1.72_package() {
+libboost_date_time1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
@@ -210,7 +189,7 @@ libboost_date_time1.72_package() {
 	}
 }
 
-libboost_fiber1.72_package() {
+libboost_fiber1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_fiber"
 	pkg_install() {
@@ -218,7 +197,7 @@ libboost_fiber1.72_package() {
 	}
 }
 
-libboost_filesystem1.72_package() {
+libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
@@ -226,7 +205,7 @@ libboost_filesystem1.72_package() {
 	}
 }
 
-libboost_graph1.72_package() {
+libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
@@ -234,7 +213,7 @@ libboost_graph1.72_package() {
 	}
 }
 
-libboost_iostreams1.72_package() {
+libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
@@ -242,7 +221,7 @@ libboost_iostreams1.72_package() {
 	}
 }
 
-libboost_locale1.72_package() {
+libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
@@ -250,7 +229,7 @@ libboost_locale1.72_package() {
 	}
 }
 
-libboost_log1.72_package() {
+libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
@@ -258,7 +237,7 @@ libboost_log1.72_package() {
 	}
 }
 
-libboost_log_setup1.72_package() {
+libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
@@ -266,7 +245,7 @@ libboost_log_setup1.72_package() {
 	}
 }
 
-libboost_math_c991.72_package() {
+libboost_math_c99-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
@@ -274,7 +253,7 @@ libboost_math_c991.72_package() {
 	}
 }
 
-libboost_math_c99f1.72_package() {
+libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
@@ -282,7 +261,7 @@ libboost_math_c99f1.72_package() {
 	}
 }
 
-libboost_math_c99l1.72_package() {
+libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
@@ -290,7 +269,7 @@ libboost_math_c99l1.72_package() {
 	}
 }
 
-libboost_math_tr11.72_package() {
+libboost_math_tr1-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
@@ -298,7 +277,7 @@ libboost_math_tr11.72_package() {
 	}
 }
 
-libboost_math_tr1f1.72_package() {
+libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
@@ -306,7 +285,7 @@ libboost_math_tr1f1.72_package() {
 	}
 }
 
-libboost_math_tr1l1.72_package() {
+libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
@@ -314,7 +293,7 @@ libboost_math_tr1l1.72_package() {
 	}
 }
 
-libboost_prg_exec_monitor1.72_package() {
+libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
@@ -322,7 +301,7 @@ libboost_prg_exec_monitor1.72_package() {
 	}
 }
 
-libboost_program_options1.72_package() {
+libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
@@ -330,7 +309,7 @@ libboost_program_options1.72_package() {
 	}
 }
 
-libboost_random1.72_package() {
+libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
@@ -338,7 +317,7 @@ libboost_random1.72_package() {
 	}
 }
 
-libboost_regex1.72_package() {
+libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
@@ -346,7 +325,7 @@ libboost_regex1.72_package() {
 	}
 }
 
-libboost_serialization1.72_package() {
+libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
@@ -354,7 +333,7 @@ libboost_serialization1.72_package() {
 	}
 }
 
-libboost_stacktrace_addr2line1.72_package() {
+libboost_stacktrace_addr2line1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_addr2line"
 	pkg_install() {
@@ -362,7 +341,7 @@ libboost_stacktrace_addr2line1.72_package() {
 	}
 }
 
-libboost_stacktrace_basic1.72_package() {
+libboost_stacktrace_basic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_basic"
 	pkg_install() {
@@ -370,7 +349,7 @@ libboost_stacktrace_basic1.72_package() {
 	}
 }
 
-libboost_stacktrace_noop1.72_package() {
+libboost_stacktrace_noop1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_noop"
 	pkg_install() {
@@ -378,7 +357,7 @@ libboost_stacktrace_noop1.72_package() {
 	}
 }
 
-libboost_system1.72_package() {
+libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
@@ -386,7 +365,7 @@ libboost_system1.72_package() {
 	}
 }
 
-libboost_thread1.72_package() {
+libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
@@ -394,7 +373,7 @@ libboost_thread1.72_package() {
 	}
 }
 
-libboost_timer1.72_package() {
+libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
@@ -402,7 +381,7 @@ libboost_timer1.72_package() {
 	}
 }
 
-libboost_type_erasure1.72_package() {
+libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
@@ -410,7 +389,7 @@ libboost_type_erasure1.72_package() {
 	}
 }
 
-libboost_unit_test_framework1.72_package() {
+libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
@@ -418,7 +397,7 @@ libboost_unit_test_framework1.72_package() {
 	}
 }
 
-libboost_wave1.72_package() {
+libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
@@ -426,10 +405,26 @@ libboost_wave1.72_package() {
 	}
 }
 
-libboost_wserialization1.72_package() {
+libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
 		vmove usr/lib/libboost_wserialization.so.*
 	}
 }
+
+libboost_json1.79_package() {
+	depends="boost"
+	short_desc+=" - libboost_json"
+	pkg_install() {
+		vmove "usr/lib/libboost_json.so.*"
+	}
+}
+
+libboost_nowide1.79_package() {
+	depends="boost"
+	short_desc+=" - libboost_nowide"
+	pkg_install() {
+		vmove "usr/lib/libboost_nowide.so.*"
+	}
+}
diff --git a/srcpkgs/libboost_atomic1.72 b/srcpkgs/libboost_atomic1.79
similarity index 100%
rename from srcpkgs/libboost_atomic1.72
rename to srcpkgs/libboost_atomic1.79
diff --git a/srcpkgs/libboost_chrono1.72 b/srcpkgs/libboost_chrono1.79
similarity index 100%
rename from srcpkgs/libboost_chrono1.72
rename to srcpkgs/libboost_chrono1.79
diff --git a/srcpkgs/libboost_container1.72 b/srcpkgs/libboost_container1.79
similarity index 100%
rename from srcpkgs/libboost_container1.72
rename to srcpkgs/libboost_container1.79
diff --git a/srcpkgs/libboost_context1.72 b/srcpkgs/libboost_context1.79
similarity index 100%
rename from srcpkgs/libboost_context1.72
rename to srcpkgs/libboost_context1.79
diff --git a/srcpkgs/libboost_contract1.72 b/srcpkgs/libboost_contract1.79
similarity index 100%
rename from srcpkgs/libboost_contract1.72
rename to srcpkgs/libboost_contract1.79
diff --git a/srcpkgs/libboost_coroutine1.72 b/srcpkgs/libboost_coroutine1.79
similarity index 100%
rename from srcpkgs/libboost_coroutine1.72
rename to srcpkgs/libboost_coroutine1.79
diff --git a/srcpkgs/libboost_date_time1.72 b/srcpkgs/libboost_date_time1.79
similarity index 100%
rename from srcpkgs/libboost_date_time1.72
rename to srcpkgs/libboost_date_time1.79
diff --git a/srcpkgs/libboost_fiber1.72 b/srcpkgs/libboost_fiber1.79
similarity index 100%
rename from srcpkgs/libboost_fiber1.72
rename to srcpkgs/libboost_fiber1.79
diff --git a/srcpkgs/libboost_filesystem1.72 b/srcpkgs/libboost_filesystem1.79
similarity index 100%
rename from srcpkgs/libboost_filesystem1.72
rename to srcpkgs/libboost_filesystem1.79
diff --git a/srcpkgs/libboost_graph1.72 b/srcpkgs/libboost_graph1.79
similarity index 100%
rename from srcpkgs/libboost_graph1.72
rename to srcpkgs/libboost_graph1.79
diff --git a/srcpkgs/libboost_iostreams1.72 b/srcpkgs/libboost_iostreams1.79
similarity index 100%
rename from srcpkgs/libboost_iostreams1.72
rename to srcpkgs/libboost_iostreams1.79
diff --git a/srcpkgs/libboost_locale1.72 b/srcpkgs/libboost_json1.79
similarity index 100%
rename from srcpkgs/libboost_locale1.72
rename to srcpkgs/libboost_json1.79
diff --git a/srcpkgs/libboost_log1.72 b/srcpkgs/libboost_locale1.79
similarity index 100%
rename from srcpkgs/libboost_log1.72
rename to srcpkgs/libboost_locale1.79
diff --git a/srcpkgs/libboost_log_setup1.72 b/srcpkgs/libboost_log1.79
similarity index 100%
rename from srcpkgs/libboost_log_setup1.72
rename to srcpkgs/libboost_log1.79
diff --git a/srcpkgs/libboost_math_c991.72 b/srcpkgs/libboost_log_setup1.79
similarity index 100%
rename from srcpkgs/libboost_math_c991.72
rename to srcpkgs/libboost_log_setup1.79
diff --git a/srcpkgs/libboost_math_c99f1.72 b/srcpkgs/libboost_math_c99-1.79
similarity index 100%
rename from srcpkgs/libboost_math_c99f1.72
rename to srcpkgs/libboost_math_c99-1.79
diff --git a/srcpkgs/libboost_math_c99l1.72 b/srcpkgs/libboost_math_c99f1.79
similarity index 100%
rename from srcpkgs/libboost_math_c99l1.72
rename to srcpkgs/libboost_math_c99f1.79
diff --git a/srcpkgs/libboost_math_tr11.72 b/srcpkgs/libboost_math_c99l1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr11.72
rename to srcpkgs/libboost_math_c99l1.79
diff --git a/srcpkgs/libboost_math_tr1f1.72 b/srcpkgs/libboost_math_tr1-1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1f1.72
rename to srcpkgs/libboost_math_tr1-1.79
diff --git a/srcpkgs/libboost_math_tr1l1.72 b/srcpkgs/libboost_math_tr1f1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1l1.72
rename to srcpkgs/libboost_math_tr1f1.79
diff --git a/srcpkgs/libboost_prg_exec_monitor1.72 b/srcpkgs/libboost_math_tr1l1.79
similarity index 100%
rename from srcpkgs/libboost_prg_exec_monitor1.72
rename to srcpkgs/libboost_math_tr1l1.79
diff --git a/srcpkgs/libboost_program_options1.72 b/srcpkgs/libboost_nowide1.79
similarity index 100%
rename from srcpkgs/libboost_program_options1.72
rename to srcpkgs/libboost_nowide1.79
diff --git a/srcpkgs/libboost_random1.72 b/srcpkgs/libboost_prg_exec_monitor1.79
similarity index 100%
rename from srcpkgs/libboost_random1.72
rename to srcpkgs/libboost_prg_exec_monitor1.79
diff --git a/srcpkgs/libboost_regex1.72 b/srcpkgs/libboost_program_options1.79
similarity index 100%
rename from srcpkgs/libboost_regex1.72
rename to srcpkgs/libboost_program_options1.79
diff --git a/srcpkgs/libboost_serialization1.72 b/srcpkgs/libboost_random1.79
similarity index 100%
rename from srcpkgs/libboost_serialization1.72
rename to srcpkgs/libboost_random1.79
diff --git a/srcpkgs/libboost_stacktrace_addr2line1.72 b/srcpkgs/libboost_regex1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_addr2line1.72
rename to srcpkgs/libboost_regex1.79
diff --git a/srcpkgs/libboost_stacktrace_basic1.72 b/srcpkgs/libboost_serialization1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_basic1.72
rename to srcpkgs/libboost_serialization1.79
diff --git a/srcpkgs/libboost_stacktrace_noop1.72 b/srcpkgs/libboost_stacktrace_addr2line1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_noop1.72
rename to srcpkgs/libboost_stacktrace_addr2line1.79
diff --git a/srcpkgs/libboost_system1.72 b/srcpkgs/libboost_stacktrace_basic1.79
similarity index 100%
rename from srcpkgs/libboost_system1.72
rename to srcpkgs/libboost_stacktrace_basic1.79
diff --git a/srcpkgs/libboost_thread1.72 b/srcpkgs/libboost_stacktrace_noop1.79
similarity index 100%
rename from srcpkgs/libboost_thread1.72
rename to srcpkgs/libboost_stacktrace_noop1.79
diff --git a/srcpkgs/libboost_timer1.72 b/srcpkgs/libboost_system1.79
similarity index 100%
rename from srcpkgs/libboost_timer1.72
rename to srcpkgs/libboost_system1.79
diff --git a/srcpkgs/libboost_type_erasure1.72 b/srcpkgs/libboost_thread1.79
similarity index 100%
rename from srcpkgs/libboost_type_erasure1.72
rename to srcpkgs/libboost_thread1.79
diff --git a/srcpkgs/libboost_unit_test_framework1.72 b/srcpkgs/libboost_timer1.79
similarity index 100%
rename from srcpkgs/libboost_unit_test_framework1.72
rename to srcpkgs/libboost_timer1.79
diff --git a/srcpkgs/libboost_wave1.72 b/srcpkgs/libboost_type_erasure1.79
similarity index 100%
rename from srcpkgs/libboost_wave1.72
rename to srcpkgs/libboost_type_erasure1.79
diff --git a/srcpkgs/libboost_wserialization1.72 b/srcpkgs/libboost_unit_test_framework1.79
similarity index 100%
rename from srcpkgs/libboost_wserialization1.72
rename to srcpkgs/libboost_unit_test_framework1.79
diff --git a/srcpkgs/libboost_wave1.79 b/srcpkgs/libboost_wave1.79
new file mode 120000
index 000000000000..baef819c48f6
--- /dev/null
+++ b/srcpkgs/libboost_wave1.79
@@ -0,0 +1 @@
+boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_wserialization1.79 b/srcpkgs/libboost_wserialization1.79
new file mode 120000
index 000000000000..baef819c48f6
--- /dev/null
+++ b/srcpkgs/libboost_wserialization1.79
@@ -0,0 +1 @@
+boost
\ No newline at end of file

From 52cb0d9b49cae345f203af24efa07d24d6bdd98a Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 18:29:05 +0200
Subject: [PATCH 2/2] boost: quote all vmove's with a glob.

---
 srcpkgs/boost/template | 70 +++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index ad705311b867..7a9c1c33fa44 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -137,7 +137,7 @@ libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
-		vmove usr/lib/libboost_atomic.so.*
+		vmove "usr/lib/libboost_atomic.so.*"
 	}
 }
 
@@ -145,7 +145,7 @@ libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
-		vmove usr/lib/libboost_chrono.so.*
+		vmove "usr/lib/libboost_chrono.so.*"
 	}
 }
 
@@ -153,7 +153,7 @@ libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
-		vmove usr/lib/libboost_container.so.*
+		vmove "usr/lib/libboost_container.so.*"
 	}
 }
 
@@ -161,7 +161,7 @@ libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
-		vmove usr/lib/libboost_context.so.*
+		vmove "usr/lib/libboost_context.so.*"
 	}
 }
 
@@ -169,7 +169,7 @@ libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
-		vmove usr/lib/libboost_contract.so.*
+		vmove "usr/lib/libboost_contract.so.*"
 	}
 }
 
@@ -177,7 +177,7 @@ libboost_coroutine1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
-		vmove usr/lib/libboost_coroutine.so.*
+		vmove "usr/lib/libboost_coroutine.so.*"
 	}
 }
 
@@ -185,7 +185,7 @@ libboost_date_time1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
-		vmove usr/lib/libboost_date_time.so.*
+		vmove "usr/lib/libboost_date_time.so.*"
 	}
 }
 
@@ -193,7 +193,7 @@ libboost_fiber1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_fiber"
 	pkg_install() {
-		vmove usr/lib/libboost_fiber.so.*
+		vmove "usr/lib/libboost_fiber.so.*"
 	}
 }
 
@@ -201,7 +201,7 @@ libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
-		vmove usr/lib/libboost_filesystem.so.*
+		vmove "usr/lib/libboost_filesystem.so.*"
 	}
 }
 
@@ -209,7 +209,7 @@ libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
-		vmove usr/lib/libboost_graph.so.*
+		vmove "usr/lib/libboost_graph.so.*"
 	}
 }
 
@@ -217,7 +217,7 @@ libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
-		vmove usr/lib/libboost_iostreams.so.*
+		vmove "usr/lib/libboost_iostreams.so.*"
 	}
 }
 
@@ -225,7 +225,7 @@ libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
-		vmove usr/lib/libboost_locale.so.*
+		vmove "usr/lib/libboost_locale.so.*"
 	}
 }
 
@@ -233,7 +233,7 @@ libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
-		vmove usr/lib/libboost_log.so.*
+		vmove "usr/lib/libboost_log.so.*"
 	}
 }
 
@@ -241,7 +241,7 @@ libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
-		vmove usr/lib/libboost_log_setup.so.*
+		vmove "usr/lib/libboost_log_setup.so.*"
 	}
 }
 
@@ -249,7 +249,7 @@ libboost_math_c99-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99.so.*
+		vmove "usr/lib/libboost_math_c99.so.*"
 	}
 }
 
@@ -257,7 +257,7 @@ libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99f.so.*
+		vmove "usr/lib/libboost_math_c99f.so.*"
 	}
 }
 
@@ -265,7 +265,7 @@ libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99l.so.*
+		vmove "usr/lib/libboost_math_c99l.so.*"
 	}
 }
 
@@ -273,7 +273,7 @@ libboost_math_tr1-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1.so.*
+		vmove "usr/lib/libboost_math_tr1.so.*"
 	}
 }
 
@@ -281,7 +281,7 @@ libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1f.so.*
+		vmove "usr/lib/libboost_math_tr1f.so.*"
 	}
 }
 
@@ -289,7 +289,7 @@ libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1l.so.*
+		vmove "usr/lib/libboost_math_tr1l.so.*"
 	}
 }
 
@@ -297,7 +297,7 @@ libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
-		vmove usr/lib/libboost_prg_exec_monitor.so.*
+		vmove "usr/lib/libboost_prg_exec_monitor.so.*"
 	}
 }
 
@@ -305,7 +305,7 @@ libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
-		vmove usr/lib/libboost_program_options.so.*
+		vmove "usr/lib/libboost_program_options.so.*"
 	}
 }
 
@@ -313,7 +313,7 @@ libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
-		vmove usr/lib/libboost_random.so.*
+		vmove "usr/lib/libboost_random.so.*"
 	}
 }
 
@@ -321,7 +321,7 @@ libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
-		vmove usr/lib/libboost_regex.so.*
+		vmove "usr/lib/libboost_regex.so.*"
 	}
 }
 
@@ -329,7 +329,7 @@ libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
-		vmove usr/lib/libboost_serialization.so.*
+		vmove "usr/lib/libboost_serialization.so.*"
 	}
 }
 
@@ -337,7 +337,7 @@ libboost_stacktrace_addr2line1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_addr2line"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_addr2line.so.*
+		vmove "usr/lib/libboost_stacktrace_addr2line.so.*"
 	}
 }
 
@@ -345,7 +345,7 @@ libboost_stacktrace_basic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_basic"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_basic.so.*
+		vmove "usr/lib/libboost_stacktrace_basic.so.*"
 	}
 }
 
@@ -353,7 +353,7 @@ libboost_stacktrace_noop1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_noop"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_noop.so.*
+		vmove "usr/lib/libboost_stacktrace_noop.so.*"
 	}
 }
 
@@ -361,7 +361,7 @@ libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
-		vmove usr/lib/libboost_system.so.*
+		vmove "usr/lib/libboost_system.so.*"
 	}
 }
 
@@ -369,7 +369,7 @@ libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
-		vmove usr/lib/libboost_thread.so.*
+		vmove "usr/lib/libboost_thread.so.*"
 	}
 }
 
@@ -377,7 +377,7 @@ libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
-		vmove usr/lib/libboost_timer.so.*
+		vmove "usr/lib/libboost_timer.so.*"
 	}
 }
 
@@ -385,7 +385,7 @@ libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
-		vmove usr/lib/libboost_type_erasure.so.*
+		vmove "usr/lib/libboost_type_erasure.so.*"
 	}
 }
 
@@ -393,7 +393,7 @@ libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
-		vmove usr/lib/libboost_unit_test_framework.so.*
+		vmove "usr/lib/libboost_unit_test_framework.so.*"
 	}
 }
 
@@ -401,7 +401,7 @@ libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
-		vmove usr/lib/libboost_wave.so.*
+		vmove "usr/lib/libboost_wave.so.*"
 	}
 }
 
@@ -409,7 +409,7 @@ libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
-		vmove usr/lib/libboost_wserialization.so.*
+		vmove "usr/lib/libboost_wserialization.so.*"
 	}
 }
 

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] boost: update to 1.79.0.
  2022-03-18 14:28 [PR PATCH] boost: update to 1.79.0.b1 JamiKettunen
                   ` (13 preceding siblings ...)
  2022-05-26 15:22 ` [PR PATCH] [Updated] " JamiKettunen
@ 2022-05-26 15:29 ` JamiKettunen
  2022-05-26 16:21 ` JamiKettunen
                   ` (13 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: JamiKettunen @ 2022-05-26 15:29 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3568 bytes --]

There is an updated pull request by JamiKettunen against master on the void-packages repository

https://github.com/JamiKettunen/void-packages boost-1.79.0
https://github.com/void-linux/void-packages/pull/36204

boost: update to 1.79.0.
#### Packages to fix (from `xrevshlib boost` as locally build-tested on `x86_64-musl`)
- [ ] Aegisub (fails on `do_build()`)
- [ ] PrusaSlicer (fails on `do_build()`)
- [ ] TSC (fails on `do_build()`)
- [ ] bitcoin (fails on `do_check()`)
- [ ] openimageio (fails on `pre_build()`, `vsed` doesn't change `src/cmake/compiler.cmake`)
  - [ ] blender (depends on `openimageio`)
- [ ] cryfs (fails on `do_build()`)
- [ ] leatherman (hangs on `do_check()`, test process pinned one core at 100% for 10 minutes)
  - [ ] facter (depends on `leatherman`)
- [ ] fifengine (fails on `do_build()`)
- [ ] uhd (fails on `do_build()`)
  - [ ] gnuradio (depends on `uhd`)
    - [ ] gnuradio-osmosdr (depends on `gnuradio`)
- [ ] imagescan (fails on `do_build()`)
- [ ] inkscape (fails on `do_check()`)
- [ ] kea (fails on `do_build()`)
- [ ] ledger (fails on `do_build()`)
- [ ] libbitcoin-system (fails on `do_build()`)
  - [ ] libbitcoin-database (depends on `libbitcoin-system`)
    - [ ] libbitcoin-blockchain (depends on `libbitcoin-database`)
      - [ ] libbitcoin-node (depends on `libbitcoin-blockchain`)
      - [ ] libbitcoin-server (depends on `libbitcoin-blockchain`)
  - [ ] libbitcoin-protocol (depends on `libbitcoin-system`)
    - [ ] libbitcoin-client (depends on `libbitcoin-protocol`)
      - [ ] libbitcoin-explorer (depends on `libbitcoin-client`)
  - [ ] libbitcoin-network (depends on `libbitcoin-system`)
- [ ] libetonyek (fails on `do_build()`, appears to need `-std=c++17` or higher? `NUM3Parser.cpp:46:8: error: 'for_each' is not a member of 'std'`)
  - [ ] libreoffice (depends on `libetonyek`)
- [ ] librime (fails on `do_build()`)
- [ ] libtorrent-rasterbar (hangs on `do_check()`, 90/97 test_web_seed_http stuck for 10 minutes)
- [ ] namecoin (fails on `do_build()`)
- [ ] pulseeffects-legacy (fails on `do_build()`)
- [ ] schroot (fails on `do_check()`)
- [ ] supercollider (fails on `do_build()`)
- [ ] swiften (do_patch, `fix-cross-build.patch` doesn't apply)

#### Modified patches
`exec_file.patch`: Removed due to being upstream as https://github.com/boostorg/python/commit/d9f06052e28873037db7f98629bce72182a42410
`mips.patch`: Updated to apply on top of https://github.com/boostorg/fiber/commit/5dc9dabc5d5ff8da53ec897c265c9cba1b6ed0df, not sure if this can be removed now(?)

#### Misc changes
- I've renamed all subpackages of `boost` so that the versioned name doesn't conflict with other numbers and are consistent with the previously existing `boost-python3-1.72`, e.g. `libboost_math_c991.72` is now `libboost_math_c99-1.79` (notice the `-`!)

#### Testing the changes
- I tested the changes in this PR: **NO**

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36204.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boost-1.79.0-36204.patch --]
[-- Type: text/x-diff, Size: 41599 bytes --]

From d806b7c68d6d8c0a4073ce607fb91e4e294027a7 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 15:28:37 +0200
Subject: [PATCH 1/2] boost: update to 1.79.0.

---
 common/shlibs                                 |  64 +++----
 .../{boost-python1.72 => boost-python1.79}    |   0
 ...{boost-python3-1.72 => boost-python3-1.79} |   0
 srcpkgs/boost/patches/exec_file.patch         |  45 -----
 srcpkgs/boost/patches/mips.patch              |   2 +-
 srcpkgs/boost/template                        | 161 +++++++++---------
 ...ibboost_atomic1.72 => libboost_atomic1.79} |   0
 ...ibboost_chrono1.72 => libboost_chrono1.79} |   0
 ...t_container1.72 => libboost_container1.79} |   0
 ...boost_context1.72 => libboost_context1.79} |   0
 ...ost_contract1.72 => libboost_contract1.79} |   0
 ...t_coroutine1.72 => libboost_coroutine1.79} |   0
 ...t_date_time1.72 => libboost_date_time1.79} |   0
 ...{libboost_fiber1.72 => libboost_fiber1.79} |   0
 ...filesystem1.72 => libboost_filesystem1.79} |   0
 ...{libboost_graph1.72 => libboost_graph1.79} |   0
 ...t_iostreams1.72 => libboost_iostreams1.79} |   0
 ...{libboost_locale1.72 => libboost_json1.79} |   0
 .../{libboost_log1.72 => libboost_locale1.79} |   0
 ...ibboost_log_setup1.72 => libboost_log1.79} |   0
 ...st_math_c991.72 => libboost_log_setup1.79} |   0
 ...t_math_c99f1.72 => libboost_math_c99-1.79} |   0
 ...t_math_c99l1.72 => libboost_math_c99f1.79} |   0
 ...st_math_tr11.72 => libboost_math_c99l1.79} |   0
 ...t_math_tr1f1.72 => libboost_math_tr1-1.79} |   0
 ...t_math_tr1l1.72 => libboost_math_tr1f1.79} |   0
 ...xec_monitor1.72 => libboost_math_tr1l1.79} |   0
 ...rogram_options1.72 => libboost_nowide1.79} |   0
 ...ndom1.72 => libboost_prg_exec_monitor1.79} |   0
 ...regex1.72 => libboost_program_options1.79} |   0
 ..._serialization1.72 => libboost_random1.79} |   0
 ...trace_addr2line1.72 => libboost_regex1.79} |   0
 ...e_basic1.72 => libboost_serialization1.79} |   0
 ...1.72 => libboost_stacktrace_addr2line1.79} |   0
 ...stem1.72 => libboost_stacktrace_basic1.79} |   0
 ...hread1.72 => libboost_stacktrace_noop1.79} |   0
 ...libboost_timer1.72 => libboost_system1.79} |   0
 ...t_type_erasure1.72 => libboost_thread1.79} |   0
 ..._test_framework1.72 => libboost_timer1.79} |   0
 ...ost_wave1.72 => libboost_type_erasure1.79} |   0
 ...n1.72 => libboost_unit_test_framework1.79} |   0
 srcpkgs/libboost_wave1.79                     |   1 +
 srcpkgs/libboost_wserialization1.79           |   1 +
 43 files changed, 113 insertions(+), 161 deletions(-)
 rename srcpkgs/{boost-python1.72 => boost-python1.79} (100%)
 rename srcpkgs/{boost-python3-1.72 => boost-python3-1.79} (100%)
 delete mode 100644 srcpkgs/boost/patches/exec_file.patch
 rename srcpkgs/{libboost_atomic1.72 => libboost_atomic1.79} (100%)
 rename srcpkgs/{libboost_chrono1.72 => libboost_chrono1.79} (100%)
 rename srcpkgs/{libboost_container1.72 => libboost_container1.79} (100%)
 rename srcpkgs/{libboost_context1.72 => libboost_context1.79} (100%)
 rename srcpkgs/{libboost_contract1.72 => libboost_contract1.79} (100%)
 rename srcpkgs/{libboost_coroutine1.72 => libboost_coroutine1.79} (100%)
 rename srcpkgs/{libboost_date_time1.72 => libboost_date_time1.79} (100%)
 rename srcpkgs/{libboost_fiber1.72 => libboost_fiber1.79} (100%)
 rename srcpkgs/{libboost_filesystem1.72 => libboost_filesystem1.79} (100%)
 rename srcpkgs/{libboost_graph1.72 => libboost_graph1.79} (100%)
 rename srcpkgs/{libboost_iostreams1.72 => libboost_iostreams1.79} (100%)
 rename srcpkgs/{libboost_locale1.72 => libboost_json1.79} (100%)
 rename srcpkgs/{libboost_log1.72 => libboost_locale1.79} (100%)
 rename srcpkgs/{libboost_log_setup1.72 => libboost_log1.79} (100%)
 rename srcpkgs/{libboost_math_c991.72 => libboost_log_setup1.79} (100%)
 rename srcpkgs/{libboost_math_c99f1.72 => libboost_math_c99-1.79} (100%)
 rename srcpkgs/{libboost_math_c99l1.72 => libboost_math_c99f1.79} (100%)
 rename srcpkgs/{libboost_math_tr11.72 => libboost_math_c99l1.79} (100%)
 rename srcpkgs/{libboost_math_tr1f1.72 => libboost_math_tr1-1.79} (100%)
 rename srcpkgs/{libboost_math_tr1l1.72 => libboost_math_tr1f1.79} (100%)
 rename srcpkgs/{libboost_prg_exec_monitor1.72 => libboost_math_tr1l1.79} (100%)
 rename srcpkgs/{libboost_program_options1.72 => libboost_nowide1.79} (100%)
 rename srcpkgs/{libboost_random1.72 => libboost_prg_exec_monitor1.79} (100%)
 rename srcpkgs/{libboost_regex1.72 => libboost_program_options1.79} (100%)
 rename srcpkgs/{libboost_serialization1.72 => libboost_random1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_addr2line1.72 => libboost_regex1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_basic1.72 => libboost_serialization1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_noop1.72 => libboost_stacktrace_addr2line1.79} (100%)
 rename srcpkgs/{libboost_system1.72 => libboost_stacktrace_basic1.79} (100%)
 rename srcpkgs/{libboost_thread1.72 => libboost_stacktrace_noop1.79} (100%)
 rename srcpkgs/{libboost_timer1.72 => libboost_system1.79} (100%)
 rename srcpkgs/{libboost_type_erasure1.72 => libboost_thread1.79} (100%)
 rename srcpkgs/{libboost_unit_test_framework1.72 => libboost_timer1.79} (100%)
 rename srcpkgs/{libboost_wave1.72 => libboost_type_erasure1.79} (100%)
 rename srcpkgs/{libboost_wserialization1.72 => libboost_unit_test_framework1.79} (100%)
 create mode 120000 srcpkgs/libboost_wave1.79
 create mode 120000 srcpkgs/libboost_wserialization1.79

diff --git a/common/shlibs b/common/shlibs
index 9fd62e7c1baf..bb418cdfc245 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -620,38 +620,38 @@ 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.79.0 libboost_context1.79-1.79.0_1
+libboost_coroutine.so.1.79.0 libboost_coroutine1.79-1.79.0_1
+libboost_container.so.1.79.0 libboost_container1.79-1.79.0_1
+libboost_prg_exec_monitor.so.1.79.0 libboost_prg_exec_monitor1.79-1.79.0_1
+libboost_timer.so.1.79.0 libboost_timer1.79-1.79.0_1
+libboost_random.so.1.79.0 libboost_random1.79-1.79.0_1
+libboost_filesystem.so.1.79.0 libboost_filesystem1.79-1.79.0_1
+libboost_unit_test_framework.so.1.79.0 libboost_unit_test_framework1.79-1.79.0_1
+libboost_math_c99.so.1.79.0 libboost_math_c99-1.79-1.79.0_1
+libboost_math_tr1.so.1.79.0 libboost_math_tr1-1.79-1.79.0_1
+libboost_regex.so.1.79.0 libboost_regex1.79-1.79.0_1
+libboost_serialization.so.1.79.0 libboost_serialization1.79-1.79.0_1
+libboost_chrono.so.1.79.0 libboost_chrono1.79-1.79.0_1
+libboost_wserialization.so.1.79.0 libboost_wserialization1.79-1.79.0_1
+libboost_graph.so.1.79.0 libboost_graph1.79-1.79.0_1
+libboost_log.so.1.79.0 libboost_log1.79-1.79.0_1
+libboost_locale.so.1.79.0 libboost_locale1.79-1.79.0_1
+libboost_program_options.so.1.79.0 libboost_program_options1.79-1.79.0_1
+libboost_iostreams.so.1.79.0 libboost_iostreams1.79-1.79.0_1
+libboost_system.so.1.79.0 libboost_system1.79-1.79.0_1
+libboost_thread.so.1.79.0 libboost_thread1.79-1.79.0_1
+libboost_log_setup.so.1.79.0 libboost_log_setup1.79-1.79.0_1
+libboost_date_time.so.1.79.0 libboost_date_time1.79-1.79.0_1
+libboost_wave.so.1.79.0 libboost_wave1.79-1.79.0_1
+libboost_atomic.so.1.79.0 libboost_atomic1.79-1.79.0_1
+libboost_type_erasure.so.1.79.0 libboost_type_erasure1.79-1.79.0_1
+libboost_fiber.so.1.79.0 libboost_fiber1.79-1.79.0_1
+libboost_stacktrace_noop.so.1.79.0 libboost_stacktrace_noop1.79-1.79.0_1
+libboost_stacktrace_addr2line.so.1.79.0 libboost_stacktrace_addr2line1.79-1.79.0_1
+libboost_stacktrace_basic.so.1.79.0 libboost_stacktrace_basic1.79-1.79.0_1
+libboost_python27.so.1.79.0 boost-python1.79-1.79.0_1
+libboost_python310.so.1.79.0 boost-python3-1.79-1.79.0_1
 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-python1.79
similarity index 100%
rename from srcpkgs/boost-python1.72
rename to srcpkgs/boost-python1.79
diff --git a/srcpkgs/boost-python3-1.72 b/srcpkgs/boost-python3-1.79
similarity index 100%
rename from srcpkgs/boost-python3-1.72
rename to srcpkgs/boost-python3-1.79
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/mips.patch b/srcpkgs/boost/patches/mips.patch
index a10a2122d9c7..8d253fc7c286 100644
--- a/srcpkgs/boost/patches/mips.patch
+++ b/srcpkgs/boost/patches/mips.patch
@@ -3,7 +3,7 @@
 @@ -48,7 +48,7 @@
  #  define cpu_relax() asm volatile ("nop" ::: "memory");
  # endif
- #elif BOOST_ARCH_MIPS
+ #elif BOOST_ARCH_MIPS && (((__mips_isa_rev > 1) && defined(__mips32)) || ((__mips_isa_rev > 2)  && defined(__mips64)))
 -# define cpu_relax() asm volatile ("pause" ::: "memory");
 +# define cpu_relax() asm volatile ("nop" ::: "memory");
  #elif BOOST_ARCH_PPC
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 126c50770b50..ad705311b867 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,8 +1,8 @@
 # Template file for 'boost'
 pkgname=boost
-version=1.72.0
-revision=7
-wrksrc="${pkgname}_${version//\./_}"
+version=1.79.0
+revision=1
+wrksrc="boost_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
 short_desc="Free peer-reviewed portable C++ source libraries"
@@ -10,53 +10,34 @@ 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=475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39
 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"
+subpackages="libboost_program_options1.79 libboost_math_c99f1.79
+ libboost_stacktrace_basic1.79 libboost_stacktrace_noop1.79
+ libboost_iostreams1.79 libboost_math_tr1l1.79 libboost_filesystem1.79
+ libboost_chrono1.79 libboost_math_tr1f1.79 libboost_wave1.79
+ libboost_graph1.79 libboost_locale1.79 libboost_regex1.79
+ libboost_fiber1.79 libboost_type_erasure1.79 libboost_coroutine1.79
+ libboost_atomic1.79 libboost_prg_exec_monitor1.79 libboost_math_c99-1.79
+ boost-python3-1.79 libboost_log_setup1.79 boost-devel
+ libboost_timer1.79 libboost_system1.79 libboost_unit_test_framework1.79
+ libboost_serialization1.79 libboost_math_tr1-1.79 boost-build
+ libboost_math_c99l1.79 boost-python1.79 libboost_contract1.79
+ libboost_date_time1.79 libboost_log1.79 libboost_random1.79
+ libboost_thread1.79 libboost_container1.79 boost-jam
+ libboost_wserialization1.79 libboost_context1.79 libboost_json1.79
+ libboost_nowide1.79"
 
 if [ -z "$CROSS_BUILD" ]; then
-	subpackages+=" libboost_stacktrace_addr2line1.72"
+	subpackages+=" libboost_stacktrace_addr2line1.79"
 fi
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*)    _arch=x86;      _abi=sysv  ;;
-	x86_64*)  _arch=x86;      _abi=sysv  ;;
-	arm*)     _arch=arm;      _abi=aapcs ;;
-	aarch64*) _arch=arm;      _abi=aapcs ;;
-	mips*)    _arch=mips32r2; _abi=o32   ;;
-	ppc*)     _arch=power;    _abi=sysv  ;;
+	i686*|x86_64*) _arch=x86;      _abi=sysv  ;;
+	arm*|aarch64*) _arch=arm;      _abi=aapcs ;;
+	mips*)         _arch=mips32r2; _abi=o32   ;;
+	ppc*)          _arch=power;    _abi=sysv  ;;
 esac
 
 do_build() {
@@ -66,7 +47,7 @@ do_build() {
 	(
 	# Rebuild bjam for target
 	cd tools/build/src/engine
-	./build.sh gcc
+	./build.sh --cxx="${CXX}" --cxxflags="${CXXFLAGS}" gcc
 	)
 	cat > user-config.jam <<-__EOF
 	using gcc : : ${CXX} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
@@ -74,10 +55,8 @@ do_build() {
 	using python : ${py3_ver} : ${XBPS_CROSS_BASE}/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} \
 		threading=multi runtime-link=shared link=shared,static
 }
@@ -119,7 +98,7 @@ boost-jam_package() {
 		vmove usr/bin/b2
 	}
 }
-boost-python1.72_package() {
+boost-python1.79_package() {
 	depends="boost python"
 	replaces="boost-python>=0"
 	short_desc+=" - Python bindings"
@@ -127,7 +106,7 @@ boost-python1.72_package() {
 		vmove "usr/lib/libboost_python2*.so.*"
 	}
 }
-boost-python3-1.72_package() {
+boost-python3-1.79_package() {
 	depends="boost python3"
 	replaces="boost-python3>=0"
 	short_desc+=" - Python3 bindings"
@@ -154,7 +133,7 @@ boost-devel_package() {
 	}
 }
 
-libboost_atomic1.72_package() {
+libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
@@ -162,7 +141,7 @@ libboost_atomic1.72_package() {
 	}
 }
 
-libboost_chrono1.72_package() {
+libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
@@ -170,7 +149,7 @@ libboost_chrono1.72_package() {
 	}
 }
 
-libboost_container1.72_package() {
+libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
@@ -178,7 +157,7 @@ libboost_container1.72_package() {
 	}
 }
 
-libboost_context1.72_package() {
+libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
@@ -186,7 +165,7 @@ libboost_context1.72_package() {
 	}
 }
 
-libboost_contract1.72_package() {
+libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
@@ -194,7 +173,7 @@ libboost_contract1.72_package() {
 	}
 }
 
-libboost_coroutine1.72_package() {
+libboost_coroutine1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
@@ -202,7 +181,7 @@ libboost_coroutine1.72_package() {
 	}
 }
 
-libboost_date_time1.72_package() {
+libboost_date_time1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
@@ -210,7 +189,7 @@ libboost_date_time1.72_package() {
 	}
 }
 
-libboost_fiber1.72_package() {
+libboost_fiber1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_fiber"
 	pkg_install() {
@@ -218,7 +197,7 @@ libboost_fiber1.72_package() {
 	}
 }
 
-libboost_filesystem1.72_package() {
+libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
@@ -226,7 +205,7 @@ libboost_filesystem1.72_package() {
 	}
 }
 
-libboost_graph1.72_package() {
+libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
@@ -234,7 +213,7 @@ libboost_graph1.72_package() {
 	}
 }
 
-libboost_iostreams1.72_package() {
+libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
@@ -242,7 +221,7 @@ libboost_iostreams1.72_package() {
 	}
 }
 
-libboost_locale1.72_package() {
+libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
@@ -250,7 +229,7 @@ libboost_locale1.72_package() {
 	}
 }
 
-libboost_log1.72_package() {
+libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
@@ -258,7 +237,7 @@ libboost_log1.72_package() {
 	}
 }
 
-libboost_log_setup1.72_package() {
+libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
@@ -266,7 +245,7 @@ libboost_log_setup1.72_package() {
 	}
 }
 
-libboost_math_c991.72_package() {
+libboost_math_c99-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
@@ -274,7 +253,7 @@ libboost_math_c991.72_package() {
 	}
 }
 
-libboost_math_c99f1.72_package() {
+libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
@@ -282,7 +261,7 @@ libboost_math_c99f1.72_package() {
 	}
 }
 
-libboost_math_c99l1.72_package() {
+libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
@@ -290,7 +269,7 @@ libboost_math_c99l1.72_package() {
 	}
 }
 
-libboost_math_tr11.72_package() {
+libboost_math_tr1-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
@@ -298,7 +277,7 @@ libboost_math_tr11.72_package() {
 	}
 }
 
-libboost_math_tr1f1.72_package() {
+libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
@@ -306,7 +285,7 @@ libboost_math_tr1f1.72_package() {
 	}
 }
 
-libboost_math_tr1l1.72_package() {
+libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
@@ -314,7 +293,7 @@ libboost_math_tr1l1.72_package() {
 	}
 }
 
-libboost_prg_exec_monitor1.72_package() {
+libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
@@ -322,7 +301,7 @@ libboost_prg_exec_monitor1.72_package() {
 	}
 }
 
-libboost_program_options1.72_package() {
+libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
@@ -330,7 +309,7 @@ libboost_program_options1.72_package() {
 	}
 }
 
-libboost_random1.72_package() {
+libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
@@ -338,7 +317,7 @@ libboost_random1.72_package() {
 	}
 }
 
-libboost_regex1.72_package() {
+libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
@@ -346,7 +325,7 @@ libboost_regex1.72_package() {
 	}
 }
 
-libboost_serialization1.72_package() {
+libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
@@ -354,7 +333,7 @@ libboost_serialization1.72_package() {
 	}
 }
 
-libboost_stacktrace_addr2line1.72_package() {
+libboost_stacktrace_addr2line1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_addr2line"
 	pkg_install() {
@@ -362,7 +341,7 @@ libboost_stacktrace_addr2line1.72_package() {
 	}
 }
 
-libboost_stacktrace_basic1.72_package() {
+libboost_stacktrace_basic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_basic"
 	pkg_install() {
@@ -370,7 +349,7 @@ libboost_stacktrace_basic1.72_package() {
 	}
 }
 
-libboost_stacktrace_noop1.72_package() {
+libboost_stacktrace_noop1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_noop"
 	pkg_install() {
@@ -378,7 +357,7 @@ libboost_stacktrace_noop1.72_package() {
 	}
 }
 
-libboost_system1.72_package() {
+libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
@@ -386,7 +365,7 @@ libboost_system1.72_package() {
 	}
 }
 
-libboost_thread1.72_package() {
+libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
@@ -394,7 +373,7 @@ libboost_thread1.72_package() {
 	}
 }
 
-libboost_timer1.72_package() {
+libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
@@ -402,7 +381,7 @@ libboost_timer1.72_package() {
 	}
 }
 
-libboost_type_erasure1.72_package() {
+libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
@@ -410,7 +389,7 @@ libboost_type_erasure1.72_package() {
 	}
 }
 
-libboost_unit_test_framework1.72_package() {
+libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
@@ -418,7 +397,7 @@ libboost_unit_test_framework1.72_package() {
 	}
 }
 
-libboost_wave1.72_package() {
+libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
@@ -426,10 +405,26 @@ libboost_wave1.72_package() {
 	}
 }
 
-libboost_wserialization1.72_package() {
+libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
 		vmove usr/lib/libboost_wserialization.so.*
 	}
 }
+
+libboost_json1.79_package() {
+	depends="boost"
+	short_desc+=" - libboost_json"
+	pkg_install() {
+		vmove "usr/lib/libboost_json.so.*"
+	}
+}
+
+libboost_nowide1.79_package() {
+	depends="boost"
+	short_desc+=" - libboost_nowide"
+	pkg_install() {
+		vmove "usr/lib/libboost_nowide.so.*"
+	}
+}
diff --git a/srcpkgs/libboost_atomic1.72 b/srcpkgs/libboost_atomic1.79
similarity index 100%
rename from srcpkgs/libboost_atomic1.72
rename to srcpkgs/libboost_atomic1.79
diff --git a/srcpkgs/libboost_chrono1.72 b/srcpkgs/libboost_chrono1.79
similarity index 100%
rename from srcpkgs/libboost_chrono1.72
rename to srcpkgs/libboost_chrono1.79
diff --git a/srcpkgs/libboost_container1.72 b/srcpkgs/libboost_container1.79
similarity index 100%
rename from srcpkgs/libboost_container1.72
rename to srcpkgs/libboost_container1.79
diff --git a/srcpkgs/libboost_context1.72 b/srcpkgs/libboost_context1.79
similarity index 100%
rename from srcpkgs/libboost_context1.72
rename to srcpkgs/libboost_context1.79
diff --git a/srcpkgs/libboost_contract1.72 b/srcpkgs/libboost_contract1.79
similarity index 100%
rename from srcpkgs/libboost_contract1.72
rename to srcpkgs/libboost_contract1.79
diff --git a/srcpkgs/libboost_coroutine1.72 b/srcpkgs/libboost_coroutine1.79
similarity index 100%
rename from srcpkgs/libboost_coroutine1.72
rename to srcpkgs/libboost_coroutine1.79
diff --git a/srcpkgs/libboost_date_time1.72 b/srcpkgs/libboost_date_time1.79
similarity index 100%
rename from srcpkgs/libboost_date_time1.72
rename to srcpkgs/libboost_date_time1.79
diff --git a/srcpkgs/libboost_fiber1.72 b/srcpkgs/libboost_fiber1.79
similarity index 100%
rename from srcpkgs/libboost_fiber1.72
rename to srcpkgs/libboost_fiber1.79
diff --git a/srcpkgs/libboost_filesystem1.72 b/srcpkgs/libboost_filesystem1.79
similarity index 100%
rename from srcpkgs/libboost_filesystem1.72
rename to srcpkgs/libboost_filesystem1.79
diff --git a/srcpkgs/libboost_graph1.72 b/srcpkgs/libboost_graph1.79
similarity index 100%
rename from srcpkgs/libboost_graph1.72
rename to srcpkgs/libboost_graph1.79
diff --git a/srcpkgs/libboost_iostreams1.72 b/srcpkgs/libboost_iostreams1.79
similarity index 100%
rename from srcpkgs/libboost_iostreams1.72
rename to srcpkgs/libboost_iostreams1.79
diff --git a/srcpkgs/libboost_locale1.72 b/srcpkgs/libboost_json1.79
similarity index 100%
rename from srcpkgs/libboost_locale1.72
rename to srcpkgs/libboost_json1.79
diff --git a/srcpkgs/libboost_log1.72 b/srcpkgs/libboost_locale1.79
similarity index 100%
rename from srcpkgs/libboost_log1.72
rename to srcpkgs/libboost_locale1.79
diff --git a/srcpkgs/libboost_log_setup1.72 b/srcpkgs/libboost_log1.79
similarity index 100%
rename from srcpkgs/libboost_log_setup1.72
rename to srcpkgs/libboost_log1.79
diff --git a/srcpkgs/libboost_math_c991.72 b/srcpkgs/libboost_log_setup1.79
similarity index 100%
rename from srcpkgs/libboost_math_c991.72
rename to srcpkgs/libboost_log_setup1.79
diff --git a/srcpkgs/libboost_math_c99f1.72 b/srcpkgs/libboost_math_c99-1.79
similarity index 100%
rename from srcpkgs/libboost_math_c99f1.72
rename to srcpkgs/libboost_math_c99-1.79
diff --git a/srcpkgs/libboost_math_c99l1.72 b/srcpkgs/libboost_math_c99f1.79
similarity index 100%
rename from srcpkgs/libboost_math_c99l1.72
rename to srcpkgs/libboost_math_c99f1.79
diff --git a/srcpkgs/libboost_math_tr11.72 b/srcpkgs/libboost_math_c99l1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr11.72
rename to srcpkgs/libboost_math_c99l1.79
diff --git a/srcpkgs/libboost_math_tr1f1.72 b/srcpkgs/libboost_math_tr1-1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1f1.72
rename to srcpkgs/libboost_math_tr1-1.79
diff --git a/srcpkgs/libboost_math_tr1l1.72 b/srcpkgs/libboost_math_tr1f1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1l1.72
rename to srcpkgs/libboost_math_tr1f1.79
diff --git a/srcpkgs/libboost_prg_exec_monitor1.72 b/srcpkgs/libboost_math_tr1l1.79
similarity index 100%
rename from srcpkgs/libboost_prg_exec_monitor1.72
rename to srcpkgs/libboost_math_tr1l1.79
diff --git a/srcpkgs/libboost_program_options1.72 b/srcpkgs/libboost_nowide1.79
similarity index 100%
rename from srcpkgs/libboost_program_options1.72
rename to srcpkgs/libboost_nowide1.79
diff --git a/srcpkgs/libboost_random1.72 b/srcpkgs/libboost_prg_exec_monitor1.79
similarity index 100%
rename from srcpkgs/libboost_random1.72
rename to srcpkgs/libboost_prg_exec_monitor1.79
diff --git a/srcpkgs/libboost_regex1.72 b/srcpkgs/libboost_program_options1.79
similarity index 100%
rename from srcpkgs/libboost_regex1.72
rename to srcpkgs/libboost_program_options1.79
diff --git a/srcpkgs/libboost_serialization1.72 b/srcpkgs/libboost_random1.79
similarity index 100%
rename from srcpkgs/libboost_serialization1.72
rename to srcpkgs/libboost_random1.79
diff --git a/srcpkgs/libboost_stacktrace_addr2line1.72 b/srcpkgs/libboost_regex1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_addr2line1.72
rename to srcpkgs/libboost_regex1.79
diff --git a/srcpkgs/libboost_stacktrace_basic1.72 b/srcpkgs/libboost_serialization1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_basic1.72
rename to srcpkgs/libboost_serialization1.79
diff --git a/srcpkgs/libboost_stacktrace_noop1.72 b/srcpkgs/libboost_stacktrace_addr2line1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_noop1.72
rename to srcpkgs/libboost_stacktrace_addr2line1.79
diff --git a/srcpkgs/libboost_system1.72 b/srcpkgs/libboost_stacktrace_basic1.79
similarity index 100%
rename from srcpkgs/libboost_system1.72
rename to srcpkgs/libboost_stacktrace_basic1.79
diff --git a/srcpkgs/libboost_thread1.72 b/srcpkgs/libboost_stacktrace_noop1.79
similarity index 100%
rename from srcpkgs/libboost_thread1.72
rename to srcpkgs/libboost_stacktrace_noop1.79
diff --git a/srcpkgs/libboost_timer1.72 b/srcpkgs/libboost_system1.79
similarity index 100%
rename from srcpkgs/libboost_timer1.72
rename to srcpkgs/libboost_system1.79
diff --git a/srcpkgs/libboost_type_erasure1.72 b/srcpkgs/libboost_thread1.79
similarity index 100%
rename from srcpkgs/libboost_type_erasure1.72
rename to srcpkgs/libboost_thread1.79
diff --git a/srcpkgs/libboost_unit_test_framework1.72 b/srcpkgs/libboost_timer1.79
similarity index 100%
rename from srcpkgs/libboost_unit_test_framework1.72
rename to srcpkgs/libboost_timer1.79
diff --git a/srcpkgs/libboost_wave1.72 b/srcpkgs/libboost_type_erasure1.79
similarity index 100%
rename from srcpkgs/libboost_wave1.72
rename to srcpkgs/libboost_type_erasure1.79
diff --git a/srcpkgs/libboost_wserialization1.72 b/srcpkgs/libboost_unit_test_framework1.79
similarity index 100%
rename from srcpkgs/libboost_wserialization1.72
rename to srcpkgs/libboost_unit_test_framework1.79
diff --git a/srcpkgs/libboost_wave1.79 b/srcpkgs/libboost_wave1.79
new file mode 120000
index 000000000000..baef819c48f6
--- /dev/null
+++ b/srcpkgs/libboost_wave1.79
@@ -0,0 +1 @@
+boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_wserialization1.79 b/srcpkgs/libboost_wserialization1.79
new file mode 120000
index 000000000000..baef819c48f6
--- /dev/null
+++ b/srcpkgs/libboost_wserialization1.79
@@ -0,0 +1 @@
+boost
\ No newline at end of file

From ca33e49aafad26a878449022593e18fc557a7f9f Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 18:29:05 +0200
Subject: [PATCH 2/2] boost: quote all vmove's with a glob.

[ci skip] the PR is still WIP
---
 srcpkgs/boost/template | 70 +++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index ad705311b867..7a9c1c33fa44 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -137,7 +137,7 @@ libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
-		vmove usr/lib/libboost_atomic.so.*
+		vmove "usr/lib/libboost_atomic.so.*"
 	}
 }
 
@@ -145,7 +145,7 @@ libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
-		vmove usr/lib/libboost_chrono.so.*
+		vmove "usr/lib/libboost_chrono.so.*"
 	}
 }
 
@@ -153,7 +153,7 @@ libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
-		vmove usr/lib/libboost_container.so.*
+		vmove "usr/lib/libboost_container.so.*"
 	}
 }
 
@@ -161,7 +161,7 @@ libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
-		vmove usr/lib/libboost_context.so.*
+		vmove "usr/lib/libboost_context.so.*"
 	}
 }
 
@@ -169,7 +169,7 @@ libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
-		vmove usr/lib/libboost_contract.so.*
+		vmove "usr/lib/libboost_contract.so.*"
 	}
 }
 
@@ -177,7 +177,7 @@ libboost_coroutine1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
-		vmove usr/lib/libboost_coroutine.so.*
+		vmove "usr/lib/libboost_coroutine.so.*"
 	}
 }
 
@@ -185,7 +185,7 @@ libboost_date_time1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
-		vmove usr/lib/libboost_date_time.so.*
+		vmove "usr/lib/libboost_date_time.so.*"
 	}
 }
 
@@ -193,7 +193,7 @@ libboost_fiber1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_fiber"
 	pkg_install() {
-		vmove usr/lib/libboost_fiber.so.*
+		vmove "usr/lib/libboost_fiber.so.*"
 	}
 }
 
@@ -201,7 +201,7 @@ libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
-		vmove usr/lib/libboost_filesystem.so.*
+		vmove "usr/lib/libboost_filesystem.so.*"
 	}
 }
 
@@ -209,7 +209,7 @@ libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
-		vmove usr/lib/libboost_graph.so.*
+		vmove "usr/lib/libboost_graph.so.*"
 	}
 }
 
@@ -217,7 +217,7 @@ libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
-		vmove usr/lib/libboost_iostreams.so.*
+		vmove "usr/lib/libboost_iostreams.so.*"
 	}
 }
 
@@ -225,7 +225,7 @@ libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
-		vmove usr/lib/libboost_locale.so.*
+		vmove "usr/lib/libboost_locale.so.*"
 	}
 }
 
@@ -233,7 +233,7 @@ libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
-		vmove usr/lib/libboost_log.so.*
+		vmove "usr/lib/libboost_log.so.*"
 	}
 }
 
@@ -241,7 +241,7 @@ libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
-		vmove usr/lib/libboost_log_setup.so.*
+		vmove "usr/lib/libboost_log_setup.so.*"
 	}
 }
 
@@ -249,7 +249,7 @@ libboost_math_c99-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99.so.*
+		vmove "usr/lib/libboost_math_c99.so.*"
 	}
 }
 
@@ -257,7 +257,7 @@ libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99f.so.*
+		vmove "usr/lib/libboost_math_c99f.so.*"
 	}
 }
 
@@ -265,7 +265,7 @@ libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99l.so.*
+		vmove "usr/lib/libboost_math_c99l.so.*"
 	}
 }
 
@@ -273,7 +273,7 @@ libboost_math_tr1-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1.so.*
+		vmove "usr/lib/libboost_math_tr1.so.*"
 	}
 }
 
@@ -281,7 +281,7 @@ libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1f.so.*
+		vmove "usr/lib/libboost_math_tr1f.so.*"
 	}
 }
 
@@ -289,7 +289,7 @@ libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1l.so.*
+		vmove "usr/lib/libboost_math_tr1l.so.*"
 	}
 }
 
@@ -297,7 +297,7 @@ libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
-		vmove usr/lib/libboost_prg_exec_monitor.so.*
+		vmove "usr/lib/libboost_prg_exec_monitor.so.*"
 	}
 }
 
@@ -305,7 +305,7 @@ libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
-		vmove usr/lib/libboost_program_options.so.*
+		vmove "usr/lib/libboost_program_options.so.*"
 	}
 }
 
@@ -313,7 +313,7 @@ libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
-		vmove usr/lib/libboost_random.so.*
+		vmove "usr/lib/libboost_random.so.*"
 	}
 }
 
@@ -321,7 +321,7 @@ libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
-		vmove usr/lib/libboost_regex.so.*
+		vmove "usr/lib/libboost_regex.so.*"
 	}
 }
 
@@ -329,7 +329,7 @@ libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
-		vmove usr/lib/libboost_serialization.so.*
+		vmove "usr/lib/libboost_serialization.so.*"
 	}
 }
 
@@ -337,7 +337,7 @@ libboost_stacktrace_addr2line1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_addr2line"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_addr2line.so.*
+		vmove "usr/lib/libboost_stacktrace_addr2line.so.*"
 	}
 }
 
@@ -345,7 +345,7 @@ libboost_stacktrace_basic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_basic"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_basic.so.*
+		vmove "usr/lib/libboost_stacktrace_basic.so.*"
 	}
 }
 
@@ -353,7 +353,7 @@ libboost_stacktrace_noop1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_noop"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_noop.so.*
+		vmove "usr/lib/libboost_stacktrace_noop.so.*"
 	}
 }
 
@@ -361,7 +361,7 @@ libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
-		vmove usr/lib/libboost_system.so.*
+		vmove "usr/lib/libboost_system.so.*"
 	}
 }
 
@@ -369,7 +369,7 @@ libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
-		vmove usr/lib/libboost_thread.so.*
+		vmove "usr/lib/libboost_thread.so.*"
 	}
 }
 
@@ -377,7 +377,7 @@ libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
-		vmove usr/lib/libboost_timer.so.*
+		vmove "usr/lib/libboost_timer.so.*"
 	}
 }
 
@@ -385,7 +385,7 @@ libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
-		vmove usr/lib/libboost_type_erasure.so.*
+		vmove "usr/lib/libboost_type_erasure.so.*"
 	}
 }
 
@@ -393,7 +393,7 @@ libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
-		vmove usr/lib/libboost_unit_test_framework.so.*
+		vmove "usr/lib/libboost_unit_test_framework.so.*"
 	}
 }
 
@@ -401,7 +401,7 @@ libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
-		vmove usr/lib/libboost_wave.so.*
+		vmove "usr/lib/libboost_wave.so.*"
 	}
 }
 
@@ -409,7 +409,7 @@ libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
-		vmove usr/lib/libboost_wserialization.so.*
+		vmove "usr/lib/libboost_wserialization.so.*"
 	}
 }
 

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] boost: update to 1.79.0.
  2022-03-18 14:28 [PR PATCH] boost: update to 1.79.0.b1 JamiKettunen
                   ` (14 preceding siblings ...)
  2022-05-26 15:29 ` [PR PATCH] [Updated] boost: update to 1.79.0 JamiKettunen
@ 2022-05-26 16:21 ` JamiKettunen
  2022-05-26 18:41 ` JamiKettunen
                   ` (12 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: JamiKettunen @ 2022-05-26 16:21 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3568 bytes --]

There is an updated pull request by JamiKettunen against master on the void-packages repository

https://github.com/JamiKettunen/void-packages boost-1.79.0
https://github.com/void-linux/void-packages/pull/36204

boost: update to 1.79.0.
#### Packages to fix (from `xrevshlib boost` as locally build-tested on `x86_64-musl`)
- [ ] Aegisub (fails on `do_build()`)
- [ ] PrusaSlicer (fails on `do_build()`)
- [ ] TSC (fails on `do_build()`)
- [ ] bitcoin (fails on `do_check()`)
- [ ] openimageio (fails on `pre_build()`, `vsed` doesn't change `src/cmake/compiler.cmake`)
  - [ ] blender (depends on `openimageio`)
- [ ] cryfs (fails on `do_build()`)
- [ ] leatherman (hangs on `do_check()`, test process pinned one core at 100% for 10 minutes)
  - [ ] facter (depends on `leatherman`)
- [ ] fifengine (fails on `do_build()`)
- [ ] uhd (fails on `do_build()`)
  - [ ] gnuradio (depends on `uhd`)
    - [ ] gnuradio-osmosdr (depends on `gnuradio`)
- [ ] imagescan (fails on `do_build()`)
- [ ] inkscape (fails on `do_check()`)
- [ ] kea (fails on `do_build()`)
- [ ] ledger (fails on `do_build()`)
- [ ] libbitcoin-system (fails on `do_build()`)
  - [ ] libbitcoin-database (depends on `libbitcoin-system`)
    - [ ] libbitcoin-blockchain (depends on `libbitcoin-database`)
      - [ ] libbitcoin-node (depends on `libbitcoin-blockchain`)
      - [ ] libbitcoin-server (depends on `libbitcoin-blockchain`)
  - [ ] libbitcoin-protocol (depends on `libbitcoin-system`)
    - [ ] libbitcoin-client (depends on `libbitcoin-protocol`)
      - [ ] libbitcoin-explorer (depends on `libbitcoin-client`)
  - [ ] libbitcoin-network (depends on `libbitcoin-system`)
- [ ] libetonyek (fails on `do_build()`, appears to need `-std=c++17` or higher? `NUM3Parser.cpp:46:8: error: 'for_each' is not a member of 'std'`)
  - [ ] libreoffice (depends on `libetonyek`)
- [ ] librime (fails on `do_build()`)
- [ ] libtorrent-rasterbar (hangs on `do_check()`, 90/97 test_web_seed_http stuck for 10 minutes)
- [ ] namecoin (fails on `do_build()`)
- [ ] pulseeffects-legacy (fails on `do_build()`)
- [ ] schroot (fails on `do_check()`)
- [ ] supercollider (fails on `do_build()`)
- [ ] swiften (do_patch, `fix-cross-build.patch` doesn't apply)

#### Modified patches
`exec_file.patch`: Removed due to being upstream as https://github.com/boostorg/python/commit/d9f06052e28873037db7f98629bce72182a42410
`mips.patch`: Updated to apply on top of https://github.com/boostorg/fiber/commit/5dc9dabc5d5ff8da53ec897c265c9cba1b6ed0df, not sure if this can be removed now(?)

#### Misc changes
- I've renamed all subpackages of `boost` so that the versioned name doesn't conflict with other numbers and are consistent with the previously existing `boost-python3-1.72`, e.g. `libboost_math_c991.72` is now `libboost_math_c99-1.79` (notice the `-`!)

#### Testing the changes
- I tested the changes in this PR: **NO**

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36204.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boost-1.79.0-36204.patch --]
[-- Type: text/x-diff, Size: 43139 bytes --]

From d806b7c68d6d8c0a4073ce607fb91e4e294027a7 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 15:28:37 +0200
Subject: [PATCH 1/3] boost: update to 1.79.0.

---
 common/shlibs                                 |  64 +++----
 .../{boost-python1.72 => boost-python1.79}    |   0
 ...{boost-python3-1.72 => boost-python3-1.79} |   0
 srcpkgs/boost/patches/exec_file.patch         |  45 -----
 srcpkgs/boost/patches/mips.patch              |   2 +-
 srcpkgs/boost/template                        | 161 +++++++++---------
 ...ibboost_atomic1.72 => libboost_atomic1.79} |   0
 ...ibboost_chrono1.72 => libboost_chrono1.79} |   0
 ...t_container1.72 => libboost_container1.79} |   0
 ...boost_context1.72 => libboost_context1.79} |   0
 ...ost_contract1.72 => libboost_contract1.79} |   0
 ...t_coroutine1.72 => libboost_coroutine1.79} |   0
 ...t_date_time1.72 => libboost_date_time1.79} |   0
 ...{libboost_fiber1.72 => libboost_fiber1.79} |   0
 ...filesystem1.72 => libboost_filesystem1.79} |   0
 ...{libboost_graph1.72 => libboost_graph1.79} |   0
 ...t_iostreams1.72 => libboost_iostreams1.79} |   0
 ...{libboost_locale1.72 => libboost_json1.79} |   0
 .../{libboost_log1.72 => libboost_locale1.79} |   0
 ...ibboost_log_setup1.72 => libboost_log1.79} |   0
 ...st_math_c991.72 => libboost_log_setup1.79} |   0
 ...t_math_c99f1.72 => libboost_math_c99-1.79} |   0
 ...t_math_c99l1.72 => libboost_math_c99f1.79} |   0
 ...st_math_tr11.72 => libboost_math_c99l1.79} |   0
 ...t_math_tr1f1.72 => libboost_math_tr1-1.79} |   0
 ...t_math_tr1l1.72 => libboost_math_tr1f1.79} |   0
 ...xec_monitor1.72 => libboost_math_tr1l1.79} |   0
 ...rogram_options1.72 => libboost_nowide1.79} |   0
 ...ndom1.72 => libboost_prg_exec_monitor1.79} |   0
 ...regex1.72 => libboost_program_options1.79} |   0
 ..._serialization1.72 => libboost_random1.79} |   0
 ...trace_addr2line1.72 => libboost_regex1.79} |   0
 ...e_basic1.72 => libboost_serialization1.79} |   0
 ...1.72 => libboost_stacktrace_addr2line1.79} |   0
 ...stem1.72 => libboost_stacktrace_basic1.79} |   0
 ...hread1.72 => libboost_stacktrace_noop1.79} |   0
 ...libboost_timer1.72 => libboost_system1.79} |   0
 ...t_type_erasure1.72 => libboost_thread1.79} |   0
 ..._test_framework1.72 => libboost_timer1.79} |   0
 ...ost_wave1.72 => libboost_type_erasure1.79} |   0
 ...n1.72 => libboost_unit_test_framework1.79} |   0
 srcpkgs/libboost_wave1.79                     |   1 +
 srcpkgs/libboost_wserialization1.79           |   1 +
 43 files changed, 113 insertions(+), 161 deletions(-)
 rename srcpkgs/{boost-python1.72 => boost-python1.79} (100%)
 rename srcpkgs/{boost-python3-1.72 => boost-python3-1.79} (100%)
 delete mode 100644 srcpkgs/boost/patches/exec_file.patch
 rename srcpkgs/{libboost_atomic1.72 => libboost_atomic1.79} (100%)
 rename srcpkgs/{libboost_chrono1.72 => libboost_chrono1.79} (100%)
 rename srcpkgs/{libboost_container1.72 => libboost_container1.79} (100%)
 rename srcpkgs/{libboost_context1.72 => libboost_context1.79} (100%)
 rename srcpkgs/{libboost_contract1.72 => libboost_contract1.79} (100%)
 rename srcpkgs/{libboost_coroutine1.72 => libboost_coroutine1.79} (100%)
 rename srcpkgs/{libboost_date_time1.72 => libboost_date_time1.79} (100%)
 rename srcpkgs/{libboost_fiber1.72 => libboost_fiber1.79} (100%)
 rename srcpkgs/{libboost_filesystem1.72 => libboost_filesystem1.79} (100%)
 rename srcpkgs/{libboost_graph1.72 => libboost_graph1.79} (100%)
 rename srcpkgs/{libboost_iostreams1.72 => libboost_iostreams1.79} (100%)
 rename srcpkgs/{libboost_locale1.72 => libboost_json1.79} (100%)
 rename srcpkgs/{libboost_log1.72 => libboost_locale1.79} (100%)
 rename srcpkgs/{libboost_log_setup1.72 => libboost_log1.79} (100%)
 rename srcpkgs/{libboost_math_c991.72 => libboost_log_setup1.79} (100%)
 rename srcpkgs/{libboost_math_c99f1.72 => libboost_math_c99-1.79} (100%)
 rename srcpkgs/{libboost_math_c99l1.72 => libboost_math_c99f1.79} (100%)
 rename srcpkgs/{libboost_math_tr11.72 => libboost_math_c99l1.79} (100%)
 rename srcpkgs/{libboost_math_tr1f1.72 => libboost_math_tr1-1.79} (100%)
 rename srcpkgs/{libboost_math_tr1l1.72 => libboost_math_tr1f1.79} (100%)
 rename srcpkgs/{libboost_prg_exec_monitor1.72 => libboost_math_tr1l1.79} (100%)
 rename srcpkgs/{libboost_program_options1.72 => libboost_nowide1.79} (100%)
 rename srcpkgs/{libboost_random1.72 => libboost_prg_exec_monitor1.79} (100%)
 rename srcpkgs/{libboost_regex1.72 => libboost_program_options1.79} (100%)
 rename srcpkgs/{libboost_serialization1.72 => libboost_random1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_addr2line1.72 => libboost_regex1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_basic1.72 => libboost_serialization1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_noop1.72 => libboost_stacktrace_addr2line1.79} (100%)
 rename srcpkgs/{libboost_system1.72 => libboost_stacktrace_basic1.79} (100%)
 rename srcpkgs/{libboost_thread1.72 => libboost_stacktrace_noop1.79} (100%)
 rename srcpkgs/{libboost_timer1.72 => libboost_system1.79} (100%)
 rename srcpkgs/{libboost_type_erasure1.72 => libboost_thread1.79} (100%)
 rename srcpkgs/{libboost_unit_test_framework1.72 => libboost_timer1.79} (100%)
 rename srcpkgs/{libboost_wave1.72 => libboost_type_erasure1.79} (100%)
 rename srcpkgs/{libboost_wserialization1.72 => libboost_unit_test_framework1.79} (100%)
 create mode 120000 srcpkgs/libboost_wave1.79
 create mode 120000 srcpkgs/libboost_wserialization1.79

diff --git a/common/shlibs b/common/shlibs
index 9fd62e7c1baf..bb418cdfc245 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -620,38 +620,38 @@ 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.79.0 libboost_context1.79-1.79.0_1
+libboost_coroutine.so.1.79.0 libboost_coroutine1.79-1.79.0_1
+libboost_container.so.1.79.0 libboost_container1.79-1.79.0_1
+libboost_prg_exec_monitor.so.1.79.0 libboost_prg_exec_monitor1.79-1.79.0_1
+libboost_timer.so.1.79.0 libboost_timer1.79-1.79.0_1
+libboost_random.so.1.79.0 libboost_random1.79-1.79.0_1
+libboost_filesystem.so.1.79.0 libboost_filesystem1.79-1.79.0_1
+libboost_unit_test_framework.so.1.79.0 libboost_unit_test_framework1.79-1.79.0_1
+libboost_math_c99.so.1.79.0 libboost_math_c99-1.79-1.79.0_1
+libboost_math_tr1.so.1.79.0 libboost_math_tr1-1.79-1.79.0_1
+libboost_regex.so.1.79.0 libboost_regex1.79-1.79.0_1
+libboost_serialization.so.1.79.0 libboost_serialization1.79-1.79.0_1
+libboost_chrono.so.1.79.0 libboost_chrono1.79-1.79.0_1
+libboost_wserialization.so.1.79.0 libboost_wserialization1.79-1.79.0_1
+libboost_graph.so.1.79.0 libboost_graph1.79-1.79.0_1
+libboost_log.so.1.79.0 libboost_log1.79-1.79.0_1
+libboost_locale.so.1.79.0 libboost_locale1.79-1.79.0_1
+libboost_program_options.so.1.79.0 libboost_program_options1.79-1.79.0_1
+libboost_iostreams.so.1.79.0 libboost_iostreams1.79-1.79.0_1
+libboost_system.so.1.79.0 libboost_system1.79-1.79.0_1
+libboost_thread.so.1.79.0 libboost_thread1.79-1.79.0_1
+libboost_log_setup.so.1.79.0 libboost_log_setup1.79-1.79.0_1
+libboost_date_time.so.1.79.0 libboost_date_time1.79-1.79.0_1
+libboost_wave.so.1.79.0 libboost_wave1.79-1.79.0_1
+libboost_atomic.so.1.79.0 libboost_atomic1.79-1.79.0_1
+libboost_type_erasure.so.1.79.0 libboost_type_erasure1.79-1.79.0_1
+libboost_fiber.so.1.79.0 libboost_fiber1.79-1.79.0_1
+libboost_stacktrace_noop.so.1.79.0 libboost_stacktrace_noop1.79-1.79.0_1
+libboost_stacktrace_addr2line.so.1.79.0 libboost_stacktrace_addr2line1.79-1.79.0_1
+libboost_stacktrace_basic.so.1.79.0 libboost_stacktrace_basic1.79-1.79.0_1
+libboost_python27.so.1.79.0 boost-python1.79-1.79.0_1
+libboost_python310.so.1.79.0 boost-python3-1.79-1.79.0_1
 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-python1.79
similarity index 100%
rename from srcpkgs/boost-python1.72
rename to srcpkgs/boost-python1.79
diff --git a/srcpkgs/boost-python3-1.72 b/srcpkgs/boost-python3-1.79
similarity index 100%
rename from srcpkgs/boost-python3-1.72
rename to srcpkgs/boost-python3-1.79
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/mips.patch b/srcpkgs/boost/patches/mips.patch
index a10a2122d9c7..8d253fc7c286 100644
--- a/srcpkgs/boost/patches/mips.patch
+++ b/srcpkgs/boost/patches/mips.patch
@@ -3,7 +3,7 @@
 @@ -48,7 +48,7 @@
  #  define cpu_relax() asm volatile ("nop" ::: "memory");
  # endif
- #elif BOOST_ARCH_MIPS
+ #elif BOOST_ARCH_MIPS && (((__mips_isa_rev > 1) && defined(__mips32)) || ((__mips_isa_rev > 2)  && defined(__mips64)))
 -# define cpu_relax() asm volatile ("pause" ::: "memory");
 +# define cpu_relax() asm volatile ("nop" ::: "memory");
  #elif BOOST_ARCH_PPC
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 126c50770b50..ad705311b867 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,8 +1,8 @@
 # Template file for 'boost'
 pkgname=boost
-version=1.72.0
-revision=7
-wrksrc="${pkgname}_${version//\./_}"
+version=1.79.0
+revision=1
+wrksrc="boost_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
 short_desc="Free peer-reviewed portable C++ source libraries"
@@ -10,53 +10,34 @@ 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=475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39
 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"
+subpackages="libboost_program_options1.79 libboost_math_c99f1.79
+ libboost_stacktrace_basic1.79 libboost_stacktrace_noop1.79
+ libboost_iostreams1.79 libboost_math_tr1l1.79 libboost_filesystem1.79
+ libboost_chrono1.79 libboost_math_tr1f1.79 libboost_wave1.79
+ libboost_graph1.79 libboost_locale1.79 libboost_regex1.79
+ libboost_fiber1.79 libboost_type_erasure1.79 libboost_coroutine1.79
+ libboost_atomic1.79 libboost_prg_exec_monitor1.79 libboost_math_c99-1.79
+ boost-python3-1.79 libboost_log_setup1.79 boost-devel
+ libboost_timer1.79 libboost_system1.79 libboost_unit_test_framework1.79
+ libboost_serialization1.79 libboost_math_tr1-1.79 boost-build
+ libboost_math_c99l1.79 boost-python1.79 libboost_contract1.79
+ libboost_date_time1.79 libboost_log1.79 libboost_random1.79
+ libboost_thread1.79 libboost_container1.79 boost-jam
+ libboost_wserialization1.79 libboost_context1.79 libboost_json1.79
+ libboost_nowide1.79"
 
 if [ -z "$CROSS_BUILD" ]; then
-	subpackages+=" libboost_stacktrace_addr2line1.72"
+	subpackages+=" libboost_stacktrace_addr2line1.79"
 fi
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*)    _arch=x86;      _abi=sysv  ;;
-	x86_64*)  _arch=x86;      _abi=sysv  ;;
-	arm*)     _arch=arm;      _abi=aapcs ;;
-	aarch64*) _arch=arm;      _abi=aapcs ;;
-	mips*)    _arch=mips32r2; _abi=o32   ;;
-	ppc*)     _arch=power;    _abi=sysv  ;;
+	i686*|x86_64*) _arch=x86;      _abi=sysv  ;;
+	arm*|aarch64*) _arch=arm;      _abi=aapcs ;;
+	mips*)         _arch=mips32r2; _abi=o32   ;;
+	ppc*)          _arch=power;    _abi=sysv  ;;
 esac
 
 do_build() {
@@ -66,7 +47,7 @@ do_build() {
 	(
 	# Rebuild bjam for target
 	cd tools/build/src/engine
-	./build.sh gcc
+	./build.sh --cxx="${CXX}" --cxxflags="${CXXFLAGS}" gcc
 	)
 	cat > user-config.jam <<-__EOF
 	using gcc : : ${CXX} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
@@ -74,10 +55,8 @@ do_build() {
 	using python : ${py3_ver} : ${XBPS_CROSS_BASE}/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} \
 		threading=multi runtime-link=shared link=shared,static
 }
@@ -119,7 +98,7 @@ boost-jam_package() {
 		vmove usr/bin/b2
 	}
 }
-boost-python1.72_package() {
+boost-python1.79_package() {
 	depends="boost python"
 	replaces="boost-python>=0"
 	short_desc+=" - Python bindings"
@@ -127,7 +106,7 @@ boost-python1.72_package() {
 		vmove "usr/lib/libboost_python2*.so.*"
 	}
 }
-boost-python3-1.72_package() {
+boost-python3-1.79_package() {
 	depends="boost python3"
 	replaces="boost-python3>=0"
 	short_desc+=" - Python3 bindings"
@@ -154,7 +133,7 @@ boost-devel_package() {
 	}
 }
 
-libboost_atomic1.72_package() {
+libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
@@ -162,7 +141,7 @@ libboost_atomic1.72_package() {
 	}
 }
 
-libboost_chrono1.72_package() {
+libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
@@ -170,7 +149,7 @@ libboost_chrono1.72_package() {
 	}
 }
 
-libboost_container1.72_package() {
+libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
@@ -178,7 +157,7 @@ libboost_container1.72_package() {
 	}
 }
 
-libboost_context1.72_package() {
+libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
@@ -186,7 +165,7 @@ libboost_context1.72_package() {
 	}
 }
 
-libboost_contract1.72_package() {
+libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
@@ -194,7 +173,7 @@ libboost_contract1.72_package() {
 	}
 }
 
-libboost_coroutine1.72_package() {
+libboost_coroutine1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
@@ -202,7 +181,7 @@ libboost_coroutine1.72_package() {
 	}
 }
 
-libboost_date_time1.72_package() {
+libboost_date_time1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
@@ -210,7 +189,7 @@ libboost_date_time1.72_package() {
 	}
 }
 
-libboost_fiber1.72_package() {
+libboost_fiber1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_fiber"
 	pkg_install() {
@@ -218,7 +197,7 @@ libboost_fiber1.72_package() {
 	}
 }
 
-libboost_filesystem1.72_package() {
+libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
@@ -226,7 +205,7 @@ libboost_filesystem1.72_package() {
 	}
 }
 
-libboost_graph1.72_package() {
+libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
@@ -234,7 +213,7 @@ libboost_graph1.72_package() {
 	}
 }
 
-libboost_iostreams1.72_package() {
+libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
@@ -242,7 +221,7 @@ libboost_iostreams1.72_package() {
 	}
 }
 
-libboost_locale1.72_package() {
+libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
@@ -250,7 +229,7 @@ libboost_locale1.72_package() {
 	}
 }
 
-libboost_log1.72_package() {
+libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
@@ -258,7 +237,7 @@ libboost_log1.72_package() {
 	}
 }
 
-libboost_log_setup1.72_package() {
+libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
@@ -266,7 +245,7 @@ libboost_log_setup1.72_package() {
 	}
 }
 
-libboost_math_c991.72_package() {
+libboost_math_c99-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
@@ -274,7 +253,7 @@ libboost_math_c991.72_package() {
 	}
 }
 
-libboost_math_c99f1.72_package() {
+libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
@@ -282,7 +261,7 @@ libboost_math_c99f1.72_package() {
 	}
 }
 
-libboost_math_c99l1.72_package() {
+libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
@@ -290,7 +269,7 @@ libboost_math_c99l1.72_package() {
 	}
 }
 
-libboost_math_tr11.72_package() {
+libboost_math_tr1-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
@@ -298,7 +277,7 @@ libboost_math_tr11.72_package() {
 	}
 }
 
-libboost_math_tr1f1.72_package() {
+libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
@@ -306,7 +285,7 @@ libboost_math_tr1f1.72_package() {
 	}
 }
 
-libboost_math_tr1l1.72_package() {
+libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
@@ -314,7 +293,7 @@ libboost_math_tr1l1.72_package() {
 	}
 }
 
-libboost_prg_exec_monitor1.72_package() {
+libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
@@ -322,7 +301,7 @@ libboost_prg_exec_monitor1.72_package() {
 	}
 }
 
-libboost_program_options1.72_package() {
+libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
@@ -330,7 +309,7 @@ libboost_program_options1.72_package() {
 	}
 }
 
-libboost_random1.72_package() {
+libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
@@ -338,7 +317,7 @@ libboost_random1.72_package() {
 	}
 }
 
-libboost_regex1.72_package() {
+libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
@@ -346,7 +325,7 @@ libboost_regex1.72_package() {
 	}
 }
 
-libboost_serialization1.72_package() {
+libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
@@ -354,7 +333,7 @@ libboost_serialization1.72_package() {
 	}
 }
 
-libboost_stacktrace_addr2line1.72_package() {
+libboost_stacktrace_addr2line1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_addr2line"
 	pkg_install() {
@@ -362,7 +341,7 @@ libboost_stacktrace_addr2line1.72_package() {
 	}
 }
 
-libboost_stacktrace_basic1.72_package() {
+libboost_stacktrace_basic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_basic"
 	pkg_install() {
@@ -370,7 +349,7 @@ libboost_stacktrace_basic1.72_package() {
 	}
 }
 
-libboost_stacktrace_noop1.72_package() {
+libboost_stacktrace_noop1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_noop"
 	pkg_install() {
@@ -378,7 +357,7 @@ libboost_stacktrace_noop1.72_package() {
 	}
 }
 
-libboost_system1.72_package() {
+libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
@@ -386,7 +365,7 @@ libboost_system1.72_package() {
 	}
 }
 
-libboost_thread1.72_package() {
+libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
@@ -394,7 +373,7 @@ libboost_thread1.72_package() {
 	}
 }
 
-libboost_timer1.72_package() {
+libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
@@ -402,7 +381,7 @@ libboost_timer1.72_package() {
 	}
 }
 
-libboost_type_erasure1.72_package() {
+libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
@@ -410,7 +389,7 @@ libboost_type_erasure1.72_package() {
 	}
 }
 
-libboost_unit_test_framework1.72_package() {
+libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
@@ -418,7 +397,7 @@ libboost_unit_test_framework1.72_package() {
 	}
 }
 
-libboost_wave1.72_package() {
+libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
@@ -426,10 +405,26 @@ libboost_wave1.72_package() {
 	}
 }
 
-libboost_wserialization1.72_package() {
+libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
 		vmove usr/lib/libboost_wserialization.so.*
 	}
 }
+
+libboost_json1.79_package() {
+	depends="boost"
+	short_desc+=" - libboost_json"
+	pkg_install() {
+		vmove "usr/lib/libboost_json.so.*"
+	}
+}
+
+libboost_nowide1.79_package() {
+	depends="boost"
+	short_desc+=" - libboost_nowide"
+	pkg_install() {
+		vmove "usr/lib/libboost_nowide.so.*"
+	}
+}
diff --git a/srcpkgs/libboost_atomic1.72 b/srcpkgs/libboost_atomic1.79
similarity index 100%
rename from srcpkgs/libboost_atomic1.72
rename to srcpkgs/libboost_atomic1.79
diff --git a/srcpkgs/libboost_chrono1.72 b/srcpkgs/libboost_chrono1.79
similarity index 100%
rename from srcpkgs/libboost_chrono1.72
rename to srcpkgs/libboost_chrono1.79
diff --git a/srcpkgs/libboost_container1.72 b/srcpkgs/libboost_container1.79
similarity index 100%
rename from srcpkgs/libboost_container1.72
rename to srcpkgs/libboost_container1.79
diff --git a/srcpkgs/libboost_context1.72 b/srcpkgs/libboost_context1.79
similarity index 100%
rename from srcpkgs/libboost_context1.72
rename to srcpkgs/libboost_context1.79
diff --git a/srcpkgs/libboost_contract1.72 b/srcpkgs/libboost_contract1.79
similarity index 100%
rename from srcpkgs/libboost_contract1.72
rename to srcpkgs/libboost_contract1.79
diff --git a/srcpkgs/libboost_coroutine1.72 b/srcpkgs/libboost_coroutine1.79
similarity index 100%
rename from srcpkgs/libboost_coroutine1.72
rename to srcpkgs/libboost_coroutine1.79
diff --git a/srcpkgs/libboost_date_time1.72 b/srcpkgs/libboost_date_time1.79
similarity index 100%
rename from srcpkgs/libboost_date_time1.72
rename to srcpkgs/libboost_date_time1.79
diff --git a/srcpkgs/libboost_fiber1.72 b/srcpkgs/libboost_fiber1.79
similarity index 100%
rename from srcpkgs/libboost_fiber1.72
rename to srcpkgs/libboost_fiber1.79
diff --git a/srcpkgs/libboost_filesystem1.72 b/srcpkgs/libboost_filesystem1.79
similarity index 100%
rename from srcpkgs/libboost_filesystem1.72
rename to srcpkgs/libboost_filesystem1.79
diff --git a/srcpkgs/libboost_graph1.72 b/srcpkgs/libboost_graph1.79
similarity index 100%
rename from srcpkgs/libboost_graph1.72
rename to srcpkgs/libboost_graph1.79
diff --git a/srcpkgs/libboost_iostreams1.72 b/srcpkgs/libboost_iostreams1.79
similarity index 100%
rename from srcpkgs/libboost_iostreams1.72
rename to srcpkgs/libboost_iostreams1.79
diff --git a/srcpkgs/libboost_locale1.72 b/srcpkgs/libboost_json1.79
similarity index 100%
rename from srcpkgs/libboost_locale1.72
rename to srcpkgs/libboost_json1.79
diff --git a/srcpkgs/libboost_log1.72 b/srcpkgs/libboost_locale1.79
similarity index 100%
rename from srcpkgs/libboost_log1.72
rename to srcpkgs/libboost_locale1.79
diff --git a/srcpkgs/libboost_log_setup1.72 b/srcpkgs/libboost_log1.79
similarity index 100%
rename from srcpkgs/libboost_log_setup1.72
rename to srcpkgs/libboost_log1.79
diff --git a/srcpkgs/libboost_math_c991.72 b/srcpkgs/libboost_log_setup1.79
similarity index 100%
rename from srcpkgs/libboost_math_c991.72
rename to srcpkgs/libboost_log_setup1.79
diff --git a/srcpkgs/libboost_math_c99f1.72 b/srcpkgs/libboost_math_c99-1.79
similarity index 100%
rename from srcpkgs/libboost_math_c99f1.72
rename to srcpkgs/libboost_math_c99-1.79
diff --git a/srcpkgs/libboost_math_c99l1.72 b/srcpkgs/libboost_math_c99f1.79
similarity index 100%
rename from srcpkgs/libboost_math_c99l1.72
rename to srcpkgs/libboost_math_c99f1.79
diff --git a/srcpkgs/libboost_math_tr11.72 b/srcpkgs/libboost_math_c99l1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr11.72
rename to srcpkgs/libboost_math_c99l1.79
diff --git a/srcpkgs/libboost_math_tr1f1.72 b/srcpkgs/libboost_math_tr1-1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1f1.72
rename to srcpkgs/libboost_math_tr1-1.79
diff --git a/srcpkgs/libboost_math_tr1l1.72 b/srcpkgs/libboost_math_tr1f1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1l1.72
rename to srcpkgs/libboost_math_tr1f1.79
diff --git a/srcpkgs/libboost_prg_exec_monitor1.72 b/srcpkgs/libboost_math_tr1l1.79
similarity index 100%
rename from srcpkgs/libboost_prg_exec_monitor1.72
rename to srcpkgs/libboost_math_tr1l1.79
diff --git a/srcpkgs/libboost_program_options1.72 b/srcpkgs/libboost_nowide1.79
similarity index 100%
rename from srcpkgs/libboost_program_options1.72
rename to srcpkgs/libboost_nowide1.79
diff --git a/srcpkgs/libboost_random1.72 b/srcpkgs/libboost_prg_exec_monitor1.79
similarity index 100%
rename from srcpkgs/libboost_random1.72
rename to srcpkgs/libboost_prg_exec_monitor1.79
diff --git a/srcpkgs/libboost_regex1.72 b/srcpkgs/libboost_program_options1.79
similarity index 100%
rename from srcpkgs/libboost_regex1.72
rename to srcpkgs/libboost_program_options1.79
diff --git a/srcpkgs/libboost_serialization1.72 b/srcpkgs/libboost_random1.79
similarity index 100%
rename from srcpkgs/libboost_serialization1.72
rename to srcpkgs/libboost_random1.79
diff --git a/srcpkgs/libboost_stacktrace_addr2line1.72 b/srcpkgs/libboost_regex1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_addr2line1.72
rename to srcpkgs/libboost_regex1.79
diff --git a/srcpkgs/libboost_stacktrace_basic1.72 b/srcpkgs/libboost_serialization1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_basic1.72
rename to srcpkgs/libboost_serialization1.79
diff --git a/srcpkgs/libboost_stacktrace_noop1.72 b/srcpkgs/libboost_stacktrace_addr2line1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_noop1.72
rename to srcpkgs/libboost_stacktrace_addr2line1.79
diff --git a/srcpkgs/libboost_system1.72 b/srcpkgs/libboost_stacktrace_basic1.79
similarity index 100%
rename from srcpkgs/libboost_system1.72
rename to srcpkgs/libboost_stacktrace_basic1.79
diff --git a/srcpkgs/libboost_thread1.72 b/srcpkgs/libboost_stacktrace_noop1.79
similarity index 100%
rename from srcpkgs/libboost_thread1.72
rename to srcpkgs/libboost_stacktrace_noop1.79
diff --git a/srcpkgs/libboost_timer1.72 b/srcpkgs/libboost_system1.79
similarity index 100%
rename from srcpkgs/libboost_timer1.72
rename to srcpkgs/libboost_system1.79
diff --git a/srcpkgs/libboost_type_erasure1.72 b/srcpkgs/libboost_thread1.79
similarity index 100%
rename from srcpkgs/libboost_type_erasure1.72
rename to srcpkgs/libboost_thread1.79
diff --git a/srcpkgs/libboost_unit_test_framework1.72 b/srcpkgs/libboost_timer1.79
similarity index 100%
rename from srcpkgs/libboost_unit_test_framework1.72
rename to srcpkgs/libboost_timer1.79
diff --git a/srcpkgs/libboost_wave1.72 b/srcpkgs/libboost_type_erasure1.79
similarity index 100%
rename from srcpkgs/libboost_wave1.72
rename to srcpkgs/libboost_type_erasure1.79
diff --git a/srcpkgs/libboost_wserialization1.72 b/srcpkgs/libboost_unit_test_framework1.79
similarity index 100%
rename from srcpkgs/libboost_wserialization1.72
rename to srcpkgs/libboost_unit_test_framework1.79
diff --git a/srcpkgs/libboost_wave1.79 b/srcpkgs/libboost_wave1.79
new file mode 120000
index 000000000000..baef819c48f6
--- /dev/null
+++ b/srcpkgs/libboost_wave1.79
@@ -0,0 +1 @@
+boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_wserialization1.79 b/srcpkgs/libboost_wserialization1.79
new file mode 120000
index 000000000000..baef819c48f6
--- /dev/null
+++ b/srcpkgs/libboost_wserialization1.79
@@ -0,0 +1 @@
+boost
\ No newline at end of file

From e21adca57850bc707e0819694419ae4c9a525b27 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 18:29:05 +0200
Subject: [PATCH 2/3] boost: quote all vmove's with a glob.

---
 srcpkgs/boost/template | 70 +++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index ad705311b867..7a9c1c33fa44 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -137,7 +137,7 @@ libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
-		vmove usr/lib/libboost_atomic.so.*
+		vmove "usr/lib/libboost_atomic.so.*"
 	}
 }
 
@@ -145,7 +145,7 @@ libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
-		vmove usr/lib/libboost_chrono.so.*
+		vmove "usr/lib/libboost_chrono.so.*"
 	}
 }
 
@@ -153,7 +153,7 @@ libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
-		vmove usr/lib/libboost_container.so.*
+		vmove "usr/lib/libboost_container.so.*"
 	}
 }
 
@@ -161,7 +161,7 @@ libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
-		vmove usr/lib/libboost_context.so.*
+		vmove "usr/lib/libboost_context.so.*"
 	}
 }
 
@@ -169,7 +169,7 @@ libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
-		vmove usr/lib/libboost_contract.so.*
+		vmove "usr/lib/libboost_contract.so.*"
 	}
 }
 
@@ -177,7 +177,7 @@ libboost_coroutine1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
-		vmove usr/lib/libboost_coroutine.so.*
+		vmove "usr/lib/libboost_coroutine.so.*"
 	}
 }
 
@@ -185,7 +185,7 @@ libboost_date_time1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
-		vmove usr/lib/libboost_date_time.so.*
+		vmove "usr/lib/libboost_date_time.so.*"
 	}
 }
 
@@ -193,7 +193,7 @@ libboost_fiber1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_fiber"
 	pkg_install() {
-		vmove usr/lib/libboost_fiber.so.*
+		vmove "usr/lib/libboost_fiber.so.*"
 	}
 }
 
@@ -201,7 +201,7 @@ libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
-		vmove usr/lib/libboost_filesystem.so.*
+		vmove "usr/lib/libboost_filesystem.so.*"
 	}
 }
 
@@ -209,7 +209,7 @@ libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
-		vmove usr/lib/libboost_graph.so.*
+		vmove "usr/lib/libboost_graph.so.*"
 	}
 }
 
@@ -217,7 +217,7 @@ libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
-		vmove usr/lib/libboost_iostreams.so.*
+		vmove "usr/lib/libboost_iostreams.so.*"
 	}
 }
 
@@ -225,7 +225,7 @@ libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
-		vmove usr/lib/libboost_locale.so.*
+		vmove "usr/lib/libboost_locale.so.*"
 	}
 }
 
@@ -233,7 +233,7 @@ libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
-		vmove usr/lib/libboost_log.so.*
+		vmove "usr/lib/libboost_log.so.*"
 	}
 }
 
@@ -241,7 +241,7 @@ libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
-		vmove usr/lib/libboost_log_setup.so.*
+		vmove "usr/lib/libboost_log_setup.so.*"
 	}
 }
 
@@ -249,7 +249,7 @@ libboost_math_c99-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99.so.*
+		vmove "usr/lib/libboost_math_c99.so.*"
 	}
 }
 
@@ -257,7 +257,7 @@ libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99f.so.*
+		vmove "usr/lib/libboost_math_c99f.so.*"
 	}
 }
 
@@ -265,7 +265,7 @@ libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99l.so.*
+		vmove "usr/lib/libboost_math_c99l.so.*"
 	}
 }
 
@@ -273,7 +273,7 @@ libboost_math_tr1-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1.so.*
+		vmove "usr/lib/libboost_math_tr1.so.*"
 	}
 }
 
@@ -281,7 +281,7 @@ libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1f.so.*
+		vmove "usr/lib/libboost_math_tr1f.so.*"
 	}
 }
 
@@ -289,7 +289,7 @@ libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1l.so.*
+		vmove "usr/lib/libboost_math_tr1l.so.*"
 	}
 }
 
@@ -297,7 +297,7 @@ libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
-		vmove usr/lib/libboost_prg_exec_monitor.so.*
+		vmove "usr/lib/libboost_prg_exec_monitor.so.*"
 	}
 }
 
@@ -305,7 +305,7 @@ libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
-		vmove usr/lib/libboost_program_options.so.*
+		vmove "usr/lib/libboost_program_options.so.*"
 	}
 }
 
@@ -313,7 +313,7 @@ libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
-		vmove usr/lib/libboost_random.so.*
+		vmove "usr/lib/libboost_random.so.*"
 	}
 }
 
@@ -321,7 +321,7 @@ libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
-		vmove usr/lib/libboost_regex.so.*
+		vmove "usr/lib/libboost_regex.so.*"
 	}
 }
 
@@ -329,7 +329,7 @@ libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
-		vmove usr/lib/libboost_serialization.so.*
+		vmove "usr/lib/libboost_serialization.so.*"
 	}
 }
 
@@ -337,7 +337,7 @@ libboost_stacktrace_addr2line1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_addr2line"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_addr2line.so.*
+		vmove "usr/lib/libboost_stacktrace_addr2line.so.*"
 	}
 }
 
@@ -345,7 +345,7 @@ libboost_stacktrace_basic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_basic"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_basic.so.*
+		vmove "usr/lib/libboost_stacktrace_basic.so.*"
 	}
 }
 
@@ -353,7 +353,7 @@ libboost_stacktrace_noop1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_noop"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_noop.so.*
+		vmove "usr/lib/libboost_stacktrace_noop.so.*"
 	}
 }
 
@@ -361,7 +361,7 @@ libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
-		vmove usr/lib/libboost_system.so.*
+		vmove "usr/lib/libboost_system.so.*"
 	}
 }
 
@@ -369,7 +369,7 @@ libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
-		vmove usr/lib/libboost_thread.so.*
+		vmove "usr/lib/libboost_thread.so.*"
 	}
 }
 
@@ -377,7 +377,7 @@ libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
-		vmove usr/lib/libboost_timer.so.*
+		vmove "usr/lib/libboost_timer.so.*"
 	}
 }
 
@@ -385,7 +385,7 @@ libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
-		vmove usr/lib/libboost_type_erasure.so.*
+		vmove "usr/lib/libboost_type_erasure.so.*"
 	}
 }
 
@@ -393,7 +393,7 @@ libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
-		vmove usr/lib/libboost_unit_test_framework.so.*
+		vmove "usr/lib/libboost_unit_test_framework.so.*"
 	}
 }
 
@@ -401,7 +401,7 @@ libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
-		vmove usr/lib/libboost_wave.so.*
+		vmove "usr/lib/libboost_wave.so.*"
 	}
 }
 
@@ -409,7 +409,7 @@ libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
-		vmove usr/lib/libboost_wserialization.so.*
+		vmove "usr/lib/libboost_wserialization.so.*"
 	}
 }
 

From 28eb27fecdb55fe1b4ea9e865439d1741efa4185 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 26 May 2022 18:52:59 +0300
Subject: [PATCH 3/3] uhd: update to 4.2.0.0.

[ci skip] the PR is still WIP
---
 common/shlibs        | 2 +-
 srcpkgs/uhd/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index bb418cdfc245..529a07f73a31 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3595,7 +3595,7 @@ libbinpac.so.0 zeek-3.2.4_2
 libllhttp.so.1 llhttp-1.0.1_1
 libpinyin.so.13 libpinyin-2.2.1_1
 libzhuyin.so.13 libzhuyin-2.6.0_3
-libuhd.so.4.0.0 uhd-4.0.0.0_1
+libuhd.so.4.2.0 uhd-4.2.0.0_1
 libeditline.so.1 editline-1.16.0_1
 libgnuradio-rds.so.1 gnuradio-rds-3.8.0_1
 libgnuradio-nrsc5-1.0.0git.so.0.0.0 gnuradio-nrsc5-1.0.0_1
diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template
index 5f043162d7dc..685f877dc380 100644
--- a/srcpkgs/uhd/template
+++ b/srcpkgs/uhd/template
@@ -1,6 +1,6 @@
 # Template file for 'uhd'
 pkgname=uhd
-version=4.0.0.0
+version=4.2.0.0
 revision=1
 build_wrksrc=host
 build_style=cmake
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://files.ettus.com/manual/"
 changelog="https://raw.githubusercontent.com/EttusResearch/uhd/master/CHANGELOG"
 distfiles="https://github.com/EttusResearch/uhd/archive/v${version}.tar.gz"
-checksum=4f3513c43edf0178391ed5755266864532716b8b503bcfb9a983ae6256c51b14
+checksum=ad15cedc8a4b9ba78078f1c4c3c179eff8297a08e44928679de896ca42313e6b
 python_version=3
 
 case "${XBPS_TARGET_MACHINE}" in

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] boost: update to 1.79.0.
  2022-03-18 14:28 [PR PATCH] boost: update to 1.79.0.b1 JamiKettunen
                   ` (15 preceding siblings ...)
  2022-05-26 16:21 ` JamiKettunen
@ 2022-05-26 18:41 ` JamiKettunen
  2022-05-26 20:27 ` JamiKettunen
                   ` (11 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: JamiKettunen @ 2022-05-26 18:41 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3749 bytes --]

There is an updated pull request by JamiKettunen against master on the void-packages repository

https://github.com/JamiKettunen/void-packages boost-1.79.0
https://github.com/void-linux/void-packages/pull/36204

boost: update to 1.79.0.
#### Packages to fix (from `xrevshlib boost` as locally build-tested on `x86_64-musl`)
- [ ] Aegisub (fails on `do_build()`)
- [ ] PrusaSlicer (fails on `do_build()`)
- [ ] TSC (fails on `do_build()`)
- [ ] bitcoin (fails on `do_check()`)
- [ ] openimageio (fails on `pre_build()`, `vsed` doesn't change `src/cmake/compiler.cmake`)
  - [ ] blender (depends on `openimageio`)
- [ ] cryfs (fails on `do_build()`)
- [ ] leatherman (hangs on `do_check()`, test process pinned one core at 100% for 10 minutes)
  - [ ] facter (depends on `leatherman`)
- [ ] fifengine (fails on `do_build()`)
- [x] uhd (fails on `do_build()`)
  - [ ] gnuradio (depends on `uhd`)
    - [ ] gnuradio-osmosdr (depends on `gnuradio`)
- [ ] imagescan (fails on `do_build()`)
- [ ] inkscape (fails on `do_check()`)
- [ ] kea (fails on `do_build()`)
- [ ] ledger (fails on `do_build()`)
- [ ] libbitcoin-system (fails on `do_build()`)
  - [ ] libbitcoin-database (depends on `libbitcoin-system`)
    - [ ] libbitcoin-blockchain (depends on `libbitcoin-database`)
      - [ ] libbitcoin-node (depends on `libbitcoin-blockchain`)
      - [ ] libbitcoin-server (depends on `libbitcoin-blockchain`)
  - [ ] libbitcoin-protocol (depends on `libbitcoin-system`)
    - [ ] libbitcoin-client (depends on `libbitcoin-protocol`)
      - [ ] libbitcoin-explorer (depends on `libbitcoin-client`)
  - [ ] libbitcoin-network (depends on `libbitcoin-system`)
- [ ] libetonyek (fails on `do_build()`, appears to need `-std=c++17` or higher? `NUM3Parser.cpp:46:8: error: 'for_each' is not a member of 'std'`)
  - [ ] libreoffice (depends on `libetonyek`)
- [ ] librime (fails on `do_build()`)
- [ ] libtorrent-rasterbar (hangs on `do_check()`, 90/97 test_web_seed_http stuck for 10 minutes)
- [ ] namecoin (fails on `do_build()`)
- [ ] pulseeffects-legacy (fails on `do_build()`)
- [ ] schroot (fails on `do_check()`)
- [ ] supercollider (fails on `do_build()`)
- [ ] swiften (fails on `do_patch`, `fix-cross-build.patch` doesn't apply)

#### Packages to fix (from `xrevshlib uhd` as locally build-tested on `x86_64-musl`)
- [ ] urh (fails on `do_check()` even after adding `checkdepends="python3-pip"`)

#### Modified patches
`exec_file.patch`: Removed due to being upstream as https://github.com/boostorg/python/commit/d9f06052e28873037db7f98629bce72182a42410
`mips.patch`: Updated to apply on top of https://github.com/boostorg/fiber/commit/5dc9dabc5d5ff8da53ec897c265c9cba1b6ed0df, not sure if this can be removed now(?)

#### Misc changes
- I've renamed all subpackages of `boost` so that the versioned name doesn't conflict with other numbers and are consistent with the previously existing `boost-python3-1.72`, e.g. `libboost_math_c991.72` is now `libboost_math_c99-1.79` (notice the `-`!)

#### Testing the changes
- I tested the changes in this PR: **NO**

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36204.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boost-1.79.0-36204.patch --]
[-- Type: text/x-diff, Size: 51173 bytes --]

From d806b7c68d6d8c0a4073ce607fb91e4e294027a7 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 15:28:37 +0200
Subject: [PATCH 1/4] boost: update to 1.79.0.

---
 common/shlibs                                 |  64 +++----
 .../{boost-python1.72 => boost-python1.79}    |   0
 ...{boost-python3-1.72 => boost-python3-1.79} |   0
 srcpkgs/boost/patches/exec_file.patch         |  45 -----
 srcpkgs/boost/patches/mips.patch              |   2 +-
 srcpkgs/boost/template                        | 161 +++++++++---------
 ...ibboost_atomic1.72 => libboost_atomic1.79} |   0
 ...ibboost_chrono1.72 => libboost_chrono1.79} |   0
 ...t_container1.72 => libboost_container1.79} |   0
 ...boost_context1.72 => libboost_context1.79} |   0
 ...ost_contract1.72 => libboost_contract1.79} |   0
 ...t_coroutine1.72 => libboost_coroutine1.79} |   0
 ...t_date_time1.72 => libboost_date_time1.79} |   0
 ...{libboost_fiber1.72 => libboost_fiber1.79} |   0
 ...filesystem1.72 => libboost_filesystem1.79} |   0
 ...{libboost_graph1.72 => libboost_graph1.79} |   0
 ...t_iostreams1.72 => libboost_iostreams1.79} |   0
 ...{libboost_locale1.72 => libboost_json1.79} |   0
 .../{libboost_log1.72 => libboost_locale1.79} |   0
 ...ibboost_log_setup1.72 => libboost_log1.79} |   0
 ...st_math_c991.72 => libboost_log_setup1.79} |   0
 ...t_math_c99f1.72 => libboost_math_c99-1.79} |   0
 ...t_math_c99l1.72 => libboost_math_c99f1.79} |   0
 ...st_math_tr11.72 => libboost_math_c99l1.79} |   0
 ...t_math_tr1f1.72 => libboost_math_tr1-1.79} |   0
 ...t_math_tr1l1.72 => libboost_math_tr1f1.79} |   0
 ...xec_monitor1.72 => libboost_math_tr1l1.79} |   0
 ...rogram_options1.72 => libboost_nowide1.79} |   0
 ...ndom1.72 => libboost_prg_exec_monitor1.79} |   0
 ...regex1.72 => libboost_program_options1.79} |   0
 ..._serialization1.72 => libboost_random1.79} |   0
 ...trace_addr2line1.72 => libboost_regex1.79} |   0
 ...e_basic1.72 => libboost_serialization1.79} |   0
 ...1.72 => libboost_stacktrace_addr2line1.79} |   0
 ...stem1.72 => libboost_stacktrace_basic1.79} |   0
 ...hread1.72 => libboost_stacktrace_noop1.79} |   0
 ...libboost_timer1.72 => libboost_system1.79} |   0
 ...t_type_erasure1.72 => libboost_thread1.79} |   0
 ..._test_framework1.72 => libboost_timer1.79} |   0
 ...ost_wave1.72 => libboost_type_erasure1.79} |   0
 ...n1.72 => libboost_unit_test_framework1.79} |   0
 srcpkgs/libboost_wave1.79                     |   1 +
 srcpkgs/libboost_wserialization1.79           |   1 +
 43 files changed, 113 insertions(+), 161 deletions(-)
 rename srcpkgs/{boost-python1.72 => boost-python1.79} (100%)
 rename srcpkgs/{boost-python3-1.72 => boost-python3-1.79} (100%)
 delete mode 100644 srcpkgs/boost/patches/exec_file.patch
 rename srcpkgs/{libboost_atomic1.72 => libboost_atomic1.79} (100%)
 rename srcpkgs/{libboost_chrono1.72 => libboost_chrono1.79} (100%)
 rename srcpkgs/{libboost_container1.72 => libboost_container1.79} (100%)
 rename srcpkgs/{libboost_context1.72 => libboost_context1.79} (100%)
 rename srcpkgs/{libboost_contract1.72 => libboost_contract1.79} (100%)
 rename srcpkgs/{libboost_coroutine1.72 => libboost_coroutine1.79} (100%)
 rename srcpkgs/{libboost_date_time1.72 => libboost_date_time1.79} (100%)
 rename srcpkgs/{libboost_fiber1.72 => libboost_fiber1.79} (100%)
 rename srcpkgs/{libboost_filesystem1.72 => libboost_filesystem1.79} (100%)
 rename srcpkgs/{libboost_graph1.72 => libboost_graph1.79} (100%)
 rename srcpkgs/{libboost_iostreams1.72 => libboost_iostreams1.79} (100%)
 rename srcpkgs/{libboost_locale1.72 => libboost_json1.79} (100%)
 rename srcpkgs/{libboost_log1.72 => libboost_locale1.79} (100%)
 rename srcpkgs/{libboost_log_setup1.72 => libboost_log1.79} (100%)
 rename srcpkgs/{libboost_math_c991.72 => libboost_log_setup1.79} (100%)
 rename srcpkgs/{libboost_math_c99f1.72 => libboost_math_c99-1.79} (100%)
 rename srcpkgs/{libboost_math_c99l1.72 => libboost_math_c99f1.79} (100%)
 rename srcpkgs/{libboost_math_tr11.72 => libboost_math_c99l1.79} (100%)
 rename srcpkgs/{libboost_math_tr1f1.72 => libboost_math_tr1-1.79} (100%)
 rename srcpkgs/{libboost_math_tr1l1.72 => libboost_math_tr1f1.79} (100%)
 rename srcpkgs/{libboost_prg_exec_monitor1.72 => libboost_math_tr1l1.79} (100%)
 rename srcpkgs/{libboost_program_options1.72 => libboost_nowide1.79} (100%)
 rename srcpkgs/{libboost_random1.72 => libboost_prg_exec_monitor1.79} (100%)
 rename srcpkgs/{libboost_regex1.72 => libboost_program_options1.79} (100%)
 rename srcpkgs/{libboost_serialization1.72 => libboost_random1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_addr2line1.72 => libboost_regex1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_basic1.72 => libboost_serialization1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_noop1.72 => libboost_stacktrace_addr2line1.79} (100%)
 rename srcpkgs/{libboost_system1.72 => libboost_stacktrace_basic1.79} (100%)
 rename srcpkgs/{libboost_thread1.72 => libboost_stacktrace_noop1.79} (100%)
 rename srcpkgs/{libboost_timer1.72 => libboost_system1.79} (100%)
 rename srcpkgs/{libboost_type_erasure1.72 => libboost_thread1.79} (100%)
 rename srcpkgs/{libboost_unit_test_framework1.72 => libboost_timer1.79} (100%)
 rename srcpkgs/{libboost_wave1.72 => libboost_type_erasure1.79} (100%)
 rename srcpkgs/{libboost_wserialization1.72 => libboost_unit_test_framework1.79} (100%)
 create mode 120000 srcpkgs/libboost_wave1.79
 create mode 120000 srcpkgs/libboost_wserialization1.79

diff --git a/common/shlibs b/common/shlibs
index 9fd62e7c1baf..bb418cdfc245 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -620,38 +620,38 @@ 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.79.0 libboost_context1.79-1.79.0_1
+libboost_coroutine.so.1.79.0 libboost_coroutine1.79-1.79.0_1
+libboost_container.so.1.79.0 libboost_container1.79-1.79.0_1
+libboost_prg_exec_monitor.so.1.79.0 libboost_prg_exec_monitor1.79-1.79.0_1
+libboost_timer.so.1.79.0 libboost_timer1.79-1.79.0_1
+libboost_random.so.1.79.0 libboost_random1.79-1.79.0_1
+libboost_filesystem.so.1.79.0 libboost_filesystem1.79-1.79.0_1
+libboost_unit_test_framework.so.1.79.0 libboost_unit_test_framework1.79-1.79.0_1
+libboost_math_c99.so.1.79.0 libboost_math_c99-1.79-1.79.0_1
+libboost_math_tr1.so.1.79.0 libboost_math_tr1-1.79-1.79.0_1
+libboost_regex.so.1.79.0 libboost_regex1.79-1.79.0_1
+libboost_serialization.so.1.79.0 libboost_serialization1.79-1.79.0_1
+libboost_chrono.so.1.79.0 libboost_chrono1.79-1.79.0_1
+libboost_wserialization.so.1.79.0 libboost_wserialization1.79-1.79.0_1
+libboost_graph.so.1.79.0 libboost_graph1.79-1.79.0_1
+libboost_log.so.1.79.0 libboost_log1.79-1.79.0_1
+libboost_locale.so.1.79.0 libboost_locale1.79-1.79.0_1
+libboost_program_options.so.1.79.0 libboost_program_options1.79-1.79.0_1
+libboost_iostreams.so.1.79.0 libboost_iostreams1.79-1.79.0_1
+libboost_system.so.1.79.0 libboost_system1.79-1.79.0_1
+libboost_thread.so.1.79.0 libboost_thread1.79-1.79.0_1
+libboost_log_setup.so.1.79.0 libboost_log_setup1.79-1.79.0_1
+libboost_date_time.so.1.79.0 libboost_date_time1.79-1.79.0_1
+libboost_wave.so.1.79.0 libboost_wave1.79-1.79.0_1
+libboost_atomic.so.1.79.0 libboost_atomic1.79-1.79.0_1
+libboost_type_erasure.so.1.79.0 libboost_type_erasure1.79-1.79.0_1
+libboost_fiber.so.1.79.0 libboost_fiber1.79-1.79.0_1
+libboost_stacktrace_noop.so.1.79.0 libboost_stacktrace_noop1.79-1.79.0_1
+libboost_stacktrace_addr2line.so.1.79.0 libboost_stacktrace_addr2line1.79-1.79.0_1
+libboost_stacktrace_basic.so.1.79.0 libboost_stacktrace_basic1.79-1.79.0_1
+libboost_python27.so.1.79.0 boost-python1.79-1.79.0_1
+libboost_python310.so.1.79.0 boost-python3-1.79-1.79.0_1
 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-python1.79
similarity index 100%
rename from srcpkgs/boost-python1.72
rename to srcpkgs/boost-python1.79
diff --git a/srcpkgs/boost-python3-1.72 b/srcpkgs/boost-python3-1.79
similarity index 100%
rename from srcpkgs/boost-python3-1.72
rename to srcpkgs/boost-python3-1.79
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/mips.patch b/srcpkgs/boost/patches/mips.patch
index a10a2122d9c7..8d253fc7c286 100644
--- a/srcpkgs/boost/patches/mips.patch
+++ b/srcpkgs/boost/patches/mips.patch
@@ -3,7 +3,7 @@
 @@ -48,7 +48,7 @@
  #  define cpu_relax() asm volatile ("nop" ::: "memory");
  # endif
- #elif BOOST_ARCH_MIPS
+ #elif BOOST_ARCH_MIPS && (((__mips_isa_rev > 1) && defined(__mips32)) || ((__mips_isa_rev > 2)  && defined(__mips64)))
 -# define cpu_relax() asm volatile ("pause" ::: "memory");
 +# define cpu_relax() asm volatile ("nop" ::: "memory");
  #elif BOOST_ARCH_PPC
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 126c50770b50..ad705311b867 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,8 +1,8 @@
 # Template file for 'boost'
 pkgname=boost
-version=1.72.0
-revision=7
-wrksrc="${pkgname}_${version//\./_}"
+version=1.79.0
+revision=1
+wrksrc="boost_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
 short_desc="Free peer-reviewed portable C++ source libraries"
@@ -10,53 +10,34 @@ 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=475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39
 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"
+subpackages="libboost_program_options1.79 libboost_math_c99f1.79
+ libboost_stacktrace_basic1.79 libboost_stacktrace_noop1.79
+ libboost_iostreams1.79 libboost_math_tr1l1.79 libboost_filesystem1.79
+ libboost_chrono1.79 libboost_math_tr1f1.79 libboost_wave1.79
+ libboost_graph1.79 libboost_locale1.79 libboost_regex1.79
+ libboost_fiber1.79 libboost_type_erasure1.79 libboost_coroutine1.79
+ libboost_atomic1.79 libboost_prg_exec_monitor1.79 libboost_math_c99-1.79
+ boost-python3-1.79 libboost_log_setup1.79 boost-devel
+ libboost_timer1.79 libboost_system1.79 libboost_unit_test_framework1.79
+ libboost_serialization1.79 libboost_math_tr1-1.79 boost-build
+ libboost_math_c99l1.79 boost-python1.79 libboost_contract1.79
+ libboost_date_time1.79 libboost_log1.79 libboost_random1.79
+ libboost_thread1.79 libboost_container1.79 boost-jam
+ libboost_wserialization1.79 libboost_context1.79 libboost_json1.79
+ libboost_nowide1.79"
 
 if [ -z "$CROSS_BUILD" ]; then
-	subpackages+=" libboost_stacktrace_addr2line1.72"
+	subpackages+=" libboost_stacktrace_addr2line1.79"
 fi
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*)    _arch=x86;      _abi=sysv  ;;
-	x86_64*)  _arch=x86;      _abi=sysv  ;;
-	arm*)     _arch=arm;      _abi=aapcs ;;
-	aarch64*) _arch=arm;      _abi=aapcs ;;
-	mips*)    _arch=mips32r2; _abi=o32   ;;
-	ppc*)     _arch=power;    _abi=sysv  ;;
+	i686*|x86_64*) _arch=x86;      _abi=sysv  ;;
+	arm*|aarch64*) _arch=arm;      _abi=aapcs ;;
+	mips*)         _arch=mips32r2; _abi=o32   ;;
+	ppc*)          _arch=power;    _abi=sysv  ;;
 esac
 
 do_build() {
@@ -66,7 +47,7 @@ do_build() {
 	(
 	# Rebuild bjam for target
 	cd tools/build/src/engine
-	./build.sh gcc
+	./build.sh --cxx="${CXX}" --cxxflags="${CXXFLAGS}" gcc
 	)
 	cat > user-config.jam <<-__EOF
 	using gcc : : ${CXX} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
@@ -74,10 +55,8 @@ do_build() {
 	using python : ${py3_ver} : ${XBPS_CROSS_BASE}/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} \
 		threading=multi runtime-link=shared link=shared,static
 }
@@ -119,7 +98,7 @@ boost-jam_package() {
 		vmove usr/bin/b2
 	}
 }
-boost-python1.72_package() {
+boost-python1.79_package() {
 	depends="boost python"
 	replaces="boost-python>=0"
 	short_desc+=" - Python bindings"
@@ -127,7 +106,7 @@ boost-python1.72_package() {
 		vmove "usr/lib/libboost_python2*.so.*"
 	}
 }
-boost-python3-1.72_package() {
+boost-python3-1.79_package() {
 	depends="boost python3"
 	replaces="boost-python3>=0"
 	short_desc+=" - Python3 bindings"
@@ -154,7 +133,7 @@ boost-devel_package() {
 	}
 }
 
-libboost_atomic1.72_package() {
+libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
@@ -162,7 +141,7 @@ libboost_atomic1.72_package() {
 	}
 }
 
-libboost_chrono1.72_package() {
+libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
@@ -170,7 +149,7 @@ libboost_chrono1.72_package() {
 	}
 }
 
-libboost_container1.72_package() {
+libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
@@ -178,7 +157,7 @@ libboost_container1.72_package() {
 	}
 }
 
-libboost_context1.72_package() {
+libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
@@ -186,7 +165,7 @@ libboost_context1.72_package() {
 	}
 }
 
-libboost_contract1.72_package() {
+libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
@@ -194,7 +173,7 @@ libboost_contract1.72_package() {
 	}
 }
 
-libboost_coroutine1.72_package() {
+libboost_coroutine1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
@@ -202,7 +181,7 @@ libboost_coroutine1.72_package() {
 	}
 }
 
-libboost_date_time1.72_package() {
+libboost_date_time1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
@@ -210,7 +189,7 @@ libboost_date_time1.72_package() {
 	}
 }
 
-libboost_fiber1.72_package() {
+libboost_fiber1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_fiber"
 	pkg_install() {
@@ -218,7 +197,7 @@ libboost_fiber1.72_package() {
 	}
 }
 
-libboost_filesystem1.72_package() {
+libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
@@ -226,7 +205,7 @@ libboost_filesystem1.72_package() {
 	}
 }
 
-libboost_graph1.72_package() {
+libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
@@ -234,7 +213,7 @@ libboost_graph1.72_package() {
 	}
 }
 
-libboost_iostreams1.72_package() {
+libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
@@ -242,7 +221,7 @@ libboost_iostreams1.72_package() {
 	}
 }
 
-libboost_locale1.72_package() {
+libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
@@ -250,7 +229,7 @@ libboost_locale1.72_package() {
 	}
 }
 
-libboost_log1.72_package() {
+libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
@@ -258,7 +237,7 @@ libboost_log1.72_package() {
 	}
 }
 
-libboost_log_setup1.72_package() {
+libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
@@ -266,7 +245,7 @@ libboost_log_setup1.72_package() {
 	}
 }
 
-libboost_math_c991.72_package() {
+libboost_math_c99-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
@@ -274,7 +253,7 @@ libboost_math_c991.72_package() {
 	}
 }
 
-libboost_math_c99f1.72_package() {
+libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
@@ -282,7 +261,7 @@ libboost_math_c99f1.72_package() {
 	}
 }
 
-libboost_math_c99l1.72_package() {
+libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
@@ -290,7 +269,7 @@ libboost_math_c99l1.72_package() {
 	}
 }
 
-libboost_math_tr11.72_package() {
+libboost_math_tr1-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
@@ -298,7 +277,7 @@ libboost_math_tr11.72_package() {
 	}
 }
 
-libboost_math_tr1f1.72_package() {
+libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
@@ -306,7 +285,7 @@ libboost_math_tr1f1.72_package() {
 	}
 }
 
-libboost_math_tr1l1.72_package() {
+libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
@@ -314,7 +293,7 @@ libboost_math_tr1l1.72_package() {
 	}
 }
 
-libboost_prg_exec_monitor1.72_package() {
+libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
@@ -322,7 +301,7 @@ libboost_prg_exec_monitor1.72_package() {
 	}
 }
 
-libboost_program_options1.72_package() {
+libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
@@ -330,7 +309,7 @@ libboost_program_options1.72_package() {
 	}
 }
 
-libboost_random1.72_package() {
+libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
@@ -338,7 +317,7 @@ libboost_random1.72_package() {
 	}
 }
 
-libboost_regex1.72_package() {
+libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
@@ -346,7 +325,7 @@ libboost_regex1.72_package() {
 	}
 }
 
-libboost_serialization1.72_package() {
+libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
@@ -354,7 +333,7 @@ libboost_serialization1.72_package() {
 	}
 }
 
-libboost_stacktrace_addr2line1.72_package() {
+libboost_stacktrace_addr2line1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_addr2line"
 	pkg_install() {
@@ -362,7 +341,7 @@ libboost_stacktrace_addr2line1.72_package() {
 	}
 }
 
-libboost_stacktrace_basic1.72_package() {
+libboost_stacktrace_basic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_basic"
 	pkg_install() {
@@ -370,7 +349,7 @@ libboost_stacktrace_basic1.72_package() {
 	}
 }
 
-libboost_stacktrace_noop1.72_package() {
+libboost_stacktrace_noop1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_noop"
 	pkg_install() {
@@ -378,7 +357,7 @@ libboost_stacktrace_noop1.72_package() {
 	}
 }
 
-libboost_system1.72_package() {
+libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
@@ -386,7 +365,7 @@ libboost_system1.72_package() {
 	}
 }
 
-libboost_thread1.72_package() {
+libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
@@ -394,7 +373,7 @@ libboost_thread1.72_package() {
 	}
 }
 
-libboost_timer1.72_package() {
+libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
@@ -402,7 +381,7 @@ libboost_timer1.72_package() {
 	}
 }
 
-libboost_type_erasure1.72_package() {
+libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
@@ -410,7 +389,7 @@ libboost_type_erasure1.72_package() {
 	}
 }
 
-libboost_unit_test_framework1.72_package() {
+libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
@@ -418,7 +397,7 @@ libboost_unit_test_framework1.72_package() {
 	}
 }
 
-libboost_wave1.72_package() {
+libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
@@ -426,10 +405,26 @@ libboost_wave1.72_package() {
 	}
 }
 
-libboost_wserialization1.72_package() {
+libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
 		vmove usr/lib/libboost_wserialization.so.*
 	}
 }
+
+libboost_json1.79_package() {
+	depends="boost"
+	short_desc+=" - libboost_json"
+	pkg_install() {
+		vmove "usr/lib/libboost_json.so.*"
+	}
+}
+
+libboost_nowide1.79_package() {
+	depends="boost"
+	short_desc+=" - libboost_nowide"
+	pkg_install() {
+		vmove "usr/lib/libboost_nowide.so.*"
+	}
+}
diff --git a/srcpkgs/libboost_atomic1.72 b/srcpkgs/libboost_atomic1.79
similarity index 100%
rename from srcpkgs/libboost_atomic1.72
rename to srcpkgs/libboost_atomic1.79
diff --git a/srcpkgs/libboost_chrono1.72 b/srcpkgs/libboost_chrono1.79
similarity index 100%
rename from srcpkgs/libboost_chrono1.72
rename to srcpkgs/libboost_chrono1.79
diff --git a/srcpkgs/libboost_container1.72 b/srcpkgs/libboost_container1.79
similarity index 100%
rename from srcpkgs/libboost_container1.72
rename to srcpkgs/libboost_container1.79
diff --git a/srcpkgs/libboost_context1.72 b/srcpkgs/libboost_context1.79
similarity index 100%
rename from srcpkgs/libboost_context1.72
rename to srcpkgs/libboost_context1.79
diff --git a/srcpkgs/libboost_contract1.72 b/srcpkgs/libboost_contract1.79
similarity index 100%
rename from srcpkgs/libboost_contract1.72
rename to srcpkgs/libboost_contract1.79
diff --git a/srcpkgs/libboost_coroutine1.72 b/srcpkgs/libboost_coroutine1.79
similarity index 100%
rename from srcpkgs/libboost_coroutine1.72
rename to srcpkgs/libboost_coroutine1.79
diff --git a/srcpkgs/libboost_date_time1.72 b/srcpkgs/libboost_date_time1.79
similarity index 100%
rename from srcpkgs/libboost_date_time1.72
rename to srcpkgs/libboost_date_time1.79
diff --git a/srcpkgs/libboost_fiber1.72 b/srcpkgs/libboost_fiber1.79
similarity index 100%
rename from srcpkgs/libboost_fiber1.72
rename to srcpkgs/libboost_fiber1.79
diff --git a/srcpkgs/libboost_filesystem1.72 b/srcpkgs/libboost_filesystem1.79
similarity index 100%
rename from srcpkgs/libboost_filesystem1.72
rename to srcpkgs/libboost_filesystem1.79
diff --git a/srcpkgs/libboost_graph1.72 b/srcpkgs/libboost_graph1.79
similarity index 100%
rename from srcpkgs/libboost_graph1.72
rename to srcpkgs/libboost_graph1.79
diff --git a/srcpkgs/libboost_iostreams1.72 b/srcpkgs/libboost_iostreams1.79
similarity index 100%
rename from srcpkgs/libboost_iostreams1.72
rename to srcpkgs/libboost_iostreams1.79
diff --git a/srcpkgs/libboost_locale1.72 b/srcpkgs/libboost_json1.79
similarity index 100%
rename from srcpkgs/libboost_locale1.72
rename to srcpkgs/libboost_json1.79
diff --git a/srcpkgs/libboost_log1.72 b/srcpkgs/libboost_locale1.79
similarity index 100%
rename from srcpkgs/libboost_log1.72
rename to srcpkgs/libboost_locale1.79
diff --git a/srcpkgs/libboost_log_setup1.72 b/srcpkgs/libboost_log1.79
similarity index 100%
rename from srcpkgs/libboost_log_setup1.72
rename to srcpkgs/libboost_log1.79
diff --git a/srcpkgs/libboost_math_c991.72 b/srcpkgs/libboost_log_setup1.79
similarity index 100%
rename from srcpkgs/libboost_math_c991.72
rename to srcpkgs/libboost_log_setup1.79
diff --git a/srcpkgs/libboost_math_c99f1.72 b/srcpkgs/libboost_math_c99-1.79
similarity index 100%
rename from srcpkgs/libboost_math_c99f1.72
rename to srcpkgs/libboost_math_c99-1.79
diff --git a/srcpkgs/libboost_math_c99l1.72 b/srcpkgs/libboost_math_c99f1.79
similarity index 100%
rename from srcpkgs/libboost_math_c99l1.72
rename to srcpkgs/libboost_math_c99f1.79
diff --git a/srcpkgs/libboost_math_tr11.72 b/srcpkgs/libboost_math_c99l1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr11.72
rename to srcpkgs/libboost_math_c99l1.79
diff --git a/srcpkgs/libboost_math_tr1f1.72 b/srcpkgs/libboost_math_tr1-1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1f1.72
rename to srcpkgs/libboost_math_tr1-1.79
diff --git a/srcpkgs/libboost_math_tr1l1.72 b/srcpkgs/libboost_math_tr1f1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1l1.72
rename to srcpkgs/libboost_math_tr1f1.79
diff --git a/srcpkgs/libboost_prg_exec_monitor1.72 b/srcpkgs/libboost_math_tr1l1.79
similarity index 100%
rename from srcpkgs/libboost_prg_exec_monitor1.72
rename to srcpkgs/libboost_math_tr1l1.79
diff --git a/srcpkgs/libboost_program_options1.72 b/srcpkgs/libboost_nowide1.79
similarity index 100%
rename from srcpkgs/libboost_program_options1.72
rename to srcpkgs/libboost_nowide1.79
diff --git a/srcpkgs/libboost_random1.72 b/srcpkgs/libboost_prg_exec_monitor1.79
similarity index 100%
rename from srcpkgs/libboost_random1.72
rename to srcpkgs/libboost_prg_exec_monitor1.79
diff --git a/srcpkgs/libboost_regex1.72 b/srcpkgs/libboost_program_options1.79
similarity index 100%
rename from srcpkgs/libboost_regex1.72
rename to srcpkgs/libboost_program_options1.79
diff --git a/srcpkgs/libboost_serialization1.72 b/srcpkgs/libboost_random1.79
similarity index 100%
rename from srcpkgs/libboost_serialization1.72
rename to srcpkgs/libboost_random1.79
diff --git a/srcpkgs/libboost_stacktrace_addr2line1.72 b/srcpkgs/libboost_regex1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_addr2line1.72
rename to srcpkgs/libboost_regex1.79
diff --git a/srcpkgs/libboost_stacktrace_basic1.72 b/srcpkgs/libboost_serialization1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_basic1.72
rename to srcpkgs/libboost_serialization1.79
diff --git a/srcpkgs/libboost_stacktrace_noop1.72 b/srcpkgs/libboost_stacktrace_addr2line1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_noop1.72
rename to srcpkgs/libboost_stacktrace_addr2line1.79
diff --git a/srcpkgs/libboost_system1.72 b/srcpkgs/libboost_stacktrace_basic1.79
similarity index 100%
rename from srcpkgs/libboost_system1.72
rename to srcpkgs/libboost_stacktrace_basic1.79
diff --git a/srcpkgs/libboost_thread1.72 b/srcpkgs/libboost_stacktrace_noop1.79
similarity index 100%
rename from srcpkgs/libboost_thread1.72
rename to srcpkgs/libboost_stacktrace_noop1.79
diff --git a/srcpkgs/libboost_timer1.72 b/srcpkgs/libboost_system1.79
similarity index 100%
rename from srcpkgs/libboost_timer1.72
rename to srcpkgs/libboost_system1.79
diff --git a/srcpkgs/libboost_type_erasure1.72 b/srcpkgs/libboost_thread1.79
similarity index 100%
rename from srcpkgs/libboost_type_erasure1.72
rename to srcpkgs/libboost_thread1.79
diff --git a/srcpkgs/libboost_unit_test_framework1.72 b/srcpkgs/libboost_timer1.79
similarity index 100%
rename from srcpkgs/libboost_unit_test_framework1.72
rename to srcpkgs/libboost_timer1.79
diff --git a/srcpkgs/libboost_wave1.72 b/srcpkgs/libboost_type_erasure1.79
similarity index 100%
rename from srcpkgs/libboost_wave1.72
rename to srcpkgs/libboost_type_erasure1.79
diff --git a/srcpkgs/libboost_wserialization1.72 b/srcpkgs/libboost_unit_test_framework1.79
similarity index 100%
rename from srcpkgs/libboost_wserialization1.72
rename to srcpkgs/libboost_unit_test_framework1.79
diff --git a/srcpkgs/libboost_wave1.79 b/srcpkgs/libboost_wave1.79
new file mode 120000
index 000000000000..baef819c48f6
--- /dev/null
+++ b/srcpkgs/libboost_wave1.79
@@ -0,0 +1 @@
+boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_wserialization1.79 b/srcpkgs/libboost_wserialization1.79
new file mode 120000
index 000000000000..baef819c48f6
--- /dev/null
+++ b/srcpkgs/libboost_wserialization1.79
@@ -0,0 +1 @@
+boost
\ No newline at end of file

From e21adca57850bc707e0819694419ae4c9a525b27 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 18:29:05 +0200
Subject: [PATCH 2/4] boost: quote all vmove's with a glob.

---
 srcpkgs/boost/template | 70 +++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index ad705311b867..7a9c1c33fa44 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -137,7 +137,7 @@ libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
-		vmove usr/lib/libboost_atomic.so.*
+		vmove "usr/lib/libboost_atomic.so.*"
 	}
 }
 
@@ -145,7 +145,7 @@ libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
-		vmove usr/lib/libboost_chrono.so.*
+		vmove "usr/lib/libboost_chrono.so.*"
 	}
 }
 
@@ -153,7 +153,7 @@ libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
-		vmove usr/lib/libboost_container.so.*
+		vmove "usr/lib/libboost_container.so.*"
 	}
 }
 
@@ -161,7 +161,7 @@ libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
-		vmove usr/lib/libboost_context.so.*
+		vmove "usr/lib/libboost_context.so.*"
 	}
 }
 
@@ -169,7 +169,7 @@ libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
-		vmove usr/lib/libboost_contract.so.*
+		vmove "usr/lib/libboost_contract.so.*"
 	}
 }
 
@@ -177,7 +177,7 @@ libboost_coroutine1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
-		vmove usr/lib/libboost_coroutine.so.*
+		vmove "usr/lib/libboost_coroutine.so.*"
 	}
 }
 
@@ -185,7 +185,7 @@ libboost_date_time1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
-		vmove usr/lib/libboost_date_time.so.*
+		vmove "usr/lib/libboost_date_time.so.*"
 	}
 }
 
@@ -193,7 +193,7 @@ libboost_fiber1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_fiber"
 	pkg_install() {
-		vmove usr/lib/libboost_fiber.so.*
+		vmove "usr/lib/libboost_fiber.so.*"
 	}
 }
 
@@ -201,7 +201,7 @@ libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
-		vmove usr/lib/libboost_filesystem.so.*
+		vmove "usr/lib/libboost_filesystem.so.*"
 	}
 }
 
@@ -209,7 +209,7 @@ libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
-		vmove usr/lib/libboost_graph.so.*
+		vmove "usr/lib/libboost_graph.so.*"
 	}
 }
 
@@ -217,7 +217,7 @@ libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
-		vmove usr/lib/libboost_iostreams.so.*
+		vmove "usr/lib/libboost_iostreams.so.*"
 	}
 }
 
@@ -225,7 +225,7 @@ libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
-		vmove usr/lib/libboost_locale.so.*
+		vmove "usr/lib/libboost_locale.so.*"
 	}
 }
 
@@ -233,7 +233,7 @@ libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
-		vmove usr/lib/libboost_log.so.*
+		vmove "usr/lib/libboost_log.so.*"
 	}
 }
 
@@ -241,7 +241,7 @@ libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
-		vmove usr/lib/libboost_log_setup.so.*
+		vmove "usr/lib/libboost_log_setup.so.*"
 	}
 }
 
@@ -249,7 +249,7 @@ libboost_math_c99-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99.so.*
+		vmove "usr/lib/libboost_math_c99.so.*"
 	}
 }
 
@@ -257,7 +257,7 @@ libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99f.so.*
+		vmove "usr/lib/libboost_math_c99f.so.*"
 	}
 }
 
@@ -265,7 +265,7 @@ libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99l.so.*
+		vmove "usr/lib/libboost_math_c99l.so.*"
 	}
 }
 
@@ -273,7 +273,7 @@ libboost_math_tr1-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1.so.*
+		vmove "usr/lib/libboost_math_tr1.so.*"
 	}
 }
 
@@ -281,7 +281,7 @@ libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1f.so.*
+		vmove "usr/lib/libboost_math_tr1f.so.*"
 	}
 }
 
@@ -289,7 +289,7 @@ libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1l.so.*
+		vmove "usr/lib/libboost_math_tr1l.so.*"
 	}
 }
 
@@ -297,7 +297,7 @@ libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
-		vmove usr/lib/libboost_prg_exec_monitor.so.*
+		vmove "usr/lib/libboost_prg_exec_monitor.so.*"
 	}
 }
 
@@ -305,7 +305,7 @@ libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
-		vmove usr/lib/libboost_program_options.so.*
+		vmove "usr/lib/libboost_program_options.so.*"
 	}
 }
 
@@ -313,7 +313,7 @@ libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
-		vmove usr/lib/libboost_random.so.*
+		vmove "usr/lib/libboost_random.so.*"
 	}
 }
 
@@ -321,7 +321,7 @@ libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
-		vmove usr/lib/libboost_regex.so.*
+		vmove "usr/lib/libboost_regex.so.*"
 	}
 }
 
@@ -329,7 +329,7 @@ libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
-		vmove usr/lib/libboost_serialization.so.*
+		vmove "usr/lib/libboost_serialization.so.*"
 	}
 }
 
@@ -337,7 +337,7 @@ libboost_stacktrace_addr2line1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_addr2line"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_addr2line.so.*
+		vmove "usr/lib/libboost_stacktrace_addr2line.so.*"
 	}
 }
 
@@ -345,7 +345,7 @@ libboost_stacktrace_basic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_basic"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_basic.so.*
+		vmove "usr/lib/libboost_stacktrace_basic.so.*"
 	}
 }
 
@@ -353,7 +353,7 @@ libboost_stacktrace_noop1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_noop"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_noop.so.*
+		vmove "usr/lib/libboost_stacktrace_noop.so.*"
 	}
 }
 
@@ -361,7 +361,7 @@ libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
-		vmove usr/lib/libboost_system.so.*
+		vmove "usr/lib/libboost_system.so.*"
 	}
 }
 
@@ -369,7 +369,7 @@ libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
-		vmove usr/lib/libboost_thread.so.*
+		vmove "usr/lib/libboost_thread.so.*"
 	}
 }
 
@@ -377,7 +377,7 @@ libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
-		vmove usr/lib/libboost_timer.so.*
+		vmove "usr/lib/libboost_timer.so.*"
 	}
 }
 
@@ -385,7 +385,7 @@ libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
-		vmove usr/lib/libboost_type_erasure.so.*
+		vmove "usr/lib/libboost_type_erasure.so.*"
 	}
 }
 
@@ -393,7 +393,7 @@ libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
-		vmove usr/lib/libboost_unit_test_framework.so.*
+		vmove "usr/lib/libboost_unit_test_framework.so.*"
 	}
 }
 
@@ -401,7 +401,7 @@ libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
-		vmove usr/lib/libboost_wave.so.*
+		vmove "usr/lib/libboost_wave.so.*"
 	}
 }
 
@@ -409,7 +409,7 @@ libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
-		vmove usr/lib/libboost_wserialization.so.*
+		vmove "usr/lib/libboost_wserialization.so.*"
 	}
 }
 

From e094fd0b7f35e8477635fac6a3f9e4737646c6be Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 26 May 2022 18:52:59 +0300
Subject: [PATCH 3/4] uhd: update to 4.2.0.0.

---
 common/shlibs        | 2 +-
 srcpkgs/uhd/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index bb418cdfc245..529a07f73a31 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3595,7 +3595,7 @@ libbinpac.so.0 zeek-3.2.4_2
 libllhttp.so.1 llhttp-1.0.1_1
 libpinyin.so.13 libpinyin-2.2.1_1
 libzhuyin.so.13 libzhuyin-2.6.0_3
-libuhd.so.4.0.0 uhd-4.0.0.0_1
+libuhd.so.4.2.0 uhd-4.2.0.0_1
 libeditline.so.1 editline-1.16.0_1
 libgnuradio-rds.so.1 gnuradio-rds-3.8.0_1
 libgnuradio-nrsc5-1.0.0git.so.0.0.0 gnuradio-nrsc5-1.0.0_1
diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template
index 5f043162d7dc..685f877dc380 100644
--- a/srcpkgs/uhd/template
+++ b/srcpkgs/uhd/template
@@ -1,6 +1,6 @@
 # Template file for 'uhd'
 pkgname=uhd
-version=4.0.0.0
+version=4.2.0.0
 revision=1
 build_wrksrc=host
 build_style=cmake
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://files.ettus.com/manual/"
 changelog="https://raw.githubusercontent.com/EttusResearch/uhd/master/CHANGELOG"
 distfiles="https://github.com/EttusResearch/uhd/archive/v${version}.tar.gz"
-checksum=4f3513c43edf0178391ed5755266864532716b8b503bcfb9a983ae6256c51b14
+checksum=ad15cedc8a4b9ba78078f1c4c3c179eff8297a08e44928679de896ca42313e6b
 python_version=3
 
 case "${XBPS_TARGET_MACHINE}" in

From ad89f0df96704b6b1660f49e0dbee5f80f083b58 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 26 May 2022 21:37:30 +0300
Subject: [PATCH 4/4] [WIP] gnuradio: update to 3.10.2.0.

This is most certainly a broken updated packaging for now... probably
just needs a bunch of new dependencies to even build anything useful
while if it doesn't find anything it just builds the bare minimum
(e.g. docs), annoying behavior...

[ci skip] the PR is still WIP
---
 ...6495f3bdf579dae0c26531a16f6adcc7fb2f.patch | 46 -------------------
 ...15d0b26b3c72fab736bcd28a67ab9d1404b7.patch | 28 -----------
 ...befbbe54e55fc4994899e92bcf5bf462fa2f.patch | 31 -------------
 srcpkgs/gnuradio/template                     | 20 ++++----
 4 files changed, 11 insertions(+), 114 deletions(-)
 delete mode 100644 srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch
 delete mode 100644 srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch
 delete mode 100644 srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch

diff --git a/srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch b/srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch
deleted file mode 100644
index 51952bd29b38..000000000000
--- a/srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 596c6495f3bdf579dae0c26531a16f6adcc7fb2f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marcus=20M=C3=BCller?= <mmueller@gnuradio.org>
-Date: Mon, 13 Apr 2020 00:11:59 +0200
-Subject: [PATCH] =?UTF-8?q?pmt:=20conditionalize=20testing=20of=20long=20>?=
- =?UTF-8?q?=202=C2=B3=C2=B2=20on=20sizeof(long)?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- gnuradio-runtime/python/pmt/qa_pmt.py | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/gnuradio-runtime/python/pmt/qa_pmt.py b/gnuradio-runtime/python/pmt/qa_pmt.py
-index 884bba7dd4b..44f616cdae1 100644
---- a/gnuradio-runtime/python/pmt/qa_pmt.py
-+++ b/gnuradio-runtime/python/pmt/qa_pmt.py
-@@ -18,6 +18,10 @@ class test_pmt(unittest.TestCase):
-     MAXINT32 = (2**31)-1
-     MININT32 = (-MAXINT32)-1
- 
-+    def setUp(self):
-+        from ctypes import sizeof, c_long
-+        self.sizeof_long = sizeof(c_long)
-+
-     def test01(self):
-         a = pmt.intern("a")
-         b = pmt.from_double(123765)
-@@ -112,6 +116,8 @@ def test14(self):
-         self.assertEqual(const,pmt.to_long(deser))
- 
-     def test15(self):
-+        if(self.sizeof_long <= 4):
-+            return
-         const = self.MAXINT32 + 1
-         x_pmt = pmt.from_long(const)
-         s = pmt.serialize_str(x_pmt)
-@@ -137,6 +143,8 @@ def test17(self):
-         self.assertEqual(const, x_long)
- 
-     def test18(self):
-+        if(self.sizeof_long <= 4):
-+            return
-         const = self.MININT32 - 1
-         x_pmt = pmt.from_long(const)
-         s = pmt.serialize_str(x_pmt)
diff --git a/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch b/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch
deleted file mode 100644
index c49a047427e8..000000000000
--- a/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7 Mon Sep 17 00:00:00 2001
-From: John Sallay <jasallay@gmail.com>
-Date: Sat, 23 Oct 2021 08:26:42 -0400
-Subject: [PATCH] Fix issue 4595 qa_agc Assertion Error.
-
-The number of input elements needs to be disivible by volk_alignment, which it wasn't
-for machines with 512-bit registers.
-
-Signed-off-by: John Sallay <jasallay@gmail.com>
----
- gr-analog/python/analog/qa_agc.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/gr-analog/python/analog/qa_agc.py b/gr-analog/python/analog/qa_agc.py
-index a5a8ea47b6a..9368dd5d2a8 100644
---- a/gr-analog/python/analog/qa_agc.py
-+++ b/gr-analog/python/analog/qa_agc.py
-@@ -454,7 +454,9 @@ def test_006(self):
-         tb = self.tb
- 
-         sampling_freq = 100
--        N = int(5*sampling_freq)
-+        # N must by a multiple of the volk_alignment of the system for this test to work.
-+        # For a machine with 512-bit registers, that would be 8 complex-floats.
-+        N = int(8 * sampling_freq)
-         src1 = analog.sig_source_c(sampling_freq, analog.GR_SIN_WAVE,
-                                    sampling_freq * 0.10, 100)
-         dst1 = blocks.vector_sink_c()
diff --git a/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch b/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch
deleted file mode 100644
index 4faa3468140a..000000000000
--- a/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f259befbbe54e55fc4994899e92bcf5bf462fa2f Mon Sep 17 00:00:00 2001
-From: alekhgupta1441 <alekhgupta1441@gmail.com>
-Date: Sun, 12 Apr 2020 03:48:14 +0530
-Subject: [PATCH] gr-digital/python : Updated soft_dec_lut_gen.py
-
----
- gr-digital/python/digital/soft_dec_lut_gen.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gr-digital/python/digital/soft_dec_lut_gen.py b/gr-digital/python/digital/soft_dec_lut_gen.py
-index 4503c4fea7b..84f6de66e45 100644
---- a/gr-digital/python/digital/soft_dec_lut_gen.py
-+++ b/gr-digital/python/digital/soft_dec_lut_gen.py
-@@ -73,7 +73,7 @@ def soft_dec_table_generator(soft_dec_gen, prec, Es=1):
- 
-     '''
- 
--    npts = 2.0**prec
-+    npts = int(2.0**prec)
-     maxd = Es*numpy.sqrt(2.0)/2.0
-     yrng = numpy.linspace(-maxd, maxd, npts)
-     xrng = numpy.linspace(-maxd, maxd, npts)
-@@ -110,7 +110,7 @@ def soft_dec_table(constel, symbols, prec, npwr=1):
-     re_max = max(numpy.array(constel).real)
-     im_max = max(numpy.array(constel).imag)
- 
--    npts = 2.0**prec
-+    npts = int(2.0**prec)
-     yrng = numpy.linspace(im_min, im_max, npts)
-     xrng = numpy.linspace(re_min, re_max, npts)
- 
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index c950b53e8bea..b47325cb6034 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,10 +1,12 @@
 # Template file for 'gnuradio'
 pkgname=gnuradio
-version=3.8.0.0
-revision=9
+version=3.10.2.0
+revision=1
 build_style=cmake
-conf_files="/etc/gnuradio/conf.d/*"
-configure_args="-DENABLE_INTERNAL_VOLK=OFF -DGR_PYTHON_DIR=/${py3_sitelib}"
+# FIXME: '/etc/gnuradio/conf.d/*' configuration file not in PKGDESTDIR!
+#conf_files="/etc/gnuradio/conf.d/*"
+configure_args="-DGR_PYTHON_DIR=/${py3_sitelib}"
+# TODO: https://pypi.org/project/schema/ as new build/runtime dep since v3.10.2.0?
 hostmakedepends="pkg-config doxygen swig python3-Mako python3-Sphinx
  python3-cairo python3-numpy python3-yaml texlive texlive-latexextra texlive-dvi"
 makedepends="SDL-devel boost-devel fftw-devel gsl-devel jack-devel
@@ -18,12 +20,10 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnuradio.org"
 distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=03fd01f0b27033befb91709b3d56f95e0869b5fb8bc71bec2662266a3f0dedf5
+checksum=a8f6c1cc98bc3784aa70ab29d3039ad6922ec36f908ecfb2c904a597b32c0776
 python_version=3
 
 post_install() {
-	rm ${DESTDIR}/usr/share/gnuradio/examples/audio/dial_tone \
-		${DESTDIR}/usr/share/gnuradio/examples/uhd/tags_demo
 	vinstall grc/scripts/freedesktop/gnuradio-grc.desktop 644 \
 		usr/share/applications
 	vinstall grc/scripts/freedesktop/gnuradio_logo_icon-square.svg 644 \
@@ -42,8 +42,10 @@ gnuradio-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove "usr/lib/*.so"
+		# FIXME: there's no shared objects at all anymore?!
+		#vmove "usr/lib/*.so"
 		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
+		# FIXME: it looks like pkgconfig files aren't installed even though *.pc.in files do exist
+		#vmove usr/lib/pkgconfig
 	}
 }

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] boost: update to 1.79.0.
  2022-03-18 14:28 [PR PATCH] boost: update to 1.79.0.b1 JamiKettunen
                   ` (16 preceding siblings ...)
  2022-05-26 18:41 ` JamiKettunen
@ 2022-05-26 20:27 ` JamiKettunen
  2022-05-26 20:29 ` JamiKettunen
                   ` (10 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: JamiKettunen @ 2022-05-26 20:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 4041 bytes --]

There is an updated pull request by JamiKettunen against master on the void-packages repository

https://github.com/JamiKettunen/void-packages boost-1.79.0
https://github.com/void-linux/void-packages/pull/36204

boost: update to 1.79.0.
#### Packages to fix (from `xrevshlib boost` as locally build-tested on `x86_64-musl`)
- [ ] Aegisub (fails on `do_build()`)
- [ ] PrusaSlicer (fails on `do_build()`)
- [ ] TSC (fails on `do_build()`)
- [ ] bitcoin (fails on `do_check()`)
- [ ] openimageio (fails on `pre_build()`, `vsed` doesn't change `src/cmake/compiler.cmake`)
  - [ ] blender (depends on `openimageio`)
- [ ] cryfs (fails on `do_build()`)
- [ ] leatherman (hangs on `do_check()`, test process pinned one core at 100% for 10 minutes)
  - [ ] facter (depends on `leatherman`)
- [ ] fifengine (fails on `do_build()`)
- [x] uhd (fails on `do_build()`)
  - [ ] gnuradio (failed on `do_build()`, updating to [v3.10.2.0](https://github.com/gnuradio/gnuradio/releases/tag/v3.10.2.0) appears to have disabled building a lot of components including all shared objects and pkg-config files for example, probably just a bunch of missing new "optional" build-time dependencies...)
    - [ ] gnuradio-osmosdr (depends on `gnuradio`)
- [ ] imagescan (fails on `do_build()`)
- [ ] inkscape (fails on `do_check()`)
- [ ] kea (fails on `do_build()`)
- [ ] ledger (fails on `do_build()`)
- [ ] libbitcoin-system (fails on `do_build()`)
  - [ ] libbitcoin-database (depends on `libbitcoin-system`)
    - [ ] libbitcoin-blockchain (depends on `libbitcoin-database`)
      - [ ] libbitcoin-node (depends on `libbitcoin-blockchain`)
      - [ ] libbitcoin-server (depends on `libbitcoin-blockchain`)
  - [ ] libbitcoin-protocol (depends on `libbitcoin-system`)
    - [ ] libbitcoin-client (depends on `libbitcoin-protocol`)
      - [ ] libbitcoin-explorer (depends on `libbitcoin-client`)
  - [ ] libbitcoin-network (depends on `libbitcoin-system`)
- [ ] libetonyek (fails on `do_build()`, appears to need `-std=c++17` or higher? `NUM3Parser.cpp:46:8: error: 'for_each' is not a member of 'std'`)
  - [ ] libreoffice (depends on `libetonyek`)
- [ ] librime (fails on `do_build()`)
- [ ] libtorrent-rasterbar (hangs on `do_check()`, 90/97 test_web_seed_http stuck for 10 minutes)
- [ ] namecoin (fails on `do_build()`)
- [ ] pulseeffects-legacy (fails on `do_build()`)
- [ ] schroot (fails on `do_check()`)
- [ ] supercollider (fails on `do_build()`)
- [ ] swiften (fails on `do_patch`, `fix-cross-build.patch` doesn't apply)

#### Packages to fix (from `xrevshlib uhd` as locally build-tested on `x86_64-musl`)
- [ ] urh (fails on `do_check()` even after adding `checkdepends="python3-pip"`)

#### Modified patches (boost)
`exec_file.patch`: Removed due to being upstream as https://github.com/boostorg/python/commit/d9f06052e28873037db7f98629bce72182a42410
`mips.patch`: Updated to apply on top of https://github.com/boostorg/fiber/commit/5dc9dabc5d5ff8da53ec897c265c9cba1b6ed0df, not sure if this can be removed now(?)

#### Misc changes
- I've renamed all subpackages of `boost` so that the versioned name doesn't conflict with other numbers and are consistent with the previously existing `boost-python3-1.72`, e.g. `libboost_math_c991.72` is now `libboost_math_c99-1.79` (notice the `-`!)

#### Testing the changes
- I tested the changes in this PR: **NO**

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36204.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boost-1.79.0-36204.patch --]
[-- Type: text/x-diff, Size: 54555 bytes --]

From d806b7c68d6d8c0a4073ce607fb91e4e294027a7 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 15:28:37 +0200
Subject: [PATCH 1/6] boost: update to 1.79.0.

---
 common/shlibs                                 |  64 +++----
 .../{boost-python1.72 => boost-python1.79}    |   0
 ...{boost-python3-1.72 => boost-python3-1.79} |   0
 srcpkgs/boost/patches/exec_file.patch         |  45 -----
 srcpkgs/boost/patches/mips.patch              |   2 +-
 srcpkgs/boost/template                        | 161 +++++++++---------
 ...ibboost_atomic1.72 => libboost_atomic1.79} |   0
 ...ibboost_chrono1.72 => libboost_chrono1.79} |   0
 ...t_container1.72 => libboost_container1.79} |   0
 ...boost_context1.72 => libboost_context1.79} |   0
 ...ost_contract1.72 => libboost_contract1.79} |   0
 ...t_coroutine1.72 => libboost_coroutine1.79} |   0
 ...t_date_time1.72 => libboost_date_time1.79} |   0
 ...{libboost_fiber1.72 => libboost_fiber1.79} |   0
 ...filesystem1.72 => libboost_filesystem1.79} |   0
 ...{libboost_graph1.72 => libboost_graph1.79} |   0
 ...t_iostreams1.72 => libboost_iostreams1.79} |   0
 ...{libboost_locale1.72 => libboost_json1.79} |   0
 .../{libboost_log1.72 => libboost_locale1.79} |   0
 ...ibboost_log_setup1.72 => libboost_log1.79} |   0
 ...st_math_c991.72 => libboost_log_setup1.79} |   0
 ...t_math_c99f1.72 => libboost_math_c99-1.79} |   0
 ...t_math_c99l1.72 => libboost_math_c99f1.79} |   0
 ...st_math_tr11.72 => libboost_math_c99l1.79} |   0
 ...t_math_tr1f1.72 => libboost_math_tr1-1.79} |   0
 ...t_math_tr1l1.72 => libboost_math_tr1f1.79} |   0
 ...xec_monitor1.72 => libboost_math_tr1l1.79} |   0
 ...rogram_options1.72 => libboost_nowide1.79} |   0
 ...ndom1.72 => libboost_prg_exec_monitor1.79} |   0
 ...regex1.72 => libboost_program_options1.79} |   0
 ..._serialization1.72 => libboost_random1.79} |   0
 ...trace_addr2line1.72 => libboost_regex1.79} |   0
 ...e_basic1.72 => libboost_serialization1.79} |   0
 ...1.72 => libboost_stacktrace_addr2line1.79} |   0
 ...stem1.72 => libboost_stacktrace_basic1.79} |   0
 ...hread1.72 => libboost_stacktrace_noop1.79} |   0
 ...libboost_timer1.72 => libboost_system1.79} |   0
 ...t_type_erasure1.72 => libboost_thread1.79} |   0
 ..._test_framework1.72 => libboost_timer1.79} |   0
 ...ost_wave1.72 => libboost_type_erasure1.79} |   0
 ...n1.72 => libboost_unit_test_framework1.79} |   0
 srcpkgs/libboost_wave1.79                     |   1 +
 srcpkgs/libboost_wserialization1.79           |   1 +
 43 files changed, 113 insertions(+), 161 deletions(-)
 rename srcpkgs/{boost-python1.72 => boost-python1.79} (100%)
 rename srcpkgs/{boost-python3-1.72 => boost-python3-1.79} (100%)
 delete mode 100644 srcpkgs/boost/patches/exec_file.patch
 rename srcpkgs/{libboost_atomic1.72 => libboost_atomic1.79} (100%)
 rename srcpkgs/{libboost_chrono1.72 => libboost_chrono1.79} (100%)
 rename srcpkgs/{libboost_container1.72 => libboost_container1.79} (100%)
 rename srcpkgs/{libboost_context1.72 => libboost_context1.79} (100%)
 rename srcpkgs/{libboost_contract1.72 => libboost_contract1.79} (100%)
 rename srcpkgs/{libboost_coroutine1.72 => libboost_coroutine1.79} (100%)
 rename srcpkgs/{libboost_date_time1.72 => libboost_date_time1.79} (100%)
 rename srcpkgs/{libboost_fiber1.72 => libboost_fiber1.79} (100%)
 rename srcpkgs/{libboost_filesystem1.72 => libboost_filesystem1.79} (100%)
 rename srcpkgs/{libboost_graph1.72 => libboost_graph1.79} (100%)
 rename srcpkgs/{libboost_iostreams1.72 => libboost_iostreams1.79} (100%)
 rename srcpkgs/{libboost_locale1.72 => libboost_json1.79} (100%)
 rename srcpkgs/{libboost_log1.72 => libboost_locale1.79} (100%)
 rename srcpkgs/{libboost_log_setup1.72 => libboost_log1.79} (100%)
 rename srcpkgs/{libboost_math_c991.72 => libboost_log_setup1.79} (100%)
 rename srcpkgs/{libboost_math_c99f1.72 => libboost_math_c99-1.79} (100%)
 rename srcpkgs/{libboost_math_c99l1.72 => libboost_math_c99f1.79} (100%)
 rename srcpkgs/{libboost_math_tr11.72 => libboost_math_c99l1.79} (100%)
 rename srcpkgs/{libboost_math_tr1f1.72 => libboost_math_tr1-1.79} (100%)
 rename srcpkgs/{libboost_math_tr1l1.72 => libboost_math_tr1f1.79} (100%)
 rename srcpkgs/{libboost_prg_exec_monitor1.72 => libboost_math_tr1l1.79} (100%)
 rename srcpkgs/{libboost_program_options1.72 => libboost_nowide1.79} (100%)
 rename srcpkgs/{libboost_random1.72 => libboost_prg_exec_monitor1.79} (100%)
 rename srcpkgs/{libboost_regex1.72 => libboost_program_options1.79} (100%)
 rename srcpkgs/{libboost_serialization1.72 => libboost_random1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_addr2line1.72 => libboost_regex1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_basic1.72 => libboost_serialization1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_noop1.72 => libboost_stacktrace_addr2line1.79} (100%)
 rename srcpkgs/{libboost_system1.72 => libboost_stacktrace_basic1.79} (100%)
 rename srcpkgs/{libboost_thread1.72 => libboost_stacktrace_noop1.79} (100%)
 rename srcpkgs/{libboost_timer1.72 => libboost_system1.79} (100%)
 rename srcpkgs/{libboost_type_erasure1.72 => libboost_thread1.79} (100%)
 rename srcpkgs/{libboost_unit_test_framework1.72 => libboost_timer1.79} (100%)
 rename srcpkgs/{libboost_wave1.72 => libboost_type_erasure1.79} (100%)
 rename srcpkgs/{libboost_wserialization1.72 => libboost_unit_test_framework1.79} (100%)
 create mode 120000 srcpkgs/libboost_wave1.79
 create mode 120000 srcpkgs/libboost_wserialization1.79

diff --git a/common/shlibs b/common/shlibs
index 9fd62e7c1baf..bb418cdfc245 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -620,38 +620,38 @@ 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.79.0 libboost_context1.79-1.79.0_1
+libboost_coroutine.so.1.79.0 libboost_coroutine1.79-1.79.0_1
+libboost_container.so.1.79.0 libboost_container1.79-1.79.0_1
+libboost_prg_exec_monitor.so.1.79.0 libboost_prg_exec_monitor1.79-1.79.0_1
+libboost_timer.so.1.79.0 libboost_timer1.79-1.79.0_1
+libboost_random.so.1.79.0 libboost_random1.79-1.79.0_1
+libboost_filesystem.so.1.79.0 libboost_filesystem1.79-1.79.0_1
+libboost_unit_test_framework.so.1.79.0 libboost_unit_test_framework1.79-1.79.0_1
+libboost_math_c99.so.1.79.0 libboost_math_c99-1.79-1.79.0_1
+libboost_math_tr1.so.1.79.0 libboost_math_tr1-1.79-1.79.0_1
+libboost_regex.so.1.79.0 libboost_regex1.79-1.79.0_1
+libboost_serialization.so.1.79.0 libboost_serialization1.79-1.79.0_1
+libboost_chrono.so.1.79.0 libboost_chrono1.79-1.79.0_1
+libboost_wserialization.so.1.79.0 libboost_wserialization1.79-1.79.0_1
+libboost_graph.so.1.79.0 libboost_graph1.79-1.79.0_1
+libboost_log.so.1.79.0 libboost_log1.79-1.79.0_1
+libboost_locale.so.1.79.0 libboost_locale1.79-1.79.0_1
+libboost_program_options.so.1.79.0 libboost_program_options1.79-1.79.0_1
+libboost_iostreams.so.1.79.0 libboost_iostreams1.79-1.79.0_1
+libboost_system.so.1.79.0 libboost_system1.79-1.79.0_1
+libboost_thread.so.1.79.0 libboost_thread1.79-1.79.0_1
+libboost_log_setup.so.1.79.0 libboost_log_setup1.79-1.79.0_1
+libboost_date_time.so.1.79.0 libboost_date_time1.79-1.79.0_1
+libboost_wave.so.1.79.0 libboost_wave1.79-1.79.0_1
+libboost_atomic.so.1.79.0 libboost_atomic1.79-1.79.0_1
+libboost_type_erasure.so.1.79.0 libboost_type_erasure1.79-1.79.0_1
+libboost_fiber.so.1.79.0 libboost_fiber1.79-1.79.0_1
+libboost_stacktrace_noop.so.1.79.0 libboost_stacktrace_noop1.79-1.79.0_1
+libboost_stacktrace_addr2line.so.1.79.0 libboost_stacktrace_addr2line1.79-1.79.0_1
+libboost_stacktrace_basic.so.1.79.0 libboost_stacktrace_basic1.79-1.79.0_1
+libboost_python27.so.1.79.0 boost-python1.79-1.79.0_1
+libboost_python310.so.1.79.0 boost-python3-1.79-1.79.0_1
 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-python1.79
similarity index 100%
rename from srcpkgs/boost-python1.72
rename to srcpkgs/boost-python1.79
diff --git a/srcpkgs/boost-python3-1.72 b/srcpkgs/boost-python3-1.79
similarity index 100%
rename from srcpkgs/boost-python3-1.72
rename to srcpkgs/boost-python3-1.79
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/mips.patch b/srcpkgs/boost/patches/mips.patch
index a10a2122d9c7..8d253fc7c286 100644
--- a/srcpkgs/boost/patches/mips.patch
+++ b/srcpkgs/boost/patches/mips.patch
@@ -3,7 +3,7 @@
 @@ -48,7 +48,7 @@
  #  define cpu_relax() asm volatile ("nop" ::: "memory");
  # endif
- #elif BOOST_ARCH_MIPS
+ #elif BOOST_ARCH_MIPS && (((__mips_isa_rev > 1) && defined(__mips32)) || ((__mips_isa_rev > 2)  && defined(__mips64)))
 -# define cpu_relax() asm volatile ("pause" ::: "memory");
 +# define cpu_relax() asm volatile ("nop" ::: "memory");
  #elif BOOST_ARCH_PPC
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 126c50770b50..ad705311b867 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,8 +1,8 @@
 # Template file for 'boost'
 pkgname=boost
-version=1.72.0
-revision=7
-wrksrc="${pkgname}_${version//\./_}"
+version=1.79.0
+revision=1
+wrksrc="boost_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
 short_desc="Free peer-reviewed portable C++ source libraries"
@@ -10,53 +10,34 @@ 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=475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39
 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"
+subpackages="libboost_program_options1.79 libboost_math_c99f1.79
+ libboost_stacktrace_basic1.79 libboost_stacktrace_noop1.79
+ libboost_iostreams1.79 libboost_math_tr1l1.79 libboost_filesystem1.79
+ libboost_chrono1.79 libboost_math_tr1f1.79 libboost_wave1.79
+ libboost_graph1.79 libboost_locale1.79 libboost_regex1.79
+ libboost_fiber1.79 libboost_type_erasure1.79 libboost_coroutine1.79
+ libboost_atomic1.79 libboost_prg_exec_monitor1.79 libboost_math_c99-1.79
+ boost-python3-1.79 libboost_log_setup1.79 boost-devel
+ libboost_timer1.79 libboost_system1.79 libboost_unit_test_framework1.79
+ libboost_serialization1.79 libboost_math_tr1-1.79 boost-build
+ libboost_math_c99l1.79 boost-python1.79 libboost_contract1.79
+ libboost_date_time1.79 libboost_log1.79 libboost_random1.79
+ libboost_thread1.79 libboost_container1.79 boost-jam
+ libboost_wserialization1.79 libboost_context1.79 libboost_json1.79
+ libboost_nowide1.79"
 
 if [ -z "$CROSS_BUILD" ]; then
-	subpackages+=" libboost_stacktrace_addr2line1.72"
+	subpackages+=" libboost_stacktrace_addr2line1.79"
 fi
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*)    _arch=x86;      _abi=sysv  ;;
-	x86_64*)  _arch=x86;      _abi=sysv  ;;
-	arm*)     _arch=arm;      _abi=aapcs ;;
-	aarch64*) _arch=arm;      _abi=aapcs ;;
-	mips*)    _arch=mips32r2; _abi=o32   ;;
-	ppc*)     _arch=power;    _abi=sysv  ;;
+	i686*|x86_64*) _arch=x86;      _abi=sysv  ;;
+	arm*|aarch64*) _arch=arm;      _abi=aapcs ;;
+	mips*)         _arch=mips32r2; _abi=o32   ;;
+	ppc*)          _arch=power;    _abi=sysv  ;;
 esac
 
 do_build() {
@@ -66,7 +47,7 @@ do_build() {
 	(
 	# Rebuild bjam for target
 	cd tools/build/src/engine
-	./build.sh gcc
+	./build.sh --cxx="${CXX}" --cxxflags="${CXXFLAGS}" gcc
 	)
 	cat > user-config.jam <<-__EOF
 	using gcc : : ${CXX} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
@@ -74,10 +55,8 @@ do_build() {
 	using python : ${py3_ver} : ${XBPS_CROSS_BASE}/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} \
 		threading=multi runtime-link=shared link=shared,static
 }
@@ -119,7 +98,7 @@ boost-jam_package() {
 		vmove usr/bin/b2
 	}
 }
-boost-python1.72_package() {
+boost-python1.79_package() {
 	depends="boost python"
 	replaces="boost-python>=0"
 	short_desc+=" - Python bindings"
@@ -127,7 +106,7 @@ boost-python1.72_package() {
 		vmove "usr/lib/libboost_python2*.so.*"
 	}
 }
-boost-python3-1.72_package() {
+boost-python3-1.79_package() {
 	depends="boost python3"
 	replaces="boost-python3>=0"
 	short_desc+=" - Python3 bindings"
@@ -154,7 +133,7 @@ boost-devel_package() {
 	}
 }
 
-libboost_atomic1.72_package() {
+libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
@@ -162,7 +141,7 @@ libboost_atomic1.72_package() {
 	}
 }
 
-libboost_chrono1.72_package() {
+libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
@@ -170,7 +149,7 @@ libboost_chrono1.72_package() {
 	}
 }
 
-libboost_container1.72_package() {
+libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
@@ -178,7 +157,7 @@ libboost_container1.72_package() {
 	}
 }
 
-libboost_context1.72_package() {
+libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
@@ -186,7 +165,7 @@ libboost_context1.72_package() {
 	}
 }
 
-libboost_contract1.72_package() {
+libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
@@ -194,7 +173,7 @@ libboost_contract1.72_package() {
 	}
 }
 
-libboost_coroutine1.72_package() {
+libboost_coroutine1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
@@ -202,7 +181,7 @@ libboost_coroutine1.72_package() {
 	}
 }
 
-libboost_date_time1.72_package() {
+libboost_date_time1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
@@ -210,7 +189,7 @@ libboost_date_time1.72_package() {
 	}
 }
 
-libboost_fiber1.72_package() {
+libboost_fiber1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_fiber"
 	pkg_install() {
@@ -218,7 +197,7 @@ libboost_fiber1.72_package() {
 	}
 }
 
-libboost_filesystem1.72_package() {
+libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
@@ -226,7 +205,7 @@ libboost_filesystem1.72_package() {
 	}
 }
 
-libboost_graph1.72_package() {
+libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
@@ -234,7 +213,7 @@ libboost_graph1.72_package() {
 	}
 }
 
-libboost_iostreams1.72_package() {
+libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
@@ -242,7 +221,7 @@ libboost_iostreams1.72_package() {
 	}
 }
 
-libboost_locale1.72_package() {
+libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
@@ -250,7 +229,7 @@ libboost_locale1.72_package() {
 	}
 }
 
-libboost_log1.72_package() {
+libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
@@ -258,7 +237,7 @@ libboost_log1.72_package() {
 	}
 }
 
-libboost_log_setup1.72_package() {
+libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
@@ -266,7 +245,7 @@ libboost_log_setup1.72_package() {
 	}
 }
 
-libboost_math_c991.72_package() {
+libboost_math_c99-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
@@ -274,7 +253,7 @@ libboost_math_c991.72_package() {
 	}
 }
 
-libboost_math_c99f1.72_package() {
+libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
@@ -282,7 +261,7 @@ libboost_math_c99f1.72_package() {
 	}
 }
 
-libboost_math_c99l1.72_package() {
+libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
@@ -290,7 +269,7 @@ libboost_math_c99l1.72_package() {
 	}
 }
 
-libboost_math_tr11.72_package() {
+libboost_math_tr1-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
@@ -298,7 +277,7 @@ libboost_math_tr11.72_package() {
 	}
 }
 
-libboost_math_tr1f1.72_package() {
+libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
@@ -306,7 +285,7 @@ libboost_math_tr1f1.72_package() {
 	}
 }
 
-libboost_math_tr1l1.72_package() {
+libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
@@ -314,7 +293,7 @@ libboost_math_tr1l1.72_package() {
 	}
 }
 
-libboost_prg_exec_monitor1.72_package() {
+libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
@@ -322,7 +301,7 @@ libboost_prg_exec_monitor1.72_package() {
 	}
 }
 
-libboost_program_options1.72_package() {
+libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
@@ -330,7 +309,7 @@ libboost_program_options1.72_package() {
 	}
 }
 
-libboost_random1.72_package() {
+libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
@@ -338,7 +317,7 @@ libboost_random1.72_package() {
 	}
 }
 
-libboost_regex1.72_package() {
+libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
@@ -346,7 +325,7 @@ libboost_regex1.72_package() {
 	}
 }
 
-libboost_serialization1.72_package() {
+libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
@@ -354,7 +333,7 @@ libboost_serialization1.72_package() {
 	}
 }
 
-libboost_stacktrace_addr2line1.72_package() {
+libboost_stacktrace_addr2line1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_addr2line"
 	pkg_install() {
@@ -362,7 +341,7 @@ libboost_stacktrace_addr2line1.72_package() {
 	}
 }
 
-libboost_stacktrace_basic1.72_package() {
+libboost_stacktrace_basic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_basic"
 	pkg_install() {
@@ -370,7 +349,7 @@ libboost_stacktrace_basic1.72_package() {
 	}
 }
 
-libboost_stacktrace_noop1.72_package() {
+libboost_stacktrace_noop1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_noop"
 	pkg_install() {
@@ -378,7 +357,7 @@ libboost_stacktrace_noop1.72_package() {
 	}
 }
 
-libboost_system1.72_package() {
+libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
@@ -386,7 +365,7 @@ libboost_system1.72_package() {
 	}
 }
 
-libboost_thread1.72_package() {
+libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
@@ -394,7 +373,7 @@ libboost_thread1.72_package() {
 	}
 }
 
-libboost_timer1.72_package() {
+libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
@@ -402,7 +381,7 @@ libboost_timer1.72_package() {
 	}
 }
 
-libboost_type_erasure1.72_package() {
+libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
@@ -410,7 +389,7 @@ libboost_type_erasure1.72_package() {
 	}
 }
 
-libboost_unit_test_framework1.72_package() {
+libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
@@ -418,7 +397,7 @@ libboost_unit_test_framework1.72_package() {
 	}
 }
 
-libboost_wave1.72_package() {
+libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
@@ -426,10 +405,26 @@ libboost_wave1.72_package() {
 	}
 }
 
-libboost_wserialization1.72_package() {
+libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
 		vmove usr/lib/libboost_wserialization.so.*
 	}
 }
+
+libboost_json1.79_package() {
+	depends="boost"
+	short_desc+=" - libboost_json"
+	pkg_install() {
+		vmove "usr/lib/libboost_json.so.*"
+	}
+}
+
+libboost_nowide1.79_package() {
+	depends="boost"
+	short_desc+=" - libboost_nowide"
+	pkg_install() {
+		vmove "usr/lib/libboost_nowide.so.*"
+	}
+}
diff --git a/srcpkgs/libboost_atomic1.72 b/srcpkgs/libboost_atomic1.79
similarity index 100%
rename from srcpkgs/libboost_atomic1.72
rename to srcpkgs/libboost_atomic1.79
diff --git a/srcpkgs/libboost_chrono1.72 b/srcpkgs/libboost_chrono1.79
similarity index 100%
rename from srcpkgs/libboost_chrono1.72
rename to srcpkgs/libboost_chrono1.79
diff --git a/srcpkgs/libboost_container1.72 b/srcpkgs/libboost_container1.79
similarity index 100%
rename from srcpkgs/libboost_container1.72
rename to srcpkgs/libboost_container1.79
diff --git a/srcpkgs/libboost_context1.72 b/srcpkgs/libboost_context1.79
similarity index 100%
rename from srcpkgs/libboost_context1.72
rename to srcpkgs/libboost_context1.79
diff --git a/srcpkgs/libboost_contract1.72 b/srcpkgs/libboost_contract1.79
similarity index 100%
rename from srcpkgs/libboost_contract1.72
rename to srcpkgs/libboost_contract1.79
diff --git a/srcpkgs/libboost_coroutine1.72 b/srcpkgs/libboost_coroutine1.79
similarity index 100%
rename from srcpkgs/libboost_coroutine1.72
rename to srcpkgs/libboost_coroutine1.79
diff --git a/srcpkgs/libboost_date_time1.72 b/srcpkgs/libboost_date_time1.79
similarity index 100%
rename from srcpkgs/libboost_date_time1.72
rename to srcpkgs/libboost_date_time1.79
diff --git a/srcpkgs/libboost_fiber1.72 b/srcpkgs/libboost_fiber1.79
similarity index 100%
rename from srcpkgs/libboost_fiber1.72
rename to srcpkgs/libboost_fiber1.79
diff --git a/srcpkgs/libboost_filesystem1.72 b/srcpkgs/libboost_filesystem1.79
similarity index 100%
rename from srcpkgs/libboost_filesystem1.72
rename to srcpkgs/libboost_filesystem1.79
diff --git a/srcpkgs/libboost_graph1.72 b/srcpkgs/libboost_graph1.79
similarity index 100%
rename from srcpkgs/libboost_graph1.72
rename to srcpkgs/libboost_graph1.79
diff --git a/srcpkgs/libboost_iostreams1.72 b/srcpkgs/libboost_iostreams1.79
similarity index 100%
rename from srcpkgs/libboost_iostreams1.72
rename to srcpkgs/libboost_iostreams1.79
diff --git a/srcpkgs/libboost_locale1.72 b/srcpkgs/libboost_json1.79
similarity index 100%
rename from srcpkgs/libboost_locale1.72
rename to srcpkgs/libboost_json1.79
diff --git a/srcpkgs/libboost_log1.72 b/srcpkgs/libboost_locale1.79
similarity index 100%
rename from srcpkgs/libboost_log1.72
rename to srcpkgs/libboost_locale1.79
diff --git a/srcpkgs/libboost_log_setup1.72 b/srcpkgs/libboost_log1.79
similarity index 100%
rename from srcpkgs/libboost_log_setup1.72
rename to srcpkgs/libboost_log1.79
diff --git a/srcpkgs/libboost_math_c991.72 b/srcpkgs/libboost_log_setup1.79
similarity index 100%
rename from srcpkgs/libboost_math_c991.72
rename to srcpkgs/libboost_log_setup1.79
diff --git a/srcpkgs/libboost_math_c99f1.72 b/srcpkgs/libboost_math_c99-1.79
similarity index 100%
rename from srcpkgs/libboost_math_c99f1.72
rename to srcpkgs/libboost_math_c99-1.79
diff --git a/srcpkgs/libboost_math_c99l1.72 b/srcpkgs/libboost_math_c99f1.79
similarity index 100%
rename from srcpkgs/libboost_math_c99l1.72
rename to srcpkgs/libboost_math_c99f1.79
diff --git a/srcpkgs/libboost_math_tr11.72 b/srcpkgs/libboost_math_c99l1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr11.72
rename to srcpkgs/libboost_math_c99l1.79
diff --git a/srcpkgs/libboost_math_tr1f1.72 b/srcpkgs/libboost_math_tr1-1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1f1.72
rename to srcpkgs/libboost_math_tr1-1.79
diff --git a/srcpkgs/libboost_math_tr1l1.72 b/srcpkgs/libboost_math_tr1f1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1l1.72
rename to srcpkgs/libboost_math_tr1f1.79
diff --git a/srcpkgs/libboost_prg_exec_monitor1.72 b/srcpkgs/libboost_math_tr1l1.79
similarity index 100%
rename from srcpkgs/libboost_prg_exec_monitor1.72
rename to srcpkgs/libboost_math_tr1l1.79
diff --git a/srcpkgs/libboost_program_options1.72 b/srcpkgs/libboost_nowide1.79
similarity index 100%
rename from srcpkgs/libboost_program_options1.72
rename to srcpkgs/libboost_nowide1.79
diff --git a/srcpkgs/libboost_random1.72 b/srcpkgs/libboost_prg_exec_monitor1.79
similarity index 100%
rename from srcpkgs/libboost_random1.72
rename to srcpkgs/libboost_prg_exec_monitor1.79
diff --git a/srcpkgs/libboost_regex1.72 b/srcpkgs/libboost_program_options1.79
similarity index 100%
rename from srcpkgs/libboost_regex1.72
rename to srcpkgs/libboost_program_options1.79
diff --git a/srcpkgs/libboost_serialization1.72 b/srcpkgs/libboost_random1.79
similarity index 100%
rename from srcpkgs/libboost_serialization1.72
rename to srcpkgs/libboost_random1.79
diff --git a/srcpkgs/libboost_stacktrace_addr2line1.72 b/srcpkgs/libboost_regex1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_addr2line1.72
rename to srcpkgs/libboost_regex1.79
diff --git a/srcpkgs/libboost_stacktrace_basic1.72 b/srcpkgs/libboost_serialization1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_basic1.72
rename to srcpkgs/libboost_serialization1.79
diff --git a/srcpkgs/libboost_stacktrace_noop1.72 b/srcpkgs/libboost_stacktrace_addr2line1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_noop1.72
rename to srcpkgs/libboost_stacktrace_addr2line1.79
diff --git a/srcpkgs/libboost_system1.72 b/srcpkgs/libboost_stacktrace_basic1.79
similarity index 100%
rename from srcpkgs/libboost_system1.72
rename to srcpkgs/libboost_stacktrace_basic1.79
diff --git a/srcpkgs/libboost_thread1.72 b/srcpkgs/libboost_stacktrace_noop1.79
similarity index 100%
rename from srcpkgs/libboost_thread1.72
rename to srcpkgs/libboost_stacktrace_noop1.79
diff --git a/srcpkgs/libboost_timer1.72 b/srcpkgs/libboost_system1.79
similarity index 100%
rename from srcpkgs/libboost_timer1.72
rename to srcpkgs/libboost_system1.79
diff --git a/srcpkgs/libboost_type_erasure1.72 b/srcpkgs/libboost_thread1.79
similarity index 100%
rename from srcpkgs/libboost_type_erasure1.72
rename to srcpkgs/libboost_thread1.79
diff --git a/srcpkgs/libboost_unit_test_framework1.72 b/srcpkgs/libboost_timer1.79
similarity index 100%
rename from srcpkgs/libboost_unit_test_framework1.72
rename to srcpkgs/libboost_timer1.79
diff --git a/srcpkgs/libboost_wave1.72 b/srcpkgs/libboost_type_erasure1.79
similarity index 100%
rename from srcpkgs/libboost_wave1.72
rename to srcpkgs/libboost_type_erasure1.79
diff --git a/srcpkgs/libboost_wserialization1.72 b/srcpkgs/libboost_unit_test_framework1.79
similarity index 100%
rename from srcpkgs/libboost_wserialization1.72
rename to srcpkgs/libboost_unit_test_framework1.79
diff --git a/srcpkgs/libboost_wave1.79 b/srcpkgs/libboost_wave1.79
new file mode 120000
index 000000000000..baef819c48f6
--- /dev/null
+++ b/srcpkgs/libboost_wave1.79
@@ -0,0 +1 @@
+boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_wserialization1.79 b/srcpkgs/libboost_wserialization1.79
new file mode 120000
index 000000000000..baef819c48f6
--- /dev/null
+++ b/srcpkgs/libboost_wserialization1.79
@@ -0,0 +1 @@
+boost
\ No newline at end of file

From e21adca57850bc707e0819694419ae4c9a525b27 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 18:29:05 +0200
Subject: [PATCH 2/6] boost: quote all vmove's with a glob.

---
 srcpkgs/boost/template | 70 +++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index ad705311b867..7a9c1c33fa44 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -137,7 +137,7 @@ libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
-		vmove usr/lib/libboost_atomic.so.*
+		vmove "usr/lib/libboost_atomic.so.*"
 	}
 }
 
@@ -145,7 +145,7 @@ libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
-		vmove usr/lib/libboost_chrono.so.*
+		vmove "usr/lib/libboost_chrono.so.*"
 	}
 }
 
@@ -153,7 +153,7 @@ libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
-		vmove usr/lib/libboost_container.so.*
+		vmove "usr/lib/libboost_container.so.*"
 	}
 }
 
@@ -161,7 +161,7 @@ libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
-		vmove usr/lib/libboost_context.so.*
+		vmove "usr/lib/libboost_context.so.*"
 	}
 }
 
@@ -169,7 +169,7 @@ libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
-		vmove usr/lib/libboost_contract.so.*
+		vmove "usr/lib/libboost_contract.so.*"
 	}
 }
 
@@ -177,7 +177,7 @@ libboost_coroutine1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
-		vmove usr/lib/libboost_coroutine.so.*
+		vmove "usr/lib/libboost_coroutine.so.*"
 	}
 }
 
@@ -185,7 +185,7 @@ libboost_date_time1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
-		vmove usr/lib/libboost_date_time.so.*
+		vmove "usr/lib/libboost_date_time.so.*"
 	}
 }
 
@@ -193,7 +193,7 @@ libboost_fiber1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_fiber"
 	pkg_install() {
-		vmove usr/lib/libboost_fiber.so.*
+		vmove "usr/lib/libboost_fiber.so.*"
 	}
 }
 
@@ -201,7 +201,7 @@ libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
-		vmove usr/lib/libboost_filesystem.so.*
+		vmove "usr/lib/libboost_filesystem.so.*"
 	}
 }
 
@@ -209,7 +209,7 @@ libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
-		vmove usr/lib/libboost_graph.so.*
+		vmove "usr/lib/libboost_graph.so.*"
 	}
 }
 
@@ -217,7 +217,7 @@ libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
-		vmove usr/lib/libboost_iostreams.so.*
+		vmove "usr/lib/libboost_iostreams.so.*"
 	}
 }
 
@@ -225,7 +225,7 @@ libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
-		vmove usr/lib/libboost_locale.so.*
+		vmove "usr/lib/libboost_locale.so.*"
 	}
 }
 
@@ -233,7 +233,7 @@ libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
-		vmove usr/lib/libboost_log.so.*
+		vmove "usr/lib/libboost_log.so.*"
 	}
 }
 
@@ -241,7 +241,7 @@ libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
-		vmove usr/lib/libboost_log_setup.so.*
+		vmove "usr/lib/libboost_log_setup.so.*"
 	}
 }
 
@@ -249,7 +249,7 @@ libboost_math_c99-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99.so.*
+		vmove "usr/lib/libboost_math_c99.so.*"
 	}
 }
 
@@ -257,7 +257,7 @@ libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99f.so.*
+		vmove "usr/lib/libboost_math_c99f.so.*"
 	}
 }
 
@@ -265,7 +265,7 @@ libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99l.so.*
+		vmove "usr/lib/libboost_math_c99l.so.*"
 	}
 }
 
@@ -273,7 +273,7 @@ libboost_math_tr1-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1.so.*
+		vmove "usr/lib/libboost_math_tr1.so.*"
 	}
 }
 
@@ -281,7 +281,7 @@ libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1f.so.*
+		vmove "usr/lib/libboost_math_tr1f.so.*"
 	}
 }
 
@@ -289,7 +289,7 @@ libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1l.so.*
+		vmove "usr/lib/libboost_math_tr1l.so.*"
 	}
 }
 
@@ -297,7 +297,7 @@ libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
-		vmove usr/lib/libboost_prg_exec_monitor.so.*
+		vmove "usr/lib/libboost_prg_exec_monitor.so.*"
 	}
 }
 
@@ -305,7 +305,7 @@ libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
-		vmove usr/lib/libboost_program_options.so.*
+		vmove "usr/lib/libboost_program_options.so.*"
 	}
 }
 
@@ -313,7 +313,7 @@ libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
-		vmove usr/lib/libboost_random.so.*
+		vmove "usr/lib/libboost_random.so.*"
 	}
 }
 
@@ -321,7 +321,7 @@ libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
-		vmove usr/lib/libboost_regex.so.*
+		vmove "usr/lib/libboost_regex.so.*"
 	}
 }
 
@@ -329,7 +329,7 @@ libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
-		vmove usr/lib/libboost_serialization.so.*
+		vmove "usr/lib/libboost_serialization.so.*"
 	}
 }
 
@@ -337,7 +337,7 @@ libboost_stacktrace_addr2line1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_addr2line"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_addr2line.so.*
+		vmove "usr/lib/libboost_stacktrace_addr2line.so.*"
 	}
 }
 
@@ -345,7 +345,7 @@ libboost_stacktrace_basic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_basic"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_basic.so.*
+		vmove "usr/lib/libboost_stacktrace_basic.so.*"
 	}
 }
 
@@ -353,7 +353,7 @@ libboost_stacktrace_noop1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_noop"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_noop.so.*
+		vmove "usr/lib/libboost_stacktrace_noop.so.*"
 	}
 }
 
@@ -361,7 +361,7 @@ libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
-		vmove usr/lib/libboost_system.so.*
+		vmove "usr/lib/libboost_system.so.*"
 	}
 }
 
@@ -369,7 +369,7 @@ libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
-		vmove usr/lib/libboost_thread.so.*
+		vmove "usr/lib/libboost_thread.so.*"
 	}
 }
 
@@ -377,7 +377,7 @@ libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
-		vmove usr/lib/libboost_timer.so.*
+		vmove "usr/lib/libboost_timer.so.*"
 	}
 }
 
@@ -385,7 +385,7 @@ libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
-		vmove usr/lib/libboost_type_erasure.so.*
+		vmove "usr/lib/libboost_type_erasure.so.*"
 	}
 }
 
@@ -393,7 +393,7 @@ libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
-		vmove usr/lib/libboost_unit_test_framework.so.*
+		vmove "usr/lib/libboost_unit_test_framework.so.*"
 	}
 }
 
@@ -401,7 +401,7 @@ libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
-		vmove usr/lib/libboost_wave.so.*
+		vmove "usr/lib/libboost_wave.so.*"
 	}
 }
 
@@ -409,7 +409,7 @@ libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
-		vmove usr/lib/libboost_wserialization.so.*
+		vmove "usr/lib/libboost_wserialization.so.*"
 	}
 }
 

From e094fd0b7f35e8477635fac6a3f9e4737646c6be Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 26 May 2022 18:52:59 +0300
Subject: [PATCH 3/6] uhd: update to 4.2.0.0.

---
 common/shlibs        | 2 +-
 srcpkgs/uhd/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index bb418cdfc245..529a07f73a31 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3595,7 +3595,7 @@ libbinpac.so.0 zeek-3.2.4_2
 libllhttp.so.1 llhttp-1.0.1_1
 libpinyin.so.13 libpinyin-2.2.1_1
 libzhuyin.so.13 libzhuyin-2.6.0_3
-libuhd.so.4.0.0 uhd-4.0.0.0_1
+libuhd.so.4.2.0 uhd-4.2.0.0_1
 libeditline.so.1 editline-1.16.0_1
 libgnuradio-rds.so.1 gnuradio-rds-3.8.0_1
 libgnuradio-nrsc5-1.0.0git.so.0.0.0 gnuradio-nrsc5-1.0.0_1
diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template
index 5f043162d7dc..685f877dc380 100644
--- a/srcpkgs/uhd/template
+++ b/srcpkgs/uhd/template
@@ -1,6 +1,6 @@
 # Template file for 'uhd'
 pkgname=uhd
-version=4.0.0.0
+version=4.2.0.0
 revision=1
 build_wrksrc=host
 build_style=cmake
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://files.ettus.com/manual/"
 changelog="https://raw.githubusercontent.com/EttusResearch/uhd/master/CHANGELOG"
 distfiles="https://github.com/EttusResearch/uhd/archive/v${version}.tar.gz"
-checksum=4f3513c43edf0178391ed5755266864532716b8b503bcfb9a983ae6256c51b14
+checksum=ad15cedc8a4b9ba78078f1c4c3c179eff8297a08e44928679de896ca42313e6b
 python_version=3
 
 case "${XBPS_TARGET_MACHINE}" in

From ad89f0df96704b6b1660f49e0dbee5f80f083b58 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 26 May 2022 21:37:30 +0300
Subject: [PATCH 4/6] [WIP] gnuradio: update to 3.10.2.0.

This is most certainly a broken updated packaging for now... probably
just needs a bunch of new dependencies to even build anything useful
while if it doesn't find anything it just builds the bare minimum
(e.g. docs), annoying behavior...

[ci skip] the PR is still WIP
---
 ...6495f3bdf579dae0c26531a16f6adcc7fb2f.patch | 46 -------------------
 ...15d0b26b3c72fab736bcd28a67ab9d1404b7.patch | 28 -----------
 ...befbbe54e55fc4994899e92bcf5bf462fa2f.patch | 31 -------------
 srcpkgs/gnuradio/template                     | 20 ++++----
 4 files changed, 11 insertions(+), 114 deletions(-)
 delete mode 100644 srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch
 delete mode 100644 srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch
 delete mode 100644 srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch

diff --git a/srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch b/srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch
deleted file mode 100644
index 51952bd29b38..000000000000
--- a/srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 596c6495f3bdf579dae0c26531a16f6adcc7fb2f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marcus=20M=C3=BCller?= <mmueller@gnuradio.org>
-Date: Mon, 13 Apr 2020 00:11:59 +0200
-Subject: [PATCH] =?UTF-8?q?pmt:=20conditionalize=20testing=20of=20long=20>?=
- =?UTF-8?q?=202=C2=B3=C2=B2=20on=20sizeof(long)?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- gnuradio-runtime/python/pmt/qa_pmt.py | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/gnuradio-runtime/python/pmt/qa_pmt.py b/gnuradio-runtime/python/pmt/qa_pmt.py
-index 884bba7dd4b..44f616cdae1 100644
---- a/gnuradio-runtime/python/pmt/qa_pmt.py
-+++ b/gnuradio-runtime/python/pmt/qa_pmt.py
-@@ -18,6 +18,10 @@ class test_pmt(unittest.TestCase):
-     MAXINT32 = (2**31)-1
-     MININT32 = (-MAXINT32)-1
- 
-+    def setUp(self):
-+        from ctypes import sizeof, c_long
-+        self.sizeof_long = sizeof(c_long)
-+
-     def test01(self):
-         a = pmt.intern("a")
-         b = pmt.from_double(123765)
-@@ -112,6 +116,8 @@ def test14(self):
-         self.assertEqual(const,pmt.to_long(deser))
- 
-     def test15(self):
-+        if(self.sizeof_long <= 4):
-+            return
-         const = self.MAXINT32 + 1
-         x_pmt = pmt.from_long(const)
-         s = pmt.serialize_str(x_pmt)
-@@ -137,6 +143,8 @@ def test17(self):
-         self.assertEqual(const, x_long)
- 
-     def test18(self):
-+        if(self.sizeof_long <= 4):
-+            return
-         const = self.MININT32 - 1
-         x_pmt = pmt.from_long(const)
-         s = pmt.serialize_str(x_pmt)
diff --git a/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch b/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch
deleted file mode 100644
index c49a047427e8..000000000000
--- a/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7 Mon Sep 17 00:00:00 2001
-From: John Sallay <jasallay@gmail.com>
-Date: Sat, 23 Oct 2021 08:26:42 -0400
-Subject: [PATCH] Fix issue 4595 qa_agc Assertion Error.
-
-The number of input elements needs to be disivible by volk_alignment, which it wasn't
-for machines with 512-bit registers.
-
-Signed-off-by: John Sallay <jasallay@gmail.com>
----
- gr-analog/python/analog/qa_agc.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/gr-analog/python/analog/qa_agc.py b/gr-analog/python/analog/qa_agc.py
-index a5a8ea47b6a..9368dd5d2a8 100644
---- a/gr-analog/python/analog/qa_agc.py
-+++ b/gr-analog/python/analog/qa_agc.py
-@@ -454,7 +454,9 @@ def test_006(self):
-         tb = self.tb
- 
-         sampling_freq = 100
--        N = int(5*sampling_freq)
-+        # N must by a multiple of the volk_alignment of the system for this test to work.
-+        # For a machine with 512-bit registers, that would be 8 complex-floats.
-+        N = int(8 * sampling_freq)
-         src1 = analog.sig_source_c(sampling_freq, analog.GR_SIN_WAVE,
-                                    sampling_freq * 0.10, 100)
-         dst1 = blocks.vector_sink_c()
diff --git a/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch b/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch
deleted file mode 100644
index 4faa3468140a..000000000000
--- a/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f259befbbe54e55fc4994899e92bcf5bf462fa2f Mon Sep 17 00:00:00 2001
-From: alekhgupta1441 <alekhgupta1441@gmail.com>
-Date: Sun, 12 Apr 2020 03:48:14 +0530
-Subject: [PATCH] gr-digital/python : Updated soft_dec_lut_gen.py
-
----
- gr-digital/python/digital/soft_dec_lut_gen.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gr-digital/python/digital/soft_dec_lut_gen.py b/gr-digital/python/digital/soft_dec_lut_gen.py
-index 4503c4fea7b..84f6de66e45 100644
---- a/gr-digital/python/digital/soft_dec_lut_gen.py
-+++ b/gr-digital/python/digital/soft_dec_lut_gen.py
-@@ -73,7 +73,7 @@ def soft_dec_table_generator(soft_dec_gen, prec, Es=1):
- 
-     '''
- 
--    npts = 2.0**prec
-+    npts = int(2.0**prec)
-     maxd = Es*numpy.sqrt(2.0)/2.0
-     yrng = numpy.linspace(-maxd, maxd, npts)
-     xrng = numpy.linspace(-maxd, maxd, npts)
-@@ -110,7 +110,7 @@ def soft_dec_table(constel, symbols, prec, npwr=1):
-     re_max = max(numpy.array(constel).real)
-     im_max = max(numpy.array(constel).imag)
- 
--    npts = 2.0**prec
-+    npts = int(2.0**prec)
-     yrng = numpy.linspace(im_min, im_max, npts)
-     xrng = numpy.linspace(re_min, re_max, npts)
- 
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index c950b53e8bea..b47325cb6034 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,10 +1,12 @@
 # Template file for 'gnuradio'
 pkgname=gnuradio
-version=3.8.0.0
-revision=9
+version=3.10.2.0
+revision=1
 build_style=cmake
-conf_files="/etc/gnuradio/conf.d/*"
-configure_args="-DENABLE_INTERNAL_VOLK=OFF -DGR_PYTHON_DIR=/${py3_sitelib}"
+# FIXME: '/etc/gnuradio/conf.d/*' configuration file not in PKGDESTDIR!
+#conf_files="/etc/gnuradio/conf.d/*"
+configure_args="-DGR_PYTHON_DIR=/${py3_sitelib}"
+# TODO: https://pypi.org/project/schema/ as new build/runtime dep since v3.10.2.0?
 hostmakedepends="pkg-config doxygen swig python3-Mako python3-Sphinx
  python3-cairo python3-numpy python3-yaml texlive texlive-latexextra texlive-dvi"
 makedepends="SDL-devel boost-devel fftw-devel gsl-devel jack-devel
@@ -18,12 +20,10 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnuradio.org"
 distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=03fd01f0b27033befb91709b3d56f95e0869b5fb8bc71bec2662266a3f0dedf5
+checksum=a8f6c1cc98bc3784aa70ab29d3039ad6922ec36f908ecfb2c904a597b32c0776
 python_version=3
 
 post_install() {
-	rm ${DESTDIR}/usr/share/gnuradio/examples/audio/dial_tone \
-		${DESTDIR}/usr/share/gnuradio/examples/uhd/tags_demo
 	vinstall grc/scripts/freedesktop/gnuradio-grc.desktop 644 \
 		usr/share/applications
 	vinstall grc/scripts/freedesktop/gnuradio_logo_icon-square.svg 644 \
@@ -42,8 +42,10 @@ gnuradio-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove "usr/lib/*.so"
+		# FIXME: there's no shared objects at all anymore?!
+		#vmove "usr/lib/*.so"
 		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
+		# FIXME: it looks like pkgconfig files aren't installed even though *.pc.in files do exist
+		#vmove usr/lib/pkgconfig
 	}
 }

From edd64f92c6488b858e2cc63553673958366dc8fc Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 26 May 2022 21:55:43 +0300
Subject: [PATCH 5/6] openimageio: remove pointless pre_build vsed

This caused an error with XBPS_STRICT set due to the vsed not changing
anything.
---
 srcpkgs/openimageio/template | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index b63eca2ae31c..8abf3b05d6a3 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -36,9 +36,6 @@ fi
 
 pre_build() {
 	local f
-	# Replace -isystem with -I to avoid "#include_next <stdlib.h>" file not found
-	vsed -i src/cmake/compiler.cmake -e "s;-isystem;-I;g"
-
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		# Add libatomic to the targets
 		vsed -i src/libOpenImageIO/CMakeLists.txt \

From 37cb4daf9977598bf2eb4dc821d9a06f2aadacd6 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 26 May 2022 22:23:33 +0300
Subject: [PATCH 6/6] swiften: fix indentation of fix-cross-build.patch

This used to apply fine previously due to more lax default patch_args,
fix it to build in 2022.
---
 srcpkgs/swiften/patches/fix-cross-build.patch | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/swiften/patches/fix-cross-build.patch b/srcpkgs/swiften/patches/fix-cross-build.patch
index 906e60ce07de..c00178208a63 100644
--- a/srcpkgs/swiften/patches/fix-cross-build.patch
+++ b/srcpkgs/swiften/patches/fix-cross-build.patch
@@ -1,19 +1,19 @@
 --- a/3rdParty/LibMiniUPnPc/SConscript	2016-09-07 10:29:12.251340787 +0200
 +++ b/3rdParty/LibMiniUPnPc/SConscript	2016-09-07 10:29:49.165342691 +0200
-@@ -46,11 +46,11 @@
- 		if myenv["PLATFORM"] == "win32":
- 			myenv.Append(CCFLAGS = ["-DWIN32", "-D_WIN32_WINNT=0x0501"])
+@@ -46,11 +46,11 @@ if env.get("LIBMINIUPNPC_BUNDLED", False) :
+         if myenv["PLATFORM"] == "win32":
+             myenv.Append(CCFLAGS = ["-DWIN32", "-D_WIN32_WINNT=0x0501"])
  
--		if myenv["PLATFORM"] != "win32" and myenv["PLATFORM"] != "darwin":
--			conf = Configure(conf_env)
--			if conf.CheckTypeSize("struct ip_mreqn", includes="#include <netinet/in.h>") == 0:
--				myenv.Append(CCFLAGS = ["-DNEED_STRUCT_IP_MREQN"])
--			conf.Finish()
-+		#if myenv["PLATFORM"] != "win32" and myenv["PLATFORM"] != "darwin":
-+		#	conf = Configure(conf_env)
-+		#	if conf.CheckTypeSize("struct ip_mreqn", includes="#include <netinet/in.h>") == 0:
-+		#		myenv.Append(CCFLAGS = ["-DNEED_STRUCT_IP_MREQN"])
-+		#	conf.Finish()
+-        if myenv["PLATFORM"] != "win32" and myenv["PLATFORM"] != "darwin":
+-            conf = Configure(conf_env)
+-            if conf.CheckTypeSize("struct ip_mreqn", includes="#include <netinet/in.h>") == 0:
+-                myenv.Append(CCFLAGS = ["-DNEED_STRUCT_IP_MREQN"])
+-            conf.Finish()
++        #if myenv["PLATFORM"] != "win32" and myenv["PLATFORM"] != "darwin":
++        #    conf = Configure(conf_env)
++        #    if conf.CheckTypeSize("struct ip_mreqn", includes="#include <netinet/in.h>") == 0:
++        #        myenv.Append(CCFLAGS = ["-DNEED_STRUCT_IP_MREQN"])
++        #    conf.Finish()
  
- 		myenv.WriteVal("src/miniupnpc/miniupnpcstrings.h", myenv.Value(
+         myenv.WriteVal("src/miniupnpc/miniupnpcstrings.h", myenv.Value(
  """

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] boost: update to 1.79.0.
  2022-03-18 14:28 [PR PATCH] boost: update to 1.79.0.b1 JamiKettunen
                   ` (17 preceding siblings ...)
  2022-05-26 20:27 ` JamiKettunen
@ 2022-05-26 20:29 ` JamiKettunen
  2022-05-27 16:20 ` JamiKettunen
                   ` (9 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: JamiKettunen @ 2022-05-26 20:29 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 4041 bytes --]

There is an updated pull request by JamiKettunen against master on the void-packages repository

https://github.com/JamiKettunen/void-packages boost-1.79.0
https://github.com/void-linux/void-packages/pull/36204

boost: update to 1.79.0.
#### Packages to fix (from `xrevshlib boost` as locally build-tested on `x86_64-musl`)
- [ ] Aegisub (fails on `do_build()`)
- [ ] PrusaSlicer (fails on `do_build()`)
- [ ] TSC (fails on `do_build()`)
- [ ] bitcoin (fails on `do_check()`)
- [x] openimageio (fails on `pre_build()`, `vsed` doesn't change `src/cmake/compiler.cmake`)
  - [x] blender (depends on `openimageio`)
- [ ] cryfs (fails on `do_build()`)
- [ ] leatherman (hangs on `do_check()`, test process pinned one core at 100% for 10 minutes)
  - [ ] facter (depends on `leatherman`)
- [ ] fifengine (fails on `do_build()`)
- [x] uhd (fails on `do_build()`)
  - [ ] gnuradio (failed on `do_build()`, updating to [v3.10.2.0](https://github.com/gnuradio/gnuradio/releases/tag/v3.10.2.0) appears to have disabled building a lot of components including all shared objects and pkg-config files for example, probably just a bunch of missing new "optional" build-time dependencies...)
    - [ ] gnuradio-osmosdr (depends on `gnuradio`)
- [ ] imagescan (fails on `do_build()`)
- [ ] inkscape (fails on `do_check()`)
- [ ] kea (fails on `do_build()`)
- [ ] ledger (fails on `do_build()`)
- [ ] libbitcoin-system (fails on `do_build()`)
  - [ ] libbitcoin-database (depends on `libbitcoin-system`)
    - [ ] libbitcoin-blockchain (depends on `libbitcoin-database`)
      - [ ] libbitcoin-node (depends on `libbitcoin-blockchain`)
      - [ ] libbitcoin-server (depends on `libbitcoin-blockchain`)
  - [ ] libbitcoin-protocol (depends on `libbitcoin-system`)
    - [ ] libbitcoin-client (depends on `libbitcoin-protocol`)
      - [ ] libbitcoin-explorer (depends on `libbitcoin-client`)
  - [ ] libbitcoin-network (depends on `libbitcoin-system`)
- [ ] libetonyek (fails on `do_build()`, appears to need `-std=c++17` or higher? `NUM3Parser.cpp:46:8: error: 'for_each' is not a member of 'std'`)
  - [ ] libreoffice (depends on `libetonyek`)
- [ ] librime (fails on `do_build()`)
- [ ] libtorrent-rasterbar (hangs on `do_check()`, 90/97 test_web_seed_http stuck for 10 minutes)
- [ ] namecoin (fails on `do_build()`)
- [ ] pulseeffects-legacy (fails on `do_build()`)
- [ ] schroot (fails on `do_check()`)
- [ ] supercollider (fails on `do_build()`)
- [x] swiften (fails on `do_patch`, `fix-cross-build.patch` doesn't apply)

#### Packages to fix (from `xrevshlib uhd` as locally build-tested on `x86_64-musl`)
- [ ] urh (fails on `do_check()` even after adding `checkdepends="python3-pip"`)

#### Modified patches (boost)
`exec_file.patch`: Removed due to being upstream as https://github.com/boostorg/python/commit/d9f06052e28873037db7f98629bce72182a42410
`mips.patch`: Updated to apply on top of https://github.com/boostorg/fiber/commit/5dc9dabc5d5ff8da53ec897c265c9cba1b6ed0df, not sure if this can be removed now(?)

#### Misc changes
- I've renamed all subpackages of `boost` so that the versioned name doesn't conflict with other numbers and are consistent with the previously existing `boost-python3-1.72`, e.g. `libboost_math_c991.72` is now `libboost_math_c99-1.79` (notice the `-`!)

#### Testing the changes
- I tested the changes in this PR: **NO**

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36204.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boost-1.79.0-36204.patch --]
[-- Type: text/x-diff, Size: 54555 bytes --]

From e66da88f51e2d7285a4ea2e5ea76e0373997340c Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 15:28:37 +0200
Subject: [PATCH 1/6] boost: update to 1.79.0.

---
 common/shlibs                                 |  64 +++----
 .../{boost-python1.72 => boost-python1.79}    |   0
 ...{boost-python3-1.72 => boost-python3-1.79} |   0
 srcpkgs/boost/patches/exec_file.patch         |  45 -----
 srcpkgs/boost/patches/mips.patch              |   2 +-
 srcpkgs/boost/template                        | 161 +++++++++---------
 ...ibboost_atomic1.72 => libboost_atomic1.79} |   0
 ...ibboost_chrono1.72 => libboost_chrono1.79} |   0
 ...t_container1.72 => libboost_container1.79} |   0
 ...boost_context1.72 => libboost_context1.79} |   0
 ...ost_contract1.72 => libboost_contract1.79} |   0
 ...t_coroutine1.72 => libboost_coroutine1.79} |   0
 ...t_date_time1.72 => libboost_date_time1.79} |   0
 ...{libboost_fiber1.72 => libboost_fiber1.79} |   0
 ...filesystem1.72 => libboost_filesystem1.79} |   0
 ...{libboost_graph1.72 => libboost_graph1.79} |   0
 ...t_iostreams1.72 => libboost_iostreams1.79} |   0
 ...{libboost_locale1.72 => libboost_json1.79} |   0
 .../{libboost_log1.72 => libboost_locale1.79} |   0
 ...ibboost_log_setup1.72 => libboost_log1.79} |   0
 ...st_math_c991.72 => libboost_log_setup1.79} |   0
 ...t_math_c99f1.72 => libboost_math_c99-1.79} |   0
 ...t_math_c99l1.72 => libboost_math_c99f1.79} |   0
 ...st_math_tr11.72 => libboost_math_c99l1.79} |   0
 ...t_math_tr1f1.72 => libboost_math_tr1-1.79} |   0
 ...t_math_tr1l1.72 => libboost_math_tr1f1.79} |   0
 ...xec_monitor1.72 => libboost_math_tr1l1.79} |   0
 ...rogram_options1.72 => libboost_nowide1.79} |   0
 ...ndom1.72 => libboost_prg_exec_monitor1.79} |   0
 ...regex1.72 => libboost_program_options1.79} |   0
 ..._serialization1.72 => libboost_random1.79} |   0
 ...trace_addr2line1.72 => libboost_regex1.79} |   0
 ...e_basic1.72 => libboost_serialization1.79} |   0
 ...1.72 => libboost_stacktrace_addr2line1.79} |   0
 ...stem1.72 => libboost_stacktrace_basic1.79} |   0
 ...hread1.72 => libboost_stacktrace_noop1.79} |   0
 ...libboost_timer1.72 => libboost_system1.79} |   0
 ...t_type_erasure1.72 => libboost_thread1.79} |   0
 ..._test_framework1.72 => libboost_timer1.79} |   0
 ...ost_wave1.72 => libboost_type_erasure1.79} |   0
 ...n1.72 => libboost_unit_test_framework1.79} |   0
 srcpkgs/libboost_wave1.79                     |   1 +
 srcpkgs/libboost_wserialization1.79           |   1 +
 43 files changed, 113 insertions(+), 161 deletions(-)
 rename srcpkgs/{boost-python1.72 => boost-python1.79} (100%)
 rename srcpkgs/{boost-python3-1.72 => boost-python3-1.79} (100%)
 delete mode 100644 srcpkgs/boost/patches/exec_file.patch
 rename srcpkgs/{libboost_atomic1.72 => libboost_atomic1.79} (100%)
 rename srcpkgs/{libboost_chrono1.72 => libboost_chrono1.79} (100%)
 rename srcpkgs/{libboost_container1.72 => libboost_container1.79} (100%)
 rename srcpkgs/{libboost_context1.72 => libboost_context1.79} (100%)
 rename srcpkgs/{libboost_contract1.72 => libboost_contract1.79} (100%)
 rename srcpkgs/{libboost_coroutine1.72 => libboost_coroutine1.79} (100%)
 rename srcpkgs/{libboost_date_time1.72 => libboost_date_time1.79} (100%)
 rename srcpkgs/{libboost_fiber1.72 => libboost_fiber1.79} (100%)
 rename srcpkgs/{libboost_filesystem1.72 => libboost_filesystem1.79} (100%)
 rename srcpkgs/{libboost_graph1.72 => libboost_graph1.79} (100%)
 rename srcpkgs/{libboost_iostreams1.72 => libboost_iostreams1.79} (100%)
 rename srcpkgs/{libboost_locale1.72 => libboost_json1.79} (100%)
 rename srcpkgs/{libboost_log1.72 => libboost_locale1.79} (100%)
 rename srcpkgs/{libboost_log_setup1.72 => libboost_log1.79} (100%)
 rename srcpkgs/{libboost_math_c991.72 => libboost_log_setup1.79} (100%)
 rename srcpkgs/{libboost_math_c99f1.72 => libboost_math_c99-1.79} (100%)
 rename srcpkgs/{libboost_math_c99l1.72 => libboost_math_c99f1.79} (100%)
 rename srcpkgs/{libboost_math_tr11.72 => libboost_math_c99l1.79} (100%)
 rename srcpkgs/{libboost_math_tr1f1.72 => libboost_math_tr1-1.79} (100%)
 rename srcpkgs/{libboost_math_tr1l1.72 => libboost_math_tr1f1.79} (100%)
 rename srcpkgs/{libboost_prg_exec_monitor1.72 => libboost_math_tr1l1.79} (100%)
 rename srcpkgs/{libboost_program_options1.72 => libboost_nowide1.79} (100%)
 rename srcpkgs/{libboost_random1.72 => libboost_prg_exec_monitor1.79} (100%)
 rename srcpkgs/{libboost_regex1.72 => libboost_program_options1.79} (100%)
 rename srcpkgs/{libboost_serialization1.72 => libboost_random1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_addr2line1.72 => libboost_regex1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_basic1.72 => libboost_serialization1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_noop1.72 => libboost_stacktrace_addr2line1.79} (100%)
 rename srcpkgs/{libboost_system1.72 => libboost_stacktrace_basic1.79} (100%)
 rename srcpkgs/{libboost_thread1.72 => libboost_stacktrace_noop1.79} (100%)
 rename srcpkgs/{libboost_timer1.72 => libboost_system1.79} (100%)
 rename srcpkgs/{libboost_type_erasure1.72 => libboost_thread1.79} (100%)
 rename srcpkgs/{libboost_unit_test_framework1.72 => libboost_timer1.79} (100%)
 rename srcpkgs/{libboost_wave1.72 => libboost_type_erasure1.79} (100%)
 rename srcpkgs/{libboost_wserialization1.72 => libboost_unit_test_framework1.79} (100%)
 create mode 120000 srcpkgs/libboost_wave1.79
 create mode 120000 srcpkgs/libboost_wserialization1.79

diff --git a/common/shlibs b/common/shlibs
index 9fd62e7c1baf..bb418cdfc245 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -620,38 +620,38 @@ 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.79.0 libboost_context1.79-1.79.0_1
+libboost_coroutine.so.1.79.0 libboost_coroutine1.79-1.79.0_1
+libboost_container.so.1.79.0 libboost_container1.79-1.79.0_1
+libboost_prg_exec_monitor.so.1.79.0 libboost_prg_exec_monitor1.79-1.79.0_1
+libboost_timer.so.1.79.0 libboost_timer1.79-1.79.0_1
+libboost_random.so.1.79.0 libboost_random1.79-1.79.0_1
+libboost_filesystem.so.1.79.0 libboost_filesystem1.79-1.79.0_1
+libboost_unit_test_framework.so.1.79.0 libboost_unit_test_framework1.79-1.79.0_1
+libboost_math_c99.so.1.79.0 libboost_math_c99-1.79-1.79.0_1
+libboost_math_tr1.so.1.79.0 libboost_math_tr1-1.79-1.79.0_1
+libboost_regex.so.1.79.0 libboost_regex1.79-1.79.0_1
+libboost_serialization.so.1.79.0 libboost_serialization1.79-1.79.0_1
+libboost_chrono.so.1.79.0 libboost_chrono1.79-1.79.0_1
+libboost_wserialization.so.1.79.0 libboost_wserialization1.79-1.79.0_1
+libboost_graph.so.1.79.0 libboost_graph1.79-1.79.0_1
+libboost_log.so.1.79.0 libboost_log1.79-1.79.0_1
+libboost_locale.so.1.79.0 libboost_locale1.79-1.79.0_1
+libboost_program_options.so.1.79.0 libboost_program_options1.79-1.79.0_1
+libboost_iostreams.so.1.79.0 libboost_iostreams1.79-1.79.0_1
+libboost_system.so.1.79.0 libboost_system1.79-1.79.0_1
+libboost_thread.so.1.79.0 libboost_thread1.79-1.79.0_1
+libboost_log_setup.so.1.79.0 libboost_log_setup1.79-1.79.0_1
+libboost_date_time.so.1.79.0 libboost_date_time1.79-1.79.0_1
+libboost_wave.so.1.79.0 libboost_wave1.79-1.79.0_1
+libboost_atomic.so.1.79.0 libboost_atomic1.79-1.79.0_1
+libboost_type_erasure.so.1.79.0 libboost_type_erasure1.79-1.79.0_1
+libboost_fiber.so.1.79.0 libboost_fiber1.79-1.79.0_1
+libboost_stacktrace_noop.so.1.79.0 libboost_stacktrace_noop1.79-1.79.0_1
+libboost_stacktrace_addr2line.so.1.79.0 libboost_stacktrace_addr2line1.79-1.79.0_1
+libboost_stacktrace_basic.so.1.79.0 libboost_stacktrace_basic1.79-1.79.0_1
+libboost_python27.so.1.79.0 boost-python1.79-1.79.0_1
+libboost_python310.so.1.79.0 boost-python3-1.79-1.79.0_1
 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-python1.79
similarity index 100%
rename from srcpkgs/boost-python1.72
rename to srcpkgs/boost-python1.79
diff --git a/srcpkgs/boost-python3-1.72 b/srcpkgs/boost-python3-1.79
similarity index 100%
rename from srcpkgs/boost-python3-1.72
rename to srcpkgs/boost-python3-1.79
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/mips.patch b/srcpkgs/boost/patches/mips.patch
index a10a2122d9c7..8d253fc7c286 100644
--- a/srcpkgs/boost/patches/mips.patch
+++ b/srcpkgs/boost/patches/mips.patch
@@ -3,7 +3,7 @@
 @@ -48,7 +48,7 @@
  #  define cpu_relax() asm volatile ("nop" ::: "memory");
  # endif
- #elif BOOST_ARCH_MIPS
+ #elif BOOST_ARCH_MIPS && (((__mips_isa_rev > 1) && defined(__mips32)) || ((__mips_isa_rev > 2)  && defined(__mips64)))
 -# define cpu_relax() asm volatile ("pause" ::: "memory");
 +# define cpu_relax() asm volatile ("nop" ::: "memory");
  #elif BOOST_ARCH_PPC
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 126c50770b50..ad705311b867 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,8 +1,8 @@
 # Template file for 'boost'
 pkgname=boost
-version=1.72.0
-revision=7
-wrksrc="${pkgname}_${version//\./_}"
+version=1.79.0
+revision=1
+wrksrc="boost_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
 short_desc="Free peer-reviewed portable C++ source libraries"
@@ -10,53 +10,34 @@ 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=475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39
 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"
+subpackages="libboost_program_options1.79 libboost_math_c99f1.79
+ libboost_stacktrace_basic1.79 libboost_stacktrace_noop1.79
+ libboost_iostreams1.79 libboost_math_tr1l1.79 libboost_filesystem1.79
+ libboost_chrono1.79 libboost_math_tr1f1.79 libboost_wave1.79
+ libboost_graph1.79 libboost_locale1.79 libboost_regex1.79
+ libboost_fiber1.79 libboost_type_erasure1.79 libboost_coroutine1.79
+ libboost_atomic1.79 libboost_prg_exec_monitor1.79 libboost_math_c99-1.79
+ boost-python3-1.79 libboost_log_setup1.79 boost-devel
+ libboost_timer1.79 libboost_system1.79 libboost_unit_test_framework1.79
+ libboost_serialization1.79 libboost_math_tr1-1.79 boost-build
+ libboost_math_c99l1.79 boost-python1.79 libboost_contract1.79
+ libboost_date_time1.79 libboost_log1.79 libboost_random1.79
+ libboost_thread1.79 libboost_container1.79 boost-jam
+ libboost_wserialization1.79 libboost_context1.79 libboost_json1.79
+ libboost_nowide1.79"
 
 if [ -z "$CROSS_BUILD" ]; then
-	subpackages+=" libboost_stacktrace_addr2line1.72"
+	subpackages+=" libboost_stacktrace_addr2line1.79"
 fi
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*)    _arch=x86;      _abi=sysv  ;;
-	x86_64*)  _arch=x86;      _abi=sysv  ;;
-	arm*)     _arch=arm;      _abi=aapcs ;;
-	aarch64*) _arch=arm;      _abi=aapcs ;;
-	mips*)    _arch=mips32r2; _abi=o32   ;;
-	ppc*)     _arch=power;    _abi=sysv  ;;
+	i686*|x86_64*) _arch=x86;      _abi=sysv  ;;
+	arm*|aarch64*) _arch=arm;      _abi=aapcs ;;
+	mips*)         _arch=mips32r2; _abi=o32   ;;
+	ppc*)          _arch=power;    _abi=sysv  ;;
 esac
 
 do_build() {
@@ -66,7 +47,7 @@ do_build() {
 	(
 	# Rebuild bjam for target
 	cd tools/build/src/engine
-	./build.sh gcc
+	./build.sh --cxx="${CXX}" --cxxflags="${CXXFLAGS}" gcc
 	)
 	cat > user-config.jam <<-__EOF
 	using gcc : : ${CXX} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
@@ -74,10 +55,8 @@ do_build() {
 	using python : ${py3_ver} : ${XBPS_CROSS_BASE}/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} \
 		threading=multi runtime-link=shared link=shared,static
 }
@@ -119,7 +98,7 @@ boost-jam_package() {
 		vmove usr/bin/b2
 	}
 }
-boost-python1.72_package() {
+boost-python1.79_package() {
 	depends="boost python"
 	replaces="boost-python>=0"
 	short_desc+=" - Python bindings"
@@ -127,7 +106,7 @@ boost-python1.72_package() {
 		vmove "usr/lib/libboost_python2*.so.*"
 	}
 }
-boost-python3-1.72_package() {
+boost-python3-1.79_package() {
 	depends="boost python3"
 	replaces="boost-python3>=0"
 	short_desc+=" - Python3 bindings"
@@ -154,7 +133,7 @@ boost-devel_package() {
 	}
 }
 
-libboost_atomic1.72_package() {
+libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
@@ -162,7 +141,7 @@ libboost_atomic1.72_package() {
 	}
 }
 
-libboost_chrono1.72_package() {
+libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
@@ -170,7 +149,7 @@ libboost_chrono1.72_package() {
 	}
 }
 
-libboost_container1.72_package() {
+libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
@@ -178,7 +157,7 @@ libboost_container1.72_package() {
 	}
 }
 
-libboost_context1.72_package() {
+libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
@@ -186,7 +165,7 @@ libboost_context1.72_package() {
 	}
 }
 
-libboost_contract1.72_package() {
+libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
@@ -194,7 +173,7 @@ libboost_contract1.72_package() {
 	}
 }
 
-libboost_coroutine1.72_package() {
+libboost_coroutine1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
@@ -202,7 +181,7 @@ libboost_coroutine1.72_package() {
 	}
 }
 
-libboost_date_time1.72_package() {
+libboost_date_time1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
@@ -210,7 +189,7 @@ libboost_date_time1.72_package() {
 	}
 }
 
-libboost_fiber1.72_package() {
+libboost_fiber1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_fiber"
 	pkg_install() {
@@ -218,7 +197,7 @@ libboost_fiber1.72_package() {
 	}
 }
 
-libboost_filesystem1.72_package() {
+libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
@@ -226,7 +205,7 @@ libboost_filesystem1.72_package() {
 	}
 }
 
-libboost_graph1.72_package() {
+libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
@@ -234,7 +213,7 @@ libboost_graph1.72_package() {
 	}
 }
 
-libboost_iostreams1.72_package() {
+libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
@@ -242,7 +221,7 @@ libboost_iostreams1.72_package() {
 	}
 }
 
-libboost_locale1.72_package() {
+libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
@@ -250,7 +229,7 @@ libboost_locale1.72_package() {
 	}
 }
 
-libboost_log1.72_package() {
+libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
@@ -258,7 +237,7 @@ libboost_log1.72_package() {
 	}
 }
 
-libboost_log_setup1.72_package() {
+libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
@@ -266,7 +245,7 @@ libboost_log_setup1.72_package() {
 	}
 }
 
-libboost_math_c991.72_package() {
+libboost_math_c99-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
@@ -274,7 +253,7 @@ libboost_math_c991.72_package() {
 	}
 }
 
-libboost_math_c99f1.72_package() {
+libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
@@ -282,7 +261,7 @@ libboost_math_c99f1.72_package() {
 	}
 }
 
-libboost_math_c99l1.72_package() {
+libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
@@ -290,7 +269,7 @@ libboost_math_c99l1.72_package() {
 	}
 }
 
-libboost_math_tr11.72_package() {
+libboost_math_tr1-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
@@ -298,7 +277,7 @@ libboost_math_tr11.72_package() {
 	}
 }
 
-libboost_math_tr1f1.72_package() {
+libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
@@ -306,7 +285,7 @@ libboost_math_tr1f1.72_package() {
 	}
 }
 
-libboost_math_tr1l1.72_package() {
+libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
@@ -314,7 +293,7 @@ libboost_math_tr1l1.72_package() {
 	}
 }
 
-libboost_prg_exec_monitor1.72_package() {
+libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
@@ -322,7 +301,7 @@ libboost_prg_exec_monitor1.72_package() {
 	}
 }
 
-libboost_program_options1.72_package() {
+libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
@@ -330,7 +309,7 @@ libboost_program_options1.72_package() {
 	}
 }
 
-libboost_random1.72_package() {
+libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
@@ -338,7 +317,7 @@ libboost_random1.72_package() {
 	}
 }
 
-libboost_regex1.72_package() {
+libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
@@ -346,7 +325,7 @@ libboost_regex1.72_package() {
 	}
 }
 
-libboost_serialization1.72_package() {
+libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
@@ -354,7 +333,7 @@ libboost_serialization1.72_package() {
 	}
 }
 
-libboost_stacktrace_addr2line1.72_package() {
+libboost_stacktrace_addr2line1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_addr2line"
 	pkg_install() {
@@ -362,7 +341,7 @@ libboost_stacktrace_addr2line1.72_package() {
 	}
 }
 
-libboost_stacktrace_basic1.72_package() {
+libboost_stacktrace_basic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_basic"
 	pkg_install() {
@@ -370,7 +349,7 @@ libboost_stacktrace_basic1.72_package() {
 	}
 }
 
-libboost_stacktrace_noop1.72_package() {
+libboost_stacktrace_noop1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_noop"
 	pkg_install() {
@@ -378,7 +357,7 @@ libboost_stacktrace_noop1.72_package() {
 	}
 }
 
-libboost_system1.72_package() {
+libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
@@ -386,7 +365,7 @@ libboost_system1.72_package() {
 	}
 }
 
-libboost_thread1.72_package() {
+libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
@@ -394,7 +373,7 @@ libboost_thread1.72_package() {
 	}
 }
 
-libboost_timer1.72_package() {
+libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
@@ -402,7 +381,7 @@ libboost_timer1.72_package() {
 	}
 }
 
-libboost_type_erasure1.72_package() {
+libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
@@ -410,7 +389,7 @@ libboost_type_erasure1.72_package() {
 	}
 }
 
-libboost_unit_test_framework1.72_package() {
+libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
@@ -418,7 +397,7 @@ libboost_unit_test_framework1.72_package() {
 	}
 }
 
-libboost_wave1.72_package() {
+libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
@@ -426,10 +405,26 @@ libboost_wave1.72_package() {
 	}
 }
 
-libboost_wserialization1.72_package() {
+libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
 		vmove usr/lib/libboost_wserialization.so.*
 	}
 }
+
+libboost_json1.79_package() {
+	depends="boost"
+	short_desc+=" - libboost_json"
+	pkg_install() {
+		vmove "usr/lib/libboost_json.so.*"
+	}
+}
+
+libboost_nowide1.79_package() {
+	depends="boost"
+	short_desc+=" - libboost_nowide"
+	pkg_install() {
+		vmove "usr/lib/libboost_nowide.so.*"
+	}
+}
diff --git a/srcpkgs/libboost_atomic1.72 b/srcpkgs/libboost_atomic1.79
similarity index 100%
rename from srcpkgs/libboost_atomic1.72
rename to srcpkgs/libboost_atomic1.79
diff --git a/srcpkgs/libboost_chrono1.72 b/srcpkgs/libboost_chrono1.79
similarity index 100%
rename from srcpkgs/libboost_chrono1.72
rename to srcpkgs/libboost_chrono1.79
diff --git a/srcpkgs/libboost_container1.72 b/srcpkgs/libboost_container1.79
similarity index 100%
rename from srcpkgs/libboost_container1.72
rename to srcpkgs/libboost_container1.79
diff --git a/srcpkgs/libboost_context1.72 b/srcpkgs/libboost_context1.79
similarity index 100%
rename from srcpkgs/libboost_context1.72
rename to srcpkgs/libboost_context1.79
diff --git a/srcpkgs/libboost_contract1.72 b/srcpkgs/libboost_contract1.79
similarity index 100%
rename from srcpkgs/libboost_contract1.72
rename to srcpkgs/libboost_contract1.79
diff --git a/srcpkgs/libboost_coroutine1.72 b/srcpkgs/libboost_coroutine1.79
similarity index 100%
rename from srcpkgs/libboost_coroutine1.72
rename to srcpkgs/libboost_coroutine1.79
diff --git a/srcpkgs/libboost_date_time1.72 b/srcpkgs/libboost_date_time1.79
similarity index 100%
rename from srcpkgs/libboost_date_time1.72
rename to srcpkgs/libboost_date_time1.79
diff --git a/srcpkgs/libboost_fiber1.72 b/srcpkgs/libboost_fiber1.79
similarity index 100%
rename from srcpkgs/libboost_fiber1.72
rename to srcpkgs/libboost_fiber1.79
diff --git a/srcpkgs/libboost_filesystem1.72 b/srcpkgs/libboost_filesystem1.79
similarity index 100%
rename from srcpkgs/libboost_filesystem1.72
rename to srcpkgs/libboost_filesystem1.79
diff --git a/srcpkgs/libboost_graph1.72 b/srcpkgs/libboost_graph1.79
similarity index 100%
rename from srcpkgs/libboost_graph1.72
rename to srcpkgs/libboost_graph1.79
diff --git a/srcpkgs/libboost_iostreams1.72 b/srcpkgs/libboost_iostreams1.79
similarity index 100%
rename from srcpkgs/libboost_iostreams1.72
rename to srcpkgs/libboost_iostreams1.79
diff --git a/srcpkgs/libboost_locale1.72 b/srcpkgs/libboost_json1.79
similarity index 100%
rename from srcpkgs/libboost_locale1.72
rename to srcpkgs/libboost_json1.79
diff --git a/srcpkgs/libboost_log1.72 b/srcpkgs/libboost_locale1.79
similarity index 100%
rename from srcpkgs/libboost_log1.72
rename to srcpkgs/libboost_locale1.79
diff --git a/srcpkgs/libboost_log_setup1.72 b/srcpkgs/libboost_log1.79
similarity index 100%
rename from srcpkgs/libboost_log_setup1.72
rename to srcpkgs/libboost_log1.79
diff --git a/srcpkgs/libboost_math_c991.72 b/srcpkgs/libboost_log_setup1.79
similarity index 100%
rename from srcpkgs/libboost_math_c991.72
rename to srcpkgs/libboost_log_setup1.79
diff --git a/srcpkgs/libboost_math_c99f1.72 b/srcpkgs/libboost_math_c99-1.79
similarity index 100%
rename from srcpkgs/libboost_math_c99f1.72
rename to srcpkgs/libboost_math_c99-1.79
diff --git a/srcpkgs/libboost_math_c99l1.72 b/srcpkgs/libboost_math_c99f1.79
similarity index 100%
rename from srcpkgs/libboost_math_c99l1.72
rename to srcpkgs/libboost_math_c99f1.79
diff --git a/srcpkgs/libboost_math_tr11.72 b/srcpkgs/libboost_math_c99l1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr11.72
rename to srcpkgs/libboost_math_c99l1.79
diff --git a/srcpkgs/libboost_math_tr1f1.72 b/srcpkgs/libboost_math_tr1-1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1f1.72
rename to srcpkgs/libboost_math_tr1-1.79
diff --git a/srcpkgs/libboost_math_tr1l1.72 b/srcpkgs/libboost_math_tr1f1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1l1.72
rename to srcpkgs/libboost_math_tr1f1.79
diff --git a/srcpkgs/libboost_prg_exec_monitor1.72 b/srcpkgs/libboost_math_tr1l1.79
similarity index 100%
rename from srcpkgs/libboost_prg_exec_monitor1.72
rename to srcpkgs/libboost_math_tr1l1.79
diff --git a/srcpkgs/libboost_program_options1.72 b/srcpkgs/libboost_nowide1.79
similarity index 100%
rename from srcpkgs/libboost_program_options1.72
rename to srcpkgs/libboost_nowide1.79
diff --git a/srcpkgs/libboost_random1.72 b/srcpkgs/libboost_prg_exec_monitor1.79
similarity index 100%
rename from srcpkgs/libboost_random1.72
rename to srcpkgs/libboost_prg_exec_monitor1.79
diff --git a/srcpkgs/libboost_regex1.72 b/srcpkgs/libboost_program_options1.79
similarity index 100%
rename from srcpkgs/libboost_regex1.72
rename to srcpkgs/libboost_program_options1.79
diff --git a/srcpkgs/libboost_serialization1.72 b/srcpkgs/libboost_random1.79
similarity index 100%
rename from srcpkgs/libboost_serialization1.72
rename to srcpkgs/libboost_random1.79
diff --git a/srcpkgs/libboost_stacktrace_addr2line1.72 b/srcpkgs/libboost_regex1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_addr2line1.72
rename to srcpkgs/libboost_regex1.79
diff --git a/srcpkgs/libboost_stacktrace_basic1.72 b/srcpkgs/libboost_serialization1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_basic1.72
rename to srcpkgs/libboost_serialization1.79
diff --git a/srcpkgs/libboost_stacktrace_noop1.72 b/srcpkgs/libboost_stacktrace_addr2line1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_noop1.72
rename to srcpkgs/libboost_stacktrace_addr2line1.79
diff --git a/srcpkgs/libboost_system1.72 b/srcpkgs/libboost_stacktrace_basic1.79
similarity index 100%
rename from srcpkgs/libboost_system1.72
rename to srcpkgs/libboost_stacktrace_basic1.79
diff --git a/srcpkgs/libboost_thread1.72 b/srcpkgs/libboost_stacktrace_noop1.79
similarity index 100%
rename from srcpkgs/libboost_thread1.72
rename to srcpkgs/libboost_stacktrace_noop1.79
diff --git a/srcpkgs/libboost_timer1.72 b/srcpkgs/libboost_system1.79
similarity index 100%
rename from srcpkgs/libboost_timer1.72
rename to srcpkgs/libboost_system1.79
diff --git a/srcpkgs/libboost_type_erasure1.72 b/srcpkgs/libboost_thread1.79
similarity index 100%
rename from srcpkgs/libboost_type_erasure1.72
rename to srcpkgs/libboost_thread1.79
diff --git a/srcpkgs/libboost_unit_test_framework1.72 b/srcpkgs/libboost_timer1.79
similarity index 100%
rename from srcpkgs/libboost_unit_test_framework1.72
rename to srcpkgs/libboost_timer1.79
diff --git a/srcpkgs/libboost_wave1.72 b/srcpkgs/libboost_type_erasure1.79
similarity index 100%
rename from srcpkgs/libboost_wave1.72
rename to srcpkgs/libboost_type_erasure1.79
diff --git a/srcpkgs/libboost_wserialization1.72 b/srcpkgs/libboost_unit_test_framework1.79
similarity index 100%
rename from srcpkgs/libboost_wserialization1.72
rename to srcpkgs/libboost_unit_test_framework1.79
diff --git a/srcpkgs/libboost_wave1.79 b/srcpkgs/libboost_wave1.79
new file mode 120000
index 000000000000..baef819c48f6
--- /dev/null
+++ b/srcpkgs/libboost_wave1.79
@@ -0,0 +1 @@
+boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_wserialization1.79 b/srcpkgs/libboost_wserialization1.79
new file mode 120000
index 000000000000..baef819c48f6
--- /dev/null
+++ b/srcpkgs/libboost_wserialization1.79
@@ -0,0 +1 @@
+boost
\ No newline at end of file

From e78e8f0a48490cbb4efaa0ff492c23d760bea7ed Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 18:29:05 +0200
Subject: [PATCH 2/6] boost: quote all vmove's with a glob.

---
 srcpkgs/boost/template | 70 +++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index ad705311b867..7a9c1c33fa44 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -137,7 +137,7 @@ libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
-		vmove usr/lib/libboost_atomic.so.*
+		vmove "usr/lib/libboost_atomic.so.*"
 	}
 }
 
@@ -145,7 +145,7 @@ libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
-		vmove usr/lib/libboost_chrono.so.*
+		vmove "usr/lib/libboost_chrono.so.*"
 	}
 }
 
@@ -153,7 +153,7 @@ libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
-		vmove usr/lib/libboost_container.so.*
+		vmove "usr/lib/libboost_container.so.*"
 	}
 }
 
@@ -161,7 +161,7 @@ libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
-		vmove usr/lib/libboost_context.so.*
+		vmove "usr/lib/libboost_context.so.*"
 	}
 }
 
@@ -169,7 +169,7 @@ libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
-		vmove usr/lib/libboost_contract.so.*
+		vmove "usr/lib/libboost_contract.so.*"
 	}
 }
 
@@ -177,7 +177,7 @@ libboost_coroutine1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
-		vmove usr/lib/libboost_coroutine.so.*
+		vmove "usr/lib/libboost_coroutine.so.*"
 	}
 }
 
@@ -185,7 +185,7 @@ libboost_date_time1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
-		vmove usr/lib/libboost_date_time.so.*
+		vmove "usr/lib/libboost_date_time.so.*"
 	}
 }
 
@@ -193,7 +193,7 @@ libboost_fiber1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_fiber"
 	pkg_install() {
-		vmove usr/lib/libboost_fiber.so.*
+		vmove "usr/lib/libboost_fiber.so.*"
 	}
 }
 
@@ -201,7 +201,7 @@ libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
-		vmove usr/lib/libboost_filesystem.so.*
+		vmove "usr/lib/libboost_filesystem.so.*"
 	}
 }
 
@@ -209,7 +209,7 @@ libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
-		vmove usr/lib/libboost_graph.so.*
+		vmove "usr/lib/libboost_graph.so.*"
 	}
 }
 
@@ -217,7 +217,7 @@ libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
-		vmove usr/lib/libboost_iostreams.so.*
+		vmove "usr/lib/libboost_iostreams.so.*"
 	}
 }
 
@@ -225,7 +225,7 @@ libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
-		vmove usr/lib/libboost_locale.so.*
+		vmove "usr/lib/libboost_locale.so.*"
 	}
 }
 
@@ -233,7 +233,7 @@ libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
-		vmove usr/lib/libboost_log.so.*
+		vmove "usr/lib/libboost_log.so.*"
 	}
 }
 
@@ -241,7 +241,7 @@ libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
-		vmove usr/lib/libboost_log_setup.so.*
+		vmove "usr/lib/libboost_log_setup.so.*"
 	}
 }
 
@@ -249,7 +249,7 @@ libboost_math_c99-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99.so.*
+		vmove "usr/lib/libboost_math_c99.so.*"
 	}
 }
 
@@ -257,7 +257,7 @@ libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99f.so.*
+		vmove "usr/lib/libboost_math_c99f.so.*"
 	}
 }
 
@@ -265,7 +265,7 @@ libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99l.so.*
+		vmove "usr/lib/libboost_math_c99l.so.*"
 	}
 }
 
@@ -273,7 +273,7 @@ libboost_math_tr1-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1.so.*
+		vmove "usr/lib/libboost_math_tr1.so.*"
 	}
 }
 
@@ -281,7 +281,7 @@ libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1f.so.*
+		vmove "usr/lib/libboost_math_tr1f.so.*"
 	}
 }
 
@@ -289,7 +289,7 @@ libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1l.so.*
+		vmove "usr/lib/libboost_math_tr1l.so.*"
 	}
 }
 
@@ -297,7 +297,7 @@ libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
-		vmove usr/lib/libboost_prg_exec_monitor.so.*
+		vmove "usr/lib/libboost_prg_exec_monitor.so.*"
 	}
 }
 
@@ -305,7 +305,7 @@ libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
-		vmove usr/lib/libboost_program_options.so.*
+		vmove "usr/lib/libboost_program_options.so.*"
 	}
 }
 
@@ -313,7 +313,7 @@ libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
-		vmove usr/lib/libboost_random.so.*
+		vmove "usr/lib/libboost_random.so.*"
 	}
 }
 
@@ -321,7 +321,7 @@ libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
-		vmove usr/lib/libboost_regex.so.*
+		vmove "usr/lib/libboost_regex.so.*"
 	}
 }
 
@@ -329,7 +329,7 @@ libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
-		vmove usr/lib/libboost_serialization.so.*
+		vmove "usr/lib/libboost_serialization.so.*"
 	}
 }
 
@@ -337,7 +337,7 @@ libboost_stacktrace_addr2line1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_addr2line"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_addr2line.so.*
+		vmove "usr/lib/libboost_stacktrace_addr2line.so.*"
 	}
 }
 
@@ -345,7 +345,7 @@ libboost_stacktrace_basic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_basic"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_basic.so.*
+		vmove "usr/lib/libboost_stacktrace_basic.so.*"
 	}
 }
 
@@ -353,7 +353,7 @@ libboost_stacktrace_noop1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_noop"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_noop.so.*
+		vmove "usr/lib/libboost_stacktrace_noop.so.*"
 	}
 }
 
@@ -361,7 +361,7 @@ libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
-		vmove usr/lib/libboost_system.so.*
+		vmove "usr/lib/libboost_system.so.*"
 	}
 }
 
@@ -369,7 +369,7 @@ libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
-		vmove usr/lib/libboost_thread.so.*
+		vmove "usr/lib/libboost_thread.so.*"
 	}
 }
 
@@ -377,7 +377,7 @@ libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
-		vmove usr/lib/libboost_timer.so.*
+		vmove "usr/lib/libboost_timer.so.*"
 	}
 }
 
@@ -385,7 +385,7 @@ libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
-		vmove usr/lib/libboost_type_erasure.so.*
+		vmove "usr/lib/libboost_type_erasure.so.*"
 	}
 }
 
@@ -393,7 +393,7 @@ libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
-		vmove usr/lib/libboost_unit_test_framework.so.*
+		vmove "usr/lib/libboost_unit_test_framework.so.*"
 	}
 }
 
@@ -401,7 +401,7 @@ libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
-		vmove usr/lib/libboost_wave.so.*
+		vmove "usr/lib/libboost_wave.so.*"
 	}
 }
 
@@ -409,7 +409,7 @@ libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
-		vmove usr/lib/libboost_wserialization.so.*
+		vmove "usr/lib/libboost_wserialization.so.*"
 	}
 }
 

From 3a4b4d9a4bc90414acbaaf934bc28855ef36a4d2 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 26 May 2022 18:52:59 +0300
Subject: [PATCH 3/6] uhd: update to 4.2.0.0.

---
 common/shlibs        | 2 +-
 srcpkgs/uhd/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index bb418cdfc245..529a07f73a31 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3595,7 +3595,7 @@ libbinpac.so.0 zeek-3.2.4_2
 libllhttp.so.1 llhttp-1.0.1_1
 libpinyin.so.13 libpinyin-2.2.1_1
 libzhuyin.so.13 libzhuyin-2.6.0_3
-libuhd.so.4.0.0 uhd-4.0.0.0_1
+libuhd.so.4.2.0 uhd-4.2.0.0_1
 libeditline.so.1 editline-1.16.0_1
 libgnuradio-rds.so.1 gnuradio-rds-3.8.0_1
 libgnuradio-nrsc5-1.0.0git.so.0.0.0 gnuradio-nrsc5-1.0.0_1
diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template
index 5f043162d7dc..685f877dc380 100644
--- a/srcpkgs/uhd/template
+++ b/srcpkgs/uhd/template
@@ -1,6 +1,6 @@
 # Template file for 'uhd'
 pkgname=uhd
-version=4.0.0.0
+version=4.2.0.0
 revision=1
 build_wrksrc=host
 build_style=cmake
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://files.ettus.com/manual/"
 changelog="https://raw.githubusercontent.com/EttusResearch/uhd/master/CHANGELOG"
 distfiles="https://github.com/EttusResearch/uhd/archive/v${version}.tar.gz"
-checksum=4f3513c43edf0178391ed5755266864532716b8b503bcfb9a983ae6256c51b14
+checksum=ad15cedc8a4b9ba78078f1c4c3c179eff8297a08e44928679de896ca42313e6b
 python_version=3
 
 case "${XBPS_TARGET_MACHINE}" in

From 9d86615e1d025fe8d0cad362ed31c60824ca7e85 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 26 May 2022 21:37:30 +0300
Subject: [PATCH 4/6] [WIP] gnuradio: update to 3.10.2.0.

This is most certainly a broken updated packaging for now... probably
just needs a bunch of new dependencies to even build anything useful
while if it doesn't find anything it just builds the bare minimum
(e.g. docs), annoying behavior...
---
 ...6495f3bdf579dae0c26531a16f6adcc7fb2f.patch | 46 -------------------
 ...15d0b26b3c72fab736bcd28a67ab9d1404b7.patch | 28 -----------
 ...befbbe54e55fc4994899e92bcf5bf462fa2f.patch | 31 -------------
 srcpkgs/gnuradio/template                     | 20 ++++----
 4 files changed, 11 insertions(+), 114 deletions(-)
 delete mode 100644 srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch
 delete mode 100644 srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch
 delete mode 100644 srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch

diff --git a/srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch b/srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch
deleted file mode 100644
index 51952bd29b38..000000000000
--- a/srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 596c6495f3bdf579dae0c26531a16f6adcc7fb2f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marcus=20M=C3=BCller?= <mmueller@gnuradio.org>
-Date: Mon, 13 Apr 2020 00:11:59 +0200
-Subject: [PATCH] =?UTF-8?q?pmt:=20conditionalize=20testing=20of=20long=20>?=
- =?UTF-8?q?=202=C2=B3=C2=B2=20on=20sizeof(long)?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- gnuradio-runtime/python/pmt/qa_pmt.py | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/gnuradio-runtime/python/pmt/qa_pmt.py b/gnuradio-runtime/python/pmt/qa_pmt.py
-index 884bba7dd4b..44f616cdae1 100644
---- a/gnuradio-runtime/python/pmt/qa_pmt.py
-+++ b/gnuradio-runtime/python/pmt/qa_pmt.py
-@@ -18,6 +18,10 @@ class test_pmt(unittest.TestCase):
-     MAXINT32 = (2**31)-1
-     MININT32 = (-MAXINT32)-1
- 
-+    def setUp(self):
-+        from ctypes import sizeof, c_long
-+        self.sizeof_long = sizeof(c_long)
-+
-     def test01(self):
-         a = pmt.intern("a")
-         b = pmt.from_double(123765)
-@@ -112,6 +116,8 @@ def test14(self):
-         self.assertEqual(const,pmt.to_long(deser))
- 
-     def test15(self):
-+        if(self.sizeof_long <= 4):
-+            return
-         const = self.MAXINT32 + 1
-         x_pmt = pmt.from_long(const)
-         s = pmt.serialize_str(x_pmt)
-@@ -137,6 +143,8 @@ def test17(self):
-         self.assertEqual(const, x_long)
- 
-     def test18(self):
-+        if(self.sizeof_long <= 4):
-+            return
-         const = self.MININT32 - 1
-         x_pmt = pmt.from_long(const)
-         s = pmt.serialize_str(x_pmt)
diff --git a/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch b/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch
deleted file mode 100644
index c49a047427e8..000000000000
--- a/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7 Mon Sep 17 00:00:00 2001
-From: John Sallay <jasallay@gmail.com>
-Date: Sat, 23 Oct 2021 08:26:42 -0400
-Subject: [PATCH] Fix issue 4595 qa_agc Assertion Error.
-
-The number of input elements needs to be disivible by volk_alignment, which it wasn't
-for machines with 512-bit registers.
-
-Signed-off-by: John Sallay <jasallay@gmail.com>
----
- gr-analog/python/analog/qa_agc.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/gr-analog/python/analog/qa_agc.py b/gr-analog/python/analog/qa_agc.py
-index a5a8ea47b6a..9368dd5d2a8 100644
---- a/gr-analog/python/analog/qa_agc.py
-+++ b/gr-analog/python/analog/qa_agc.py
-@@ -454,7 +454,9 @@ def test_006(self):
-         tb = self.tb
- 
-         sampling_freq = 100
--        N = int(5*sampling_freq)
-+        # N must by a multiple of the volk_alignment of the system for this test to work.
-+        # For a machine with 512-bit registers, that would be 8 complex-floats.
-+        N = int(8 * sampling_freq)
-         src1 = analog.sig_source_c(sampling_freq, analog.GR_SIN_WAVE,
-                                    sampling_freq * 0.10, 100)
-         dst1 = blocks.vector_sink_c()
diff --git a/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch b/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch
deleted file mode 100644
index 4faa3468140a..000000000000
--- a/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f259befbbe54e55fc4994899e92bcf5bf462fa2f Mon Sep 17 00:00:00 2001
-From: alekhgupta1441 <alekhgupta1441@gmail.com>
-Date: Sun, 12 Apr 2020 03:48:14 +0530
-Subject: [PATCH] gr-digital/python : Updated soft_dec_lut_gen.py
-
----
- gr-digital/python/digital/soft_dec_lut_gen.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gr-digital/python/digital/soft_dec_lut_gen.py b/gr-digital/python/digital/soft_dec_lut_gen.py
-index 4503c4fea7b..84f6de66e45 100644
---- a/gr-digital/python/digital/soft_dec_lut_gen.py
-+++ b/gr-digital/python/digital/soft_dec_lut_gen.py
-@@ -73,7 +73,7 @@ def soft_dec_table_generator(soft_dec_gen, prec, Es=1):
- 
-     '''
- 
--    npts = 2.0**prec
-+    npts = int(2.0**prec)
-     maxd = Es*numpy.sqrt(2.0)/2.0
-     yrng = numpy.linspace(-maxd, maxd, npts)
-     xrng = numpy.linspace(-maxd, maxd, npts)
-@@ -110,7 +110,7 @@ def soft_dec_table(constel, symbols, prec, npwr=1):
-     re_max = max(numpy.array(constel).real)
-     im_max = max(numpy.array(constel).imag)
- 
--    npts = 2.0**prec
-+    npts = int(2.0**prec)
-     yrng = numpy.linspace(im_min, im_max, npts)
-     xrng = numpy.linspace(re_min, re_max, npts)
- 
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index c950b53e8bea..b47325cb6034 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,10 +1,12 @@
 # Template file for 'gnuradio'
 pkgname=gnuradio
-version=3.8.0.0
-revision=9
+version=3.10.2.0
+revision=1
 build_style=cmake
-conf_files="/etc/gnuradio/conf.d/*"
-configure_args="-DENABLE_INTERNAL_VOLK=OFF -DGR_PYTHON_DIR=/${py3_sitelib}"
+# FIXME: '/etc/gnuradio/conf.d/*' configuration file not in PKGDESTDIR!
+#conf_files="/etc/gnuradio/conf.d/*"
+configure_args="-DGR_PYTHON_DIR=/${py3_sitelib}"
+# TODO: https://pypi.org/project/schema/ as new build/runtime dep since v3.10.2.0?
 hostmakedepends="pkg-config doxygen swig python3-Mako python3-Sphinx
  python3-cairo python3-numpy python3-yaml texlive texlive-latexextra texlive-dvi"
 makedepends="SDL-devel boost-devel fftw-devel gsl-devel jack-devel
@@ -18,12 +20,10 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnuradio.org"
 distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=03fd01f0b27033befb91709b3d56f95e0869b5fb8bc71bec2662266a3f0dedf5
+checksum=a8f6c1cc98bc3784aa70ab29d3039ad6922ec36f908ecfb2c904a597b32c0776
 python_version=3
 
 post_install() {
-	rm ${DESTDIR}/usr/share/gnuradio/examples/audio/dial_tone \
-		${DESTDIR}/usr/share/gnuradio/examples/uhd/tags_demo
 	vinstall grc/scripts/freedesktop/gnuradio-grc.desktop 644 \
 		usr/share/applications
 	vinstall grc/scripts/freedesktop/gnuradio_logo_icon-square.svg 644 \
@@ -42,8 +42,10 @@ gnuradio-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove "usr/lib/*.so"
+		# FIXME: there's no shared objects at all anymore?!
+		#vmove "usr/lib/*.so"
 		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
+		# FIXME: it looks like pkgconfig files aren't installed even though *.pc.in files do exist
+		#vmove usr/lib/pkgconfig
 	}
 }

From 7d4db87f6b60b4325b8d14a49671d66bf8540d4f Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 26 May 2022 21:55:43 +0300
Subject: [PATCH 5/6] openimageio: remove pointless pre_build vsed

This caused an error with XBPS_STRICT set due to the vsed not changing
anything.
---
 srcpkgs/openimageio/template | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/srcpkgs/openimageio/template b/srcpkgs/openimageio/template
index b63eca2ae31c..8abf3b05d6a3 100644
--- a/srcpkgs/openimageio/template
+++ b/srcpkgs/openimageio/template
@@ -36,9 +36,6 @@ fi
 
 pre_build() {
 	local f
-	# Replace -isystem with -I to avoid "#include_next <stdlib.h>" file not found
-	vsed -i src/cmake/compiler.cmake -e "s;-isystem;-I;g"
-
 	if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 		# Add libatomic to the targets
 		vsed -i src/libOpenImageIO/CMakeLists.txt \

From 1396c5f55c722a6d4a644c302d6e751a1b67985e Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 26 May 2022 22:23:33 +0300
Subject: [PATCH 6/6] swiften: fix indentation of fix-cross-build.patch

This used to apply fine previously due to more lax default patch_args,
fix it to build in 2022.

[ci skip] the PR is still WIP
---
 srcpkgs/swiften/patches/fix-cross-build.patch | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/swiften/patches/fix-cross-build.patch b/srcpkgs/swiften/patches/fix-cross-build.patch
index 906e60ce07de..c00178208a63 100644
--- a/srcpkgs/swiften/patches/fix-cross-build.patch
+++ b/srcpkgs/swiften/patches/fix-cross-build.patch
@@ -1,19 +1,19 @@
 --- a/3rdParty/LibMiniUPnPc/SConscript	2016-09-07 10:29:12.251340787 +0200
 +++ b/3rdParty/LibMiniUPnPc/SConscript	2016-09-07 10:29:49.165342691 +0200
-@@ -46,11 +46,11 @@
- 		if myenv["PLATFORM"] == "win32":
- 			myenv.Append(CCFLAGS = ["-DWIN32", "-D_WIN32_WINNT=0x0501"])
+@@ -46,11 +46,11 @@ if env.get("LIBMINIUPNPC_BUNDLED", False) :
+         if myenv["PLATFORM"] == "win32":
+             myenv.Append(CCFLAGS = ["-DWIN32", "-D_WIN32_WINNT=0x0501"])
  
--		if myenv["PLATFORM"] != "win32" and myenv["PLATFORM"] != "darwin":
--			conf = Configure(conf_env)
--			if conf.CheckTypeSize("struct ip_mreqn", includes="#include <netinet/in.h>") == 0:
--				myenv.Append(CCFLAGS = ["-DNEED_STRUCT_IP_MREQN"])
--			conf.Finish()
-+		#if myenv["PLATFORM"] != "win32" and myenv["PLATFORM"] != "darwin":
-+		#	conf = Configure(conf_env)
-+		#	if conf.CheckTypeSize("struct ip_mreqn", includes="#include <netinet/in.h>") == 0:
-+		#		myenv.Append(CCFLAGS = ["-DNEED_STRUCT_IP_MREQN"])
-+		#	conf.Finish()
+-        if myenv["PLATFORM"] != "win32" and myenv["PLATFORM"] != "darwin":
+-            conf = Configure(conf_env)
+-            if conf.CheckTypeSize("struct ip_mreqn", includes="#include <netinet/in.h>") == 0:
+-                myenv.Append(CCFLAGS = ["-DNEED_STRUCT_IP_MREQN"])
+-            conf.Finish()
++        #if myenv["PLATFORM"] != "win32" and myenv["PLATFORM"] != "darwin":
++        #    conf = Configure(conf_env)
++        #    if conf.CheckTypeSize("struct ip_mreqn", includes="#include <netinet/in.h>") == 0:
++        #        myenv.Append(CCFLAGS = ["-DNEED_STRUCT_IP_MREQN"])
++        #    conf.Finish()
  
- 		myenv.WriteVal("src/miniupnpc/miniupnpcstrings.h", myenv.Value(
+         myenv.WriteVal("src/miniupnpc/miniupnpcstrings.h", myenv.Value(
  """

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] boost: update to 1.79.0.
  2022-03-18 14:28 [PR PATCH] boost: update to 1.79.0.b1 JamiKettunen
                   ` (18 preceding siblings ...)
  2022-05-26 20:29 ` JamiKettunen
@ 2022-05-27 16:20 ` JamiKettunen
  2022-05-27 16:21 ` JamiKettunen
                   ` (8 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: JamiKettunen @ 2022-05-27 16:20 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 4041 bytes --]

There is an updated pull request by JamiKettunen against master on the void-packages repository

https://github.com/JamiKettunen/void-packages boost-1.79.0
https://github.com/void-linux/void-packages/pull/36204

boost: update to 1.79.0.
#### Packages to fix (from `xrevshlib boost` as locally build-tested on `x86_64-musl`)
- [ ] Aegisub (fails on `do_build()`)
- [ ] PrusaSlicer (fails on `do_build()`)
- [ ] TSC (fails on `do_build()`)
- [ ] bitcoin (fails on `do_check()`)
- [x] openimageio (fails on `pre_build()`, `vsed` doesn't change `src/cmake/compiler.cmake`)
  - [x] blender (depends on `openimageio`)
- [ ] cryfs (fails on `do_build()`)
- [ ] leatherman (hangs on `do_check()`, test process pinned one core at 100% for 10 minutes)
  - [ ] facter (depends on `leatherman`)
- [ ] fifengine (fails on `do_build()`)
- [x] uhd (fails on `do_build()`)
  - [ ] gnuradio (failed on `do_build()`, updating to [v3.10.2.0](https://github.com/gnuradio/gnuradio/releases/tag/v3.10.2.0) appears to have disabled building a lot of components including all shared objects and pkg-config files for example, probably just a bunch of missing new "optional" build-time dependencies...)
    - [ ] gnuradio-osmosdr (depends on `gnuradio`)
- [ ] imagescan (fails on `do_build()`)
- [ ] inkscape (fails on `do_check()`)
- [ ] kea (fails on `do_build()`)
- [ ] ledger (fails on `do_build()`)
- [ ] libbitcoin-system (fails on `do_build()`)
  - [ ] libbitcoin-database (depends on `libbitcoin-system`)
    - [ ] libbitcoin-blockchain (depends on `libbitcoin-database`)
      - [ ] libbitcoin-node (depends on `libbitcoin-blockchain`)
      - [ ] libbitcoin-server (depends on `libbitcoin-blockchain`)
  - [ ] libbitcoin-protocol (depends on `libbitcoin-system`)
    - [ ] libbitcoin-client (depends on `libbitcoin-protocol`)
      - [ ] libbitcoin-explorer (depends on `libbitcoin-client`)
  - [ ] libbitcoin-network (depends on `libbitcoin-system`)
- [ ] libetonyek (fails on `do_build()`, appears to need `-std=c++17` or higher? `NUM3Parser.cpp:46:8: error: 'for_each' is not a member of 'std'`)
  - [ ] libreoffice (depends on `libetonyek`)
- [ ] librime (fails on `do_build()`)
- [ ] libtorrent-rasterbar (hangs on `do_check()`, 90/97 test_web_seed_http stuck for 10 minutes)
- [ ] namecoin (fails on `do_build()`)
- [ ] pulseeffects-legacy (fails on `do_build()`)
- [ ] schroot (fails on `do_check()`)
- [ ] supercollider (fails on `do_build()`)
- [x] swiften (fails on `do_patch`, `fix-cross-build.patch` doesn't apply)

#### Packages to fix (from `xrevshlib uhd` as locally build-tested on `x86_64-musl`)
- [ ] urh (fails on `do_check()` even after adding `checkdepends="python3-pip"`)

#### Modified patches (boost)
`exec_file.patch`: Removed due to being upstream as https://github.com/boostorg/python/commit/d9f06052e28873037db7f98629bce72182a42410
`mips.patch`: Updated to apply on top of https://github.com/boostorg/fiber/commit/5dc9dabc5d5ff8da53ec897c265c9cba1b6ed0df, not sure if this can be removed now(?)

#### Misc changes
- I've renamed all subpackages of `boost` so that the versioned name doesn't conflict with other numbers and are consistent with the previously existing `boost-python3-1.72`, e.g. `libboost_math_c991.72` is now `libboost_math_c99-1.79` (notice the `-`!)

#### Testing the changes
- I tested the changes in this PR: **NO**

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36204.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boost-1.79.0-36204.patch --]
[-- Type: text/x-diff, Size: 51142 bytes --]

From 699af92c6d3a9286bf2cab08fe77544eff2c2d9b Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 15:28:37 +0200
Subject: [PATCH 1/4] boost: update to 1.79.0.

---
 common/shlibs                                 |  64 +++----
 .../{boost-python1.72 => boost-python1.79}    |   0
 ...{boost-python3-1.72 => boost-python3-1.79} |   0
 srcpkgs/boost/patches/exec_file.patch         |  45 -----
 srcpkgs/boost/patches/mips.patch              |   2 +-
 srcpkgs/boost/template                        | 161 +++++++++---------
 ...ibboost_atomic1.72 => libboost_atomic1.79} |   0
 ...ibboost_chrono1.72 => libboost_chrono1.79} |   0
 ...t_container1.72 => libboost_container1.79} |   0
 ...boost_context1.72 => libboost_context1.79} |   0
 ...ost_contract1.72 => libboost_contract1.79} |   0
 ...t_coroutine1.72 => libboost_coroutine1.79} |   0
 ...t_date_time1.72 => libboost_date_time1.79} |   0
 ...{libboost_fiber1.72 => libboost_fiber1.79} |   0
 ...filesystem1.72 => libboost_filesystem1.79} |   0
 ...{libboost_graph1.72 => libboost_graph1.79} |   0
 ...t_iostreams1.72 => libboost_iostreams1.79} |   0
 ...{libboost_locale1.72 => libboost_json1.79} |   0
 .../{libboost_log1.72 => libboost_locale1.79} |   0
 ...ibboost_log_setup1.72 => libboost_log1.79} |   0
 ...st_math_c991.72 => libboost_log_setup1.79} |   0
 ...t_math_c99f1.72 => libboost_math_c99-1.79} |   0
 ...t_math_c99l1.72 => libboost_math_c99f1.79} |   0
 ...st_math_tr11.72 => libboost_math_c99l1.79} |   0
 ...t_math_tr1f1.72 => libboost_math_tr1-1.79} |   0
 ...t_math_tr1l1.72 => libboost_math_tr1f1.79} |   0
 ...xec_monitor1.72 => libboost_math_tr1l1.79} |   0
 ...rogram_options1.72 => libboost_nowide1.79} |   0
 ...ndom1.72 => libboost_prg_exec_monitor1.79} |   0
 ...regex1.72 => libboost_program_options1.79} |   0
 ..._serialization1.72 => libboost_random1.79} |   0
 ...trace_addr2line1.72 => libboost_regex1.79} |   0
 ...e_basic1.72 => libboost_serialization1.79} |   0
 ...1.72 => libboost_stacktrace_addr2line1.79} |   0
 ...stem1.72 => libboost_stacktrace_basic1.79} |   0
 ...hread1.72 => libboost_stacktrace_noop1.79} |   0
 ...libboost_timer1.72 => libboost_system1.79} |   0
 ...t_type_erasure1.72 => libboost_thread1.79} |   0
 ..._test_framework1.72 => libboost_timer1.79} |   0
 ...ost_wave1.72 => libboost_type_erasure1.79} |   0
 ...n1.72 => libboost_unit_test_framework1.79} |   0
 srcpkgs/libboost_wave1.79                     |   1 +
 srcpkgs/libboost_wserialization1.79           |   1 +
 43 files changed, 113 insertions(+), 161 deletions(-)
 rename srcpkgs/{boost-python1.72 => boost-python1.79} (100%)
 rename srcpkgs/{boost-python3-1.72 => boost-python3-1.79} (100%)
 delete mode 100644 srcpkgs/boost/patches/exec_file.patch
 rename srcpkgs/{libboost_atomic1.72 => libboost_atomic1.79} (100%)
 rename srcpkgs/{libboost_chrono1.72 => libboost_chrono1.79} (100%)
 rename srcpkgs/{libboost_container1.72 => libboost_container1.79} (100%)
 rename srcpkgs/{libboost_context1.72 => libboost_context1.79} (100%)
 rename srcpkgs/{libboost_contract1.72 => libboost_contract1.79} (100%)
 rename srcpkgs/{libboost_coroutine1.72 => libboost_coroutine1.79} (100%)
 rename srcpkgs/{libboost_date_time1.72 => libboost_date_time1.79} (100%)
 rename srcpkgs/{libboost_fiber1.72 => libboost_fiber1.79} (100%)
 rename srcpkgs/{libboost_filesystem1.72 => libboost_filesystem1.79} (100%)
 rename srcpkgs/{libboost_graph1.72 => libboost_graph1.79} (100%)
 rename srcpkgs/{libboost_iostreams1.72 => libboost_iostreams1.79} (100%)
 rename srcpkgs/{libboost_locale1.72 => libboost_json1.79} (100%)
 rename srcpkgs/{libboost_log1.72 => libboost_locale1.79} (100%)
 rename srcpkgs/{libboost_log_setup1.72 => libboost_log1.79} (100%)
 rename srcpkgs/{libboost_math_c991.72 => libboost_log_setup1.79} (100%)
 rename srcpkgs/{libboost_math_c99f1.72 => libboost_math_c99-1.79} (100%)
 rename srcpkgs/{libboost_math_c99l1.72 => libboost_math_c99f1.79} (100%)
 rename srcpkgs/{libboost_math_tr11.72 => libboost_math_c99l1.79} (100%)
 rename srcpkgs/{libboost_math_tr1f1.72 => libboost_math_tr1-1.79} (100%)
 rename srcpkgs/{libboost_math_tr1l1.72 => libboost_math_tr1f1.79} (100%)
 rename srcpkgs/{libboost_prg_exec_monitor1.72 => libboost_math_tr1l1.79} (100%)
 rename srcpkgs/{libboost_program_options1.72 => libboost_nowide1.79} (100%)
 rename srcpkgs/{libboost_random1.72 => libboost_prg_exec_monitor1.79} (100%)
 rename srcpkgs/{libboost_regex1.72 => libboost_program_options1.79} (100%)
 rename srcpkgs/{libboost_serialization1.72 => libboost_random1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_addr2line1.72 => libboost_regex1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_basic1.72 => libboost_serialization1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_noop1.72 => libboost_stacktrace_addr2line1.79} (100%)
 rename srcpkgs/{libboost_system1.72 => libboost_stacktrace_basic1.79} (100%)
 rename srcpkgs/{libboost_thread1.72 => libboost_stacktrace_noop1.79} (100%)
 rename srcpkgs/{libboost_timer1.72 => libboost_system1.79} (100%)
 rename srcpkgs/{libboost_type_erasure1.72 => libboost_thread1.79} (100%)
 rename srcpkgs/{libboost_unit_test_framework1.72 => libboost_timer1.79} (100%)
 rename srcpkgs/{libboost_wave1.72 => libboost_type_erasure1.79} (100%)
 rename srcpkgs/{libboost_wserialization1.72 => libboost_unit_test_framework1.79} (100%)
 create mode 120000 srcpkgs/libboost_wave1.79
 create mode 120000 srcpkgs/libboost_wserialization1.79

diff --git a/common/shlibs b/common/shlibs
index 9fd62e7c1baf..bb418cdfc245 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -620,38 +620,38 @@ 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.79.0 libboost_context1.79-1.79.0_1
+libboost_coroutine.so.1.79.0 libboost_coroutine1.79-1.79.0_1
+libboost_container.so.1.79.0 libboost_container1.79-1.79.0_1
+libboost_prg_exec_monitor.so.1.79.0 libboost_prg_exec_monitor1.79-1.79.0_1
+libboost_timer.so.1.79.0 libboost_timer1.79-1.79.0_1
+libboost_random.so.1.79.0 libboost_random1.79-1.79.0_1
+libboost_filesystem.so.1.79.0 libboost_filesystem1.79-1.79.0_1
+libboost_unit_test_framework.so.1.79.0 libboost_unit_test_framework1.79-1.79.0_1
+libboost_math_c99.so.1.79.0 libboost_math_c99-1.79-1.79.0_1
+libboost_math_tr1.so.1.79.0 libboost_math_tr1-1.79-1.79.0_1
+libboost_regex.so.1.79.0 libboost_regex1.79-1.79.0_1
+libboost_serialization.so.1.79.0 libboost_serialization1.79-1.79.0_1
+libboost_chrono.so.1.79.0 libboost_chrono1.79-1.79.0_1
+libboost_wserialization.so.1.79.0 libboost_wserialization1.79-1.79.0_1
+libboost_graph.so.1.79.0 libboost_graph1.79-1.79.0_1
+libboost_log.so.1.79.0 libboost_log1.79-1.79.0_1
+libboost_locale.so.1.79.0 libboost_locale1.79-1.79.0_1
+libboost_program_options.so.1.79.0 libboost_program_options1.79-1.79.0_1
+libboost_iostreams.so.1.79.0 libboost_iostreams1.79-1.79.0_1
+libboost_system.so.1.79.0 libboost_system1.79-1.79.0_1
+libboost_thread.so.1.79.0 libboost_thread1.79-1.79.0_1
+libboost_log_setup.so.1.79.0 libboost_log_setup1.79-1.79.0_1
+libboost_date_time.so.1.79.0 libboost_date_time1.79-1.79.0_1
+libboost_wave.so.1.79.0 libboost_wave1.79-1.79.0_1
+libboost_atomic.so.1.79.0 libboost_atomic1.79-1.79.0_1
+libboost_type_erasure.so.1.79.0 libboost_type_erasure1.79-1.79.0_1
+libboost_fiber.so.1.79.0 libboost_fiber1.79-1.79.0_1
+libboost_stacktrace_noop.so.1.79.0 libboost_stacktrace_noop1.79-1.79.0_1
+libboost_stacktrace_addr2line.so.1.79.0 libboost_stacktrace_addr2line1.79-1.79.0_1
+libboost_stacktrace_basic.so.1.79.0 libboost_stacktrace_basic1.79-1.79.0_1
+libboost_python27.so.1.79.0 boost-python1.79-1.79.0_1
+libboost_python310.so.1.79.0 boost-python3-1.79-1.79.0_1
 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-python1.79
similarity index 100%
rename from srcpkgs/boost-python1.72
rename to srcpkgs/boost-python1.79
diff --git a/srcpkgs/boost-python3-1.72 b/srcpkgs/boost-python3-1.79
similarity index 100%
rename from srcpkgs/boost-python3-1.72
rename to srcpkgs/boost-python3-1.79
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/mips.patch b/srcpkgs/boost/patches/mips.patch
index a10a2122d9c7..8d253fc7c286 100644
--- a/srcpkgs/boost/patches/mips.patch
+++ b/srcpkgs/boost/patches/mips.patch
@@ -3,7 +3,7 @@
 @@ -48,7 +48,7 @@
  #  define cpu_relax() asm volatile ("nop" ::: "memory");
  # endif
- #elif BOOST_ARCH_MIPS
+ #elif BOOST_ARCH_MIPS && (((__mips_isa_rev > 1) && defined(__mips32)) || ((__mips_isa_rev > 2)  && defined(__mips64)))
 -# define cpu_relax() asm volatile ("pause" ::: "memory");
 +# define cpu_relax() asm volatile ("nop" ::: "memory");
  #elif BOOST_ARCH_PPC
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 126c50770b50..ad705311b867 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,8 +1,8 @@
 # Template file for 'boost'
 pkgname=boost
-version=1.72.0
-revision=7
-wrksrc="${pkgname}_${version//\./_}"
+version=1.79.0
+revision=1
+wrksrc="boost_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
 short_desc="Free peer-reviewed portable C++ source libraries"
@@ -10,53 +10,34 @@ 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=475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39
 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"
+subpackages="libboost_program_options1.79 libboost_math_c99f1.79
+ libboost_stacktrace_basic1.79 libboost_stacktrace_noop1.79
+ libboost_iostreams1.79 libboost_math_tr1l1.79 libboost_filesystem1.79
+ libboost_chrono1.79 libboost_math_tr1f1.79 libboost_wave1.79
+ libboost_graph1.79 libboost_locale1.79 libboost_regex1.79
+ libboost_fiber1.79 libboost_type_erasure1.79 libboost_coroutine1.79
+ libboost_atomic1.79 libboost_prg_exec_monitor1.79 libboost_math_c99-1.79
+ boost-python3-1.79 libboost_log_setup1.79 boost-devel
+ libboost_timer1.79 libboost_system1.79 libboost_unit_test_framework1.79
+ libboost_serialization1.79 libboost_math_tr1-1.79 boost-build
+ libboost_math_c99l1.79 boost-python1.79 libboost_contract1.79
+ libboost_date_time1.79 libboost_log1.79 libboost_random1.79
+ libboost_thread1.79 libboost_container1.79 boost-jam
+ libboost_wserialization1.79 libboost_context1.79 libboost_json1.79
+ libboost_nowide1.79"
 
 if [ -z "$CROSS_BUILD" ]; then
-	subpackages+=" libboost_stacktrace_addr2line1.72"
+	subpackages+=" libboost_stacktrace_addr2line1.79"
 fi
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*)    _arch=x86;      _abi=sysv  ;;
-	x86_64*)  _arch=x86;      _abi=sysv  ;;
-	arm*)     _arch=arm;      _abi=aapcs ;;
-	aarch64*) _arch=arm;      _abi=aapcs ;;
-	mips*)    _arch=mips32r2; _abi=o32   ;;
-	ppc*)     _arch=power;    _abi=sysv  ;;
+	i686*|x86_64*) _arch=x86;      _abi=sysv  ;;
+	arm*|aarch64*) _arch=arm;      _abi=aapcs ;;
+	mips*)         _arch=mips32r2; _abi=o32   ;;
+	ppc*)          _arch=power;    _abi=sysv  ;;
 esac
 
 do_build() {
@@ -66,7 +47,7 @@ do_build() {
 	(
 	# Rebuild bjam for target
 	cd tools/build/src/engine
-	./build.sh gcc
+	./build.sh --cxx="${CXX}" --cxxflags="${CXXFLAGS}" gcc
 	)
 	cat > user-config.jam <<-__EOF
 	using gcc : : ${CXX} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
@@ -74,10 +55,8 @@ do_build() {
 	using python : ${py3_ver} : ${XBPS_CROSS_BASE}/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} \
 		threading=multi runtime-link=shared link=shared,static
 }
@@ -119,7 +98,7 @@ boost-jam_package() {
 		vmove usr/bin/b2
 	}
 }
-boost-python1.72_package() {
+boost-python1.79_package() {
 	depends="boost python"
 	replaces="boost-python>=0"
 	short_desc+=" - Python bindings"
@@ -127,7 +106,7 @@ boost-python1.72_package() {
 		vmove "usr/lib/libboost_python2*.so.*"
 	}
 }
-boost-python3-1.72_package() {
+boost-python3-1.79_package() {
 	depends="boost python3"
 	replaces="boost-python3>=0"
 	short_desc+=" - Python3 bindings"
@@ -154,7 +133,7 @@ boost-devel_package() {
 	}
 }
 
-libboost_atomic1.72_package() {
+libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
@@ -162,7 +141,7 @@ libboost_atomic1.72_package() {
 	}
 }
 
-libboost_chrono1.72_package() {
+libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
@@ -170,7 +149,7 @@ libboost_chrono1.72_package() {
 	}
 }
 
-libboost_container1.72_package() {
+libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
@@ -178,7 +157,7 @@ libboost_container1.72_package() {
 	}
 }
 
-libboost_context1.72_package() {
+libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
@@ -186,7 +165,7 @@ libboost_context1.72_package() {
 	}
 }
 
-libboost_contract1.72_package() {
+libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
@@ -194,7 +173,7 @@ libboost_contract1.72_package() {
 	}
 }
 
-libboost_coroutine1.72_package() {
+libboost_coroutine1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
@@ -202,7 +181,7 @@ libboost_coroutine1.72_package() {
 	}
 }
 
-libboost_date_time1.72_package() {
+libboost_date_time1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
@@ -210,7 +189,7 @@ libboost_date_time1.72_package() {
 	}
 }
 
-libboost_fiber1.72_package() {
+libboost_fiber1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_fiber"
 	pkg_install() {
@@ -218,7 +197,7 @@ libboost_fiber1.72_package() {
 	}
 }
 
-libboost_filesystem1.72_package() {
+libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
@@ -226,7 +205,7 @@ libboost_filesystem1.72_package() {
 	}
 }
 
-libboost_graph1.72_package() {
+libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
@@ -234,7 +213,7 @@ libboost_graph1.72_package() {
 	}
 }
 
-libboost_iostreams1.72_package() {
+libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
@@ -242,7 +221,7 @@ libboost_iostreams1.72_package() {
 	}
 }
 
-libboost_locale1.72_package() {
+libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
@@ -250,7 +229,7 @@ libboost_locale1.72_package() {
 	}
 }
 
-libboost_log1.72_package() {
+libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
@@ -258,7 +237,7 @@ libboost_log1.72_package() {
 	}
 }
 
-libboost_log_setup1.72_package() {
+libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
@@ -266,7 +245,7 @@ libboost_log_setup1.72_package() {
 	}
 }
 
-libboost_math_c991.72_package() {
+libboost_math_c99-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
@@ -274,7 +253,7 @@ libboost_math_c991.72_package() {
 	}
 }
 
-libboost_math_c99f1.72_package() {
+libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
@@ -282,7 +261,7 @@ libboost_math_c99f1.72_package() {
 	}
 }
 
-libboost_math_c99l1.72_package() {
+libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
@@ -290,7 +269,7 @@ libboost_math_c99l1.72_package() {
 	}
 }
 
-libboost_math_tr11.72_package() {
+libboost_math_tr1-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
@@ -298,7 +277,7 @@ libboost_math_tr11.72_package() {
 	}
 }
 
-libboost_math_tr1f1.72_package() {
+libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
@@ -306,7 +285,7 @@ libboost_math_tr1f1.72_package() {
 	}
 }
 
-libboost_math_tr1l1.72_package() {
+libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
@@ -314,7 +293,7 @@ libboost_math_tr1l1.72_package() {
 	}
 }
 
-libboost_prg_exec_monitor1.72_package() {
+libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
@@ -322,7 +301,7 @@ libboost_prg_exec_monitor1.72_package() {
 	}
 }
 
-libboost_program_options1.72_package() {
+libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
@@ -330,7 +309,7 @@ libboost_program_options1.72_package() {
 	}
 }
 
-libboost_random1.72_package() {
+libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
@@ -338,7 +317,7 @@ libboost_random1.72_package() {
 	}
 }
 
-libboost_regex1.72_package() {
+libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
@@ -346,7 +325,7 @@ libboost_regex1.72_package() {
 	}
 }
 
-libboost_serialization1.72_package() {
+libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
@@ -354,7 +333,7 @@ libboost_serialization1.72_package() {
 	}
 }
 
-libboost_stacktrace_addr2line1.72_package() {
+libboost_stacktrace_addr2line1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_addr2line"
 	pkg_install() {
@@ -362,7 +341,7 @@ libboost_stacktrace_addr2line1.72_package() {
 	}
 }
 
-libboost_stacktrace_basic1.72_package() {
+libboost_stacktrace_basic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_basic"
 	pkg_install() {
@@ -370,7 +349,7 @@ libboost_stacktrace_basic1.72_package() {
 	}
 }
 
-libboost_stacktrace_noop1.72_package() {
+libboost_stacktrace_noop1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_noop"
 	pkg_install() {
@@ -378,7 +357,7 @@ libboost_stacktrace_noop1.72_package() {
 	}
 }
 
-libboost_system1.72_package() {
+libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
@@ -386,7 +365,7 @@ libboost_system1.72_package() {
 	}
 }
 
-libboost_thread1.72_package() {
+libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
@@ -394,7 +373,7 @@ libboost_thread1.72_package() {
 	}
 }
 
-libboost_timer1.72_package() {
+libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
@@ -402,7 +381,7 @@ libboost_timer1.72_package() {
 	}
 }
 
-libboost_type_erasure1.72_package() {
+libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
@@ -410,7 +389,7 @@ libboost_type_erasure1.72_package() {
 	}
 }
 
-libboost_unit_test_framework1.72_package() {
+libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
@@ -418,7 +397,7 @@ libboost_unit_test_framework1.72_package() {
 	}
 }
 
-libboost_wave1.72_package() {
+libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
@@ -426,10 +405,26 @@ libboost_wave1.72_package() {
 	}
 }
 
-libboost_wserialization1.72_package() {
+libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
 		vmove usr/lib/libboost_wserialization.so.*
 	}
 }
+
+libboost_json1.79_package() {
+	depends="boost"
+	short_desc+=" - libboost_json"
+	pkg_install() {
+		vmove "usr/lib/libboost_json.so.*"
+	}
+}
+
+libboost_nowide1.79_package() {
+	depends="boost"
+	short_desc+=" - libboost_nowide"
+	pkg_install() {
+		vmove "usr/lib/libboost_nowide.so.*"
+	}
+}
diff --git a/srcpkgs/libboost_atomic1.72 b/srcpkgs/libboost_atomic1.79
similarity index 100%
rename from srcpkgs/libboost_atomic1.72
rename to srcpkgs/libboost_atomic1.79
diff --git a/srcpkgs/libboost_chrono1.72 b/srcpkgs/libboost_chrono1.79
similarity index 100%
rename from srcpkgs/libboost_chrono1.72
rename to srcpkgs/libboost_chrono1.79
diff --git a/srcpkgs/libboost_container1.72 b/srcpkgs/libboost_container1.79
similarity index 100%
rename from srcpkgs/libboost_container1.72
rename to srcpkgs/libboost_container1.79
diff --git a/srcpkgs/libboost_context1.72 b/srcpkgs/libboost_context1.79
similarity index 100%
rename from srcpkgs/libboost_context1.72
rename to srcpkgs/libboost_context1.79
diff --git a/srcpkgs/libboost_contract1.72 b/srcpkgs/libboost_contract1.79
similarity index 100%
rename from srcpkgs/libboost_contract1.72
rename to srcpkgs/libboost_contract1.79
diff --git a/srcpkgs/libboost_coroutine1.72 b/srcpkgs/libboost_coroutine1.79
similarity index 100%
rename from srcpkgs/libboost_coroutine1.72
rename to srcpkgs/libboost_coroutine1.79
diff --git a/srcpkgs/libboost_date_time1.72 b/srcpkgs/libboost_date_time1.79
similarity index 100%
rename from srcpkgs/libboost_date_time1.72
rename to srcpkgs/libboost_date_time1.79
diff --git a/srcpkgs/libboost_fiber1.72 b/srcpkgs/libboost_fiber1.79
similarity index 100%
rename from srcpkgs/libboost_fiber1.72
rename to srcpkgs/libboost_fiber1.79
diff --git a/srcpkgs/libboost_filesystem1.72 b/srcpkgs/libboost_filesystem1.79
similarity index 100%
rename from srcpkgs/libboost_filesystem1.72
rename to srcpkgs/libboost_filesystem1.79
diff --git a/srcpkgs/libboost_graph1.72 b/srcpkgs/libboost_graph1.79
similarity index 100%
rename from srcpkgs/libboost_graph1.72
rename to srcpkgs/libboost_graph1.79
diff --git a/srcpkgs/libboost_iostreams1.72 b/srcpkgs/libboost_iostreams1.79
similarity index 100%
rename from srcpkgs/libboost_iostreams1.72
rename to srcpkgs/libboost_iostreams1.79
diff --git a/srcpkgs/libboost_locale1.72 b/srcpkgs/libboost_json1.79
similarity index 100%
rename from srcpkgs/libboost_locale1.72
rename to srcpkgs/libboost_json1.79
diff --git a/srcpkgs/libboost_log1.72 b/srcpkgs/libboost_locale1.79
similarity index 100%
rename from srcpkgs/libboost_log1.72
rename to srcpkgs/libboost_locale1.79
diff --git a/srcpkgs/libboost_log_setup1.72 b/srcpkgs/libboost_log1.79
similarity index 100%
rename from srcpkgs/libboost_log_setup1.72
rename to srcpkgs/libboost_log1.79
diff --git a/srcpkgs/libboost_math_c991.72 b/srcpkgs/libboost_log_setup1.79
similarity index 100%
rename from srcpkgs/libboost_math_c991.72
rename to srcpkgs/libboost_log_setup1.79
diff --git a/srcpkgs/libboost_math_c99f1.72 b/srcpkgs/libboost_math_c99-1.79
similarity index 100%
rename from srcpkgs/libboost_math_c99f1.72
rename to srcpkgs/libboost_math_c99-1.79
diff --git a/srcpkgs/libboost_math_c99l1.72 b/srcpkgs/libboost_math_c99f1.79
similarity index 100%
rename from srcpkgs/libboost_math_c99l1.72
rename to srcpkgs/libboost_math_c99f1.79
diff --git a/srcpkgs/libboost_math_tr11.72 b/srcpkgs/libboost_math_c99l1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr11.72
rename to srcpkgs/libboost_math_c99l1.79
diff --git a/srcpkgs/libboost_math_tr1f1.72 b/srcpkgs/libboost_math_tr1-1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1f1.72
rename to srcpkgs/libboost_math_tr1-1.79
diff --git a/srcpkgs/libboost_math_tr1l1.72 b/srcpkgs/libboost_math_tr1f1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1l1.72
rename to srcpkgs/libboost_math_tr1f1.79
diff --git a/srcpkgs/libboost_prg_exec_monitor1.72 b/srcpkgs/libboost_math_tr1l1.79
similarity index 100%
rename from srcpkgs/libboost_prg_exec_monitor1.72
rename to srcpkgs/libboost_math_tr1l1.79
diff --git a/srcpkgs/libboost_program_options1.72 b/srcpkgs/libboost_nowide1.79
similarity index 100%
rename from srcpkgs/libboost_program_options1.72
rename to srcpkgs/libboost_nowide1.79
diff --git a/srcpkgs/libboost_random1.72 b/srcpkgs/libboost_prg_exec_monitor1.79
similarity index 100%
rename from srcpkgs/libboost_random1.72
rename to srcpkgs/libboost_prg_exec_monitor1.79
diff --git a/srcpkgs/libboost_regex1.72 b/srcpkgs/libboost_program_options1.79
similarity index 100%
rename from srcpkgs/libboost_regex1.72
rename to srcpkgs/libboost_program_options1.79
diff --git a/srcpkgs/libboost_serialization1.72 b/srcpkgs/libboost_random1.79
similarity index 100%
rename from srcpkgs/libboost_serialization1.72
rename to srcpkgs/libboost_random1.79
diff --git a/srcpkgs/libboost_stacktrace_addr2line1.72 b/srcpkgs/libboost_regex1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_addr2line1.72
rename to srcpkgs/libboost_regex1.79
diff --git a/srcpkgs/libboost_stacktrace_basic1.72 b/srcpkgs/libboost_serialization1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_basic1.72
rename to srcpkgs/libboost_serialization1.79
diff --git a/srcpkgs/libboost_stacktrace_noop1.72 b/srcpkgs/libboost_stacktrace_addr2line1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_noop1.72
rename to srcpkgs/libboost_stacktrace_addr2line1.79
diff --git a/srcpkgs/libboost_system1.72 b/srcpkgs/libboost_stacktrace_basic1.79
similarity index 100%
rename from srcpkgs/libboost_system1.72
rename to srcpkgs/libboost_stacktrace_basic1.79
diff --git a/srcpkgs/libboost_thread1.72 b/srcpkgs/libboost_stacktrace_noop1.79
similarity index 100%
rename from srcpkgs/libboost_thread1.72
rename to srcpkgs/libboost_stacktrace_noop1.79
diff --git a/srcpkgs/libboost_timer1.72 b/srcpkgs/libboost_system1.79
similarity index 100%
rename from srcpkgs/libboost_timer1.72
rename to srcpkgs/libboost_system1.79
diff --git a/srcpkgs/libboost_type_erasure1.72 b/srcpkgs/libboost_thread1.79
similarity index 100%
rename from srcpkgs/libboost_type_erasure1.72
rename to srcpkgs/libboost_thread1.79
diff --git a/srcpkgs/libboost_unit_test_framework1.72 b/srcpkgs/libboost_timer1.79
similarity index 100%
rename from srcpkgs/libboost_unit_test_framework1.72
rename to srcpkgs/libboost_timer1.79
diff --git a/srcpkgs/libboost_wave1.72 b/srcpkgs/libboost_type_erasure1.79
similarity index 100%
rename from srcpkgs/libboost_wave1.72
rename to srcpkgs/libboost_type_erasure1.79
diff --git a/srcpkgs/libboost_wserialization1.72 b/srcpkgs/libboost_unit_test_framework1.79
similarity index 100%
rename from srcpkgs/libboost_wserialization1.72
rename to srcpkgs/libboost_unit_test_framework1.79
diff --git a/srcpkgs/libboost_wave1.79 b/srcpkgs/libboost_wave1.79
new file mode 120000
index 000000000000..baef819c48f6
--- /dev/null
+++ b/srcpkgs/libboost_wave1.79
@@ -0,0 +1 @@
+boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_wserialization1.79 b/srcpkgs/libboost_wserialization1.79
new file mode 120000
index 000000000000..baef819c48f6
--- /dev/null
+++ b/srcpkgs/libboost_wserialization1.79
@@ -0,0 +1 @@
+boost
\ No newline at end of file

From 1709818af6d7bd269dacc92cd6a040b9f1dcca1f Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 18:29:05 +0200
Subject: [PATCH 2/4] boost: quote all vmove's with a glob.

---
 srcpkgs/boost/template | 70 +++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index ad705311b867..7a9c1c33fa44 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -137,7 +137,7 @@ libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
-		vmove usr/lib/libboost_atomic.so.*
+		vmove "usr/lib/libboost_atomic.so.*"
 	}
 }
 
@@ -145,7 +145,7 @@ libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
-		vmove usr/lib/libboost_chrono.so.*
+		vmove "usr/lib/libboost_chrono.so.*"
 	}
 }
 
@@ -153,7 +153,7 @@ libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
-		vmove usr/lib/libboost_container.so.*
+		vmove "usr/lib/libboost_container.so.*"
 	}
 }
 
@@ -161,7 +161,7 @@ libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
-		vmove usr/lib/libboost_context.so.*
+		vmove "usr/lib/libboost_context.so.*"
 	}
 }
 
@@ -169,7 +169,7 @@ libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
-		vmove usr/lib/libboost_contract.so.*
+		vmove "usr/lib/libboost_contract.so.*"
 	}
 }
 
@@ -177,7 +177,7 @@ libboost_coroutine1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
-		vmove usr/lib/libboost_coroutine.so.*
+		vmove "usr/lib/libboost_coroutine.so.*"
 	}
 }
 
@@ -185,7 +185,7 @@ libboost_date_time1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
-		vmove usr/lib/libboost_date_time.so.*
+		vmove "usr/lib/libboost_date_time.so.*"
 	}
 }
 
@@ -193,7 +193,7 @@ libboost_fiber1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_fiber"
 	pkg_install() {
-		vmove usr/lib/libboost_fiber.so.*
+		vmove "usr/lib/libboost_fiber.so.*"
 	}
 }
 
@@ -201,7 +201,7 @@ libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
-		vmove usr/lib/libboost_filesystem.so.*
+		vmove "usr/lib/libboost_filesystem.so.*"
 	}
 }
 
@@ -209,7 +209,7 @@ libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
-		vmove usr/lib/libboost_graph.so.*
+		vmove "usr/lib/libboost_graph.so.*"
 	}
 }
 
@@ -217,7 +217,7 @@ libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
-		vmove usr/lib/libboost_iostreams.so.*
+		vmove "usr/lib/libboost_iostreams.so.*"
 	}
 }
 
@@ -225,7 +225,7 @@ libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
-		vmove usr/lib/libboost_locale.so.*
+		vmove "usr/lib/libboost_locale.so.*"
 	}
 }
 
@@ -233,7 +233,7 @@ libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
-		vmove usr/lib/libboost_log.so.*
+		vmove "usr/lib/libboost_log.so.*"
 	}
 }
 
@@ -241,7 +241,7 @@ libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
-		vmove usr/lib/libboost_log_setup.so.*
+		vmove "usr/lib/libboost_log_setup.so.*"
 	}
 }
 
@@ -249,7 +249,7 @@ libboost_math_c99-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99.so.*
+		vmove "usr/lib/libboost_math_c99.so.*"
 	}
 }
 
@@ -257,7 +257,7 @@ libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99f.so.*
+		vmove "usr/lib/libboost_math_c99f.so.*"
 	}
 }
 
@@ -265,7 +265,7 @@ libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99l.so.*
+		vmove "usr/lib/libboost_math_c99l.so.*"
 	}
 }
 
@@ -273,7 +273,7 @@ libboost_math_tr1-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1.so.*
+		vmove "usr/lib/libboost_math_tr1.so.*"
 	}
 }
 
@@ -281,7 +281,7 @@ libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1f.so.*
+		vmove "usr/lib/libboost_math_tr1f.so.*"
 	}
 }
 
@@ -289,7 +289,7 @@ libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1l.so.*
+		vmove "usr/lib/libboost_math_tr1l.so.*"
 	}
 }
 
@@ -297,7 +297,7 @@ libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
-		vmove usr/lib/libboost_prg_exec_monitor.so.*
+		vmove "usr/lib/libboost_prg_exec_monitor.so.*"
 	}
 }
 
@@ -305,7 +305,7 @@ libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
-		vmove usr/lib/libboost_program_options.so.*
+		vmove "usr/lib/libboost_program_options.so.*"
 	}
 }
 
@@ -313,7 +313,7 @@ libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
-		vmove usr/lib/libboost_random.so.*
+		vmove "usr/lib/libboost_random.so.*"
 	}
 }
 
@@ -321,7 +321,7 @@ libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
-		vmove usr/lib/libboost_regex.so.*
+		vmove "usr/lib/libboost_regex.so.*"
 	}
 }
 
@@ -329,7 +329,7 @@ libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
-		vmove usr/lib/libboost_serialization.so.*
+		vmove "usr/lib/libboost_serialization.so.*"
 	}
 }
 
@@ -337,7 +337,7 @@ libboost_stacktrace_addr2line1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_addr2line"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_addr2line.so.*
+		vmove "usr/lib/libboost_stacktrace_addr2line.so.*"
 	}
 }
 
@@ -345,7 +345,7 @@ libboost_stacktrace_basic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_basic"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_basic.so.*
+		vmove "usr/lib/libboost_stacktrace_basic.so.*"
 	}
 }
 
@@ -353,7 +353,7 @@ libboost_stacktrace_noop1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_noop"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_noop.so.*
+		vmove "usr/lib/libboost_stacktrace_noop.so.*"
 	}
 }
 
@@ -361,7 +361,7 @@ libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
-		vmove usr/lib/libboost_system.so.*
+		vmove "usr/lib/libboost_system.so.*"
 	}
 }
 
@@ -369,7 +369,7 @@ libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
-		vmove usr/lib/libboost_thread.so.*
+		vmove "usr/lib/libboost_thread.so.*"
 	}
 }
 
@@ -377,7 +377,7 @@ libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
-		vmove usr/lib/libboost_timer.so.*
+		vmove "usr/lib/libboost_timer.so.*"
 	}
 }
 
@@ -385,7 +385,7 @@ libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
-		vmove usr/lib/libboost_type_erasure.so.*
+		vmove "usr/lib/libboost_type_erasure.so.*"
 	}
 }
 
@@ -393,7 +393,7 @@ libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
-		vmove usr/lib/libboost_unit_test_framework.so.*
+		vmove "usr/lib/libboost_unit_test_framework.so.*"
 	}
 }
 
@@ -401,7 +401,7 @@ libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
-		vmove usr/lib/libboost_wave.so.*
+		vmove "usr/lib/libboost_wave.so.*"
 	}
 }
 
@@ -409,7 +409,7 @@ libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
-		vmove usr/lib/libboost_wserialization.so.*
+		vmove "usr/lib/libboost_wserialization.so.*"
 	}
 }
 

From ee7c5df6d51ae35080dd584d1ef32001420a1404 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 26 May 2022 18:52:59 +0300
Subject: [PATCH 3/4] uhd: update to 4.2.0.0.

---
 common/shlibs        | 2 +-
 srcpkgs/uhd/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index bb418cdfc245..529a07f73a31 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3595,7 +3595,7 @@ libbinpac.so.0 zeek-3.2.4_2
 libllhttp.so.1 llhttp-1.0.1_1
 libpinyin.so.13 libpinyin-2.2.1_1
 libzhuyin.so.13 libzhuyin-2.6.0_3
-libuhd.so.4.0.0 uhd-4.0.0.0_1
+libuhd.so.4.2.0 uhd-4.2.0.0_1
 libeditline.so.1 editline-1.16.0_1
 libgnuradio-rds.so.1 gnuradio-rds-3.8.0_1
 libgnuradio-nrsc5-1.0.0git.so.0.0.0 gnuradio-nrsc5-1.0.0_1
diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template
index 5f043162d7dc..685f877dc380 100644
--- a/srcpkgs/uhd/template
+++ b/srcpkgs/uhd/template
@@ -1,6 +1,6 @@
 # Template file for 'uhd'
 pkgname=uhd
-version=4.0.0.0
+version=4.2.0.0
 revision=1
 build_wrksrc=host
 build_style=cmake
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://files.ettus.com/manual/"
 changelog="https://raw.githubusercontent.com/EttusResearch/uhd/master/CHANGELOG"
 distfiles="https://github.com/EttusResearch/uhd/archive/v${version}.tar.gz"
-checksum=4f3513c43edf0178391ed5755266864532716b8b503bcfb9a983ae6256c51b14
+checksum=ad15cedc8a4b9ba78078f1c4c3c179eff8297a08e44928679de896ca42313e6b
 python_version=3
 
 case "${XBPS_TARGET_MACHINE}" in

From fae26d1d1734f34f49eb2ca0301dcede3b35b329 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 26 May 2022 21:37:30 +0300
Subject: [PATCH 4/4] [WIP] gnuradio: update to 3.10.2.0.

This is most certainly a broken updated packaging for now... probably
just needs a bunch of new dependencies to even build anything useful
while if it doesn't find anything it just builds the bare minimum
(e.g. docs), annoying behavior...
---
 ...6495f3bdf579dae0c26531a16f6adcc7fb2f.patch | 46 -------------------
 ...15d0b26b3c72fab736bcd28a67ab9d1404b7.patch | 28 -----------
 ...befbbe54e55fc4994899e92bcf5bf462fa2f.patch | 31 -------------
 srcpkgs/gnuradio/template                     | 20 ++++----
 4 files changed, 11 insertions(+), 114 deletions(-)
 delete mode 100644 srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch
 delete mode 100644 srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch
 delete mode 100644 srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch

diff --git a/srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch b/srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch
deleted file mode 100644
index 51952bd29b38..000000000000
--- a/srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 596c6495f3bdf579dae0c26531a16f6adcc7fb2f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marcus=20M=C3=BCller?= <mmueller@gnuradio.org>
-Date: Mon, 13 Apr 2020 00:11:59 +0200
-Subject: [PATCH] =?UTF-8?q?pmt:=20conditionalize=20testing=20of=20long=20>?=
- =?UTF-8?q?=202=C2=B3=C2=B2=20on=20sizeof(long)?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- gnuradio-runtime/python/pmt/qa_pmt.py | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/gnuradio-runtime/python/pmt/qa_pmt.py b/gnuradio-runtime/python/pmt/qa_pmt.py
-index 884bba7dd4b..44f616cdae1 100644
---- a/gnuradio-runtime/python/pmt/qa_pmt.py
-+++ b/gnuradio-runtime/python/pmt/qa_pmt.py
-@@ -18,6 +18,10 @@ class test_pmt(unittest.TestCase):
-     MAXINT32 = (2**31)-1
-     MININT32 = (-MAXINT32)-1
- 
-+    def setUp(self):
-+        from ctypes import sizeof, c_long
-+        self.sizeof_long = sizeof(c_long)
-+
-     def test01(self):
-         a = pmt.intern("a")
-         b = pmt.from_double(123765)
-@@ -112,6 +116,8 @@ def test14(self):
-         self.assertEqual(const,pmt.to_long(deser))
- 
-     def test15(self):
-+        if(self.sizeof_long <= 4):
-+            return
-         const = self.MAXINT32 + 1
-         x_pmt = pmt.from_long(const)
-         s = pmt.serialize_str(x_pmt)
-@@ -137,6 +143,8 @@ def test17(self):
-         self.assertEqual(const, x_long)
- 
-     def test18(self):
-+        if(self.sizeof_long <= 4):
-+            return
-         const = self.MININT32 - 1
-         x_pmt = pmt.from_long(const)
-         s = pmt.serialize_str(x_pmt)
diff --git a/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch b/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch
deleted file mode 100644
index c49a047427e8..000000000000
--- a/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7 Mon Sep 17 00:00:00 2001
-From: John Sallay <jasallay@gmail.com>
-Date: Sat, 23 Oct 2021 08:26:42 -0400
-Subject: [PATCH] Fix issue 4595 qa_agc Assertion Error.
-
-The number of input elements needs to be disivible by volk_alignment, which it wasn't
-for machines with 512-bit registers.
-
-Signed-off-by: John Sallay <jasallay@gmail.com>
----
- gr-analog/python/analog/qa_agc.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/gr-analog/python/analog/qa_agc.py b/gr-analog/python/analog/qa_agc.py
-index a5a8ea47b6a..9368dd5d2a8 100644
---- a/gr-analog/python/analog/qa_agc.py
-+++ b/gr-analog/python/analog/qa_agc.py
-@@ -454,7 +454,9 @@ def test_006(self):
-         tb = self.tb
- 
-         sampling_freq = 100
--        N = int(5*sampling_freq)
-+        # N must by a multiple of the volk_alignment of the system for this test to work.
-+        # For a machine with 512-bit registers, that would be 8 complex-floats.
-+        N = int(8 * sampling_freq)
-         src1 = analog.sig_source_c(sampling_freq, analog.GR_SIN_WAVE,
-                                    sampling_freq * 0.10, 100)
-         dst1 = blocks.vector_sink_c()
diff --git a/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch b/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch
deleted file mode 100644
index 4faa3468140a..000000000000
--- a/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f259befbbe54e55fc4994899e92bcf5bf462fa2f Mon Sep 17 00:00:00 2001
-From: alekhgupta1441 <alekhgupta1441@gmail.com>
-Date: Sun, 12 Apr 2020 03:48:14 +0530
-Subject: [PATCH] gr-digital/python : Updated soft_dec_lut_gen.py
-
----
- gr-digital/python/digital/soft_dec_lut_gen.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gr-digital/python/digital/soft_dec_lut_gen.py b/gr-digital/python/digital/soft_dec_lut_gen.py
-index 4503c4fea7b..84f6de66e45 100644
---- a/gr-digital/python/digital/soft_dec_lut_gen.py
-+++ b/gr-digital/python/digital/soft_dec_lut_gen.py
-@@ -73,7 +73,7 @@ def soft_dec_table_generator(soft_dec_gen, prec, Es=1):
- 
-     '''
- 
--    npts = 2.0**prec
-+    npts = int(2.0**prec)
-     maxd = Es*numpy.sqrt(2.0)/2.0
-     yrng = numpy.linspace(-maxd, maxd, npts)
-     xrng = numpy.linspace(-maxd, maxd, npts)
-@@ -110,7 +110,7 @@ def soft_dec_table(constel, symbols, prec, npwr=1):
-     re_max = max(numpy.array(constel).real)
-     im_max = max(numpy.array(constel).imag)
- 
--    npts = 2.0**prec
-+    npts = int(2.0**prec)
-     yrng = numpy.linspace(im_min, im_max, npts)
-     xrng = numpy.linspace(re_min, re_max, npts)
- 
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index c950b53e8bea..b47325cb6034 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,10 +1,12 @@
 # Template file for 'gnuradio'
 pkgname=gnuradio
-version=3.8.0.0
-revision=9
+version=3.10.2.0
+revision=1
 build_style=cmake
-conf_files="/etc/gnuradio/conf.d/*"
-configure_args="-DENABLE_INTERNAL_VOLK=OFF -DGR_PYTHON_DIR=/${py3_sitelib}"
+# FIXME: '/etc/gnuradio/conf.d/*' configuration file not in PKGDESTDIR!
+#conf_files="/etc/gnuradio/conf.d/*"
+configure_args="-DGR_PYTHON_DIR=/${py3_sitelib}"
+# TODO: https://pypi.org/project/schema/ as new build/runtime dep since v3.10.2.0?
 hostmakedepends="pkg-config doxygen swig python3-Mako python3-Sphinx
  python3-cairo python3-numpy python3-yaml texlive texlive-latexextra texlive-dvi"
 makedepends="SDL-devel boost-devel fftw-devel gsl-devel jack-devel
@@ -18,12 +20,10 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnuradio.org"
 distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=03fd01f0b27033befb91709b3d56f95e0869b5fb8bc71bec2662266a3f0dedf5
+checksum=a8f6c1cc98bc3784aa70ab29d3039ad6922ec36f908ecfb2c904a597b32c0776
 python_version=3
 
 post_install() {
-	rm ${DESTDIR}/usr/share/gnuradio/examples/audio/dial_tone \
-		${DESTDIR}/usr/share/gnuradio/examples/uhd/tags_demo
 	vinstall grc/scripts/freedesktop/gnuradio-grc.desktop 644 \
 		usr/share/applications
 	vinstall grc/scripts/freedesktop/gnuradio_logo_icon-square.svg 644 \
@@ -42,8 +42,10 @@ gnuradio-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove "usr/lib/*.so"
+		# FIXME: there's no shared objects at all anymore?!
+		#vmove "usr/lib/*.so"
 		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
+		# FIXME: it looks like pkgconfig files aren't installed even though *.pc.in files do exist
+		#vmove usr/lib/pkgconfig
 	}
 }

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] boost: update to 1.79.0.
  2022-03-18 14:28 [PR PATCH] boost: update to 1.79.0.b1 JamiKettunen
                   ` (19 preceding siblings ...)
  2022-05-27 16:20 ` JamiKettunen
@ 2022-05-27 16:21 ` JamiKettunen
  2022-06-08 22:18 ` JamiKettunen
                   ` (7 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: JamiKettunen @ 2022-05-27 16:21 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 4041 bytes --]

There is an updated pull request by JamiKettunen against master on the void-packages repository

https://github.com/JamiKettunen/void-packages boost-1.79.0
https://github.com/void-linux/void-packages/pull/36204

boost: update to 1.79.0.
#### Packages to fix (from `xrevshlib boost` as locally build-tested on `x86_64-musl`)
- [ ] Aegisub (fails on `do_build()`)
- [ ] PrusaSlicer (fails on `do_build()`)
- [ ] TSC (fails on `do_build()`)
- [ ] bitcoin (fails on `do_check()`)
- [x] openimageio (fails on `pre_build()`, `vsed` doesn't change `src/cmake/compiler.cmake`)
  - [x] blender (depends on `openimageio`)
- [ ] cryfs (fails on `do_build()`)
- [ ] leatherman (hangs on `do_check()`, test process pinned one core at 100% for 10 minutes)
  - [ ] facter (depends on `leatherman`)
- [ ] fifengine (fails on `do_build()`)
- [x] uhd (fails on `do_build()`)
  - [ ] gnuradio (failed on `do_build()`, updating to [v3.10.2.0](https://github.com/gnuradio/gnuradio/releases/tag/v3.10.2.0) appears to have disabled building a lot of components including all shared objects and pkg-config files for example, probably just a bunch of missing new "optional" build-time dependencies...)
    - [ ] gnuradio-osmosdr (depends on `gnuradio`)
- [ ] imagescan (fails on `do_build()`)
- [ ] inkscape (fails on `do_check()`)
- [ ] kea (fails on `do_build()`)
- [ ] ledger (fails on `do_build()`)
- [ ] libbitcoin-system (fails on `do_build()`)
  - [ ] libbitcoin-database (depends on `libbitcoin-system`)
    - [ ] libbitcoin-blockchain (depends on `libbitcoin-database`)
      - [ ] libbitcoin-node (depends on `libbitcoin-blockchain`)
      - [ ] libbitcoin-server (depends on `libbitcoin-blockchain`)
  - [ ] libbitcoin-protocol (depends on `libbitcoin-system`)
    - [ ] libbitcoin-client (depends on `libbitcoin-protocol`)
      - [ ] libbitcoin-explorer (depends on `libbitcoin-client`)
  - [ ] libbitcoin-network (depends on `libbitcoin-system`)
- [ ] libetonyek (fails on `do_build()`, appears to need `-std=c++17` or higher? `NUM3Parser.cpp:46:8: error: 'for_each' is not a member of 'std'`)
  - [ ] libreoffice (depends on `libetonyek`)
- [ ] librime (fails on `do_build()`)
- [ ] libtorrent-rasterbar (hangs on `do_check()`, 90/97 test_web_seed_http stuck for 10 minutes)
- [ ] namecoin (fails on `do_build()`)
- [ ] pulseeffects-legacy (fails on `do_build()`)
- [ ] schroot (fails on `do_check()`)
- [ ] supercollider (fails on `do_build()`)
- [x] swiften (fails on `do_patch`, `fix-cross-build.patch` doesn't apply)

#### Packages to fix (from `xrevshlib uhd` as locally build-tested on `x86_64-musl`)
- [ ] urh (fails on `do_check()` even after adding `checkdepends="python3-pip"`)

#### Modified patches (boost)
`exec_file.patch`: Removed due to being upstream as https://github.com/boostorg/python/commit/d9f06052e28873037db7f98629bce72182a42410
`mips.patch`: Updated to apply on top of https://github.com/boostorg/fiber/commit/5dc9dabc5d5ff8da53ec897c265c9cba1b6ed0df, not sure if this can be removed now(?)

#### Misc changes
- I've renamed all subpackages of `boost` so that the versioned name doesn't conflict with other numbers and are consistent with the previously existing `boost-python3-1.72`, e.g. `libboost_math_c991.72` is now `libboost_math_c99-1.79` (notice the `-`!)

#### Testing the changes
- I tested the changes in this PR: **NO**

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36204.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boost-1.79.0-36204.patch --]
[-- Type: text/x-diff, Size: 51173 bytes --]

From 699af92c6d3a9286bf2cab08fe77544eff2c2d9b Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 15:28:37 +0200
Subject: [PATCH 1/4] boost: update to 1.79.0.

---
 common/shlibs                                 |  64 +++----
 .../{boost-python1.72 => boost-python1.79}    |   0
 ...{boost-python3-1.72 => boost-python3-1.79} |   0
 srcpkgs/boost/patches/exec_file.patch         |  45 -----
 srcpkgs/boost/patches/mips.patch              |   2 +-
 srcpkgs/boost/template                        | 161 +++++++++---------
 ...ibboost_atomic1.72 => libboost_atomic1.79} |   0
 ...ibboost_chrono1.72 => libboost_chrono1.79} |   0
 ...t_container1.72 => libboost_container1.79} |   0
 ...boost_context1.72 => libboost_context1.79} |   0
 ...ost_contract1.72 => libboost_contract1.79} |   0
 ...t_coroutine1.72 => libboost_coroutine1.79} |   0
 ...t_date_time1.72 => libboost_date_time1.79} |   0
 ...{libboost_fiber1.72 => libboost_fiber1.79} |   0
 ...filesystem1.72 => libboost_filesystem1.79} |   0
 ...{libboost_graph1.72 => libboost_graph1.79} |   0
 ...t_iostreams1.72 => libboost_iostreams1.79} |   0
 ...{libboost_locale1.72 => libboost_json1.79} |   0
 .../{libboost_log1.72 => libboost_locale1.79} |   0
 ...ibboost_log_setup1.72 => libboost_log1.79} |   0
 ...st_math_c991.72 => libboost_log_setup1.79} |   0
 ...t_math_c99f1.72 => libboost_math_c99-1.79} |   0
 ...t_math_c99l1.72 => libboost_math_c99f1.79} |   0
 ...st_math_tr11.72 => libboost_math_c99l1.79} |   0
 ...t_math_tr1f1.72 => libboost_math_tr1-1.79} |   0
 ...t_math_tr1l1.72 => libboost_math_tr1f1.79} |   0
 ...xec_monitor1.72 => libboost_math_tr1l1.79} |   0
 ...rogram_options1.72 => libboost_nowide1.79} |   0
 ...ndom1.72 => libboost_prg_exec_monitor1.79} |   0
 ...regex1.72 => libboost_program_options1.79} |   0
 ..._serialization1.72 => libboost_random1.79} |   0
 ...trace_addr2line1.72 => libboost_regex1.79} |   0
 ...e_basic1.72 => libboost_serialization1.79} |   0
 ...1.72 => libboost_stacktrace_addr2line1.79} |   0
 ...stem1.72 => libboost_stacktrace_basic1.79} |   0
 ...hread1.72 => libboost_stacktrace_noop1.79} |   0
 ...libboost_timer1.72 => libboost_system1.79} |   0
 ...t_type_erasure1.72 => libboost_thread1.79} |   0
 ..._test_framework1.72 => libboost_timer1.79} |   0
 ...ost_wave1.72 => libboost_type_erasure1.79} |   0
 ...n1.72 => libboost_unit_test_framework1.79} |   0
 srcpkgs/libboost_wave1.79                     |   1 +
 srcpkgs/libboost_wserialization1.79           |   1 +
 43 files changed, 113 insertions(+), 161 deletions(-)
 rename srcpkgs/{boost-python1.72 => boost-python1.79} (100%)
 rename srcpkgs/{boost-python3-1.72 => boost-python3-1.79} (100%)
 delete mode 100644 srcpkgs/boost/patches/exec_file.patch
 rename srcpkgs/{libboost_atomic1.72 => libboost_atomic1.79} (100%)
 rename srcpkgs/{libboost_chrono1.72 => libboost_chrono1.79} (100%)
 rename srcpkgs/{libboost_container1.72 => libboost_container1.79} (100%)
 rename srcpkgs/{libboost_context1.72 => libboost_context1.79} (100%)
 rename srcpkgs/{libboost_contract1.72 => libboost_contract1.79} (100%)
 rename srcpkgs/{libboost_coroutine1.72 => libboost_coroutine1.79} (100%)
 rename srcpkgs/{libboost_date_time1.72 => libboost_date_time1.79} (100%)
 rename srcpkgs/{libboost_fiber1.72 => libboost_fiber1.79} (100%)
 rename srcpkgs/{libboost_filesystem1.72 => libboost_filesystem1.79} (100%)
 rename srcpkgs/{libboost_graph1.72 => libboost_graph1.79} (100%)
 rename srcpkgs/{libboost_iostreams1.72 => libboost_iostreams1.79} (100%)
 rename srcpkgs/{libboost_locale1.72 => libboost_json1.79} (100%)
 rename srcpkgs/{libboost_log1.72 => libboost_locale1.79} (100%)
 rename srcpkgs/{libboost_log_setup1.72 => libboost_log1.79} (100%)
 rename srcpkgs/{libboost_math_c991.72 => libboost_log_setup1.79} (100%)
 rename srcpkgs/{libboost_math_c99f1.72 => libboost_math_c99-1.79} (100%)
 rename srcpkgs/{libboost_math_c99l1.72 => libboost_math_c99f1.79} (100%)
 rename srcpkgs/{libboost_math_tr11.72 => libboost_math_c99l1.79} (100%)
 rename srcpkgs/{libboost_math_tr1f1.72 => libboost_math_tr1-1.79} (100%)
 rename srcpkgs/{libboost_math_tr1l1.72 => libboost_math_tr1f1.79} (100%)
 rename srcpkgs/{libboost_prg_exec_monitor1.72 => libboost_math_tr1l1.79} (100%)
 rename srcpkgs/{libboost_program_options1.72 => libboost_nowide1.79} (100%)
 rename srcpkgs/{libboost_random1.72 => libboost_prg_exec_monitor1.79} (100%)
 rename srcpkgs/{libboost_regex1.72 => libboost_program_options1.79} (100%)
 rename srcpkgs/{libboost_serialization1.72 => libboost_random1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_addr2line1.72 => libboost_regex1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_basic1.72 => libboost_serialization1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_noop1.72 => libboost_stacktrace_addr2line1.79} (100%)
 rename srcpkgs/{libboost_system1.72 => libboost_stacktrace_basic1.79} (100%)
 rename srcpkgs/{libboost_thread1.72 => libboost_stacktrace_noop1.79} (100%)
 rename srcpkgs/{libboost_timer1.72 => libboost_system1.79} (100%)
 rename srcpkgs/{libboost_type_erasure1.72 => libboost_thread1.79} (100%)
 rename srcpkgs/{libboost_unit_test_framework1.72 => libboost_timer1.79} (100%)
 rename srcpkgs/{libboost_wave1.72 => libboost_type_erasure1.79} (100%)
 rename srcpkgs/{libboost_wserialization1.72 => libboost_unit_test_framework1.79} (100%)
 create mode 120000 srcpkgs/libboost_wave1.79
 create mode 120000 srcpkgs/libboost_wserialization1.79

diff --git a/common/shlibs b/common/shlibs
index 9fd62e7c1baf..bb418cdfc245 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -620,38 +620,38 @@ 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.79.0 libboost_context1.79-1.79.0_1
+libboost_coroutine.so.1.79.0 libboost_coroutine1.79-1.79.0_1
+libboost_container.so.1.79.0 libboost_container1.79-1.79.0_1
+libboost_prg_exec_monitor.so.1.79.0 libboost_prg_exec_monitor1.79-1.79.0_1
+libboost_timer.so.1.79.0 libboost_timer1.79-1.79.0_1
+libboost_random.so.1.79.0 libboost_random1.79-1.79.0_1
+libboost_filesystem.so.1.79.0 libboost_filesystem1.79-1.79.0_1
+libboost_unit_test_framework.so.1.79.0 libboost_unit_test_framework1.79-1.79.0_1
+libboost_math_c99.so.1.79.0 libboost_math_c99-1.79-1.79.0_1
+libboost_math_tr1.so.1.79.0 libboost_math_tr1-1.79-1.79.0_1
+libboost_regex.so.1.79.0 libboost_regex1.79-1.79.0_1
+libboost_serialization.so.1.79.0 libboost_serialization1.79-1.79.0_1
+libboost_chrono.so.1.79.0 libboost_chrono1.79-1.79.0_1
+libboost_wserialization.so.1.79.0 libboost_wserialization1.79-1.79.0_1
+libboost_graph.so.1.79.0 libboost_graph1.79-1.79.0_1
+libboost_log.so.1.79.0 libboost_log1.79-1.79.0_1
+libboost_locale.so.1.79.0 libboost_locale1.79-1.79.0_1
+libboost_program_options.so.1.79.0 libboost_program_options1.79-1.79.0_1
+libboost_iostreams.so.1.79.0 libboost_iostreams1.79-1.79.0_1
+libboost_system.so.1.79.0 libboost_system1.79-1.79.0_1
+libboost_thread.so.1.79.0 libboost_thread1.79-1.79.0_1
+libboost_log_setup.so.1.79.0 libboost_log_setup1.79-1.79.0_1
+libboost_date_time.so.1.79.0 libboost_date_time1.79-1.79.0_1
+libboost_wave.so.1.79.0 libboost_wave1.79-1.79.0_1
+libboost_atomic.so.1.79.0 libboost_atomic1.79-1.79.0_1
+libboost_type_erasure.so.1.79.0 libboost_type_erasure1.79-1.79.0_1
+libboost_fiber.so.1.79.0 libboost_fiber1.79-1.79.0_1
+libboost_stacktrace_noop.so.1.79.0 libboost_stacktrace_noop1.79-1.79.0_1
+libboost_stacktrace_addr2line.so.1.79.0 libboost_stacktrace_addr2line1.79-1.79.0_1
+libboost_stacktrace_basic.so.1.79.0 libboost_stacktrace_basic1.79-1.79.0_1
+libboost_python27.so.1.79.0 boost-python1.79-1.79.0_1
+libboost_python310.so.1.79.0 boost-python3-1.79-1.79.0_1
 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-python1.79
similarity index 100%
rename from srcpkgs/boost-python1.72
rename to srcpkgs/boost-python1.79
diff --git a/srcpkgs/boost-python3-1.72 b/srcpkgs/boost-python3-1.79
similarity index 100%
rename from srcpkgs/boost-python3-1.72
rename to srcpkgs/boost-python3-1.79
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/mips.patch b/srcpkgs/boost/patches/mips.patch
index a10a2122d9c7..8d253fc7c286 100644
--- a/srcpkgs/boost/patches/mips.patch
+++ b/srcpkgs/boost/patches/mips.patch
@@ -3,7 +3,7 @@
 @@ -48,7 +48,7 @@
  #  define cpu_relax() asm volatile ("nop" ::: "memory");
  # endif
- #elif BOOST_ARCH_MIPS
+ #elif BOOST_ARCH_MIPS && (((__mips_isa_rev > 1) && defined(__mips32)) || ((__mips_isa_rev > 2)  && defined(__mips64)))
 -# define cpu_relax() asm volatile ("pause" ::: "memory");
 +# define cpu_relax() asm volatile ("nop" ::: "memory");
  #elif BOOST_ARCH_PPC
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 126c50770b50..ad705311b867 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,8 +1,8 @@
 # Template file for 'boost'
 pkgname=boost
-version=1.72.0
-revision=7
-wrksrc="${pkgname}_${version//\./_}"
+version=1.79.0
+revision=1
+wrksrc="boost_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
 short_desc="Free peer-reviewed portable C++ source libraries"
@@ -10,53 +10,34 @@ 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=475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39
 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"
+subpackages="libboost_program_options1.79 libboost_math_c99f1.79
+ libboost_stacktrace_basic1.79 libboost_stacktrace_noop1.79
+ libboost_iostreams1.79 libboost_math_tr1l1.79 libboost_filesystem1.79
+ libboost_chrono1.79 libboost_math_tr1f1.79 libboost_wave1.79
+ libboost_graph1.79 libboost_locale1.79 libboost_regex1.79
+ libboost_fiber1.79 libboost_type_erasure1.79 libboost_coroutine1.79
+ libboost_atomic1.79 libboost_prg_exec_monitor1.79 libboost_math_c99-1.79
+ boost-python3-1.79 libboost_log_setup1.79 boost-devel
+ libboost_timer1.79 libboost_system1.79 libboost_unit_test_framework1.79
+ libboost_serialization1.79 libboost_math_tr1-1.79 boost-build
+ libboost_math_c99l1.79 boost-python1.79 libboost_contract1.79
+ libboost_date_time1.79 libboost_log1.79 libboost_random1.79
+ libboost_thread1.79 libboost_container1.79 boost-jam
+ libboost_wserialization1.79 libboost_context1.79 libboost_json1.79
+ libboost_nowide1.79"
 
 if [ -z "$CROSS_BUILD" ]; then
-	subpackages+=" libboost_stacktrace_addr2line1.72"
+	subpackages+=" libboost_stacktrace_addr2line1.79"
 fi
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*)    _arch=x86;      _abi=sysv  ;;
-	x86_64*)  _arch=x86;      _abi=sysv  ;;
-	arm*)     _arch=arm;      _abi=aapcs ;;
-	aarch64*) _arch=arm;      _abi=aapcs ;;
-	mips*)    _arch=mips32r2; _abi=o32   ;;
-	ppc*)     _arch=power;    _abi=sysv  ;;
+	i686*|x86_64*) _arch=x86;      _abi=sysv  ;;
+	arm*|aarch64*) _arch=arm;      _abi=aapcs ;;
+	mips*)         _arch=mips32r2; _abi=o32   ;;
+	ppc*)          _arch=power;    _abi=sysv  ;;
 esac
 
 do_build() {
@@ -66,7 +47,7 @@ do_build() {
 	(
 	# Rebuild bjam for target
 	cd tools/build/src/engine
-	./build.sh gcc
+	./build.sh --cxx="${CXX}" --cxxflags="${CXXFLAGS}" gcc
 	)
 	cat > user-config.jam <<-__EOF
 	using gcc : : ${CXX} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
@@ -74,10 +55,8 @@ do_build() {
 	using python : ${py3_ver} : ${XBPS_CROSS_BASE}/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} \
 		threading=multi runtime-link=shared link=shared,static
 }
@@ -119,7 +98,7 @@ boost-jam_package() {
 		vmove usr/bin/b2
 	}
 }
-boost-python1.72_package() {
+boost-python1.79_package() {
 	depends="boost python"
 	replaces="boost-python>=0"
 	short_desc+=" - Python bindings"
@@ -127,7 +106,7 @@ boost-python1.72_package() {
 		vmove "usr/lib/libboost_python2*.so.*"
 	}
 }
-boost-python3-1.72_package() {
+boost-python3-1.79_package() {
 	depends="boost python3"
 	replaces="boost-python3>=0"
 	short_desc+=" - Python3 bindings"
@@ -154,7 +133,7 @@ boost-devel_package() {
 	}
 }
 
-libboost_atomic1.72_package() {
+libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
@@ -162,7 +141,7 @@ libboost_atomic1.72_package() {
 	}
 }
 
-libboost_chrono1.72_package() {
+libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
@@ -170,7 +149,7 @@ libboost_chrono1.72_package() {
 	}
 }
 
-libboost_container1.72_package() {
+libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
@@ -178,7 +157,7 @@ libboost_container1.72_package() {
 	}
 }
 
-libboost_context1.72_package() {
+libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
@@ -186,7 +165,7 @@ libboost_context1.72_package() {
 	}
 }
 
-libboost_contract1.72_package() {
+libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
@@ -194,7 +173,7 @@ libboost_contract1.72_package() {
 	}
 }
 
-libboost_coroutine1.72_package() {
+libboost_coroutine1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
@@ -202,7 +181,7 @@ libboost_coroutine1.72_package() {
 	}
 }
 
-libboost_date_time1.72_package() {
+libboost_date_time1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
@@ -210,7 +189,7 @@ libboost_date_time1.72_package() {
 	}
 }
 
-libboost_fiber1.72_package() {
+libboost_fiber1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_fiber"
 	pkg_install() {
@@ -218,7 +197,7 @@ libboost_fiber1.72_package() {
 	}
 }
 
-libboost_filesystem1.72_package() {
+libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
@@ -226,7 +205,7 @@ libboost_filesystem1.72_package() {
 	}
 }
 
-libboost_graph1.72_package() {
+libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
@@ -234,7 +213,7 @@ libboost_graph1.72_package() {
 	}
 }
 
-libboost_iostreams1.72_package() {
+libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
@@ -242,7 +221,7 @@ libboost_iostreams1.72_package() {
 	}
 }
 
-libboost_locale1.72_package() {
+libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
@@ -250,7 +229,7 @@ libboost_locale1.72_package() {
 	}
 }
 
-libboost_log1.72_package() {
+libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
@@ -258,7 +237,7 @@ libboost_log1.72_package() {
 	}
 }
 
-libboost_log_setup1.72_package() {
+libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
@@ -266,7 +245,7 @@ libboost_log_setup1.72_package() {
 	}
 }
 
-libboost_math_c991.72_package() {
+libboost_math_c99-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
@@ -274,7 +253,7 @@ libboost_math_c991.72_package() {
 	}
 }
 
-libboost_math_c99f1.72_package() {
+libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
@@ -282,7 +261,7 @@ libboost_math_c99f1.72_package() {
 	}
 }
 
-libboost_math_c99l1.72_package() {
+libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
@@ -290,7 +269,7 @@ libboost_math_c99l1.72_package() {
 	}
 }
 
-libboost_math_tr11.72_package() {
+libboost_math_tr1-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
@@ -298,7 +277,7 @@ libboost_math_tr11.72_package() {
 	}
 }
 
-libboost_math_tr1f1.72_package() {
+libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
@@ -306,7 +285,7 @@ libboost_math_tr1f1.72_package() {
 	}
 }
 
-libboost_math_tr1l1.72_package() {
+libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
@@ -314,7 +293,7 @@ libboost_math_tr1l1.72_package() {
 	}
 }
 
-libboost_prg_exec_monitor1.72_package() {
+libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
@@ -322,7 +301,7 @@ libboost_prg_exec_monitor1.72_package() {
 	}
 }
 
-libboost_program_options1.72_package() {
+libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
@@ -330,7 +309,7 @@ libboost_program_options1.72_package() {
 	}
 }
 
-libboost_random1.72_package() {
+libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
@@ -338,7 +317,7 @@ libboost_random1.72_package() {
 	}
 }
 
-libboost_regex1.72_package() {
+libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
@@ -346,7 +325,7 @@ libboost_regex1.72_package() {
 	}
 }
 
-libboost_serialization1.72_package() {
+libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
@@ -354,7 +333,7 @@ libboost_serialization1.72_package() {
 	}
 }
 
-libboost_stacktrace_addr2line1.72_package() {
+libboost_stacktrace_addr2line1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_addr2line"
 	pkg_install() {
@@ -362,7 +341,7 @@ libboost_stacktrace_addr2line1.72_package() {
 	}
 }
 
-libboost_stacktrace_basic1.72_package() {
+libboost_stacktrace_basic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_basic"
 	pkg_install() {
@@ -370,7 +349,7 @@ libboost_stacktrace_basic1.72_package() {
 	}
 }
 
-libboost_stacktrace_noop1.72_package() {
+libboost_stacktrace_noop1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_noop"
 	pkg_install() {
@@ -378,7 +357,7 @@ libboost_stacktrace_noop1.72_package() {
 	}
 }
 
-libboost_system1.72_package() {
+libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
@@ -386,7 +365,7 @@ libboost_system1.72_package() {
 	}
 }
 
-libboost_thread1.72_package() {
+libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
@@ -394,7 +373,7 @@ libboost_thread1.72_package() {
 	}
 }
 
-libboost_timer1.72_package() {
+libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
@@ -402,7 +381,7 @@ libboost_timer1.72_package() {
 	}
 }
 
-libboost_type_erasure1.72_package() {
+libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
@@ -410,7 +389,7 @@ libboost_type_erasure1.72_package() {
 	}
 }
 
-libboost_unit_test_framework1.72_package() {
+libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
@@ -418,7 +397,7 @@ libboost_unit_test_framework1.72_package() {
 	}
 }
 
-libboost_wave1.72_package() {
+libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
@@ -426,10 +405,26 @@ libboost_wave1.72_package() {
 	}
 }
 
-libboost_wserialization1.72_package() {
+libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
 		vmove usr/lib/libboost_wserialization.so.*
 	}
 }
+
+libboost_json1.79_package() {
+	depends="boost"
+	short_desc+=" - libboost_json"
+	pkg_install() {
+		vmove "usr/lib/libboost_json.so.*"
+	}
+}
+
+libboost_nowide1.79_package() {
+	depends="boost"
+	short_desc+=" - libboost_nowide"
+	pkg_install() {
+		vmove "usr/lib/libboost_nowide.so.*"
+	}
+}
diff --git a/srcpkgs/libboost_atomic1.72 b/srcpkgs/libboost_atomic1.79
similarity index 100%
rename from srcpkgs/libboost_atomic1.72
rename to srcpkgs/libboost_atomic1.79
diff --git a/srcpkgs/libboost_chrono1.72 b/srcpkgs/libboost_chrono1.79
similarity index 100%
rename from srcpkgs/libboost_chrono1.72
rename to srcpkgs/libboost_chrono1.79
diff --git a/srcpkgs/libboost_container1.72 b/srcpkgs/libboost_container1.79
similarity index 100%
rename from srcpkgs/libboost_container1.72
rename to srcpkgs/libboost_container1.79
diff --git a/srcpkgs/libboost_context1.72 b/srcpkgs/libboost_context1.79
similarity index 100%
rename from srcpkgs/libboost_context1.72
rename to srcpkgs/libboost_context1.79
diff --git a/srcpkgs/libboost_contract1.72 b/srcpkgs/libboost_contract1.79
similarity index 100%
rename from srcpkgs/libboost_contract1.72
rename to srcpkgs/libboost_contract1.79
diff --git a/srcpkgs/libboost_coroutine1.72 b/srcpkgs/libboost_coroutine1.79
similarity index 100%
rename from srcpkgs/libboost_coroutine1.72
rename to srcpkgs/libboost_coroutine1.79
diff --git a/srcpkgs/libboost_date_time1.72 b/srcpkgs/libboost_date_time1.79
similarity index 100%
rename from srcpkgs/libboost_date_time1.72
rename to srcpkgs/libboost_date_time1.79
diff --git a/srcpkgs/libboost_fiber1.72 b/srcpkgs/libboost_fiber1.79
similarity index 100%
rename from srcpkgs/libboost_fiber1.72
rename to srcpkgs/libboost_fiber1.79
diff --git a/srcpkgs/libboost_filesystem1.72 b/srcpkgs/libboost_filesystem1.79
similarity index 100%
rename from srcpkgs/libboost_filesystem1.72
rename to srcpkgs/libboost_filesystem1.79
diff --git a/srcpkgs/libboost_graph1.72 b/srcpkgs/libboost_graph1.79
similarity index 100%
rename from srcpkgs/libboost_graph1.72
rename to srcpkgs/libboost_graph1.79
diff --git a/srcpkgs/libboost_iostreams1.72 b/srcpkgs/libboost_iostreams1.79
similarity index 100%
rename from srcpkgs/libboost_iostreams1.72
rename to srcpkgs/libboost_iostreams1.79
diff --git a/srcpkgs/libboost_locale1.72 b/srcpkgs/libboost_json1.79
similarity index 100%
rename from srcpkgs/libboost_locale1.72
rename to srcpkgs/libboost_json1.79
diff --git a/srcpkgs/libboost_log1.72 b/srcpkgs/libboost_locale1.79
similarity index 100%
rename from srcpkgs/libboost_log1.72
rename to srcpkgs/libboost_locale1.79
diff --git a/srcpkgs/libboost_log_setup1.72 b/srcpkgs/libboost_log1.79
similarity index 100%
rename from srcpkgs/libboost_log_setup1.72
rename to srcpkgs/libboost_log1.79
diff --git a/srcpkgs/libboost_math_c991.72 b/srcpkgs/libboost_log_setup1.79
similarity index 100%
rename from srcpkgs/libboost_math_c991.72
rename to srcpkgs/libboost_log_setup1.79
diff --git a/srcpkgs/libboost_math_c99f1.72 b/srcpkgs/libboost_math_c99-1.79
similarity index 100%
rename from srcpkgs/libboost_math_c99f1.72
rename to srcpkgs/libboost_math_c99-1.79
diff --git a/srcpkgs/libboost_math_c99l1.72 b/srcpkgs/libboost_math_c99f1.79
similarity index 100%
rename from srcpkgs/libboost_math_c99l1.72
rename to srcpkgs/libboost_math_c99f1.79
diff --git a/srcpkgs/libboost_math_tr11.72 b/srcpkgs/libboost_math_c99l1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr11.72
rename to srcpkgs/libboost_math_c99l1.79
diff --git a/srcpkgs/libboost_math_tr1f1.72 b/srcpkgs/libboost_math_tr1-1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1f1.72
rename to srcpkgs/libboost_math_tr1-1.79
diff --git a/srcpkgs/libboost_math_tr1l1.72 b/srcpkgs/libboost_math_tr1f1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1l1.72
rename to srcpkgs/libboost_math_tr1f1.79
diff --git a/srcpkgs/libboost_prg_exec_monitor1.72 b/srcpkgs/libboost_math_tr1l1.79
similarity index 100%
rename from srcpkgs/libboost_prg_exec_monitor1.72
rename to srcpkgs/libboost_math_tr1l1.79
diff --git a/srcpkgs/libboost_program_options1.72 b/srcpkgs/libboost_nowide1.79
similarity index 100%
rename from srcpkgs/libboost_program_options1.72
rename to srcpkgs/libboost_nowide1.79
diff --git a/srcpkgs/libboost_random1.72 b/srcpkgs/libboost_prg_exec_monitor1.79
similarity index 100%
rename from srcpkgs/libboost_random1.72
rename to srcpkgs/libboost_prg_exec_monitor1.79
diff --git a/srcpkgs/libboost_regex1.72 b/srcpkgs/libboost_program_options1.79
similarity index 100%
rename from srcpkgs/libboost_regex1.72
rename to srcpkgs/libboost_program_options1.79
diff --git a/srcpkgs/libboost_serialization1.72 b/srcpkgs/libboost_random1.79
similarity index 100%
rename from srcpkgs/libboost_serialization1.72
rename to srcpkgs/libboost_random1.79
diff --git a/srcpkgs/libboost_stacktrace_addr2line1.72 b/srcpkgs/libboost_regex1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_addr2line1.72
rename to srcpkgs/libboost_regex1.79
diff --git a/srcpkgs/libboost_stacktrace_basic1.72 b/srcpkgs/libboost_serialization1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_basic1.72
rename to srcpkgs/libboost_serialization1.79
diff --git a/srcpkgs/libboost_stacktrace_noop1.72 b/srcpkgs/libboost_stacktrace_addr2line1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_noop1.72
rename to srcpkgs/libboost_stacktrace_addr2line1.79
diff --git a/srcpkgs/libboost_system1.72 b/srcpkgs/libboost_stacktrace_basic1.79
similarity index 100%
rename from srcpkgs/libboost_system1.72
rename to srcpkgs/libboost_stacktrace_basic1.79
diff --git a/srcpkgs/libboost_thread1.72 b/srcpkgs/libboost_stacktrace_noop1.79
similarity index 100%
rename from srcpkgs/libboost_thread1.72
rename to srcpkgs/libboost_stacktrace_noop1.79
diff --git a/srcpkgs/libboost_timer1.72 b/srcpkgs/libboost_system1.79
similarity index 100%
rename from srcpkgs/libboost_timer1.72
rename to srcpkgs/libboost_system1.79
diff --git a/srcpkgs/libboost_type_erasure1.72 b/srcpkgs/libboost_thread1.79
similarity index 100%
rename from srcpkgs/libboost_type_erasure1.72
rename to srcpkgs/libboost_thread1.79
diff --git a/srcpkgs/libboost_unit_test_framework1.72 b/srcpkgs/libboost_timer1.79
similarity index 100%
rename from srcpkgs/libboost_unit_test_framework1.72
rename to srcpkgs/libboost_timer1.79
diff --git a/srcpkgs/libboost_wave1.72 b/srcpkgs/libboost_type_erasure1.79
similarity index 100%
rename from srcpkgs/libboost_wave1.72
rename to srcpkgs/libboost_type_erasure1.79
diff --git a/srcpkgs/libboost_wserialization1.72 b/srcpkgs/libboost_unit_test_framework1.79
similarity index 100%
rename from srcpkgs/libboost_wserialization1.72
rename to srcpkgs/libboost_unit_test_framework1.79
diff --git a/srcpkgs/libboost_wave1.79 b/srcpkgs/libboost_wave1.79
new file mode 120000
index 000000000000..baef819c48f6
--- /dev/null
+++ b/srcpkgs/libboost_wave1.79
@@ -0,0 +1 @@
+boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_wserialization1.79 b/srcpkgs/libboost_wserialization1.79
new file mode 120000
index 000000000000..baef819c48f6
--- /dev/null
+++ b/srcpkgs/libboost_wserialization1.79
@@ -0,0 +1 @@
+boost
\ No newline at end of file

From 1709818af6d7bd269dacc92cd6a040b9f1dcca1f Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 18:29:05 +0200
Subject: [PATCH 2/4] boost: quote all vmove's with a glob.

---
 srcpkgs/boost/template | 70 +++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index ad705311b867..7a9c1c33fa44 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -137,7 +137,7 @@ libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
-		vmove usr/lib/libboost_atomic.so.*
+		vmove "usr/lib/libboost_atomic.so.*"
 	}
 }
 
@@ -145,7 +145,7 @@ libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
-		vmove usr/lib/libboost_chrono.so.*
+		vmove "usr/lib/libboost_chrono.so.*"
 	}
 }
 
@@ -153,7 +153,7 @@ libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
-		vmove usr/lib/libboost_container.so.*
+		vmove "usr/lib/libboost_container.so.*"
 	}
 }
 
@@ -161,7 +161,7 @@ libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
-		vmove usr/lib/libboost_context.so.*
+		vmove "usr/lib/libboost_context.so.*"
 	}
 }
 
@@ -169,7 +169,7 @@ libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
-		vmove usr/lib/libboost_contract.so.*
+		vmove "usr/lib/libboost_contract.so.*"
 	}
 }
 
@@ -177,7 +177,7 @@ libboost_coroutine1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
-		vmove usr/lib/libboost_coroutine.so.*
+		vmove "usr/lib/libboost_coroutine.so.*"
 	}
 }
 
@@ -185,7 +185,7 @@ libboost_date_time1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
-		vmove usr/lib/libboost_date_time.so.*
+		vmove "usr/lib/libboost_date_time.so.*"
 	}
 }
 
@@ -193,7 +193,7 @@ libboost_fiber1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_fiber"
 	pkg_install() {
-		vmove usr/lib/libboost_fiber.so.*
+		vmove "usr/lib/libboost_fiber.so.*"
 	}
 }
 
@@ -201,7 +201,7 @@ libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
-		vmove usr/lib/libboost_filesystem.so.*
+		vmove "usr/lib/libboost_filesystem.so.*"
 	}
 }
 
@@ -209,7 +209,7 @@ libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
-		vmove usr/lib/libboost_graph.so.*
+		vmove "usr/lib/libboost_graph.so.*"
 	}
 }
 
@@ -217,7 +217,7 @@ libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
-		vmove usr/lib/libboost_iostreams.so.*
+		vmove "usr/lib/libboost_iostreams.so.*"
 	}
 }
 
@@ -225,7 +225,7 @@ libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
-		vmove usr/lib/libboost_locale.so.*
+		vmove "usr/lib/libboost_locale.so.*"
 	}
 }
 
@@ -233,7 +233,7 @@ libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
-		vmove usr/lib/libboost_log.so.*
+		vmove "usr/lib/libboost_log.so.*"
 	}
 }
 
@@ -241,7 +241,7 @@ libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
-		vmove usr/lib/libboost_log_setup.so.*
+		vmove "usr/lib/libboost_log_setup.so.*"
 	}
 }
 
@@ -249,7 +249,7 @@ libboost_math_c99-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99.so.*
+		vmove "usr/lib/libboost_math_c99.so.*"
 	}
 }
 
@@ -257,7 +257,7 @@ libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99f.so.*
+		vmove "usr/lib/libboost_math_c99f.so.*"
 	}
 }
 
@@ -265,7 +265,7 @@ libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99l.so.*
+		vmove "usr/lib/libboost_math_c99l.so.*"
 	}
 }
 
@@ -273,7 +273,7 @@ libboost_math_tr1-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1.so.*
+		vmove "usr/lib/libboost_math_tr1.so.*"
 	}
 }
 
@@ -281,7 +281,7 @@ libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1f.so.*
+		vmove "usr/lib/libboost_math_tr1f.so.*"
 	}
 }
 
@@ -289,7 +289,7 @@ libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1l.so.*
+		vmove "usr/lib/libboost_math_tr1l.so.*"
 	}
 }
 
@@ -297,7 +297,7 @@ libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
-		vmove usr/lib/libboost_prg_exec_monitor.so.*
+		vmove "usr/lib/libboost_prg_exec_monitor.so.*"
 	}
 }
 
@@ -305,7 +305,7 @@ libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
-		vmove usr/lib/libboost_program_options.so.*
+		vmove "usr/lib/libboost_program_options.so.*"
 	}
 }
 
@@ -313,7 +313,7 @@ libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
-		vmove usr/lib/libboost_random.so.*
+		vmove "usr/lib/libboost_random.so.*"
 	}
 }
 
@@ -321,7 +321,7 @@ libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
-		vmove usr/lib/libboost_regex.so.*
+		vmove "usr/lib/libboost_regex.so.*"
 	}
 }
 
@@ -329,7 +329,7 @@ libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
-		vmove usr/lib/libboost_serialization.so.*
+		vmove "usr/lib/libboost_serialization.so.*"
 	}
 }
 
@@ -337,7 +337,7 @@ libboost_stacktrace_addr2line1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_addr2line"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_addr2line.so.*
+		vmove "usr/lib/libboost_stacktrace_addr2line.so.*"
 	}
 }
 
@@ -345,7 +345,7 @@ libboost_stacktrace_basic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_basic"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_basic.so.*
+		vmove "usr/lib/libboost_stacktrace_basic.so.*"
 	}
 }
 
@@ -353,7 +353,7 @@ libboost_stacktrace_noop1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_noop"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_noop.so.*
+		vmove "usr/lib/libboost_stacktrace_noop.so.*"
 	}
 }
 
@@ -361,7 +361,7 @@ libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
-		vmove usr/lib/libboost_system.so.*
+		vmove "usr/lib/libboost_system.so.*"
 	}
 }
 
@@ -369,7 +369,7 @@ libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
-		vmove usr/lib/libboost_thread.so.*
+		vmove "usr/lib/libboost_thread.so.*"
 	}
 }
 
@@ -377,7 +377,7 @@ libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
-		vmove usr/lib/libboost_timer.so.*
+		vmove "usr/lib/libboost_timer.so.*"
 	}
 }
 
@@ -385,7 +385,7 @@ libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
-		vmove usr/lib/libboost_type_erasure.so.*
+		vmove "usr/lib/libboost_type_erasure.so.*"
 	}
 }
 
@@ -393,7 +393,7 @@ libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
-		vmove usr/lib/libboost_unit_test_framework.so.*
+		vmove "usr/lib/libboost_unit_test_framework.so.*"
 	}
 }
 
@@ -401,7 +401,7 @@ libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
-		vmove usr/lib/libboost_wave.so.*
+		vmove "usr/lib/libboost_wave.so.*"
 	}
 }
 
@@ -409,7 +409,7 @@ libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
-		vmove usr/lib/libboost_wserialization.so.*
+		vmove "usr/lib/libboost_wserialization.so.*"
 	}
 }
 

From ee7c5df6d51ae35080dd584d1ef32001420a1404 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 26 May 2022 18:52:59 +0300
Subject: [PATCH 3/4] uhd: update to 4.2.0.0.

---
 common/shlibs        | 2 +-
 srcpkgs/uhd/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index bb418cdfc245..529a07f73a31 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3595,7 +3595,7 @@ libbinpac.so.0 zeek-3.2.4_2
 libllhttp.so.1 llhttp-1.0.1_1
 libpinyin.so.13 libpinyin-2.2.1_1
 libzhuyin.so.13 libzhuyin-2.6.0_3
-libuhd.so.4.0.0 uhd-4.0.0.0_1
+libuhd.so.4.2.0 uhd-4.2.0.0_1
 libeditline.so.1 editline-1.16.0_1
 libgnuradio-rds.so.1 gnuradio-rds-3.8.0_1
 libgnuradio-nrsc5-1.0.0git.so.0.0.0 gnuradio-nrsc5-1.0.0_1
diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template
index 5f043162d7dc..685f877dc380 100644
--- a/srcpkgs/uhd/template
+++ b/srcpkgs/uhd/template
@@ -1,6 +1,6 @@
 # Template file for 'uhd'
 pkgname=uhd
-version=4.0.0.0
+version=4.2.0.0
 revision=1
 build_wrksrc=host
 build_style=cmake
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://files.ettus.com/manual/"
 changelog="https://raw.githubusercontent.com/EttusResearch/uhd/master/CHANGELOG"
 distfiles="https://github.com/EttusResearch/uhd/archive/v${version}.tar.gz"
-checksum=4f3513c43edf0178391ed5755266864532716b8b503bcfb9a983ae6256c51b14
+checksum=ad15cedc8a4b9ba78078f1c4c3c179eff8297a08e44928679de896ca42313e6b
 python_version=3
 
 case "${XBPS_TARGET_MACHINE}" in

From 8b7845e5706e218465bd2fb3844eca789fb94863 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 26 May 2022 21:37:30 +0300
Subject: [PATCH 4/4] [WIP] gnuradio: update to 3.10.2.0.

This is most certainly a broken updated packaging for now... probably
just needs a bunch of new dependencies to even build anything useful
while if it doesn't find anything it just builds the bare minimum
(e.g. docs), annoying behavior...

[ci skip] the PR is still WIP
---
 ...6495f3bdf579dae0c26531a16f6adcc7fb2f.patch | 46 -------------------
 ...15d0b26b3c72fab736bcd28a67ab9d1404b7.patch | 28 -----------
 ...befbbe54e55fc4994899e92bcf5bf462fa2f.patch | 31 -------------
 srcpkgs/gnuradio/template                     | 20 ++++----
 4 files changed, 11 insertions(+), 114 deletions(-)
 delete mode 100644 srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch
 delete mode 100644 srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch
 delete mode 100644 srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch

diff --git a/srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch b/srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch
deleted file mode 100644
index 51952bd29b38..000000000000
--- a/srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 596c6495f3bdf579dae0c26531a16f6adcc7fb2f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marcus=20M=C3=BCller?= <mmueller@gnuradio.org>
-Date: Mon, 13 Apr 2020 00:11:59 +0200
-Subject: [PATCH] =?UTF-8?q?pmt:=20conditionalize=20testing=20of=20long=20>?=
- =?UTF-8?q?=202=C2=B3=C2=B2=20on=20sizeof(long)?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- gnuradio-runtime/python/pmt/qa_pmt.py | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/gnuradio-runtime/python/pmt/qa_pmt.py b/gnuradio-runtime/python/pmt/qa_pmt.py
-index 884bba7dd4b..44f616cdae1 100644
---- a/gnuradio-runtime/python/pmt/qa_pmt.py
-+++ b/gnuradio-runtime/python/pmt/qa_pmt.py
-@@ -18,6 +18,10 @@ class test_pmt(unittest.TestCase):
-     MAXINT32 = (2**31)-1
-     MININT32 = (-MAXINT32)-1
- 
-+    def setUp(self):
-+        from ctypes import sizeof, c_long
-+        self.sizeof_long = sizeof(c_long)
-+
-     def test01(self):
-         a = pmt.intern("a")
-         b = pmt.from_double(123765)
-@@ -112,6 +116,8 @@ def test14(self):
-         self.assertEqual(const,pmt.to_long(deser))
- 
-     def test15(self):
-+        if(self.sizeof_long <= 4):
-+            return
-         const = self.MAXINT32 + 1
-         x_pmt = pmt.from_long(const)
-         s = pmt.serialize_str(x_pmt)
-@@ -137,6 +143,8 @@ def test17(self):
-         self.assertEqual(const, x_long)
- 
-     def test18(self):
-+        if(self.sizeof_long <= 4):
-+            return
-         const = self.MININT32 - 1
-         x_pmt = pmt.from_long(const)
-         s = pmt.serialize_str(x_pmt)
diff --git a/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch b/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch
deleted file mode 100644
index c49a047427e8..000000000000
--- a/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7 Mon Sep 17 00:00:00 2001
-From: John Sallay <jasallay@gmail.com>
-Date: Sat, 23 Oct 2021 08:26:42 -0400
-Subject: [PATCH] Fix issue 4595 qa_agc Assertion Error.
-
-The number of input elements needs to be disivible by volk_alignment, which it wasn't
-for machines with 512-bit registers.
-
-Signed-off-by: John Sallay <jasallay@gmail.com>
----
- gr-analog/python/analog/qa_agc.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/gr-analog/python/analog/qa_agc.py b/gr-analog/python/analog/qa_agc.py
-index a5a8ea47b6a..9368dd5d2a8 100644
---- a/gr-analog/python/analog/qa_agc.py
-+++ b/gr-analog/python/analog/qa_agc.py
-@@ -454,7 +454,9 @@ def test_006(self):
-         tb = self.tb
- 
-         sampling_freq = 100
--        N = int(5*sampling_freq)
-+        # N must by a multiple of the volk_alignment of the system for this test to work.
-+        # For a machine with 512-bit registers, that would be 8 complex-floats.
-+        N = int(8 * sampling_freq)
-         src1 = analog.sig_source_c(sampling_freq, analog.GR_SIN_WAVE,
-                                    sampling_freq * 0.10, 100)
-         dst1 = blocks.vector_sink_c()
diff --git a/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch b/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch
deleted file mode 100644
index 4faa3468140a..000000000000
--- a/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f259befbbe54e55fc4994899e92bcf5bf462fa2f Mon Sep 17 00:00:00 2001
-From: alekhgupta1441 <alekhgupta1441@gmail.com>
-Date: Sun, 12 Apr 2020 03:48:14 +0530
-Subject: [PATCH] gr-digital/python : Updated soft_dec_lut_gen.py
-
----
- gr-digital/python/digital/soft_dec_lut_gen.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gr-digital/python/digital/soft_dec_lut_gen.py b/gr-digital/python/digital/soft_dec_lut_gen.py
-index 4503c4fea7b..84f6de66e45 100644
---- a/gr-digital/python/digital/soft_dec_lut_gen.py
-+++ b/gr-digital/python/digital/soft_dec_lut_gen.py
-@@ -73,7 +73,7 @@ def soft_dec_table_generator(soft_dec_gen, prec, Es=1):
- 
-     '''
- 
--    npts = 2.0**prec
-+    npts = int(2.0**prec)
-     maxd = Es*numpy.sqrt(2.0)/2.0
-     yrng = numpy.linspace(-maxd, maxd, npts)
-     xrng = numpy.linspace(-maxd, maxd, npts)
-@@ -110,7 +110,7 @@ def soft_dec_table(constel, symbols, prec, npwr=1):
-     re_max = max(numpy.array(constel).real)
-     im_max = max(numpy.array(constel).imag)
- 
--    npts = 2.0**prec
-+    npts = int(2.0**prec)
-     yrng = numpy.linspace(im_min, im_max, npts)
-     xrng = numpy.linspace(re_min, re_max, npts)
- 
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index c950b53e8bea..b47325cb6034 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,10 +1,12 @@
 # Template file for 'gnuradio'
 pkgname=gnuradio
-version=3.8.0.0
-revision=9
+version=3.10.2.0
+revision=1
 build_style=cmake
-conf_files="/etc/gnuradio/conf.d/*"
-configure_args="-DENABLE_INTERNAL_VOLK=OFF -DGR_PYTHON_DIR=/${py3_sitelib}"
+# FIXME: '/etc/gnuradio/conf.d/*' configuration file not in PKGDESTDIR!
+#conf_files="/etc/gnuradio/conf.d/*"
+configure_args="-DGR_PYTHON_DIR=/${py3_sitelib}"
+# TODO: https://pypi.org/project/schema/ as new build/runtime dep since v3.10.2.0?
 hostmakedepends="pkg-config doxygen swig python3-Mako python3-Sphinx
  python3-cairo python3-numpy python3-yaml texlive texlive-latexextra texlive-dvi"
 makedepends="SDL-devel boost-devel fftw-devel gsl-devel jack-devel
@@ -18,12 +20,10 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnuradio.org"
 distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=03fd01f0b27033befb91709b3d56f95e0869b5fb8bc71bec2662266a3f0dedf5
+checksum=a8f6c1cc98bc3784aa70ab29d3039ad6922ec36f908ecfb2c904a597b32c0776
 python_version=3
 
 post_install() {
-	rm ${DESTDIR}/usr/share/gnuradio/examples/audio/dial_tone \
-		${DESTDIR}/usr/share/gnuradio/examples/uhd/tags_demo
 	vinstall grc/scripts/freedesktop/gnuradio-grc.desktop 644 \
 		usr/share/applications
 	vinstall grc/scripts/freedesktop/gnuradio_logo_icon-square.svg 644 \
@@ -42,8 +42,10 @@ gnuradio-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove "usr/lib/*.so"
+		# FIXME: there's no shared objects at all anymore?!
+		#vmove "usr/lib/*.so"
 		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
+		# FIXME: it looks like pkgconfig files aren't installed even though *.pc.in files do exist
+		#vmove usr/lib/pkgconfig
 	}
 }

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] boost: update to 1.79.0.
  2022-03-18 14:28 [PR PATCH] boost: update to 1.79.0.b1 JamiKettunen
                   ` (20 preceding siblings ...)
  2022-05-27 16:21 ` JamiKettunen
@ 2022-06-08 22:18 ` JamiKettunen
  2022-06-08 23:46 ` JamiKettunen
                   ` (6 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: JamiKettunen @ 2022-06-08 22:18 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3827 bytes --]

There is an updated pull request by JamiKettunen against master on the void-packages repository

https://github.com/JamiKettunen/void-packages boost-1.79.0
https://github.com/void-linux/void-packages/pull/36204

boost: update to 1.79.0.
#### Packages to fix (from `xrevshlib boost` as locally build-tested on `x86_64-musl`)
- [ ] Aegisub (fails on `do_build()`)
- [ ] PrusaSlicer (fails on `do_build()`)
- [ ] TSC (fails on `do_build()`)
- [ ] cryfs (fails on `do_build()`)
- [ ] fifengine (fails on `do_build()`)
- [x] uhd (fails on `do_build()`)
  - [ ] gnuradio (failed on `do_build()`, updating to [v3.10.2.0](https://github.com/gnuradio/gnuradio/releases/tag/v3.10.2.0) appears to have disabled building a lot of components including all shared objects and pkg-config files for example, probably just a bunch of missing new "optional" build-time dependencies...)
    - [ ] gnuradio-osmosdr (depends on `gnuradio`)
- [ ] imagescan (fails on `do_build()`)
- [ ] kea (fails on `do_build()`)
- [ ] ledger (fails on `do_build()`)
- [ ] libbitcoin-system (fails on `do_build()`)
  - [ ] libbitcoin-database (depends on `libbitcoin-system`)
    - [ ] libbitcoin-blockchain (depends on `libbitcoin-database`)
      - [ ] libbitcoin-node (depends on `libbitcoin-blockchain`)
      - [ ] libbitcoin-server (depends on `libbitcoin-blockchain`)
  - [ ] libbitcoin-protocol (depends on `libbitcoin-system`)
    - [ ] libbitcoin-client (depends on `libbitcoin-protocol`)
      - [ ] libbitcoin-explorer (depends on `libbitcoin-client`)
  - [ ] libbitcoin-network (depends on `libbitcoin-system`)
- [ ] libetonyek (fails on `do_build()`, appears to need `-std=c++17` or higher? `NUM3Parser.cpp:46:8: error: 'for_each' is not a member of 'std'`)
  - [ ] libreoffice (depends on `libetonyek`)
- [ ] librime (fails on `do_build()`)
- [ ] namecoin (fails on `do_build()`)
- [ ] pulseeffects-legacy (fails on `do_build()`)
- [ ] supercollider (fails on `do_build()`)
- [ ] leatherman (hangs on `do_check()`, test process pinned one core at 100% for 10 minutes)
  - [x] facter (depends on `leatherman`)
- [ ] inkscape (fails on `do_check()`)
- [ ] libtorrent-rasterbar (hangs on `do_check()`, 90/97 test_web_seed_http stuck for 10 minutes)
- [ ] schroot (fails on `do_check()`)
- [ ] bitcoin (fails on `do_check()`)

#### Packages to fix (from `xrevshlib uhd` as locally build-tested on `x86_64-musl`)
- [ ] urh (fails on `do_check()` even after adding `checkdepends="python3-pip"`)

#### Modified patches (boost)
`exec_file.patch`: Removed due to being upstream as https://github.com/boostorg/python/commit/d9f06052e28873037db7f98629bce72182a42410
`mips.patch`: Updated to apply on top of https://github.com/boostorg/fiber/commit/5dc9dabc5d5ff8da53ec897c265c9cba1b6ed0df, not sure if this can be removed now(?)

#### Misc changes
- I've renamed all subpackages of `boost` so that the versioned name doesn't conflict with other numbers and are consistent with the previously existing `boost-python3-1.72`, e.g. `libboost_math_c991.72` is now `libboost_math_c99-1.79` (notice the `-`!)

#### Testing the changes
- I tested the changes in this PR: **NO**

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36204.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boost-1.79.0-36204.patch --]
[-- Type: text/x-diff, Size: 51173 bytes --]

From a1e814cd6b37d103dea38921cf3748bc2b99c735 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 15:28:37 +0200
Subject: [PATCH 1/4] boost: update to 1.79.0.

---
 common/shlibs                                 |  64 +++----
 .../{boost-python1.72 => boost-python1.79}    |   0
 ...{boost-python3-1.72 => boost-python3-1.79} |   0
 srcpkgs/boost/patches/exec_file.patch         |  45 -----
 srcpkgs/boost/patches/mips.patch              |   2 +-
 srcpkgs/boost/template                        | 161 +++++++++---------
 ...ibboost_atomic1.72 => libboost_atomic1.79} |   0
 ...ibboost_chrono1.72 => libboost_chrono1.79} |   0
 ...t_container1.72 => libboost_container1.79} |   0
 ...boost_context1.72 => libboost_context1.79} |   0
 ...ost_contract1.72 => libboost_contract1.79} |   0
 ...t_coroutine1.72 => libboost_coroutine1.79} |   0
 ...t_date_time1.72 => libboost_date_time1.79} |   0
 ...{libboost_fiber1.72 => libboost_fiber1.79} |   0
 ...filesystem1.72 => libboost_filesystem1.79} |   0
 ...{libboost_graph1.72 => libboost_graph1.79} |   0
 ...t_iostreams1.72 => libboost_iostreams1.79} |   0
 ...{libboost_locale1.72 => libboost_json1.79} |   0
 .../{libboost_log1.72 => libboost_locale1.79} |   0
 ...ibboost_log_setup1.72 => libboost_log1.79} |   0
 ...st_math_c991.72 => libboost_log_setup1.79} |   0
 ...t_math_c99f1.72 => libboost_math_c99-1.79} |   0
 ...t_math_c99l1.72 => libboost_math_c99f1.79} |   0
 ...st_math_tr11.72 => libboost_math_c99l1.79} |   0
 ...t_math_tr1f1.72 => libboost_math_tr1-1.79} |   0
 ...t_math_tr1l1.72 => libboost_math_tr1f1.79} |   0
 ...xec_monitor1.72 => libboost_math_tr1l1.79} |   0
 ...rogram_options1.72 => libboost_nowide1.79} |   0
 ...ndom1.72 => libboost_prg_exec_monitor1.79} |   0
 ...regex1.72 => libboost_program_options1.79} |   0
 ..._serialization1.72 => libboost_random1.79} |   0
 ...trace_addr2line1.72 => libboost_regex1.79} |   0
 ...e_basic1.72 => libboost_serialization1.79} |   0
 ...1.72 => libboost_stacktrace_addr2line1.79} |   0
 ...stem1.72 => libboost_stacktrace_basic1.79} |   0
 ...hread1.72 => libboost_stacktrace_noop1.79} |   0
 ...libboost_timer1.72 => libboost_system1.79} |   0
 ...t_type_erasure1.72 => libboost_thread1.79} |   0
 ..._test_framework1.72 => libboost_timer1.79} |   0
 ...ost_wave1.72 => libboost_type_erasure1.79} |   0
 ...n1.72 => libboost_unit_test_framework1.79} |   0
 srcpkgs/libboost_wave1.79                     |   1 +
 srcpkgs/libboost_wserialization1.79           |   1 +
 43 files changed, 113 insertions(+), 161 deletions(-)
 rename srcpkgs/{boost-python1.72 => boost-python1.79} (100%)
 rename srcpkgs/{boost-python3-1.72 => boost-python3-1.79} (100%)
 delete mode 100644 srcpkgs/boost/patches/exec_file.patch
 rename srcpkgs/{libboost_atomic1.72 => libboost_atomic1.79} (100%)
 rename srcpkgs/{libboost_chrono1.72 => libboost_chrono1.79} (100%)
 rename srcpkgs/{libboost_container1.72 => libboost_container1.79} (100%)
 rename srcpkgs/{libboost_context1.72 => libboost_context1.79} (100%)
 rename srcpkgs/{libboost_contract1.72 => libboost_contract1.79} (100%)
 rename srcpkgs/{libboost_coroutine1.72 => libboost_coroutine1.79} (100%)
 rename srcpkgs/{libboost_date_time1.72 => libboost_date_time1.79} (100%)
 rename srcpkgs/{libboost_fiber1.72 => libboost_fiber1.79} (100%)
 rename srcpkgs/{libboost_filesystem1.72 => libboost_filesystem1.79} (100%)
 rename srcpkgs/{libboost_graph1.72 => libboost_graph1.79} (100%)
 rename srcpkgs/{libboost_iostreams1.72 => libboost_iostreams1.79} (100%)
 rename srcpkgs/{libboost_locale1.72 => libboost_json1.79} (100%)
 rename srcpkgs/{libboost_log1.72 => libboost_locale1.79} (100%)
 rename srcpkgs/{libboost_log_setup1.72 => libboost_log1.79} (100%)
 rename srcpkgs/{libboost_math_c991.72 => libboost_log_setup1.79} (100%)
 rename srcpkgs/{libboost_math_c99f1.72 => libboost_math_c99-1.79} (100%)
 rename srcpkgs/{libboost_math_c99l1.72 => libboost_math_c99f1.79} (100%)
 rename srcpkgs/{libboost_math_tr11.72 => libboost_math_c99l1.79} (100%)
 rename srcpkgs/{libboost_math_tr1f1.72 => libboost_math_tr1-1.79} (100%)
 rename srcpkgs/{libboost_math_tr1l1.72 => libboost_math_tr1f1.79} (100%)
 rename srcpkgs/{libboost_prg_exec_monitor1.72 => libboost_math_tr1l1.79} (100%)
 rename srcpkgs/{libboost_program_options1.72 => libboost_nowide1.79} (100%)
 rename srcpkgs/{libboost_random1.72 => libboost_prg_exec_monitor1.79} (100%)
 rename srcpkgs/{libboost_regex1.72 => libboost_program_options1.79} (100%)
 rename srcpkgs/{libboost_serialization1.72 => libboost_random1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_addr2line1.72 => libboost_regex1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_basic1.72 => libboost_serialization1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_noop1.72 => libboost_stacktrace_addr2line1.79} (100%)
 rename srcpkgs/{libboost_system1.72 => libboost_stacktrace_basic1.79} (100%)
 rename srcpkgs/{libboost_thread1.72 => libboost_stacktrace_noop1.79} (100%)
 rename srcpkgs/{libboost_timer1.72 => libboost_system1.79} (100%)
 rename srcpkgs/{libboost_type_erasure1.72 => libboost_thread1.79} (100%)
 rename srcpkgs/{libboost_unit_test_framework1.72 => libboost_timer1.79} (100%)
 rename srcpkgs/{libboost_wave1.72 => libboost_type_erasure1.79} (100%)
 rename srcpkgs/{libboost_wserialization1.72 => libboost_unit_test_framework1.79} (100%)
 create mode 120000 srcpkgs/libboost_wave1.79
 create mode 120000 srcpkgs/libboost_wserialization1.79

diff --git a/common/shlibs b/common/shlibs
index e04037a9f2f0..4dd00983b54f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -620,38 +620,38 @@ 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.79.0 libboost_context1.79-1.79.0_1
+libboost_coroutine.so.1.79.0 libboost_coroutine1.79-1.79.0_1
+libboost_container.so.1.79.0 libboost_container1.79-1.79.0_1
+libboost_prg_exec_monitor.so.1.79.0 libboost_prg_exec_monitor1.79-1.79.0_1
+libboost_timer.so.1.79.0 libboost_timer1.79-1.79.0_1
+libboost_random.so.1.79.0 libboost_random1.79-1.79.0_1
+libboost_filesystem.so.1.79.0 libboost_filesystem1.79-1.79.0_1
+libboost_unit_test_framework.so.1.79.0 libboost_unit_test_framework1.79-1.79.0_1
+libboost_math_c99.so.1.79.0 libboost_math_c99-1.79-1.79.0_1
+libboost_math_tr1.so.1.79.0 libboost_math_tr1-1.79-1.79.0_1
+libboost_regex.so.1.79.0 libboost_regex1.79-1.79.0_1
+libboost_serialization.so.1.79.0 libboost_serialization1.79-1.79.0_1
+libboost_chrono.so.1.79.0 libboost_chrono1.79-1.79.0_1
+libboost_wserialization.so.1.79.0 libboost_wserialization1.79-1.79.0_1
+libboost_graph.so.1.79.0 libboost_graph1.79-1.79.0_1
+libboost_log.so.1.79.0 libboost_log1.79-1.79.0_1
+libboost_locale.so.1.79.0 libboost_locale1.79-1.79.0_1
+libboost_program_options.so.1.79.0 libboost_program_options1.79-1.79.0_1
+libboost_iostreams.so.1.79.0 libboost_iostreams1.79-1.79.0_1
+libboost_system.so.1.79.0 libboost_system1.79-1.79.0_1
+libboost_thread.so.1.79.0 libboost_thread1.79-1.79.0_1
+libboost_log_setup.so.1.79.0 libboost_log_setup1.79-1.79.0_1
+libboost_date_time.so.1.79.0 libboost_date_time1.79-1.79.0_1
+libboost_wave.so.1.79.0 libboost_wave1.79-1.79.0_1
+libboost_atomic.so.1.79.0 libboost_atomic1.79-1.79.0_1
+libboost_type_erasure.so.1.79.0 libboost_type_erasure1.79-1.79.0_1
+libboost_fiber.so.1.79.0 libboost_fiber1.79-1.79.0_1
+libboost_stacktrace_noop.so.1.79.0 libboost_stacktrace_noop1.79-1.79.0_1
+libboost_stacktrace_addr2line.so.1.79.0 libboost_stacktrace_addr2line1.79-1.79.0_1
+libboost_stacktrace_basic.so.1.79.0 libboost_stacktrace_basic1.79-1.79.0_1
+libboost_python27.so.1.79.0 boost-python1.79-1.79.0_1
+libboost_python310.so.1.79.0 boost-python3-1.79-1.79.0_1
 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-python1.79
similarity index 100%
rename from srcpkgs/boost-python1.72
rename to srcpkgs/boost-python1.79
diff --git a/srcpkgs/boost-python3-1.72 b/srcpkgs/boost-python3-1.79
similarity index 100%
rename from srcpkgs/boost-python3-1.72
rename to srcpkgs/boost-python3-1.79
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/mips.patch b/srcpkgs/boost/patches/mips.patch
index a10a2122d9c7..8d253fc7c286 100644
--- a/srcpkgs/boost/patches/mips.patch
+++ b/srcpkgs/boost/patches/mips.patch
@@ -3,7 +3,7 @@
 @@ -48,7 +48,7 @@
  #  define cpu_relax() asm volatile ("nop" ::: "memory");
  # endif
- #elif BOOST_ARCH_MIPS
+ #elif BOOST_ARCH_MIPS && (((__mips_isa_rev > 1) && defined(__mips32)) || ((__mips_isa_rev > 2)  && defined(__mips64)))
 -# define cpu_relax() asm volatile ("pause" ::: "memory");
 +# define cpu_relax() asm volatile ("nop" ::: "memory");
  #elif BOOST_ARCH_PPC
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 126c50770b50..ad705311b867 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,8 +1,8 @@
 # Template file for 'boost'
 pkgname=boost
-version=1.72.0
-revision=7
-wrksrc="${pkgname}_${version//\./_}"
+version=1.79.0
+revision=1
+wrksrc="boost_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
 short_desc="Free peer-reviewed portable C++ source libraries"
@@ -10,53 +10,34 @@ 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=475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39
 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"
+subpackages="libboost_program_options1.79 libboost_math_c99f1.79
+ libboost_stacktrace_basic1.79 libboost_stacktrace_noop1.79
+ libboost_iostreams1.79 libboost_math_tr1l1.79 libboost_filesystem1.79
+ libboost_chrono1.79 libboost_math_tr1f1.79 libboost_wave1.79
+ libboost_graph1.79 libboost_locale1.79 libboost_regex1.79
+ libboost_fiber1.79 libboost_type_erasure1.79 libboost_coroutine1.79
+ libboost_atomic1.79 libboost_prg_exec_monitor1.79 libboost_math_c99-1.79
+ boost-python3-1.79 libboost_log_setup1.79 boost-devel
+ libboost_timer1.79 libboost_system1.79 libboost_unit_test_framework1.79
+ libboost_serialization1.79 libboost_math_tr1-1.79 boost-build
+ libboost_math_c99l1.79 boost-python1.79 libboost_contract1.79
+ libboost_date_time1.79 libboost_log1.79 libboost_random1.79
+ libboost_thread1.79 libboost_container1.79 boost-jam
+ libboost_wserialization1.79 libboost_context1.79 libboost_json1.79
+ libboost_nowide1.79"
 
 if [ -z "$CROSS_BUILD" ]; then
-	subpackages+=" libboost_stacktrace_addr2line1.72"
+	subpackages+=" libboost_stacktrace_addr2line1.79"
 fi
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*)    _arch=x86;      _abi=sysv  ;;
-	x86_64*)  _arch=x86;      _abi=sysv  ;;
-	arm*)     _arch=arm;      _abi=aapcs ;;
-	aarch64*) _arch=arm;      _abi=aapcs ;;
-	mips*)    _arch=mips32r2; _abi=o32   ;;
-	ppc*)     _arch=power;    _abi=sysv  ;;
+	i686*|x86_64*) _arch=x86;      _abi=sysv  ;;
+	arm*|aarch64*) _arch=arm;      _abi=aapcs ;;
+	mips*)         _arch=mips32r2; _abi=o32   ;;
+	ppc*)          _arch=power;    _abi=sysv  ;;
 esac
 
 do_build() {
@@ -66,7 +47,7 @@ do_build() {
 	(
 	# Rebuild bjam for target
 	cd tools/build/src/engine
-	./build.sh gcc
+	./build.sh --cxx="${CXX}" --cxxflags="${CXXFLAGS}" gcc
 	)
 	cat > user-config.jam <<-__EOF
 	using gcc : : ${CXX} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
@@ -74,10 +55,8 @@ do_build() {
 	using python : ${py3_ver} : ${XBPS_CROSS_BASE}/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} \
 		threading=multi runtime-link=shared link=shared,static
 }
@@ -119,7 +98,7 @@ boost-jam_package() {
 		vmove usr/bin/b2
 	}
 }
-boost-python1.72_package() {
+boost-python1.79_package() {
 	depends="boost python"
 	replaces="boost-python>=0"
 	short_desc+=" - Python bindings"
@@ -127,7 +106,7 @@ boost-python1.72_package() {
 		vmove "usr/lib/libboost_python2*.so.*"
 	}
 }
-boost-python3-1.72_package() {
+boost-python3-1.79_package() {
 	depends="boost python3"
 	replaces="boost-python3>=0"
 	short_desc+=" - Python3 bindings"
@@ -154,7 +133,7 @@ boost-devel_package() {
 	}
 }
 
-libboost_atomic1.72_package() {
+libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
@@ -162,7 +141,7 @@ libboost_atomic1.72_package() {
 	}
 }
 
-libboost_chrono1.72_package() {
+libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
@@ -170,7 +149,7 @@ libboost_chrono1.72_package() {
 	}
 }
 
-libboost_container1.72_package() {
+libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
@@ -178,7 +157,7 @@ libboost_container1.72_package() {
 	}
 }
 
-libboost_context1.72_package() {
+libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
@@ -186,7 +165,7 @@ libboost_context1.72_package() {
 	}
 }
 
-libboost_contract1.72_package() {
+libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
@@ -194,7 +173,7 @@ libboost_contract1.72_package() {
 	}
 }
 
-libboost_coroutine1.72_package() {
+libboost_coroutine1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
@@ -202,7 +181,7 @@ libboost_coroutine1.72_package() {
 	}
 }
 
-libboost_date_time1.72_package() {
+libboost_date_time1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
@@ -210,7 +189,7 @@ libboost_date_time1.72_package() {
 	}
 }
 
-libboost_fiber1.72_package() {
+libboost_fiber1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_fiber"
 	pkg_install() {
@@ -218,7 +197,7 @@ libboost_fiber1.72_package() {
 	}
 }
 
-libboost_filesystem1.72_package() {
+libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
@@ -226,7 +205,7 @@ libboost_filesystem1.72_package() {
 	}
 }
 
-libboost_graph1.72_package() {
+libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
@@ -234,7 +213,7 @@ libboost_graph1.72_package() {
 	}
 }
 
-libboost_iostreams1.72_package() {
+libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
@@ -242,7 +221,7 @@ libboost_iostreams1.72_package() {
 	}
 }
 
-libboost_locale1.72_package() {
+libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
@@ -250,7 +229,7 @@ libboost_locale1.72_package() {
 	}
 }
 
-libboost_log1.72_package() {
+libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
@@ -258,7 +237,7 @@ libboost_log1.72_package() {
 	}
 }
 
-libboost_log_setup1.72_package() {
+libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
@@ -266,7 +245,7 @@ libboost_log_setup1.72_package() {
 	}
 }
 
-libboost_math_c991.72_package() {
+libboost_math_c99-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
@@ -274,7 +253,7 @@ libboost_math_c991.72_package() {
 	}
 }
 
-libboost_math_c99f1.72_package() {
+libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
@@ -282,7 +261,7 @@ libboost_math_c99f1.72_package() {
 	}
 }
 
-libboost_math_c99l1.72_package() {
+libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
@@ -290,7 +269,7 @@ libboost_math_c99l1.72_package() {
 	}
 }
 
-libboost_math_tr11.72_package() {
+libboost_math_tr1-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
@@ -298,7 +277,7 @@ libboost_math_tr11.72_package() {
 	}
 }
 
-libboost_math_tr1f1.72_package() {
+libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
@@ -306,7 +285,7 @@ libboost_math_tr1f1.72_package() {
 	}
 }
 
-libboost_math_tr1l1.72_package() {
+libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
@@ -314,7 +293,7 @@ libboost_math_tr1l1.72_package() {
 	}
 }
 
-libboost_prg_exec_monitor1.72_package() {
+libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
@@ -322,7 +301,7 @@ libboost_prg_exec_monitor1.72_package() {
 	}
 }
 
-libboost_program_options1.72_package() {
+libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
@@ -330,7 +309,7 @@ libboost_program_options1.72_package() {
 	}
 }
 
-libboost_random1.72_package() {
+libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
@@ -338,7 +317,7 @@ libboost_random1.72_package() {
 	}
 }
 
-libboost_regex1.72_package() {
+libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
@@ -346,7 +325,7 @@ libboost_regex1.72_package() {
 	}
 }
 
-libboost_serialization1.72_package() {
+libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
@@ -354,7 +333,7 @@ libboost_serialization1.72_package() {
 	}
 }
 
-libboost_stacktrace_addr2line1.72_package() {
+libboost_stacktrace_addr2line1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_addr2line"
 	pkg_install() {
@@ -362,7 +341,7 @@ libboost_stacktrace_addr2line1.72_package() {
 	}
 }
 
-libboost_stacktrace_basic1.72_package() {
+libboost_stacktrace_basic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_basic"
 	pkg_install() {
@@ -370,7 +349,7 @@ libboost_stacktrace_basic1.72_package() {
 	}
 }
 
-libboost_stacktrace_noop1.72_package() {
+libboost_stacktrace_noop1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_noop"
 	pkg_install() {
@@ -378,7 +357,7 @@ libboost_stacktrace_noop1.72_package() {
 	}
 }
 
-libboost_system1.72_package() {
+libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
@@ -386,7 +365,7 @@ libboost_system1.72_package() {
 	}
 }
 
-libboost_thread1.72_package() {
+libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
@@ -394,7 +373,7 @@ libboost_thread1.72_package() {
 	}
 }
 
-libboost_timer1.72_package() {
+libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
@@ -402,7 +381,7 @@ libboost_timer1.72_package() {
 	}
 }
 
-libboost_type_erasure1.72_package() {
+libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
@@ -410,7 +389,7 @@ libboost_type_erasure1.72_package() {
 	}
 }
 
-libboost_unit_test_framework1.72_package() {
+libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
@@ -418,7 +397,7 @@ libboost_unit_test_framework1.72_package() {
 	}
 }
 
-libboost_wave1.72_package() {
+libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
@@ -426,10 +405,26 @@ libboost_wave1.72_package() {
 	}
 }
 
-libboost_wserialization1.72_package() {
+libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
 		vmove usr/lib/libboost_wserialization.so.*
 	}
 }
+
+libboost_json1.79_package() {
+	depends="boost"
+	short_desc+=" - libboost_json"
+	pkg_install() {
+		vmove "usr/lib/libboost_json.so.*"
+	}
+}
+
+libboost_nowide1.79_package() {
+	depends="boost"
+	short_desc+=" - libboost_nowide"
+	pkg_install() {
+		vmove "usr/lib/libboost_nowide.so.*"
+	}
+}
diff --git a/srcpkgs/libboost_atomic1.72 b/srcpkgs/libboost_atomic1.79
similarity index 100%
rename from srcpkgs/libboost_atomic1.72
rename to srcpkgs/libboost_atomic1.79
diff --git a/srcpkgs/libboost_chrono1.72 b/srcpkgs/libboost_chrono1.79
similarity index 100%
rename from srcpkgs/libboost_chrono1.72
rename to srcpkgs/libboost_chrono1.79
diff --git a/srcpkgs/libboost_container1.72 b/srcpkgs/libboost_container1.79
similarity index 100%
rename from srcpkgs/libboost_container1.72
rename to srcpkgs/libboost_container1.79
diff --git a/srcpkgs/libboost_context1.72 b/srcpkgs/libboost_context1.79
similarity index 100%
rename from srcpkgs/libboost_context1.72
rename to srcpkgs/libboost_context1.79
diff --git a/srcpkgs/libboost_contract1.72 b/srcpkgs/libboost_contract1.79
similarity index 100%
rename from srcpkgs/libboost_contract1.72
rename to srcpkgs/libboost_contract1.79
diff --git a/srcpkgs/libboost_coroutine1.72 b/srcpkgs/libboost_coroutine1.79
similarity index 100%
rename from srcpkgs/libboost_coroutine1.72
rename to srcpkgs/libboost_coroutine1.79
diff --git a/srcpkgs/libboost_date_time1.72 b/srcpkgs/libboost_date_time1.79
similarity index 100%
rename from srcpkgs/libboost_date_time1.72
rename to srcpkgs/libboost_date_time1.79
diff --git a/srcpkgs/libboost_fiber1.72 b/srcpkgs/libboost_fiber1.79
similarity index 100%
rename from srcpkgs/libboost_fiber1.72
rename to srcpkgs/libboost_fiber1.79
diff --git a/srcpkgs/libboost_filesystem1.72 b/srcpkgs/libboost_filesystem1.79
similarity index 100%
rename from srcpkgs/libboost_filesystem1.72
rename to srcpkgs/libboost_filesystem1.79
diff --git a/srcpkgs/libboost_graph1.72 b/srcpkgs/libboost_graph1.79
similarity index 100%
rename from srcpkgs/libboost_graph1.72
rename to srcpkgs/libboost_graph1.79
diff --git a/srcpkgs/libboost_iostreams1.72 b/srcpkgs/libboost_iostreams1.79
similarity index 100%
rename from srcpkgs/libboost_iostreams1.72
rename to srcpkgs/libboost_iostreams1.79
diff --git a/srcpkgs/libboost_locale1.72 b/srcpkgs/libboost_json1.79
similarity index 100%
rename from srcpkgs/libboost_locale1.72
rename to srcpkgs/libboost_json1.79
diff --git a/srcpkgs/libboost_log1.72 b/srcpkgs/libboost_locale1.79
similarity index 100%
rename from srcpkgs/libboost_log1.72
rename to srcpkgs/libboost_locale1.79
diff --git a/srcpkgs/libboost_log_setup1.72 b/srcpkgs/libboost_log1.79
similarity index 100%
rename from srcpkgs/libboost_log_setup1.72
rename to srcpkgs/libboost_log1.79
diff --git a/srcpkgs/libboost_math_c991.72 b/srcpkgs/libboost_log_setup1.79
similarity index 100%
rename from srcpkgs/libboost_math_c991.72
rename to srcpkgs/libboost_log_setup1.79
diff --git a/srcpkgs/libboost_math_c99f1.72 b/srcpkgs/libboost_math_c99-1.79
similarity index 100%
rename from srcpkgs/libboost_math_c99f1.72
rename to srcpkgs/libboost_math_c99-1.79
diff --git a/srcpkgs/libboost_math_c99l1.72 b/srcpkgs/libboost_math_c99f1.79
similarity index 100%
rename from srcpkgs/libboost_math_c99l1.72
rename to srcpkgs/libboost_math_c99f1.79
diff --git a/srcpkgs/libboost_math_tr11.72 b/srcpkgs/libboost_math_c99l1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr11.72
rename to srcpkgs/libboost_math_c99l1.79
diff --git a/srcpkgs/libboost_math_tr1f1.72 b/srcpkgs/libboost_math_tr1-1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1f1.72
rename to srcpkgs/libboost_math_tr1-1.79
diff --git a/srcpkgs/libboost_math_tr1l1.72 b/srcpkgs/libboost_math_tr1f1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1l1.72
rename to srcpkgs/libboost_math_tr1f1.79
diff --git a/srcpkgs/libboost_prg_exec_monitor1.72 b/srcpkgs/libboost_math_tr1l1.79
similarity index 100%
rename from srcpkgs/libboost_prg_exec_monitor1.72
rename to srcpkgs/libboost_math_tr1l1.79
diff --git a/srcpkgs/libboost_program_options1.72 b/srcpkgs/libboost_nowide1.79
similarity index 100%
rename from srcpkgs/libboost_program_options1.72
rename to srcpkgs/libboost_nowide1.79
diff --git a/srcpkgs/libboost_random1.72 b/srcpkgs/libboost_prg_exec_monitor1.79
similarity index 100%
rename from srcpkgs/libboost_random1.72
rename to srcpkgs/libboost_prg_exec_monitor1.79
diff --git a/srcpkgs/libboost_regex1.72 b/srcpkgs/libboost_program_options1.79
similarity index 100%
rename from srcpkgs/libboost_regex1.72
rename to srcpkgs/libboost_program_options1.79
diff --git a/srcpkgs/libboost_serialization1.72 b/srcpkgs/libboost_random1.79
similarity index 100%
rename from srcpkgs/libboost_serialization1.72
rename to srcpkgs/libboost_random1.79
diff --git a/srcpkgs/libboost_stacktrace_addr2line1.72 b/srcpkgs/libboost_regex1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_addr2line1.72
rename to srcpkgs/libboost_regex1.79
diff --git a/srcpkgs/libboost_stacktrace_basic1.72 b/srcpkgs/libboost_serialization1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_basic1.72
rename to srcpkgs/libboost_serialization1.79
diff --git a/srcpkgs/libboost_stacktrace_noop1.72 b/srcpkgs/libboost_stacktrace_addr2line1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_noop1.72
rename to srcpkgs/libboost_stacktrace_addr2line1.79
diff --git a/srcpkgs/libboost_system1.72 b/srcpkgs/libboost_stacktrace_basic1.79
similarity index 100%
rename from srcpkgs/libboost_system1.72
rename to srcpkgs/libboost_stacktrace_basic1.79
diff --git a/srcpkgs/libboost_thread1.72 b/srcpkgs/libboost_stacktrace_noop1.79
similarity index 100%
rename from srcpkgs/libboost_thread1.72
rename to srcpkgs/libboost_stacktrace_noop1.79
diff --git a/srcpkgs/libboost_timer1.72 b/srcpkgs/libboost_system1.79
similarity index 100%
rename from srcpkgs/libboost_timer1.72
rename to srcpkgs/libboost_system1.79
diff --git a/srcpkgs/libboost_type_erasure1.72 b/srcpkgs/libboost_thread1.79
similarity index 100%
rename from srcpkgs/libboost_type_erasure1.72
rename to srcpkgs/libboost_thread1.79
diff --git a/srcpkgs/libboost_unit_test_framework1.72 b/srcpkgs/libboost_timer1.79
similarity index 100%
rename from srcpkgs/libboost_unit_test_framework1.72
rename to srcpkgs/libboost_timer1.79
diff --git a/srcpkgs/libboost_wave1.72 b/srcpkgs/libboost_type_erasure1.79
similarity index 100%
rename from srcpkgs/libboost_wave1.72
rename to srcpkgs/libboost_type_erasure1.79
diff --git a/srcpkgs/libboost_wserialization1.72 b/srcpkgs/libboost_unit_test_framework1.79
similarity index 100%
rename from srcpkgs/libboost_wserialization1.72
rename to srcpkgs/libboost_unit_test_framework1.79
diff --git a/srcpkgs/libboost_wave1.79 b/srcpkgs/libboost_wave1.79
new file mode 120000
index 000000000000..baef819c48f6
--- /dev/null
+++ b/srcpkgs/libboost_wave1.79
@@ -0,0 +1 @@
+boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_wserialization1.79 b/srcpkgs/libboost_wserialization1.79
new file mode 120000
index 000000000000..baef819c48f6
--- /dev/null
+++ b/srcpkgs/libboost_wserialization1.79
@@ -0,0 +1 @@
+boost
\ No newline at end of file

From 65964e6332e0de203ca4af2b91c27bb9ede2fb83 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 18:29:05 +0200
Subject: [PATCH 2/4] boost: quote all vmove's with a glob.

---
 srcpkgs/boost/template | 70 +++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index ad705311b867..7a9c1c33fa44 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -137,7 +137,7 @@ libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
-		vmove usr/lib/libboost_atomic.so.*
+		vmove "usr/lib/libboost_atomic.so.*"
 	}
 }
 
@@ -145,7 +145,7 @@ libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
-		vmove usr/lib/libboost_chrono.so.*
+		vmove "usr/lib/libboost_chrono.so.*"
 	}
 }
 
@@ -153,7 +153,7 @@ libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
-		vmove usr/lib/libboost_container.so.*
+		vmove "usr/lib/libboost_container.so.*"
 	}
 }
 
@@ -161,7 +161,7 @@ libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
-		vmove usr/lib/libboost_context.so.*
+		vmove "usr/lib/libboost_context.so.*"
 	}
 }
 
@@ -169,7 +169,7 @@ libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
-		vmove usr/lib/libboost_contract.so.*
+		vmove "usr/lib/libboost_contract.so.*"
 	}
 }
 
@@ -177,7 +177,7 @@ libboost_coroutine1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
-		vmove usr/lib/libboost_coroutine.so.*
+		vmove "usr/lib/libboost_coroutine.so.*"
 	}
 }
 
@@ -185,7 +185,7 @@ libboost_date_time1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
-		vmove usr/lib/libboost_date_time.so.*
+		vmove "usr/lib/libboost_date_time.so.*"
 	}
 }
 
@@ -193,7 +193,7 @@ libboost_fiber1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_fiber"
 	pkg_install() {
-		vmove usr/lib/libboost_fiber.so.*
+		vmove "usr/lib/libboost_fiber.so.*"
 	}
 }
 
@@ -201,7 +201,7 @@ libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
-		vmove usr/lib/libboost_filesystem.so.*
+		vmove "usr/lib/libboost_filesystem.so.*"
 	}
 }
 
@@ -209,7 +209,7 @@ libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
-		vmove usr/lib/libboost_graph.so.*
+		vmove "usr/lib/libboost_graph.so.*"
 	}
 }
 
@@ -217,7 +217,7 @@ libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
-		vmove usr/lib/libboost_iostreams.so.*
+		vmove "usr/lib/libboost_iostreams.so.*"
 	}
 }
 
@@ -225,7 +225,7 @@ libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
-		vmove usr/lib/libboost_locale.so.*
+		vmove "usr/lib/libboost_locale.so.*"
 	}
 }
 
@@ -233,7 +233,7 @@ libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
-		vmove usr/lib/libboost_log.so.*
+		vmove "usr/lib/libboost_log.so.*"
 	}
 }
 
@@ -241,7 +241,7 @@ libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
-		vmove usr/lib/libboost_log_setup.so.*
+		vmove "usr/lib/libboost_log_setup.so.*"
 	}
 }
 
@@ -249,7 +249,7 @@ libboost_math_c99-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99.so.*
+		vmove "usr/lib/libboost_math_c99.so.*"
 	}
 }
 
@@ -257,7 +257,7 @@ libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99f.so.*
+		vmove "usr/lib/libboost_math_c99f.so.*"
 	}
 }
 
@@ -265,7 +265,7 @@ libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99l.so.*
+		vmove "usr/lib/libboost_math_c99l.so.*"
 	}
 }
 
@@ -273,7 +273,7 @@ libboost_math_tr1-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1.so.*
+		vmove "usr/lib/libboost_math_tr1.so.*"
 	}
 }
 
@@ -281,7 +281,7 @@ libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1f.so.*
+		vmove "usr/lib/libboost_math_tr1f.so.*"
 	}
 }
 
@@ -289,7 +289,7 @@ libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1l.so.*
+		vmove "usr/lib/libboost_math_tr1l.so.*"
 	}
 }
 
@@ -297,7 +297,7 @@ libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
-		vmove usr/lib/libboost_prg_exec_monitor.so.*
+		vmove "usr/lib/libboost_prg_exec_monitor.so.*"
 	}
 }
 
@@ -305,7 +305,7 @@ libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
-		vmove usr/lib/libboost_program_options.so.*
+		vmove "usr/lib/libboost_program_options.so.*"
 	}
 }
 
@@ -313,7 +313,7 @@ libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
-		vmove usr/lib/libboost_random.so.*
+		vmove "usr/lib/libboost_random.so.*"
 	}
 }
 
@@ -321,7 +321,7 @@ libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
-		vmove usr/lib/libboost_regex.so.*
+		vmove "usr/lib/libboost_regex.so.*"
 	}
 }
 
@@ -329,7 +329,7 @@ libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
-		vmove usr/lib/libboost_serialization.so.*
+		vmove "usr/lib/libboost_serialization.so.*"
 	}
 }
 
@@ -337,7 +337,7 @@ libboost_stacktrace_addr2line1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_addr2line"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_addr2line.so.*
+		vmove "usr/lib/libboost_stacktrace_addr2line.so.*"
 	}
 }
 
@@ -345,7 +345,7 @@ libboost_stacktrace_basic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_basic"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_basic.so.*
+		vmove "usr/lib/libboost_stacktrace_basic.so.*"
 	}
 }
 
@@ -353,7 +353,7 @@ libboost_stacktrace_noop1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_noop"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_noop.so.*
+		vmove "usr/lib/libboost_stacktrace_noop.so.*"
 	}
 }
 
@@ -361,7 +361,7 @@ libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
-		vmove usr/lib/libboost_system.so.*
+		vmove "usr/lib/libboost_system.so.*"
 	}
 }
 
@@ -369,7 +369,7 @@ libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
-		vmove usr/lib/libboost_thread.so.*
+		vmove "usr/lib/libboost_thread.so.*"
 	}
 }
 
@@ -377,7 +377,7 @@ libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
-		vmove usr/lib/libboost_timer.so.*
+		vmove "usr/lib/libboost_timer.so.*"
 	}
 }
 
@@ -385,7 +385,7 @@ libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
-		vmove usr/lib/libboost_type_erasure.so.*
+		vmove "usr/lib/libboost_type_erasure.so.*"
 	}
 }
 
@@ -393,7 +393,7 @@ libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
-		vmove usr/lib/libboost_unit_test_framework.so.*
+		vmove "usr/lib/libboost_unit_test_framework.so.*"
 	}
 }
 
@@ -401,7 +401,7 @@ libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
-		vmove usr/lib/libboost_wave.so.*
+		vmove "usr/lib/libboost_wave.so.*"
 	}
 }
 
@@ -409,7 +409,7 @@ libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
-		vmove usr/lib/libboost_wserialization.so.*
+		vmove "usr/lib/libboost_wserialization.so.*"
 	}
 }
 

From e6f6ae7ece7a32e024afb818108be305703f77b3 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 26 May 2022 18:52:59 +0300
Subject: [PATCH 3/4] uhd: update to 4.2.0.0.

---
 common/shlibs        | 2 +-
 srcpkgs/uhd/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4dd00983b54f..416f22d54910 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3589,7 +3589,7 @@ libbinpac.so.0 zeek-3.2.4_2
 libllhttp.so.1 llhttp-1.0.1_1
 libpinyin.so.13 libpinyin-2.2.1_1
 libzhuyin.so.13 libzhuyin-2.6.0_3
-libuhd.so.4.0.0 uhd-4.0.0.0_1
+libuhd.so.4.2.0 uhd-4.2.0.0_1
 libeditline.so.1 editline-1.16.0_1
 libgnuradio-rds.so.1 gnuradio-rds-3.8.0_1
 libgnuradio-nrsc5-1.0.0git.so.0.0.0 gnuradio-nrsc5-1.0.0_1
diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template
index 5f043162d7dc..685f877dc380 100644
--- a/srcpkgs/uhd/template
+++ b/srcpkgs/uhd/template
@@ -1,6 +1,6 @@
 # Template file for 'uhd'
 pkgname=uhd
-version=4.0.0.0
+version=4.2.0.0
 revision=1
 build_wrksrc=host
 build_style=cmake
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://files.ettus.com/manual/"
 changelog="https://raw.githubusercontent.com/EttusResearch/uhd/master/CHANGELOG"
 distfiles="https://github.com/EttusResearch/uhd/archive/v${version}.tar.gz"
-checksum=4f3513c43edf0178391ed5755266864532716b8b503bcfb9a983ae6256c51b14
+checksum=ad15cedc8a4b9ba78078f1c4c3c179eff8297a08e44928679de896ca42313e6b
 python_version=3
 
 case "${XBPS_TARGET_MACHINE}" in

From 9f2ef4c2596fc9f51000e4c941e7aece246e4c28 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 26 May 2022 21:37:30 +0300
Subject: [PATCH 4/4] [WIP] gnuradio: update to 3.10.2.0.

This is most certainly a broken updated packaging for now... probably
just needs a bunch of new dependencies to even build anything useful
while if it doesn't find anything it just builds the bare minimum
(e.g. docs), annoying behavior...

[ci skip] the PR is still WIP
---
 ...6495f3bdf579dae0c26531a16f6adcc7fb2f.patch | 46 -------------------
 ...15d0b26b3c72fab736bcd28a67ab9d1404b7.patch | 28 -----------
 ...befbbe54e55fc4994899e92bcf5bf462fa2f.patch | 31 -------------
 srcpkgs/gnuradio/template                     | 20 ++++----
 4 files changed, 11 insertions(+), 114 deletions(-)
 delete mode 100644 srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch
 delete mode 100644 srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch
 delete mode 100644 srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch

diff --git a/srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch b/srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch
deleted file mode 100644
index 51952bd29b38..000000000000
--- a/srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 596c6495f3bdf579dae0c26531a16f6adcc7fb2f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marcus=20M=C3=BCller?= <mmueller@gnuradio.org>
-Date: Mon, 13 Apr 2020 00:11:59 +0200
-Subject: [PATCH] =?UTF-8?q?pmt:=20conditionalize=20testing=20of=20long=20>?=
- =?UTF-8?q?=202=C2=B3=C2=B2=20on=20sizeof(long)?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- gnuradio-runtime/python/pmt/qa_pmt.py | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/gnuradio-runtime/python/pmt/qa_pmt.py b/gnuradio-runtime/python/pmt/qa_pmt.py
-index 884bba7dd4b..44f616cdae1 100644
---- a/gnuradio-runtime/python/pmt/qa_pmt.py
-+++ b/gnuradio-runtime/python/pmt/qa_pmt.py
-@@ -18,6 +18,10 @@ class test_pmt(unittest.TestCase):
-     MAXINT32 = (2**31)-1
-     MININT32 = (-MAXINT32)-1
- 
-+    def setUp(self):
-+        from ctypes import sizeof, c_long
-+        self.sizeof_long = sizeof(c_long)
-+
-     def test01(self):
-         a = pmt.intern("a")
-         b = pmt.from_double(123765)
-@@ -112,6 +116,8 @@ def test14(self):
-         self.assertEqual(const,pmt.to_long(deser))
- 
-     def test15(self):
-+        if(self.sizeof_long <= 4):
-+            return
-         const = self.MAXINT32 + 1
-         x_pmt = pmt.from_long(const)
-         s = pmt.serialize_str(x_pmt)
-@@ -137,6 +143,8 @@ def test17(self):
-         self.assertEqual(const, x_long)
- 
-     def test18(self):
-+        if(self.sizeof_long <= 4):
-+            return
-         const = self.MININT32 - 1
-         x_pmt = pmt.from_long(const)
-         s = pmt.serialize_str(x_pmt)
diff --git a/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch b/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch
deleted file mode 100644
index c49a047427e8..000000000000
--- a/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7 Mon Sep 17 00:00:00 2001
-From: John Sallay <jasallay@gmail.com>
-Date: Sat, 23 Oct 2021 08:26:42 -0400
-Subject: [PATCH] Fix issue 4595 qa_agc Assertion Error.
-
-The number of input elements needs to be disivible by volk_alignment, which it wasn't
-for machines with 512-bit registers.
-
-Signed-off-by: John Sallay <jasallay@gmail.com>
----
- gr-analog/python/analog/qa_agc.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/gr-analog/python/analog/qa_agc.py b/gr-analog/python/analog/qa_agc.py
-index a5a8ea47b6a..9368dd5d2a8 100644
---- a/gr-analog/python/analog/qa_agc.py
-+++ b/gr-analog/python/analog/qa_agc.py
-@@ -454,7 +454,9 @@ def test_006(self):
-         tb = self.tb
- 
-         sampling_freq = 100
--        N = int(5*sampling_freq)
-+        # N must by a multiple of the volk_alignment of the system for this test to work.
-+        # For a machine with 512-bit registers, that would be 8 complex-floats.
-+        N = int(8 * sampling_freq)
-         src1 = analog.sig_source_c(sampling_freq, analog.GR_SIN_WAVE,
-                                    sampling_freq * 0.10, 100)
-         dst1 = blocks.vector_sink_c()
diff --git a/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch b/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch
deleted file mode 100644
index 4faa3468140a..000000000000
--- a/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f259befbbe54e55fc4994899e92bcf5bf462fa2f Mon Sep 17 00:00:00 2001
-From: alekhgupta1441 <alekhgupta1441@gmail.com>
-Date: Sun, 12 Apr 2020 03:48:14 +0530
-Subject: [PATCH] gr-digital/python : Updated soft_dec_lut_gen.py
-
----
- gr-digital/python/digital/soft_dec_lut_gen.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gr-digital/python/digital/soft_dec_lut_gen.py b/gr-digital/python/digital/soft_dec_lut_gen.py
-index 4503c4fea7b..84f6de66e45 100644
---- a/gr-digital/python/digital/soft_dec_lut_gen.py
-+++ b/gr-digital/python/digital/soft_dec_lut_gen.py
-@@ -73,7 +73,7 @@ def soft_dec_table_generator(soft_dec_gen, prec, Es=1):
- 
-     '''
- 
--    npts = 2.0**prec
-+    npts = int(2.0**prec)
-     maxd = Es*numpy.sqrt(2.0)/2.0
-     yrng = numpy.linspace(-maxd, maxd, npts)
-     xrng = numpy.linspace(-maxd, maxd, npts)
-@@ -110,7 +110,7 @@ def soft_dec_table(constel, symbols, prec, npwr=1):
-     re_max = max(numpy.array(constel).real)
-     im_max = max(numpy.array(constel).imag)
- 
--    npts = 2.0**prec
-+    npts = int(2.0**prec)
-     yrng = numpy.linspace(im_min, im_max, npts)
-     xrng = numpy.linspace(re_min, re_max, npts)
- 
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index c950b53e8bea..b47325cb6034 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,10 +1,12 @@
 # Template file for 'gnuradio'
 pkgname=gnuradio
-version=3.8.0.0
-revision=9
+version=3.10.2.0
+revision=1
 build_style=cmake
-conf_files="/etc/gnuradio/conf.d/*"
-configure_args="-DENABLE_INTERNAL_VOLK=OFF -DGR_PYTHON_DIR=/${py3_sitelib}"
+# FIXME: '/etc/gnuradio/conf.d/*' configuration file not in PKGDESTDIR!
+#conf_files="/etc/gnuradio/conf.d/*"
+configure_args="-DGR_PYTHON_DIR=/${py3_sitelib}"
+# TODO: https://pypi.org/project/schema/ as new build/runtime dep since v3.10.2.0?
 hostmakedepends="pkg-config doxygen swig python3-Mako python3-Sphinx
  python3-cairo python3-numpy python3-yaml texlive texlive-latexextra texlive-dvi"
 makedepends="SDL-devel boost-devel fftw-devel gsl-devel jack-devel
@@ -18,12 +20,10 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnuradio.org"
 distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=03fd01f0b27033befb91709b3d56f95e0869b5fb8bc71bec2662266a3f0dedf5
+checksum=a8f6c1cc98bc3784aa70ab29d3039ad6922ec36f908ecfb2c904a597b32c0776
 python_version=3
 
 post_install() {
-	rm ${DESTDIR}/usr/share/gnuradio/examples/audio/dial_tone \
-		${DESTDIR}/usr/share/gnuradio/examples/uhd/tags_demo
 	vinstall grc/scripts/freedesktop/gnuradio-grc.desktop 644 \
 		usr/share/applications
 	vinstall grc/scripts/freedesktop/gnuradio_logo_icon-square.svg 644 \
@@ -42,8 +42,10 @@ gnuradio-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove "usr/lib/*.so"
+		# FIXME: there's no shared objects at all anymore?!
+		#vmove "usr/lib/*.so"
 		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
+		# FIXME: it looks like pkgconfig files aren't installed even though *.pc.in files do exist
+		#vmove usr/lib/pkgconfig
 	}
 }

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] boost: update to 1.79.0.
  2022-03-18 14:28 [PR PATCH] boost: update to 1.79.0.b1 JamiKettunen
                   ` (21 preceding siblings ...)
  2022-06-08 22:18 ` JamiKettunen
@ 2022-06-08 23:46 ` JamiKettunen
  2022-06-08 23:47 ` JamiKettunen
                   ` (5 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: JamiKettunen @ 2022-06-08 23:46 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 4093 bytes --]

There is an updated pull request by JamiKettunen against master on the void-packages repository

https://github.com/JamiKettunen/void-packages boost-1.79.0
https://github.com/void-linux/void-packages/pull/36204

boost: update to 1.79.0.
#### Packages to fix (from `xrevshlib boost` as locally build-tested on `x86_64-musl`)
- [ ] Aegisub (fails on `do_build()`)
```
/usr/bin/ld: CMakeFiles/Aegisub.dir/src/search_replace_engine.cpp.o: undefined reference to symbol '_ZN6icu_708Collator14createInstanceERKNS_6LocaleER10UErrorCode'
/usr/bin/ld: /lib64/libicui18n.so.70: error adding symbols: DSO missing from command line
```
- [ ] PrusaSlicer (fails on `do_build()`)
- [ ] TSC (fails on `do_build()`)
- [ ] cryfs (fails on `do_build()`)
- [ ] fifengine (fails on `do_build()`)
- [x] uhd (fails on `do_build()`)
  - [ ] gnuradio (failed on `do_build()`, updating to [v3.10.2.0](https://github.com/gnuradio/gnuradio/releases/tag/v3.10.2.0) appears to have disabled building a lot of components including all shared objects and pkg-config files for example, probably just a bunch of missing new "optional" build-time dependencies...)
    - [ ] gnuradio-osmosdr (depends on `gnuradio`)
- [ ] imagescan (fails on `do_build()`)
- [ ] kea (fails on `do_build()`)
- [ ] ledger (fails on `do_build()`)
- [ ] libbitcoin-system (fails on `do_build()`)
  - [ ] libbitcoin-database (depends on `libbitcoin-system`)
    - [ ] libbitcoin-blockchain (depends on `libbitcoin-database`)
      - [ ] libbitcoin-node (depends on `libbitcoin-blockchain`)
      - [ ] libbitcoin-server (depends on `libbitcoin-blockchain`)
  - [ ] libbitcoin-protocol (depends on `libbitcoin-system`)
    - [ ] libbitcoin-client (depends on `libbitcoin-protocol`)
      - [ ] libbitcoin-explorer (depends on `libbitcoin-client`)
  - [ ] libbitcoin-network (depends on `libbitcoin-system`)
- [ ] libetonyek (fails on `do_build()`, appears to need `-std=c++17` or higher? `NUM3Parser.cpp:46:8: error: 'for_each' is not a member of 'std'`)
  - [ ] libreoffice (depends on `libetonyek`)
- [ ] librime (fails on `do_build()`)
- [ ] namecoin (fails on `do_build()`)
- [ ] pulseeffects-legacy (fails on `do_build()`)
- [ ] supercollider (fails on `do_build()`)
- [ ] leatherman (hangs on `do_check()`, test process pinned one core at 100% for 10 minutes)
  - [x] facter (depends on `leatherman`)
- [ ] inkscape (fails on `do_check()`)
- [ ] libtorrent-rasterbar (hangs on `do_check()`, 90/97 test_web_seed_http stuck for 10 minutes)
- [ ] schroot (fails on `do_check()`)
- [ ] bitcoin (fails on `do_check()`)

#### Packages to fix (from `xrevshlib uhd` as locally build-tested on `x86_64-musl`)
- [ ] urh (fails on `do_check()` even after adding `checkdepends="python3-pip"`)

#### Modified patches (boost)
`exec_file.patch`: Removed due to being upstream as https://github.com/boostorg/python/commit/d9f06052e28873037db7f98629bce72182a42410
`mips.patch`: Updated to apply on top of https://github.com/boostorg/fiber/commit/5dc9dabc5d5ff8da53ec897c265c9cba1b6ed0df, not sure if this can be removed now(?)

#### Misc changes
- I've renamed all subpackages of `boost` so that the versioned name doesn't conflict with other numbers and are consistent with the previously existing `boost-python3-1.72`, e.g. `libboost_math_c991.72` is now `libboost_math_c99-1.79` (notice the `-`!)

#### Testing the changes
- I tested the changes in this PR: **NO**

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36204.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boost-1.79.0-36204.patch --]
[-- Type: text/x-diff, Size: 63089 bytes --]

From a1e814cd6b37d103dea38921cf3748bc2b99c735 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 15:28:37 +0200
Subject: [PATCH 1/5] boost: update to 1.79.0.

---
 common/shlibs                                 |  64 +++----
 .../{boost-python1.72 => boost-python1.79}    |   0
 ...{boost-python3-1.72 => boost-python3-1.79} |   0
 srcpkgs/boost/patches/exec_file.patch         |  45 -----
 srcpkgs/boost/patches/mips.patch              |   2 +-
 srcpkgs/boost/template                        | 161 +++++++++---------
 ...ibboost_atomic1.72 => libboost_atomic1.79} |   0
 ...ibboost_chrono1.72 => libboost_chrono1.79} |   0
 ...t_container1.72 => libboost_container1.79} |   0
 ...boost_context1.72 => libboost_context1.79} |   0
 ...ost_contract1.72 => libboost_contract1.79} |   0
 ...t_coroutine1.72 => libboost_coroutine1.79} |   0
 ...t_date_time1.72 => libboost_date_time1.79} |   0
 ...{libboost_fiber1.72 => libboost_fiber1.79} |   0
 ...filesystem1.72 => libboost_filesystem1.79} |   0
 ...{libboost_graph1.72 => libboost_graph1.79} |   0
 ...t_iostreams1.72 => libboost_iostreams1.79} |   0
 ...{libboost_locale1.72 => libboost_json1.79} |   0
 .../{libboost_log1.72 => libboost_locale1.79} |   0
 ...ibboost_log_setup1.72 => libboost_log1.79} |   0
 ...st_math_c991.72 => libboost_log_setup1.79} |   0
 ...t_math_c99f1.72 => libboost_math_c99-1.79} |   0
 ...t_math_c99l1.72 => libboost_math_c99f1.79} |   0
 ...st_math_tr11.72 => libboost_math_c99l1.79} |   0
 ...t_math_tr1f1.72 => libboost_math_tr1-1.79} |   0
 ...t_math_tr1l1.72 => libboost_math_tr1f1.79} |   0
 ...xec_monitor1.72 => libboost_math_tr1l1.79} |   0
 ...rogram_options1.72 => libboost_nowide1.79} |   0
 ...ndom1.72 => libboost_prg_exec_monitor1.79} |   0
 ...regex1.72 => libboost_program_options1.79} |   0
 ..._serialization1.72 => libboost_random1.79} |   0
 ...trace_addr2line1.72 => libboost_regex1.79} |   0
 ...e_basic1.72 => libboost_serialization1.79} |   0
 ...1.72 => libboost_stacktrace_addr2line1.79} |   0
 ...stem1.72 => libboost_stacktrace_basic1.79} |   0
 ...hread1.72 => libboost_stacktrace_noop1.79} |   0
 ...libboost_timer1.72 => libboost_system1.79} |   0
 ...t_type_erasure1.72 => libboost_thread1.79} |   0
 ..._test_framework1.72 => libboost_timer1.79} |   0
 ...ost_wave1.72 => libboost_type_erasure1.79} |   0
 ...n1.72 => libboost_unit_test_framework1.79} |   0
 srcpkgs/libboost_wave1.79                     |   1 +
 srcpkgs/libboost_wserialization1.79           |   1 +
 43 files changed, 113 insertions(+), 161 deletions(-)
 rename srcpkgs/{boost-python1.72 => boost-python1.79} (100%)
 rename srcpkgs/{boost-python3-1.72 => boost-python3-1.79} (100%)
 delete mode 100644 srcpkgs/boost/patches/exec_file.patch
 rename srcpkgs/{libboost_atomic1.72 => libboost_atomic1.79} (100%)
 rename srcpkgs/{libboost_chrono1.72 => libboost_chrono1.79} (100%)
 rename srcpkgs/{libboost_container1.72 => libboost_container1.79} (100%)
 rename srcpkgs/{libboost_context1.72 => libboost_context1.79} (100%)
 rename srcpkgs/{libboost_contract1.72 => libboost_contract1.79} (100%)
 rename srcpkgs/{libboost_coroutine1.72 => libboost_coroutine1.79} (100%)
 rename srcpkgs/{libboost_date_time1.72 => libboost_date_time1.79} (100%)
 rename srcpkgs/{libboost_fiber1.72 => libboost_fiber1.79} (100%)
 rename srcpkgs/{libboost_filesystem1.72 => libboost_filesystem1.79} (100%)
 rename srcpkgs/{libboost_graph1.72 => libboost_graph1.79} (100%)
 rename srcpkgs/{libboost_iostreams1.72 => libboost_iostreams1.79} (100%)
 rename srcpkgs/{libboost_locale1.72 => libboost_json1.79} (100%)
 rename srcpkgs/{libboost_log1.72 => libboost_locale1.79} (100%)
 rename srcpkgs/{libboost_log_setup1.72 => libboost_log1.79} (100%)
 rename srcpkgs/{libboost_math_c991.72 => libboost_log_setup1.79} (100%)
 rename srcpkgs/{libboost_math_c99f1.72 => libboost_math_c99-1.79} (100%)
 rename srcpkgs/{libboost_math_c99l1.72 => libboost_math_c99f1.79} (100%)
 rename srcpkgs/{libboost_math_tr11.72 => libboost_math_c99l1.79} (100%)
 rename srcpkgs/{libboost_math_tr1f1.72 => libboost_math_tr1-1.79} (100%)
 rename srcpkgs/{libboost_math_tr1l1.72 => libboost_math_tr1f1.79} (100%)
 rename srcpkgs/{libboost_prg_exec_monitor1.72 => libboost_math_tr1l1.79} (100%)
 rename srcpkgs/{libboost_program_options1.72 => libboost_nowide1.79} (100%)
 rename srcpkgs/{libboost_random1.72 => libboost_prg_exec_monitor1.79} (100%)
 rename srcpkgs/{libboost_regex1.72 => libboost_program_options1.79} (100%)
 rename srcpkgs/{libboost_serialization1.72 => libboost_random1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_addr2line1.72 => libboost_regex1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_basic1.72 => libboost_serialization1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_noop1.72 => libboost_stacktrace_addr2line1.79} (100%)
 rename srcpkgs/{libboost_system1.72 => libboost_stacktrace_basic1.79} (100%)
 rename srcpkgs/{libboost_thread1.72 => libboost_stacktrace_noop1.79} (100%)
 rename srcpkgs/{libboost_timer1.72 => libboost_system1.79} (100%)
 rename srcpkgs/{libboost_type_erasure1.72 => libboost_thread1.79} (100%)
 rename srcpkgs/{libboost_unit_test_framework1.72 => libboost_timer1.79} (100%)
 rename srcpkgs/{libboost_wave1.72 => libboost_type_erasure1.79} (100%)
 rename srcpkgs/{libboost_wserialization1.72 => libboost_unit_test_framework1.79} (100%)
 create mode 120000 srcpkgs/libboost_wave1.79
 create mode 120000 srcpkgs/libboost_wserialization1.79

diff --git a/common/shlibs b/common/shlibs
index e04037a9f2f0..4dd00983b54f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -620,38 +620,38 @@ 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.79.0 libboost_context1.79-1.79.0_1
+libboost_coroutine.so.1.79.0 libboost_coroutine1.79-1.79.0_1
+libboost_container.so.1.79.0 libboost_container1.79-1.79.0_1
+libboost_prg_exec_monitor.so.1.79.0 libboost_prg_exec_monitor1.79-1.79.0_1
+libboost_timer.so.1.79.0 libboost_timer1.79-1.79.0_1
+libboost_random.so.1.79.0 libboost_random1.79-1.79.0_1
+libboost_filesystem.so.1.79.0 libboost_filesystem1.79-1.79.0_1
+libboost_unit_test_framework.so.1.79.0 libboost_unit_test_framework1.79-1.79.0_1
+libboost_math_c99.so.1.79.0 libboost_math_c99-1.79-1.79.0_1
+libboost_math_tr1.so.1.79.0 libboost_math_tr1-1.79-1.79.0_1
+libboost_regex.so.1.79.0 libboost_regex1.79-1.79.0_1
+libboost_serialization.so.1.79.0 libboost_serialization1.79-1.79.0_1
+libboost_chrono.so.1.79.0 libboost_chrono1.79-1.79.0_1
+libboost_wserialization.so.1.79.0 libboost_wserialization1.79-1.79.0_1
+libboost_graph.so.1.79.0 libboost_graph1.79-1.79.0_1
+libboost_log.so.1.79.0 libboost_log1.79-1.79.0_1
+libboost_locale.so.1.79.0 libboost_locale1.79-1.79.0_1
+libboost_program_options.so.1.79.0 libboost_program_options1.79-1.79.0_1
+libboost_iostreams.so.1.79.0 libboost_iostreams1.79-1.79.0_1
+libboost_system.so.1.79.0 libboost_system1.79-1.79.0_1
+libboost_thread.so.1.79.0 libboost_thread1.79-1.79.0_1
+libboost_log_setup.so.1.79.0 libboost_log_setup1.79-1.79.0_1
+libboost_date_time.so.1.79.0 libboost_date_time1.79-1.79.0_1
+libboost_wave.so.1.79.0 libboost_wave1.79-1.79.0_1
+libboost_atomic.so.1.79.0 libboost_atomic1.79-1.79.0_1
+libboost_type_erasure.so.1.79.0 libboost_type_erasure1.79-1.79.0_1
+libboost_fiber.so.1.79.0 libboost_fiber1.79-1.79.0_1
+libboost_stacktrace_noop.so.1.79.0 libboost_stacktrace_noop1.79-1.79.0_1
+libboost_stacktrace_addr2line.so.1.79.0 libboost_stacktrace_addr2line1.79-1.79.0_1
+libboost_stacktrace_basic.so.1.79.0 libboost_stacktrace_basic1.79-1.79.0_1
+libboost_python27.so.1.79.0 boost-python1.79-1.79.0_1
+libboost_python310.so.1.79.0 boost-python3-1.79-1.79.0_1
 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-python1.79
similarity index 100%
rename from srcpkgs/boost-python1.72
rename to srcpkgs/boost-python1.79
diff --git a/srcpkgs/boost-python3-1.72 b/srcpkgs/boost-python3-1.79
similarity index 100%
rename from srcpkgs/boost-python3-1.72
rename to srcpkgs/boost-python3-1.79
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/mips.patch b/srcpkgs/boost/patches/mips.patch
index a10a2122d9c7..8d253fc7c286 100644
--- a/srcpkgs/boost/patches/mips.patch
+++ b/srcpkgs/boost/patches/mips.patch
@@ -3,7 +3,7 @@
 @@ -48,7 +48,7 @@
  #  define cpu_relax() asm volatile ("nop" ::: "memory");
  # endif
- #elif BOOST_ARCH_MIPS
+ #elif BOOST_ARCH_MIPS && (((__mips_isa_rev > 1) && defined(__mips32)) || ((__mips_isa_rev > 2)  && defined(__mips64)))
 -# define cpu_relax() asm volatile ("pause" ::: "memory");
 +# define cpu_relax() asm volatile ("nop" ::: "memory");
  #elif BOOST_ARCH_PPC
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 126c50770b50..ad705311b867 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,8 +1,8 @@
 # Template file for 'boost'
 pkgname=boost
-version=1.72.0
-revision=7
-wrksrc="${pkgname}_${version//\./_}"
+version=1.79.0
+revision=1
+wrksrc="boost_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
 short_desc="Free peer-reviewed portable C++ source libraries"
@@ -10,53 +10,34 @@ 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=475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39
 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"
+subpackages="libboost_program_options1.79 libboost_math_c99f1.79
+ libboost_stacktrace_basic1.79 libboost_stacktrace_noop1.79
+ libboost_iostreams1.79 libboost_math_tr1l1.79 libboost_filesystem1.79
+ libboost_chrono1.79 libboost_math_tr1f1.79 libboost_wave1.79
+ libboost_graph1.79 libboost_locale1.79 libboost_regex1.79
+ libboost_fiber1.79 libboost_type_erasure1.79 libboost_coroutine1.79
+ libboost_atomic1.79 libboost_prg_exec_monitor1.79 libboost_math_c99-1.79
+ boost-python3-1.79 libboost_log_setup1.79 boost-devel
+ libboost_timer1.79 libboost_system1.79 libboost_unit_test_framework1.79
+ libboost_serialization1.79 libboost_math_tr1-1.79 boost-build
+ libboost_math_c99l1.79 boost-python1.79 libboost_contract1.79
+ libboost_date_time1.79 libboost_log1.79 libboost_random1.79
+ libboost_thread1.79 libboost_container1.79 boost-jam
+ libboost_wserialization1.79 libboost_context1.79 libboost_json1.79
+ libboost_nowide1.79"
 
 if [ -z "$CROSS_BUILD" ]; then
-	subpackages+=" libboost_stacktrace_addr2line1.72"
+	subpackages+=" libboost_stacktrace_addr2line1.79"
 fi
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*)    _arch=x86;      _abi=sysv  ;;
-	x86_64*)  _arch=x86;      _abi=sysv  ;;
-	arm*)     _arch=arm;      _abi=aapcs ;;
-	aarch64*) _arch=arm;      _abi=aapcs ;;
-	mips*)    _arch=mips32r2; _abi=o32   ;;
-	ppc*)     _arch=power;    _abi=sysv  ;;
+	i686*|x86_64*) _arch=x86;      _abi=sysv  ;;
+	arm*|aarch64*) _arch=arm;      _abi=aapcs ;;
+	mips*)         _arch=mips32r2; _abi=o32   ;;
+	ppc*)          _arch=power;    _abi=sysv  ;;
 esac
 
 do_build() {
@@ -66,7 +47,7 @@ do_build() {
 	(
 	# Rebuild bjam for target
 	cd tools/build/src/engine
-	./build.sh gcc
+	./build.sh --cxx="${CXX}" --cxxflags="${CXXFLAGS}" gcc
 	)
 	cat > user-config.jam <<-__EOF
 	using gcc : : ${CXX} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
@@ -74,10 +55,8 @@ do_build() {
 	using python : ${py3_ver} : ${XBPS_CROSS_BASE}/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} \
 		threading=multi runtime-link=shared link=shared,static
 }
@@ -119,7 +98,7 @@ boost-jam_package() {
 		vmove usr/bin/b2
 	}
 }
-boost-python1.72_package() {
+boost-python1.79_package() {
 	depends="boost python"
 	replaces="boost-python>=0"
 	short_desc+=" - Python bindings"
@@ -127,7 +106,7 @@ boost-python1.72_package() {
 		vmove "usr/lib/libboost_python2*.so.*"
 	}
 }
-boost-python3-1.72_package() {
+boost-python3-1.79_package() {
 	depends="boost python3"
 	replaces="boost-python3>=0"
 	short_desc+=" - Python3 bindings"
@@ -154,7 +133,7 @@ boost-devel_package() {
 	}
 }
 
-libboost_atomic1.72_package() {
+libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
@@ -162,7 +141,7 @@ libboost_atomic1.72_package() {
 	}
 }
 
-libboost_chrono1.72_package() {
+libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
@@ -170,7 +149,7 @@ libboost_chrono1.72_package() {
 	}
 }
 
-libboost_container1.72_package() {
+libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
@@ -178,7 +157,7 @@ libboost_container1.72_package() {
 	}
 }
 
-libboost_context1.72_package() {
+libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
@@ -186,7 +165,7 @@ libboost_context1.72_package() {
 	}
 }
 
-libboost_contract1.72_package() {
+libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
@@ -194,7 +173,7 @@ libboost_contract1.72_package() {
 	}
 }
 
-libboost_coroutine1.72_package() {
+libboost_coroutine1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
@@ -202,7 +181,7 @@ libboost_coroutine1.72_package() {
 	}
 }
 
-libboost_date_time1.72_package() {
+libboost_date_time1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
@@ -210,7 +189,7 @@ libboost_date_time1.72_package() {
 	}
 }
 
-libboost_fiber1.72_package() {
+libboost_fiber1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_fiber"
 	pkg_install() {
@@ -218,7 +197,7 @@ libboost_fiber1.72_package() {
 	}
 }
 
-libboost_filesystem1.72_package() {
+libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
@@ -226,7 +205,7 @@ libboost_filesystem1.72_package() {
 	}
 }
 
-libboost_graph1.72_package() {
+libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
@@ -234,7 +213,7 @@ libboost_graph1.72_package() {
 	}
 }
 
-libboost_iostreams1.72_package() {
+libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
@@ -242,7 +221,7 @@ libboost_iostreams1.72_package() {
 	}
 }
 
-libboost_locale1.72_package() {
+libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
@@ -250,7 +229,7 @@ libboost_locale1.72_package() {
 	}
 }
 
-libboost_log1.72_package() {
+libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
@@ -258,7 +237,7 @@ libboost_log1.72_package() {
 	}
 }
 
-libboost_log_setup1.72_package() {
+libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
@@ -266,7 +245,7 @@ libboost_log_setup1.72_package() {
 	}
 }
 
-libboost_math_c991.72_package() {
+libboost_math_c99-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
@@ -274,7 +253,7 @@ libboost_math_c991.72_package() {
 	}
 }
 
-libboost_math_c99f1.72_package() {
+libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
@@ -282,7 +261,7 @@ libboost_math_c99f1.72_package() {
 	}
 }
 
-libboost_math_c99l1.72_package() {
+libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
@@ -290,7 +269,7 @@ libboost_math_c99l1.72_package() {
 	}
 }
 
-libboost_math_tr11.72_package() {
+libboost_math_tr1-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
@@ -298,7 +277,7 @@ libboost_math_tr11.72_package() {
 	}
 }
 
-libboost_math_tr1f1.72_package() {
+libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
@@ -306,7 +285,7 @@ libboost_math_tr1f1.72_package() {
 	}
 }
 
-libboost_math_tr1l1.72_package() {
+libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
@@ -314,7 +293,7 @@ libboost_math_tr1l1.72_package() {
 	}
 }
 
-libboost_prg_exec_monitor1.72_package() {
+libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
@@ -322,7 +301,7 @@ libboost_prg_exec_monitor1.72_package() {
 	}
 }
 
-libboost_program_options1.72_package() {
+libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
@@ -330,7 +309,7 @@ libboost_program_options1.72_package() {
 	}
 }
 
-libboost_random1.72_package() {
+libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
@@ -338,7 +317,7 @@ libboost_random1.72_package() {
 	}
 }
 
-libboost_regex1.72_package() {
+libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
@@ -346,7 +325,7 @@ libboost_regex1.72_package() {
 	}
 }
 
-libboost_serialization1.72_package() {
+libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
@@ -354,7 +333,7 @@ libboost_serialization1.72_package() {
 	}
 }
 
-libboost_stacktrace_addr2line1.72_package() {
+libboost_stacktrace_addr2line1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_addr2line"
 	pkg_install() {
@@ -362,7 +341,7 @@ libboost_stacktrace_addr2line1.72_package() {
 	}
 }
 
-libboost_stacktrace_basic1.72_package() {
+libboost_stacktrace_basic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_basic"
 	pkg_install() {
@@ -370,7 +349,7 @@ libboost_stacktrace_basic1.72_package() {
 	}
 }
 
-libboost_stacktrace_noop1.72_package() {
+libboost_stacktrace_noop1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_noop"
 	pkg_install() {
@@ -378,7 +357,7 @@ libboost_stacktrace_noop1.72_package() {
 	}
 }
 
-libboost_system1.72_package() {
+libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
@@ -386,7 +365,7 @@ libboost_system1.72_package() {
 	}
 }
 
-libboost_thread1.72_package() {
+libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
@@ -394,7 +373,7 @@ libboost_thread1.72_package() {
 	}
 }
 
-libboost_timer1.72_package() {
+libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
@@ -402,7 +381,7 @@ libboost_timer1.72_package() {
 	}
 }
 
-libboost_type_erasure1.72_package() {
+libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
@@ -410,7 +389,7 @@ libboost_type_erasure1.72_package() {
 	}
 }
 
-libboost_unit_test_framework1.72_package() {
+libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
@@ -418,7 +397,7 @@ libboost_unit_test_framework1.72_package() {
 	}
 }
 
-libboost_wave1.72_package() {
+libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
@@ -426,10 +405,26 @@ libboost_wave1.72_package() {
 	}
 }
 
-libboost_wserialization1.72_package() {
+libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
 		vmove usr/lib/libboost_wserialization.so.*
 	}
 }
+
+libboost_json1.79_package() {
+	depends="boost"
+	short_desc+=" - libboost_json"
+	pkg_install() {
+		vmove "usr/lib/libboost_json.so.*"
+	}
+}
+
+libboost_nowide1.79_package() {
+	depends="boost"
+	short_desc+=" - libboost_nowide"
+	pkg_install() {
+		vmove "usr/lib/libboost_nowide.so.*"
+	}
+}
diff --git a/srcpkgs/libboost_atomic1.72 b/srcpkgs/libboost_atomic1.79
similarity index 100%
rename from srcpkgs/libboost_atomic1.72
rename to srcpkgs/libboost_atomic1.79
diff --git a/srcpkgs/libboost_chrono1.72 b/srcpkgs/libboost_chrono1.79
similarity index 100%
rename from srcpkgs/libboost_chrono1.72
rename to srcpkgs/libboost_chrono1.79
diff --git a/srcpkgs/libboost_container1.72 b/srcpkgs/libboost_container1.79
similarity index 100%
rename from srcpkgs/libboost_container1.72
rename to srcpkgs/libboost_container1.79
diff --git a/srcpkgs/libboost_context1.72 b/srcpkgs/libboost_context1.79
similarity index 100%
rename from srcpkgs/libboost_context1.72
rename to srcpkgs/libboost_context1.79
diff --git a/srcpkgs/libboost_contract1.72 b/srcpkgs/libboost_contract1.79
similarity index 100%
rename from srcpkgs/libboost_contract1.72
rename to srcpkgs/libboost_contract1.79
diff --git a/srcpkgs/libboost_coroutine1.72 b/srcpkgs/libboost_coroutine1.79
similarity index 100%
rename from srcpkgs/libboost_coroutine1.72
rename to srcpkgs/libboost_coroutine1.79
diff --git a/srcpkgs/libboost_date_time1.72 b/srcpkgs/libboost_date_time1.79
similarity index 100%
rename from srcpkgs/libboost_date_time1.72
rename to srcpkgs/libboost_date_time1.79
diff --git a/srcpkgs/libboost_fiber1.72 b/srcpkgs/libboost_fiber1.79
similarity index 100%
rename from srcpkgs/libboost_fiber1.72
rename to srcpkgs/libboost_fiber1.79
diff --git a/srcpkgs/libboost_filesystem1.72 b/srcpkgs/libboost_filesystem1.79
similarity index 100%
rename from srcpkgs/libboost_filesystem1.72
rename to srcpkgs/libboost_filesystem1.79
diff --git a/srcpkgs/libboost_graph1.72 b/srcpkgs/libboost_graph1.79
similarity index 100%
rename from srcpkgs/libboost_graph1.72
rename to srcpkgs/libboost_graph1.79
diff --git a/srcpkgs/libboost_iostreams1.72 b/srcpkgs/libboost_iostreams1.79
similarity index 100%
rename from srcpkgs/libboost_iostreams1.72
rename to srcpkgs/libboost_iostreams1.79
diff --git a/srcpkgs/libboost_locale1.72 b/srcpkgs/libboost_json1.79
similarity index 100%
rename from srcpkgs/libboost_locale1.72
rename to srcpkgs/libboost_json1.79
diff --git a/srcpkgs/libboost_log1.72 b/srcpkgs/libboost_locale1.79
similarity index 100%
rename from srcpkgs/libboost_log1.72
rename to srcpkgs/libboost_locale1.79
diff --git a/srcpkgs/libboost_log_setup1.72 b/srcpkgs/libboost_log1.79
similarity index 100%
rename from srcpkgs/libboost_log_setup1.72
rename to srcpkgs/libboost_log1.79
diff --git a/srcpkgs/libboost_math_c991.72 b/srcpkgs/libboost_log_setup1.79
similarity index 100%
rename from srcpkgs/libboost_math_c991.72
rename to srcpkgs/libboost_log_setup1.79
diff --git a/srcpkgs/libboost_math_c99f1.72 b/srcpkgs/libboost_math_c99-1.79
similarity index 100%
rename from srcpkgs/libboost_math_c99f1.72
rename to srcpkgs/libboost_math_c99-1.79
diff --git a/srcpkgs/libboost_math_c99l1.72 b/srcpkgs/libboost_math_c99f1.79
similarity index 100%
rename from srcpkgs/libboost_math_c99l1.72
rename to srcpkgs/libboost_math_c99f1.79
diff --git a/srcpkgs/libboost_math_tr11.72 b/srcpkgs/libboost_math_c99l1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr11.72
rename to srcpkgs/libboost_math_c99l1.79
diff --git a/srcpkgs/libboost_math_tr1f1.72 b/srcpkgs/libboost_math_tr1-1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1f1.72
rename to srcpkgs/libboost_math_tr1-1.79
diff --git a/srcpkgs/libboost_math_tr1l1.72 b/srcpkgs/libboost_math_tr1f1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1l1.72
rename to srcpkgs/libboost_math_tr1f1.79
diff --git a/srcpkgs/libboost_prg_exec_monitor1.72 b/srcpkgs/libboost_math_tr1l1.79
similarity index 100%
rename from srcpkgs/libboost_prg_exec_monitor1.72
rename to srcpkgs/libboost_math_tr1l1.79
diff --git a/srcpkgs/libboost_program_options1.72 b/srcpkgs/libboost_nowide1.79
similarity index 100%
rename from srcpkgs/libboost_program_options1.72
rename to srcpkgs/libboost_nowide1.79
diff --git a/srcpkgs/libboost_random1.72 b/srcpkgs/libboost_prg_exec_monitor1.79
similarity index 100%
rename from srcpkgs/libboost_random1.72
rename to srcpkgs/libboost_prg_exec_monitor1.79
diff --git a/srcpkgs/libboost_regex1.72 b/srcpkgs/libboost_program_options1.79
similarity index 100%
rename from srcpkgs/libboost_regex1.72
rename to srcpkgs/libboost_program_options1.79
diff --git a/srcpkgs/libboost_serialization1.72 b/srcpkgs/libboost_random1.79
similarity index 100%
rename from srcpkgs/libboost_serialization1.72
rename to srcpkgs/libboost_random1.79
diff --git a/srcpkgs/libboost_stacktrace_addr2line1.72 b/srcpkgs/libboost_regex1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_addr2line1.72
rename to srcpkgs/libboost_regex1.79
diff --git a/srcpkgs/libboost_stacktrace_basic1.72 b/srcpkgs/libboost_serialization1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_basic1.72
rename to srcpkgs/libboost_serialization1.79
diff --git a/srcpkgs/libboost_stacktrace_noop1.72 b/srcpkgs/libboost_stacktrace_addr2line1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_noop1.72
rename to srcpkgs/libboost_stacktrace_addr2line1.79
diff --git a/srcpkgs/libboost_system1.72 b/srcpkgs/libboost_stacktrace_basic1.79
similarity index 100%
rename from srcpkgs/libboost_system1.72
rename to srcpkgs/libboost_stacktrace_basic1.79
diff --git a/srcpkgs/libboost_thread1.72 b/srcpkgs/libboost_stacktrace_noop1.79
similarity index 100%
rename from srcpkgs/libboost_thread1.72
rename to srcpkgs/libboost_stacktrace_noop1.79
diff --git a/srcpkgs/libboost_timer1.72 b/srcpkgs/libboost_system1.79
similarity index 100%
rename from srcpkgs/libboost_timer1.72
rename to srcpkgs/libboost_system1.79
diff --git a/srcpkgs/libboost_type_erasure1.72 b/srcpkgs/libboost_thread1.79
similarity index 100%
rename from srcpkgs/libboost_type_erasure1.72
rename to srcpkgs/libboost_thread1.79
diff --git a/srcpkgs/libboost_unit_test_framework1.72 b/srcpkgs/libboost_timer1.79
similarity index 100%
rename from srcpkgs/libboost_unit_test_framework1.72
rename to srcpkgs/libboost_timer1.79
diff --git a/srcpkgs/libboost_wave1.72 b/srcpkgs/libboost_type_erasure1.79
similarity index 100%
rename from srcpkgs/libboost_wave1.72
rename to srcpkgs/libboost_type_erasure1.79
diff --git a/srcpkgs/libboost_wserialization1.72 b/srcpkgs/libboost_unit_test_framework1.79
similarity index 100%
rename from srcpkgs/libboost_wserialization1.72
rename to srcpkgs/libboost_unit_test_framework1.79
diff --git a/srcpkgs/libboost_wave1.79 b/srcpkgs/libboost_wave1.79
new file mode 120000
index 000000000000..baef819c48f6
--- /dev/null
+++ b/srcpkgs/libboost_wave1.79
@@ -0,0 +1 @@
+boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_wserialization1.79 b/srcpkgs/libboost_wserialization1.79
new file mode 120000
index 000000000000..baef819c48f6
--- /dev/null
+++ b/srcpkgs/libboost_wserialization1.79
@@ -0,0 +1 @@
+boost
\ No newline at end of file

From 65964e6332e0de203ca4af2b91c27bb9ede2fb83 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 18:29:05 +0200
Subject: [PATCH 2/5] boost: quote all vmove's with a glob.

---
 srcpkgs/boost/template | 70 +++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index ad705311b867..7a9c1c33fa44 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -137,7 +137,7 @@ libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
-		vmove usr/lib/libboost_atomic.so.*
+		vmove "usr/lib/libboost_atomic.so.*"
 	}
 }
 
@@ -145,7 +145,7 @@ libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
-		vmove usr/lib/libboost_chrono.so.*
+		vmove "usr/lib/libboost_chrono.so.*"
 	}
 }
 
@@ -153,7 +153,7 @@ libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
-		vmove usr/lib/libboost_container.so.*
+		vmove "usr/lib/libboost_container.so.*"
 	}
 }
 
@@ -161,7 +161,7 @@ libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
-		vmove usr/lib/libboost_context.so.*
+		vmove "usr/lib/libboost_context.so.*"
 	}
 }
 
@@ -169,7 +169,7 @@ libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
-		vmove usr/lib/libboost_contract.so.*
+		vmove "usr/lib/libboost_contract.so.*"
 	}
 }
 
@@ -177,7 +177,7 @@ libboost_coroutine1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
-		vmove usr/lib/libboost_coroutine.so.*
+		vmove "usr/lib/libboost_coroutine.so.*"
 	}
 }
 
@@ -185,7 +185,7 @@ libboost_date_time1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
-		vmove usr/lib/libboost_date_time.so.*
+		vmove "usr/lib/libboost_date_time.so.*"
 	}
 }
 
@@ -193,7 +193,7 @@ libboost_fiber1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_fiber"
 	pkg_install() {
-		vmove usr/lib/libboost_fiber.so.*
+		vmove "usr/lib/libboost_fiber.so.*"
 	}
 }
 
@@ -201,7 +201,7 @@ libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
-		vmove usr/lib/libboost_filesystem.so.*
+		vmove "usr/lib/libboost_filesystem.so.*"
 	}
 }
 
@@ -209,7 +209,7 @@ libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
-		vmove usr/lib/libboost_graph.so.*
+		vmove "usr/lib/libboost_graph.so.*"
 	}
 }
 
@@ -217,7 +217,7 @@ libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
-		vmove usr/lib/libboost_iostreams.so.*
+		vmove "usr/lib/libboost_iostreams.so.*"
 	}
 }
 
@@ -225,7 +225,7 @@ libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
-		vmove usr/lib/libboost_locale.so.*
+		vmove "usr/lib/libboost_locale.so.*"
 	}
 }
 
@@ -233,7 +233,7 @@ libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
-		vmove usr/lib/libboost_log.so.*
+		vmove "usr/lib/libboost_log.so.*"
 	}
 }
 
@@ -241,7 +241,7 @@ libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
-		vmove usr/lib/libboost_log_setup.so.*
+		vmove "usr/lib/libboost_log_setup.so.*"
 	}
 }
 
@@ -249,7 +249,7 @@ libboost_math_c99-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99.so.*
+		vmove "usr/lib/libboost_math_c99.so.*"
 	}
 }
 
@@ -257,7 +257,7 @@ libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99f.so.*
+		vmove "usr/lib/libboost_math_c99f.so.*"
 	}
 }
 
@@ -265,7 +265,7 @@ libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99l.so.*
+		vmove "usr/lib/libboost_math_c99l.so.*"
 	}
 }
 
@@ -273,7 +273,7 @@ libboost_math_tr1-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1.so.*
+		vmove "usr/lib/libboost_math_tr1.so.*"
 	}
 }
 
@@ -281,7 +281,7 @@ libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1f.so.*
+		vmove "usr/lib/libboost_math_tr1f.so.*"
 	}
 }
 
@@ -289,7 +289,7 @@ libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1l.so.*
+		vmove "usr/lib/libboost_math_tr1l.so.*"
 	}
 }
 
@@ -297,7 +297,7 @@ libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
-		vmove usr/lib/libboost_prg_exec_monitor.so.*
+		vmove "usr/lib/libboost_prg_exec_monitor.so.*"
 	}
 }
 
@@ -305,7 +305,7 @@ libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
-		vmove usr/lib/libboost_program_options.so.*
+		vmove "usr/lib/libboost_program_options.so.*"
 	}
 }
 
@@ -313,7 +313,7 @@ libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
-		vmove usr/lib/libboost_random.so.*
+		vmove "usr/lib/libboost_random.so.*"
 	}
 }
 
@@ -321,7 +321,7 @@ libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
-		vmove usr/lib/libboost_regex.so.*
+		vmove "usr/lib/libboost_regex.so.*"
 	}
 }
 
@@ -329,7 +329,7 @@ libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
-		vmove usr/lib/libboost_serialization.so.*
+		vmove "usr/lib/libboost_serialization.so.*"
 	}
 }
 
@@ -337,7 +337,7 @@ libboost_stacktrace_addr2line1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_addr2line"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_addr2line.so.*
+		vmove "usr/lib/libboost_stacktrace_addr2line.so.*"
 	}
 }
 
@@ -345,7 +345,7 @@ libboost_stacktrace_basic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_basic"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_basic.so.*
+		vmove "usr/lib/libboost_stacktrace_basic.so.*"
 	}
 }
 
@@ -353,7 +353,7 @@ libboost_stacktrace_noop1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_noop"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_noop.so.*
+		vmove "usr/lib/libboost_stacktrace_noop.so.*"
 	}
 }
 
@@ -361,7 +361,7 @@ libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
-		vmove usr/lib/libboost_system.so.*
+		vmove "usr/lib/libboost_system.so.*"
 	}
 }
 
@@ -369,7 +369,7 @@ libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
-		vmove usr/lib/libboost_thread.so.*
+		vmove "usr/lib/libboost_thread.so.*"
 	}
 }
 
@@ -377,7 +377,7 @@ libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
-		vmove usr/lib/libboost_timer.so.*
+		vmove "usr/lib/libboost_timer.so.*"
 	}
 }
 
@@ -385,7 +385,7 @@ libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
-		vmove usr/lib/libboost_type_erasure.so.*
+		vmove "usr/lib/libboost_type_erasure.so.*"
 	}
 }
 
@@ -393,7 +393,7 @@ libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
-		vmove usr/lib/libboost_unit_test_framework.so.*
+		vmove "usr/lib/libboost_unit_test_framework.so.*"
 	}
 }
 
@@ -401,7 +401,7 @@ libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
-		vmove usr/lib/libboost_wave.so.*
+		vmove "usr/lib/libboost_wave.so.*"
 	}
 }
 
@@ -409,7 +409,7 @@ libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
-		vmove usr/lib/libboost_wserialization.so.*
+		vmove "usr/lib/libboost_wserialization.so.*"
 	}
 }
 

From e6f6ae7ece7a32e024afb818108be305703f77b3 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 26 May 2022 18:52:59 +0300
Subject: [PATCH 3/5] uhd: update to 4.2.0.0.

---
 common/shlibs        | 2 +-
 srcpkgs/uhd/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4dd00983b54f..416f22d54910 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3589,7 +3589,7 @@ libbinpac.so.0 zeek-3.2.4_2
 libllhttp.so.1 llhttp-1.0.1_1
 libpinyin.so.13 libpinyin-2.2.1_1
 libzhuyin.so.13 libzhuyin-2.6.0_3
-libuhd.so.4.0.0 uhd-4.0.0.0_1
+libuhd.so.4.2.0 uhd-4.2.0.0_1
 libeditline.so.1 editline-1.16.0_1
 libgnuradio-rds.so.1 gnuradio-rds-3.8.0_1
 libgnuradio-nrsc5-1.0.0git.so.0.0.0 gnuradio-nrsc5-1.0.0_1
diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template
index 5f043162d7dc..685f877dc380 100644
--- a/srcpkgs/uhd/template
+++ b/srcpkgs/uhd/template
@@ -1,6 +1,6 @@
 # Template file for 'uhd'
 pkgname=uhd
-version=4.0.0.0
+version=4.2.0.0
 revision=1
 build_wrksrc=host
 build_style=cmake
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://files.ettus.com/manual/"
 changelog="https://raw.githubusercontent.com/EttusResearch/uhd/master/CHANGELOG"
 distfiles="https://github.com/EttusResearch/uhd/archive/v${version}.tar.gz"
-checksum=4f3513c43edf0178391ed5755266864532716b8b503bcfb9a983ae6256c51b14
+checksum=ad15cedc8a4b9ba78078f1c4c3c179eff8297a08e44928679de896ca42313e6b
 python_version=3
 
 case "${XBPS_TARGET_MACHINE}" in

From 9f2ef4c2596fc9f51000e4c941e7aece246e4c28 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 26 May 2022 21:37:30 +0300
Subject: [PATCH 4/5] [WIP] gnuradio: update to 3.10.2.0.

This is most certainly a broken updated packaging for now... probably
just needs a bunch of new dependencies to even build anything useful
while if it doesn't find anything it just builds the bare minimum
(e.g. docs), annoying behavior...

[ci skip] the PR is still WIP
---
 ...6495f3bdf579dae0c26531a16f6adcc7fb2f.patch | 46 -------------------
 ...15d0b26b3c72fab736bcd28a67ab9d1404b7.patch | 28 -----------
 ...befbbe54e55fc4994899e92bcf5bf462fa2f.patch | 31 -------------
 srcpkgs/gnuradio/template                     | 20 ++++----
 4 files changed, 11 insertions(+), 114 deletions(-)
 delete mode 100644 srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch
 delete mode 100644 srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch
 delete mode 100644 srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch

diff --git a/srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch b/srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch
deleted file mode 100644
index 51952bd29b38..000000000000
--- a/srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 596c6495f3bdf579dae0c26531a16f6adcc7fb2f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marcus=20M=C3=BCller?= <mmueller@gnuradio.org>
-Date: Mon, 13 Apr 2020 00:11:59 +0200
-Subject: [PATCH] =?UTF-8?q?pmt:=20conditionalize=20testing=20of=20long=20>?=
- =?UTF-8?q?=202=C2=B3=C2=B2=20on=20sizeof(long)?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- gnuradio-runtime/python/pmt/qa_pmt.py | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/gnuradio-runtime/python/pmt/qa_pmt.py b/gnuradio-runtime/python/pmt/qa_pmt.py
-index 884bba7dd4b..44f616cdae1 100644
---- a/gnuradio-runtime/python/pmt/qa_pmt.py
-+++ b/gnuradio-runtime/python/pmt/qa_pmt.py
-@@ -18,6 +18,10 @@ class test_pmt(unittest.TestCase):
-     MAXINT32 = (2**31)-1
-     MININT32 = (-MAXINT32)-1
- 
-+    def setUp(self):
-+        from ctypes import sizeof, c_long
-+        self.sizeof_long = sizeof(c_long)
-+
-     def test01(self):
-         a = pmt.intern("a")
-         b = pmt.from_double(123765)
-@@ -112,6 +116,8 @@ def test14(self):
-         self.assertEqual(const,pmt.to_long(deser))
- 
-     def test15(self):
-+        if(self.sizeof_long <= 4):
-+            return
-         const = self.MAXINT32 + 1
-         x_pmt = pmt.from_long(const)
-         s = pmt.serialize_str(x_pmt)
-@@ -137,6 +143,8 @@ def test17(self):
-         self.assertEqual(const, x_long)
- 
-     def test18(self):
-+        if(self.sizeof_long <= 4):
-+            return
-         const = self.MININT32 - 1
-         x_pmt = pmt.from_long(const)
-         s = pmt.serialize_str(x_pmt)
diff --git a/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch b/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch
deleted file mode 100644
index c49a047427e8..000000000000
--- a/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7 Mon Sep 17 00:00:00 2001
-From: John Sallay <jasallay@gmail.com>
-Date: Sat, 23 Oct 2021 08:26:42 -0400
-Subject: [PATCH] Fix issue 4595 qa_agc Assertion Error.
-
-The number of input elements needs to be disivible by volk_alignment, which it wasn't
-for machines with 512-bit registers.
-
-Signed-off-by: John Sallay <jasallay@gmail.com>
----
- gr-analog/python/analog/qa_agc.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/gr-analog/python/analog/qa_agc.py b/gr-analog/python/analog/qa_agc.py
-index a5a8ea47b6a..9368dd5d2a8 100644
---- a/gr-analog/python/analog/qa_agc.py
-+++ b/gr-analog/python/analog/qa_agc.py
-@@ -454,7 +454,9 @@ def test_006(self):
-         tb = self.tb
- 
-         sampling_freq = 100
--        N = int(5*sampling_freq)
-+        # N must by a multiple of the volk_alignment of the system for this test to work.
-+        # For a machine with 512-bit registers, that would be 8 complex-floats.
-+        N = int(8 * sampling_freq)
-         src1 = analog.sig_source_c(sampling_freq, analog.GR_SIN_WAVE,
-                                    sampling_freq * 0.10, 100)
-         dst1 = blocks.vector_sink_c()
diff --git a/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch b/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch
deleted file mode 100644
index 4faa3468140a..000000000000
--- a/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f259befbbe54e55fc4994899e92bcf5bf462fa2f Mon Sep 17 00:00:00 2001
-From: alekhgupta1441 <alekhgupta1441@gmail.com>
-Date: Sun, 12 Apr 2020 03:48:14 +0530
-Subject: [PATCH] gr-digital/python : Updated soft_dec_lut_gen.py
-
----
- gr-digital/python/digital/soft_dec_lut_gen.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gr-digital/python/digital/soft_dec_lut_gen.py b/gr-digital/python/digital/soft_dec_lut_gen.py
-index 4503c4fea7b..84f6de66e45 100644
---- a/gr-digital/python/digital/soft_dec_lut_gen.py
-+++ b/gr-digital/python/digital/soft_dec_lut_gen.py
-@@ -73,7 +73,7 @@ def soft_dec_table_generator(soft_dec_gen, prec, Es=1):
- 
-     '''
- 
--    npts = 2.0**prec
-+    npts = int(2.0**prec)
-     maxd = Es*numpy.sqrt(2.0)/2.0
-     yrng = numpy.linspace(-maxd, maxd, npts)
-     xrng = numpy.linspace(-maxd, maxd, npts)
-@@ -110,7 +110,7 @@ def soft_dec_table(constel, symbols, prec, npwr=1):
-     re_max = max(numpy.array(constel).real)
-     im_max = max(numpy.array(constel).imag)
- 
--    npts = 2.0**prec
-+    npts = int(2.0**prec)
-     yrng = numpy.linspace(im_min, im_max, npts)
-     xrng = numpy.linspace(re_min, re_max, npts)
- 
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index c950b53e8bea..b47325cb6034 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,10 +1,12 @@
 # Template file for 'gnuradio'
 pkgname=gnuradio
-version=3.8.0.0
-revision=9
+version=3.10.2.0
+revision=1
 build_style=cmake
-conf_files="/etc/gnuradio/conf.d/*"
-configure_args="-DENABLE_INTERNAL_VOLK=OFF -DGR_PYTHON_DIR=/${py3_sitelib}"
+# FIXME: '/etc/gnuradio/conf.d/*' configuration file not in PKGDESTDIR!
+#conf_files="/etc/gnuradio/conf.d/*"
+configure_args="-DGR_PYTHON_DIR=/${py3_sitelib}"
+# TODO: https://pypi.org/project/schema/ as new build/runtime dep since v3.10.2.0?
 hostmakedepends="pkg-config doxygen swig python3-Mako python3-Sphinx
  python3-cairo python3-numpy python3-yaml texlive texlive-latexextra texlive-dvi"
 makedepends="SDL-devel boost-devel fftw-devel gsl-devel jack-devel
@@ -18,12 +20,10 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnuradio.org"
 distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=03fd01f0b27033befb91709b3d56f95e0869b5fb8bc71bec2662266a3f0dedf5
+checksum=a8f6c1cc98bc3784aa70ab29d3039ad6922ec36f908ecfb2c904a597b32c0776
 python_version=3
 
 post_install() {
-	rm ${DESTDIR}/usr/share/gnuradio/examples/audio/dial_tone \
-		${DESTDIR}/usr/share/gnuradio/examples/uhd/tags_demo
 	vinstall grc/scripts/freedesktop/gnuradio-grc.desktop 644 \
 		usr/share/applications
 	vinstall grc/scripts/freedesktop/gnuradio_logo_icon-square.svg 644 \
@@ -42,8 +42,10 @@ gnuradio-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove "usr/lib/*.so"
+		# FIXME: there's no shared objects at all anymore?!
+		#vmove "usr/lib/*.so"
 		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
+		# FIXME: it looks like pkgconfig files aren't installed even though *.pc.in files do exist
+		#vmove usr/lib/pkgconfig
 	}
 }

From 871db95796135316a524ea5dff481456a08a9547 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 9 Jun 2022 02:43:52 +0300
Subject: [PATCH 5/5] [WIP] Aegisub: upgrade to 3.3.2r8112.

WIP because upstream should really make a new release, packaging tip of
dev branch just to be able to build is kind of dumb.

This also seemed to fix cross builds as tested from x86_64-musl host to
aarch64-musl target.
---
 .../allow-cmake-builds-from-tarball.patch     | 56 --------------
 .../remove-busted-luajit-vendor-pt2.patch     | 11 +++
 .../patches/remove-busted-luajit-vendor.patch | 75 ++++++++++++-------
 srcpkgs/Aegisub/template                      | 14 ++--
 4 files changed, 67 insertions(+), 89 deletions(-)
 delete mode 100644 srcpkgs/Aegisub/patches/allow-cmake-builds-from-tarball.patch
 create mode 100644 srcpkgs/Aegisub/patches/remove-busted-luajit-vendor-pt2.patch

diff --git a/srcpkgs/Aegisub/patches/allow-cmake-builds-from-tarball.patch b/srcpkgs/Aegisub/patches/allow-cmake-builds-from-tarball.patch
deleted file mode 100644
index 705965ca1df9..000000000000
--- a/srcpkgs/Aegisub/patches/allow-cmake-builds-from-tarball.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From dee94396eee4b67eafae7f00e540cb284769473d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Wed, 15 Sep 2021 23:54:10 -0300
-Subject: [PATCH] Allow CMake builds from tarball.
-
-Add environment variable that can be passed to build/version.sh to force
-a git version if it can't use git to determine one.
-
-Since we are here, also fix:
-
-- use of 'return' in a script, should be 'exit'
-- wrong grep command to match numerical version with 3 digits
----
- build/version.sh | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/build/version.sh b/build/version.sh
-index 8cea0a3f3..d505341e4 100755
---- a/build/version.sh
-+++ b/build/version.sh
-@@ -10,13 +10,13 @@ if ! test -d "${srcdir}/.git"; then
-     done < "${version_h_path}"
-     if test x$BUILD_GIT_VERSION_NUMBER != x -a x$BUILD_GIT_VERSION_STRING != x; then
-       export VERSION_SOURCE="from cached git_version.h"
--      return 0
-+      exit 0
-     else
-       echo "invalid git_version.h"
-       exit 2
-     fi
--  else
--    echo "git repo not found and no cached git_version.h"
-+  elif [ -z "$FORCE_GIT_VERSION" ]; then
-+    echo "git repo not found and no cached git_version.h - use FORCE_GIT_VERSION to override"
-     exit 2
-   fi
- fi
-@@ -25,13 +25,13 @@ last_svn_revision=6962
- last_svn_hash="16cd907fe7482cb54a7374cd28b8501f138116be"
- 
- git_revision=$(expr $last_svn_revision + $(git log --pretty=oneline $last_svn_hash..HEAD 2>/dev/null | wc -l))
--git_version_str=$(git describe --exact-match 2> /dev/null)
-+git_version_str=${FORCE_GIT_VERSION:-$(git describe --exact-match 2> /dev/null)}
- installer_version='0.0.0'
- resource_version='0, 0, 0'
- if test x$git_version_str != x; then
-   git_version_str="${git_version_str##v}"
-   tagged_release=1
--  if [ $(echo $git_version_str | grep '\d\.\d\.\d') ]; then
-+  if [ $(echo $git_version_str | grep '[0-9].[0-9].[0-9]') ]; then
-     installer_version=$git_version_str
-     resource_version=$(echo $git_version_str | sed 's/\./, /g')
-   fi
--- 
-2.33.0
-
diff --git a/srcpkgs/Aegisub/patches/remove-busted-luajit-vendor-pt2.patch b/srcpkgs/Aegisub/patches/remove-busted-luajit-vendor-pt2.patch
new file mode 100644
index 000000000000..b9faefee2275
--- /dev/null
+++ b/srcpkgs/Aegisub/patches/remove-busted-luajit-vendor-pt2.patch
@@ -0,0 +1,11 @@
+diff --color -ru a/vendor/luabins/CMakeLists.txt b/vendor/luabins/CMakeLists.txt
+--- a/vendor/luabins/CMakeLists.txt	2022-06-09 02:01:24.456929000 +0300
++++ b/vendor/luabins/CMakeLists.txt	2022-06-09 02:09:36.408047000 +0300
+@@ -36,4 +36,5 @@
+     src/savebuffer.c
+     src/write.c
+ )
+-target_link_libraries(luabins PRIVATE luajit)
+\ No newline at end of file
++target_include_directories(luabins PUBLIC ${LUAJIT_INCLUDE_DIRS})
++target_link_libraries(luabins PRIVATE ${LUAJIT_LIBRARIES})
diff --git a/srcpkgs/Aegisub/patches/remove-busted-luajit-vendor.patch b/srcpkgs/Aegisub/patches/remove-busted-luajit-vendor.patch
index 3ee7588647ca..d4ef5804eea2 100644
--- a/srcpkgs/Aegisub/patches/remove-busted-luajit-vendor.patch
+++ b/srcpkgs/Aegisub/patches/remove-busted-luajit-vendor.patch
@@ -12,7 +12,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 4614f6d..0e7bc81 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -3,6 +3,10 @@ cmake_policy(SET CMP0074 NEW)
+@@ -4,6 +4,10 @@
  
  project(Aegisub)
  
@@ -23,10 +23,11 @@ index 4614f6d..0e7bc81 100644
  list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
  
  # Explicitly set the build type to Release if no other type is specified
-@@ -12,181 +16,6 @@ if(NOT CMAKE_BUILD_TYPE)
+@@ -13,210 +17,6 @@
      set(CMAKE_BUILD_TYPE Release)
  endif()
  
+-## Build bundled LuaJIT with aegisub specific patches
 -add_executable(luajit-minilua vendor/luajit/src/host/minilua.c)
 -if(NOT WIN32)
 -    target_link_libraries(luajit-minilua m)
@@ -47,6 +48,22 @@ index 4614f6d..0e7bc81 100644
 -            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
 -        )
 -    endif()
+-elseif(APPLE)
+-    if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64")
+-        add_custom_command(
+-            OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h"
+-            COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen"
+-            COMMAND luajit-minilua ../dynasm/dynasm.lua -D ENDIAN_LE -D P64 -D FFI -D DUALNUM -D FPU -D HFABI -D NO_UNWIND -D VER=80 -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" vm_arm64.dasc
+-            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
+-        )
+-    else()
+-        add_custom_command(
+-            OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h"
+-            COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen"
+-            COMMAND luajit-minilua ../dynasm/dynasm.lua -D P64 -D JIT -D FFI -D FPU -D HFABI -D VER= -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" vm_x64.dasc
+-            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
+-        )
+-    endif()
 -else()
 -    if(CMAKE_SIZEOF_VOID_P EQUAL 8)
 -        add_custom_command(
@@ -76,7 +93,13 @@ index 4614f6d..0e7bc81 100644
 -)
 -target_compile_definitions(luajit-buildvm PRIVATE LUAJIT_ENABLE_LUA52COMPAT)
 -target_include_directories(luajit-buildvm PRIVATE vendor/luajit/src "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen")
--if(UNIX)
+-
+-if(APPLE)
+-    add_custom_command(
+-        OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s"
+-        COMMAND luajit-buildvm -m machasm -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s"
+-    )
+-elseif(UNIX)
 -    add_custom_command(
 -        OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s"
 -        COMMAND luajit-buildvm -m elfasm -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s"
@@ -197,21 +220,32 @@ index 4614f6d..0e7bc81 100644
 -if(WIN32)
 -    target_sources(luajit PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.obj")
 -else()
+-    enable_language(ASM)
 -    target_sources(luajit PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s")
--    set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s" PROPERTY LANGUAGE C)
 -    target_link_libraries(luajit ${CMAKE_DL_LIBS})
 -endif()
+-if(APPLE)
+-    if(NOT CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64")
+-        target_compile_definitions(luajit-buildvm PRIVATE LUAJIT_ENABLE_GC64)
+-        target_compile_definitions(luajit PRIVATE LUAJIT_ENABLE_GC64)
+-    endif()
+-endif()
 -
  add_subdirectory(vendor/luabins)
  
- add_library(libaegisub STATIC
-@@ -264,20 +93,20 @@ elseif(WIN32)
+ ## libaegisub
+@@ -303,25 +103,25 @@
  endif()
  set_target_properties(libaegisub PROPERTIES PREFIX "")
  target_compile_definitions(libaegisub PRIVATE CMAKE_BUILD)
 -target_include_directories(libaegisub PUBLIC "libaegisub/include")
 +target_include_directories(libaegisub PUBLIC ${LUAJIT_INCLUDE_DIRS} "libaegisub/include")
- target_precompile_headers(libaegisub PRIVATE "libaegisub/lagi_pre.h")
+ if(APPLE)
+     # CMake on macOS currently does not support pch with objc, so use the old way
+     target_compile_options(libaegisub PRIVATE -include "${PROJECT_SOURCE_DIR}/libaegisub/lagi_pre.h")
+ else()
+     target_precompile_headers(libaegisub PRIVATE "libaegisub/lagi_pre.h")
+ endif()
 -target_link_libraries(libaegisub PRIVATE luajit luabins)
 +target_link_libraries(libaegisub PRIVATE ${LUAJIT_LIBRARIES} luabins)
  
@@ -230,7 +264,7 @@ index 4614f6d..0e7bc81 100644
      WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/src/bitmaps
  )
  
-@@ -451,8 +280,9 @@ add_executable(Aegisub WIN32
+@@ -496,8 +296,9 @@
      src/video_slider.cpp
      src/visual_feature.cpp
  )
@@ -239,29 +273,14 @@ index 4614f6d..0e7bc81 100644
  target_compile_definitions(Aegisub PRIVATE CMAKE_BUILD)
 +target_include_directories(Aegisub PUBLIC ${LUAJIT_INCLUDE_DIRS})
  target_include_directories(Aegisub PRIVATE "src/libresrc" "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc")
- target_precompile_headers(Aegisub PRIVATE "src/agi_pre.h")
- 
-@@ -776,7 +606,7 @@ message(STATUS "\n"
-     "  FFTW3:                 ${WITH_FFTW3}\n"
+ if(APPLE)
+     # CMake on macOS currently does not support pch with objc, so use the old way
+@@ -877,7 +678,7 @@
      "  Hunspell:              ${WITH_HUNSPELL}\n"
      "  uchardet:              ${WITH_UCHARDET}\n"
+     "  wxStyledTextCtrl:      ${WITH_WXSTC}\n"
 -    "  LuaJIT:                bundled\n"
 +    "  LuaJIT:                unfucked\n"
      "\n"
      "Options\n"
-     "  Startup log:           ${WITH_STARTUPLOG}\n"
-diff --git a/vendor/luabins/CMakeLists.txt b/vendor/luabins/CMakeLists.txt
-index 1fe1d20..e68403c 100644
---- a/vendor/luabins/CMakeLists.txt
-+++ b/vendor/luabins/CMakeLists.txt
-@@ -36,4 +36,5 @@ add_library(luabins STATIC
-     src/savebuffer.c
-     src/write.c
- )
--target_link_libraries(luabins PRIVATE luajit)
-\ No newline at end of file
-+target_include_directories(luabins PUBLIC ${LUAJIT_INCLUDE_DIRS})
-+target_link_libraries(luabins PRIVATE ${LUAJIT_LIBRARIES})
--- 
-2.33.0
-
+     "  Translations:          ${WITH_TRANSLATION}\n"
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 1583c4853b9b..86f9b8312226 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,12 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
-version=3.3.2
-revision=3
+# FIXME: wait for new upstream release, v3.3.2 tag doesn't link against modern boost!
+# /usr/bin/ld: CMakeFiles/Aegisub.dir/src/search_replace_engine.cpp.o: undefined reference to symbol '_ZN6icu_708Collator14createInstanceERKNS_6LocaleER10UErrorCode'
+# /usr/bin/ld: /lib64/libicui18n.so.70: error adding symbols: DSO missing from command line
+version=3.3.2r8112
+revision=1
+_commit=aa1e63f5bfed688711d8b46bf5dbd807d1c07300
+wrksrc="Aegisub-${_commit}"
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 cmake_builddir="BUILD"
@@ -17,9 +22,8 @@ short_desc="Subtitle editor (ssa, ass, srt)"
 maintainer="pudiva <rogi@skylittlesystem.org>"
 license="BSD-3-Clause, MIT"
 homepage="https://github.com/wangqr/Aegisub"
-distfiles="https://github.com/wangqr/Aegisub/archive/v${version}.tar.gz"
-checksum="9aaab8e66cef2a72368c6b7f79b2f99700321a7b9a1ca623c5e6be0e65418db5"
-nocross="lots of errors like: undefined reference to boost::icu_regex_traits::isctype..."
+distfiles="https://github.com/wangqr/Aegisub/archive/${_commit}.tar.gz"
+checksum="a2073a57efa717e7e6ba8021727779e9695601e96127d5d5c4d0fb749174f2b9"
 
 build_options="fftw openal portaudio"
 build_options_default="fftw"

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] boost: update to 1.79.0.
  2022-03-18 14:28 [PR PATCH] boost: update to 1.79.0.b1 JamiKettunen
                   ` (22 preceding siblings ...)
  2022-06-08 23:46 ` JamiKettunen
@ 2022-06-08 23:47 ` JamiKettunen
  2022-06-09  0:26 ` JamiKettunen
                   ` (4 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: JamiKettunen @ 2022-06-08 23:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3887 bytes --]

There is an updated pull request by JamiKettunen against master on the void-packages repository

https://github.com/JamiKettunen/void-packages boost-1.79.0
https://github.com/void-linux/void-packages/pull/36204

boost: update to 1.79.0.
#### Packages to fix (from `xrevshlib boost` as locally build-tested on `x86_64-musl`)
- [x] Aegisub (fails on `do_build()`) - awaiting new upstream release, tip of `dev` branch builds
- [ ] PrusaSlicer (fails on `do_build()`)
- [ ] TSC (fails on `do_build()`)
- [ ] cryfs (fails on `do_build()`)
- [ ] fifengine (fails on `do_build()`)
- [x] uhd (fails on `do_build()`)
  - [ ] gnuradio (failed on `do_build()`, updating to [v3.10.2.0](https://github.com/gnuradio/gnuradio/releases/tag/v3.10.2.0) appears to have disabled building a lot of components including all shared objects and pkg-config files for example, probably just a bunch of missing new "optional" build-time dependencies...)
    - [ ] gnuradio-osmosdr (depends on `gnuradio`)
- [ ] imagescan (fails on `do_build()`)
- [ ] kea (fails on `do_build()`)
- [ ] ledger (fails on `do_build()`)
- [ ] libbitcoin-system (fails on `do_build()`)
  - [ ] libbitcoin-database (depends on `libbitcoin-system`)
    - [ ] libbitcoin-blockchain (depends on `libbitcoin-database`)
      - [ ] libbitcoin-node (depends on `libbitcoin-blockchain`)
      - [ ] libbitcoin-server (depends on `libbitcoin-blockchain`)
  - [ ] libbitcoin-protocol (depends on `libbitcoin-system`)
    - [ ] libbitcoin-client (depends on `libbitcoin-protocol`)
      - [ ] libbitcoin-explorer (depends on `libbitcoin-client`)
  - [ ] libbitcoin-network (depends on `libbitcoin-system`)
- [ ] libetonyek (fails on `do_build()`, appears to need `-std=c++17` or higher? `NUM3Parser.cpp:46:8: error: 'for_each' is not a member of 'std'`)
  - [ ] libreoffice (depends on `libetonyek`)
- [ ] librime (fails on `do_build()`)
- [ ] namecoin (fails on `do_build()`)
- [ ] pulseeffects-legacy (fails on `do_build()`)
- [ ] supercollider (fails on `do_build()`)
- [ ] leatherman (hangs on `do_check()`, test process pinned one core at 100% for 10 minutes)
  - [x] facter (depends on `leatherman`)
- [ ] inkscape (fails on `do_check()`)
- [ ] libtorrent-rasterbar (hangs on `do_check()`, 90/97 test_web_seed_http stuck for 10 minutes)
- [ ] schroot (fails on `do_check()`)
- [ ] bitcoin (fails on `do_check()`)

#### Packages to fix (from `xrevshlib uhd` as locally build-tested on `x86_64-musl`)
- [ ] urh (fails on `do_check()` even after adding `checkdepends="python3-pip"`)

#### Modified patches (boost)
`exec_file.patch`: Removed due to being upstream as https://github.com/boostorg/python/commit/d9f06052e28873037db7f98629bce72182a42410
`mips.patch`: Updated to apply on top of https://github.com/boostorg/fiber/commit/5dc9dabc5d5ff8da53ec897c265c9cba1b6ed0df, not sure if this can be removed now(?)

#### Misc changes
- I've renamed all subpackages of `boost` so that the versioned name doesn't conflict with other numbers and are consistent with the previously existing `boost-python3-1.72`, e.g. `libboost_math_c991.72` is now `libboost_math_c99-1.79` (notice the `-`!)

#### Testing the changes
- I tested the changes in this PR: **NO**

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36204.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boost-1.79.0-36204.patch --]
[-- Type: text/x-diff, Size: 63089 bytes --]

From a1e814cd6b37d103dea38921cf3748bc2b99c735 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 15:28:37 +0200
Subject: [PATCH 1/5] boost: update to 1.79.0.

---
 common/shlibs                                 |  64 +++----
 .../{boost-python1.72 => boost-python1.79}    |   0
 ...{boost-python3-1.72 => boost-python3-1.79} |   0
 srcpkgs/boost/patches/exec_file.patch         |  45 -----
 srcpkgs/boost/patches/mips.patch              |   2 +-
 srcpkgs/boost/template                        | 161 +++++++++---------
 ...ibboost_atomic1.72 => libboost_atomic1.79} |   0
 ...ibboost_chrono1.72 => libboost_chrono1.79} |   0
 ...t_container1.72 => libboost_container1.79} |   0
 ...boost_context1.72 => libboost_context1.79} |   0
 ...ost_contract1.72 => libboost_contract1.79} |   0
 ...t_coroutine1.72 => libboost_coroutine1.79} |   0
 ...t_date_time1.72 => libboost_date_time1.79} |   0
 ...{libboost_fiber1.72 => libboost_fiber1.79} |   0
 ...filesystem1.72 => libboost_filesystem1.79} |   0
 ...{libboost_graph1.72 => libboost_graph1.79} |   0
 ...t_iostreams1.72 => libboost_iostreams1.79} |   0
 ...{libboost_locale1.72 => libboost_json1.79} |   0
 .../{libboost_log1.72 => libboost_locale1.79} |   0
 ...ibboost_log_setup1.72 => libboost_log1.79} |   0
 ...st_math_c991.72 => libboost_log_setup1.79} |   0
 ...t_math_c99f1.72 => libboost_math_c99-1.79} |   0
 ...t_math_c99l1.72 => libboost_math_c99f1.79} |   0
 ...st_math_tr11.72 => libboost_math_c99l1.79} |   0
 ...t_math_tr1f1.72 => libboost_math_tr1-1.79} |   0
 ...t_math_tr1l1.72 => libboost_math_tr1f1.79} |   0
 ...xec_monitor1.72 => libboost_math_tr1l1.79} |   0
 ...rogram_options1.72 => libboost_nowide1.79} |   0
 ...ndom1.72 => libboost_prg_exec_monitor1.79} |   0
 ...regex1.72 => libboost_program_options1.79} |   0
 ..._serialization1.72 => libboost_random1.79} |   0
 ...trace_addr2line1.72 => libboost_regex1.79} |   0
 ...e_basic1.72 => libboost_serialization1.79} |   0
 ...1.72 => libboost_stacktrace_addr2line1.79} |   0
 ...stem1.72 => libboost_stacktrace_basic1.79} |   0
 ...hread1.72 => libboost_stacktrace_noop1.79} |   0
 ...libboost_timer1.72 => libboost_system1.79} |   0
 ...t_type_erasure1.72 => libboost_thread1.79} |   0
 ..._test_framework1.72 => libboost_timer1.79} |   0
 ...ost_wave1.72 => libboost_type_erasure1.79} |   0
 ...n1.72 => libboost_unit_test_framework1.79} |   0
 srcpkgs/libboost_wave1.79                     |   1 +
 srcpkgs/libboost_wserialization1.79           |   1 +
 43 files changed, 113 insertions(+), 161 deletions(-)
 rename srcpkgs/{boost-python1.72 => boost-python1.79} (100%)
 rename srcpkgs/{boost-python3-1.72 => boost-python3-1.79} (100%)
 delete mode 100644 srcpkgs/boost/patches/exec_file.patch
 rename srcpkgs/{libboost_atomic1.72 => libboost_atomic1.79} (100%)
 rename srcpkgs/{libboost_chrono1.72 => libboost_chrono1.79} (100%)
 rename srcpkgs/{libboost_container1.72 => libboost_container1.79} (100%)
 rename srcpkgs/{libboost_context1.72 => libboost_context1.79} (100%)
 rename srcpkgs/{libboost_contract1.72 => libboost_contract1.79} (100%)
 rename srcpkgs/{libboost_coroutine1.72 => libboost_coroutine1.79} (100%)
 rename srcpkgs/{libboost_date_time1.72 => libboost_date_time1.79} (100%)
 rename srcpkgs/{libboost_fiber1.72 => libboost_fiber1.79} (100%)
 rename srcpkgs/{libboost_filesystem1.72 => libboost_filesystem1.79} (100%)
 rename srcpkgs/{libboost_graph1.72 => libboost_graph1.79} (100%)
 rename srcpkgs/{libboost_iostreams1.72 => libboost_iostreams1.79} (100%)
 rename srcpkgs/{libboost_locale1.72 => libboost_json1.79} (100%)
 rename srcpkgs/{libboost_log1.72 => libboost_locale1.79} (100%)
 rename srcpkgs/{libboost_log_setup1.72 => libboost_log1.79} (100%)
 rename srcpkgs/{libboost_math_c991.72 => libboost_log_setup1.79} (100%)
 rename srcpkgs/{libboost_math_c99f1.72 => libboost_math_c99-1.79} (100%)
 rename srcpkgs/{libboost_math_c99l1.72 => libboost_math_c99f1.79} (100%)
 rename srcpkgs/{libboost_math_tr11.72 => libboost_math_c99l1.79} (100%)
 rename srcpkgs/{libboost_math_tr1f1.72 => libboost_math_tr1-1.79} (100%)
 rename srcpkgs/{libboost_math_tr1l1.72 => libboost_math_tr1f1.79} (100%)
 rename srcpkgs/{libboost_prg_exec_monitor1.72 => libboost_math_tr1l1.79} (100%)
 rename srcpkgs/{libboost_program_options1.72 => libboost_nowide1.79} (100%)
 rename srcpkgs/{libboost_random1.72 => libboost_prg_exec_monitor1.79} (100%)
 rename srcpkgs/{libboost_regex1.72 => libboost_program_options1.79} (100%)
 rename srcpkgs/{libboost_serialization1.72 => libboost_random1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_addr2line1.72 => libboost_regex1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_basic1.72 => libboost_serialization1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_noop1.72 => libboost_stacktrace_addr2line1.79} (100%)
 rename srcpkgs/{libboost_system1.72 => libboost_stacktrace_basic1.79} (100%)
 rename srcpkgs/{libboost_thread1.72 => libboost_stacktrace_noop1.79} (100%)
 rename srcpkgs/{libboost_timer1.72 => libboost_system1.79} (100%)
 rename srcpkgs/{libboost_type_erasure1.72 => libboost_thread1.79} (100%)
 rename srcpkgs/{libboost_unit_test_framework1.72 => libboost_timer1.79} (100%)
 rename srcpkgs/{libboost_wave1.72 => libboost_type_erasure1.79} (100%)
 rename srcpkgs/{libboost_wserialization1.72 => libboost_unit_test_framework1.79} (100%)
 create mode 120000 srcpkgs/libboost_wave1.79
 create mode 120000 srcpkgs/libboost_wserialization1.79

diff --git a/common/shlibs b/common/shlibs
index e04037a9f2f0..4dd00983b54f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -620,38 +620,38 @@ 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.79.0 libboost_context1.79-1.79.0_1
+libboost_coroutine.so.1.79.0 libboost_coroutine1.79-1.79.0_1
+libboost_container.so.1.79.0 libboost_container1.79-1.79.0_1
+libboost_prg_exec_monitor.so.1.79.0 libboost_prg_exec_monitor1.79-1.79.0_1
+libboost_timer.so.1.79.0 libboost_timer1.79-1.79.0_1
+libboost_random.so.1.79.0 libboost_random1.79-1.79.0_1
+libboost_filesystem.so.1.79.0 libboost_filesystem1.79-1.79.0_1
+libboost_unit_test_framework.so.1.79.0 libboost_unit_test_framework1.79-1.79.0_1
+libboost_math_c99.so.1.79.0 libboost_math_c99-1.79-1.79.0_1
+libboost_math_tr1.so.1.79.0 libboost_math_tr1-1.79-1.79.0_1
+libboost_regex.so.1.79.0 libboost_regex1.79-1.79.0_1
+libboost_serialization.so.1.79.0 libboost_serialization1.79-1.79.0_1
+libboost_chrono.so.1.79.0 libboost_chrono1.79-1.79.0_1
+libboost_wserialization.so.1.79.0 libboost_wserialization1.79-1.79.0_1
+libboost_graph.so.1.79.0 libboost_graph1.79-1.79.0_1
+libboost_log.so.1.79.0 libboost_log1.79-1.79.0_1
+libboost_locale.so.1.79.0 libboost_locale1.79-1.79.0_1
+libboost_program_options.so.1.79.0 libboost_program_options1.79-1.79.0_1
+libboost_iostreams.so.1.79.0 libboost_iostreams1.79-1.79.0_1
+libboost_system.so.1.79.0 libboost_system1.79-1.79.0_1
+libboost_thread.so.1.79.0 libboost_thread1.79-1.79.0_1
+libboost_log_setup.so.1.79.0 libboost_log_setup1.79-1.79.0_1
+libboost_date_time.so.1.79.0 libboost_date_time1.79-1.79.0_1
+libboost_wave.so.1.79.0 libboost_wave1.79-1.79.0_1
+libboost_atomic.so.1.79.0 libboost_atomic1.79-1.79.0_1
+libboost_type_erasure.so.1.79.0 libboost_type_erasure1.79-1.79.0_1
+libboost_fiber.so.1.79.0 libboost_fiber1.79-1.79.0_1
+libboost_stacktrace_noop.so.1.79.0 libboost_stacktrace_noop1.79-1.79.0_1
+libboost_stacktrace_addr2line.so.1.79.0 libboost_stacktrace_addr2line1.79-1.79.0_1
+libboost_stacktrace_basic.so.1.79.0 libboost_stacktrace_basic1.79-1.79.0_1
+libboost_python27.so.1.79.0 boost-python1.79-1.79.0_1
+libboost_python310.so.1.79.0 boost-python3-1.79-1.79.0_1
 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-python1.79
similarity index 100%
rename from srcpkgs/boost-python1.72
rename to srcpkgs/boost-python1.79
diff --git a/srcpkgs/boost-python3-1.72 b/srcpkgs/boost-python3-1.79
similarity index 100%
rename from srcpkgs/boost-python3-1.72
rename to srcpkgs/boost-python3-1.79
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/mips.patch b/srcpkgs/boost/patches/mips.patch
index a10a2122d9c7..8d253fc7c286 100644
--- a/srcpkgs/boost/patches/mips.patch
+++ b/srcpkgs/boost/patches/mips.patch
@@ -3,7 +3,7 @@
 @@ -48,7 +48,7 @@
  #  define cpu_relax() asm volatile ("nop" ::: "memory");
  # endif
- #elif BOOST_ARCH_MIPS
+ #elif BOOST_ARCH_MIPS && (((__mips_isa_rev > 1) && defined(__mips32)) || ((__mips_isa_rev > 2)  && defined(__mips64)))
 -# define cpu_relax() asm volatile ("pause" ::: "memory");
 +# define cpu_relax() asm volatile ("nop" ::: "memory");
  #elif BOOST_ARCH_PPC
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 126c50770b50..ad705311b867 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,8 +1,8 @@
 # Template file for 'boost'
 pkgname=boost
-version=1.72.0
-revision=7
-wrksrc="${pkgname}_${version//\./_}"
+version=1.79.0
+revision=1
+wrksrc="boost_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
 short_desc="Free peer-reviewed portable C++ source libraries"
@@ -10,53 +10,34 @@ 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=475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39
 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"
+subpackages="libboost_program_options1.79 libboost_math_c99f1.79
+ libboost_stacktrace_basic1.79 libboost_stacktrace_noop1.79
+ libboost_iostreams1.79 libboost_math_tr1l1.79 libboost_filesystem1.79
+ libboost_chrono1.79 libboost_math_tr1f1.79 libboost_wave1.79
+ libboost_graph1.79 libboost_locale1.79 libboost_regex1.79
+ libboost_fiber1.79 libboost_type_erasure1.79 libboost_coroutine1.79
+ libboost_atomic1.79 libboost_prg_exec_monitor1.79 libboost_math_c99-1.79
+ boost-python3-1.79 libboost_log_setup1.79 boost-devel
+ libboost_timer1.79 libboost_system1.79 libboost_unit_test_framework1.79
+ libboost_serialization1.79 libboost_math_tr1-1.79 boost-build
+ libboost_math_c99l1.79 boost-python1.79 libboost_contract1.79
+ libboost_date_time1.79 libboost_log1.79 libboost_random1.79
+ libboost_thread1.79 libboost_container1.79 boost-jam
+ libboost_wserialization1.79 libboost_context1.79 libboost_json1.79
+ libboost_nowide1.79"
 
 if [ -z "$CROSS_BUILD" ]; then
-	subpackages+=" libboost_stacktrace_addr2line1.72"
+	subpackages+=" libboost_stacktrace_addr2line1.79"
 fi
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*)    _arch=x86;      _abi=sysv  ;;
-	x86_64*)  _arch=x86;      _abi=sysv  ;;
-	arm*)     _arch=arm;      _abi=aapcs ;;
-	aarch64*) _arch=arm;      _abi=aapcs ;;
-	mips*)    _arch=mips32r2; _abi=o32   ;;
-	ppc*)     _arch=power;    _abi=sysv  ;;
+	i686*|x86_64*) _arch=x86;      _abi=sysv  ;;
+	arm*|aarch64*) _arch=arm;      _abi=aapcs ;;
+	mips*)         _arch=mips32r2; _abi=o32   ;;
+	ppc*)          _arch=power;    _abi=sysv  ;;
 esac
 
 do_build() {
@@ -66,7 +47,7 @@ do_build() {
 	(
 	# Rebuild bjam for target
 	cd tools/build/src/engine
-	./build.sh gcc
+	./build.sh --cxx="${CXX}" --cxxflags="${CXXFLAGS}" gcc
 	)
 	cat > user-config.jam <<-__EOF
 	using gcc : : ${CXX} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
@@ -74,10 +55,8 @@ do_build() {
 	using python : ${py3_ver} : ${XBPS_CROSS_BASE}/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} \
 		threading=multi runtime-link=shared link=shared,static
 }
@@ -119,7 +98,7 @@ boost-jam_package() {
 		vmove usr/bin/b2
 	}
 }
-boost-python1.72_package() {
+boost-python1.79_package() {
 	depends="boost python"
 	replaces="boost-python>=0"
 	short_desc+=" - Python bindings"
@@ -127,7 +106,7 @@ boost-python1.72_package() {
 		vmove "usr/lib/libboost_python2*.so.*"
 	}
 }
-boost-python3-1.72_package() {
+boost-python3-1.79_package() {
 	depends="boost python3"
 	replaces="boost-python3>=0"
 	short_desc+=" - Python3 bindings"
@@ -154,7 +133,7 @@ boost-devel_package() {
 	}
 }
 
-libboost_atomic1.72_package() {
+libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
@@ -162,7 +141,7 @@ libboost_atomic1.72_package() {
 	}
 }
 
-libboost_chrono1.72_package() {
+libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
@@ -170,7 +149,7 @@ libboost_chrono1.72_package() {
 	}
 }
 
-libboost_container1.72_package() {
+libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
@@ -178,7 +157,7 @@ libboost_container1.72_package() {
 	}
 }
 
-libboost_context1.72_package() {
+libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
@@ -186,7 +165,7 @@ libboost_context1.72_package() {
 	}
 }
 
-libboost_contract1.72_package() {
+libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
@@ -194,7 +173,7 @@ libboost_contract1.72_package() {
 	}
 }
 
-libboost_coroutine1.72_package() {
+libboost_coroutine1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
@@ -202,7 +181,7 @@ libboost_coroutine1.72_package() {
 	}
 }
 
-libboost_date_time1.72_package() {
+libboost_date_time1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
@@ -210,7 +189,7 @@ libboost_date_time1.72_package() {
 	}
 }
 
-libboost_fiber1.72_package() {
+libboost_fiber1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_fiber"
 	pkg_install() {
@@ -218,7 +197,7 @@ libboost_fiber1.72_package() {
 	}
 }
 
-libboost_filesystem1.72_package() {
+libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
@@ -226,7 +205,7 @@ libboost_filesystem1.72_package() {
 	}
 }
 
-libboost_graph1.72_package() {
+libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
@@ -234,7 +213,7 @@ libboost_graph1.72_package() {
 	}
 }
 
-libboost_iostreams1.72_package() {
+libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
@@ -242,7 +221,7 @@ libboost_iostreams1.72_package() {
 	}
 }
 
-libboost_locale1.72_package() {
+libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
@@ -250,7 +229,7 @@ libboost_locale1.72_package() {
 	}
 }
 
-libboost_log1.72_package() {
+libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
@@ -258,7 +237,7 @@ libboost_log1.72_package() {
 	}
 }
 
-libboost_log_setup1.72_package() {
+libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
@@ -266,7 +245,7 @@ libboost_log_setup1.72_package() {
 	}
 }
 
-libboost_math_c991.72_package() {
+libboost_math_c99-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
@@ -274,7 +253,7 @@ libboost_math_c991.72_package() {
 	}
 }
 
-libboost_math_c99f1.72_package() {
+libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
@@ -282,7 +261,7 @@ libboost_math_c99f1.72_package() {
 	}
 }
 
-libboost_math_c99l1.72_package() {
+libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
@@ -290,7 +269,7 @@ libboost_math_c99l1.72_package() {
 	}
 }
 
-libboost_math_tr11.72_package() {
+libboost_math_tr1-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
@@ -298,7 +277,7 @@ libboost_math_tr11.72_package() {
 	}
 }
 
-libboost_math_tr1f1.72_package() {
+libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
@@ -306,7 +285,7 @@ libboost_math_tr1f1.72_package() {
 	}
 }
 
-libboost_math_tr1l1.72_package() {
+libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
@@ -314,7 +293,7 @@ libboost_math_tr1l1.72_package() {
 	}
 }
 
-libboost_prg_exec_monitor1.72_package() {
+libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
@@ -322,7 +301,7 @@ libboost_prg_exec_monitor1.72_package() {
 	}
 }
 
-libboost_program_options1.72_package() {
+libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
@@ -330,7 +309,7 @@ libboost_program_options1.72_package() {
 	}
 }
 
-libboost_random1.72_package() {
+libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
@@ -338,7 +317,7 @@ libboost_random1.72_package() {
 	}
 }
 
-libboost_regex1.72_package() {
+libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
@@ -346,7 +325,7 @@ libboost_regex1.72_package() {
 	}
 }
 
-libboost_serialization1.72_package() {
+libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
@@ -354,7 +333,7 @@ libboost_serialization1.72_package() {
 	}
 }
 
-libboost_stacktrace_addr2line1.72_package() {
+libboost_stacktrace_addr2line1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_addr2line"
 	pkg_install() {
@@ -362,7 +341,7 @@ libboost_stacktrace_addr2line1.72_package() {
 	}
 }
 
-libboost_stacktrace_basic1.72_package() {
+libboost_stacktrace_basic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_basic"
 	pkg_install() {
@@ -370,7 +349,7 @@ libboost_stacktrace_basic1.72_package() {
 	}
 }
 
-libboost_stacktrace_noop1.72_package() {
+libboost_stacktrace_noop1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_noop"
 	pkg_install() {
@@ -378,7 +357,7 @@ libboost_stacktrace_noop1.72_package() {
 	}
 }
 
-libboost_system1.72_package() {
+libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
@@ -386,7 +365,7 @@ libboost_system1.72_package() {
 	}
 }
 
-libboost_thread1.72_package() {
+libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
@@ -394,7 +373,7 @@ libboost_thread1.72_package() {
 	}
 }
 
-libboost_timer1.72_package() {
+libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
@@ -402,7 +381,7 @@ libboost_timer1.72_package() {
 	}
 }
 
-libboost_type_erasure1.72_package() {
+libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
@@ -410,7 +389,7 @@ libboost_type_erasure1.72_package() {
 	}
 }
 
-libboost_unit_test_framework1.72_package() {
+libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
@@ -418,7 +397,7 @@ libboost_unit_test_framework1.72_package() {
 	}
 }
 
-libboost_wave1.72_package() {
+libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
@@ -426,10 +405,26 @@ libboost_wave1.72_package() {
 	}
 }
 
-libboost_wserialization1.72_package() {
+libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
 		vmove usr/lib/libboost_wserialization.so.*
 	}
 }
+
+libboost_json1.79_package() {
+	depends="boost"
+	short_desc+=" - libboost_json"
+	pkg_install() {
+		vmove "usr/lib/libboost_json.so.*"
+	}
+}
+
+libboost_nowide1.79_package() {
+	depends="boost"
+	short_desc+=" - libboost_nowide"
+	pkg_install() {
+		vmove "usr/lib/libboost_nowide.so.*"
+	}
+}
diff --git a/srcpkgs/libboost_atomic1.72 b/srcpkgs/libboost_atomic1.79
similarity index 100%
rename from srcpkgs/libboost_atomic1.72
rename to srcpkgs/libboost_atomic1.79
diff --git a/srcpkgs/libboost_chrono1.72 b/srcpkgs/libboost_chrono1.79
similarity index 100%
rename from srcpkgs/libboost_chrono1.72
rename to srcpkgs/libboost_chrono1.79
diff --git a/srcpkgs/libboost_container1.72 b/srcpkgs/libboost_container1.79
similarity index 100%
rename from srcpkgs/libboost_container1.72
rename to srcpkgs/libboost_container1.79
diff --git a/srcpkgs/libboost_context1.72 b/srcpkgs/libboost_context1.79
similarity index 100%
rename from srcpkgs/libboost_context1.72
rename to srcpkgs/libboost_context1.79
diff --git a/srcpkgs/libboost_contract1.72 b/srcpkgs/libboost_contract1.79
similarity index 100%
rename from srcpkgs/libboost_contract1.72
rename to srcpkgs/libboost_contract1.79
diff --git a/srcpkgs/libboost_coroutine1.72 b/srcpkgs/libboost_coroutine1.79
similarity index 100%
rename from srcpkgs/libboost_coroutine1.72
rename to srcpkgs/libboost_coroutine1.79
diff --git a/srcpkgs/libboost_date_time1.72 b/srcpkgs/libboost_date_time1.79
similarity index 100%
rename from srcpkgs/libboost_date_time1.72
rename to srcpkgs/libboost_date_time1.79
diff --git a/srcpkgs/libboost_fiber1.72 b/srcpkgs/libboost_fiber1.79
similarity index 100%
rename from srcpkgs/libboost_fiber1.72
rename to srcpkgs/libboost_fiber1.79
diff --git a/srcpkgs/libboost_filesystem1.72 b/srcpkgs/libboost_filesystem1.79
similarity index 100%
rename from srcpkgs/libboost_filesystem1.72
rename to srcpkgs/libboost_filesystem1.79
diff --git a/srcpkgs/libboost_graph1.72 b/srcpkgs/libboost_graph1.79
similarity index 100%
rename from srcpkgs/libboost_graph1.72
rename to srcpkgs/libboost_graph1.79
diff --git a/srcpkgs/libboost_iostreams1.72 b/srcpkgs/libboost_iostreams1.79
similarity index 100%
rename from srcpkgs/libboost_iostreams1.72
rename to srcpkgs/libboost_iostreams1.79
diff --git a/srcpkgs/libboost_locale1.72 b/srcpkgs/libboost_json1.79
similarity index 100%
rename from srcpkgs/libboost_locale1.72
rename to srcpkgs/libboost_json1.79
diff --git a/srcpkgs/libboost_log1.72 b/srcpkgs/libboost_locale1.79
similarity index 100%
rename from srcpkgs/libboost_log1.72
rename to srcpkgs/libboost_locale1.79
diff --git a/srcpkgs/libboost_log_setup1.72 b/srcpkgs/libboost_log1.79
similarity index 100%
rename from srcpkgs/libboost_log_setup1.72
rename to srcpkgs/libboost_log1.79
diff --git a/srcpkgs/libboost_math_c991.72 b/srcpkgs/libboost_log_setup1.79
similarity index 100%
rename from srcpkgs/libboost_math_c991.72
rename to srcpkgs/libboost_log_setup1.79
diff --git a/srcpkgs/libboost_math_c99f1.72 b/srcpkgs/libboost_math_c99-1.79
similarity index 100%
rename from srcpkgs/libboost_math_c99f1.72
rename to srcpkgs/libboost_math_c99-1.79
diff --git a/srcpkgs/libboost_math_c99l1.72 b/srcpkgs/libboost_math_c99f1.79
similarity index 100%
rename from srcpkgs/libboost_math_c99l1.72
rename to srcpkgs/libboost_math_c99f1.79
diff --git a/srcpkgs/libboost_math_tr11.72 b/srcpkgs/libboost_math_c99l1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr11.72
rename to srcpkgs/libboost_math_c99l1.79
diff --git a/srcpkgs/libboost_math_tr1f1.72 b/srcpkgs/libboost_math_tr1-1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1f1.72
rename to srcpkgs/libboost_math_tr1-1.79
diff --git a/srcpkgs/libboost_math_tr1l1.72 b/srcpkgs/libboost_math_tr1f1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1l1.72
rename to srcpkgs/libboost_math_tr1f1.79
diff --git a/srcpkgs/libboost_prg_exec_monitor1.72 b/srcpkgs/libboost_math_tr1l1.79
similarity index 100%
rename from srcpkgs/libboost_prg_exec_monitor1.72
rename to srcpkgs/libboost_math_tr1l1.79
diff --git a/srcpkgs/libboost_program_options1.72 b/srcpkgs/libboost_nowide1.79
similarity index 100%
rename from srcpkgs/libboost_program_options1.72
rename to srcpkgs/libboost_nowide1.79
diff --git a/srcpkgs/libboost_random1.72 b/srcpkgs/libboost_prg_exec_monitor1.79
similarity index 100%
rename from srcpkgs/libboost_random1.72
rename to srcpkgs/libboost_prg_exec_monitor1.79
diff --git a/srcpkgs/libboost_regex1.72 b/srcpkgs/libboost_program_options1.79
similarity index 100%
rename from srcpkgs/libboost_regex1.72
rename to srcpkgs/libboost_program_options1.79
diff --git a/srcpkgs/libboost_serialization1.72 b/srcpkgs/libboost_random1.79
similarity index 100%
rename from srcpkgs/libboost_serialization1.72
rename to srcpkgs/libboost_random1.79
diff --git a/srcpkgs/libboost_stacktrace_addr2line1.72 b/srcpkgs/libboost_regex1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_addr2line1.72
rename to srcpkgs/libboost_regex1.79
diff --git a/srcpkgs/libboost_stacktrace_basic1.72 b/srcpkgs/libboost_serialization1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_basic1.72
rename to srcpkgs/libboost_serialization1.79
diff --git a/srcpkgs/libboost_stacktrace_noop1.72 b/srcpkgs/libboost_stacktrace_addr2line1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_noop1.72
rename to srcpkgs/libboost_stacktrace_addr2line1.79
diff --git a/srcpkgs/libboost_system1.72 b/srcpkgs/libboost_stacktrace_basic1.79
similarity index 100%
rename from srcpkgs/libboost_system1.72
rename to srcpkgs/libboost_stacktrace_basic1.79
diff --git a/srcpkgs/libboost_thread1.72 b/srcpkgs/libboost_stacktrace_noop1.79
similarity index 100%
rename from srcpkgs/libboost_thread1.72
rename to srcpkgs/libboost_stacktrace_noop1.79
diff --git a/srcpkgs/libboost_timer1.72 b/srcpkgs/libboost_system1.79
similarity index 100%
rename from srcpkgs/libboost_timer1.72
rename to srcpkgs/libboost_system1.79
diff --git a/srcpkgs/libboost_type_erasure1.72 b/srcpkgs/libboost_thread1.79
similarity index 100%
rename from srcpkgs/libboost_type_erasure1.72
rename to srcpkgs/libboost_thread1.79
diff --git a/srcpkgs/libboost_unit_test_framework1.72 b/srcpkgs/libboost_timer1.79
similarity index 100%
rename from srcpkgs/libboost_unit_test_framework1.72
rename to srcpkgs/libboost_timer1.79
diff --git a/srcpkgs/libboost_wave1.72 b/srcpkgs/libboost_type_erasure1.79
similarity index 100%
rename from srcpkgs/libboost_wave1.72
rename to srcpkgs/libboost_type_erasure1.79
diff --git a/srcpkgs/libboost_wserialization1.72 b/srcpkgs/libboost_unit_test_framework1.79
similarity index 100%
rename from srcpkgs/libboost_wserialization1.72
rename to srcpkgs/libboost_unit_test_framework1.79
diff --git a/srcpkgs/libboost_wave1.79 b/srcpkgs/libboost_wave1.79
new file mode 120000
index 000000000000..baef819c48f6
--- /dev/null
+++ b/srcpkgs/libboost_wave1.79
@@ -0,0 +1 @@
+boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_wserialization1.79 b/srcpkgs/libboost_wserialization1.79
new file mode 120000
index 000000000000..baef819c48f6
--- /dev/null
+++ b/srcpkgs/libboost_wserialization1.79
@@ -0,0 +1 @@
+boost
\ No newline at end of file

From 65964e6332e0de203ca4af2b91c27bb9ede2fb83 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 18:29:05 +0200
Subject: [PATCH 2/5] boost: quote all vmove's with a glob.

---
 srcpkgs/boost/template | 70 +++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index ad705311b867..7a9c1c33fa44 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -137,7 +137,7 @@ libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
-		vmove usr/lib/libboost_atomic.so.*
+		vmove "usr/lib/libboost_atomic.so.*"
 	}
 }
 
@@ -145,7 +145,7 @@ libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
-		vmove usr/lib/libboost_chrono.so.*
+		vmove "usr/lib/libboost_chrono.so.*"
 	}
 }
 
@@ -153,7 +153,7 @@ libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
-		vmove usr/lib/libboost_container.so.*
+		vmove "usr/lib/libboost_container.so.*"
 	}
 }
 
@@ -161,7 +161,7 @@ libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
-		vmove usr/lib/libboost_context.so.*
+		vmove "usr/lib/libboost_context.so.*"
 	}
 }
 
@@ -169,7 +169,7 @@ libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
-		vmove usr/lib/libboost_contract.so.*
+		vmove "usr/lib/libboost_contract.so.*"
 	}
 }
 
@@ -177,7 +177,7 @@ libboost_coroutine1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
-		vmove usr/lib/libboost_coroutine.so.*
+		vmove "usr/lib/libboost_coroutine.so.*"
 	}
 }
 
@@ -185,7 +185,7 @@ libboost_date_time1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
-		vmove usr/lib/libboost_date_time.so.*
+		vmove "usr/lib/libboost_date_time.so.*"
 	}
 }
 
@@ -193,7 +193,7 @@ libboost_fiber1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_fiber"
 	pkg_install() {
-		vmove usr/lib/libboost_fiber.so.*
+		vmove "usr/lib/libboost_fiber.so.*"
 	}
 }
 
@@ -201,7 +201,7 @@ libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
-		vmove usr/lib/libboost_filesystem.so.*
+		vmove "usr/lib/libboost_filesystem.so.*"
 	}
 }
 
@@ -209,7 +209,7 @@ libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
-		vmove usr/lib/libboost_graph.so.*
+		vmove "usr/lib/libboost_graph.so.*"
 	}
 }
 
@@ -217,7 +217,7 @@ libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
-		vmove usr/lib/libboost_iostreams.so.*
+		vmove "usr/lib/libboost_iostreams.so.*"
 	}
 }
 
@@ -225,7 +225,7 @@ libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
-		vmove usr/lib/libboost_locale.so.*
+		vmove "usr/lib/libboost_locale.so.*"
 	}
 }
 
@@ -233,7 +233,7 @@ libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
-		vmove usr/lib/libboost_log.so.*
+		vmove "usr/lib/libboost_log.so.*"
 	}
 }
 
@@ -241,7 +241,7 @@ libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
-		vmove usr/lib/libboost_log_setup.so.*
+		vmove "usr/lib/libboost_log_setup.so.*"
 	}
 }
 
@@ -249,7 +249,7 @@ libboost_math_c99-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99.so.*
+		vmove "usr/lib/libboost_math_c99.so.*"
 	}
 }
 
@@ -257,7 +257,7 @@ libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99f.so.*
+		vmove "usr/lib/libboost_math_c99f.so.*"
 	}
 }
 
@@ -265,7 +265,7 @@ libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99l.so.*
+		vmove "usr/lib/libboost_math_c99l.so.*"
 	}
 }
 
@@ -273,7 +273,7 @@ libboost_math_tr1-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1.so.*
+		vmove "usr/lib/libboost_math_tr1.so.*"
 	}
 }
 
@@ -281,7 +281,7 @@ libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1f.so.*
+		vmove "usr/lib/libboost_math_tr1f.so.*"
 	}
 }
 
@@ -289,7 +289,7 @@ libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1l.so.*
+		vmove "usr/lib/libboost_math_tr1l.so.*"
 	}
 }
 
@@ -297,7 +297,7 @@ libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
-		vmove usr/lib/libboost_prg_exec_monitor.so.*
+		vmove "usr/lib/libboost_prg_exec_monitor.so.*"
 	}
 }
 
@@ -305,7 +305,7 @@ libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
-		vmove usr/lib/libboost_program_options.so.*
+		vmove "usr/lib/libboost_program_options.so.*"
 	}
 }
 
@@ -313,7 +313,7 @@ libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
-		vmove usr/lib/libboost_random.so.*
+		vmove "usr/lib/libboost_random.so.*"
 	}
 }
 
@@ -321,7 +321,7 @@ libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
-		vmove usr/lib/libboost_regex.so.*
+		vmove "usr/lib/libboost_regex.so.*"
 	}
 }
 
@@ -329,7 +329,7 @@ libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
-		vmove usr/lib/libboost_serialization.so.*
+		vmove "usr/lib/libboost_serialization.so.*"
 	}
 }
 
@@ -337,7 +337,7 @@ libboost_stacktrace_addr2line1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_addr2line"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_addr2line.so.*
+		vmove "usr/lib/libboost_stacktrace_addr2line.so.*"
 	}
 }
 
@@ -345,7 +345,7 @@ libboost_stacktrace_basic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_basic"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_basic.so.*
+		vmove "usr/lib/libboost_stacktrace_basic.so.*"
 	}
 }
 
@@ -353,7 +353,7 @@ libboost_stacktrace_noop1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_noop"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_noop.so.*
+		vmove "usr/lib/libboost_stacktrace_noop.so.*"
 	}
 }
 
@@ -361,7 +361,7 @@ libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
-		vmove usr/lib/libboost_system.so.*
+		vmove "usr/lib/libboost_system.so.*"
 	}
 }
 
@@ -369,7 +369,7 @@ libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
-		vmove usr/lib/libboost_thread.so.*
+		vmove "usr/lib/libboost_thread.so.*"
 	}
 }
 
@@ -377,7 +377,7 @@ libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
-		vmove usr/lib/libboost_timer.so.*
+		vmove "usr/lib/libboost_timer.so.*"
 	}
 }
 
@@ -385,7 +385,7 @@ libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
-		vmove usr/lib/libboost_type_erasure.so.*
+		vmove "usr/lib/libboost_type_erasure.so.*"
 	}
 }
 
@@ -393,7 +393,7 @@ libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
-		vmove usr/lib/libboost_unit_test_framework.so.*
+		vmove "usr/lib/libboost_unit_test_framework.so.*"
 	}
 }
 
@@ -401,7 +401,7 @@ libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
-		vmove usr/lib/libboost_wave.so.*
+		vmove "usr/lib/libboost_wave.so.*"
 	}
 }
 
@@ -409,7 +409,7 @@ libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
-		vmove usr/lib/libboost_wserialization.so.*
+		vmove "usr/lib/libboost_wserialization.so.*"
 	}
 }
 

From e6f6ae7ece7a32e024afb818108be305703f77b3 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 26 May 2022 18:52:59 +0300
Subject: [PATCH 3/5] uhd: update to 4.2.0.0.

---
 common/shlibs        | 2 +-
 srcpkgs/uhd/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4dd00983b54f..416f22d54910 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3589,7 +3589,7 @@ libbinpac.so.0 zeek-3.2.4_2
 libllhttp.so.1 llhttp-1.0.1_1
 libpinyin.so.13 libpinyin-2.2.1_1
 libzhuyin.so.13 libzhuyin-2.6.0_3
-libuhd.so.4.0.0 uhd-4.0.0.0_1
+libuhd.so.4.2.0 uhd-4.2.0.0_1
 libeditline.so.1 editline-1.16.0_1
 libgnuradio-rds.so.1 gnuradio-rds-3.8.0_1
 libgnuradio-nrsc5-1.0.0git.so.0.0.0 gnuradio-nrsc5-1.0.0_1
diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template
index 5f043162d7dc..685f877dc380 100644
--- a/srcpkgs/uhd/template
+++ b/srcpkgs/uhd/template
@@ -1,6 +1,6 @@
 # Template file for 'uhd'
 pkgname=uhd
-version=4.0.0.0
+version=4.2.0.0
 revision=1
 build_wrksrc=host
 build_style=cmake
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://files.ettus.com/manual/"
 changelog="https://raw.githubusercontent.com/EttusResearch/uhd/master/CHANGELOG"
 distfiles="https://github.com/EttusResearch/uhd/archive/v${version}.tar.gz"
-checksum=4f3513c43edf0178391ed5755266864532716b8b503bcfb9a983ae6256c51b14
+checksum=ad15cedc8a4b9ba78078f1c4c3c179eff8297a08e44928679de896ca42313e6b
 python_version=3
 
 case "${XBPS_TARGET_MACHINE}" in

From 62a6de94c4e2c60c31d2fc9d688604544c6e330e Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 26 May 2022 21:37:30 +0300
Subject: [PATCH 4/5] [WIP] gnuradio: update to 3.10.2.0.

This is most certainly a broken updated packaging for now... probably
just needs a bunch of new dependencies to even build anything useful
while if it doesn't find anything it just builds the bare minimum
(e.g. docs), annoying behavior...
---
 ...6495f3bdf579dae0c26531a16f6adcc7fb2f.patch | 46 -------------------
 ...15d0b26b3c72fab736bcd28a67ab9d1404b7.patch | 28 -----------
 ...befbbe54e55fc4994899e92bcf5bf462fa2f.patch | 31 -------------
 srcpkgs/gnuradio/template                     | 20 ++++----
 4 files changed, 11 insertions(+), 114 deletions(-)
 delete mode 100644 srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch
 delete mode 100644 srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch
 delete mode 100644 srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch

diff --git a/srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch b/srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch
deleted file mode 100644
index 51952bd29b38..000000000000
--- a/srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 596c6495f3bdf579dae0c26531a16f6adcc7fb2f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marcus=20M=C3=BCller?= <mmueller@gnuradio.org>
-Date: Mon, 13 Apr 2020 00:11:59 +0200
-Subject: [PATCH] =?UTF-8?q?pmt:=20conditionalize=20testing=20of=20long=20>?=
- =?UTF-8?q?=202=C2=B3=C2=B2=20on=20sizeof(long)?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- gnuradio-runtime/python/pmt/qa_pmt.py | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/gnuradio-runtime/python/pmt/qa_pmt.py b/gnuradio-runtime/python/pmt/qa_pmt.py
-index 884bba7dd4b..44f616cdae1 100644
---- a/gnuradio-runtime/python/pmt/qa_pmt.py
-+++ b/gnuradio-runtime/python/pmt/qa_pmt.py
-@@ -18,6 +18,10 @@ class test_pmt(unittest.TestCase):
-     MAXINT32 = (2**31)-1
-     MININT32 = (-MAXINT32)-1
- 
-+    def setUp(self):
-+        from ctypes import sizeof, c_long
-+        self.sizeof_long = sizeof(c_long)
-+
-     def test01(self):
-         a = pmt.intern("a")
-         b = pmt.from_double(123765)
-@@ -112,6 +116,8 @@ def test14(self):
-         self.assertEqual(const,pmt.to_long(deser))
- 
-     def test15(self):
-+        if(self.sizeof_long <= 4):
-+            return
-         const = self.MAXINT32 + 1
-         x_pmt = pmt.from_long(const)
-         s = pmt.serialize_str(x_pmt)
-@@ -137,6 +143,8 @@ def test17(self):
-         self.assertEqual(const, x_long)
- 
-     def test18(self):
-+        if(self.sizeof_long <= 4):
-+            return
-         const = self.MININT32 - 1
-         x_pmt = pmt.from_long(const)
-         s = pmt.serialize_str(x_pmt)
diff --git a/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch b/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch
deleted file mode 100644
index c49a047427e8..000000000000
--- a/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7 Mon Sep 17 00:00:00 2001
-From: John Sallay <jasallay@gmail.com>
-Date: Sat, 23 Oct 2021 08:26:42 -0400
-Subject: [PATCH] Fix issue 4595 qa_agc Assertion Error.
-
-The number of input elements needs to be disivible by volk_alignment, which it wasn't
-for machines with 512-bit registers.
-
-Signed-off-by: John Sallay <jasallay@gmail.com>
----
- gr-analog/python/analog/qa_agc.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/gr-analog/python/analog/qa_agc.py b/gr-analog/python/analog/qa_agc.py
-index a5a8ea47b6a..9368dd5d2a8 100644
---- a/gr-analog/python/analog/qa_agc.py
-+++ b/gr-analog/python/analog/qa_agc.py
-@@ -454,7 +454,9 @@ def test_006(self):
-         tb = self.tb
- 
-         sampling_freq = 100
--        N = int(5*sampling_freq)
-+        # N must by a multiple of the volk_alignment of the system for this test to work.
-+        # For a machine with 512-bit registers, that would be 8 complex-floats.
-+        N = int(8 * sampling_freq)
-         src1 = analog.sig_source_c(sampling_freq, analog.GR_SIN_WAVE,
-                                    sampling_freq * 0.10, 100)
-         dst1 = blocks.vector_sink_c()
diff --git a/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch b/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch
deleted file mode 100644
index 4faa3468140a..000000000000
--- a/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f259befbbe54e55fc4994899e92bcf5bf462fa2f Mon Sep 17 00:00:00 2001
-From: alekhgupta1441 <alekhgupta1441@gmail.com>
-Date: Sun, 12 Apr 2020 03:48:14 +0530
-Subject: [PATCH] gr-digital/python : Updated soft_dec_lut_gen.py
-
----
- gr-digital/python/digital/soft_dec_lut_gen.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gr-digital/python/digital/soft_dec_lut_gen.py b/gr-digital/python/digital/soft_dec_lut_gen.py
-index 4503c4fea7b..84f6de66e45 100644
---- a/gr-digital/python/digital/soft_dec_lut_gen.py
-+++ b/gr-digital/python/digital/soft_dec_lut_gen.py
-@@ -73,7 +73,7 @@ def soft_dec_table_generator(soft_dec_gen, prec, Es=1):
- 
-     '''
- 
--    npts = 2.0**prec
-+    npts = int(2.0**prec)
-     maxd = Es*numpy.sqrt(2.0)/2.0
-     yrng = numpy.linspace(-maxd, maxd, npts)
-     xrng = numpy.linspace(-maxd, maxd, npts)
-@@ -110,7 +110,7 @@ def soft_dec_table(constel, symbols, prec, npwr=1):
-     re_max = max(numpy.array(constel).real)
-     im_max = max(numpy.array(constel).imag)
- 
--    npts = 2.0**prec
-+    npts = int(2.0**prec)
-     yrng = numpy.linspace(im_min, im_max, npts)
-     xrng = numpy.linspace(re_min, re_max, npts)
- 
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index c950b53e8bea..b47325cb6034 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,10 +1,12 @@
 # Template file for 'gnuradio'
 pkgname=gnuradio
-version=3.8.0.0
-revision=9
+version=3.10.2.0
+revision=1
 build_style=cmake
-conf_files="/etc/gnuradio/conf.d/*"
-configure_args="-DENABLE_INTERNAL_VOLK=OFF -DGR_PYTHON_DIR=/${py3_sitelib}"
+# FIXME: '/etc/gnuradio/conf.d/*' configuration file not in PKGDESTDIR!
+#conf_files="/etc/gnuradio/conf.d/*"
+configure_args="-DGR_PYTHON_DIR=/${py3_sitelib}"
+# TODO: https://pypi.org/project/schema/ as new build/runtime dep since v3.10.2.0?
 hostmakedepends="pkg-config doxygen swig python3-Mako python3-Sphinx
  python3-cairo python3-numpy python3-yaml texlive texlive-latexextra texlive-dvi"
 makedepends="SDL-devel boost-devel fftw-devel gsl-devel jack-devel
@@ -18,12 +20,10 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnuradio.org"
 distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=03fd01f0b27033befb91709b3d56f95e0869b5fb8bc71bec2662266a3f0dedf5
+checksum=a8f6c1cc98bc3784aa70ab29d3039ad6922ec36f908ecfb2c904a597b32c0776
 python_version=3
 
 post_install() {
-	rm ${DESTDIR}/usr/share/gnuradio/examples/audio/dial_tone \
-		${DESTDIR}/usr/share/gnuradio/examples/uhd/tags_demo
 	vinstall grc/scripts/freedesktop/gnuradio-grc.desktop 644 \
 		usr/share/applications
 	vinstall grc/scripts/freedesktop/gnuradio_logo_icon-square.svg 644 \
@@ -42,8 +42,10 @@ gnuradio-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove "usr/lib/*.so"
+		# FIXME: there's no shared objects at all anymore?!
+		#vmove "usr/lib/*.so"
 		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
+		# FIXME: it looks like pkgconfig files aren't installed even though *.pc.in files do exist
+		#vmove usr/lib/pkgconfig
 	}
 }

From 6f0d033b0d0e7707078008a259043e77a320d2f6 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 9 Jun 2022 02:43:52 +0300
Subject: [PATCH 5/5] [WIP] Aegisub: upgrade to 3.3.2r8112.

WIP because upstream should really make a new release, packaging tip of
dev branch just to be able to build is kind of dumb.

This also seemed to fix cross builds as tested from x86_64-musl host to
aarch64-musl target.

[ci skip] the PR is still WIP
---
 .../allow-cmake-builds-from-tarball.patch     | 56 --------------
 .../remove-busted-luajit-vendor-pt2.patch     | 11 +++
 .../patches/remove-busted-luajit-vendor.patch | 75 ++++++++++++-------
 srcpkgs/Aegisub/template                      | 14 ++--
 4 files changed, 67 insertions(+), 89 deletions(-)
 delete mode 100644 srcpkgs/Aegisub/patches/allow-cmake-builds-from-tarball.patch
 create mode 100644 srcpkgs/Aegisub/patches/remove-busted-luajit-vendor-pt2.patch

diff --git a/srcpkgs/Aegisub/patches/allow-cmake-builds-from-tarball.patch b/srcpkgs/Aegisub/patches/allow-cmake-builds-from-tarball.patch
deleted file mode 100644
index 705965ca1df9..000000000000
--- a/srcpkgs/Aegisub/patches/allow-cmake-builds-from-tarball.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From dee94396eee4b67eafae7f00e540cb284769473d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Wed, 15 Sep 2021 23:54:10 -0300
-Subject: [PATCH] Allow CMake builds from tarball.
-
-Add environment variable that can be passed to build/version.sh to force
-a git version if it can't use git to determine one.
-
-Since we are here, also fix:
-
-- use of 'return' in a script, should be 'exit'
-- wrong grep command to match numerical version with 3 digits
----
- build/version.sh | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/build/version.sh b/build/version.sh
-index 8cea0a3f3..d505341e4 100755
---- a/build/version.sh
-+++ b/build/version.sh
-@@ -10,13 +10,13 @@ if ! test -d "${srcdir}/.git"; then
-     done < "${version_h_path}"
-     if test x$BUILD_GIT_VERSION_NUMBER != x -a x$BUILD_GIT_VERSION_STRING != x; then
-       export VERSION_SOURCE="from cached git_version.h"
--      return 0
-+      exit 0
-     else
-       echo "invalid git_version.h"
-       exit 2
-     fi
--  else
--    echo "git repo not found and no cached git_version.h"
-+  elif [ -z "$FORCE_GIT_VERSION" ]; then
-+    echo "git repo not found and no cached git_version.h - use FORCE_GIT_VERSION to override"
-     exit 2
-   fi
- fi
-@@ -25,13 +25,13 @@ last_svn_revision=6962
- last_svn_hash="16cd907fe7482cb54a7374cd28b8501f138116be"
- 
- git_revision=$(expr $last_svn_revision + $(git log --pretty=oneline $last_svn_hash..HEAD 2>/dev/null | wc -l))
--git_version_str=$(git describe --exact-match 2> /dev/null)
-+git_version_str=${FORCE_GIT_VERSION:-$(git describe --exact-match 2> /dev/null)}
- installer_version='0.0.0'
- resource_version='0, 0, 0'
- if test x$git_version_str != x; then
-   git_version_str="${git_version_str##v}"
-   tagged_release=1
--  if [ $(echo $git_version_str | grep '\d\.\d\.\d') ]; then
-+  if [ $(echo $git_version_str | grep '[0-9].[0-9].[0-9]') ]; then
-     installer_version=$git_version_str
-     resource_version=$(echo $git_version_str | sed 's/\./, /g')
-   fi
--- 
-2.33.0
-
diff --git a/srcpkgs/Aegisub/patches/remove-busted-luajit-vendor-pt2.patch b/srcpkgs/Aegisub/patches/remove-busted-luajit-vendor-pt2.patch
new file mode 100644
index 000000000000..b9faefee2275
--- /dev/null
+++ b/srcpkgs/Aegisub/patches/remove-busted-luajit-vendor-pt2.patch
@@ -0,0 +1,11 @@
+diff --color -ru a/vendor/luabins/CMakeLists.txt b/vendor/luabins/CMakeLists.txt
+--- a/vendor/luabins/CMakeLists.txt	2022-06-09 02:01:24.456929000 +0300
++++ b/vendor/luabins/CMakeLists.txt	2022-06-09 02:09:36.408047000 +0300
+@@ -36,4 +36,5 @@
+     src/savebuffer.c
+     src/write.c
+ )
+-target_link_libraries(luabins PRIVATE luajit)
+\ No newline at end of file
++target_include_directories(luabins PUBLIC ${LUAJIT_INCLUDE_DIRS})
++target_link_libraries(luabins PRIVATE ${LUAJIT_LIBRARIES})
diff --git a/srcpkgs/Aegisub/patches/remove-busted-luajit-vendor.patch b/srcpkgs/Aegisub/patches/remove-busted-luajit-vendor.patch
index 3ee7588647ca..d4ef5804eea2 100644
--- a/srcpkgs/Aegisub/patches/remove-busted-luajit-vendor.patch
+++ b/srcpkgs/Aegisub/patches/remove-busted-luajit-vendor.patch
@@ -12,7 +12,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 4614f6d..0e7bc81 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -3,6 +3,10 @@ cmake_policy(SET CMP0074 NEW)
+@@ -4,6 +4,10 @@
  
  project(Aegisub)
  
@@ -23,10 +23,11 @@ index 4614f6d..0e7bc81 100644
  list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
  
  # Explicitly set the build type to Release if no other type is specified
-@@ -12,181 +16,6 @@ if(NOT CMAKE_BUILD_TYPE)
+@@ -13,210 +17,6 @@
      set(CMAKE_BUILD_TYPE Release)
  endif()
  
+-## Build bundled LuaJIT with aegisub specific patches
 -add_executable(luajit-minilua vendor/luajit/src/host/minilua.c)
 -if(NOT WIN32)
 -    target_link_libraries(luajit-minilua m)
@@ -47,6 +48,22 @@ index 4614f6d..0e7bc81 100644
 -            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
 -        )
 -    endif()
+-elseif(APPLE)
+-    if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64")
+-        add_custom_command(
+-            OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h"
+-            COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen"
+-            COMMAND luajit-minilua ../dynasm/dynasm.lua -D ENDIAN_LE -D P64 -D FFI -D DUALNUM -D FPU -D HFABI -D NO_UNWIND -D VER=80 -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" vm_arm64.dasc
+-            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
+-        )
+-    else()
+-        add_custom_command(
+-            OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h"
+-            COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen"
+-            COMMAND luajit-minilua ../dynasm/dynasm.lua -D P64 -D JIT -D FFI -D FPU -D HFABI -D VER= -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" vm_x64.dasc
+-            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
+-        )
+-    endif()
 -else()
 -    if(CMAKE_SIZEOF_VOID_P EQUAL 8)
 -        add_custom_command(
@@ -76,7 +93,13 @@ index 4614f6d..0e7bc81 100644
 -)
 -target_compile_definitions(luajit-buildvm PRIVATE LUAJIT_ENABLE_LUA52COMPAT)
 -target_include_directories(luajit-buildvm PRIVATE vendor/luajit/src "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen")
--if(UNIX)
+-
+-if(APPLE)
+-    add_custom_command(
+-        OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s"
+-        COMMAND luajit-buildvm -m machasm -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s"
+-    )
+-elseif(UNIX)
 -    add_custom_command(
 -        OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s"
 -        COMMAND luajit-buildvm -m elfasm -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s"
@@ -197,21 +220,32 @@ index 4614f6d..0e7bc81 100644
 -if(WIN32)
 -    target_sources(luajit PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.obj")
 -else()
+-    enable_language(ASM)
 -    target_sources(luajit PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s")
--    set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s" PROPERTY LANGUAGE C)
 -    target_link_libraries(luajit ${CMAKE_DL_LIBS})
 -endif()
+-if(APPLE)
+-    if(NOT CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64")
+-        target_compile_definitions(luajit-buildvm PRIVATE LUAJIT_ENABLE_GC64)
+-        target_compile_definitions(luajit PRIVATE LUAJIT_ENABLE_GC64)
+-    endif()
+-endif()
 -
  add_subdirectory(vendor/luabins)
  
- add_library(libaegisub STATIC
-@@ -264,20 +93,20 @@ elseif(WIN32)
+ ## libaegisub
+@@ -303,25 +103,25 @@
  endif()
  set_target_properties(libaegisub PROPERTIES PREFIX "")
  target_compile_definitions(libaegisub PRIVATE CMAKE_BUILD)
 -target_include_directories(libaegisub PUBLIC "libaegisub/include")
 +target_include_directories(libaegisub PUBLIC ${LUAJIT_INCLUDE_DIRS} "libaegisub/include")
- target_precompile_headers(libaegisub PRIVATE "libaegisub/lagi_pre.h")
+ if(APPLE)
+     # CMake on macOS currently does not support pch with objc, so use the old way
+     target_compile_options(libaegisub PRIVATE -include "${PROJECT_SOURCE_DIR}/libaegisub/lagi_pre.h")
+ else()
+     target_precompile_headers(libaegisub PRIVATE "libaegisub/lagi_pre.h")
+ endif()
 -target_link_libraries(libaegisub PRIVATE luajit luabins)
 +target_link_libraries(libaegisub PRIVATE ${LUAJIT_LIBRARIES} luabins)
  
@@ -230,7 +264,7 @@ index 4614f6d..0e7bc81 100644
      WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/src/bitmaps
  )
  
-@@ -451,8 +280,9 @@ add_executable(Aegisub WIN32
+@@ -496,8 +296,9 @@
      src/video_slider.cpp
      src/visual_feature.cpp
  )
@@ -239,29 +273,14 @@ index 4614f6d..0e7bc81 100644
  target_compile_definitions(Aegisub PRIVATE CMAKE_BUILD)
 +target_include_directories(Aegisub PUBLIC ${LUAJIT_INCLUDE_DIRS})
  target_include_directories(Aegisub PRIVATE "src/libresrc" "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc")
- target_precompile_headers(Aegisub PRIVATE "src/agi_pre.h")
- 
-@@ -776,7 +606,7 @@ message(STATUS "\n"
-     "  FFTW3:                 ${WITH_FFTW3}\n"
+ if(APPLE)
+     # CMake on macOS currently does not support pch with objc, so use the old way
+@@ -877,7 +678,7 @@
      "  Hunspell:              ${WITH_HUNSPELL}\n"
      "  uchardet:              ${WITH_UCHARDET}\n"
+     "  wxStyledTextCtrl:      ${WITH_WXSTC}\n"
 -    "  LuaJIT:                bundled\n"
 +    "  LuaJIT:                unfucked\n"
      "\n"
      "Options\n"
-     "  Startup log:           ${WITH_STARTUPLOG}\n"
-diff --git a/vendor/luabins/CMakeLists.txt b/vendor/luabins/CMakeLists.txt
-index 1fe1d20..e68403c 100644
---- a/vendor/luabins/CMakeLists.txt
-+++ b/vendor/luabins/CMakeLists.txt
-@@ -36,4 +36,5 @@ add_library(luabins STATIC
-     src/savebuffer.c
-     src/write.c
- )
--target_link_libraries(luabins PRIVATE luajit)
-\ No newline at end of file
-+target_include_directories(luabins PUBLIC ${LUAJIT_INCLUDE_DIRS})
-+target_link_libraries(luabins PRIVATE ${LUAJIT_LIBRARIES})
--- 
-2.33.0
-
+     "  Translations:          ${WITH_TRANSLATION}\n"
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 1583c4853b9b..86f9b8312226 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,12 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
-version=3.3.2
-revision=3
+# FIXME: wait for new upstream release, v3.3.2 tag doesn't link against modern boost!
+# /usr/bin/ld: CMakeFiles/Aegisub.dir/src/search_replace_engine.cpp.o: undefined reference to symbol '_ZN6icu_708Collator14createInstanceERKNS_6LocaleER10UErrorCode'
+# /usr/bin/ld: /lib64/libicui18n.so.70: error adding symbols: DSO missing from command line
+version=3.3.2r8112
+revision=1
+_commit=aa1e63f5bfed688711d8b46bf5dbd807d1c07300
+wrksrc="Aegisub-${_commit}"
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 cmake_builddir="BUILD"
@@ -17,9 +22,8 @@ short_desc="Subtitle editor (ssa, ass, srt)"
 maintainer="pudiva <rogi@skylittlesystem.org>"
 license="BSD-3-Clause, MIT"
 homepage="https://github.com/wangqr/Aegisub"
-distfiles="https://github.com/wangqr/Aegisub/archive/v${version}.tar.gz"
-checksum="9aaab8e66cef2a72368c6b7f79b2f99700321a7b9a1ca623c5e6be0e65418db5"
-nocross="lots of errors like: undefined reference to boost::icu_regex_traits::isctype..."
+distfiles="https://github.com/wangqr/Aegisub/archive/${_commit}.tar.gz"
+checksum="a2073a57efa717e7e6ba8021727779e9695601e96127d5d5c4d0fb749174f2b9"
 
 build_options="fftw openal portaudio"
 build_options_default="fftw"

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Updated] boost: update to 1.79.0.
  2022-03-18 14:28 [PR PATCH] boost: update to 1.79.0.b1 JamiKettunen
                   ` (23 preceding siblings ...)
  2022-06-08 23:47 ` JamiKettunen
@ 2022-06-09  0:26 ` JamiKettunen
  2022-07-06 11:26 ` atweiden
                   ` (3 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: JamiKettunen @ 2022-06-09  0:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3887 bytes --]

There is an updated pull request by JamiKettunen against master on the void-packages repository

https://github.com/JamiKettunen/void-packages boost-1.79.0
https://github.com/void-linux/void-packages/pull/36204

boost: update to 1.79.0.
#### Packages to fix (from `xrevshlib boost` as locally build-tested on `x86_64-musl`)
- [x] Aegisub (fails on `do_build()`) - awaiting new upstream release, tip of `dev` branch builds
- [ ] PrusaSlicer (fails on `do_build()`)
- [ ] TSC (fails on `do_build()`)
- [ ] cryfs (fails on `do_build()`)
- [ ] fifengine (fails on `do_build()`)
- [x] uhd (fails on `do_build()`)
  - [ ] gnuradio (failed on `do_build()`, updating to [v3.10.2.0](https://github.com/gnuradio/gnuradio/releases/tag/v3.10.2.0) appears to have disabled building a lot of components including all shared objects and pkg-config files for example, probably just a bunch of missing new "optional" build-time dependencies...)
    - [ ] gnuradio-osmosdr (depends on `gnuradio`)
- [ ] imagescan (fails on `do_build()`)
- [ ] kea (fails on `do_build()`)
- [ ] ledger (fails on `do_build()`)
- [ ] libbitcoin-system (fails on `do_build()`)
  - [ ] libbitcoin-database (depends on `libbitcoin-system`)
    - [ ] libbitcoin-blockchain (depends on `libbitcoin-database`)
      - [ ] libbitcoin-node (depends on `libbitcoin-blockchain`)
      - [ ] libbitcoin-server (depends on `libbitcoin-blockchain`)
  - [ ] libbitcoin-protocol (depends on `libbitcoin-system`)
    - [ ] libbitcoin-client (depends on `libbitcoin-protocol`)
      - [ ] libbitcoin-explorer (depends on `libbitcoin-client`)
  - [ ] libbitcoin-network (depends on `libbitcoin-system`)
- [ ] libetonyek (fails on `do_build()`, appears to need `-std=c++17` or higher? `NUM3Parser.cpp:46:8: error: 'for_each' is not a member of 'std'`)
  - [ ] libreoffice (depends on `libetonyek`)
- [ ] librime (fails on `do_build()`)
- [ ] namecoin (fails on `do_build()`)
- [ ] pulseeffects-legacy (fails on `do_build()`)
- [ ] supercollider (fails on `do_build()`)
- [ ] leatherman (hangs on `do_check()`, test process pinned one core at 100% for 10 minutes)
  - [x] facter (depends on `leatherman`)
- [ ] inkscape (fails on `do_check()`)
- [ ] libtorrent-rasterbar (hangs on `do_check()`, 90/97 test_web_seed_http stuck for 10 minutes)
- [ ] schroot (fails on `do_check()`)
- [ ] bitcoin (fails on `do_check()`)

#### Packages to fix (from `xrevshlib uhd` as locally build-tested on `x86_64-musl`)
- [ ] urh (fails on `do_check()` even after adding `checkdepends="python3-pip"`)

#### Modified patches (boost)
`exec_file.patch`: Removed due to being upstream as https://github.com/boostorg/python/commit/d9f06052e28873037db7f98629bce72182a42410
`mips.patch`: Updated to apply on top of https://github.com/boostorg/fiber/commit/5dc9dabc5d5ff8da53ec897c265c9cba1b6ed0df, not sure if this can be removed now(?)

#### Misc changes
- I've renamed all subpackages of `boost` so that the versioned name doesn't conflict with other numbers and are consistent with the previously existing `boost-python3-1.72`, e.g. `libboost_math_c991.72` is now `libboost_math_c99-1.79` (notice the `-`!)

#### Testing the changes
- I tested the changes in this PR: **NO**

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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/36204.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-boost-1.79.0-36204.patch --]
[-- Type: text/x-diff, Size: 68814 bytes --]

From a1e814cd6b37d103dea38921cf3748bc2b99c735 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 15:28:37 +0200
Subject: [PATCH 1/6] boost: update to 1.79.0.

---
 common/shlibs                                 |  64 +++----
 .../{boost-python1.72 => boost-python1.79}    |   0
 ...{boost-python3-1.72 => boost-python3-1.79} |   0
 srcpkgs/boost/patches/exec_file.patch         |  45 -----
 srcpkgs/boost/patches/mips.patch              |   2 +-
 srcpkgs/boost/template                        | 161 +++++++++---------
 ...ibboost_atomic1.72 => libboost_atomic1.79} |   0
 ...ibboost_chrono1.72 => libboost_chrono1.79} |   0
 ...t_container1.72 => libboost_container1.79} |   0
 ...boost_context1.72 => libboost_context1.79} |   0
 ...ost_contract1.72 => libboost_contract1.79} |   0
 ...t_coroutine1.72 => libboost_coroutine1.79} |   0
 ...t_date_time1.72 => libboost_date_time1.79} |   0
 ...{libboost_fiber1.72 => libboost_fiber1.79} |   0
 ...filesystem1.72 => libboost_filesystem1.79} |   0
 ...{libboost_graph1.72 => libboost_graph1.79} |   0
 ...t_iostreams1.72 => libboost_iostreams1.79} |   0
 ...{libboost_locale1.72 => libboost_json1.79} |   0
 .../{libboost_log1.72 => libboost_locale1.79} |   0
 ...ibboost_log_setup1.72 => libboost_log1.79} |   0
 ...st_math_c991.72 => libboost_log_setup1.79} |   0
 ...t_math_c99f1.72 => libboost_math_c99-1.79} |   0
 ...t_math_c99l1.72 => libboost_math_c99f1.79} |   0
 ...st_math_tr11.72 => libboost_math_c99l1.79} |   0
 ...t_math_tr1f1.72 => libboost_math_tr1-1.79} |   0
 ...t_math_tr1l1.72 => libboost_math_tr1f1.79} |   0
 ...xec_monitor1.72 => libboost_math_tr1l1.79} |   0
 ...rogram_options1.72 => libboost_nowide1.79} |   0
 ...ndom1.72 => libboost_prg_exec_monitor1.79} |   0
 ...regex1.72 => libboost_program_options1.79} |   0
 ..._serialization1.72 => libboost_random1.79} |   0
 ...trace_addr2line1.72 => libboost_regex1.79} |   0
 ...e_basic1.72 => libboost_serialization1.79} |   0
 ...1.72 => libboost_stacktrace_addr2line1.79} |   0
 ...stem1.72 => libboost_stacktrace_basic1.79} |   0
 ...hread1.72 => libboost_stacktrace_noop1.79} |   0
 ...libboost_timer1.72 => libboost_system1.79} |   0
 ...t_type_erasure1.72 => libboost_thread1.79} |   0
 ..._test_framework1.72 => libboost_timer1.79} |   0
 ...ost_wave1.72 => libboost_type_erasure1.79} |   0
 ...n1.72 => libboost_unit_test_framework1.79} |   0
 srcpkgs/libboost_wave1.79                     |   1 +
 srcpkgs/libboost_wserialization1.79           |   1 +
 43 files changed, 113 insertions(+), 161 deletions(-)
 rename srcpkgs/{boost-python1.72 => boost-python1.79} (100%)
 rename srcpkgs/{boost-python3-1.72 => boost-python3-1.79} (100%)
 delete mode 100644 srcpkgs/boost/patches/exec_file.patch
 rename srcpkgs/{libboost_atomic1.72 => libboost_atomic1.79} (100%)
 rename srcpkgs/{libboost_chrono1.72 => libboost_chrono1.79} (100%)
 rename srcpkgs/{libboost_container1.72 => libboost_container1.79} (100%)
 rename srcpkgs/{libboost_context1.72 => libboost_context1.79} (100%)
 rename srcpkgs/{libboost_contract1.72 => libboost_contract1.79} (100%)
 rename srcpkgs/{libboost_coroutine1.72 => libboost_coroutine1.79} (100%)
 rename srcpkgs/{libboost_date_time1.72 => libboost_date_time1.79} (100%)
 rename srcpkgs/{libboost_fiber1.72 => libboost_fiber1.79} (100%)
 rename srcpkgs/{libboost_filesystem1.72 => libboost_filesystem1.79} (100%)
 rename srcpkgs/{libboost_graph1.72 => libboost_graph1.79} (100%)
 rename srcpkgs/{libboost_iostreams1.72 => libboost_iostreams1.79} (100%)
 rename srcpkgs/{libboost_locale1.72 => libboost_json1.79} (100%)
 rename srcpkgs/{libboost_log1.72 => libboost_locale1.79} (100%)
 rename srcpkgs/{libboost_log_setup1.72 => libboost_log1.79} (100%)
 rename srcpkgs/{libboost_math_c991.72 => libboost_log_setup1.79} (100%)
 rename srcpkgs/{libboost_math_c99f1.72 => libboost_math_c99-1.79} (100%)
 rename srcpkgs/{libboost_math_c99l1.72 => libboost_math_c99f1.79} (100%)
 rename srcpkgs/{libboost_math_tr11.72 => libboost_math_c99l1.79} (100%)
 rename srcpkgs/{libboost_math_tr1f1.72 => libboost_math_tr1-1.79} (100%)
 rename srcpkgs/{libboost_math_tr1l1.72 => libboost_math_tr1f1.79} (100%)
 rename srcpkgs/{libboost_prg_exec_monitor1.72 => libboost_math_tr1l1.79} (100%)
 rename srcpkgs/{libboost_program_options1.72 => libboost_nowide1.79} (100%)
 rename srcpkgs/{libboost_random1.72 => libboost_prg_exec_monitor1.79} (100%)
 rename srcpkgs/{libboost_regex1.72 => libboost_program_options1.79} (100%)
 rename srcpkgs/{libboost_serialization1.72 => libboost_random1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_addr2line1.72 => libboost_regex1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_basic1.72 => libboost_serialization1.79} (100%)
 rename srcpkgs/{libboost_stacktrace_noop1.72 => libboost_stacktrace_addr2line1.79} (100%)
 rename srcpkgs/{libboost_system1.72 => libboost_stacktrace_basic1.79} (100%)
 rename srcpkgs/{libboost_thread1.72 => libboost_stacktrace_noop1.79} (100%)
 rename srcpkgs/{libboost_timer1.72 => libboost_system1.79} (100%)
 rename srcpkgs/{libboost_type_erasure1.72 => libboost_thread1.79} (100%)
 rename srcpkgs/{libboost_unit_test_framework1.72 => libboost_timer1.79} (100%)
 rename srcpkgs/{libboost_wave1.72 => libboost_type_erasure1.79} (100%)
 rename srcpkgs/{libboost_wserialization1.72 => libboost_unit_test_framework1.79} (100%)
 create mode 120000 srcpkgs/libboost_wave1.79
 create mode 120000 srcpkgs/libboost_wserialization1.79

diff --git a/common/shlibs b/common/shlibs
index e04037a9f2f0..4dd00983b54f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -620,38 +620,38 @@ 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.79.0 libboost_context1.79-1.79.0_1
+libboost_coroutine.so.1.79.0 libboost_coroutine1.79-1.79.0_1
+libboost_container.so.1.79.0 libboost_container1.79-1.79.0_1
+libboost_prg_exec_monitor.so.1.79.0 libboost_prg_exec_monitor1.79-1.79.0_1
+libboost_timer.so.1.79.0 libboost_timer1.79-1.79.0_1
+libboost_random.so.1.79.0 libboost_random1.79-1.79.0_1
+libboost_filesystem.so.1.79.0 libboost_filesystem1.79-1.79.0_1
+libboost_unit_test_framework.so.1.79.0 libboost_unit_test_framework1.79-1.79.0_1
+libboost_math_c99.so.1.79.0 libboost_math_c99-1.79-1.79.0_1
+libboost_math_tr1.so.1.79.0 libboost_math_tr1-1.79-1.79.0_1
+libboost_regex.so.1.79.0 libboost_regex1.79-1.79.0_1
+libboost_serialization.so.1.79.0 libboost_serialization1.79-1.79.0_1
+libboost_chrono.so.1.79.0 libboost_chrono1.79-1.79.0_1
+libboost_wserialization.so.1.79.0 libboost_wserialization1.79-1.79.0_1
+libboost_graph.so.1.79.0 libboost_graph1.79-1.79.0_1
+libboost_log.so.1.79.0 libboost_log1.79-1.79.0_1
+libboost_locale.so.1.79.0 libboost_locale1.79-1.79.0_1
+libboost_program_options.so.1.79.0 libboost_program_options1.79-1.79.0_1
+libboost_iostreams.so.1.79.0 libboost_iostreams1.79-1.79.0_1
+libboost_system.so.1.79.0 libboost_system1.79-1.79.0_1
+libboost_thread.so.1.79.0 libboost_thread1.79-1.79.0_1
+libboost_log_setup.so.1.79.0 libboost_log_setup1.79-1.79.0_1
+libboost_date_time.so.1.79.0 libboost_date_time1.79-1.79.0_1
+libboost_wave.so.1.79.0 libboost_wave1.79-1.79.0_1
+libboost_atomic.so.1.79.0 libboost_atomic1.79-1.79.0_1
+libboost_type_erasure.so.1.79.0 libboost_type_erasure1.79-1.79.0_1
+libboost_fiber.so.1.79.0 libboost_fiber1.79-1.79.0_1
+libboost_stacktrace_noop.so.1.79.0 libboost_stacktrace_noop1.79-1.79.0_1
+libboost_stacktrace_addr2line.so.1.79.0 libboost_stacktrace_addr2line1.79-1.79.0_1
+libboost_stacktrace_basic.so.1.79.0 libboost_stacktrace_basic1.79-1.79.0_1
+libboost_python27.so.1.79.0 boost-python1.79-1.79.0_1
+libboost_python310.so.1.79.0 boost-python3-1.79-1.79.0_1
 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-python1.79
similarity index 100%
rename from srcpkgs/boost-python1.72
rename to srcpkgs/boost-python1.79
diff --git a/srcpkgs/boost-python3-1.72 b/srcpkgs/boost-python3-1.79
similarity index 100%
rename from srcpkgs/boost-python3-1.72
rename to srcpkgs/boost-python3-1.79
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/mips.patch b/srcpkgs/boost/patches/mips.patch
index a10a2122d9c7..8d253fc7c286 100644
--- a/srcpkgs/boost/patches/mips.patch
+++ b/srcpkgs/boost/patches/mips.patch
@@ -3,7 +3,7 @@
 @@ -48,7 +48,7 @@
  #  define cpu_relax() asm volatile ("nop" ::: "memory");
  # endif
- #elif BOOST_ARCH_MIPS
+ #elif BOOST_ARCH_MIPS && (((__mips_isa_rev > 1) && defined(__mips32)) || ((__mips_isa_rev > 2)  && defined(__mips64)))
 -# define cpu_relax() asm volatile ("pause" ::: "memory");
 +# define cpu_relax() asm volatile ("nop" ::: "memory");
  #elif BOOST_ARCH_PPC
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 126c50770b50..ad705311b867 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,8 +1,8 @@
 # Template file for 'boost'
 pkgname=boost
-version=1.72.0
-revision=7
-wrksrc="${pkgname}_${version//\./_}"
+version=1.79.0
+revision=1
+wrksrc="boost_${version//\./_}"
 hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
 makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
 short_desc="Free peer-reviewed portable C++ source libraries"
@@ -10,53 +10,34 @@ 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=475d589d51a7f8b3ba2ba4eda022b170e562ca3b760ee922c146b6c65856ef39
 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"
+subpackages="libboost_program_options1.79 libboost_math_c99f1.79
+ libboost_stacktrace_basic1.79 libboost_stacktrace_noop1.79
+ libboost_iostreams1.79 libboost_math_tr1l1.79 libboost_filesystem1.79
+ libboost_chrono1.79 libboost_math_tr1f1.79 libboost_wave1.79
+ libboost_graph1.79 libboost_locale1.79 libboost_regex1.79
+ libboost_fiber1.79 libboost_type_erasure1.79 libboost_coroutine1.79
+ libboost_atomic1.79 libboost_prg_exec_monitor1.79 libboost_math_c99-1.79
+ boost-python3-1.79 libboost_log_setup1.79 boost-devel
+ libboost_timer1.79 libboost_system1.79 libboost_unit_test_framework1.79
+ libboost_serialization1.79 libboost_math_tr1-1.79 boost-build
+ libboost_math_c99l1.79 boost-python1.79 libboost_contract1.79
+ libboost_date_time1.79 libboost_log1.79 libboost_random1.79
+ libboost_thread1.79 libboost_container1.79 boost-jam
+ libboost_wserialization1.79 libboost_context1.79 libboost_json1.79
+ libboost_nowide1.79"
 
 if [ -z "$CROSS_BUILD" ]; then
-	subpackages+=" libboost_stacktrace_addr2line1.72"
+	subpackages+=" libboost_stacktrace_addr2line1.79"
 fi
 
 case "$XBPS_TARGET_MACHINE" in
-	i686*)    _arch=x86;      _abi=sysv  ;;
-	x86_64*)  _arch=x86;      _abi=sysv  ;;
-	arm*)     _arch=arm;      _abi=aapcs ;;
-	aarch64*) _arch=arm;      _abi=aapcs ;;
-	mips*)    _arch=mips32r2; _abi=o32   ;;
-	ppc*)     _arch=power;    _abi=sysv  ;;
+	i686*|x86_64*) _arch=x86;      _abi=sysv  ;;
+	arm*|aarch64*) _arch=arm;      _abi=aapcs ;;
+	mips*)         _arch=mips32r2; _abi=o32   ;;
+	ppc*)          _arch=power;    _abi=sysv  ;;
 esac
 
 do_build() {
@@ -66,7 +47,7 @@ do_build() {
 	(
 	# Rebuild bjam for target
 	cd tools/build/src/engine
-	./build.sh gcc
+	./build.sh --cxx="${CXX}" --cxxflags="${CXXFLAGS}" gcc
 	)
 	cat > user-config.jam <<-__EOF
 	using gcc : : ${CXX} : <cxxflags>"${CXXFLAGS}" <linkflags>"${LDFLAGS}" ;
@@ -74,10 +55,8 @@ do_build() {
 	using python : ${py3_ver} : ${XBPS_CROSS_BASE}/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} \
 		threading=multi runtime-link=shared link=shared,static
 }
@@ -119,7 +98,7 @@ boost-jam_package() {
 		vmove usr/bin/b2
 	}
 }
-boost-python1.72_package() {
+boost-python1.79_package() {
 	depends="boost python"
 	replaces="boost-python>=0"
 	short_desc+=" - Python bindings"
@@ -127,7 +106,7 @@ boost-python1.72_package() {
 		vmove "usr/lib/libboost_python2*.so.*"
 	}
 }
-boost-python3-1.72_package() {
+boost-python3-1.79_package() {
 	depends="boost python3"
 	replaces="boost-python3>=0"
 	short_desc+=" - Python3 bindings"
@@ -154,7 +133,7 @@ boost-devel_package() {
 	}
 }
 
-libboost_atomic1.72_package() {
+libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
@@ -162,7 +141,7 @@ libboost_atomic1.72_package() {
 	}
 }
 
-libboost_chrono1.72_package() {
+libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
@@ -170,7 +149,7 @@ libboost_chrono1.72_package() {
 	}
 }
 
-libboost_container1.72_package() {
+libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
@@ -178,7 +157,7 @@ libboost_container1.72_package() {
 	}
 }
 
-libboost_context1.72_package() {
+libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
@@ -186,7 +165,7 @@ libboost_context1.72_package() {
 	}
 }
 
-libboost_contract1.72_package() {
+libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
@@ -194,7 +173,7 @@ libboost_contract1.72_package() {
 	}
 }
 
-libboost_coroutine1.72_package() {
+libboost_coroutine1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
@@ -202,7 +181,7 @@ libboost_coroutine1.72_package() {
 	}
 }
 
-libboost_date_time1.72_package() {
+libboost_date_time1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
@@ -210,7 +189,7 @@ libboost_date_time1.72_package() {
 	}
 }
 
-libboost_fiber1.72_package() {
+libboost_fiber1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_fiber"
 	pkg_install() {
@@ -218,7 +197,7 @@ libboost_fiber1.72_package() {
 	}
 }
 
-libboost_filesystem1.72_package() {
+libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
@@ -226,7 +205,7 @@ libboost_filesystem1.72_package() {
 	}
 }
 
-libboost_graph1.72_package() {
+libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
@@ -234,7 +213,7 @@ libboost_graph1.72_package() {
 	}
 }
 
-libboost_iostreams1.72_package() {
+libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
@@ -242,7 +221,7 @@ libboost_iostreams1.72_package() {
 	}
 }
 
-libboost_locale1.72_package() {
+libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
@@ -250,7 +229,7 @@ libboost_locale1.72_package() {
 	}
 }
 
-libboost_log1.72_package() {
+libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
@@ -258,7 +237,7 @@ libboost_log1.72_package() {
 	}
 }
 
-libboost_log_setup1.72_package() {
+libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
@@ -266,7 +245,7 @@ libboost_log_setup1.72_package() {
 	}
 }
 
-libboost_math_c991.72_package() {
+libboost_math_c99-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
@@ -274,7 +253,7 @@ libboost_math_c991.72_package() {
 	}
 }
 
-libboost_math_c99f1.72_package() {
+libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
@@ -282,7 +261,7 @@ libboost_math_c99f1.72_package() {
 	}
 }
 
-libboost_math_c99l1.72_package() {
+libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
@@ -290,7 +269,7 @@ libboost_math_c99l1.72_package() {
 	}
 }
 
-libboost_math_tr11.72_package() {
+libboost_math_tr1-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
@@ -298,7 +277,7 @@ libboost_math_tr11.72_package() {
 	}
 }
 
-libboost_math_tr1f1.72_package() {
+libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
@@ -306,7 +285,7 @@ libboost_math_tr1f1.72_package() {
 	}
 }
 
-libboost_math_tr1l1.72_package() {
+libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
@@ -314,7 +293,7 @@ libboost_math_tr1l1.72_package() {
 	}
 }
 
-libboost_prg_exec_monitor1.72_package() {
+libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
@@ -322,7 +301,7 @@ libboost_prg_exec_monitor1.72_package() {
 	}
 }
 
-libboost_program_options1.72_package() {
+libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
@@ -330,7 +309,7 @@ libboost_program_options1.72_package() {
 	}
 }
 
-libboost_random1.72_package() {
+libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
@@ -338,7 +317,7 @@ libboost_random1.72_package() {
 	}
 }
 
-libboost_regex1.72_package() {
+libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
@@ -346,7 +325,7 @@ libboost_regex1.72_package() {
 	}
 }
 
-libboost_serialization1.72_package() {
+libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
@@ -354,7 +333,7 @@ libboost_serialization1.72_package() {
 	}
 }
 
-libboost_stacktrace_addr2line1.72_package() {
+libboost_stacktrace_addr2line1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_addr2line"
 	pkg_install() {
@@ -362,7 +341,7 @@ libboost_stacktrace_addr2line1.72_package() {
 	}
 }
 
-libboost_stacktrace_basic1.72_package() {
+libboost_stacktrace_basic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_basic"
 	pkg_install() {
@@ -370,7 +349,7 @@ libboost_stacktrace_basic1.72_package() {
 	}
 }
 
-libboost_stacktrace_noop1.72_package() {
+libboost_stacktrace_noop1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_noop"
 	pkg_install() {
@@ -378,7 +357,7 @@ libboost_stacktrace_noop1.72_package() {
 	}
 }
 
-libboost_system1.72_package() {
+libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
@@ -386,7 +365,7 @@ libboost_system1.72_package() {
 	}
 }
 
-libboost_thread1.72_package() {
+libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
@@ -394,7 +373,7 @@ libboost_thread1.72_package() {
 	}
 }
 
-libboost_timer1.72_package() {
+libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
@@ -402,7 +381,7 @@ libboost_timer1.72_package() {
 	}
 }
 
-libboost_type_erasure1.72_package() {
+libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
@@ -410,7 +389,7 @@ libboost_type_erasure1.72_package() {
 	}
 }
 
-libboost_unit_test_framework1.72_package() {
+libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
@@ -418,7 +397,7 @@ libboost_unit_test_framework1.72_package() {
 	}
 }
 
-libboost_wave1.72_package() {
+libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
@@ -426,10 +405,26 @@ libboost_wave1.72_package() {
 	}
 }
 
-libboost_wserialization1.72_package() {
+libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
 		vmove usr/lib/libboost_wserialization.so.*
 	}
 }
+
+libboost_json1.79_package() {
+	depends="boost"
+	short_desc+=" - libboost_json"
+	pkg_install() {
+		vmove "usr/lib/libboost_json.so.*"
+	}
+}
+
+libboost_nowide1.79_package() {
+	depends="boost"
+	short_desc+=" - libboost_nowide"
+	pkg_install() {
+		vmove "usr/lib/libboost_nowide.so.*"
+	}
+}
diff --git a/srcpkgs/libboost_atomic1.72 b/srcpkgs/libboost_atomic1.79
similarity index 100%
rename from srcpkgs/libboost_atomic1.72
rename to srcpkgs/libboost_atomic1.79
diff --git a/srcpkgs/libboost_chrono1.72 b/srcpkgs/libboost_chrono1.79
similarity index 100%
rename from srcpkgs/libboost_chrono1.72
rename to srcpkgs/libboost_chrono1.79
diff --git a/srcpkgs/libboost_container1.72 b/srcpkgs/libboost_container1.79
similarity index 100%
rename from srcpkgs/libboost_container1.72
rename to srcpkgs/libboost_container1.79
diff --git a/srcpkgs/libboost_context1.72 b/srcpkgs/libboost_context1.79
similarity index 100%
rename from srcpkgs/libboost_context1.72
rename to srcpkgs/libboost_context1.79
diff --git a/srcpkgs/libboost_contract1.72 b/srcpkgs/libboost_contract1.79
similarity index 100%
rename from srcpkgs/libboost_contract1.72
rename to srcpkgs/libboost_contract1.79
diff --git a/srcpkgs/libboost_coroutine1.72 b/srcpkgs/libboost_coroutine1.79
similarity index 100%
rename from srcpkgs/libboost_coroutine1.72
rename to srcpkgs/libboost_coroutine1.79
diff --git a/srcpkgs/libboost_date_time1.72 b/srcpkgs/libboost_date_time1.79
similarity index 100%
rename from srcpkgs/libboost_date_time1.72
rename to srcpkgs/libboost_date_time1.79
diff --git a/srcpkgs/libboost_fiber1.72 b/srcpkgs/libboost_fiber1.79
similarity index 100%
rename from srcpkgs/libboost_fiber1.72
rename to srcpkgs/libboost_fiber1.79
diff --git a/srcpkgs/libboost_filesystem1.72 b/srcpkgs/libboost_filesystem1.79
similarity index 100%
rename from srcpkgs/libboost_filesystem1.72
rename to srcpkgs/libboost_filesystem1.79
diff --git a/srcpkgs/libboost_graph1.72 b/srcpkgs/libboost_graph1.79
similarity index 100%
rename from srcpkgs/libboost_graph1.72
rename to srcpkgs/libboost_graph1.79
diff --git a/srcpkgs/libboost_iostreams1.72 b/srcpkgs/libboost_iostreams1.79
similarity index 100%
rename from srcpkgs/libboost_iostreams1.72
rename to srcpkgs/libboost_iostreams1.79
diff --git a/srcpkgs/libboost_locale1.72 b/srcpkgs/libboost_json1.79
similarity index 100%
rename from srcpkgs/libboost_locale1.72
rename to srcpkgs/libboost_json1.79
diff --git a/srcpkgs/libboost_log1.72 b/srcpkgs/libboost_locale1.79
similarity index 100%
rename from srcpkgs/libboost_log1.72
rename to srcpkgs/libboost_locale1.79
diff --git a/srcpkgs/libboost_log_setup1.72 b/srcpkgs/libboost_log1.79
similarity index 100%
rename from srcpkgs/libboost_log_setup1.72
rename to srcpkgs/libboost_log1.79
diff --git a/srcpkgs/libboost_math_c991.72 b/srcpkgs/libboost_log_setup1.79
similarity index 100%
rename from srcpkgs/libboost_math_c991.72
rename to srcpkgs/libboost_log_setup1.79
diff --git a/srcpkgs/libboost_math_c99f1.72 b/srcpkgs/libboost_math_c99-1.79
similarity index 100%
rename from srcpkgs/libboost_math_c99f1.72
rename to srcpkgs/libboost_math_c99-1.79
diff --git a/srcpkgs/libboost_math_c99l1.72 b/srcpkgs/libboost_math_c99f1.79
similarity index 100%
rename from srcpkgs/libboost_math_c99l1.72
rename to srcpkgs/libboost_math_c99f1.79
diff --git a/srcpkgs/libboost_math_tr11.72 b/srcpkgs/libboost_math_c99l1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr11.72
rename to srcpkgs/libboost_math_c99l1.79
diff --git a/srcpkgs/libboost_math_tr1f1.72 b/srcpkgs/libboost_math_tr1-1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1f1.72
rename to srcpkgs/libboost_math_tr1-1.79
diff --git a/srcpkgs/libboost_math_tr1l1.72 b/srcpkgs/libboost_math_tr1f1.79
similarity index 100%
rename from srcpkgs/libboost_math_tr1l1.72
rename to srcpkgs/libboost_math_tr1f1.79
diff --git a/srcpkgs/libboost_prg_exec_monitor1.72 b/srcpkgs/libboost_math_tr1l1.79
similarity index 100%
rename from srcpkgs/libboost_prg_exec_monitor1.72
rename to srcpkgs/libboost_math_tr1l1.79
diff --git a/srcpkgs/libboost_program_options1.72 b/srcpkgs/libboost_nowide1.79
similarity index 100%
rename from srcpkgs/libboost_program_options1.72
rename to srcpkgs/libboost_nowide1.79
diff --git a/srcpkgs/libboost_random1.72 b/srcpkgs/libboost_prg_exec_monitor1.79
similarity index 100%
rename from srcpkgs/libboost_random1.72
rename to srcpkgs/libboost_prg_exec_monitor1.79
diff --git a/srcpkgs/libboost_regex1.72 b/srcpkgs/libboost_program_options1.79
similarity index 100%
rename from srcpkgs/libboost_regex1.72
rename to srcpkgs/libboost_program_options1.79
diff --git a/srcpkgs/libboost_serialization1.72 b/srcpkgs/libboost_random1.79
similarity index 100%
rename from srcpkgs/libboost_serialization1.72
rename to srcpkgs/libboost_random1.79
diff --git a/srcpkgs/libboost_stacktrace_addr2line1.72 b/srcpkgs/libboost_regex1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_addr2line1.72
rename to srcpkgs/libboost_regex1.79
diff --git a/srcpkgs/libboost_stacktrace_basic1.72 b/srcpkgs/libboost_serialization1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_basic1.72
rename to srcpkgs/libboost_serialization1.79
diff --git a/srcpkgs/libboost_stacktrace_noop1.72 b/srcpkgs/libboost_stacktrace_addr2line1.79
similarity index 100%
rename from srcpkgs/libboost_stacktrace_noop1.72
rename to srcpkgs/libboost_stacktrace_addr2line1.79
diff --git a/srcpkgs/libboost_system1.72 b/srcpkgs/libboost_stacktrace_basic1.79
similarity index 100%
rename from srcpkgs/libboost_system1.72
rename to srcpkgs/libboost_stacktrace_basic1.79
diff --git a/srcpkgs/libboost_thread1.72 b/srcpkgs/libboost_stacktrace_noop1.79
similarity index 100%
rename from srcpkgs/libboost_thread1.72
rename to srcpkgs/libboost_stacktrace_noop1.79
diff --git a/srcpkgs/libboost_timer1.72 b/srcpkgs/libboost_system1.79
similarity index 100%
rename from srcpkgs/libboost_timer1.72
rename to srcpkgs/libboost_system1.79
diff --git a/srcpkgs/libboost_type_erasure1.72 b/srcpkgs/libboost_thread1.79
similarity index 100%
rename from srcpkgs/libboost_type_erasure1.72
rename to srcpkgs/libboost_thread1.79
diff --git a/srcpkgs/libboost_unit_test_framework1.72 b/srcpkgs/libboost_timer1.79
similarity index 100%
rename from srcpkgs/libboost_unit_test_framework1.72
rename to srcpkgs/libboost_timer1.79
diff --git a/srcpkgs/libboost_wave1.72 b/srcpkgs/libboost_type_erasure1.79
similarity index 100%
rename from srcpkgs/libboost_wave1.72
rename to srcpkgs/libboost_type_erasure1.79
diff --git a/srcpkgs/libboost_wserialization1.72 b/srcpkgs/libboost_unit_test_framework1.79
similarity index 100%
rename from srcpkgs/libboost_wserialization1.72
rename to srcpkgs/libboost_unit_test_framework1.79
diff --git a/srcpkgs/libboost_wave1.79 b/srcpkgs/libboost_wave1.79
new file mode 120000
index 000000000000..baef819c48f6
--- /dev/null
+++ b/srcpkgs/libboost_wave1.79
@@ -0,0 +1 @@
+boost
\ No newline at end of file
diff --git a/srcpkgs/libboost_wserialization1.79 b/srcpkgs/libboost_wserialization1.79
new file mode 120000
index 000000000000..baef819c48f6
--- /dev/null
+++ b/srcpkgs/libboost_wserialization1.79
@@ -0,0 +1 @@
+boost
\ No newline at end of file

From 65964e6332e0de203ca4af2b91c27bb9ede2fb83 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Fri, 18 Mar 2022 18:29:05 +0200
Subject: [PATCH 2/6] boost: quote all vmove's with a glob.

---
 srcpkgs/boost/template | 70 +++++++++++++++++++++---------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index ad705311b867..7a9c1c33fa44 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -137,7 +137,7 @@ libboost_atomic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_atomic"
 	pkg_install() {
-		vmove usr/lib/libboost_atomic.so.*
+		vmove "usr/lib/libboost_atomic.so.*"
 	}
 }
 
@@ -145,7 +145,7 @@ libboost_chrono1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_chrono"
 	pkg_install() {
-		vmove usr/lib/libboost_chrono.so.*
+		vmove "usr/lib/libboost_chrono.so.*"
 	}
 }
 
@@ -153,7 +153,7 @@ libboost_container1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_container"
 	pkg_install() {
-		vmove usr/lib/libboost_container.so.*
+		vmove "usr/lib/libboost_container.so.*"
 	}
 }
 
@@ -161,7 +161,7 @@ libboost_context1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_context"
 	pkg_install() {
-		vmove usr/lib/libboost_context.so.*
+		vmove "usr/lib/libboost_context.so.*"
 	}
 }
 
@@ -169,7 +169,7 @@ libboost_contract1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_contract"
 	pkg_install() {
-		vmove usr/lib/libboost_contract.so.*
+		vmove "usr/lib/libboost_contract.so.*"
 	}
 }
 
@@ -177,7 +177,7 @@ libboost_coroutine1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_coroutine"
 	pkg_install() {
-		vmove usr/lib/libboost_coroutine.so.*
+		vmove "usr/lib/libboost_coroutine.so.*"
 	}
 }
 
@@ -185,7 +185,7 @@ libboost_date_time1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_date_time"
 	pkg_install() {
-		vmove usr/lib/libboost_date_time.so.*
+		vmove "usr/lib/libboost_date_time.so.*"
 	}
 }
 
@@ -193,7 +193,7 @@ libboost_fiber1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_fiber"
 	pkg_install() {
-		vmove usr/lib/libboost_fiber.so.*
+		vmove "usr/lib/libboost_fiber.so.*"
 	}
 }
 
@@ -201,7 +201,7 @@ libboost_filesystem1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_filesystem"
 	pkg_install() {
-		vmove usr/lib/libboost_filesystem.so.*
+		vmove "usr/lib/libboost_filesystem.so.*"
 	}
 }
 
@@ -209,7 +209,7 @@ libboost_graph1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_graph"
 	pkg_install() {
-		vmove usr/lib/libboost_graph.so.*
+		vmove "usr/lib/libboost_graph.so.*"
 	}
 }
 
@@ -217,7 +217,7 @@ libboost_iostreams1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_iostreams"
 	pkg_install() {
-		vmove usr/lib/libboost_iostreams.so.*
+		vmove "usr/lib/libboost_iostreams.so.*"
 	}
 }
 
@@ -225,7 +225,7 @@ libboost_locale1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_locale"
 	pkg_install() {
-		vmove usr/lib/libboost_locale.so.*
+		vmove "usr/lib/libboost_locale.so.*"
 	}
 }
 
@@ -233,7 +233,7 @@ libboost_log1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log"
 	pkg_install() {
-		vmove usr/lib/libboost_log.so.*
+		vmove "usr/lib/libboost_log.so.*"
 	}
 }
 
@@ -241,7 +241,7 @@ libboost_log_setup1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_log_setup"
 	pkg_install() {
-		vmove usr/lib/libboost_log_setup.so.*
+		vmove "usr/lib/libboost_log_setup.so.*"
 	}
 }
 
@@ -249,7 +249,7 @@ libboost_math_c99-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99.so.*
+		vmove "usr/lib/libboost_math_c99.so.*"
 	}
 }
 
@@ -257,7 +257,7 @@ libboost_math_c99f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99f.so.*
+		vmove "usr/lib/libboost_math_c99f.so.*"
 	}
 }
 
@@ -265,7 +265,7 @@ libboost_math_c99l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_c99l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_c99l.so.*
+		vmove "usr/lib/libboost_math_c99l.so.*"
 	}
 }
 
@@ -273,7 +273,7 @@ libboost_math_tr1-1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1.so.*
+		vmove "usr/lib/libboost_math_tr1.so.*"
 	}
 }
 
@@ -281,7 +281,7 @@ libboost_math_tr1f1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1f"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1f.so.*
+		vmove "usr/lib/libboost_math_tr1f.so.*"
 	}
 }
 
@@ -289,7 +289,7 @@ libboost_math_tr1l1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_math_tr1l"
 	pkg_install() {
-		vmove usr/lib/libboost_math_tr1l.so.*
+		vmove "usr/lib/libboost_math_tr1l.so.*"
 	}
 }
 
@@ -297,7 +297,7 @@ libboost_prg_exec_monitor1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_prg_exec_monitor"
 	pkg_install() {
-		vmove usr/lib/libboost_prg_exec_monitor.so.*
+		vmove "usr/lib/libboost_prg_exec_monitor.so.*"
 	}
 }
 
@@ -305,7 +305,7 @@ libboost_program_options1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_program_options"
 	pkg_install() {
-		vmove usr/lib/libboost_program_options.so.*
+		vmove "usr/lib/libboost_program_options.so.*"
 	}
 }
 
@@ -313,7 +313,7 @@ libboost_random1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_random"
 	pkg_install() {
-		vmove usr/lib/libboost_random.so.*
+		vmove "usr/lib/libboost_random.so.*"
 	}
 }
 
@@ -321,7 +321,7 @@ libboost_regex1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_regex"
 	pkg_install() {
-		vmove usr/lib/libboost_regex.so.*
+		vmove "usr/lib/libboost_regex.so.*"
 	}
 }
 
@@ -329,7 +329,7 @@ libboost_serialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_serialization"
 	pkg_install() {
-		vmove usr/lib/libboost_serialization.so.*
+		vmove "usr/lib/libboost_serialization.so.*"
 	}
 }
 
@@ -337,7 +337,7 @@ libboost_stacktrace_addr2line1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_addr2line"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_addr2line.so.*
+		vmove "usr/lib/libboost_stacktrace_addr2line.so.*"
 	}
 }
 
@@ -345,7 +345,7 @@ libboost_stacktrace_basic1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_basic"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_basic.so.*
+		vmove "usr/lib/libboost_stacktrace_basic.so.*"
 	}
 }
 
@@ -353,7 +353,7 @@ libboost_stacktrace_noop1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_stacktrace_noop"
 	pkg_install() {
-		vmove usr/lib/libboost_stacktrace_noop.so.*
+		vmove "usr/lib/libboost_stacktrace_noop.so.*"
 	}
 }
 
@@ -361,7 +361,7 @@ libboost_system1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_system"
 	pkg_install() {
-		vmove usr/lib/libboost_system.so.*
+		vmove "usr/lib/libboost_system.so.*"
 	}
 }
 
@@ -369,7 +369,7 @@ libboost_thread1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_thread"
 	pkg_install() {
-		vmove usr/lib/libboost_thread.so.*
+		vmove "usr/lib/libboost_thread.so.*"
 	}
 }
 
@@ -377,7 +377,7 @@ libboost_timer1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_timer"
 	pkg_install() {
-		vmove usr/lib/libboost_timer.so.*
+		vmove "usr/lib/libboost_timer.so.*"
 	}
 }
 
@@ -385,7 +385,7 @@ libboost_type_erasure1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_type_erasure"
 	pkg_install() {
-		vmove usr/lib/libboost_type_erasure.so.*
+		vmove "usr/lib/libboost_type_erasure.so.*"
 	}
 }
 
@@ -393,7 +393,7 @@ libboost_unit_test_framework1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_unit_test_framework"
 	pkg_install() {
-		vmove usr/lib/libboost_unit_test_framework.so.*
+		vmove "usr/lib/libboost_unit_test_framework.so.*"
 	}
 }
 
@@ -401,7 +401,7 @@ libboost_wave1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wave"
 	pkg_install() {
-		vmove usr/lib/libboost_wave.so.*
+		vmove "usr/lib/libboost_wave.so.*"
 	}
 }
 
@@ -409,7 +409,7 @@ libboost_wserialization1.79_package() {
 	depends="boost"
 	short_desc+=" - libboost_wserialization"
 	pkg_install() {
-		vmove usr/lib/libboost_wserialization.so.*
+		vmove "usr/lib/libboost_wserialization.so.*"
 	}
 }
 

From e6f6ae7ece7a32e024afb818108be305703f77b3 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 26 May 2022 18:52:59 +0300
Subject: [PATCH 3/6] uhd: update to 4.2.0.0.

---
 common/shlibs        | 2 +-
 srcpkgs/uhd/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 4dd00983b54f..416f22d54910 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3589,7 +3589,7 @@ libbinpac.so.0 zeek-3.2.4_2
 libllhttp.so.1 llhttp-1.0.1_1
 libpinyin.so.13 libpinyin-2.2.1_1
 libzhuyin.so.13 libzhuyin-2.6.0_3
-libuhd.so.4.0.0 uhd-4.0.0.0_1
+libuhd.so.4.2.0 uhd-4.2.0.0_1
 libeditline.so.1 editline-1.16.0_1
 libgnuradio-rds.so.1 gnuradio-rds-3.8.0_1
 libgnuradio-nrsc5-1.0.0git.so.0.0.0 gnuradio-nrsc5-1.0.0_1
diff --git a/srcpkgs/uhd/template b/srcpkgs/uhd/template
index 5f043162d7dc..685f877dc380 100644
--- a/srcpkgs/uhd/template
+++ b/srcpkgs/uhd/template
@@ -1,6 +1,6 @@
 # Template file for 'uhd'
 pkgname=uhd
-version=4.0.0.0
+version=4.2.0.0
 revision=1
 build_wrksrc=host
 build_style=cmake
@@ -13,7 +13,7 @@ license="GPL-3.0-or-later"
 homepage="https://files.ettus.com/manual/"
 changelog="https://raw.githubusercontent.com/EttusResearch/uhd/master/CHANGELOG"
 distfiles="https://github.com/EttusResearch/uhd/archive/v${version}.tar.gz"
-checksum=4f3513c43edf0178391ed5755266864532716b8b503bcfb9a983ae6256c51b14
+checksum=ad15cedc8a4b9ba78078f1c4c3c179eff8297a08e44928679de896ca42313e6b
 python_version=3
 
 case "${XBPS_TARGET_MACHINE}" in

From 62a6de94c4e2c60c31d2fc9d688604544c6e330e Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 26 May 2022 21:37:30 +0300
Subject: [PATCH 4/6] [WIP] gnuradio: update to 3.10.2.0.

This is most certainly a broken updated packaging for now... probably
just needs a bunch of new dependencies to even build anything useful
while if it doesn't find anything it just builds the bare minimum
(e.g. docs), annoying behavior...
---
 ...6495f3bdf579dae0c26531a16f6adcc7fb2f.patch | 46 -------------------
 ...15d0b26b3c72fab736bcd28a67ab9d1404b7.patch | 28 -----------
 ...befbbe54e55fc4994899e92bcf5bf462fa2f.patch | 31 -------------
 srcpkgs/gnuradio/template                     | 20 ++++----
 4 files changed, 11 insertions(+), 114 deletions(-)
 delete mode 100644 srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch
 delete mode 100644 srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch
 delete mode 100644 srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch

diff --git a/srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch b/srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch
deleted file mode 100644
index 51952bd29b38..000000000000
--- a/srcpkgs/gnuradio/patches/596c6495f3bdf579dae0c26531a16f6adcc7fb2f.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 596c6495f3bdf579dae0c26531a16f6adcc7fb2f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Marcus=20M=C3=BCller?= <mmueller@gnuradio.org>
-Date: Mon, 13 Apr 2020 00:11:59 +0200
-Subject: [PATCH] =?UTF-8?q?pmt:=20conditionalize=20testing=20of=20long=20>?=
- =?UTF-8?q?=202=C2=B3=C2=B2=20on=20sizeof(long)?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- gnuradio-runtime/python/pmt/qa_pmt.py | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/gnuradio-runtime/python/pmt/qa_pmt.py b/gnuradio-runtime/python/pmt/qa_pmt.py
-index 884bba7dd4b..44f616cdae1 100644
---- a/gnuradio-runtime/python/pmt/qa_pmt.py
-+++ b/gnuradio-runtime/python/pmt/qa_pmt.py
-@@ -18,6 +18,10 @@ class test_pmt(unittest.TestCase):
-     MAXINT32 = (2**31)-1
-     MININT32 = (-MAXINT32)-1
- 
-+    def setUp(self):
-+        from ctypes import sizeof, c_long
-+        self.sizeof_long = sizeof(c_long)
-+
-     def test01(self):
-         a = pmt.intern("a")
-         b = pmt.from_double(123765)
-@@ -112,6 +116,8 @@ def test14(self):
-         self.assertEqual(const,pmt.to_long(deser))
- 
-     def test15(self):
-+        if(self.sizeof_long <= 4):
-+            return
-         const = self.MAXINT32 + 1
-         x_pmt = pmt.from_long(const)
-         s = pmt.serialize_str(x_pmt)
-@@ -137,6 +143,8 @@ def test17(self):
-         self.assertEqual(const, x_long)
- 
-     def test18(self):
-+        if(self.sizeof_long <= 4):
-+            return
-         const = self.MININT32 - 1
-         x_pmt = pmt.from_long(const)
-         s = pmt.serialize_str(x_pmt)
diff --git a/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch b/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch
deleted file mode 100644
index c49a047427e8..000000000000
--- a/srcpkgs/gnuradio/patches/aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From aa4b15d0b26b3c72fab736bcd28a67ab9d1404b7 Mon Sep 17 00:00:00 2001
-From: John Sallay <jasallay@gmail.com>
-Date: Sat, 23 Oct 2021 08:26:42 -0400
-Subject: [PATCH] Fix issue 4595 qa_agc Assertion Error.
-
-The number of input elements needs to be disivible by volk_alignment, which it wasn't
-for machines with 512-bit registers.
-
-Signed-off-by: John Sallay <jasallay@gmail.com>
----
- gr-analog/python/analog/qa_agc.py | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/gr-analog/python/analog/qa_agc.py b/gr-analog/python/analog/qa_agc.py
-index a5a8ea47b6a..9368dd5d2a8 100644
---- a/gr-analog/python/analog/qa_agc.py
-+++ b/gr-analog/python/analog/qa_agc.py
-@@ -454,7 +454,9 @@ def test_006(self):
-         tb = self.tb
- 
-         sampling_freq = 100
--        N = int(5*sampling_freq)
-+        # N must by a multiple of the volk_alignment of the system for this test to work.
-+        # For a machine with 512-bit registers, that would be 8 complex-floats.
-+        N = int(8 * sampling_freq)
-         src1 = analog.sig_source_c(sampling_freq, analog.GR_SIN_WAVE,
-                                    sampling_freq * 0.10, 100)
-         dst1 = blocks.vector_sink_c()
diff --git a/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch b/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch
deleted file mode 100644
index 4faa3468140a..000000000000
--- a/srcpkgs/gnuradio/patches/f259befbbe54e55fc4994899e92bcf5bf462fa2f.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f259befbbe54e55fc4994899e92bcf5bf462fa2f Mon Sep 17 00:00:00 2001
-From: alekhgupta1441 <alekhgupta1441@gmail.com>
-Date: Sun, 12 Apr 2020 03:48:14 +0530
-Subject: [PATCH] gr-digital/python : Updated soft_dec_lut_gen.py
-
----
- gr-digital/python/digital/soft_dec_lut_gen.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gr-digital/python/digital/soft_dec_lut_gen.py b/gr-digital/python/digital/soft_dec_lut_gen.py
-index 4503c4fea7b..84f6de66e45 100644
---- a/gr-digital/python/digital/soft_dec_lut_gen.py
-+++ b/gr-digital/python/digital/soft_dec_lut_gen.py
-@@ -73,7 +73,7 @@ def soft_dec_table_generator(soft_dec_gen, prec, Es=1):
- 
-     '''
- 
--    npts = 2.0**prec
-+    npts = int(2.0**prec)
-     maxd = Es*numpy.sqrt(2.0)/2.0
-     yrng = numpy.linspace(-maxd, maxd, npts)
-     xrng = numpy.linspace(-maxd, maxd, npts)
-@@ -110,7 +110,7 @@ def soft_dec_table(constel, symbols, prec, npwr=1):
-     re_max = max(numpy.array(constel).real)
-     im_max = max(numpy.array(constel).imag)
- 
--    npts = 2.0**prec
-+    npts = int(2.0**prec)
-     yrng = numpy.linspace(im_min, im_max, npts)
-     xrng = numpy.linspace(re_min, re_max, npts)
- 
diff --git a/srcpkgs/gnuradio/template b/srcpkgs/gnuradio/template
index c950b53e8bea..b47325cb6034 100644
--- a/srcpkgs/gnuradio/template
+++ b/srcpkgs/gnuradio/template
@@ -1,10 +1,12 @@
 # Template file for 'gnuradio'
 pkgname=gnuradio
-version=3.8.0.0
-revision=9
+version=3.10.2.0
+revision=1
 build_style=cmake
-conf_files="/etc/gnuradio/conf.d/*"
-configure_args="-DENABLE_INTERNAL_VOLK=OFF -DGR_PYTHON_DIR=/${py3_sitelib}"
+# FIXME: '/etc/gnuradio/conf.d/*' configuration file not in PKGDESTDIR!
+#conf_files="/etc/gnuradio/conf.d/*"
+configure_args="-DGR_PYTHON_DIR=/${py3_sitelib}"
+# TODO: https://pypi.org/project/schema/ as new build/runtime dep since v3.10.2.0?
 hostmakedepends="pkg-config doxygen swig python3-Mako python3-Sphinx
  python3-cairo python3-numpy python3-yaml texlive texlive-latexextra texlive-dvi"
 makedepends="SDL-devel boost-devel fftw-devel gsl-devel jack-devel
@@ -18,12 +20,10 @@ maintainer="Andrew Benson <abenson+void@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.gnuradio.org"
 distfiles="https://github.com/gnuradio/gnuradio/archive/v${version}.tar.gz"
-checksum=03fd01f0b27033befb91709b3d56f95e0869b5fb8bc71bec2662266a3f0dedf5
+checksum=a8f6c1cc98bc3784aa70ab29d3039ad6922ec36f908ecfb2c904a597b32c0776
 python_version=3
 
 post_install() {
-	rm ${DESTDIR}/usr/share/gnuradio/examples/audio/dial_tone \
-		${DESTDIR}/usr/share/gnuradio/examples/uhd/tags_demo
 	vinstall grc/scripts/freedesktop/gnuradio-grc.desktop 644 \
 		usr/share/applications
 	vinstall grc/scripts/freedesktop/gnuradio_logo_icon-square.svg 644 \
@@ -42,8 +42,10 @@ gnuradio-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include
-		vmove "usr/lib/*.so"
+		# FIXME: there's no shared objects at all anymore?!
+		#vmove "usr/lib/*.so"
 		vmove usr/lib/cmake
-		vmove usr/lib/pkgconfig
+		# FIXME: it looks like pkgconfig files aren't installed even though *.pc.in files do exist
+		#vmove usr/lib/pkgconfig
 	}
 }

From 63b1b74d3cf0c5ae5256f6063231759322d06600 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 9 Jun 2022 02:43:52 +0300
Subject: [PATCH 5/6] [WIP] Aegisub: upgrade to 3.3.2r8112.

WIP because upstream should really make a new release, packaging tip of
dev branch just to be able to build is kind of dumb.

This also seemed to fix cross builds as tested from x86_64-musl host to
aarch64-musl target.
---
 .../allow-cmake-builds-from-tarball.patch     | 56 --------------
 .../remove-busted-luajit-vendor-pt2.patch     | 11 +++
 .../patches/remove-busted-luajit-vendor.patch | 75 ++++++++++++-------
 srcpkgs/Aegisub/template                      | 14 ++--
 4 files changed, 67 insertions(+), 89 deletions(-)
 delete mode 100644 srcpkgs/Aegisub/patches/allow-cmake-builds-from-tarball.patch
 create mode 100644 srcpkgs/Aegisub/patches/remove-busted-luajit-vendor-pt2.patch

diff --git a/srcpkgs/Aegisub/patches/allow-cmake-builds-from-tarball.patch b/srcpkgs/Aegisub/patches/allow-cmake-builds-from-tarball.patch
deleted file mode 100644
index 705965ca1df9..000000000000
--- a/srcpkgs/Aegisub/patches/allow-cmake-builds-from-tarball.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From dee94396eee4b67eafae7f00e540cb284769473d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=89rico=20Nogueira?= <erico.erc@gmail.com>
-Date: Wed, 15 Sep 2021 23:54:10 -0300
-Subject: [PATCH] Allow CMake builds from tarball.
-
-Add environment variable that can be passed to build/version.sh to force
-a git version if it can't use git to determine one.
-
-Since we are here, also fix:
-
-- use of 'return' in a script, should be 'exit'
-- wrong grep command to match numerical version with 3 digits
----
- build/version.sh | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/build/version.sh b/build/version.sh
-index 8cea0a3f3..d505341e4 100755
---- a/build/version.sh
-+++ b/build/version.sh
-@@ -10,13 +10,13 @@ if ! test -d "${srcdir}/.git"; then
-     done < "${version_h_path}"
-     if test x$BUILD_GIT_VERSION_NUMBER != x -a x$BUILD_GIT_VERSION_STRING != x; then
-       export VERSION_SOURCE="from cached git_version.h"
--      return 0
-+      exit 0
-     else
-       echo "invalid git_version.h"
-       exit 2
-     fi
--  else
--    echo "git repo not found and no cached git_version.h"
-+  elif [ -z "$FORCE_GIT_VERSION" ]; then
-+    echo "git repo not found and no cached git_version.h - use FORCE_GIT_VERSION to override"
-     exit 2
-   fi
- fi
-@@ -25,13 +25,13 @@ last_svn_revision=6962
- last_svn_hash="16cd907fe7482cb54a7374cd28b8501f138116be"
- 
- git_revision=$(expr $last_svn_revision + $(git log --pretty=oneline $last_svn_hash..HEAD 2>/dev/null | wc -l))
--git_version_str=$(git describe --exact-match 2> /dev/null)
-+git_version_str=${FORCE_GIT_VERSION:-$(git describe --exact-match 2> /dev/null)}
- installer_version='0.0.0'
- resource_version='0, 0, 0'
- if test x$git_version_str != x; then
-   git_version_str="${git_version_str##v}"
-   tagged_release=1
--  if [ $(echo $git_version_str | grep '\d\.\d\.\d') ]; then
-+  if [ $(echo $git_version_str | grep '[0-9].[0-9].[0-9]') ]; then
-     installer_version=$git_version_str
-     resource_version=$(echo $git_version_str | sed 's/\./, /g')
-   fi
--- 
-2.33.0
-
diff --git a/srcpkgs/Aegisub/patches/remove-busted-luajit-vendor-pt2.patch b/srcpkgs/Aegisub/patches/remove-busted-luajit-vendor-pt2.patch
new file mode 100644
index 000000000000..b9faefee2275
--- /dev/null
+++ b/srcpkgs/Aegisub/patches/remove-busted-luajit-vendor-pt2.patch
@@ -0,0 +1,11 @@
+diff --color -ru a/vendor/luabins/CMakeLists.txt b/vendor/luabins/CMakeLists.txt
+--- a/vendor/luabins/CMakeLists.txt	2022-06-09 02:01:24.456929000 +0300
++++ b/vendor/luabins/CMakeLists.txt	2022-06-09 02:09:36.408047000 +0300
+@@ -36,4 +36,5 @@
+     src/savebuffer.c
+     src/write.c
+ )
+-target_link_libraries(luabins PRIVATE luajit)
+\ No newline at end of file
++target_include_directories(luabins PUBLIC ${LUAJIT_INCLUDE_DIRS})
++target_link_libraries(luabins PRIVATE ${LUAJIT_LIBRARIES})
diff --git a/srcpkgs/Aegisub/patches/remove-busted-luajit-vendor.patch b/srcpkgs/Aegisub/patches/remove-busted-luajit-vendor.patch
index 3ee7588647ca..d4ef5804eea2 100644
--- a/srcpkgs/Aegisub/patches/remove-busted-luajit-vendor.patch
+++ b/srcpkgs/Aegisub/patches/remove-busted-luajit-vendor.patch
@@ -12,7 +12,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 4614f6d..0e7bc81 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -3,6 +3,10 @@ cmake_policy(SET CMP0074 NEW)
+@@ -4,6 +4,10 @@
  
  project(Aegisub)
  
@@ -23,10 +23,11 @@ index 4614f6d..0e7bc81 100644
  list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
  
  # Explicitly set the build type to Release if no other type is specified
-@@ -12,181 +16,6 @@ if(NOT CMAKE_BUILD_TYPE)
+@@ -13,210 +17,6 @@
      set(CMAKE_BUILD_TYPE Release)
  endif()
  
+-## Build bundled LuaJIT with aegisub specific patches
 -add_executable(luajit-minilua vendor/luajit/src/host/minilua.c)
 -if(NOT WIN32)
 -    target_link_libraries(luajit-minilua m)
@@ -47,6 +48,22 @@ index 4614f6d..0e7bc81 100644
 -            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
 -        )
 -    endif()
+-elseif(APPLE)
+-    if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64")
+-        add_custom_command(
+-            OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h"
+-            COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen"
+-            COMMAND luajit-minilua ../dynasm/dynasm.lua -D ENDIAN_LE -D P64 -D FFI -D DUALNUM -D FPU -D HFABI -D NO_UNWIND -D VER=80 -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" vm_arm64.dasc
+-            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
+-        )
+-    else()
+-        add_custom_command(
+-            OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h"
+-            COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen"
+-            COMMAND luajit-minilua ../dynasm/dynasm.lua -D P64 -D JIT -D FFI -D FPU -D HFABI -D VER= -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen/buildvm_arch.h" vm_x64.dasc
+-            WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/vendor/luajit/src
+-        )
+-    endif()
 -else()
 -    if(CMAKE_SIZEOF_VOID_P EQUAL 8)
 -        add_custom_command(
@@ -76,7 +93,13 @@ index 4614f6d..0e7bc81 100644
 -)
 -target_compile_definitions(luajit-buildvm PRIVATE LUAJIT_ENABLE_LUA52COMPAT)
 -target_include_directories(luajit-buildvm PRIVATE vendor/luajit/src "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/gen")
--if(UNIX)
+-
+-if(APPLE)
+-    add_custom_command(
+-        OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s"
+-        COMMAND luajit-buildvm -m machasm -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s"
+-    )
+-elseif(UNIX)
 -    add_custom_command(
 -        OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s"
 -        COMMAND luajit-buildvm -m elfasm -o "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s"
@@ -197,21 +220,32 @@ index 4614f6d..0e7bc81 100644
 -if(WIN32)
 -    target_sources(luajit PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.obj")
 -else()
+-    enable_language(ASM)
 -    target_sources(luajit PRIVATE "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s")
--    set_property(SOURCE "${CMAKE_CURRENT_BINARY_DIR}/vendor/luajit/src/lj_vm.s" PROPERTY LANGUAGE C)
 -    target_link_libraries(luajit ${CMAKE_DL_LIBS})
 -endif()
+-if(APPLE)
+-    if(NOT CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "arm64")
+-        target_compile_definitions(luajit-buildvm PRIVATE LUAJIT_ENABLE_GC64)
+-        target_compile_definitions(luajit PRIVATE LUAJIT_ENABLE_GC64)
+-    endif()
+-endif()
 -
  add_subdirectory(vendor/luabins)
  
- add_library(libaegisub STATIC
-@@ -264,20 +93,20 @@ elseif(WIN32)
+ ## libaegisub
+@@ -303,25 +103,25 @@
  endif()
  set_target_properties(libaegisub PROPERTIES PREFIX "")
  target_compile_definitions(libaegisub PRIVATE CMAKE_BUILD)
 -target_include_directories(libaegisub PUBLIC "libaegisub/include")
 +target_include_directories(libaegisub PUBLIC ${LUAJIT_INCLUDE_DIRS} "libaegisub/include")
- target_precompile_headers(libaegisub PRIVATE "libaegisub/lagi_pre.h")
+ if(APPLE)
+     # CMake on macOS currently does not support pch with objc, so use the old way
+     target_compile_options(libaegisub PRIVATE -include "${PROJECT_SOURCE_DIR}/libaegisub/lagi_pre.h")
+ else()
+     target_precompile_headers(libaegisub PRIVATE "libaegisub/lagi_pre.h")
+ endif()
 -target_link_libraries(libaegisub PRIVATE luajit luabins)
 +target_link_libraries(libaegisub PRIVATE ${LUAJIT_LIBRARIES} luabins)
  
@@ -230,7 +264,7 @@ index 4614f6d..0e7bc81 100644
      WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/src/bitmaps
  )
  
-@@ -451,8 +280,9 @@ add_executable(Aegisub WIN32
+@@ -496,8 +296,9 @@
      src/video_slider.cpp
      src/visual_feature.cpp
  )
@@ -239,29 +273,14 @@ index 4614f6d..0e7bc81 100644
  target_compile_definitions(Aegisub PRIVATE CMAKE_BUILD)
 +target_include_directories(Aegisub PUBLIC ${LUAJIT_INCLUDE_DIRS})
  target_include_directories(Aegisub PRIVATE "src/libresrc" "${CMAKE_CURRENT_BINARY_DIR}/src/libresrc")
- target_precompile_headers(Aegisub PRIVATE "src/agi_pre.h")
- 
-@@ -776,7 +606,7 @@ message(STATUS "\n"
-     "  FFTW3:                 ${WITH_FFTW3}\n"
+ if(APPLE)
+     # CMake on macOS currently does not support pch with objc, so use the old way
+@@ -877,7 +678,7 @@
      "  Hunspell:              ${WITH_HUNSPELL}\n"
      "  uchardet:              ${WITH_UCHARDET}\n"
+     "  wxStyledTextCtrl:      ${WITH_WXSTC}\n"
 -    "  LuaJIT:                bundled\n"
 +    "  LuaJIT:                unfucked\n"
      "\n"
      "Options\n"
-     "  Startup log:           ${WITH_STARTUPLOG}\n"
-diff --git a/vendor/luabins/CMakeLists.txt b/vendor/luabins/CMakeLists.txt
-index 1fe1d20..e68403c 100644
---- a/vendor/luabins/CMakeLists.txt
-+++ b/vendor/luabins/CMakeLists.txt
-@@ -36,4 +36,5 @@ add_library(luabins STATIC
-     src/savebuffer.c
-     src/write.c
- )
--target_link_libraries(luabins PRIVATE luajit)
-\ No newline at end of file
-+target_include_directories(luabins PUBLIC ${LUAJIT_INCLUDE_DIRS})
-+target_link_libraries(luabins PRIVATE ${LUAJIT_LIBRARIES})
--- 
-2.33.0
-
+     "  Translations:          ${WITH_TRANSLATION}\n"
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 1583c4853b9b..86f9b8312226 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,12 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
-version=3.3.2
-revision=3
+# FIXME: wait for new upstream release, v3.3.2 tag doesn't link against modern boost!
+# /usr/bin/ld: CMakeFiles/Aegisub.dir/src/search_replace_engine.cpp.o: undefined reference to symbol '_ZN6icu_708Collator14createInstanceERKNS_6LocaleER10UErrorCode'
+# /usr/bin/ld: /lib64/libicui18n.so.70: error adding symbols: DSO missing from command line
+version=3.3.2r8112
+revision=1
+_commit=aa1e63f5bfed688711d8b46bf5dbd807d1c07300
+wrksrc="Aegisub-${_commit}"
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3
 cmake_builddir="BUILD"
@@ -17,9 +22,8 @@ short_desc="Subtitle editor (ssa, ass, srt)"
 maintainer="pudiva <rogi@skylittlesystem.org>"
 license="BSD-3-Clause, MIT"
 homepage="https://github.com/wangqr/Aegisub"
-distfiles="https://github.com/wangqr/Aegisub/archive/v${version}.tar.gz"
-checksum="9aaab8e66cef2a72368c6b7f79b2f99700321a7b9a1ca623c5e6be0e65418db5"
-nocross="lots of errors like: undefined reference to boost::icu_regex_traits::isctype..."
+distfiles="https://github.com/wangqr/Aegisub/archive/${_commit}.tar.gz"
+checksum="a2073a57efa717e7e6ba8021727779e9695601e96127d5d5c4d0fb749174f2b9"
 
 build_options="fftw openal portaudio"
 build_options_default="fftw"

From 1bc1da0421254b230d39c147093e3a36839805c6 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Thu, 9 Jun 2022 03:24:15 +0300
Subject: [PATCH 6/6] PrusaSlicer: update to 2.4.2.

Also fixes update checking and compile against boost 1.79.

[ci skip] the PR is still WIP
---
 .../PrusaSlicer/patches/0003-boost-1.79.patch | 89 +++++++++++++++++++
 srcpkgs/PrusaSlicer/template                  |  6 +-
 srcpkgs/PrusaSlicer/update                    |  3 +
 3 files changed, 95 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/PrusaSlicer/patches/0003-boost-1.79.patch
 create mode 100644 srcpkgs/PrusaSlicer/update

diff --git a/srcpkgs/PrusaSlicer/patches/0003-boost-1.79.patch b/srcpkgs/PrusaSlicer/patches/0003-boost-1.79.patch
new file mode 100644
index 000000000000..ff7988bc4e4d
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/0003-boost-1.79.patch
@@ -0,0 +1,89 @@
+Combines the following upstream boost 1.79.0 compile fixes:
+- https://github.com/prusa3d/PrusaSlicer/commit/408e56f0390f20aaf793e0aa0c70c4d9544401d4
+- https://github.com/prusa3d/PrusaSlicer/commit/926ae0471800abd1e5335e251a5934570eb8f6ff
+---
+diff --git a/src/hints/HintsToPot.cpp b/src/hints/HintsToPot.cpp
+index 7c8029cdeb..4791f0612f 100644
+--- a/src/hints/HintsToPot.cpp
++++ b/src/hints/HintsToPot.cpp
+@@ -9,7 +9,7 @@
+ 
+ bool write_to_pot(boost::filesystem::path path, const std::vector<std::pair<std::string, std::string>>& data)
+ {
+-	boost::filesystem::ofstream file(std::move(path), std::ios_base::app);
++	boost::nowide::ofstream file(path.string(), std::ios_base::app);
+ 	for (const auto& element : data)
+ 	{
+ 		//Example of .pot element 
+diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp
+index f3a1c15b3e..f171cb14dd 100644
+--- a/src/libslic3r/Preset.cpp
++++ b/src/libslic3r/Preset.cpp
+@@ -84,7 +84,7 @@ ConfigFileType guess_config_file_type(const ptree &tree)
+ VendorProfile VendorProfile::from_ini(const boost::filesystem::path &path, bool load_all)
+ {
+     ptree tree;
+-    boost::filesystem::ifstream ifs(path);
++    boost::nowide::ifstream ifs(path.string());
+     boost::property_tree::read_ini(ifs, tree);
+     return VendorProfile::from_ini(tree, path, load_all);
+ }
+diff --git a/src/slic3r/GUI/HintNotification.cpp b/src/slic3r/GUI/HintNotification.cpp
+index 93e0fb3259..820b74eedb 100644
+--- a/src/slic3r/GUI/HintNotification.cpp
++++ b/src/slic3r/GUI/HintNotification.cpp
+@@ -14,12 +14,14 @@
+ #include "libslic3r/Config.hpp"
+ #include "libslic3r/PrintConfig.hpp"
+ 
++#include <map>
++
+ #include <boost/algorithm/string/replace.hpp>
+ #include <boost/filesystem.hpp>
+ #include <boost/nowide/fstream.hpp>
+ #include <boost/log/trivial.hpp>
+ #include <boost/property_tree/ini_parser.hpp>
+-#include <map>
++
+ #include <cereal/archives/binary.hpp>
+ #include <cereal/types/string.hpp>
+ #include <cereal/types/vector.hpp>
+@@ -65,7 +67,7 @@ inline void push_style_color(ImGuiCol idx, const ImVec4& col, bool fading_out, f
+ 
+ void write_used_binary(const std::vector<std::string>& ids)
+ {
+-	boost::filesystem::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal"), std::ios::binary);
++	boost::nowide::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal").string(), std::ios::binary);
+ 	cereal::BinaryOutputArchive archive(file);
+ 		HintsCerealData cd { ids };
+ 	try
+@@ -84,7 +86,7 @@ void read_used_binary(std::vector<std::string>& ids)
+ 		BOOST_LOG_TRIVIAL(warning) << "Failed to load to hints.cereal. File does not exists. " << path.string();
+ 		return;
+ 	}
+-	boost::filesystem::ifstream file(path);
++	boost::nowide::ifstream file(path.string());
+ 	cereal::BinaryInputArchive archive(file);
+ 	HintsCerealData cd;
+ 	try
+diff --git a/tests/fff_print/test_data.cpp b/tests/fff_print/test_data.cpp
+index 32e31c264c..f7077007db 100644
+--- a/tests/fff_print/test_data.cpp
++++ b/tests/fff_print/test_data.cpp
+@@ -11,6 +11,7 @@
+ #include <string>
+ 
+ #include <boost/nowide/cstdio.hpp>
++#include <boost/nowide/fstream.hpp>
+ #include <boost/filesystem.hpp>
+ #include <libslic3r/ModelArrange.hpp>
+ 
+@@ -286,7 +287,7 @@ std::string gcode(Print & print)
+     print.set_status_silent();
+     print.process();
+     print.export_gcode(temp.string(), nullptr, nullptr);
+-    std::ifstream t(temp.string());
++    boost::nowide::ifstream t(temp.string());
+ 	std::string str((std::istreambuf_iterator<char>(t)), std::istreambuf_iterator<char>());
+ 	boost::nowide::remove(temp.string().c_str());
+ 	return str;
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 46cd9d3dede6..e6b6f01b5e1c 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
-version=2.4.0
-revision=2
+version=2.4.2
+revision=1
 wrksrc="PrusaSlicer-version_${version}"
 build_style=cmake
 build_helper="qemu"
@@ -16,7 +16,7 @@ maintainer="Jasper Chan <jasperchan515@gmail.com>"
 license="GPL-3.0-or-later"
 homepage="https://www.prusa3d.com/prusaslicer/"
 distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=906d0acf0d0e064ae3cbaa16ba1a2e24dd9c32ceb2121464cb4d5951c09e66c2
+checksum=ac3a77212260e8d0baf9df027c29e0ae965bc77f371e59fd27b8fe103ebb1f23
 nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/25230/steps/shell_3/logs/stdio"
 
 post_extract() {
diff --git a/srcpkgs/PrusaSlicer/update b/srcpkgs/PrusaSlicer/update
new file mode 100644
index 000000000000..18b2a1e99b40
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/update
@@ -0,0 +1,3 @@
+site='https://github.com/prusa3d/PrusaSlicer/tags.atom'
+pattern='version_\K.*(?=<)'
+ignore='*alpha* *beta* *rc*'

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: boost: update to 1.79.0.
  2022-03-18 14:28 [PR PATCH] boost: update to 1.79.0.b1 JamiKettunen
                   ` (24 preceding siblings ...)
  2022-06-09  0:26 ` JamiKettunen
@ 2022-07-06 11:26 ` atweiden
  2022-08-27  3:35 ` classabbyamp
                   ` (2 subsequent siblings)
  28 siblings, 0 replies; 30+ messages in thread
From: atweiden @ 2022-07-06 11:26 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 279 bytes --]

New comment by atweiden on void-packages repository

https://github.com/void-linux/void-packages/pull/36204#issuecomment-1176106195

Comment:
> cryfs (fails on `do_build()`)

cryfs builds succeed with [boost-1.79.0](https://github.com/atweiden/voidpkgs/tree/cryfs-boost1.79.0)

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: boost: update to 1.79.0.
  2022-03-18 14:28 [PR PATCH] boost: update to 1.79.0.b1 JamiKettunen
                   ` (25 preceding siblings ...)
  2022-07-06 11:26 ` atweiden
@ 2022-08-27  3:35 ` classabbyamp
  2022-08-27 19:21 ` [PR PATCH] [Closed]: " JamiKettunen
  2022-08-27 19:21 ` JamiKettunen
  28 siblings, 0 replies; 30+ messages in thread
From: classabbyamp @ 2022-08-27  3:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 242 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/36204#issuecomment-1229113266

Comment:
can we look into removing the python2 boost subpkg? it seems there's currently nothing using it

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: boost: update to 1.79.0.
  2022-03-18 14:28 [PR PATCH] boost: update to 1.79.0.b1 JamiKettunen
                   ` (27 preceding siblings ...)
  2022-08-27 19:21 ` [PR PATCH] [Closed]: " JamiKettunen
@ 2022-08-27 19:21 ` JamiKettunen
  28 siblings, 0 replies; 30+ messages in thread
From: JamiKettunen @ 2022-08-27 19:21 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 174 bytes --]

New comment by JamiKettunen on void-packages repository

https://github.com/void-linux/void-packages/pull/36204#issuecomment-1229250614

Comment:
Closing in favor of #38949.

^ permalink raw reply	[flat|nested] 30+ messages in thread

* Re: [PR PATCH] [Closed]: boost: update to 1.79.0.
  2022-03-18 14:28 [PR PATCH] boost: update to 1.79.0.b1 JamiKettunen
                   ` (26 preceding siblings ...)
  2022-08-27  3:35 ` classabbyamp
@ 2022-08-27 19:21 ` JamiKettunen
  2022-08-27 19:21 ` JamiKettunen
  28 siblings, 0 replies; 30+ messages in thread
From: JamiKettunen @ 2022-08-27 19:21 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 3786 bytes --]

There's a closed pull request on the void-packages repository

boost: update to 1.79.0.
https://github.com/void-linux/void-packages/pull/36204

Description:
[ci skip]

#### Packages to fix (from `xrevshlib boost` as locally build-tested on `x86_64-musl`)
- [x] Aegisub (fails on `do_build()`) - awaiting new upstream release, tip of `dev` branch builds
- [x] PrusaSlicer (fails on `do_build()`) - backported upstream boost 1.79 compile fixes to v2.4.2
- [ ] TSC (fails on `do_build()`)
- [ ] cryfs (fails on `do_build()`)
- [ ] fifengine (fails on `do_build()`)
- [x] uhd (fails on `do_build()`)
  - [ ] gnuradio (failed on `do_build()`, updating to [v3.10.2.0](https://github.com/gnuradio/gnuradio/releases/tag/v3.10.2.0) appears to have disabled building a lot of components including all shared objects and pkg-config files for example, probably just a bunch of missing new "optional" build-time dependencies...)
    - [ ] gnuradio-osmosdr (depends on `gnuradio`)
- [ ] imagescan (fails on `do_build()`)
- [ ] kea (fails on `do_build()`)
- [ ] ledger (fails on `do_build()`)
- [ ] libbitcoin-system (fails on `do_build()`)
  - [ ] libbitcoin-database (depends on `libbitcoin-system`)
    - [ ] libbitcoin-blockchain (depends on `libbitcoin-database`)
      - [ ] libbitcoin-node (depends on `libbitcoin-blockchain`)
      - [ ] libbitcoin-server (depends on `libbitcoin-blockchain`)
  - [ ] libbitcoin-protocol (depends on `libbitcoin-system`)
    - [ ] libbitcoin-client (depends on `libbitcoin-protocol`)
      - [ ] libbitcoin-explorer (depends on `libbitcoin-client`)
  - [ ] libbitcoin-network (depends on `libbitcoin-system`)
- [ ] libetonyek (fails on `do_build()`, appears to need `-std=c++17` or higher? `NUM3Parser.cpp:46:8: error: 'for_each' is not a member of 'std'`)
  - [ ] libreoffice (depends on `libetonyek`)
- [ ] librime (fails on `do_build()`)
- [ ] namecoin (fails on `do_build()`)
- [ ] pulseeffects-legacy (fails on `do_build()`)
- [ ] supercollider (fails on `do_build()`)
- [ ] leatherman (hangs on `do_check()`, test process pinned one core at 100% for 10 minutes)
  - [x] facter (depends on `leatherman`)
- [ ] inkscape (fails on `do_check()`)
- [ ] libtorrent-rasterbar (hangs on `do_check()`, 90/97 test_web_seed_http stuck for 10 minutes)
- [ ] schroot (fails on `do_check()`)
- [ ] bitcoin (fails on `do_check()`)

#### Packages to fix (from `xrevshlib uhd` as locally build-tested on `x86_64-musl`)
- [ ] urh (fails on `do_check()` even after adding `checkdepends="python3-pip"`)

#### Modified patches (boost)
`exec_file.patch`: Removed due to being upstream as https://github.com/boostorg/python/commit/d9f06052e28873037db7f98629bce72182a42410
`mips.patch`: Updated to apply on top of https://github.com/boostorg/fiber/commit/5dc9dabc5d5ff8da53ec897c265c9cba1b6ed0df, not sure if this can be removed now(?)

#### Misc changes
- I've renamed all subpackages of `boost` so that the versioned name doesn't conflict with other numbers and are consistent with the previously existing `boost-python3-1.72`, e.g. `libboost_math_c991.72` is now `libboost_math_c99-1.79` (notice the `-`!)

#### Testing the changes
- I tested the changes in this PR: **NO**

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](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] 30+ messages in thread

end of thread, other threads:[~2022-08-27 19:21 UTC | newest]

Thread overview: 30+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-03-18 14:28 [PR PATCH] boost: update to 1.79.0.b1 JamiKettunen
2022-03-18 14:32 ` [PR REVIEW] " ahesford
2022-03-18 14:32 ` ahesford
2022-03-18 14:37 ` Johnnynator
2022-03-18 14:38 ` [PR PATCH] [Updated] " JamiKettunen
2022-03-18 16:32 ` JamiKettunen
2022-03-18 16:33 ` [PR REVIEW] " JamiKettunen
2022-03-18 16:42 ` [PR PATCH] [Updated] " JamiKettunen
2022-03-18 17:58 ` JamiKettunen
2022-03-18 23:32 ` JamiKettunen
2022-03-18 23:33 ` JamiKettunen
2022-03-19 12:39 ` JamiKettunen
2022-04-08  3:00 ` q66
2022-05-04 15:22 ` loreb
2022-05-26 15:22 ` [PR PATCH] [Updated] " JamiKettunen
2022-05-26 15:29 ` [PR PATCH] [Updated] boost: update to 1.79.0 JamiKettunen
2022-05-26 16:21 ` JamiKettunen
2022-05-26 18:41 ` JamiKettunen
2022-05-26 20:27 ` JamiKettunen
2022-05-26 20:29 ` JamiKettunen
2022-05-27 16:20 ` JamiKettunen
2022-05-27 16:21 ` JamiKettunen
2022-06-08 22:18 ` JamiKettunen
2022-06-08 23:46 ` JamiKettunen
2022-06-08 23:47 ` JamiKettunen
2022-06-09  0:26 ` JamiKettunen
2022-07-06 11:26 ` atweiden
2022-08-27  3:35 ` classabbyamp
2022-08-27 19:21 ` [PR PATCH] [Closed]: " JamiKettunen
2022-08-27 19:21 ` JamiKettunen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).