cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update kicad and kicad-share to 5.12.1. ok sdk@

Browse Source
This commit is contained in:
tracey 2021-11-22 14:55:53 +00:00
parent 6eb550683d
commit 58fae133a4
13 changed files with 59 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cad/kicad-share/Makefile.inc
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile.inc,v 1.8 2021/11/13 13:12:31 jca Exp $
# $OpenBSD: Makefile.inc,v 1.9 2021/11/22 14:55:53 tracey Exp $
NOT_FOR_ARCHS = powerpc riscv64
NOT_FOR_ARCHS = powerpc
PKG_ARCH ?= *
V ?= 5.1.10
V ?= 5.1.12
EXTRACT_SUFX ?= .tar.bz2
DISTNAME= kicad-${KICAD_PROJECT}-$V
@ -20,3 +20,5 @@ MASTER_SITES ?= \
PERMIT_PACKAGE ?= Yes
MODULES ?= devel/cmake
NO_TEST = Yes

4
cad/kicad-share/footprints/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (kicad-footprints-5.1.10.tar.bz2) = ZwfRx59XowV3PtjBaXHSI65wT94+bCOJWHEb5BvsiXU=
SIZE (kicad-footprints-5.1.10.tar.bz2) = 3382220
SHA256 (kicad-footprints-5.1.12.tar.bz2) = LzLbeYa/18nUJCBULYNzPCemBCcGl+kMmv+hWgzEcHo=
SIZE (kicad-footprints-5.1.12.tar.bz2) = 3382783

4
cad/kicad-share/i18n/Makefile
View File

@ -1,6 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2021/10/20 11:47:48 sthen Exp $
REVISION = 0
# $OpenBSD: Makefile,v 1.6 2021/11/22 14:55:54 tracey Exp $
KICAD_PROJECT = i18n
COMMENT = language translations for KiCad

4
cad/kicad-share/i18n/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (kicad-i18n-5.1.10.tar.bz2) = zDNT+Ayp+Aq/upUbRV51qdGmoLzDCFpUFthgZfRnTIg=
SIZE (kicad-i18n-5.1.10.tar.bz2) = 2934783
SHA256 (kicad-i18n-5.1.12.tar.bz2) = oXzy6L4R71fXSG9fU66I6YbBQubOQ9IXU9/iT62f6S0=
SIZE (kicad-i18n-5.1.12.tar.bz2) = 2934525

4
cad/kicad-share/packages3D/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (kicad-packages3D-5.1.10.tar.bz2) = WwISj8tf9p+clGi2h2199orODu+1U1n28342663TKgs=
SIZE (kicad-packages3D-5.1.10.tar.bz2) = 727194444
SHA256 (kicad-packages3D-5.1.12.tar.bz2) = z3dsHMdvnA8pAREb80NQ/MXdqyDmWPB9FQuBMGEHZi4=
SIZE (kicad-packages3D-5.1.12.tar.bz2) = 727191578

4
cad/kicad-share/symbols/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (kicad-symbols-5.1.10.tar.bz2) = y/cTlKjxMMNIBHHhfpCBYxGuPJyj+RaABRHi8Wp7UoU=
SIZE (kicad-symbols-5.1.10.tar.bz2) = 1815573
SHA256 (kicad-symbols-5.1.12.tar.bz2) = qytC3gyoLBk98UHkiDoZsaFuUzXxWWT5AGsQHqpMj5E=
SIZE (kicad-symbols-5.1.12.tar.bz2) = 1815145

4
cad/kicad-share/templates/Makefile
View File

@ -1,6 +1,4 @@
# $OpenBSD: Makefile,v 1.2 2021/10/20 11:47:48 sthen Exp $
REVISION = 0
# $OpenBSD: Makefile,v 1.3 2021/11/22 14:55:54 tracey Exp $
KICAD_PROJECT = templates
COMMENT = templates for KiCad

