CVS commit: pkgsrc/devel/wayland

["Robert Bagdan" <kikadf%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kikadf
Date:           Sun Feb 22 15:33:14 UTC 2026

Modified Files:
        pkgsrc/devel/wayland: Makefile distinfo
        pkgsrc/devel/wayland/patches: patch-meson.build

Log Message:
wayland: workaround for cursor loading on NetBSD

Gdk-WARNING **: 16:00:11.681: Failed to load cursor theme default
Gdk:ERROR:../gdk/wayland/gdkdisplay-wayland.c:1195:_gdk_wayland_display_get_scaled_cursor_theme:
   assertion failed: (display_wayland->cursor_theme_name)
PR kern/57622


To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 pkgsrc/devel/wayland/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/wayland/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/wayland/patches/patch-meson.build

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

Modified files:

Index: pkgsrc/devel/wayland/Makefile
diff -u pkgsrc/devel/wayland/Makefile:1.33 pkgsrc/devel/wayland/Makefile:1.34
--- pkgsrc/devel/wayland/Makefile:1.33  Wed Jan  7 08:46:47 2026
+++ pkgsrc/devel/wayland/Makefile       Sun Feb 22 15:33:14 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2026/01/07 08:46:47 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2026/02/22 15:33:14 kikadf Exp $
 
 DISTNAME=      wayland-1.24.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel
 MASTER_SITES=  https://gitlab.freedesktop.org/wayland/wayland/-/releases/${PKGVERSION_NOREV}/downloads/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/devel/wayland/distinfo
diff -u pkgsrc/devel/wayland/distinfo:1.16 pkgsrc/devel/wayland/distinfo:1.17
--- pkgsrc/devel/wayland/distinfo:1.16  Sun Oct 12 18:47:06 2025
+++ pkgsrc/devel/wayland/distinfo       Sun Feb 22 15:33:14 2026
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.16 2025/10/12 18:47:06 wiz Exp $
+$NetBSD: distinfo,v 1.17 2026/02/22 15:33:14 kikadf Exp $
 
 BLAKE2s (wayland-1.24.0.tar.xz) = 12e12e8cd76dffa4112943fc46d2a1a1a51b092ab0ee6e038c579ab24736339d
 SHA512 (wayland-1.24.0.tar.xz) = 60216602cffd1473ae15381f9e9a6f3829e742cac83843ca65360ba78bcff8d9442f15eb6a6d5d29c8f74dd920762ca1605f51658d22a1d3c18e338505b9f974
 Size (wayland-1.24.0.tar.xz) = 241764 bytes
-SHA1 (patch-meson.build) = de540a3d1f72d258b377a1e41325064f425e7534
+SHA1 (patch-meson.build) = b894dc443d7d9a47b6077c16a35b60bb3d997152
 SHA1 (patch-meson__options.txt) = af930cd03994d7a2202af97b17939555c3aa7409
 SHA1 (patch-scanner.c) = 68629112c5518aeaecbf831d14bea53168c1bc95
 SHA1 (patch-src_meson.build) = 47bb46d9af0ab428667bebbed36b09f0b0b9c414

Index: pkgsrc/devel/wayland/patches/patch-meson.build
diff -u pkgsrc/devel/wayland/patches/patch-meson.build:1.2 pkgsrc/devel/wayland/patches/patch-meson.build:1.3
--- pkgsrc/devel/wayland/patches/patch-meson.build:1.2  Sun Jun  9 14:29:27 2024
+++ pkgsrc/devel/wayland/patches/patch-meson.build      Sun Feb 22 15:33:14 2026
@@ -1,21 +1,23 @@
-$NetBSD: patch-meson.build,v 1.2 2024/06/09 14:29:27 wiz Exp $
+$NetBSD: patch-meson.build,v 1.3 2026/02/22 15:33:14 kikadf Exp $
 
 Support for NetBSD.
 
---- meson.build.orig   2024-05-30 18:59:51.000000000 +0000
+--- meson.build.orig   2025-07-06 12:11:26.000000000 +0000
 +++ meson.build
-@@ -38,6 +38,18 @@ foreach h: [ 'sys/prctl.h', 'sys/procctl
+@@ -38,6 +38,20 @@ foreach h: [ 'sys/prctl.h', 'sys/procctl
        config_h.set('HAVE_' + h.underscorify().to_upper(), cc.has_header(h))
  endforeach
  
 +# NetBSD defines posix_fallocate(), but it always returns failure.
 +# Cleanly fall back to ftruncate.
++# After memfd_create() and ftruncate(), mmap() fails
++# when the file size is smaller than a page.
++# See: https://gnats.netbsd.org/57622
 +if host_machine.system() == 'netbsd'
 +have_funcs = [
 +      'accept4',
 +      'mkostemp',
 +      'prctl',
-+      'memfd_create',
 +      'mremap',
 +      'strndup',
 +]
@@ -23,7 +25,7 @@ Support for NetBSD.
  have_funcs = [
        'accept4',
        'mkostemp',
-@@ -47,6 +59,7 @@ have_funcs = [
+@@ -47,6 +61,7 @@ have_funcs = [
        'mremap',
        'strndup',
  ]
@@ -31,7 +33,7 @@ Support for NetBSD.
  foreach f: have_funcs
        config_h.set('HAVE_' + f.underscorify().to_upper(), cc.has_function(f))
  endforeach
-@@ -69,8 +82,8 @@ endif
+@@ -69,8 +84,8 @@ endif
  config_h.set10('HAVE_BROKEN_MSG_CMSG_CLOEXEC', have_broken_msg_cmsg_cloexec)
  
  if get_option('libraries')