Skip to content

Commit 0654711

Browse files
kleisaukekleisauke
committed
Dependency version bumps
- Update libarchive to 3.8.3. - Update matio to 1.5.29.
1 parent 848e432 commit 0654711

File tree

3 files changed

+23
-216
lines changed

3 files changed

+23
-216
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
2828
| [harfbuzz] | 12.2.0 | MIT Licence |
2929
| [highway] | 1.3.0 | Apache-2.0 License, BSD 3-Clause |
3030
| [lcms] | 2.17 | MIT Licence |
31-
| [libarchive] | 3.8.2 | BSD 2-Clause |
31+
| [libarchive] | 3.8.3 | BSD 2-Clause |
3232
| [libexif] | 0.6.25 | LGPLv3 |
3333
| [libffi] | 3.5.2 | MIT Licence |
3434
| [libheif] | 1.20.2 | LGPLv3 |
@@ -103,7 +103,7 @@ Same as libvips-web + these extra dependencies:
103103
| [libdicom] | 1.2.0 | MIT Licence |
104104
| [libjxl] | 0.11.1 | BSD 3-Clause |
105105
| [libraw] | 0.21.4 | LGPL-2.1-only |
106-
| [matio] | 1.5.28 | BSD 2-Clause |
106+
| [matio] | 1.5.29 | BSD 2-Clause |
107107
| [nifticlib] | 3.0.1 | Public domain |
108108
| [openexr] | 3.1.11 | BSD 3-Clause |
109109
| [openjpeg] | 2.5.4 | BSD 2-Clause |

‎build/overrides.mk‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ libxml2_URL := https://download.gnome.org/sources/libxml2/$(call SHORT_PKG_
2323
# upstream version is 1.5.23
2424
# cannot use GH_CONF:
2525
# matio_GH_CONF := tbeu/matio/releases,v
26-
matio_VERSION := 1.5.28
27-
matio_CHECKSUM := 9da698934a21569af058e6348564666f45029e6c2b0878ca0d8f9609bf77b8d8
26+
matio_VERSION := 1.5.29
27+
matio_CHECKSUM := d9e5f7a2f2c594eff15f550e34729b01991cdd5a028a558be8ce595b32233afb
2828
matio_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/matio-[0-9]*.patch)))
2929
matio_SUBDIR := matio-$(matio_VERSION)
3030
matio_FILE := matio-$(matio_VERSION).tar.gz
3131
matio_URL := https://github.com/tbeu/matio/releases/download/v$(matio_VERSION)/$(matio_FILE)
3232

3333
# upstream version is 3.4.0
34-
libarchive_VERSION := 3.8.2
35-
libarchive_CHECKSUM := db0dee91561cbd957689036a3a71281efefd131d35d1d98ebbc32720e4da58e2
34+
libarchive_VERSION := 3.8.3
35+
libarchive_CHECKSUM := 90e21f2b89f19391ce7b90f6e48ed9fde5394d23ad30ae256fb8236b38b99788
3636
libarchive_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/libarchive-[0-9]*.patch)))
3737
libarchive_SUBDIR := libarchive-$(libarchive_VERSION)
3838
libarchive_FILE := libarchive-$(libarchive_VERSION).tar.xz
@@ -155,6 +155,9 @@ libraw_SUBDIR := LibRaw-$(libraw_VERSION)
155155
libraw_FILE := LibRaw-$(libraw_VERSION).tar.gz
156156
libraw_URL := https://www.libraw.org/data/$(libraw_FILE)
157157

158+
# https://github.com/mxe/mxe/commit/a46f5f7c1c7b524f17401531ab16eda5a998f699
159+
sqlite_CHECKSUM := 42e26dfdd96aa2e6b1b1be5c88b0887f9959093f650d693cb02eb9c36d146ca5
160+
158161
# upstream version is 2.7.1
159162
# needed by nip4
160163
gsl_VERSION := 2.8

‎build/patches/librsvg-2-fixes.patch‎

Lines changed: 14 additions & 210 deletions
Original file line numberDiff line numberDiff line change
@@ -151,81 +151,27 @@ index 1111111..2222222 100644
151151
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
152152
From: Kleis Auke Wolthuizen <[email protected]>
153153
Date: Wed, 5 Nov 2025 10:39:31 +0100
154-
Subject: [PATCH 4/4] Downgrade to windows-sys < 0.61.0
154+
Subject: [PATCH 4/4] Downgrade to windows-sys 0.60.2
155155

