[CImPlot3D] Rebuild for CImGuiPack_jll 0.13 (#14507)

This needs a rebuild for compatibility, and also to update the compiler options
that can break ABI.

Author: JamesWrigley

C/CImPlot3D/build_tarballs.jl

@@ -3,23 +3,25 @@
 using BinaryBuilder, Pkg
 
 name = "CImPlot3D"
-version = v"0.4.0" # tracking implot3d release tags
+# We try to track implot3d release tags, with the occasional patch bump if a
+# rebuild is needed for e.g. a new CImGuiPack_jll version.
+version = v"0.4.1"
 
 # Sources required to build CImPlot3D
 sources = [
     # cimplot3d ships the C wrapper; implot3d is its git submodule pinned at a
     # SHA that matches the wrapper's generated bindings (currently v0.4 of
     # implot3d). A recursive submodule init in the script keeps them locked.
     GitSource("https://github.com/cimgui/cimplot3d.git",
-              "8c1c16e98fdddc4b3ee78bf0f89e0dd708be79e0"),
+              "8d04820c009357e791e30a004e410c6eb98522d1"),
 
     # cimplot3d's generator does `require"cpp2ffi"` and a `dofile` of cimgui's
-    # generator output, expecting cimgui as a sibling directory. Pinned to the
-    # SAME cimgui SHA that CImGuiPack_jll 0.12's libcimgui submodule is built
-    # from, so the C struct types referenced by the generated cimplot3d.cpp
-    # match the layout inside libcimgui at runtime.
+    # generator output, expecting cimgui as a sibling directory. Usually pinned
+    # to the same cimgui SHA that CImGuiPack_jll's libcimgui submodule is built
+    # from. Currently one commit ahead to get this patch:
+    # https://github.com/cimgui/cimgui/pull/326
     GitSource("https://github.com/cimgui/cimgui.git",
-              "1261b231939fc210032f30c4ee8a8f0440372237"),
+              "700140771a12e61f4bb851fb4e2d885f04b32dd9"),
 
     # Bundled CMakeLists.txt that links against CImGuiPack_jll's exported
     # cimgui::cimgui target rather than rebuilding imgui sources locally —
@@ -81,7 +83,7 @@ products = [
 ]
 
 dependencies = [
-    Dependency("CImGuiPack_jll"; compat="0.12.1"),
+    Dependency("CImGuiPack_jll"; compat="0.13.1"),
     HostBuildDependency("LuaJIT_jll"),
 ]
 

C/CImPlot3D/bundled/CMakeLists.txt

@@ -35,6 +35,8 @@ target_include_directories(cimplot3d PRIVATE
 target_compile_definitions(cimplot3d PRIVATE
     IMGUI_DISABLE_OBSOLETE_FUNCTIONS=1
     IMGUI_ENABLE_TEST_ENGINE
+    IMGUI_ENABLE_FREETYPE
+    IMGUI_USE_WCHAR32
 )
 
 target_link_libraries(cimplot3d PRIVATE ${CIMGUI_LIBRARY})