From 8df613e1f8bb8f5a06863bf25af09b2ca0b5feda Mon Sep 17 00:00:00 2001 From: Jerry Ling Date: Sat, 22 May 2021 15:48:05 -0400 Subject: [PATCH 1/7] Update build_tarballs.jl adding more optional deps to expand functionality --- L/libgraphicsmagic/build_tarballs.jl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/L/libgraphicsmagic/build_tarballs.jl b/L/libgraphicsmagic/build_tarballs.jl index c326ebe3899..e115bf7abad 100644 --- a/L/libgraphicsmagic/build_tarballs.jl +++ b/L/libgraphicsmagic/build_tarballs.jl @@ -34,7 +34,12 @@ products = [ # Dependencies that must be installed before this package can be built dependencies = [ - Dependency(PackageSpec(name="CompilerSupportLibraries_jll", uuid="e66e0078-7015-5450-92f7-15fbd957f2ae")), + Dependency(PackageSpec(name="CompilerSupportLibraries_jll", uuid="e66e0078-7015-5450-92f7-15fbd957f2ae")) + Dependency(PackageSpec(name="libwebp_jll", uuid="c5f90fcd-3b7e-5836-afba-fc50a0988cb2")) + Dependency(PackageSpec(name="libpng_jll", uuid="b53b4c65-9356-5827-b1ea-8c7a1a84506f")) + Dependency(PackageSpec(name="FreeType2_jll", uuid="d7e528f0-a631-5988-bf34-fe36492bcfd7")) + Dependency(PackageSpec(name="Ghostscript_jll", uuid="61579ee1-b43e-5ca0-a5da-69d92c66a64b")) + Dependency(PackageSpec(name="Xorg_libXext_jll", uuid="1082639a-0dae-5f34-9b06-72781eeb8cb3")) ] # Build the tarballs, and possibly a `build.jl` as well. From 08be5650a6b41679d57bb1c916313163caffd0ce Mon Sep 17 00:00:00 2001 From: Jerry Ling Date: Sat, 22 May 2021 15:53:02 -0400 Subject: [PATCH 2/7] Update build_tarballs.jl --- L/libgraphicsmagic/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/L/libgraphicsmagic/build_tarballs.jl b/L/libgraphicsmagic/build_tarballs.jl index e115bf7abad..84c316877f0 100644 --- a/L/libgraphicsmagic/build_tarballs.jl +++ b/L/libgraphicsmagic/build_tarballs.jl @@ -43,4 +43,4 @@ dependencies = [ ] # Build the tarballs, and possibly a `build.jl` as well. -build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; julia_compat="1.6") +build_tarballs(ARGS, name, version, sources, script, platforms, products, dependencies; julia_compat="1.6", preferred_gcc_version = v"8.1.0") From cf6bf562e8287e23e6b75c63bbd81e9a100023f7 Mon Sep 17 00:00:00 2001 From: Jerry Ling Date: Sat, 22 May 2021 16:23:25 -0400 Subject: [PATCH 3/7] Update build_tarballs.jl --- L/libgraphicsmagic/build_tarballs.jl | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/L/libgraphicsmagic/build_tarballs.jl b/L/libgraphicsmagic/build_tarballs.jl index 84c316877f0..5ad2b109a99 100644 --- a/L/libgraphicsmagic/build_tarballs.jl +++ b/L/libgraphicsmagic/build_tarballs.jl @@ -40,6 +40,12 @@ dependencies = [ Dependency(PackageSpec(name="FreeType2_jll", uuid="d7e528f0-a631-5988-bf34-fe36492bcfd7")) Dependency(PackageSpec(name="Ghostscript_jll", uuid="61579ee1-b43e-5ca0-a5da-69d92c66a64b")) Dependency(PackageSpec(name="Xorg_libXext_jll", uuid="1082639a-0dae-5f34-9b06-72781eeb8cb3")) + Dependency(PackageSpec(name="Xorg_libSM_jll", uuid="c834827a-8449-5923-a945-d239c165b7dd")) + Dependency(PackageSpec(name="Libtiff_jll", uuid="89763e89-9b03-5906-acba-b20f662cd828")) + Dependency(PackageSpec(name="LittleCMS_jll", uuid="d3a379c0-f9a3-5b72-a4c0-6bf4d2e8af0f")) + Dependency(PackageSpec(name="Bzip2_jll", uuid="6e34b625-4abd-537c-b88f-471c36dfa7a0")) + Dependency(PackageSpec(name="XZ_jll", uuid="ffd25f8a-64ca-5728-b0f7-c24cf3aae800")) + ] # Build the tarballs, and possibly a `build.jl` as well. From 9a4c1e4115d71254cc5a473f75928c398736eccd Mon Sep 17 00:00:00 2001 From: Jerry Ling Date: Sat, 22 May 2021 16:33:27 -0400 Subject: [PATCH 4/7] Update build_tarballs.jl --- L/libgraphicsmagic/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/L/libgraphicsmagic/build_tarballs.jl b/L/libgraphicsmagic/build_tarballs.jl index 5ad2b109a99..1eca25ee32e 100644 --- a/L/libgraphicsmagic/build_tarballs.jl +++ b/L/libgraphicsmagic/build_tarballs.jl @@ -45,7 +45,7 @@ dependencies = [ Dependency(PackageSpec(name="LittleCMS_jll", uuid="d3a379c0-f9a3-5b72-a4c0-6bf4d2e8af0f")) Dependency(PackageSpec(name="Bzip2_jll", uuid="6e34b625-4abd-537c-b88f-471c36dfa7a0")) Dependency(PackageSpec(name="XZ_jll", uuid="ffd25f8a-64ca-5728-b0f7-c24cf3aae800")) - + Dependency(PackageSpec(name="Libtool_jll", uuid="a76c16ae-fb8f-5ff0-8826-da3b7a640f0b")) ] # Build the tarballs, and possibly a `build.jl` as well. From 47c0f0fe59b3871d8c40d4e43c922d877aca3083 Mon Sep 17 00:00:00 2001 From: Jerry Ling Date: Sat, 22 May 2021 17:19:04 -0400 Subject: [PATCH 5/7] Update build_tarballs.jl --- L/libgraphicsmagic/build_tarballs.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/L/libgraphicsmagic/build_tarballs.jl b/L/libgraphicsmagic/build_tarballs.jl index 1eca25ee32e..8a9cfe38f73 100644 --- a/L/libgraphicsmagic/build_tarballs.jl +++ b/L/libgraphicsmagic/build_tarballs.jl @@ -36,14 +36,14 @@ products = [ dependencies = [ Dependency(PackageSpec(name="CompilerSupportLibraries_jll", uuid="e66e0078-7015-5450-92f7-15fbd957f2ae")) Dependency(PackageSpec(name="libwebp_jll", uuid="c5f90fcd-3b7e-5836-afba-fc50a0988cb2")) - Dependency(PackageSpec(name="libpng_jll", uuid="b53b4c65-9356-5827-b1ea-8c7a1a84506f")) + Dependency(PackageSpec(name="libpng_jll", version=v"1.6.38", uuid="b53b4c65-9356-5827-b1ea-8c7a1a84506f")) Dependency(PackageSpec(name="FreeType2_jll", uuid="d7e528f0-a631-5988-bf34-fe36492bcfd7")) Dependency(PackageSpec(name="Ghostscript_jll", uuid="61579ee1-b43e-5ca0-a5da-69d92c66a64b")) Dependency(PackageSpec(name="Xorg_libXext_jll", uuid="1082639a-0dae-5f34-9b06-72781eeb8cb3")) Dependency(PackageSpec(name="Xorg_libSM_jll", uuid="c834827a-8449-5923-a945-d239c165b7dd")) Dependency(PackageSpec(name="Libtiff_jll", uuid="89763e89-9b03-5906-acba-b20f662cd828")) Dependency(PackageSpec(name="LittleCMS_jll", uuid="d3a379c0-f9a3-5b72-a4c0-6bf4d2e8af0f")) - Dependency(PackageSpec(name="Bzip2_jll", uuid="6e34b625-4abd-537c-b88f-471c36dfa7a0")) + Dependency(PackageSpec(name="Bzip2_jll", version=v"1.0.7", uuid="6e34b625-4abd-537c-b88f-471c36dfa7a0")) Dependency(PackageSpec(name="XZ_jll", uuid="ffd25f8a-64ca-5728-b0f7-c24cf3aae800")) Dependency(PackageSpec(name="Libtool_jll", uuid="a76c16ae-fb8f-5ff0-8826-da3b7a640f0b")) ] From 26233b786c69b1e8e83f913d731fc2de77fe889e Mon Sep 17 00:00:00 2001 From: Jerry Ling Date: Sat, 22 May 2021 17:20:46 -0400 Subject: [PATCH 6/7] Update L/libgraphicsmagic/build_tarballs.jl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Mosè Giordano --- L/libgraphicsmagic/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/L/libgraphicsmagic/build_tarballs.jl b/L/libgraphicsmagic/build_tarballs.jl index 8a9cfe38f73..e73e5f37594 100644 --- a/L/libgraphicsmagic/build_tarballs.jl +++ b/L/libgraphicsmagic/build_tarballs.jl @@ -43,7 +43,7 @@ dependencies = [ Dependency(PackageSpec(name="Xorg_libSM_jll", uuid="c834827a-8449-5923-a945-d239c165b7dd")) Dependency(PackageSpec(name="Libtiff_jll", uuid="89763e89-9b03-5906-acba-b20f662cd828")) Dependency(PackageSpec(name="LittleCMS_jll", uuid="d3a379c0-f9a3-5b72-a4c0-6bf4d2e8af0f")) - Dependency(PackageSpec(name="Bzip2_jll", version=v"1.0.7", uuid="6e34b625-4abd-537c-b88f-471c36dfa7a0")) + Dependency("Bzip2_jll", v"1.0.7"; compat="1.0.7") Dependency(PackageSpec(name="XZ_jll", uuid="ffd25f8a-64ca-5728-b0f7-c24cf3aae800")) Dependency(PackageSpec(name="Libtool_jll", uuid="a76c16ae-fb8f-5ff0-8826-da3b7a640f0b")) ] From 8b87610bef98fba8a3693ee7b6f78b97aa6c0c50 Mon Sep 17 00:00:00 2001 From: Jerry Ling Date: Sun, 23 May 2021 00:44:39 -0400 Subject: [PATCH 7/7] Update build_tarballs.jl --- L/libgraphicsmagic/build_tarballs.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/L/libgraphicsmagic/build_tarballs.jl b/L/libgraphicsmagic/build_tarballs.jl index e73e5f37594..848ab2c3ff2 100644 --- a/L/libgraphicsmagic/build_tarballs.jl +++ b/L/libgraphicsmagic/build_tarballs.jl @@ -36,7 +36,7 @@ products = [ dependencies = [ Dependency(PackageSpec(name="CompilerSupportLibraries_jll", uuid="e66e0078-7015-5450-92f7-15fbd957f2ae")) Dependency(PackageSpec(name="libwebp_jll", uuid="c5f90fcd-3b7e-5836-afba-fc50a0988cb2")) - Dependency(PackageSpec(name="libpng_jll", version=v"1.6.38", uuid="b53b4c65-9356-5827-b1ea-8c7a1a84506f")) + Dependency(PackageSpec(name="libpng_jll", uuid="b53b4c65-9356-5827-b1ea-8c7a1a84506f")) Dependency(PackageSpec(name="FreeType2_jll", uuid="d7e528f0-a631-5988-bf34-fe36492bcfd7")) Dependency(PackageSpec(name="Ghostscript_jll", uuid="61579ee1-b43e-5ca0-a5da-69d92c66a64b")) Dependency(PackageSpec(name="Xorg_libXext_jll", uuid="1082639a-0dae-5f34-9b06-72781eeb8cb3"))