Accepting request 1172084 from GNOME:Next

- Pass -Dothers=enabled to meson: enable other image loaders (most
  notably beeded seems xpm,xbm). This is in line with upstreams
  recommendation for now, but won't be working past version 2.43.x.
  The loaders will likely be split out into a separate repo.
  (boo#1223903, glgo#GNOME/gdk-pixbuf!169).
- Add 238893d8cd6f9c2616a05ab521a29651a17a38c2.patch: Fix test
  suite with other loaders enabled.

OBS-URL: https://build.opensuse.org/request/show/1172084
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdk-pixbuf?expand=0&rev=202

238893d8cd6f9c2616a05ab521a29651a17a38c2.patch

@@ -0,0 +1,35 @@
+From 238893d8cd6f9c2616a05ab521a29651a17a38c2 Mon Sep 17 00:00:00 2001
+From: Christian Heusel <christian@heusel.eu>
+Date: Sat, 20 Apr 2024 11:07:32 +0200
+Subject: [PATCH] fix build failure due to typo in the build script
+
+The fixed commit had a typo where it would try to call a nonexistant
+function instead of the .contains method of the relevant array.
+This was only made visible when the "other" loaders were enabled so it
+is triggered all the time.
+
+This was made visible when working on
+https://gitlab.archlinux.org/archlinux/packaging/packages/gdk-pixbuf2/-/merge_requests/1
+
+Fixes: 81a77399a ("Update the testsuite")
+Signed-off-by: Christian Heusel <christian@heusel.eu>
+---
+ tests/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/meson.build b/tests/meson.build
+index 78d0ad92e..78ae43af1 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -71,7 +71,7 @@ installed_tests = {
+   'pixbuf-construction': { 'suites': ['conform'], },
+   'animation': {
+     'suites': ['format'],
+-    'skip': not (enabled_loaders.contains('ani') and enabled_loaders_contains('gif')),
++    'skip': not (enabled_loaders.contains('ani') and enabled_loaders.contains('gif')),
+   },
+   'cve-2015-4491': {
+     'suites': ['security'],
+-- 
+GitLab
+

gdk-pixbuf.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon May  6 07:03:01 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Pass -Dothers=enabled to meson: enable other image loaders (most
+  notably beeded seems xpm,xbm). This is in line with upstreams
+  recommendation for now, but won't be working past version 2.43.x.
+  The loaders will likely be split out into a separate repo.
+  (boo#1223903, glgo#GNOME/gdk-pixbuf!169).
+- Add 238893d8cd6f9c2616a05ab521a29651a17a38c2.patch: Fix test
+  suite with other loaders enabled.
+
 -------------------------------------------------------------------
 Thu May  2 08:53:08 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 

gdk-pixbuf.spec

@@ -36,6 +36,8 @@ Source1:        macros.gdk-pixbuf
 Source2:        README.SUSE
 Source3:        gdk-pixbuf-rpmlintrc
 Source99:       baselibs.conf
+# PATCH-FIX-UPSTREAM
+Patch0:         https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/238893d8cd6f9c2616a05ab521a29651a17a38c2.patch
 
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  docutils
@@ -141,6 +143,7 @@ cp -a %{SOURCE2} .
 %build
 %meson \
 	-Dinstalled_tests=false \
+	-Dothers=enabled \
 	%{nil}
 %meson_build