4
cad/kicad-share/templates/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (kicad-templates-5.1.10.tar.bz2) = wC9RbxX6yJx3jMPpDKLFO/spPrmFZskLI/S/G+lCouI=
SIZE (kicad-templates-5.1.10.tar.bz2) = 1552124
SHA256 (kicad-templates-5.1.12.tar.bz2) = Svz4cbfwxtVdB9648TEGhhSVphZv1J7dixi12VKXThY=
SIZE (kicad-templates-5.1.12.tar.bz2) = 1552173

28
cad/kicad/Makefile
View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.49 2021/11/13 13:12:31 jca Exp $
# $OpenBSD: Makefile,v 1.50 2021/11/22 14:55:53 tracey Exp $
# Sync cad/kicad-share/Makefile.inc with archs where kicad is broken
BROKEN-powerpc = segfaults when trying to run the PCB editor
BROKEN-riscv64 = kicad-5.1.10/include/system/libcontext.h:93:36: error: expected ';' after top level declarator
V = 5.1.10
V = 5.1.12
COMMENT = schematic and PCB editing software
DISTNAME = kicad-${V}
REVISION = 1
EPOCH = 0
SHARED_LIBS += kicad_3dsg 0.0 # 2.0
@ -19,17 +18,18 @@ HOMEPAGE = https://www.kicad.org
#GPLv3
PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} GL GLEW GLU ICE PTKernel SM TKBO
WANTLIB += TKBRep TKBin TKBinL TKBinXCAF TKBool TKCAF TKCDF TKFillet
WANTLIB += ${COMPILER_LIBCXX} GL GLEW GLU TKBO TKBRep TKBin TKBinL
WANTLIB += TKBinTObj TKBinXCAF TKBool TKCAF TKCDF TKFeat TKFillet
WANTLIB += TKG2d TKG3d TKGeomAlgo TKGeomBase TKHLR TKIGES TKLCAF
WANTLIB += TKMath TKMesh TKOffset TKPCAF TKPLCAF TKPShape TKPrim
WANTLIB += TKSTEP TKSTEP209 TKSTEPAttr TKSTEPBase TKService TKShHealing
WANTLIB += TKTopAlgo TKV3d TKXCAF TKXDEIGES TKXDESTEP TKXSBase
WANTLIB += TKernel X11 Xext boost_context-mt boost_system-mt
WANTLIB += c cairo crypto curl freetype m ngspice pixman-1 ${MODPY_WANTLIB}
WANTLIB += ssl wx_baseu-3.0 wx_baseu_net-3.0 wx_baseu_xml-3.0
WANTLIB += wx_gtk3u_adv-3.0 wx_gtk3u_aui-3.0 wx_gtk3u_core-3.0
WANTLIB += wx_gtk3u_gl-3.0 wx_gtk3u_html-3.0 wx_gtk3u_stc-3.0
WANTLIB += TKMath TKMesh TKMeshVS TKOffset TKOpenGl TKPrim TKSTEP
WANTLIB += TKSTEP209 TKSTEPAttr TKSTEPBase TKSTL TKService TKShHealing
WANTLIB += TKTObj TKTopAlgo TKV3d TKVRML TKXCAF TKXDEIGES TKXDESTEP
WANTLIB += TKXMesh TKXSBase TKXml TKXmlL TKXmlTObj TKXmlXCAF TKernel
WANTLIB += boost_context-mt boost_system-mt c cairo crypto curl
WANTLIB += m ngspice pixman-1 python3.9 ssl wx_baseu-3.0 wx_baseu_net-3.0
WANTLIB += wx_baseu_xml-3.0 wx_gtk3u_adv-3.0 wx_gtk3u_aui-3.0
WANTLIB += wx_gtk3u_core-3.0 wx_gtk3u_gl-3.0 wx_gtk3u_html-3.0
WANTLIB += wx_gtk3u_stc-3.0
MASTER_SITES = https://gitlab.com/kicad/code/kicad/-/archive/${V}/
@ -68,7 +68,7 @@ CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE=Release \
-DwxWidgets_CONFIG_EXECUTABLE=${LOCALBASE}/bin/wx-config \
-DwxWidgets_LIBRARIES="${LOCALBASE}/lib" \
-DwxWidgets_INCLUDE_DIRS="${LOCALBASE}/include/wx-3.0" \
-DOCE_DIR="${LOCALBASE}/include/oce" \
-DOCC_INCLUDE_DIR="${LOCALBASE}/include/oce" \
-DKICAD_SCRIPTING_PYTHON3=ON \
-DKICAD_SCRIPTING_WXPYTHON=OFF