156156
Generated using:
157-
cargo update -p chrono --precise 0.4.41
158-
cargo update -p errno --precise 0.3.13
159-
cargo update -p gio-sys --precise 0.21.1
160-
cargo update -p libloading --precise 0.8.8
161-
cargo update -p parking_lot --precise 0.12.4
162-
cargo update -p parking_lot_core --precise 0.9.11
163-
cargo update -p rustix --precise 1.0.8
164-
cargo update -p tempfile --precise 3.21.0
165-
cargo update -p winapi-util --precise 0.1.10
166-
cargo update -p windows-core --precise 0.61.2
167-
cargo update -p [email protected] --precise 0.53.3
157+
cargo update -p [email protected] --precise 0.60.2
168158

169159
Context: https://github.com/msys2/MINGW-packages/pull/26246#issuecomment-3486403668.
170160

171161
diff --git a/Cargo.lock b/Cargo.lock
172162
index 1111111..2222222 100644
173163
--- a/Cargo.lock
174164
+++ b/Cargo.lock
175-
@@ -40,6 +40,12 @@ dependencies = [
176-
"memchr",
177-
]
178-
179-
+[[package]]
180-
+name = "android-tzdata"
181-
+version = "0.1.1"
182-
+source = "registry+https://github.com/rust-lang/crates.io-index"
183-
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
184-
+
185-
[[package]]
186-
name = "android_system_properties"
187-
version = "0.1.5"
188-
@@ -321,10 +327,11 @@ checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
189-
190-
[[package]]
191-
name = "chrono"
192-
-version = "0.4.42"
193-
+version = "0.4.41"
194-
source = "registry+https://github.com/rust-lang/crates.io-index"
195-
-checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
196-
+checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
197-
dependencies = [
198-
+ "android-tzdata",
199-
"iana-time-zone",
200-
"num-traits",
201-
"windows-link",
202-
@@ -701,12 +708,12 @@ checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
203-
204-
[[package]]
205-
name = "errno"
206-
-version = "0.3.14"
207-
+version = "0.3.13"
208-
source = "registry+https://github.com/rust-lang/crates.io-index"
209-
-checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
210-
+checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
165+
@@ -706,7 +706,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
166+
checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
211167
dependencies = [
212168
"libc",
213169
- "windows-sys 0.61.2",
214170
+ "windows-sys 0.59.0",
215171
]
216172

217173
[[package]]
218-
@@ -921,15 +928,15 @@ dependencies = [
219-
220-
[[package]]
221-
name = "gio-sys"
222-
-version = "0.21.2"
223-
+version = "0.21.1"
224-
source = "registry+https://github.com/rust-lang/crates.io-index"
225-
-checksum = "171ed2f6dd927abbe108cfd9eebff2052c335013f5879d55bab0dc1dee19b706"
226-
+checksum = "a03f2234671e5a588cfe1f59c2b22c103f5772ea351be9cc824a9ce0d06d99fd"
227-
dependencies = [
228-
"glib-sys",
174+
@@ -929,7 +929,7 @@ dependencies = [
229175
"gobject-sys",
230176
"libc",
231177
"system-deps",
@@ -234,76 +180,7 @@ index 1111111..2222222 100644
234180
]
235181

236182
[[package]]
237-
@@ -1283,12 +1290,12 @@ checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
238-
239-
[[package]]
240-
name = "libloading"
241-
-version = "0.8.9"
242-
+version = "0.8.8"
243-
source = "registry+https://github.com/rust-lang/crates.io-index"
244-
-checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
245-
+checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
246-
dependencies = [
247-
"cfg-if",
248-
- "windows-link",
249-
+ "windows-targets 0.52.6",
250-
]
251-
252-
[[package]]
253-
@@ -1385,9 +1392,9 @@ dependencies = [
254-
255-
[[package]]
256-
name = "linux-raw-sys"
257-
-version = "0.11.0"
258-
+version = "0.9.4"
259-
source = "registry+https://github.com/rust-lang/crates.io-index"
260-
-checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
261-
+checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
262-
263-
[[package]]
264-
name = "litemap"
265-
@@ -1770,9 +1777,9 @@ dependencies = [
266-
267-
[[package]]
268-
name = "parking_lot"
269-
-version = "0.12.5"
270-
+version = "0.12.4"
271-
source = "registry+https://github.com/rust-lang/crates.io-index"
272-
-checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
273-
+checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
274-
dependencies = [
275-
"lock_api",
276-
"parking_lot_core",
277-
@@ -1780,15 +1787,15 @@ dependencies = [
278-
279-
[[package]]
280-
name = "parking_lot_core"
281-
-version = "0.9.12"
282-
+version = "0.9.11"
283-
source = "registry+https://github.com/rust-lang/crates.io-index"
284-
-checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
285-
+checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
286-
dependencies = [
287-
"cfg-if",
288-
"libc",
289-
"redox_syscall",
290-
"smallvec",
291-
- "windows-link",
292-
+ "windows-targets 0.52.6",
293-
]
294-
295-
[[package]]
296-
@@ -2256,15 +2263,15 @@ dependencies = [
297-
298-
[[package]]
299-
name = "rustix"
300-
-version = "1.1.2"
301-
+version = "1.0.8"
302-
source = "registry+https://github.com/rust-lang/crates.io-index"
303-
-checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
304-
+checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
305-
dependencies = [
306-
"bitflags",
183+
@@ -2264,7 +2264,7 @@ dependencies = [
307184
"errno",
308185
"libc",
309186
"linux-raw-sys",
@@ -312,17 +189,7 @@ index 1111111..2222222 100644
312189
]
313190

314191
[[package]]
315-
@@ -2565,15 +2572,15 @@ checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c"
316-
317-
[[package]]
318-
name = "tempfile"
319-
-version = "3.23.0"
320-
+version = "3.21.0"
321-
source = "registry+https://github.com/rust-lang/crates.io-index"
322-
-checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
323-
+checksum = "15b61f8f20e3a6f7e0649d825294eaf317edce30f82cf6026e7e4cb9222a7d1e"
324-
dependencies = [
325-
"fastrand",
192+
@@ -2573,7 +2573,7 @@ dependencies = [
326193
"getrandom",
327194
"once_cell",
328195
"rustix",
@@ -331,91 +198,28 @@ index 1111111..2222222 100644
331198
]
332199

333200
[[package]]
334-
@@ -2946,11 +2953,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
335-
336-
[[package]]
337-
name = "winapi-util"
338-
-version = "0.1.11"
339-
+version = "0.1.10"
201+
@@ -2950,7 +2950,7 @@ version = "0.1.11"
340202
source = "registry+https://github.com/rust-lang/crates.io-index"
341-
-checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
342-
+checksum = "0978bf7171b3d90bac376700cb56d606feb40f251a475a5d6634613564460b22"
203+
checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
343204
dependencies = [
344205
- "windows-sys 0.61.2",
345206
+ "windows-sys 0.59.0",
346207
]
347208

348209
[[package]]
349-
@@ -2961,9 +2968,9 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
350-
351-
[[package]]
352-
name = "windows-core"
353-
-version = "0.62.2"
354-
+version = "0.61.2"
355-
source = "registry+https://github.com/rust-lang/crates.io-index"
356-
-checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
357-
+checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
358-
dependencies = [
359-
"windows-implement",
360-
"windows-interface",
361-
@@ -2996,24 +3003,24 @@ dependencies = [
362-
363-
[[package]]
364-
name = "windows-link"
365-
-version = "0.2.1"
366-
+version = "0.1.3"
367-
source = "registry+https://github.com/rust-lang/crates.io-index"
368-
-checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
369-
+checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
370-
371-
[[package]]
372-
name = "windows-result"
373-
-version = "0.4.1"
374-
+version = "0.3.4"
375-
source = "registry+https://github.com/rust-lang/crates.io-index"
376-
-checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
377-
+checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
378-
dependencies = [
379-
"windows-link",
210+
@@ -3036,15 +3036,6 @@ dependencies = [
211+
"windows-targets 0.53.5",
380212
]
381213

382-
[[package]]
383-
name = "windows-strings"
384-
-version = "0.5.1"
385-
+version = "0.4.2"
386-
source = "registry+https://github.com/rust-lang/crates.io-index"
387-
-checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
388-
+checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
389-
dependencies = [
390-
"windows-link",
391-
]
392-
@@ -3033,16 +3040,7 @@ version = "0.60.2"
393-
source = "registry+https://github.com/rust-lang/crates.io-index"
394-
checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
395-
dependencies = [
396-
- "windows-targets 0.53.5",
397-
-]
398-
-
399214
-[[package]]
400215
-name = "windows-sys"
401216
-version = "0.61.2"
402217
-source = "registry+https://github.com/rust-lang/crates.io-index"
403218
-checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
404219
-dependencies = [
405220
- "windows-link",
406-
+ "windows-targets 0.53.3",
407-
]
408-
409-
[[package]]
410-
@@ -3063,9 +3061,9 @@ dependencies = [
411-
221+
-]
222+
-
412223
[[package]]
413224
name = "windows-targets"
414-
-version = "0.53.5"
415-
+version = "0.53.3"
416-
source = "registry+https://github.com/rust-lang/crates.io-index"
417-
-checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
418-
+checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
419-
dependencies = [
420-
"windows-link",
421-
"windows_aarch64_gnullvm 0.53.1",
225+
version = "0.52.6"

0 commit comments

Comments
 (0)