CVS commit: pkgsrc/x11/gtk3

["Izumi Tsutsui" <tsutsui%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tsutsui
Date:           Wed Aug 19 15:16:31 UTC 2026

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

Log Message:
gtk3: remove NetBSD-specific Wayland workaround

MESALIB_SUPPORTS_EGL now handles native EGL support correctly on
NetBSD, so PLATFORM_SUPPORTS_WAYLAND already excludes systems where
the native libepoxy has no EGL support.

Remove the additional libglamoregl.so check added in PR pkg/60295.
The file is part of the xserver set, so checking for it incorrectly
disables Wayland on bulk build hosts where the xserver set is not
installed.  PR pkg/60476

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.230 -r1.231 pkgsrc/x11/gtk3/Makefile
cvs rdiff -u -r1.36 -r1.37 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.230 pkgsrc/x11/gtk3/Makefile:1.231
--- pkgsrc/x11/gtk3/Makefile:1.230      Thu Jun 11 07:16:41 2026
+++ pkgsrc/x11/gtk3/Makefile    Wed Aug 19 15:16:31 2026
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.230 2026/06/11 07:16:41 wiz Exp $
+# $NetBSD: Makefile,v 1.231 2026/08/19 15:16:31 tsutsui Exp $
 
 DISTNAME=      gtk-3.24.52
 PKGNAME=       ${DISTNAME:S/gtk/gtk3+/}
-PKGREVISION=   1
+PKGREVISION=   2
 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.36 pkgsrc/x11/gtk3/options.mk:1.37
--- pkgsrc/x11/gtk3/options.mk:1.36     Wed May 27 12:39:08 2026
+++ pkgsrc/x11/gtk3/options.mk  Wed Aug 19 15:16:31 2026
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.36 2026/05/27 12:39:08 nia Exp $
+# $NetBSD: options.mk,v 1.37 2026/08/19 15:16:31 tsutsui Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gtk3
 PKG_SUPPORTED_OPTIONS+=        doc introspection gtk3-atk-bridge cups
@@ -11,11 +11,7 @@ PKG_SUGGESTED_OPTIONS+=      x11
 .endif
 .include "../../devel/wayland/platform.mk"
 .if ${PLATFORM_SUPPORTS_WAYLAND} == "yes"
-# workaround for PR pkg/60295
-.  if ${OPSYS} != "NetBSD" || ${X11_TYPE} != "native" || \
-      exists(${X11BASE}/lib/modules/libglamoregl.so)
 PKG_SUGGESTED_OPTIONS+=        wayland
-.  endif
 .endif
 PKG_SUGGESTED_OPTIONS+=        gtk3-atk-bridge cups
 PKG_SUGGESTED_OPTIONS+=        ${${USE_CROSS_COMPILE:tl} == "yes":?:introspection}