From b3f7870d83226935f60264517aba52f5a90ca629 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.org>
Date: Fri, 1 Oct 2021 10:27:04 +0200
Subject: [PATCH] gdk-pixbuf: update to 2.42.6.

---
 srcpkgs/gdk-pixbuf-xlib                       |  1 -
 .../patches/skip-broken-tests.patch           | 12 +++++++++++
 srcpkgs/gdk-pixbuf/template                   | 21 +++++++------------
 3 files changed, 19 insertions(+), 15 deletions(-)
 delete mode 120000 srcpkgs/gdk-pixbuf-xlib
 create mode 100644 srcpkgs/gdk-pixbuf/patches/skip-broken-tests.patch

diff --git a/srcpkgs/gdk-pixbuf-xlib b/srcpkgs/gdk-pixbuf-xlib
deleted file mode 120000
index fa20dc708aa..00000000000
--- a/srcpkgs/gdk-pixbuf-xlib
+++ /dev/null
@@ -1 +0,0 @@
-gdk-pixbuf
\ No newline at end of file
diff --git a/srcpkgs/gdk-pixbuf/patches/skip-broken-tests.patch b/srcpkgs/gdk-pixbuf/patches/skip-broken-tests.patch
new file mode 100644
index 00000000000..872572ed7ab
--- /dev/null
+++ b/srcpkgs/gdk-pixbuf/patches/skip-broken-tests.patch
@@ -0,0 +1,12 @@
+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'],
diff --git a/srcpkgs/gdk-pixbuf/template b/srcpkgs/gdk-pixbuf/template
index 74c362c5d6b..02c82570305 100644
--- a/srcpkgs/gdk-pixbuf/template
+++ b/srcpkgs/gdk-pixbuf/template
@@ -1,13 +1,13 @@
 # Template file for 'gdk-pixbuf'
 pkgname=gdk-pixbuf
-version=2.40.0
-revision=3
+version=2.42.6
+revision=1
 build_style=meson
 build_helper="gir"
-configure_args="-Dgir=$(vopt_if gir true false) -Djasper=false
- -Dpng=true -Dx11=true -Dinstalled_tests=false"
+configure_args="-Dintrospection=$(vopt_if gir enabled disabled) -Dpng=true
+ -Dinstalled_tests=false"
 hostmakedepends="gettext-devel glib-devel pkg-config libxslt docbook-xsl"
-makedepends="libX11-devel libglib-devel libpng-devel tiff-devel
+makedepends="libglib-devel libpng-devel tiff-devel
  shared-mime-info"
 depends="shared-mime-info"
 short_desc="Image loading library for The GTK+ toolkit (v2)"
@@ -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}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=1582595099537ca8ff3b99c6804350b4c058bb8ad67411bbaae024ee7cead4e6
+checksum=c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f
 
 # Package build options
 build_options="gir"
@@ -31,15 +31,8 @@ pre_configure() {
 	fi
 }
 
-gdk-pixbuf-xlib_package() {
-	short_desc+=" - xlib rendering library"
-	pkg_install() {
-		vmove usr/lib/libgdk_pixbuf_xlib*.so.*
-	}
-}
-
 gdk-pixbuf-devel_package() {
-	depends="${makedepends} ${sourcepkg}-xlib>=${version}_${revision} ${sourcepkg}>=${version}_${revision}"
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove "usr/lib/*.so"