Skip to content

Commit 637e470

Browse files
committed
Dependency version bumps
- Update GLib to 2.74.0. - Update HarfBuzz to 5.2.0. - Update Pango to 1.50.10. - Update ImageMagick to 6.9.12-63. MXE Updates: - Update libpng to 1.6.38. - Update SQLite to 3.39.3.
1 parent ae2895e commit 637e470

File tree

6 files changed

+24
-26
lines changed

6 files changed

+24
-26
lines changed

README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
2525
| [freetype] | 2.12.1 | [freetype Licence] (BSD-like) |
2626
| [fribidi] | 1.0.12 | LGPLv3 |
2727
| [gdk-pixbuf] | 2.42.9 | LGPLv3 |
28-
| [glib] | 2.73.3 | LGPLv3 |
29-
| [harfbuzz] | 5.1.0 | MIT Licence |
28+
| [glib] | 2.74.0 | LGPLv3 |
29+
| [harfbuzz] | 5.2.0 | MIT Licence |
3030
| [lcms] | 2.13.1 | MIT Licence |
3131
| [libexif] | 0.6.24 | LGPLv3 |
3232
| [libffi] | 3.4.2 | MIT Licence |
3333
| [libgsf] | 1.14.50 | LGPLv3 |
3434
| [libheif] | 1.13.0 | LGPLv3 |
3535
| [libimagequant] | 2.4.1¹ | BSD 2-Clause |
36-
| [libpng] | 1.6.37 | [libpng License version 2] |
36+
| [libpng] | 1.6.38 | [libpng License version 2] |
3737
| [librsvg] | 2.55.0 | LGPLv3 |
3838
| [libspng] | 0.7.2 | BSD 2-Clause |
3939
| [libtiff] | 4.4.0 | [libtiff License] (BSD-like) |
@@ -42,7 +42,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
4242
| [libxml2] | 2.10.2 | MIT Licence |
4343
| [mozjpeg] | 4.1.1 | [zlib License, IJG License, BSD-3-Clause] |
4444
| [orc] | 0.4.32 | [orc License] (BSD-like) |
45-
| [pango] | 1.50.9 | LGPLv3 |
45+
| [pango] | 1.50.10 | LGPLv3 |
4646
| [pixman] | 0.40.0 | MIT Licence |
4747
| [proxy-libintl] | 0.4 | LGPLv3 |
4848
| [zlib-ng] | 2.0.6 | [zlib-ng Licence] |
@@ -97,7 +97,7 @@ Same as libvips-web + these extra dependencies:
9797
| [cfitsio] | 4.1.0 | BSD-like |
9898
| [fftw] | 3.3.10 | GPLv2 |
9999
| [highway] | 1.0.1 | Apache-2.0 License |
100-
| [imagemagick] | 6.9.12-62 | [ImageMagick License] (Apache-2.0-like) |
100+
| [imagemagick] | 6.9.12-63 | [ImageMagick License] (Apache-2.0-like) |
101101
| [imath] | 3.1.5 | BSD 3-Clause |
102102
| [libjxl] | 0.7² | BSD 3-Clause |
103103
| [matio] | 1.5.23 | BSD 2-Clause |
@@ -106,7 +106,7 @@ Same as libvips-web + these extra dependencies:
106106
| [openjpeg] | 2.5.0 | BSD 2-Clause |
107107
| [openslide] | 3.4.1 | LGPLv3 |
108108
| [poppler] | 22.09.0 | GPLv2 |
109-
| [sqlite] | 3.39.2 | Public domain |
109+
| [sqlite] | 3.39.3 | Public domain |
110110

111111
² libjxl is built from the [`v0.7rc`](https://github.com/libjxl/libjxl/tree/v0.7rc) tag, see:
112112
https://github.com/libjxl/libjxl/releases/tag/v0.7rc

build/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ fi
5151
# Always checkout a particular revision which will successfully build.
5252
# This ensures that it will not suddenly break a build.
5353
# Note: Must be regularly updated.
54-
revision="fa26c6fd61596109d289c80f73a2d1b08736ac3f"
54+
revision="f1cb8e7b92c4ae014de8a1816c995e13d4fbffbd"
5555
initialize=false
5656

5757
if [ -f "$mxe_dir/Makefile" ]; then

build/overrides.mk

+12-14
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ matio_FILE := matio-$(matio_VERSION).tar.gz
3939
matio_URL := https://github.com/tbeu/matio/releases/download/v$(matio_VERSION)/$(matio_FILE)
4040

4141
# upstream version is 7, we want ImageMagick 6
42-
imagemagick_VERSION := 6.9.12-62
43-
imagemagick_CHECKSUM := 21eb4c5a4f0f9e76f1e67fb6a20f7b1e4374346ed9351bec9898f370d7b2f035
42+
imagemagick_VERSION := 6.9.12-63
43+
imagemagick_CHECKSUM := 208e8dda121f51ac8a1230ac5dec57b7366120ae2b0b0a243c40757c7776d1ea
4444
imagemagick_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/imagemagick-[0-9]*.patch)))
4545
imagemagick_GH_CONF := ImageMagick/ImageMagick6/tags
4646

@@ -61,8 +61,8 @@ librsvg_FILE := librsvg-$(librsvg_VERSION).tar.xz
6161
librsvg_URL := https://download.gnome.org/sources/librsvg/$(call SHORT_PKG_VERSION,librsvg)/$(librsvg_FILE)
6262

