Add compat option for Zlib_jll

Author: jheinen

GR/Project.toml

@@ -1,6 +1,6 @@
 name = "GR"
 uuid = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71"
-version = "0.73.22"
+version = "0.73.23"
 author = ["Josef Heinen (@jheinen)"]
 
 [deps]
@@ -34,7 +34,7 @@ IJuliaExt = "IJulia"
 Artifacts = "1"
 DelimitedFiles = "1"
 Downloads = "1"
-GR_jll = "=0.73.22"
+GR_jll = "=0.73.23"
 HTTP = "0.8, 0.9, 1"
 IJulia = "1"
 JSON = "0.20, 0.21, 1"

GR/src/downloader.jl

@@ -9,7 +9,7 @@ using Tar
 using Downloads
 using p7zip_jll
 
-const version = v"0.73.22"
+const version = v"0.73.23"
 
 """
     get_grdir()

GR/src/js.jl

@@ -4,7 +4,7 @@ import GR
 
 const init = Ref(false)
 
-const jssource = Ref("https://gr-framework.org/downloads/gr-0.73.22.js")
+const jssource = Ref("https://gr-framework.org/downloads/gr-0.73.23.js")
 
 function get_jsterm()
   if GR.isijulia()

build_tarballs.jl

@@ -1,15 +1,19 @@
 # Note that this script can accept some limited command-line arguments, run
 # `julia build_tarballs.jl --help` to see a usage message.
 using BinaryBuilder
+using Pkg: PackageSpec
+
+const YGGDRASIL_DIR = "../.."
+include(joinpath(YGGDRASIL_DIR, "fancy_toys.jl"))
 
 name = "GR"
-version = v"0.73.22"
+version = v"0.73.23"
 
 # Collection of sources required to complete build
 sources = [
-    GitSource("https://github.com/sciapp/gr.git", "30e6b712d2915275388cf552f57480e73f5224ad"),
+    GitSource("https://github.com/sciapp/gr.git", "30a598f87747c909e061d954c33527e6f75595e6"),
     FileSource("https://github.com/sciapp/gr/releases/download/v$version/gr-$version.js",
-               "a33da3ce2879467dcdef023881982106e2fa57100aa4b5dec362926a06a34278", "gr.js"),
+               "0d316bcf4c5b580faf7166cd97b031d10ba76270042fc418c7dfbbdc6d27679f", "gr.js"),
     ArchiveSource("https://github.com/roblabla/MacOSX-SDKs/releases/download/macosx14.0/MacOSX14.0.sdk.tar.xz",
                   "4a31565fd2644d1aec23da3829977f83632a20985561a2038e198681e7e7bf49")
 ]
@@ -18,6 +22,8 @@ sources = [
 script = raw"""
 cd $WORKSPACE/srcdir/gr
 
+apk del cmake
+
 update_configure_scripts
 
 make -C 3rdparty/qhull -j${nproc}
@@ -98,14 +104,24 @@ dependencies = [
     Dependency("libpng_jll"),
     Dependency("Libtiff_jll"; compat="4.7.1"),
     Dependency("Pixman_jll"),
-    HostBuildDependency("Qt6Base_jll"),
-    Dependency("Qt6Base_jll"; compat="~6.8.2"), # Never allow upgrading more than the minor version without recompilation
+    Dependency("Qt6Base_jll"),
     BuildDependency("Xorg_libX11_jll"),
     BuildDependency("Xorg_xproto_jll"),
     Dependency("Zlib_jll"),
+    HostBuildDependency(PackageSpec(; name="CMake_jll", version = "3.31.9")),
 ]
 
+platforms_win = filter(Sys.iswindows, platforms)
+platforms_rest = setdiff(platforms, platforms_win)
+
 # Build the tarballs, and possibly a `build.jl` as well.
-# GCC version 13 because of Qt6.8
-build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies;
-               preferred_gcc_version = v"13", julia_compat="1.6")
+# GCC version 11 because of Qt6.10
+if any(should_build_platform.(triplet.(platforms_win)))
+    # GCC 12 and before fail with internal compiler error on mingw
+    build_tarballs(ARGS, name, version, sources, script, platforms_win, products, dependencies;
+                   preferred_gcc_version=v"13", julia_compat="1.6")
+end
+if any(should_build_platform.(triplet.(platforms_rest)))
+    build_tarballs(ARGS, name, version, sources, script, platforms_rest, products, dependencies;
+                   preferred_gcc_version=v"11", julia_compat="1.6")
+end