diff --git a/Project.toml b/Project.toml index 0000954..e8d0fb5 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "GR" uuid = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71" author = ["Josef Heinen (@jheinen)"] -version = "0.73.5" +version = "0.73.6" [deps] Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" @@ -27,7 +27,7 @@ p7zip_jll = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0" Artifacts = "1" DelimitedFiles = "1" Downloads = "1" -GR_jll = "=0.73.5" +GR_jll = "=0.73.6" HTTP = "0.8, 0.9, 1" JSON = "0.20, 0.21, 1" Preferences = "1" diff --git a/build_tarballs.jl b/build_tarballs.jl index 24c5ec7..b9e2766 100644 --- a/build_tarballs.jl +++ b/build_tarballs.jl @@ -3,13 +3,13 @@ using BinaryBuilder name = "GR" -version = v"0.73.5" +version = v"0.73.6" # Collection of sources required to complete build sources = [ - GitSource("https://github.com/sciapp/gr.git", "bdd3f65bd994eb146129565f035abe03edb92d3f.sha512 + GitSource("https://github.com/sciapp/gr.git", "3b7a729650cc663c98b8066e93fa4799feef1537"), FileSource("https://github.com/sciapp/gr/releases/download/v$version/gr-$version.js", - "186e9f15c4eb410b42b9ca19d87a548d3de7d81d21a11d3f7eb4783440117376", "gr.js"), + "024c3600cf6d28f1888158862c237dcae39d5635b05c524d98f652cfa4308e29", "gr.js"), ArchiveSource("https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.14.sdk.tar.xz", "0f03869f72df8705b832910517b47dd5b79eb4e160512602f593ed243b28715f") ] @@ -92,19 +92,20 @@ dependencies = [ Dependency("Cairo_jll"; compat="1.16.1"), Dependency("FFMPEG_jll"), Dependency("Fontconfig_jll"), + Dependency("FreeType2_jll"; compat="2.10.4"), Dependency("GLFW_jll"), Dependency("JpegTurbo_jll"), Dependency("libpng_jll"), Dependency("Libtiff_jll"; compat="~4.5.1"), Dependency("Pixman_jll"), HostBuildDependency("Qt6Base_jll"), - Dependency("Qt6Base_jll"; compat="~6.5.2"), # Never allow upgrading more than the minor version without recompilation + Dependency("Qt6Base_jll"; compat="~6.7.1"), # Never allow upgrading more than the minor version without recompilation BuildDependency("Xorg_libX11_jll"), BuildDependency("Xorg_xproto_jll"), Dependency("Zlib_jll"), ] # Build the tarballs, and possibly a `build.jl` as well. -# GCC version 10 because of Qt6.5 +# GCC version 10 because of Qt6.7 build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; preferred_gcc_version = v"10", julia_compat="1.6") diff --git a/src/downloader.jl b/src/downloader.jl index caac597..f1e5d8b 100644 --- a/src/downloader.jl +++ b/src/downloader.jl @@ -9,7 +9,7 @@ using Tar using Downloads using p7zip_jll -const version = v"0.73.5" +const version = v"0.73.6" """ get_grdir() diff --git a/src/js.jl b/src/js.jl index 9cde8ee..20fc3ad 100644 --- a/src/js.jl +++ b/src/js.jl @@ -391,7 +391,7 @@ function ws_cb(webs) end const plutoisinit = Ref(false) -const jssource = Ref("https://gr-framework.org/downloads/gr-0.73.5.js") +const jssource = Ref("https://gr-framework.org/downloads/gr-0.73.6.js") function init_pluto(source=jssource[]::String) plutoisinit[] = true