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

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)

ok matthieu@ fwiw
> 
> Landry

> ? patches/patch-gdk-pixbuf_io-bmp_c
> 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 06:57:41 -0000
> @@ -2,6 +2,7 @@
>  
>  GNOME_PROJECT=		gdk-pixbuf
>  GNOME_VERSION=		2.44.3
> +REVISION=		0
>  
>  CATEGORIES=		graphics
>  

https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/241/diffs

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 */

-- 
Matthieu Herrb