[Update] cad/kicad 5.1.7

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[Update] cad/kicad 5.1.7

Tracey Emery
Here is a bump to KiCAD's stable 5.1.7 version.

The kicad-shared bump is to follow.

Everything looks good on amd64. There were no library changes.

Ok?

--

Tracey Emery

Index: Makefile
===================================================================
RCS file: /cvs/ports/cad/kicad/Makefile,v
retrieving revision 1.43
diff -u -p -u -r1.43 Makefile
--- Makefile 3 Jul 2020 21:12:35 -0000 1.43
+++ Makefile 16 Feb 2021 23:25:13 -0000
@@ -3,11 +3,10 @@
 # Sync cad/kicad-share/Makefile.inc with archs where kicad is broken
 BROKEN-powerpc = segfaults when trying to run the PCB editor
 
-V = 5.1.5
+V = 5.1.7
 COMMENT = schematic and PCB editing software
 DISTNAME = kicad-${V}
 EPOCH = 0
-REVISION = 2
 
 SHARED_LIBS += kicad_3dsg                0.0 # 2.0
 
@@ -24,16 +23,13 @@ WANTLIB += TKG2d TKG3d TKGeomAlgo TKGeom
 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_atomic-mt boost_chrono-mt boost_context-mt
-WANTLIB += boost_date_time-mt boost_system-mt boost_thread-mt
+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
 
-MASTER_SITES = https://launchpad.net/kicad/5.0/${V}/+download/
-
-EXTRACT_SUFX = .tar.xz
+MASTER_SITES = https://gitlab.com/kicad/code/kicad/-/archive/${V}/
 
 COMPILER = base-clang ports-gcc
 
Index: distinfo
===================================================================
RCS file: /cvs/ports/cad/kicad/distinfo,v
retrieving revision 1.8
diff -u -p -u -r1.8 distinfo
--- distinfo 10 Dec 2019 23:09:48 -0000 1.8
+++ distinfo 16 Feb 2021 23:25:13 -0000
@@ -1,2 +1,2 @@
-SHA256 (kicad-5.1.5.tar.xz) = gGJaHah24b5oPcCCaP5D/me7cE6EHpd0MfeoK9wJZHQ=
-SIZE (kicad-5.1.5.tar.xz) = 14203632
+SHA256 (kicad-5.1.7.tar.gz) = lq0wqiie1vd//NgoPQh3twATkYfl8ZV6ytitTbrUcrw=
+SIZE (kicad-5.1.7.tar.gz) = 23795576
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/cad/kicad/patches/patch-CMakeLists_txt,v
retrieving revision 1.4
diff -u -p -u -r1.4 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 2 Apr 2020 14:48:27 -0000 1.4
+++ patches/patch-CMakeLists_txt 16 Feb 2021 23:25:13 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.4 202
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -434,12 +434,12 @@ if( false )
+@@ -409,12 +409,12 @@ if( false )
      set( KIFACE_SUFFIX  ${CMAKE_SHARED_MODULE_SUFFIX} )
  else()
      # Temporary situation until we can dovetail the python DSO into the kiface DSO.
@@ -18,7 +18,7 @@ Index: CMakeLists.txt
  #message( STATUS "KIFACE_SUFFIX:${KIFACE_SUFFIX}  KIFACE_PREFIX:${KIFACE_PREFIX}" )
 
 
-@@ -607,7 +607,7 @@ find_package( Pixman 0.30 REQUIRED )
+@@ -582,7 +582,7 @@ find_package( Pixman 0.30 REQUIRED )
 
  #
  # Find Boost headers, required.
