pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

kicad: update to 10.0.6 pkgsrc change: pass Protobuf_INCLUDE_DIR to protoc so that it will find its includes See https://www.kicad.org/blog/2026/08/KiCad-10.0.6-Release/ for changes since 10.0.5



Module Name:	pkgsrc-wip
Committed By:	Manuel Bouyer <bouyer%antioche.eu.org@localhost>
Pushed By:	bouyer
Date:		Sat Sep 26 16:49:40 2026 +0200
Changeset:	84b5b6dd6ef9cd380246705f9caba74ca44e0f17

Modified Files:
	kicad/Makefile
	kicad/distinfo
Added Files:
	kicad/patches/patch-CMakeLists.txt
	kicad/patches/patch-api_CMakeLists.txt

Log Message:
kicad: update to 10.0.6
pkgsrc change: pass Protobuf_INCLUDE_DIR to protoc so that it will find
its includes
See https://www.kicad.org/blog/2026/08/KiCad-10.0.6-Release/
for changes since 10.0.5

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=84b5b6dd6ef9cd380246705f9caba74ca44e0f17

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

diffstat:
 kicad/Makefile                         |  9 +--------
 kicad/distinfo                         |  8 +++++---
 kicad/patches/patch-CMakeLists.txt     | 15 +++++++++++++++
 kicad/patches/patch-api_CMakeLists.txt | 14 ++++++++++++++
 4 files changed, 35 insertions(+), 11 deletions(-)

diffs:
diff --git a/kicad/Makefile b/kicad/Makefile
index 2caaad5f96..3f2506cb35 100644
--- a/kicad/Makefile
+++ b/kicad/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.108 2025/01/10 22:49:54 wiz Exp $
 
-V=		10.0.5
+V=		10.0.6
 DISTNAME=	kicad-${V}
 CATEGORIES=	cad
 MASTER_SITES=	${MASTER_SITE_GITLAB:=kicad/code/}
@@ -33,13 +33,6 @@ CMAKE_CONFIGURE_ARGS+=		-DKICAD_USE_EGL=ON
 CMAKE_CONFIGURE_ARGS+=		-DKICAD_USE_EGL=OFF
 .endif
 
-#SUBST_CLASSES+=		undef
-#SUBST_STAGE.undef=	post-configure
-#SUBST_MESSAGE.undef=    TODO: Conflict 'major' and 'minor' defined somewhere.
-#SUBST_FILES.undef=	cmake-pkgsrc-build/api/cpp/api/common/types/base_types.pb.h
-#SUBST_SED.undef=	-e "/^#include <string>$/a #undef major"
-#SUBST_SED.undef+=	-e "/^#include <string>$/a #undef minor"
-
 PY_PATCHPLIST=		yes
 
 # The package tries to build a native .app bundle. This doesn't work
diff --git a/kicad/distinfo b/kicad/distinfo
index 5cbe335aaf..fc1eb34727 100644
--- a/kicad/distinfo
+++ b/kicad/distinfo
@@ -1,14 +1,16 @@
 $NetBSD: distinfo,v 1.29 2024/11/20 01:29:49 mef Exp $
 
