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

[Rob Whitlock <rwhitlock22%gmail.com@localhost>]

> On Dec 9, 2024, at 4:21 PM, bsiegert%netbsd.org@localhost wrote:
> 
> Synopsis: cad/kicad fails without wayland being installed
> 
> State-Changed-From-To: open->closed
> State-Changed-By: bsiegert%NetBSD.org@localhost
> State-Changed-When: Mon, 09 Dec 2024 21:21:55 +0000
> State-Changed-Why:
> Patch applied, thanks!

There were recent changes updating the kicad pkgsrc makefile to use the new version of the cmake interface but the patch wasn't updated for that. Here's a patch that handles that:

Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/cad/kicad/options.mk,v
retrieving revision 1.4
diff -u -r1.4 options.mk
--- options.mk	9 Dec 2024 21:20:52 -0000	1.4
+++ options.mk	14 Dec 2024 22:11:06 -0000
@@ -15,7 +15,7 @@
 
 .if !empty(PKG_OPTIONS:Mwayland)
 .  include "../../devel/wayland/buildlink3.mk"
-CMAKE_ARGS+=   -DKICAD_WAYLAND=ON
+CMAKE_CONFIGURE_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.
@@ -25,5 +25,5 @@
 PKG_FAIL_REASON+= "for KICAD_WAYLAND in CMakeLists.txt."
 .  endif
 .else
-CMAKE_ARGS+=   -DKICAD_WAYLAND=OFF
+CMAKE_CONFIGURE_ARGS+=   -DKICAD_WAYLAND=OFF
 .endif

Without it the following error occurss when trying to build without the wayland option:

=> Bootstrap dependency digest>=20211023: found digest-20220214
===> Skipping vulnerability checks.
WARNING: No /usr/pkg/pkgdb/pkg-vulnerabilities file found.
WARNING: To fix run: `/usr/sbin/pkg_admin -K /usr/pkg/pkgdb fetch-pkg-vulnerabilities'.
===> Building for kicad-8.0.6
[  0%] Built target glew
[  1%] Built target metadata
[  1%] Built target clipper
[  1%] Built target delaunator
[  1%] Built target clipper2
[  1%] Built target dxflib_qcad
[  2%] Built target fmt
[  2%] Built target lemon
[  3%] Built target libcontext
[  3%] Creating image archive /usr/pkgsrc/cad/kicad/work/kicad-8.0.6/cmake-pkgsrc-build/resources/images.tar.gz
[  3%] Built target nanodbc
[  3%] Built target nanosvg
[  3%] Built target markdown_lib
[  3%] Built target othermath
[  3%] Built target potrace
[  3%] Built target tinyspline_lib
[  3%] Built target TDxNavlib
[  3%] Built target nlohmann_json_schema_validator
[  3%] Built target core
[  3%] Linking CXX static library libsexpr.a
[  3%] Generating version string header
-- Found Git: /usr/pkg/bin/git (found version "2.47.1")
-- Using Git to determine build version string.
[  3%] Building CXX object libs/kiplatform/CMakeFiles/kiplatform.dir/gtk/ui.cpp.o
-- git describe returned error 128: fatal: not a git repository (or any of the parent directories): .git

-- git rev-parse returned error 128: fatal: not a git repository (or any of the parent directories): .git

-- git rev-list --count returned error 128: fatal: not a git repository (or any of the parent directories): .git

-- Not updating /usr/pkgsrc/cad/kicad/work/kicad-8.0.6/cmake-pkgsrc-build/kicad_build_version.h
[  3%] Built target sexpr
[  3%] Built target version_header
[  3%] Building CXX object 3d-viewer/3d_cache/sg/CMakeFiles/kicad_3dsg.dir/sg_base.cpp.o
[  3%] Building CXX object libs/kimath/CMakeFiles/kimath.dir/src/geometry/convex_hull.cpp.o
[  3%] Built target bitmap_archive
[  3%] Building C object libs/kiplatform/CMakeFiles/kiplatform.dir/gtk/wayland-pointer-constraints-unstable-v1.c.o
/usr/pkgsrc/cad/kicad/work/kicad-8.0.6/libs/kiplatform/gtk/wayland-pointer-constraints-unstable-v1.c:29:10: fatal error: wayland-util.h: No such file or directory
   29 | #include "wayland-util.h"
      |          ^~~~~~~~~~~~~~~~
compilation terminated.
--- libs/kiplatform/CMakeFiles/kiplatform.dir/gtk/wayland-pointer-constraints-unstable-v1.c.o ---
*** [libs/kiplatform/CMakeFiles/kiplatform.dir/gtk/wayland-pointer-constraints-unstable-v1.c.o] Error code 1

make[2]: stopped making "libs/kiplatform/CMakeFiles/kiplatform.dir/build" in /usr/pkgsrc/cad/kicad/work/kicad-8.0.6/cmake-pkgsrc-build
*** [all] Error code 6

make: stopped making "all" in /usr/pkgsrc/cad/kicad/work/kicad-8.0.6/cmake-pkgsrc-build
make: 1 error

make: stopped making "all" in /usr/pkgsrc/cad/kicad/work/kicad-8.0.6/cmake-pkgsrc-build
*** Error code 2

Stop.
make[1]: stopped making "install" in /usr/pkgsrc/cad/kicad
*** Error code 1

Stop.
make: stopped making "install" in /usr/pkgsrc/cad/kicad