gdk-pixbuf: update to 2.42.12

Closes: #54932 [via git-merge-pr]
This commit is contained in:
chrysos349 2025-04-01 23:13:03 +03:00 committed by classabbyamp
parent f07cb79199
commit 31023e9598
No known key found for this signature in database
GPG key ID: 6BE0755918A4C7F5
3 changed files with 23 additions and 18 deletions

View file

@ -1,14 +1,31 @@
From: Simon McVittie <smcv@debian.org>
Date: Tue, 16 Aug 2022 11:19:07 +0100
Subject: tests: Tolerate either CORRUPT_IMAGE or INSUFFICIENT_MEMORY for
issue 205
Workaround for https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/issues/215
Forwarded: not-needed
---
tests/pixbuf-jpeg.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tests/pixbuf-jpeg.c b/tests/pixbuf-jpeg.c
index 7d0ff87..02b4648 100644
--- a/tests/pixbuf-jpeg.c
+++ b/tests/pixbuf-jpeg.c
@@ -196,10 +196,7 @@ test_jpeg_fbfbfbfb (void)
@@ -202,10 +202,11 @@ test_jpeg_fbfbfbfb (void)
g_assert_no_error (error);
gdk_pixbuf_loader_close (loader, &error);
- g_assert_error (error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_CORRUPT_IMAGE);
-
- pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
- g_assert_nonnull (pixbuf);
+ g_assert_error (error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY);
+ if (error != NULL && error->domain == GDK_PIXBUF_ERROR && error->code == GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY)
+ g_test_message ("OK: failed reporting insufficient memory: %s", error->message);
+ else
+ g_assert_error (error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_CORRUPT_IMAGE);
g_object_unref (loader);
g_free (contents);

View file

@ -1,12 +0,0 @@
pixbuf-randomly-modified tries to allocate 170MB which fails in CI
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -79,7 +79,6 @@ installed_tests = {
},
'pixbuf-fail': { 'suites': ['conform', 'slow'], },
'pixbuf-icon-serialize': { 'suites': ['conform'], },
- 'pixbuf-randomly-modified': { 'suites': ['slow'], },
'pixbuf-threads': { 'suites': ['io'], },
'pixbuf-gif': {
'suites': ['io'],

View file

@ -1,7 +1,7 @@
# Template file for 'gdk-pixbuf'
pkgname=gdk-pixbuf
version=2.42.10
revision=2
version=2.42.12
revision=1
build_style=meson
build_helper="gir"
configure_args="$(vopt_feature gir introspection) -Dpng=enabled
@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GdkPixbuf"
distfiles="${GNOME_SITE}/gdk-pixbuf/${version%.*}/gdk-pixbuf-${version}.tar.xz"
checksum=ee9b6c75d13ba096907a2e3c6b27b61bcd17f5c7ebeab5a5b439d2f2e39fe44b
checksum=b9505b3445b9a7e48ced34760c3bcb73e966df3ac94c95a148cb669ab748e3c7
# Package build options
build_options="gir"