CVS commit: pkgsrc/x11/xfce4-desktop

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Sun Apr 27 21:44:56 UTC 2025

Modified Files:
        pkgsrc/x11/xfce4-desktop: Makefile distinfo
Added Files:
        pkgsrc/x11/xfce4-desktop/patches: patch-common_xfdesktop-common.c

Log Message:
xfce4-desktop: fix issue with monitor names in some contexts

Analysis and patch from Martin Husemann <martin%NetBSD.org@localhost>.


To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 pkgsrc/x11/xfce4-desktop/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/x11/xfce4-desktop/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/xfce4-desktop/patches/patch-common_xfdesktop-common.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/xfce4-desktop/Makefile
diff -u pkgsrc/x11/xfce4-desktop/Makefile:1.111 pkgsrc/x11/xfce4-desktop/Makefile:1.112
--- pkgsrc/x11/xfce4-desktop/Makefile:1.111     Thu Apr 24 14:16:34 2025
+++ pkgsrc/x11/xfce4-desktop/Makefile   Sun Apr 27 21:44:56 2025
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.111 2025/04/24 14:16:34 wiz Exp $
+# $NetBSD: Makefile,v 1.112 2025/04/27 21:44:56 gutteridge Exp $
 
-PKGREVISION= 1
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 VERSION=       4.20.1
+PKGREVISION=   2
 DISTNAME=      xfdesktop-${VERSION}
 PKGNAME=       xfce4-desktop-${VERSION}
 CATEGORIES=    x11

Index: pkgsrc/x11/xfce4-desktop/distinfo
diff -u pkgsrc/x11/xfce4-desktop/distinfo:1.42 pkgsrc/x11/xfce4-desktop/distinfo:1.43
--- pkgsrc/x11/xfce4-desktop/distinfo:1.42      Sat Feb 22 03:41:16 2025
+++ pkgsrc/x11/xfce4-desktop/distinfo   Sun Apr 27 21:44:56 2025
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.42 2025/02/22 03:41:16 gutteridge Exp $
+$NetBSD: distinfo,v 1.43 2025/04/27 21:44:56 gutteridge Exp $
 
 BLAKE2s (xfdesktop-4.20.1.tar.bz2) = 449e27b4cd1f4c7916d037b8c811b148f2c00cfcc5a6596d5c21c37f94510683
 SHA512 (xfdesktop-4.20.1.tar.bz2) = 11f422e31fb5b4f789ac61252a79ef9b139fd0a3e29f1346d5e3c06779567f1809fd78d751df5595cdb5510d0349e908276e85f6325b8ac90dfd00c79ca5d0e2
 Size (xfdesktop-4.20.1.tar.bz2) = 2527982 bytes
+SHA1 (patch-common_xfdesktop-common.c) = 3321e3c31ac899bca1c05c754e5012cd3799d416

Added files:

Index: pkgsrc/x11/xfce4-desktop/patches/patch-common_xfdesktop-common.c
diff -u /dev/null pkgsrc/x11/xfce4-desktop/patches/patch-common_xfdesktop-common.c:1.1
--- /dev/null   Sun Apr 27 21:44:56 2025
+++ pkgsrc/x11/xfce4-desktop/patches/patch-common_xfdesktop-common.c    Sun Apr 27 21:44:56 2025
@@ -0,0 +1,27 @@
+$NetBSD: patch-common_xfdesktop-common.c,v 1.1 2025/04/27 21:44:56 gutteridge Exp $
+
+Default the monitor name to "default" if we cannot get anything more
+specific from gdk_monitor_get_model().
+
+Reported in https://gitlab.xfce.org/xfce/xfdesktop/-/issues/380
+
+--- common/xfdesktop-common.c.orig     2024-11-03 07:01:56.000000000 +0100
++++ common/xfdesktop-common.c
+@@ -114,12 +114,16 @@ xfdesktop_get_monitor_name_from_gtk_widg
+     GdkWindow     *window = NULL;
+     GdkDisplay    *display = NULL;
+     GdkMonitor    *monitor = NULL;
++    const gchar   *monitor_name = NULL;
+ 
+     window = gtk_widget_get_window(widget);
+     display = gdk_window_get_display(window);
+     monitor = gdk_display_get_monitor(display, monitor_num);
+ 
+-    return g_strdup(gdk_monitor_get_model(monitor));
++    monitor_name = gdk_monitor_get_model(monitor);
++    if (monitor_name == NULL)
++        monitor_name = "default";
++    return g_strdup(monitor_name);
+ }
+ 
+ gint