-BLAKE2s (kicad-10.0.5.tar.bz2) = e82880767f8bdf1d0af2a9498f0e8e7886dd445c789d5528b9e31881ad5849c9
-SHA512 (kicad-10.0.5.tar.bz2) = 58897802ba53585f09e7b7991028bcc8b8240a0917d9306f12a63242ce0fb8932cc229e99298b2addcc85486bdd48ac9bc09cde3162b90798538ae0dfe76bc87
-Size (kicad-10.0.5.tar.bz2) = 232792797 bytes
+BLAKE2s (kicad-10.0.6.tar.bz2) = 3724d0ea4490077a06219cc5b603cf05fe3aeab5a11b9d0f03080f06301095ea
+SHA512 (kicad-10.0.6.tar.bz2) = 5fd23c26c36d39ce7b58ba224bbce843b708e945806e3c303707a4216b644a8993a6d956078b5f4edb029bcb70e5489411daee23ae471386109cf631ce1d8201
+Size (kicad-10.0.6.tar.bz2) = 232821863 bytes
 SHA1 (patch-3d-viewer_3d__rendering_opengl_3d__spheres__gizmo.cpp) = c78959f9f10de3f9884ab64bf26f4c4f5f813cde
 SHA1 (patch-3d-viewer_3d__viewer_eda__3d__viewer__frame.cpp) = ec756e9952b2e3614384b86782e28c5bc8c42c1b
 SHA1 (patch-3d-viewer_3d__viewer_eda__3d__viewer__frame.h) = 41dfce6f955d6af543ae3536f3105727db86c7bf
 SHA1 (patch-3d-viewer_3d_cache_sg_CMakeLists.txt) = c6e55d62646e890ba02b2a56dc3481f75ffba8a0
 SHA1 (patch-3d-viewer_dialogs_panel__preview__3d__model.cpp) = 9c856e16ed4fd89ac9a1c9c9273101ec1792fae6
 SHA1 (patch-3d-viewer_dialogs_panel__preview__3d__model.h) = 47fd811b1c89a066b08ed3899dcd6e6d40bf8a1c
+SHA1 (patch-CMakeLists.txt) = 5a3869f50675de2b19ea20dfabe56b8ed40fbee6
+SHA1 (patch-api_CMakeLists.txt) = 23b2b74ab15dd64da83bda39293c32da1bb67f5e
 SHA1 (patch-api_proto_common_types_base__types.proto) = 63de1236017bc8d92dbb5ed5affc026f1585e8f9
 SHA1 (patch-cmake_config.h.cmake) = 325b9c81e90477152b778e04c4fabe41548aa51d
 SHA1 (patch-common_api_api__handler__common.cpp) = 9c907cc0e155a759ac41e71317b601f678777e09
diff --git a/kicad/patches/patch-CMakeLists.txt b/kicad/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000000..35946213fc
--- /dev/null
+++ b/kicad/patches/patch-CMakeLists.txt
@@ -0,0 +1,15 @@
+$NetBSD: $
+
+export Protobuf_INCLUDE_DIR from protobuf::libprotobuf, for use in
+api/CMakeLists.txt
+
+--- CMakeLists.txt.orig	2026-08-28 20:01:37.000000000 +0200
++++ CMakeLists.txt	2026-09-26 11:17:30.991741798 +0200
+@@ -906,6 +906,7 @@
+     find_package( Protobuf QUIET CONFIG )
+     if( Protobuf_FOUND )
+         set( Protobuf_LIBRARY "protobuf::libprotobuf" )
++        get_target_property(Protobuf_INCLUDE_DIR protobuf::libprotobuf INTERFACE_INCLUDE_DIRECTORIES)
+         set( _protobuf_found TRUE )
+         message( STATUS "Found Protobuf using CONFIG mode" )
+     else()
diff --git a/kicad/patches/patch-api_CMakeLists.txt b/kicad/patches/patch-api_CMakeLists.txt
new file mode 100644
index 0000000000..209c3e9e91
--- /dev/null
+++ b/kicad/patches/patch-api_CMakeLists.txt
@@ -0,0 +1,14 @@
+$NetBSD: $
+
+Make sure protoc will find system includes
+
+--- api/CMakeLists.txt.orig	2026-08-28 20:01:37.000000000 +0200
++++ api/CMakeLists.txt	2026-09-26 11:15:22.451740568 +0200
+@@ -52,6 +52,7 @@
+     COMMAND ${Protobuf_PROTOC_EXECUTABLE}
+     --cpp_out=dllexport_decl=KIAPI_IMPORTEXPORT:${KIAPI_CPP_BASEPATH}
+     --proto_path=${CMAKE_CURRENT_SOURCE_DIR}/proto
++    --proto_path=${Protobuf_INCLUDE_DIR}
+     --experimental_allow_proto3_optional
+     ${KIAPI_PROTO_SRCS}
+     COMMENT "Generating API protobuf source files from proto definitions..."


Home | Main Index | Thread Index | Old Index