CVS commit: pkgsrc/x11/gtk3

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Thu Aug  4 15:24:48 UTC 2022

Modified Files:
        pkgsrc/x11/gtk3: Makefile options.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.172 -r1.173 pkgsrc/x11/gtk3/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/x11/gtk3/options.mk

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

Modified files:

Index: pkgsrc/x11/gtk3/Makefile
diff -u pkgsrc/x11/gtk3/Makefile:1.172 pkgsrc/x11/gtk3/Makefile:1.173
--- pkgsrc/x11/gtk3/Makefile:1.172      Sun Jul  3 09:38:04 2022
+++ pkgsrc/x11/gtk3/Makefile    Thu Aug  4 15:24:47 2022
@@ -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

Index: pkgsrc/x11/gtk3/options.mk
diff -u pkgsrc/x11/gtk3/options.mk:1.21 pkgsrc/x11/gtk3/options.mk:1.22
--- pkgsrc/x11/gtk3/options.mk:1.21     Sun Jul  3 09:38:04 2022
+++ pkgsrc/x11/gtk3/options.mk  Thu Aug  4 15:24:47 2022
@@ -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 @@ PKG_SUPPORTED_OPTIONS+= quartz
 .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 @@ CONFIGURE_ARGS+=      --disable-quartz-backen
 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"