Sync master with upstream (2026-07-23)#3
Merged
Conversation
Updates to the latest LuaJIT version so that we can use the new backported extensions from LuaJIT 3.0 https://luajit.org/extensions.html#lj30_bp_syntax
…munity/update-lua Update LuaJIT version
Upstream's LuaJIT bump adds vcpkg-ports/ports/luajit/2026-07-20_1 and points the filesystem-registry baseline at it. That directory is byte-identical to 2025-07-24_1 apart from lacking the macOS fixes this fork carries, so they would have silently stopped applying on the next build without any textual merge conflict. Restore all three in the new port: - configure: pin the installed tool symlink via INSTALL_TSYMNAME so it doesn't collide with an existing target on the osx triplet. - configure: restore the executable bit; portfile.cmake file(COPY)s the script into the source tree and the make step invokes it directly. Upstream's own 2025-07-24_1 shipped it 100755. - pob-wide-crt.patch: make _lua_getenvcopy null-safe, since strdup(NULL) on an unset env var is UB, and cast in _lua_getenvfree so free() doesn't discard a const qualifier. Both files are now byte-identical to their 2025-07-24_1 counterparts. Not build-verified: a CMake rebuild is the real test.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merges 3 upstream commits from
PathOfBuildingCommunity/PathOfBuilding-SimpleGraphic@master:bd4fa78Update LuaJIT version (to 2026-07-20, for LuaJIT 3.0 backported syntax extensions)835eb86Fix build to use vs 2022 instead of 2026 with windows latest3b1a346Merge PR Update LuaJIT version PathOfBuildingCommunity/PathOfBuilding-SimpleGraphic#104 from upstreammacOS port: one silent break, resolved
No file-path overlap and no textual conflict, but the LuaJIT bump would have silently disabled three of this fork's macOS fixes. Upstream added a new port directory
vcpkg-ports/ports/luajit/2026-07-20_1/and repointed the filesystem-registry baseline (vcpkg-configuration.json:2025-10-07->2026-07-22) at it. That directory is byte-identical to2025-07-24_1except it lacks the fork's fixes, so the next build would have picked up an unpatched port with no conflict to warn us.Forward-ported in
5d5679d:INSTALL_TSYMNAME=luajit-lnkconfigure:80_lua_getenvcopy/ const-safe_lua_getenvfreepob-wide-crt.patch:396-397strdup(NULL)on an unset env var is UB;free()discarded a const qualifier100644->100755configureportfile.cmakefile(COPY)s the script in and the make step invokes it directly; upstream's own2025-07-24_1shipped it100755Both files are now byte-identical to their known-good
2025-07-24_1counterparts (verified viadiff). Editing in place is the correct mechanism here because the registry entry is path-based ("path": "$/ports/luajit/2026-07-20_1"), not git-tree-pinned.Upstream's new port also ships two genuinely macOS-friendly patches of its own (
003-do-not-set-macosx-deployment-target,005-do-not-pass-ld-e-macosx) — kept as-is.Other verification
git diff <pre-merge master> HEADshows only upstream's additions, nothing fork-only touched. Covers the ANGLE Metal backend (sys_video.cpp,vcpkg.json), Cmd->CTRL mapping,sleep_forreplacement, base64 includes, CMake platform-conditional sources,FindLuaJIT.cmake, andmacos-launcher/pob_launch.c.libs/luautf8submodule pin1bb70d4still reachable from its ownorigin/master— the earlier orphan-pin problem stays fixed. No upstream commit touched a submodule pin.cmake/FindLuaJIT.cmakeis not version-coupled (searches by sonameluajit-2.1/lua51, not port version).Not build-verified
The forward-port is not compile-tested — a full CMake rebuild is the real test, and that's deliberately out of scope for the sync. A native rebuild +
runtime/restage in PathOfBuilding-PoE2 is recommended before the macOS build reflects this update.