Fix compat for packages depending on Libtiff_jll (#3311)

giordano · web-flow · commit 89bf46cfd1fc · 2021-07-10T23:53:14.000+01:00
[skip ci] [skip build]
diff --git a/G/GDAL/common.jl b/G/GDAL/common.jl
@@ -113,7 +113,8 @@ function configure(version_offset, min_julia_version, proj_jll_version)
         Dependency("OpenJpeg_jll"),
         Dependency("Expat_jll", v"2.2.7"; compat="~2.2.7"),
         Dependency("Zstd_jll"),
-        Dependency("Libtiff_jll"),
+        # TODO: v4.3.0 is available, use that next time
+        Dependency("Libtiff_jll"; compat="4.1.0"),
         Dependency("libgeotiff_jll"),
     ]
 
diff --git a/G/Gnuastro/build_tarballs.jl b/G/Gnuastro/build_tarballs.jl
@@ -78,7 +78,8 @@ dependencies = [
     Dependency("CFITSIO_jll", v"3.49"; compat="~3.49"),
     Dependency("GSL_jll"),
     Dependency("JpegTurbo_jll"),
-    Dependency("Libtiff_jll"),
+    # TODO: v4.3.0 is available, use that next time
+    Dependency("Libtiff_jll"; compat="4.1.0"),
     # This is a bit complicated because LibGit2 is a dependency of Julia.
     # `LibGit2_jll` v1.2.3, corresponding to upstream v1.1.0, is what is used in
     # Julia v1.6.
diff --git a/G/gdk_pixbuf/build_tarballs.jl b/G/gdk_pixbuf/build_tarballs.jl
@@ -54,7 +54,8 @@ dependencies = [
     Dependency("Glib_jll", v"2.59.0"; compat="2.59.0"),
     Dependency("JpegTurbo_jll"),
     Dependency("libpng_jll"),
-    Dependency("Libtiff_jll"),
+    # TODO: v4.3.0 is available, use that next time
+    Dependency("Libtiff_jll"; compat="4.1.0"),
     Dependency("Xorg_libX11_jll"),
     BuildDependency("Xorg_xproto_jll"),
     BuildDependency("Xorg_kbproto_jll"),
diff --git a/I/ImageMagick/build_tarballs.jl b/I/ImageMagick/build_tarballs.jl
@@ -34,7 +34,8 @@ dependencies = [
     Dependency("Zlib_jll"),
     Dependency("libpng_jll"),
     Dependency("JpegTurbo_jll"),
-    Dependency("Libtiff_jll")
+    # TODO: v4.3.0 is available, use that next time
+    Dependency("Libtiff_jll"; compat="4.1.0"),
 ]
 
 # Build the tarballs, and possibly a `build.jl` as well.
diff --git a/L/Leptonica/build_tarballs.jl b/L/Leptonica/build_tarballs.jl
@@ -45,7 +45,7 @@ dependencies = [
     Dependency(PackageSpec(name="Giflib_jll", uuid="59f7168a-df46-5410-90c8-f2779963d0ec")),
     Dependency(PackageSpec(name="JpegTurbo_jll", uuid="aacddb02-875f-59d6-b918-886e6ef4fbf8")),
     Dependency(PackageSpec(name="libpng_jll", uuid="b53b4c65-9356-5827-b1ea-8c7a1a84506f")),
-    Dependency(PackageSpec(name="Libtiff_jll", uuid="89763e89-9b03-5906-acba-b20f662cd828")),
+    Dependency("Libtiff_jll"; compat="4.3.0"),
     Dependency(PackageSpec(name="libwebp_jll", uuid="c5f90fcd-3b7e-5836-afba-fc50a0988cb2")),
     Dependency(PackageSpec(name="Zlib_jll", uuid="83775a58-1f1d-513f-b197-d71354ab007a")),
     # Leptonica has a runtime check on the minor version of OpenJpeg, because why not:
diff --git a/L/LibGD/build_tarballs.jl b/L/LibGD/build_tarballs.jl
@@ -44,7 +44,8 @@ dependencies = [
     Dependency(PackageSpec(name="JpegTurbo_jll", uuid="aacddb02-875f-59d6-b918-886e6ef4fbf8")),
     Dependency(PackageSpec(name="Zlib_jll", uuid="83775a58-1f1d-513f-b197-d71354ab007a")),
     Dependency(PackageSpec(name="libpng_jll", uuid="b53b4c65-9356-5827-b1ea-8c7a1a84506f")),
-    Dependency(PackageSpec(name="Libtiff_jll", uuid="89763e89-9b03-5906-acba-b20f662cd828")),
+    # TODO: v4.3.0 is available, use that next time
+    Dependency("Libtiff_jll"; compat="4.1.0"),
     BuildDependency(PackageSpec(name="Xorg_xorgproto_jll", uuid = "c4d99508-4286-5418-9131-c86396af500b")),
     Dependency(PackageSpec(name="Xorg_libXpm_jll", uuid = "1a3ddb2d-74e3-57f3-a27b-e9b16291b4f2")),
     Dependency(PackageSpec(name="Libiconv_jll", uuid = "94ce4f54-9a6c-5748-9c1c-f9c7231a4531")),
diff --git a/L/LittleCMS/build_tarballs.jl b/L/LittleCMS/build_tarballs.jl
@@ -38,7 +38,7 @@ products = [
 # Dependencies that must be installed before this package can be built
 dependencies = [
     Dependency(PackageSpec(name="JpegTurbo_jll", uuid="aacddb02-875f-59d6-b918-886e6ef4fbf8"))
-    Dependency(PackageSpec(name="Libtiff_jll", uuid="89763e89-9b03-5906-acba-b20f662cd828"))
+    Dependency("Libtiff_jll"; compat="4.3.0")
 ]
 
 # Build the tarballs, and possibly a `build.jl` as well.
diff --git a/L/libgeotiff/build_tarballs.jl b/L/libgeotiff/build_tarballs.jl
@@ -55,7 +55,8 @@ products = [
 # Dependencies that must be installed before this package can be built
 dependencies = [
     Dependency(PackageSpec(name="PROJ_jll", uuid="58948b4f-47e0-5654-a9ad-f609743f8632")),
-    Dependency(PackageSpec(name="Libtiff_jll", uuid="89763e89-9b03-5906-acba-b20f662cd828")),
+    # TODO: v4.3.0 is available, use that next time
+    Dependency("Libtiff_jll"; compat="4.1.0"),
 ]
 
 # Build the tarballs, and possibly a `build.jl` as well.
diff --git a/L/libgraphicsmagic/build_tarballs.jl b/L/libgraphicsmagic/build_tarballs.jl
@@ -41,7 +41,8 @@ dependencies = [
     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"))
+    # TODO: v4.3.0 is available, use that next time
+    Dependency("Libtiff_jll"; compat="4.1.0")
     Dependency(PackageSpec(name="LittleCMS_jll", uuid="d3a379c0-f9a3-5b72-a4c0-6bf4d2e8af0f"))
     Dependency("Bzip2_jll", v"1.0.7"; compat="1.0.7")
     Dependency(PackageSpec(name="XZ_jll", uuid="ffd25f8a-64ca-5728-b0f7-c24cf3aae800"))
diff --git a/L/libwebp/build_tarballs.jl b/L/libwebp/build_tarballs.jl
@@ -49,7 +49,7 @@ dependencies = [
     Dependency("Giflib_jll"),
     Dependency("JpegTurbo_jll"),
     Dependency("libpng_jll"),
-    Dependency("Libtiff_jll"),
+    Dependency("Libtiff_jll"; compat="4.3.0"),
     Dependency("Libglvnd_jll"),
 ]
 
diff --git a/O/OpenJpeg/build_tarballs.jl b/O/OpenJpeg/build_tarballs.jl
@@ -39,7 +39,7 @@ products = [
 dependencies = [
     Dependency(PackageSpec(name="LittleCMS_jll", uuid="d3a379c0-f9a3-5b72-a4c0-6bf4d2e8af0f"))
     Dependency(PackageSpec(name="libpng_jll", uuid="b53b4c65-9356-5827-b1ea-8c7a1a84506f"))
-    Dependency(PackageSpec(name="Libtiff_jll", uuid="89763e89-9b03-5906-acba-b20f662cd828"))
+    Dependency("Libtiff_jll"; compat="4.3.0")
 ]
 
 # Build the tarballs, and possibly a `build.jl` as well.
diff --git a/O/OpenSlide/build_tarballs.jl b/O/OpenSlide/build_tarballs.jl
@@ -34,13 +34,14 @@ dependencies = [
     Dependency(PackageSpec(name="Zlib_jll", uuid="83775a58-1f1d-513f-b197-d71354ab007a"))
     Dependency(PackageSpec(name="libpng_jll", uuid="b53b4c65-9356-5827-b1ea-8c7a1a84506f"))
     Dependency(PackageSpec(name="JpegTurbo_jll", uuid="aacddb02-875f-59d6-b918-886e6ef4fbf8"))
-    Dependency(PackageSpec(name="Libtiff_jll", uuid="89763e89-9b03-5906-acba-b20f662cd828"))
+    # TODO: v4.3.0 is available, use that next time
+    Dependency("Libtiff_jll"; compat="4.1.0")
     Dependency(PackageSpec(name="OpenJpeg_jll", uuid="643b3616-a352-519d-856d-80112ee9badc"))
     Dependency(PackageSpec(name="gdk_pixbuf_jll", uuid="da03df04-f53b-5353-a52f-6a8b0620ced0"))
     Dependency(PackageSpec(name="XML2_jll", uuid="02c8fc9c-b97f-50b9-bbe4-9be30ff0a78a"))
     Dependency(PackageSpec(name="SQLite_jll", uuid="76ed43ae-9a5d-5a62-8c75-30186b810ce8"))
     Dependency(PackageSpec(name="Cairo_jll", uuid="83423d85-b0ee-5818-9007-b63ccbeb887a"))
-    Dependency(PackageSpec(name="Glib_jll", uuid="7746bdde-850d-59dc-9ae8-88ece973131d"), v"2.59.0"; compat="2.59")
+    Dependency("Glib_jll"; compat="2.59")
     BuildDependency(PackageSpec(name="Xorg_xorgproto_jll", uuid="c4d99508-4286-5418-9131-c86396af500b"))
 ]
 
diff --git a/P/PROJ/common.jl b/P/PROJ/common.jl
@@ -88,7 +88,8 @@ function configure(version_offset, min_julia_version)
         # Host SQLite needed to build proj.db
         HostBuildDependency("SQLite_jll"),
         Dependency("SQLite_jll"),
-        Dependency("Libtiff_jll"),
+        # TODO: v4.3.0 is available, use that next time
+        Dependency("Libtiff_jll"; compat="4.1.0"),
         Dependency("Zlib_jll"),
     ]
 
diff --git a/P/Poppler/build_tarballs.jl b/P/Poppler/build_tarballs.jl
@@ -67,7 +67,8 @@ dependencies = [
     # Dependency("GTK3_jll"),
     Dependency("Glib_jll", v"2.59.0"; compat="2.59.0"),
     Dependency("JpegTurbo_jll"),
-    Dependency("Libtiff_jll"),
+    # TODO: v4.3.0 is available, use that next time
+    Dependency("Libtiff_jll"; compat="4.1.0"),
     Dependency("OpenJpeg_jll"),
     # Dependency("gdk_pixbuf_jll"),
     Dependency("libpng_jll"),

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,8 @@ function configure(version_offset, min_julia_version, proj_jll_version)`
`113`	`113`	`Dependency("OpenJpeg_jll"),`
`114`	`114`	`Dependency("Expat_jll", v"2.2.7"; compat="~2.2.7"),`
`115`	`115`	`Dependency("Zstd_jll"),`
`116`		`- Dependency("Libtiff_jll"),`
	`116`	`+ # TODO: v4.3.0 is available, use that next time`
	`117`	`+ Dependency("Libtiff_jll"; compat="4.1.0"),`
`117`	`118`	`Dependency("libgeotiff_jll"),`
`118`	`119`	`]`
`119`	`120`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,8 @@ dependencies = [`
`34`	`34`	`Dependency("Zlib_jll"),`
`35`	`35`	`Dependency("libpng_jll"),`
`36`	`36`	`Dependency("JpegTurbo_jll"),`
`37`		`- Dependency("Libtiff_jll")`
	`37`	`+ # TODO: v4.3.0 is available, use that next time`
	`38`	`+ Dependency("Libtiff_jll"; compat="4.1.0"),`
`38`	`39`	`]`
`39`	`40`
`40`	`41`	# Build the tarballs, and possibly a `build.jl` as well.
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ products = [`
`38`	`38`	`# Dependencies that must be installed before this package can be built`
`39`	`39`	`dependencies = [`
`40`	`40`	`Dependency(PackageSpec(name="JpegTurbo_jll", uuid="aacddb02-875f-59d6-b918-886e6ef4fbf8"))`
`41`		`- Dependency(PackageSpec(name="Libtiff_jll", uuid="89763e89-9b03-5906-acba-b20f662cd828"))`
	`41`	`+ Dependency("Libtiff_jll"; compat="4.3.0")`
`42`	`42`	`]`
`43`	`43`
`44`	`44`	# Build the tarballs, and possibly a `build.jl` as well.
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,8 @@ products = [`
`55`	`55`	`# Dependencies that must be installed before this package can be built`
`56`	`56`	`dependencies = [`
`57`	`57`	`Dependency(PackageSpec(name="PROJ_jll", uuid="58948b4f-47e0-5654-a9ad-f609743f8632")),`
`58`		`- Dependency(PackageSpec(name="Libtiff_jll", uuid="89763e89-9b03-5906-acba-b20f662cd828")),`
	`58`	`+ # TODO: v4.3.0 is available, use that next time`
	`59`	`+ Dependency("Libtiff_jll"; compat="4.1.0"),`
`59`	`60`	`]`
`60`	`61`
`61`	`62`	# Build the tarballs, and possibly a `build.jl` as well.
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ dependencies = [`
`49`	`49`	`Dependency("Giflib_jll"),`
`50`	`50`	`Dependency("JpegTurbo_jll"),`
`51`	`51`	`Dependency("libpng_jll"),`
`52`		`- Dependency("Libtiff_jll"),`
	`52`	`+ Dependency("Libtiff_jll"; compat="4.3.0"),`
`53`	`53`	`Dependency("Libglvnd_jll"),`
`54`	`54`	`]`
`55`	`55`