From: Landry Breuil <landry@openbsd.org>
Subject: Re: fix gdk-pixbuf regression that broke xfce4-panel window icons
To: Matthieu Herrb <matthieu@openbsd.org>
Cc: ports@openbsd.org
Date: Sat, 4 Oct 2025 09:28:58 +0200

Le Sat, Oct 04, 2025 at 09:17:00AM +0200, Matthieu Herrb a écrit :
> On Sat, Oct 04, 2025 at 09:00:58AM +0200, Landry Breuil wrote:
> > hi,
> > 
> > since the update to gdk-pixbuf 2.44, window icons in xfce4-panel are
> > broken, cf https://gitlab.xfce.org/xfce/xfce4-panel/-/issues/951.
> > 
> > backporting
> > https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/241 fixes it,
> > so i'd like to have that in 7.8.
> > 
> > ok ?
> 
> You forgot to cvs add patches/patch-gdk-pixbuf_io-bmp_c, but
> recreating it from the gitlab issue fixes the issue for me too.
> (attached below)

yeah, doh :)

full port patch below
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/gdk-pixbuf2/Makefile,v
diff -u -r1.104 Makefile
--- Makefile	30 Sep 2025 06:29:37 -0000	1.104
+++ Makefile	4 Oct 2025 07:28:15 -0000
@@ -2,6 +2,7 @@
 
 GNOME_PROJECT=		gdk-pixbuf
 GNOME_VERSION=		2.44.3
+REVISION=		0
 
 CATEGORIES=		graphics
 
Index: patches/patch-gdk-pixbuf_io-bmp_c
===================================================================
RCS file: patches/patch-gdk-pixbuf_io-bmp_c
diff -N patches/patch-gdk-pixbuf_io-bmp_c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-gdk-pixbuf_io-bmp_c	4 Oct 2025 07:28:15 -0000
@@ -0,0 +1,16 @@
+https://gitlab.xfce.org/xfce/xfce4-panel/-/issues/951
+https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/issues/271
+https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/241
+
+Index: gdk-pixbuf/io-bmp.c
+--- gdk-pixbuf/io-bmp.c.orig
++++ gdk-pixbuf/io-bmp.c
+@@ -129,7 +129,7 @@ static void DumpBIH(unsigned char *BIH)
+ struct headerpair {
+ 	guint32 size;
+ 	guint32 width;
+-	guint32 height;
++	gint32 height;
+ 	guint depth;
+ 	guint Negative;		/* Negative = 1 -> top down BMP,
+ 				   Negative = 0 -> bottom up BMP */