CVS commit: pkgsrc/x11/gtk4

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

Module Name:    pkgsrc
Committed By:   kikadf
Date:           Tue Feb 24 18:05:00 UTC 2026

Modified Files:
        pkgsrc/x11/gtk4: Makefile PLIST buildlink3.mk distinfo options.mk
Added Files:
        pkgsrc/x11/gtk4/patches: patch-gdk_wayland_gdkseat-wayland.c

Log Message:
x11/gtk4: add wayland support


To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 pkgsrc/x11/gtk4/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/x11/gtk4/PLIST
cvs rdiff -u -r1.20 -r1.21 pkgsrc/x11/gtk4/buildlink3.mk
cvs rdiff -u -r1.31 -r1.32 pkgsrc/x11/gtk4/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/gtk4/options.mk
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/gtk4/patches/patch-gdk_wayland_gdkseat-wayland.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/gtk4/Makefile
diff -u pkgsrc/x11/gtk4/Makefile:1.70 pkgsrc/x11/gtk4/Makefile:1.71
--- pkgsrc/x11/gtk4/Makefile:1.70       Fri Feb  6 10:06:13 2026
+++ pkgsrc/x11/gtk4/Makefile    Tue Feb 24 18:05:00 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.70 2026/02/06 10:06:13 wiz Exp $
+# $NetBSD: Makefile,v 1.71 2026/02/24 18:05:00 kikadf Exp $
 
 DISTNAME=      gtk-4.20.3
 PKGNAME=       ${DISTNAME:S/gtk/gtk4/}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gtk/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
@@ -35,6 +35,7 @@ MESON_ARGS+=          -Dvulkan=disabled
 MESON_ARGS+=           -Df16c=disabled
 
 PKGCONFIG_OVERRIDE+=   output/meson-private/gtk4.pc
+PKGCONFIG_OVERRIDE+=   output/meson-private/gtk4-wayland.pc
 PKGCONFIG_OVERRIDE+=   output/meson-private/gtk4-x11.pc
 PKGCONFIG_OVERRIDE+=   output/meson-private/gtk4-unix-print.pc
 

Index: pkgsrc/x11/gtk4/PLIST
diff -u pkgsrc/x11/gtk4/PLIST:1.27 pkgsrc/x11/gtk4/PLIST:1.28
--- pkgsrc/x11/gtk4/PLIST:1.27  Tue Jan  6 20:06:35 2026
+++ pkgsrc/x11/gtk4/PLIST       Tue Feb 24 18:05:00 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2026/01/06 20:06:35 adam Exp $
+@comment $NetBSD: PLIST,v 1.28 2026/02/24 18:05:00 kikadf Exp $
 bin/gtk4-builder-tool
 bin/gtk4-demo
 bin/gtk4-demo-application
@@ -79,6 +79,15 @@ ${PLIST.quartz}include/gtk-4.0/gdk/macos
 ${PLIST.quartz}include/gtk-4.0/gdk/macos/gdkmacossurface.h
 include/gtk-4.0/gdk/version/gdk-visibility.h
 include/gtk-4.0/gdk/version/gdkversionmacros.h
+${PLIST.wayland}include/gtk-4.0/gdk/wayland/gdkwayland.h
+${PLIST.wayland}include/gtk-4.0/gdk/wayland/gdkwaylanddevice.h
+${PLIST.wayland}include/gtk-4.0/gdk/wayland/gdkwaylanddisplay.h
+${PLIST.wayland}include/gtk-4.0/gdk/wayland/gdkwaylandglcontext.h
+${PLIST.wayland}include/gtk-4.0/gdk/wayland/gdkwaylandmonitor.h
+${PLIST.wayland}include/gtk-4.0/gdk/wayland/gdkwaylandpopup.h
+${PLIST.wayland}include/gtk-4.0/gdk/wayland/gdkwaylandseat.h
+${PLIST.wayland}include/gtk-4.0/gdk/wayland/gdkwaylandsurface.h
+${PLIST.wayland}include/gtk-4.0/gdk/wayland/gdkwaylandtoplevel.h
 ${PLIST.x11}include/gtk-4.0/gdk/x11/gdkx-autocleanups.h
 ${PLIST.x11}include/gtk-4.0/gdk/x11/gdkx.h
 ${PLIST.x11}include/gtk-4.0/gdk/x11/gdkx11applaunchcontext.h
