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"