Skip to content

Commit 89bf46c

Browse files
giordanogiordano
authored
Fix compat for packages depending on Libtiff_jll (#3311)
[skip ci] [skip build]
1 parent 9d3df94 commit 89bf46c

File tree

14 files changed

+25
-15
lines changed

14 files changed

+25
-15
lines changed

‎G/GDAL/common.jl

+2-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,8 @@ function configure(version_offset, min_julia_version, proj_jll_version)
113113
Dependency("OpenJpeg_jll"),
114114
Dependency("Expat_jll", v"2.2.7"; compat="~2.2.7"),
115115
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"),
117118
Dependency("libgeotiff_jll"),
118119
]
119120

‎G/Gnuastro/build_tarballs.jl

+2-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ dependencies = [
7878
Dependency("CFITSIO_jll", v"3.49"; compat="~3.49"),
7979
Dependency("GSL_jll"),
8080
Dependency("JpegTurbo_jll"),
81-
Dependency("Libtiff_jll"),
81+
# TODO: v4.3.0 is available, use that next time
82+
Dependency("Libtiff_jll"; compat="4.1.0"),
8283
# This is a bit complicated because LibGit2 is a dependency of Julia.
8384
# `LibGit2_jll` v1.2.3, corresponding to upstream v1.1.0, is what is used in
8485
# Julia v1.6.

‎G/gdk_pixbuf/build_tarballs.jl

+2-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ dependencies = [
5454
Dependency("Glib_jll", v"2.59.0"; compat="2.59.0"),
5555
Dependency("JpegTurbo_jll"),
5656
Dependency("libpng_jll"),
57-
Dependency("Libtiff_jll"),
57+
# TODO: v4.3.0 is available, use that next time
58+
Dependency("Libtiff_jll"; compat="4.1.0"),
5859
Dependency("Xorg_libX11_jll"),
5960
BuildDependency("Xorg_xproto_jll"),
6061
BuildDependency("Xorg_kbproto_jll"),

‎I/ImageMagick/build_tarballs.jl

+2-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ dependencies = [
3434
Dependency("Zlib_jll"),
3535
Dependency("libpng_jll"),
3636
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"),
3839
]
3940

4041
# Build the tarballs, and possibly a `build.jl` as well.

‎L/Leptonica/build_tarballs.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ dependencies = [
4545
Dependency(PackageSpec(name="Giflib_jll", uuid="59f7168a-df46-5410-90c8-f2779963d0ec")),
4646
Dependency(PackageSpec(name="JpegTurbo_jll", uuid="aacddb02-875f-59d6-b918-886e6ef4fbf8")),
4747
Dependency(PackageSpec(name="libpng_jll", uuid="b53b4c65-9356-5827-b1ea-8c7a1a84506f")),
48-
Dependency(PackageSpec(name="Libtiff_jll", uuid="89763e89-9b03-5906-acba-b20f662cd828")),
48+
Dependency("Libtiff_jll"; compat="4.3.0"),
4949
Dependency(PackageSpec(name="libwebp_jll", uuid="c5f90fcd-3b7e-5836-afba-fc50a0988cb2")),
5050
Dependency(PackageSpec(name="Zlib_jll", uuid="83775a58-1f1d-513f-b197-d71354ab007a")),
5151
# Leptonica has a runtime check on the minor version of OpenJpeg, because why not:

‎L/LibGD/build_tarballs.jl

+2-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ dependencies = [
4444
Dependency(PackageSpec(name="JpegTurbo_jll", uuid="aacddb02-875f-59d6-b918-886e6ef4fbf8")),
4545
Dependency(PackageSpec(name="Zlib_jll", uuid="83775a58-1f1d-513f-b197-d71354ab007a")),
4646
Dependency(PackageSpec(name="libpng_jll", uuid="b53b4c65-9356-5827-b1ea-8c7a1a84506f")),
47-
Dependency(PackageSpec(name="Libtiff_jll", uuid="89763e89-9b03-5906-acba-b20f662cd828")),
47+
# TODO: v4.3.0 is available, use that next time
48+
Dependency("Libtiff_jll"; compat="4.1.0"),
4849
BuildDependency(PackageSpec(name="Xorg_xorgproto_jll", uuid = "c4d99508-4286-5418-9131-c86396af500b")),
4950
Dependency(PackageSpec(name="Xorg_libXpm_jll", uuid = "1a3ddb2d-74e3-57f3-a27b-e9b16291b4f2")),
5051
Dependency(PackageSpec(name="Libiconv_jll", uuid = "94ce4f54-9a6c-5748-9c1c-f9c7231a4531")),

‎L/LittleCMS/build_tarballs.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ products = [
3838
# Dependencies that must be installed before this package can be built
3939
dependencies = [
4040
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")
4242
]
4343

4444
# Build the tarballs, and possibly a `build.jl` as well.

‎L/libgeotiff/build_tarballs.jl

+2-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ products = [
5555
# Dependencies that must be installed before this package can be built
5656
dependencies = [
5757
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"),
5960
]
6061

6162
# Build the tarballs, and possibly a `build.jl` as well.

‎L/libgraphicsmagic/build_tarballs.jl

+2-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ dependencies = [
4141
Dependency(PackageSpec(name="Ghostscript_jll", uuid="61579ee1-b43e-5ca0-a5da-69d92c66a64b"))
4242
Dependency(PackageSpec(name="Xorg_libXext_jll", uuid="1082639a-0dae-5f34-9b06-72781eeb8cb3"))
4343
Dependency(PackageSpec(name="Xorg_libSM_jll", uuid="c834827a-8449-5923-a945-d239c165b7dd"))
44-
Dependency(PackageSpec(name="Libtiff_jll", uuid="89763e89-9b03-5906-acba-b20f662cd828"))
44+
# TODO: v4.3.0 is available, use that next time
45+
Dependency("Libtiff_jll"; compat="4.1.0")
4546
Dependency(PackageSpec(name="LittleCMS_jll", uuid="d3a379c0-f9a3-5b72-a4c0-6bf4d2e8af0f"))
4647
Dependency("Bzip2_jll", v"1.0.7"; compat="1.0.7")
4748
Dependency(PackageSpec(name="XZ_jll", uuid="ffd25f8a-64ca-5728-b0f7-c24cf3aae800"))

‎L/libwebp/build_tarballs.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ dependencies = [
4949
Dependency("Giflib_jll"),
5050
Dependency("JpegTurbo_jll"),
5151
Dependency("libpng_jll"),
52-
Dependency("Libtiff_jll"),
52+
Dependency("Libtiff_jll"; compat="4.3.0"),
5353
Dependency("Libglvnd_jll"),
5454
]
5555

‎O/OpenJpeg/build_tarballs.jl

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ products = [
3939
dependencies = [
4040
Dependency(PackageSpec(name="LittleCMS_jll", uuid="d3a379c0-f9a3-5b72-a4c0-6bf4d2e8af0f"))
4141
Dependency(PackageSpec(name="libpng_jll", uuid="b53b4c65-9356-5827-b1ea-8c7a1a84506f"))
42-
Dependency(PackageSpec(name="Libtiff_jll", uuid="89763e89-9b03-5906-acba-b20f662cd828"))
42+
Dependency("Libtiff_jll"; compat="4.3.0")
4343
]
4444

4545
# Build the tarballs, and possibly a `build.jl` as well.

‎O/OpenSlide/build_tarballs.jl

+3-2
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,14 @@ dependencies = [
3434
Dependency(PackageSpec(name="Zlib_jll", uuid="83775a58-1f1d-513f-b197-d71354ab007a"))
3535
Dependency(PackageSpec(name="libpng_jll", uuid="b53b4c65-9356-5827-b1ea-8c7a1a84506f"))
3636
Dependency(PackageSpec(name="JpegTurbo_jll", uuid="aacddb02-875f-59d6-b918-886e6ef4fbf8"))
37-
Dependency(PackageSpec(name="Libtiff_jll", uuid="89763e89-9b03-5906-acba-b20f662cd828"))
37+
# TODO: v4.3.0 is available, use that next time
38+
Dependency("Libtiff_jll"; compat="4.1.0")
3839
Dependency(PackageSpec(name="OpenJpeg_jll", uuid="643b3616-a352-519d-856d-80112ee9badc"))
3940
Dependency(PackageSpec(name="gdk_pixbuf_jll", uuid="da03df04-f53b-5353-a52f-6a8b0620ced0"))
4041
Dependency(PackageSpec(name="XML2_jll", uuid="02c8fc9c-b97f-50b9-bbe4-9be30ff0a78a"))
4142
Dependency(PackageSpec(name="SQLite_jll", uuid="76ed43ae-9a5d-5a62-8c75-30186b810ce8"))
4243
Dependency(PackageSpec(name="Cairo_jll", uuid="83423d85-b0ee-5818-9007-b63ccbeb887a"))
43-
Dependency(PackageSpec(name="Glib_jll", uuid="7746bdde-850d-59dc-9ae8-88ece973131d"), v"2.59.0"; compat="2.59")
44+
Dependency("Glib_jll"; compat="2.59")
4445
BuildDependency(PackageSpec(name="Xorg_xorgproto_jll", uuid="c4d99508-4286-5418-9131-c86396af500b"))
4546
]
4647

‎P/PROJ/common.jl

+2-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ function configure(version_offset, min_julia_version)
8888
# Host SQLite needed to build proj.db
8989
HostBuildDependency("SQLite_jll"),
9090
Dependency("SQLite_jll"),
91-
Dependency("Libtiff_jll"),
91+
# TODO: v4.3.0 is available, use that next time
92+
Dependency("Libtiff_jll"; compat="4.1.0"),
9293
Dependency("Zlib_jll"),
9394
]
9495

‎P/Poppler/build_tarballs.jl

+2-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,8 @@ dependencies = [
6767
# Dependency("GTK3_jll"),
6868
Dependency("Glib_jll", v"2.59.0"; compat="2.59.0"),
6969
Dependency("JpegTurbo_jll"),
70-
Dependency("Libtiff_jll"),
70+
# TODO: v4.3.0 is available, use that next time
71+
Dependency("Libtiff_jll"; compat="4.1.0"),
7172
Dependency("OpenJpeg_jll"),
7273
# Dependency("gdk_pixbuf_jll"),
7374
Dependency("libpng_jll"),

0 commit comments

Comments
 (0)