[us-commits] [ehb54/ultrascan3] 435b89: Bump version to 4.2.0-dev

aaron-auc noreply at github.com
Tue Jul 21 14:32:30 MDT 2026 

  Branch: refs/heads/875-request-cmake-remove-gmp-module-from-installer-for-osx
  Home:   https://github.com/ehb54/ultrascan3
  Commit: 435b89afe6c30e42df5aba726ea83b875be9a649
      https://github.com/ehb54/ultrascan3/commit/435b89afe6c30e42df5aba726ea83b875be9a649
  Author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
  Date:   2026-07-02 (Thu, 02 Jul 2026)

  Changed paths:
    M VERSION
    M utils/us_defines.h

  Log Message:
  -----------
  Bump version to 4.2.0-dev


  Commit: a2f9d27b561cba63475ff3dda2637d308c1654e9
      https://github.com/ehb54/ultrascan3/commit/a2f9d27b561cba63475ff3dda2637d308c1654e9
  Author: aaron-auc <aaron at aucsolutions.com>
  Date:   2026-07-10 (Fri, 10 Jul 2026)

  Changed paths:
    R etc/beckman_logo.png
    M etc/etc_belongs_list.txt
    R etc/logo_hsc.png
    M programs/us_reporter/us_reporter.cpp
    M programs/us_reporter/us_reporter.h

  Log Message:
  -----------
  fix: remove unused logo handling from US_Reporter


  Commit: 0b31fc702d62f9465a90923164934c2f0021d61b
      https://github.com/ehb54/ultrascan3/commit/0b31fc702d62f9465a90923164934c2f0021d61b
  Author: aaron-auc <95181880+aaron-auc at users.noreply.github.com>
  Date:   2026-07-20 (Mon, 20 Jul 2026)

  Changed paths:
    A .github/workflows/build-macos-arm.yml
    A .github/workflows/build-macos-intel.yml
    A .github/workflows/build-oraclelinux.yml
    A .github/workflows/build-ubuntu.yml
    A .github/workflows/build-windows.yml
    M .github/workflows/codeql-analysis.yml
    M .github/workflows/doc-build.yml
    A .github/workflows/nightly-build.yml
    A .github/workflows/on-demand-build.yml
    A .github/workflows/release.yml
    M .github/workflows/unit-tests-v2.yml
    M CMakeLists.txt
    M CMakePresets.json
    M README.md
    M admin/cmake/GenerateVersion.cmake
    M admin/cmake/packaging/linux/LinuxDeploy.cmake
    M admin/cmake/packaging/linux/LinuxHpcPkg.cmake
    M admin/cmake/packaging/linux/LinuxPkg.cmake
    M admin/cmake/triplets/arm64-linux.cmake
    A admin/cmake/triplets/x64-linux-dynamic.cmake
    A admin/cmake/triplets/x64-linux.cmake
    M admin/modulefiles/home-gui-build
    A buildsys/vcpkg/overlay-ports/at-spi2-core/portfile.cmake
    A buildsys/vcpkg/overlay-ports/at-spi2-core/vcpkg.json
    A buildsys/vcpkg/overlay-ports/gumbo/CMakeLists.txt
    A buildsys/vcpkg/overlay-ports/gumbo/portfile.cmake
    A buildsys/vcpkg/overlay-ports/gumbo/vcpkg.json
    A buildsys/vcpkg/overlay-ports/qtbase/GLIB2-static.patch
    A buildsys/vcpkg/overlay-ports/qtbase/allow_outside_prefix.patch
    A buildsys/vcpkg/overlay-ports/qtbase/clang-cl_QGADGET_fix.diff
    A buildsys/vcpkg/overlay-ports/qtbase/clang-cl_source_location.patch
    A buildsys/vcpkg/overlay-ports/qtbase/cmake/qt_install_copyright.cmake
    A buildsys/vcpkg/overlay-ports/qtbase/cmake/qt_install_submodule.cmake
    A buildsys/vcpkg/overlay-ports/qtbase/cmake/qt_port_details.cmake
    A buildsys/vcpkg/overlay-ports/qtbase/config_install.patch
    A buildsys/vcpkg/overlay-ports/qtbase/dont_force_cmakecache_latest.patch
    A buildsys/vcpkg/overlay-ports/qtbase/env.patch
    A buildsys/vcpkg/overlay-ports/qtbase/fix-host-aliasing.patch
    A buildsys/vcpkg/overlay-ports/qtbase/fix-libresolv-test.patch
    A buildsys/vcpkg/overlay-ports/qtbase/fix-link-lib-discovery.patch
    A buildsys/vcpkg/overlay-ports/qtbase/fix-missing-include.patch
    A buildsys/vcpkg/overlay-ports/qtbase/fix_cmake_build.patch
    A buildsys/vcpkg/overlay-ports/qtbase/fix_deploy_windows.patch
    A buildsys/vcpkg/overlay-ports/qtbase/fix_egl.patch
    A buildsys/vcpkg/overlay-ports/qtbase/fix_egl_2.patch
    A buildsys/vcpkg/overlay-ports/qtbase/framework.patch
    A buildsys/vcpkg/overlay-ports/qtbase/harfbuzz.patch
    A buildsys/vcpkg/overlay-ports/qtbase/installed_dir.patch
    A buildsys/vcpkg/overlay-ports/qtbase/macdeployqt-symlinks.patch
    A buildsys/vcpkg/overlay-ports/qtbase/moltenvk.patch
    A buildsys/vcpkg/overlay-ports/qtbase/port.data.cmake
    A buildsys/vcpkg/overlay-ports/qtbase/portfile.cmake
    A buildsys/vcpkg/overlay-ports/qtbase/qmake.debug.bat
    A buildsys/vcpkg/overlay-ports/qtbase/qt.conf.in
    A buildsys/vcpkg/overlay-ports/qtbase/qtpaths.debug.bat
    A buildsys/vcpkg/overlay-ports/qtbase/use-shared-mime-info.patch
    A buildsys/vcpkg/overlay-ports/qtbase/use_inotify_on_freebsd.patch
    A buildsys/vcpkg/overlay-ports/qtbase/vcpkg.json
    A buildsys/vcpkg/overlay-ports/qtbase/windeployqt.debug.bat
    A buildsys/vcpkg/overlay-ports/qtbase/xcodebuild-not-installed.patch
    R buildsys/vcpkg/overlay-ports/qwt-6-1-6/portfile.cmake
    R buildsys/vcpkg/overlay-ports/qwt-6-1-6/vcpkg.json
    R buildsys/vcpkg/overlay-ports/qwtplot3d-qwt-6-1-6-qt5/portfile.cmake
    R buildsys/vcpkg/overlay-ports/qwtplot3d-qwt-6-1-6-qt5/qwtplot3d-config.cmake.in
    R buildsys/vcpkg/overlay-ports/qwtplot3d-qwt-6-1-6-qt5/vcpkg.json
    M gui/us_convert_gui.cpp
    M gui/us_convert_gui.h
    M gui/us_gui_settings.cpp
    M gui/us_select_item.cpp
    M local.pri.template
    M programs/us/CMakeLists.txt
    M programs/us_analyte/CMakeLists.txt
    M programs/us_audit_trail_gmp/us_audit_trail_gmp.cpp
    M programs/us_audit_trail_gmp/us_audit_trail_gmp.h
    M programs/us_edit/us_edit.cpp
    M programs/us_esigner_gmp/us_esigner_gmp.cpp
    M programs/us_esigner_gmp/us_esigner_gmp.h
    M programs/us_experiment/us_exp_utils.cpp
    M programs/us_experiment/us_experiment_gui_optima.cpp
    M programs/us_experiment/us_experiment_gui_optima.h
    M programs/us_export_legacy/CMakeLists.txt
    M programs/us_reporter_gmp/us_reporter_gmp.cpp
    M programs/us_xpn_viewer/us_xpn_viewer_gui.cpp
    M programs/us_xpn_viewer/us_xpn_viewer_gui.h
    M scripts/bootstrap-linux.sh
    M scripts/bootstrap-macos.sh
    M scripts/build.sh
    A scripts/warm-cache.sh
    M us-build
    M us_somo/develop/src/us_saxs_util.cpp
    M us_somo/develop/us_saxs_cmds_t/main.cpp
    M vcpkg.json

  Log Message:
  -----------
  Merge branch 'main' into bump-to-v4.2.0-dev


  Commit: 100d7aacaf6c3a88239f872ff853eea0c86bb950
      https://github.com/ehb54/ultrascan3/commit/100d7aacaf6c3a88239f872ff853eea0c86bb950
  Author: aaron-auc <95181880+aaron-auc at users.noreply.github.com>
  Date:   2026-07-20 (Mon, 20 Jul 2026)

  Changed paths:
    M .github/workflows/codeql-analysis.yml
    M .github/workflows/doc-build.yml
    M .github/workflows/unit-tests-v2.yml
    M CMakePresets.json
    M README.md
    M admin/cmake/packaging/linux/LinuxDeploy.cmake
    M admin/modulefiles/home-gui-build
    A buildsys/vcpkg/overlay-ports/gumbo/CMakeLists.txt
    A buildsys/vcpkg/overlay-ports/gumbo/portfile.cmake
    A buildsys/vcpkg/overlay-ports/gumbo/vcpkg.json
    R buildsys/vcpkg/overlay-ports/qwt-6-1-6/portfile.cmake
    R buildsys/vcpkg/overlay-ports/qwt-6-1-6/vcpkg.json
    R buildsys/vcpkg/overlay-ports/qwtplot3d-qwt-6-1-6-qt5/portfile.cmake
    R buildsys/vcpkg/overlay-ports/qwtplot3d-qwt-6-1-6-qt5/qwtplot3d-config.cmake.in
    R buildsys/vcpkg/overlay-ports/qwtplot3d-qwt-6-1-6-qt5/vcpkg.json
    M gui/us_convert_gui.cpp
    M gui/us_convert_gui.h
    M gui/us_gui_settings.cpp
    M gui/us_select_item.cpp
    M local.pri.template
    M programs/us_audit_trail_gmp/us_audit_trail_gmp.cpp
    M programs/us_audit_trail_gmp/us_audit_trail_gmp.h
    M programs/us_edit/us_edit.cpp
    M programs/us_esigner_gmp/us_esigner_gmp.cpp
    M programs/us_esigner_gmp/us_esigner_gmp.h
    M programs/us_experiment/us_exp_utils.cpp
    M programs/us_experiment/us_experiment_gui_optima.cpp
    M programs/us_experiment/us_experiment_gui_optima.h
    M programs/us_reporter_gmp/us_reporter_gmp.cpp
    M programs/us_xpn_viewer/us_xpn_viewer_gui.cpp
    M programs/us_xpn_viewer/us_xpn_viewer_gui.h
    M scripts/bootstrap-linux.sh
    M scripts/bootstrap-macos.sh
    M scripts/warm-cache.sh
    M us_somo/develop/src/us_saxs_util.cpp
    M us_somo/develop/us_saxs_cmds_t/main.cpp
    M vcpkg.json

  Log Message:
  -----------
  Merge branch 'main' into 758-bug-extra-logos


  Commit: 58024eb57fdab1949486e2ab93da69601227067e
      https://github.com/ehb54/ultrascan3/commit/58024eb57fdab1949486e2ab93da69601227067e
  Author: aaron-auc <95181880+aaron-auc at users.noreply.github.com>
  Date:   2026-07-20 (Mon, 20 Jul 2026)

  Changed paths:
    M VERSION
    M utils/us_defines.h

  Log Message:
  -----------
  Merge pull request #471 from ehb54/bump-to-v4.2.0-dev

