CVS commit: pkgsrc/devel/wayland

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Thu Jan 23 17:53:36 UTC 2025

Modified Files:
        pkgsrc/devel/wayland: Makefile distinfo
Added Files:
        pkgsrc/devel/wayland/patches: patch-src_wayland-util.h

Log Message:
devel/wayland: Patch around -Wundef, __STDC_VERSION, and C++.

Proposed at:

https://mail-index.netbsd.org/tech-pkg/2025/01/15/msg030385.html

Upstream issue:

https://gitlab.freedesktop.org/wayland/wayland/-/issues/522

Upstream commentator suggested taking this branch if __cplusplus
exceeds some threshold too, but I'll leave that to upstream to
decide.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/devel/wayland/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/wayland/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/wayland/patches/patch-src_wayland-util.h

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.26 pkgsrc/devel/wayland/Makefile:1.27
--- pkgsrc/devel/wayland/Makefile:1.26  Tue Jan 21 11:00:12 2025
+++ pkgsrc/devel/wayland/Makefile       Thu Jan 23 17:53:35 2025
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2025/01/21 11:00:12 nia Exp $
+# $NetBSD: Makefile,v 1.27 2025/01/23 17:53:35 riastradh Exp $
 
 DISTNAME=      wayland-1.23.0
-PKGREVISION=   3
+PKGREVISION=   4
 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.13 pkgsrc/devel/wayland/distinfo:1.14
--- pkgsrc/devel/wayland/distinfo:1.13  Sun Jun  9 14:29:27 2024
+++ pkgsrc/devel/wayland/distinfo       Thu Jan 23 17:53:35 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2024/06/09 14:29:27 wiz Exp $
+$NetBSD: distinfo,v 1.14 2025/01/23 17:53:35 riastradh Exp $
 
 BLAKE2s (wayland-1.23.0.tar.xz) = fc1a51e492c72230e59ae2dc5380dd19ec9a40cae61cac5ef5240a0b30047822
 SHA512 (wayland-1.23.0.tar.xz) = 9c525231a7ea3e68d3178230d476285a960d23e38571ac96d885f86c0588c52ef01460bff6833db5adb9456ce8db7b996613611187aac972736748ba91b8fd81
@@ -7,3 +7,4 @@ SHA1 (patch-meson.build) = de540a3d1f72d
 SHA1 (patch-meson__options.txt) = af930cd03994d7a2202af97b17939555c3aa7409
 SHA1 (patch-src_meson.build) = 47bb46d9af0ab428667bebbed36b09f0b0b9c414
 SHA1 (patch-src_wayland-os.c) = 8bbd574108e06697c874d372062d3129eb7937d1
+SHA1 (patch-src_wayland-util.h) = 5c12f864cf64d8b3863ad2f81e398cf99fffa8e8

Added files:

Index: pkgsrc/devel/wayland/patches/patch-src_wayland-util.h
diff -u /dev/null pkgsrc/devel/wayland/patches/patch-src_wayland-util.h:1.1
--- /dev/null   Thu Jan 23 17:53:36 2025
+++ pkgsrc/devel/wayland/patches/patch-src_wayland-util.h       Thu Jan 23 17:53:36 2025
@@ -0,0 +1,26 @@
+$NetBSD: patch-src_wayland-util.h,v 1.1 2025/01/23 17:53:36 riastradh Exp $
+
+Pacify -Wundef / -Werror=undef when compiling C++ programs that use
+Wayland header files.
+https://gitlab.freedesktop.org/wayland/wayland/-/issues/522
+
+--- src/wayland-util.h.orig    2024-05-30 18:59:51.000000000 +0000
++++ src/wayland-util.h
+@@ -48,7 +48,7 @@ extern "C" {
+ #endif
+ 
+ /** Deprecated attribute */
+-#if __STDC_VERSION__ >= 202311L
++#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202311L
+ #define WL_DEPRECATED [[deprecated]]
+ #elif defined(__GNUC__) && __GNUC__ >= 4
+ #define WL_DEPRECATED __attribute__ ((deprecated))
+@@ -70,7 +70,7 @@ extern "C" {
+ #define WL_PRINTF(x, y)
+ #endif
+ 
+-#if __STDC_VERSION__ >= 202311L
++#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202311L
+ #define WL_TYPEOF(expr) typeof(expr)
+ #else
+ #define WL_TYPEOF(expr) __typeof__(expr)