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

[glaze/saucer] Update glaze to 2.9.2 and saucer to 2.3.0 #39524

Merged
merged 7 commits into from
Jul 13, 2024

Conversation

MonicaLiu0311
Copy link
Contributor

@MonicaLiu0311 MonicaLiu0311 commented Jun 26, 2024

Fixes #39517, update glaze to 2.9.2 and saucer to 2.3.0.
Temporarily waiting for upstream release a new version to fix the following error: saucer/saucer/pull/20.

FAILED: CMakeFiles/saucer.dir/src/serializer.glaze.cpp.obj 
C:\PROGRA~1\MIB055~1\2022\ENTERP~1\VC\Tools\MSVC\1440~1.338\bin\Hostx64\x64\cl.exe   /TP -DFMT_SHARED -DNOMINMAX=1 -DSAUCER_WEBVIEW2 -DUNICODE=1 -D_UNICODE=1 -IF:\vcpkg\buildtrees\saucer\src\v2.3.0-7658b67131.clean\include -IF:\vcpkg\buildtrees\saucer\src\v2.3.0-7658b67131.clean\include\saucer -IF:\vcpkg\buildtrees\saucer\src\v2.3.0-7658b67131.clean\private -external:IF:\vcpkg\installed\x64-windows\include -external:IF:\vcpkg\installed\x64-windows\share -external:W0 /nologo /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc /MP  /D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1  -std:c++20 -MDd /Zc:preprocessor /permissive- /Zc:lambda /showIncludes /FoCMakeFiles\saucer.dir\src\serializer.glaze.cpp.obj /FdCMakeFiles\saucer.dir\saucer.pdb /FS -c F:\vcpkg\buildtrees\saucer\src\v2.3.0-7658b67131.clean\src\serializer.glaze.cpp
C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Tools\MSVC\14.40.33807\include\expected(11): warning STL4038: The contents of <expected> are available only with C++23 or later.
F:\vcpkg\buildtrees\saucer\src\v2.3.0-7658b67131.clean\src\serializer.glaze.cpp(41): error C2039: 'parse_error': is not a member of 'glz'
F:\vcpkg\installed\x64-windows\include\glaze/record/recorder.hpp(14): note: see declaration of 'glz'
F:\vcpkg\buildtrees\saucer\src\v2.3.0-7658b67131.clean\src\serializer.glaze.cpp(41): error C2065: 'parse_error': undeclared identifier
F:\vcpkg\buildtrees\saucer\src\v2.3.0-7658b67131.clean\src\serializer.glaze.cpp(41): error C2923: 'tl::expected': 'parse_error' is not a valid template type argument for parameter 'E'

glaze

No feature needs to be tested, the usage test passed on x64-windows (header files found):

glaze provides CMake targets:

  # this is heuristically generated, and may not be correct
  find_package(glaze CONFIG REQUIRED)
  target_link_libraries(main PRIVATE glaze::glaze)
  • Changes comply with the maintainer guide.
  • SHA512s are updated for each updated download.
  • The "supports" clause reflects platforms that may be fixed by this new version.
  • Any fixed CI baseline entries are removed from that file.
  • ~Any patches that are no longer applied are deleted from the port's directory.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and commit~ting the result.
  • Only one version is added to each modified port's versions file.
@MonicaLiu0311 MonicaLiu0311 added info:internal This PR or Issue was filed by the vcpkg team. category:port-update The issue is with a library, which is requesting update new revision labels Jun 26, 2024
@MonicaLiu0311 MonicaLiu0311 added category:port-bug The issue is with a library, which is something the port should already support depends:upstream-changes Waiting on a change to the upstream project labels Jun 26, 2024
@MonicaLiu0311 MonicaLiu0311 changed the title [glaze] Update to 2.9.2 Jun 26, 2024
@MonicaLiu0311
Copy link
Contributor Author

MonicaLiu0311 commented Jul 12, 2024

Give up waiting and continue with this PR.

@MonicaLiu0311 MonicaLiu0311 removed the depends:upstream-changes Waiting on a change to the upstream project label Jul 12, 2024
@MonicaLiu0311 MonicaLiu0311 marked this pull request as ready for review July 12, 2024 09:47
@LilyWangLL LilyWangLL added the info:reviewed Pull Request changes follow basic guidelines label Jul 12, 2024
@JavierMatosD JavierMatosD merged commit 495a22d into microsoft:master Jul 13, 2024
17 checks passed
@Curve
Copy link
Contributor

Curve commented Jul 13, 2024

Give up waiting and continue with this PR.

Hi, sorry for the long wait, I'll probably release a pre-release tomorrow with the glaze fix implemented :)

@MonicaLiu0311 MonicaLiu0311 deleted the Dev/Monica/update_glaze branch July 15, 2024 02:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-bug The issue is with a library, which is something the port should already support category:port-update The issue is with a library, which is requesting update new revision info:internal This PR or Issue was filed by the vcpkg team. info:reviewed Pull Request changes follow basic guidelines
5 participants