Index: patches/patch-CMakeModules_CreateGitVersionHeader_cmake
===================================================================
RCS file: patches/patch-CMakeModules_CreateGitVersionHeader_cmake
diff -N patches/patch-CMakeModules_CreateGitVersionHeader_cmake
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-CMakeModules_CreateGitVersionHeader_cmake 16 Feb 2021 23:25:13 -0000
@@ -0,0 +1,57 @@
+$OpenBSD$
+
+# set build version without git
+
+Index: CMakeModules/CreateGitVersionHeader.cmake
+--- CMakeModules/CreateGitVersionHeader.cmake.orig
++++ CMakeModules/CreateGitVersionHeader.cmake
+@@ -24,31 +24,31 @@
+
+ macro( create_git_version_header _git_src_path )
+     # Include Git support to automagically create version header file.
+-    find_package( Git )
++    # find_package( Git )
+
+-    if( GIT_FOUND )
+-        message( STATUS "Using Git to determine build version string." )
++    # if( GIT_FOUND )
++    #     message( STATUS "Using Git to determine build version string." )
+
+-        set( _Git_SAVED_LC_ALL "$ENV{LC_ALL}" )
+-        set( ENV{LC_ALL} C )
++    #     set( _Git_SAVED_LC_ALL "$ENV{LC_ALL}" )
++    #     set( ENV{LC_ALL} C )
+
+         # Use `git describe --dirty` to create the KiCad version string.
+-        execute_process(
+-            COMMAND
+-            ${GIT_EXECUTABLE} describe --dirty
+-            WORKING_DIRECTORY ${_git_src_path}
+-            OUTPUT_VARIABLE _git_DESCRIBE
+-            ERROR_VARIABLE _git_log_error
+-            RESULT_VARIABLE _git_log_result
+-            OUTPUT_STRIP_TRAILING_WHITESPACE)
++        # execute_process(
++        #     COMMAND
++        #     ${GIT_EXECUTABLE} describe --dirty
++        #     WORKING_DIRECTORY ${_git_src_path}
++        #     OUTPUT_VARIABLE _git_DESCRIBE
++        #     ERROR_VARIABLE _git_log_error
++        #     RESULT_VARIABLE _git_log_result
++        #     OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+-        set( ENV{LC_ALL} ${_Git_SAVED_LC_ALL} )
+-    endif( GIT_FOUND )
++        # set( ENV{LC_ALL} ${_Git_SAVED_LC_ALL} )
++    # endif( GIT_FOUND )
+
+     # Check to make sure 'git' command did not fail.  Otherwise fallback
+     # to KiCadVersion.cmake as the revision level.
+-    if( _git_DESCRIBE )
+-        set( KICAD_VERSION "(${_git_DESCRIBE})" )
+-    endif()
++    # if( _git_DESCRIBE )
++        set( KICAD_VERSION "5.1.7" )
++    # endif()
+
+ endmacro()
Index: patches/patch-cvpcb_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/cad/kicad/patches/patch-cvpcb_CMakeLists_txt,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-cvpcb_CMakeLists_txt
--- patches/patch-cvpcb_CMakeLists_txt 8 Nov 2019 14:43:53 -0000 1.1
+++ patches/patch-cvpcb_CMakeLists_txt 16 Feb 2021 23:25:13 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-cvpcb_CMakeLists_txt,v 1
 Index: cvpcb/CMakeLists.txt
 --- cvpcb/CMakeLists.txt.orig
 +++ cvpcb/CMakeLists.txt
-@@ -175,7 +175,7 @@ target_link_libraries( cvpcb_kiface ${Boost_LIBRARIES}
+@@ -104,7 +104,7 @@ target_link_libraries( cvpcb_kiface ${Boost_LIBRARIES}
 
  if( UNIX AND NOT APPLE )
      # -lrt must follow Boost
Index: patches/patch-kicad_kicad_cpp
===================================================================
RCS file: /cvs/ports/cad/kicad/patches/patch-kicad_kicad_cpp,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-kicad_kicad_cpp
--- patches/patch-kicad_kicad_cpp 8 Nov 2019 14:43:53 -0000 1.1
+++ patches/patch-kicad_kicad_cpp 16 Feb 2021 23:25:13 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-kicad_kicad_cpp,v 1.1 20
 Index: kicad/kicad.cpp
 --- kicad/kicad.cpp.orig
 +++ kicad/kicad.cpp
-@@ -252,7 +252,7 @@ struct APP_KICAD : public wxApp
+@@ -256,7 +256,7 @@ struct APP_KICAD : public wxApp
      {
          program.OnPgmExit();
 
Index: patches/patch-pcbnew_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/cad/kicad/patches/patch-pcbnew_CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -u -r1.3 patch-pcbnew_CMakeLists_txt
--- patches/patch-pcbnew_CMakeLists_txt 2 Apr 2020 14:48:27 -0000 1.3
+++ patches/patch-pcbnew_CMakeLists_txt 16 Feb 2021 23:25:13 -0000
@@ -12,8 +12,8 @@ Index: pcbnew/CMakeLists.txt
  endif()
 
 
-@@ -808,11 +808,7 @@ if( KICAD_SCRIPTING_MODULES )
-         add_dependencies( ScriptingModulesPcbnewSoCopy ScriptingWxpythonCopy )
+@@ -805,11 +805,7 @@ if( KICAD_SCRIPTING_MODULES )
+         add_dependencies( ScriptingModulesPcbnewSoCopy ScriptingPythonDirectoryCreation )
          set( PYMOD_EXT "so" )
      else()  # only linux remains among supported platforms
 -        add_library( pcbnew_python MODULE $<TARGET_OBJECTS:pcbnew_kiface_objects> )
@@ -25,7 +25,7 @@ Index: pcbnew/CMakeLists.txt
          set( PYMOD_EXT "so" )
      endif()
 
-@@ -827,18 +823,16 @@ if( KICAD_SCRIPTING_MODULES )
+@@ -824,18 +820,16 @@ if( KICAD_SCRIPTING_MODULES )
              DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_pcbnew.${PYMOD_EXT}
              )
      else()
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/cad/kicad/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -r1.3 PLIST
--- pkg/PLIST 2 Apr 2020 14:48:27 -0000 1.3
+++ pkg/PLIST 16 Feb 2021 23:25:13 -0000
@@ -9,7 +9,6 @@
 @bin bin/idfcyl
 @bin bin/idfrect
 @bin bin/kicad
-@bin bin/kicad-ogltest
 @bin bin/kicad2step
 bin/libcvpcb.a
 bin/libeeschema.a