Bump to v4.2.0-dev


  Commit: fd6baacc3759c1e45df31c234cb2c18e8fe2b8f5
      https://github.com/ehb54/ultrascan3/commit/fd6baacc3759c1e45df31c234cb2c18e8fe2b8f5
  Author: aaron-auc <95181880+aaron-auc at users.noreply.github.com>
  Date:   2026-07-20 (Mon, 20 Jul 2026)

  Changed paths:
    M VERSION
    M utils/us_defines.h

  Log Message:
  -----------
  Merge branch 'main' into 758-bug-extra-logos


  Commit: b1e9a6ede5d92dffc87dde24f9bda9ccf586feed
      https://github.com/ehb54/ultrascan3/commit/b1e9a6ede5d92dffc87dde24f9bda9ccf586feed
  Author: aaron-auc <aaron at aucsolutions.com>
  Date:   2026-07-21 (Tue, 21 Jul 2026)

  Changed paths:
    M doc/manual/source/config.rst

  Log Message:
  -----------
  Remove hsclogo, becklogo, and us3logo debug text options from the config docs since the underlying logo code was removed.


  Commit: 5859c047d607e6b17f8f08ba43049c3a3c982a83
      https://github.com/ehb54/ultrascan3/commit/5859c047d607e6b17f8f08ba43049c3a3c982a83
  Author: aaron-auc <95181880+aaron-auc at users.noreply.github.com>
  Date:   2026-07-21 (Tue, 21 Jul 2026)

  Changed paths:
    M doc/manual/source/config.rst
    R etc/beckman_logo.png
    M etc/etc_belongs_list.txt
    R etc/logo_hsc.png
    M programs/us_reporter/us_reporter.cpp
    M programs/us_reporter/us_reporter.h

  Log Message:
  -----------
  Merge pull request #475 from ehb54/758-bug-extra-logos

Remove unused logo handling from US_Reporter


  Commit: e1a77567936a0d9b3938f18f623dc326aebc183a
      https://github.com/ehb54/ultrascan3/commit/e1a77567936a0d9b3938f18f623dc326aebc183a
  Author: aaron-auc <95181880+aaron-auc at users.noreply.github.com>
  Date:   2026-07-21 (Tue, 21 Jul 2026)

  Changed paths:
    M VERSION
    M doc/manual/source/config.rst
    R etc/beckman_logo.png
    M etc/etc_belongs_list.txt
    R etc/logo_hsc.png
    M programs/us_reporter/us_reporter.cpp
    M programs/us_reporter/us_reporter.h
    M utils/us_defines.h

  Log Message:
  -----------
  Merge branch 'main' into 875-request-cmake-remove-gmp-module-from-installer-for-osx


Compare: https://github.com/ehb54/ultrascan3/compare/6c88b17bcea6...e1a77567936a

To unsubscribe from these emails, change your notification settings at https://github.com/ehb54/ultrascan3/settings/notifications

More information about the us-commits mailing list