[pkgsrc/trunk]: pkgsrc/x11/gtk3 gtk3: Re-support wayland. Tested w/ sakura + ...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/edf664af0c41
branches:  trunk
changeset: 382768:edf664af0c41
user:      nia <nia%pkgsrc.org@localhost>
date:      Thu Aug 04 15:24:47 2022 +0000

description:
gtk3: Re-support wayland. Tested w/ sakura + velox on NetBSD CURRENT!

diffstat:

 x11/gtk3/Makefile   |  3 ++-
 x11/gtk3/options.mk |  6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (40 lines):

diff -r 981728945d74 -r edf664af0c41 x11/gtk3/Makefile
--- a/x11/gtk3/Makefile Thu Aug 04 15:22:49 2022 +0000
+++ b/x11/gtk3/Makefile Thu Aug 04 15:24:47 2022 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.172 2022/07/03 09:38:04 wiz Exp $
+# $NetBSD: Makefile,v 1.173 2022/08/04 15:24:47 nia Exp $
 
 DISTNAME=      gtk+-3.24.34
 PKGNAME=       ${DISTNAME:S/gtk/gtk3/}
+PKGREVISION=   1
 CATEGORIES=    x11 gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gtk+/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
diff -r 981728945d74 -r edf664af0c41 x11/gtk3/options.mk
--- a/x11/gtk3/options.mk       Thu Aug 04 15:22:49 2022 +0000
+++ b/x11/gtk3/options.mk       Thu Aug 04 15:24:47 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.21 2022/07/03 09:38:04 wiz Exp $
+# $NetBSD: options.mk,v 1.22 2022/08/04 15:24:47 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gtk3
 PKG_SUPPORTED_OPTIONS+=        gtk3-atk-bridge cups debug
@@ -8,8 +8,7 @@
 .endif
 .include "../../devel/wayland/platform.mk"
 .if ${PLATFORM_SUPPORTS_WAYLAND} == "yes"
-# wayland package needs updating to > 1.18
-#PKG_SUGGESTED_OPTIONS+=       wayland
+PKG_SUGGESTED_OPTIONS+=        wayland
 .endif
 PKG_SUGGESTED_OPTIONS+=        gtk3-atk-bridge x11 cups
 
@@ -38,6 +37,7 @@
 PLIST_VARS+=           wayland
 .if !empty(PKG_OPTIONS:Mwayland)
 PLIST.wayland=         yes
+BUILDLINK_API_DEPENDS.wayland?=        wayland>=1.20.0
 .include "../../devel/wayland/buildlink3.mk"
 .include "../../devel/wayland-protocols/buildlink3.mk"
 .include "../../x11/libxkbcommon/buildlink3.mk"