diff --git a/srcpkgs/gdk-pixbuf/patches/largejpeg-oom-test.patch b/srcpkgs/gdk-pixbuf/patches/largejpeg-oom-test.patch deleted file mode 100644 index 47851fce6573a3..00000000000000 --- a/srcpkgs/gdk-pixbuf/patches/largejpeg-oom-test.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Simon McVittie -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 -@@ -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); -+ 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); diff --git a/srcpkgs/gdk-pixbuf/template b/srcpkgs/gdk-pixbuf/template index 98abd229b2d3f9..991708a4ed12b4 100644 --- a/srcpkgs/gdk-pixbuf/template +++ b/srcpkgs/gdk-pixbuf/template @@ -1,7 +1,7 @@ # Template file for 'gdk-pixbuf' pkgname=gdk-pixbuf -version=2.42.12 -revision=2 +version=2.44.8 +revision=1 build_style=meson build_helper="gir" configure_args="$(vopt_feature gir introspection) -Dpng=enabled @@ -9,14 +9,14 @@ configure_args="$(vopt_feature gir introspection) -Dpng=enabled -Dinstalled_tests=false" hostmakedepends="gettext-devel glib-devel pkg-config python3-docutils" makedepends="libglib-devel libpng-devel tiff-devel libjpeg-turbo-devel - shared-mime-info" + shared-mime-info glycin-devel" depends="shared-mime-info" short_desc="Image loading library for The GTK+ toolkit (v2)" maintainer="Orphaned " 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=b9505b3445b9a7e48ced34760c3bcb73e966df3ac94c95a148cb669ab748e3c7 +checksum=919f529512961a12e81cd4b4b466a48c3933469e7f9a310c6513cd4fb252ba3c # Package build options build_options="gir" @@ -32,6 +32,13 @@ pre_configure() { fi } +do_check() { + # animation and pixbuf-fail abort on a warning from the ANI loader with glycin: + # https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/issues/303 + meson test -C build --no-rebuild ${makejobs} \ + $(meson test -C build --list --no-rebuild | sed 's/.*://' | grep -vx -e animation -e pixbuf-fail) +} + gdk-pixbuf-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" diff --git a/srcpkgs/glycin/template b/srcpkgs/glycin/template index 8fdeade2a5fbe2..75bf21592b5188 100644 --- a/srcpkgs/glycin/template +++ b/srcpkgs/glycin/template @@ -1,6 +1,6 @@ # Template file for 'glycin' pkgname=glycin -version=2.2.1 +version=2.2.6 revision=1 build_style=meson build_helper="rust gir" @@ -16,7 +16,7 @@ homepage="https://gitlab.gnome.org/GNOME/glycin" changelog="https://gitlab.gnome.org/GNOME/glycin/-/raw/2.1/NEWS" #changelog="https://gitlab.gnome.org/GNOME/glycin/-/raw/main/NEWS" distfiles="${GNOME_SITE}/glycin/${version%.*}/glycin-${version}.tar.xz" -checksum=937ae571d76c0de5e59db944d1194981360be37ee97875729781bc3816ddeafe +checksum=6a114aa1117ec2d7bd578c8cefd235d993304dedfd1a62575dc31be9a146b791 make_check=no # needs to be installed to run tests if [ "$CROSS_BUILD" ]; then