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

[Rob Whitlock <rwhitlock22%gmail.com@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: Sat, 22 Jun 2024 12:54:57 -0400

 --Apple-Mail=_8BDBD5FA-39D5-4B01-AF2B-8B0936049427
 Content-Transfer-Encoding: quoted-printable
 Content-Type: text/plain;
 	charset=us-ascii
 
 The whitespace in the original patch was mangled by the e-mail =
 processing somehow, which resulted in a patch with fuzz and a missed =
 hunk. I have attached the patch to this message to overcome these =
 issues.
 
 
 --Apple-Mail=_8BDBD5FA-39D5-4B01-AF2B-8B0936049427
 Content-Disposition: attachment;
 	filename=patch-cad_kicad_options.mk
 Content-Type: application/octet-stream;
 	x-unix-mode=0644;
 	name="patch-cad_kicad_options.mk"
 Content-Transfer-Encoding: 7bit
 
 Add the wayland option to cad/kicad.
 
 Index: cad/kicad/options.mk
 ===================================================================
 RCS file: /cvsroot/pkgsrc/cad/kicad/options.mk,v
 retrieving revision 1.1
 diff -b -u -r1.1 options.mk
 --- cad/kicad/options.mk	6 Jun 2023 10:20:58 -0000	1.1
 +++ cad/kicad/options.mk	22 Jun 2024 16:47:06 -0000
 @@ -1,7 +1,7 @@
  # $NetBSD: options.mk,v 1.1 2023/06/06 10:20:58 bouyer Exp $
  
  PKG_OPTIONS_VAR=	PKG_OPTIONS.kicad
 -PKG_SUPPORTED_OPTIONS=	ng-spice 
 +PKG_SUPPORTED_OPTIONS=	ng-spice wayland
  PKG_SUGGESTED_OPTIONS=	ng-spice 
  
  .include "../../mk/bsd.options.mk"
 @@ -12,3 +12,17 @@
  .else
  CMAKE_ARGS+=		-DKICAD_SPICE=OFF
  .endif
 +
 +.if !empty(PKG_OPTIONS:Mwayland)
 +.  include "../../devel/wayland/buildlink3.mk"
 +CMAKE_ARGS+=		-DKICAD_WAYLAND=ON
 +   # 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+= "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_ARGS+=		-DKICAD_WAYLAND=OFF
 +.endif
 +
 
 --Apple-Mail=_8BDBD5FA-39D5-4B01-AF2B-8B0936049427--