Re: [update] wayland/wayland 1.24.0

On Wed, Jul 16, 2025 at 10:46:54PM +0000, yaydn@protonmail.com wrote:
> Hello everyone,
>
> Here is wayland 1.24.0. I have been testing 1.23.93(rc3) on
> current/amd64 for a few weeks which is near identical to 1.24.0.
> Additionally, I have run 1.24.0 itself for nearly two weeks. Looks fine.
>
> I waited for various updates in ports and base to settle before
> proposing to reduce conflicts and fallout. I haven't had issues so far.
>
> I rebuilt kde-plasma, wayland/* and see no obvious problems, so I hope
> this will be clean update.
>
> Thank you @matthieu for pushing the previously needed patch upstream.
>
> Here is the changelog:
>
> https://lore.freedesktop.org/wayland-devel/plU5smxin5VXbiedTGtL7CNHe0t2mHtgQlQ3-xwREmSSNYaClAcZpEBV8L7JvMT8JHwdD_a_uSFkDUaP45CAWyL545iZh5gInAdToX6hgt4=@emersion.fr/T/#u
>
> I made this with
>
> cd /usr/ports/wayland/wayland/ && cvs diff -uNp > wayland-1.24.0.patch
>
> and should be applied somewhat like this? (I attached a copy of the
> the patch for convenience)
>
> cd /usr/ports/wayland/wayland/ && patch -l -p0 -E < wayland-1.24.0.patch
>
> Is this acceptable? Comments, advice, and testing welcome. Thank you.
>

There have been some symbols added to libwayland-client and
libwayland-server. So minor bumps are needed. Other than that I think
my patch is the same.

Index: Makefile
===================================================================
RCS file: /local/cvs/ports/wayland/wayland/Makefile,v
diff -u -p -u -r1.11 Makefile
--- Makefile 1 Nov 2024 10:42:05 -0000 1.11
+++ Makefile 29 Jul 2025 13:16:39 -0000
@@ -1,16 +1,16 @@
COMMENT = Display server protocol

DISTNAME = wayland-${V}
-V = 1.23.1
+V = 1.24.0

CATEGORIES = wayland

HOMEPAGE = https://wayland.freedesktop.org/

-SHARED_LIBS += wayland-client 0.2 # 0.21.0
-SHARED_LIBS += wayland-cursor 0.0 # 0.21.0
-SHARED_LIBS += wayland-egl 0.0 # 1.0
-SHARED_LIBS += wayland-server 0.3 # 0.21.0
+SHARED_LIBS += wayland-client 0.3 # 0.24.0
+SHARED_LIBS += wayland-cursor 0.0 # 0.24.0
+SHARED_LIBS += wayland-egl 0.0 # 1.24.0
+SHARED_LIBS += wayland-server 0.4 # 0.24.0

WANTLIB += c epoll-shim expat ffi xml2

Index: distinfo
===================================================================
RCS file: /local/cvs/ports/wayland/wayland/distinfo,v
diff -u -p -u -r1.5 distinfo
--- distinfo 1 Nov 2024 10:42:05 -0000 1.5
+++ distinfo 29 Jul 2025 13:16:39 -0000
@@ -1,2 +1,2 @@
-SHA256 (wayland-1.23.1.tar.xz) = hk+yqDmeLQ7DnVbp2bdTwJN3W+rcYCLOgfRBkpqB5e0=
-SIZE (wayland-1.23.1.tar.xz) = 238212
+SHA256 (wayland-1.24.0.tar.xz) = gokkh6Aa1nszTsqDtUMXp8hqA6ic+trP71IR8RpdBTY=
+SIZE (wayland-1.24.0.tar.xz) = 241764
Index: patches/patch-src_wayland-util_h
===================================================================
RCS file: patches/patch-src_wayland-util_h
diff -N patches/patch-src_wayland-util_h
--- patches/patch-src_wayland-util_h 1 Nov 2024 10:42:05 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-Index: src/wayland-util.h
---- src/wayland-util.h.orig
-+++ src/wayland-util.h
-@@ -48,7 +48,8 @@ extern "C" {
-