Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: Correct version strings for simdutf and cimgui to match vendored files #4468

Merged
merged 2 commits into from
Jan 3, 2025

Conversation

AnthonyZhOon
Copy link
Contributor

The cimgui version listed does not match the upstream commit or the vendored cimgui files
Checking the upstream git log the commit corresponds to commit e391fe2e66eb1c96b1624ae8444dc64c23146ef4 (tag: v1.90.6-docking) however the build.zig.zon is outdated.
The vendored cimgui files also contain the header

// This file is automatically generated by generator.lua from
// https://github.com/cimgui/cimgui based on imgui.h file version "1.90.6" 19060
// from Dear ImGui https://github.com/ocornut/imgui with imgui_internal.h api
// docking branch

I wasn't too clear with what the comment meant:

// This should be kept in sync with the submodule in the cimgui source
// code to be safe that they're compatible.

and assumed it was referring to the vendored cimgui files, added a comment pointing out where to find the cimgui source mentioned.

@AnthonyZhOon AnthonyZhOon changed the title Fix: Change cimgui version string to match pkg/cimgui/vendor/ and upstream Fix: Correct version strings for simdutf and cimgui to match vendored files Jan 3, 2025
@AnthonyZhOon
Copy link
Contributor Author

Also noticed simdutf had the wrong version compared to the vendored file

#define SIMDUTF_VERSION "5.2.8"

in simdutf.h
Is there a reason why a url isn't provided for simdutf?

@mitchellh mitchellh merged commit 7eb35d7 into ghostty-org:main Jan 3, 2025
24 checks passed
@mitchellh
Copy link
Contributor

Is there a reason why a url isn't provided for simdutf?

There is... I think we modify it to fix some Zig issues.

@github-actions github-actions bot added this to the 1.0.2 milestone Jan 3, 2025
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.

2 participants