@@ -408,6 +417,7 @@ include/gtk-4.0/unix-print/gtk/print/gtk
 include/gtk-4.0/unix-print/gtk/print/gtkprintunixdialog.h
 lib/girepository-1.0/Gdk-4.0.typelib
 ${PLIST.quartz}lib/girepository-1.0/GdkMacos-4.0.typelib
+${PLIST.wayland}lib/girepository-1.0/GdkWayland-4.0.typelib
 ${PLIST.x11}lib/girepository-1.0/GdkX11-4.0.typelib
 lib/girepository-1.0/Gsk-4.0.typelib
 lib/girepository-1.0/Gtk-4.0.typelib
@@ -417,6 +427,7 @@ lib/libgtk-4.so.1.2000.3
 lib/pkgconfig/gtk4-atspi.pc
 ${PLIST.quartz}lib/pkgconfig/gtk4-macos.pc
 lib/pkgconfig/gtk4-unix-print.pc
+${PLIST.wayland}lib/pkgconfig/gtk4-wayland.pc
 ${PLIST.x11}lib/pkgconfig/gtk4-x11.pc
 lib/pkgconfig/gtk4.pc
 share/applications/org.gtk.Demo4.desktop
@@ -427,6 +438,7 @@ share/gettext/its/gtk4builder.its
 share/gettext/its/gtk4builder.loc
 share/gir-1.0/Gdk-4.0.gir
 ${PLIST.quartz}share/gir-1.0/GdkMacos-4.0.gir
+${PLIST.wayland}share/gir-1.0/GdkWayland-4.0.gir
 ${PLIST.x11}share/gir-1.0/GdkX11-4.0.gir
 share/gir-1.0/Gsk-4.0.gir
 share/gir-1.0/Gtk-4.0.gir

Index: pkgsrc/x11/gtk4/buildlink3.mk
diff -u pkgsrc/x11/gtk4/buildlink3.mk:1.20 pkgsrc/x11/gtk4/buildlink3.mk:1.21
--- pkgsrc/x11/gtk4/buildlink3.mk:1.20  Tue Jan 27 08:40:56 2026
+++ pkgsrc/x11/gtk4/buildlink3.mk       Tue Feb 24 18:05:00 2026
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.20 2026/01/27 08:40:56 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.21 2026/02/24 18:05:00 kikadf Exp $
 
 BUILDLINK_TREE+=       gtk4
 
@@ -25,6 +25,11 @@ pkgbase := gtk4
 .include "../../x11/libXi/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
 .endif
+.if ${PKG_BUILD_OPTIONS.gtk4:Mwayland}
+.include "../../devel/wayland/buildlink3.mk"
+.include "../../devel/wayland-protocols/buildlink3.mk"
+.include "../../x11/libxkbcommon/buildlink3.mk"
+.endif # PKG_BUILD_OPTIONS.gtk4:Mwayland
 
 .endif # GTK4_BUILDLINK3_MK
 

Index: pkgsrc/x11/gtk4/distinfo
diff -u pkgsrc/x11/gtk4/distinfo:1.31 pkgsrc/x11/gtk4/distinfo:1.32
--- pkgsrc/x11/gtk4/distinfo:1.31       Tue Jan  6 20:06:35 2026
+++ pkgsrc/x11/gtk4/distinfo    Tue Feb 24 18:05:00 2026
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.31 2026/01/06 20:06:35 adam Exp $
+$NetBSD: distinfo,v 1.32 2026/02/24 18:05:00 kikadf Exp $
 
 BLAKE2s (gtk-4.20.3.tar.xz) = ded1e613ce985ec1723496fe9a3d6a78dbf727047242e2e389de183c148a5baa
 SHA512 (gtk-4.20.3.tar.xz) = 9ae8d2fb6fc6b3780587e70cbf4bff972dd36eedce79d91de874cc813ba3cb100ce6cce076e063e4606e0e32aa51d05c625dd272d5766190045f32b3754368f1
 Size (gtk-4.20.3.tar.xz) = 16003020 bytes
+SHA1 (patch-gdk_wayland_gdkseat-wayland.c) = e5ec092e35a8de1e0080a9648e9f836b0c965dbe
 SHA1 (patch-meson.build) = ed697477ebfa2b06559877170cc5b05079c61ceb
 SHA1 (patch-testsuite_gdk_colorstate.c) = 7a6d441f91332bffbd4e170809d8ad7ec51773bd