6363
# upstream version is 1.50.0
64-
pango_VERSION := 1.50.9
65-
pango_CHECKSUM := 1b636aabf905130d806372136f5e137b6a27f26d47defd9240bf444f6a4fe610
64+
pango_VERSION := 1.50.10
65+
pango_CHECKSUM := 7e5d2f1e40854d24a9a2c4d093bafe75dcdbeccdf1de43e4437332eabed64966
6666
pango_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/pango-[0-9]*.patch)))
6767
pango_SUBDIR := pango-$(pango_VERSION)
6868
pango_FILE := pango-$(pango_VERSION).tar.xz
@@ -87,8 +87,8 @@ libwebp_FILE := libwebp-$(libwebp_VERSION).tar.gz
8787
libwebp_URL := http://downloads.webmproject.org/releases/webp/$(libwebp_FILE)
8888

8989
# upstream version is 2.70.2
90-
glib_VERSION := 2.73.3
91-
glib_CHECKSUM := df1a2b841667d6b48b2ef6969ebda4328243829f6e45866726f806f90f64eead
90+
glib_VERSION := 2.74.0
91+
glib_CHECKSUM := 3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30
9292
glib_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/glib-[0-9]*.patch)))
9393
glib_SUBDIR := glib-$(glib_VERSION)
9494
glib_FILE := glib-$(glib_VERSION).tar.xz
@@ -143,6 +143,12 @@ pixman_SUBDIR := pixman-$(pixman_VERSION)
143143
pixman_FILE := pixman-$(pixman_VERSION).tar.gz
144144
pixman_URL := https://cairographics.org/releases/$(pixman_FILE)
145145

146+
# upstream version is 5.1.0
147+
harfbuzz_VERSION := 5.2.0
148+
harfbuzz_CHECKSUM := 735a94917b47936575acb4d4fa7e7986522f8a89527e4635721474dee2bc942c
149+
harfbuzz_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/harfbuzz-[0-9]*.patch)))
150+
harfbuzz_GH_CONF := harfbuzz/harfbuzz/releases,,,,,.tar.xz
151+
146152
# upstream version is 2.13
147153
# cannot use GH_CONF:
148154
# lcms_GH_CONF := mm2/Little-CMS,lcms
@@ -161,14 +167,6 @@ fftw_SUBDIR := fftw-$(fftw_VERSION)
161167
fftw_FILE := fftw-$(fftw_VERSION).tar.gz
162168
fftw_URL := http://www.fftw.org/$(fftw_FILE)
163169

164-
# upstream version is 22.08.0
165-
poppler_VERSION := 22.09.0
166-
poppler_CHECKSUM := d7a8f748211359cadb774ba3e18ecda6464b34027045c0648eb30d5852a41e2e
167-
poppler_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/poppler-[0-9]*.patch)))
168-
poppler_SUBDIR := poppler-$(poppler_VERSION)
169-
poppler_FILE := poppler-$(poppler_VERSION).tar.xz
170-
poppler_URL := https://poppler.freedesktop.org/$(poppler_FILE)
171-
172170
# upstream version is 2.14.02
173171
nasm_VERSION := 2.15.05
174172
nasm_CHECKSUM := 3caf6729c1073bf96629b57cee31eeb54f4f8129b01902c73428836550b30a3f

build/patches/glib-static.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ diff --git a/gio/meson.build b/gio/meson.build
5454
index 1111111..2222222 100644
5555
--- a/gio/meson.build
5656
+++ b/gio/meson.build
57-
@@ -816,12 +816,9 @@ else
57+
@@ -817,12 +817,9 @@ else
5858
gio_dtrace_hdr = []
5959
endif
6060

build/plugins/llvm-mingw/patches/rust-1-fixes.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/s
6262
index 1111111..2222222 100644
6363
--- a/compiler/rustc_target/src/spec/mod.rs
6464
+++ b/compiler/rustc_target/src/spec/mod.rs
65-
@@ -1045,7 +1045,9 @@ supported_targets! {
65+
@@ -1046,7 +1046,9 @@ supported_targets! {
6666
("x86_64-uwp-windows-gnu", x86_64_uwp_windows_gnu),
6767

6868
("aarch64-pc-windows-gnullvm", aarch64_pc_windows_gnullvm),

build/plugins/llvm-mingw/rust.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ PKG := rust
22
$(PKG)_WEBSITE := https://www.rust-lang.org/
33
$(PKG)_DESCR := A systems programming language focused on safety, speed and concurrency.
44
$(PKG)_IGNORE :=
5-
# https://static.rust-lang.org/dist/2022-09-07/rustc-nightly-src.tar.xz.sha256
5+
# https://static.rust-lang.org/dist/2022-09-18/rustc-nightly-src.tar.xz.sha256
66
$(PKG)_VERSION := nightly
7-
$(PKG)_CHECKSUM := c400c1a04f7cde3fc716916f9458ad6b502da84d84f8cf188c4723027c57618b
7+
$(PKG)_CHECKSUM := bbc7bc15350ddc6fc2ab0a67eafd41347a5ae14effade2f570be575506fdfba6
88
$(PKG)_PATCHES := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/$(PKG)-[0-9]*.patch)))
99
$(PKG)_SUBDIR := $(PKG)c-$($(PKG)_VERSION)-src
1010
$(PKG)_FILE := $(PKG)c-$($(PKG)_VERSION)-src.tar.xz
11-
$(PKG)_URL := https://static.rust-lang.org/dist/2022-09-07/$($(PKG)_FILE)
11+
$(PKG)_URL := https://static.rust-lang.org/dist/2022-09-18/$($(PKG)_FILE)
1212
$(PKG)_DEPS := $(BUILD)~$(PKG)
1313
$(PKG)_TARGETS := $(BUILD) $(MXE_TARGETS)
1414

0 commit comments

Comments
 (0)