cad/kicad-*-devel: Update

Update to the latest versions

5 files changed, 34 insertions, 20 deletions

diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile
index 763cb611db17..5e7edd9afa88 100644
--- a/cad/kicad-devel/Makefile
+++ b/cad/kicad-devel/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	kicad
 DISTVERSION=	r${GIT_SRC_DATE}
-PORTREVISION=	1
+#PORTREVISION=	1
 CATEGORIES=	cad
 PKGNAMESUFFIX=	-devel
 DIST_SUBDIR=		${PORTNAME}
@@ -16,40 +16,39 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/git:devel/git \
 		${LOCALBASE}/include/glm/glm.hpp:math/glm \
 		${LOCALBASE}/bin/swig:devel/swig
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
+		libharfbuzz.so:print/harfbuzz \
 		libngspice.so:cad/ngspice_rework@shlib \
 		libTKernel.so:cad/opencascade \
 		libpixman-1.so:x11/pixman \
 		libpng.so:graphics/png \
-		libcurl.so:ftp/curl
+		libcurl.so:ftp/curl \
+		libGLEW-wayland.so:graphics/glew-wayland
 
 CONFLICTS_INSTALL=	kicad # bin/_cvpcb.kiface
 
+BROKEN_aarch64=		Fails to compile: use of undeclared identifier builtin_ia32_emms
+
+OPTIONS_DEFINE=	DOCS
+
+PLIST_SUB=	OPSYS=${OPSYS}	\
+		DESKTOPDIR=${DESKTOPDIR:S|^${PREFIX}/||}
+
+USES=		desktop-file-utils shared-mime-info compiler:c++14-lang tar:bzip2 cmake:insource,noninja \
+		gettext pkgconfig python:3.5+ shebangfix ssl gl xorg gnome
 USE_GITLAB=	yes
 GL_ACCOUNT=	kicad/code
 GL_PROJECT=	kicad
 GL_COMMIT=	${GIT_SRC_HASH}
-
-CXXFLAGS+=	--std=c++14 -I${WRKSRC} -I${WRKSRC}/include -I${LOCALBASE}/include
 USE_GL=		gl glew glu glut
 USE_WX=		3.1
 WX_COMPS=	wx python:lib
 USE_GNOME=	atk cairo	# Required by libwx_gtk2_aui-2.8.so
 USE_XORG+=	ice pixman x11 xext
-
-BROKEN_aarch64=		Fails to compile: use of undeclared identifier builtin_ia32_emms
-
-OPTIONS_DEFINE=	DOCS
-
-PLIST_SUB=	OPSYS=${OPSYS}	\
-		DESKTOPDIR=${DESKTOPDIR:S|^${PREFIX}/||}
-
 BINS=		cvpcb eeschema gerbview kicad pcbnew
 EXTRAS2RM=	linux-non_unicode linux wings3d LINUX.README	\
 		contrib_makefiles.txt running_kicad_under_W98.txt
-USES=		desktop-file-utils shared-mime-info compiler:c++14-lang tar:bzip2 cmake:insource,noninja \
-		gettext pkgconfig python:3.5+ shebangfix ssl gl xorg gnome
 SHEBANG_FILES=	pcbnew/python/plugins/touch_slider_wizard.py
-
+CXXFLAGS+=	-I${WRKSRC} -I${WRKSRC}/include -I${LOCALBASE}/include
 CMAKE_ARGS=	-DLOCALBASE="${LOCALBASE}" \
 		-DCMAKE_BUILD_TYPE="Debug" \
 		-DKICAD_TESTING_VERSION=ON \