Index: pkgsrc/x11/gtk4/options.mk
diff -u pkgsrc/x11/gtk4/options.mk:1.3 pkgsrc/x11/gtk4/options.mk:1.4
--- pkgsrc/x11/gtk4/options.mk:1.3      Tue Jul 25 01:09:27 2023
+++ pkgsrc/x11/gtk4/options.mk  Tue Feb 24 18:05:00 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2023/07/25 01:09:27 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2026/02/24 18:05:00 kikadf Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gtk4
 PKG_SUPPORTED_OPTIONS= cups debug
@@ -10,27 +10,31 @@ PKG_OPTIONS_GROUP.gui=              x11
 PKG_OPTIONS_GROUP.gui+=        quartz
 PKG_SUGGESTED_OPTIONS+=        quartz
 .else
+# Wayland option is outside the gui group
+# since it can be enabled with x11.
+PKG_SUPPORTED_OPTIONS+=        wayland
 PKG_SUGGESTED_OPTIONS+=        x11
 .endif
+.include "../../devel/wayland/platform.mk"
+.if ${PLATFORM_SUPPORTS_WAYLAND} == "yes"
+PKG_SUGGESTED_OPTIONS+=        wayland
+.endif
 
 PKG_SUGGESTED_OPTIONS+=        cups
 
 .include "../../mk/bsd.options.mk"
 
-## wayland option requires gdk/wayland/tablet-unstable-v2-client-protocol.h
-## and I cannot fint it in pkgsrc.
-#PKG_SUPPORTED_OPTIONS+=       wayland
-#PLIST_VARS+=          wayland
-#.if !empty(PKG_OPTIONS:Mwayland)
-#PLIST.wayland=                yes
-#.include "../../devel/wayland/buildlink3.mk"
-#.include "../../devel/wayland-protocols/buildlink3.mk"
-#.include "../../fonts/fontconfig/buildlink3.mk"
-#.include "../../x11/libxkbcommon/buildlink3.mk"
-#MESON_ARGS+=          -Dwayland-backend=true
-#.else
+PLIST_VARS+=           wayland
+.if !empty(PKG_OPTIONS:Mwayland)
+PLIST.wayland=         yes
+.include "../../devel/wayland/buildlink3.mk"
+.include "../../devel/wayland-protocols/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../x11/libxkbcommon/buildlink3.mk"
+MESON_ARGS+=           -Dwayland-backend=true
+.else
 MESON_ARGS+=           -Dwayland-backend=false
-#.endif
+.endif
 
 PLIST_VARS+=           quartz
 .if !empty(PKG_OPTIONS:Mquartz)
@@ -58,9 +62,7 @@ MESON_ARGS+=          -Dx11-backend=true
 MESON_ARGS+=           -Dx11-backend=false
 .endif
 
-PLIST_VARS+=           cups
 .if !empty(PKG_OPTIONS:Mcups)
-PLIST.cups=            yes
 MESON_ARGS+=           -Dprint-cups=enabled
 .include "../../print/libcups/buildlink3.mk"
 .else

Added files:

Index: pkgsrc/x11/gtk4/patches/patch-gdk_wayland_gdkseat-wayland.c
diff -u /dev/null pkgsrc/x11/gtk4/patches/patch-gdk_wayland_gdkseat-wayland.c:1.1
--- /dev/null   Tue Feb 24 18:05:00 2026
+++ pkgsrc/x11/gtk4/patches/patch-gdk_wayland_gdkseat-wayland.c Tue Feb 24 18:05:00 2026
@@ -0,0 +1,21 @@
+$NetBSD: patch-gdk_wayland_gdkseat-wayland.c,v 1.1 2026/02/24 18:05:00 kikadf Exp $
+
+Allow building on systems without evdev
+
+--- gdk/wayland/gdkseat-wayland.c.orig 2025-11-20 05:08:31.000000000 +0000
++++ gdk/wayland/gdkseat-wayland.c
+@@ -51,6 +51,14 @@
+ #include <dev/evdev/input.h>
+ #elif defined(HAVE_LINUX_INPUT_H)
+ #include <linux/input.h>
++#else
++#ifndef BTN_LEFT
++#define BTN_LEFT       (0x110)
++#define BTN_RIGHT      (0x111)
++#define BTN_MIDDLE     (0x112)
++#define BTN_STYLUS     (0x14b)
++#define BTN_STYLUS2    (0x14c)
++#endif
+ #endif
+ 
+ #define WL_POINTER_HAS_FRAME 5