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

[JamiKettunen <JamiKettunen@users.noreply.github.com>]

[-- 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