diff --git a/cad/kicad-devel/Makefile.git_rev b/cad/kicad-devel/Makefile.git_rev
index 0a2be58d0a13..79c9c5ae6535 100644
--- a/cad/kicad-devel/Makefile.git_rev
+++ b/cad/kicad-devel/Makefile.git_rev
@@ -1,2 +1,2 @@
-GIT_SRC_HASH=  a17a58203b33e08b966075833b177dad5740c236
-GIT_SRC_DATE=  20211218003137
+GIT_SRC_HASH=  4d9c156b0a7ad4e343ec9cf559cc1fd4a4a80c02
+GIT_SRC_DATE=  20220303163317
diff --git a/cad/kicad-devel/distinfo b/cad/kicad-devel/distinfo
index 4b2f458d718f..0b91e31e29f4 100644
--- a/cad/kicad-devel/distinfo
+++ b/cad/kicad-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1640015141
-SHA256 (kicad/kicad/code-kicad-a17a58203b33e08b966075833b177dad5740c236_GL0.tar.gz) = ac7da06ede4ea54ba7de27daec23a6f0c2cef0332870d2ffcfc6f2d45a6f8e83
-SIZE (kicad/kicad/code-kicad-a17a58203b33e08b966075833b177dad5740c236_GL0.tar.gz) = 45053171
+TIMESTAMP = 1646325467
+SHA256 (kicad/kicad/code-kicad-4d9c156b0a7ad4e343ec9cf559cc1fd4a4a80c02_GL0.tar.gz) = 06ccbe0c14e95abcc0ed35cc8347d95395c762acac062937c2c6aa495d0cbf7e
+SIZE (kicad/kicad/code-kicad-4d9c156b0a7ad4e343ec9cf559cc1fd4a4a80c02_GL0.tar.gz) = 45289256
diff --git a/cad/kicad-devel/files/patch-pcbnew_dialogs_dialog__board__reannotate.cpp b/cad/kicad-devel/files/patch-pcbnew_dialogs_dialog__board__reannotate.cpp
new file mode 100644
index 000000000000..531346308fac
--- /dev/null
+++ b/cad/kicad-devel/files/patch-pcbnew_dialogs_dialog__board__reannotate.cpp
@@ -0,0 +1,11 @@
+--- pcbnew/dialogs/dialog_board_reannotate.cpp.orig	2022-03-03 17:16:00 UTC
++++ pcbnew/dialogs/dialog_board_reannotate.cpp
+@@ -522,7 +522,7 @@ void DIALOG_BOARD_REANNOTATE::LogChangePlan()
+                     (int) m_refDesTypes.size() );
+ 
+     for( RefDesTypeStr Type : m_refDesTypes ) // Show all the types of refdes
+-        message += Type.RefDesType + ( 0 == ( i++ % 16 ) ? wxT( "\n" ) : wxS( " " ) );
++        message += Type.RefDesType + ( 0 == ( i++ % 16 ) ? wxT( "\n" ) : wxT( " " ) );
+ 
+     if( !m_excludeArray.empty() )
+     {
diff --git a/cad/kicad-devel/pkg-plist b/cad/kicad-devel/pkg-plist
index ad073e3bb01e..4ff0efeb54cc 100644
--- a/cad/kicad-devel/pkg-plist
+++ b/cad/kicad-devel/pkg-plist
@@ -206,6 +206,10 @@ share/icons/hicolor/scalable/mimetypes/application-x-kicad-schematic.svg
 %%DATADIR%%/demos/simulation/sallen_key/sallen_key.kicad_sch
 %%DATADIR%%/demos/simulation/sallen_key/sallen_key_schlib.kicad_sym
 %%DATADIR%%/demos/simulation/sallen_key/sym-lib-table
+%%DATADIR%%/demos/simulation/subsheets/subsheet1.kicad_sch
+%%DATADIR%%/demos/simulation/subsheets/subsheet2.kicad_sch
+%%DATADIR%%/demos/simulation/subsheets/subsheets.kicad_pro
+%%DATADIR%%/demos/simulation/subsheets/subsheets.kicad_sch
 %%DATADIR%%/demos/simulation/v_i_sources/sym-lib-table
 %%DATADIR%%/demos/simulation/v_i_sources/v_i_sources.kicad_pro
 %%DATADIR%%/demos/simulation/v_i_sources/v_i_sources.kicad_sch