4
cad/kicad/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (kicad-5.1.10.tar.gz) = KWNB8wraLH9KHFRyDqtCWDWpM0lSfUvwj3PygNGWle0=
SIZE (kicad-5.1.10.tar.gz) = 23785350
SHA256 (kicad-5.1.12.tar.gz) = EBzAJeVcs8wEfevl5LGsH6EWzu0Uf+8bwnXY4h92qj8=
SIZE (kicad-5.1.12.tar.gz) = 23785717

6
cad/kicad/patches/patch-3d-viewer_3d_cache_sg_CMakeLists_txt
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-3d-viewer_3d_cache_sg_CMakeLists_txt,v 1.1 2019/11/08 14:43:53 sthen Exp $
$OpenBSD: patch-3d-viewer_3d_cache_sg_CMakeLists_txt,v 1.2 2021/11/22 14:55:53 tracey Exp $
Index: 3d-viewer/3d_cache/sg/CMakeLists.txt
--- 3d-viewer/3d_cache/sg/CMakeLists.txt.orig
@ -13,5 +13,5 @@ Index: 3d-viewer/3d_cache/sg/CMakeLists.txt
+ c
+ ${wxWidgets_LIBRARIES} )
install( TARGETS
kicad_3dsg
# Don't specify the ARCHIVE DESTINATION parameter to prevent
# the install of the import library on Windows

21
cad/kicad/patches/patch-CMakeModules_Findngspice_cmake Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-CMakeModules_Findngspice_cmake,v 1.1 2021/11/22 14:55:53 tracey Exp $
Index: CMakeModules/Findngspice.cmake
--- CMakeModules/Findngspice.cmake.orig
+++ CMakeModules/Findngspice.cmake
@@ -64,11 +64,11 @@ find_path( NGSPICE_INCLUDE_DIR ngspice/sharedspice.h
share/ngspice/include/ngspice
)
-if( UNIX )
- set( NGSPICE_LIB_NAME libngspice.so.0 CACHE STRING "Optionally versioned name of the shared library" )
-else()
+#if( UNIX )
+# set( NGSPICE_LIB_NAME libngspice.so.0 CACHE STRING "Optionally versioned name of the shared library" )
+#else()
set( NGSPICE_LIB_NAME ngspice CACHE STRING "Optionally versioned name of the shared library" )
-endif()
+#endif()
find_library( NGSPICE_LIBRARY ${NGSPICE_LIB_NAME}
PATHS

4
cad/kicad/patches/patch-common_CMakeLists_txt
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-common_CMakeLists_txt,v 1.2 2020/04/02 14:48:27 tracey Exp $
$OpenBSD: patch-common_CMakeLists_txt,v 1.3 2021/11/22 14:55:53 tracey Exp $
# get rid of -lrt linker
Index: common/CMakeLists.txt
--- common/CMakeLists.txt.orig
+++ common/CMakeLists.txt
@@ -597,7 +597,7 @@ add_dependencies( common page_layout_lexer_source_file
@@ -598,7 +598,7 @@ add_dependencies( common page_layout_lexer_source_file
# This one gets made only when testing.
# to build it, first enable #define STAND_ALONE at top of dsnlexer.cpp
add_executable( dsntest EXCLUDE_FROM_ALL dsnlexer.cpp )