Date: Tuesday, August 9, 2022 @ 21:12:52 Author: heftig Revision: 1264574
2.42.9-1 Added: lib32-gdk-pixbuf2/trunk/multilib.diff Modified: lib32-gdk-pixbuf2/trunk/PKGBUILD ---------------+ PKGBUILD | 14 +++++++++++--- multilib.diff | 17 +++++++++++++++++ 2 files changed, 28 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-08-09 20:36:27 UTC (rev 1264573) +++ PKGBUILD 2022-08-09 21:12:52 UTC (rev 1264574) @@ -1,8 +1,9 @@ # Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Jan Alexander Steffens (heftig) <hef...@archlinux.org> # Contributor: Ionut Biru <ib...@archlinux.org> pkgname=lib32-gdk-pixbuf2 -pkgver=2.42.8 +pkgver=2.42.9 pkgrel=1 pkgdesc="An image loading library (32-bit)" url="https://wiki.gnome.org/Projects/GdkPixbuf" @@ -14,13 +15,15 @@ "lib32-librsvg: Load .svg, .svgz, and .svg.gz" ) options=(debug) -_commit=bca00032ad68d0b0aa2c1f7558db931e52bd9cd2 # tags/2.42.8^0 +_commit=9b74d8dced44955b778fa1eac4fd0d29d5809e9d # tags/2.42.9^0 source=( "git+https://gitlab.gnome.org/GNOME/gdk-pixbuf.git#commit=$_commit" gdk-pixbuf-query-loaders-32.hook + multilib.diff ) sha256sums=('SKIP' - '60f0f8c2c022f9adef0902bdb4b89881e81f3388cd2e2e4830456eea10f49bae') + '60f0f8c2c022f9adef0902bdb4b89881e81f3388cd2e2e4830456eea10f49bae' + 'a87babba459f952148c0e89a046bb5c776e3530d10dd14ee6b9586c92061d500') pkgver() { cd gdk-pixbuf @@ -29,6 +32,10 @@ prepare() { cd gdk-pixbuf + + # Work around tests on lib32 + # https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/issues/215 + git apply -3 ../multilib.diff } build() { @@ -40,6 +47,7 @@ --libdir /usr/lib32 \ -D builtin_loaders=all \ -D introspection=disabled \ + -D man=false \ -D installed_tests=false meson compile -C build } Added: multilib.diff =================================================================== --- multilib.diff (rev 0) +++ multilib.diff 2022-08-09 21:12:52 UTC (rev 1264574) @@ -0,0 +1,17 @@ +diff --git i/tests/pixbuf-jpeg.c w/tests/pixbuf-jpeg.c +index be2c6b4fe..bdcf26657 100644 +--- i/tests/pixbuf-jpeg.c ++++ w/tests/pixbuf-jpeg.c +@@ -196,10 +196,10 @@ 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); ++ g_assert_error (error, GDK_PIXBUF_ERROR, GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY); + + pixbuf = gdk_pixbuf_loader_get_pixbuf (loader); +- g_assert_nonnull (pixbuf); ++ g_assert_null (pixbuf); + + g_object_unref (loader); + g_free (contents);