Skip to content

Sync master with upstream (2026-09-09) - #6

Merged
pathanin merged 6 commits into
masterfrom
sync-upstream-2026-09-09
Sep 8, 2026
Merged

Sync master with upstream (2026-09-09)#6
pathanin merged 6 commits into
masterfrom
sync-upstream-2026-09-09

Conversation

@pathanin

@pathanin pathanin commented Sep 8, 2026

Copy link
Copy Markdown
Owner

Sync master with PathOfBuildingCommunity/PathOfBuilding-SimpleGraphic.

Merged from upstream

Clean merge, no conflicts.

macOS port

Nothing needed forward-porting. Upstream's single file has no overlap with any fork-only patch.

Verification

  • P4 global assertion: git diff --name-only <pre> HEAD lists only ui_api.cpp. No fork-only file appears.
  • P4 per-commit signatures: all 14 fork-only non-merge commits verified present — LuaJIT vcpkg port fixes (configure, pob-wide-crt.patch for both 2025-07-24_1 and 2026-07-20_1), cmake/FindLuaJIT.cmake, CMakeLists.txt platform sources, base64.h/.c, common.cpp, r_texture.cpp, r_main.cpp sleep_for, ANGLE Metal backend (sys_video.cpp + vcpkg.json), Cmd→CTRL, find_c directory-entry fix, macos-launcher/pob_launch.c.
  • File modes preserved: all three vcpkg-ports/ports/luajit/*/configure still 100755.
  • One stale signature, benign: two README lines from 15160c0 are absent because the later fork commit ba877ae deliberately corrected them (launcher output path). Nothing restored.
  • P5: upstream added no versioned port directory this run. Live port remains 2026-07-20_1, which carries the fork's patches (vcpkg-ports/versions/l-/luajit.json$/ports/luajit/2026-07-20_1).
  • Submodule pins: merge touched none. libs/luautf8 @ 1bb70d45 re-verified reachable from origin/master at starwing/luautf8.

Not covered by CI

Windows build_dll cannot validate the macOS-only fixes — the _lua_getenvcopy/_lua_getenvfree macros live in the non-Windows branch of pob-wide-crt.patch, and INSTALL_TSYMNAME plus the configure exec bit are osx-triplet-only. The macOS rebuild + runtime smoke test is the real gate and is run separately.

@pathanin
pathanin merged commit 27e6ed3 into master Sep 8, 2026
2 checks passed
@pathanin
pathanin deleted the sync-upstream-2026-09-09 branch September 8, 2026 18:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants