Re: pkg/58339: cad/kicad fails without wayland being installed

["Rob Whitlock via gnats" <gnats-admin%NetBSD.org@localhost>]

The following reply was made to PR pkg/58339; it has been noted by GNATS.

From: Rob Whitlock <rwhitlock22%gmail.com@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: pkg-manager%netbsd.org@localhost,
 gnats-admin%netbsd.org@localhost,
 pkgsrc-bugs%netbsd.org@localhost
Subject: Re: pkg/58339: cad/kicad fails without wayland being installed
Date: Tue, 3 Dec 2024 03:48:49 -0500

 > On Dec 3, 2024, at 3:45 AM, Rob Whitlock via gnats =
 <gnats-admin%NetBSD.org@localhost> wrote:
 >=20
 > The following reply was made to PR pkg/58339; it has been noted by =
 GNATS.
 >=20
 > From: Rob Whitlock <rwhitlock22%gmail.com@localhost>
 > To: gnats-bugs%netbsd.org@localhost,
 > "John D. Baker via gnats" <gnats-admin%NetBSD.org@localhost>
 > Cc: pkg-manager%netbsd.org@localhost,
 > pkgsrc-bugs%netbsd.org@localhost
 > Subject: Re: pkg/58339: cad/kicad fails without wayland being =
 installed
 > Date: Tue, 3 Dec 2024 03:41:38 -0500
 >=20
 > Here's another patch to get rid of more patch fuzz due to more changes =
 =3D
 > that were committed.
 >=20
 > Can this patch be committed?
 
 Take 2: resending now that my e-mail client is set to send plain text, =
 not rich text (which I had thought it was before):
 
 Index: cad/kicad/options.mk
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /cvsroot/pkgsrc/cad/kicad/options.mk,v
 retrieving revision 1.3
 diff -u -r1.3 options.mk
 --- cad/kicad/options.mk	20 Nov 2024 01:29:49 -0000	1.3
 +++ cad/kicad/options.mk	3 Dec 2024 08:27:40 -0000
 @@ -1,7 +1,7 @@
  # $NetBSD: options.mk,v 1.3 2024/11/20 01:29:49 mef Exp $
 =20
  PKG_OPTIONS_VAR=3D	PKG_OPTIONS.kicad
 -PKG_SUPPORTED_OPTIONS=3D	ng-spice
 +PKG_SUPPORTED_OPTIONS=3D	ng-spice wayland
  PKG_SUGGESTED_OPTIONS=3D	ng-spice
 =20
  .include "../../mk/bsd.options.mk"
 @@ -12,3 +12,16 @@
  .else
  CMAKE_CONFIGURE_ARGS+=3D		-DKICAD_SPICE=3DOFF
  .endif
 +
 +.if !empty(PKG_OPTIONS:Mwayland)
 +.  include "../../devel/wayland/buildlink3.mk"
 +CMAKE_CONFIGURE_ARGS+=3D   -DKICAD_WAYLAND=3DON
 +   # This conditional matches the conditional in Makefile
 +   # so that it's effectively a test for whether
 +   # KICAD_USE_EGL is enabled
 +.  if empty(MESALIB_SUPPORTS_EGL:Myes)
 +PKG_FAIL_REASON+=3D "Kicad requires the KICAD_USE_EGL CMake option when =
 using the KICAD_WAYLAND CMake option. See the cmake_dependent_option() =
 for KICAD_WAYLAND in CMakeLists.txt"
 +.  endif
 +.else
 +CMAKE_CONFIGURE_ARGS+=3D   -DKICAD_WAYLAND=3DOFF
 +.endif=