CVS commit: pkgsrc/cad/kicad

["Makoto Fujiwara" <mef%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mef
Date:           Mon Jun  1 03:50:21 UTC 2020

Modified Files:
        pkgsrc/cad/kicad: Makefile distinfo
Added Files:
        pkgsrc/cad/kicad/patches: patch-common_lib__tree__model.cpp

Log Message:
(cad/kicad)  Adapt to boost 1.73. (sorry adhoc fix, please correct me if wrong tks)

- pkglint -F
- add patch for #include <algorithm>
  It's been failing since 2020/05/07 of boost update

  ./20200507.0738/kicad-5.1.4nb5
  ...
  ./20200523.0017/kicad-5.1.4nb6
  ...
  ./20200530.0227/kicad-5.1.4nb6


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/cad/kicad/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/cad/kicad/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/cad/kicad/patches/patch-common_lib__tree__model.cpp

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

Modified files:

Index: pkgsrc/cad/kicad/Makefile
diff -u pkgsrc/cad/kicad/Makefile:1.46 pkgsrc/cad/kicad/Makefile:1.47
--- pkgsrc/cad/kicad/Makefile:1.46      Fri May 22 10:55:57 2020
+++ pkgsrc/cad/kicad/Makefile   Mon Jun  1 03:50:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2020/05/22 10:55:57 adam Exp $
+# $NetBSD: Makefile,v 1.47 2020/06/01 03:50:21 mef Exp $
 #
 
 V=             5.1.4
@@ -26,7 +26,7 @@ CMAKE_ARGS+=          -DKICAD_SCRIPTING=OFF -DKI
 CMAKE_ARGS+=           -DKICAD_SCRIPTING_ACTION_MENU=OFF
 CMAKE_ARGS+=           -DKICAD_SCRIPTING_WXPYTHON=OFF
 
-CMAKE_MODULE_PATH_OVERRIDE = \
+CMAKE_MODULE_PATH_OVERRIDE= \
                        new/CMakeLists.txt
 
 PY_PATCHPLIST=         yes
@@ -43,7 +43,7 @@ SUBST_SED.macosx=     -e 's/[[:<:]]MACOSX_BU
 # PR 48980: no fabsl on netbsd-5
 .if !empty(MACHINE_PLATFORM:MNetBSD-5.*)
 SUBST_CLASSES+=                netbsd5
-SUBST_STAGE.netbsd5=   pre-patch
+SUBST_STAGE.netbsd5=   post-extract
 SUBST_MESSAGE.netbsd5= Substituting fabs() for fabsl() for NetBSD-5
 SUBST_FILES.netbsd5=   pcbnew/legacy_plugin.cpp \
                        tools/test-nm-biu-to-ascii-mm-round-tripping.cpp

Index: pkgsrc/cad/kicad/distinfo
diff -u pkgsrc/cad/kicad/distinfo:1.12 pkgsrc/cad/kicad/distinfo:1.13
--- pkgsrc/cad/kicad/distinfo:1.12      Thu Aug 29 15:36:39 2019
+++ pkgsrc/cad/kicad/distinfo   Mon Jun  1 03:50:21 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2019/08/29 15:36:39 bouyer Exp $
+$NetBSD: distinfo,v 1.13 2020/06/01 03:50:21 mef Exp $
 
 SHA1 (kicad-5.1.4.tar.xz) = 5c4a2cf2f99afc67a57433ead0686e0083dd6fb2
 RMD160 (kicad-5.1.4.tar.xz) = ed8e53cebddf76df70e80ec1f221cf5bf69be060
@@ -11,6 +11,7 @@ SHA1 (patch-CMakeModules_WriteVersionHea
 SHA1 (patch-CMakeModules_config.h.cmake) = 7d2edb2cf7482724d255b8db0232dd28f6b7e517
 SHA1 (patch-bitmaps_png_CMakeLists.txt) = 1202783b39af4ddf83b9def91eb72b058f2da5bb
 SHA1 (patch-common_CMakeLists.txt) = 29b3dbcbb5f82b3f16881e7c83a8cc11e2d8bd85
+SHA1 (patch-common_lib__tree__model.cpp) = 09977f6e8ed3e103dc9f9e60b015feddbad0716d
 SHA1 (patch-cvpcb_CMakeLists.txt) = 664ad5a5788c7c2b28911b60a71697012ceed260
 SHA1 (patch-eeschema_CMakeLists.txt) = 351f684b4a6ff58532634086a7df1e35ea02d792
 SHA1 (patch-gerbview_CMakeLists.txt) = 0a9417eeb432919d57afbfaa07a9651f7df4acb0

Added files:

Index: pkgsrc/cad/kicad/patches/patch-common_lib__tree__model.cpp
diff -u /dev/null pkgsrc/cad/kicad/patches/patch-common_lib__tree__model.cpp:1.1
--- /dev/null   Mon Jun  1 03:50:21 2020
+++ pkgsrc/cad/kicad/patches/patch-common_lib__tree__model.cpp  Mon Jun  1 03:50:21 2020
@@ -0,0 +1,16 @@
+$NetBSD: patch-common_lib__tree__model.cpp,v 1.1 2020/06/01 03:50:21 mef Exp $
+
+/tmp/cad/kicad/work/kicad-5.1.4/common/lib_tree_model.cpp:78:14: error: 'sort' is not a member of 'std'
+         std::sort( sort_buf.begin(), sort_buf.end(),
+              ^~~~
+
+--- common/lib_tree_model.cpp.orig     2020-06-01 08:09:39.469102942 +0900
++++ common/lib_tree_model.cpp  2020-06-01 08:10:04.891802170 +0900
+@@ -25,6 +25,7 @@
+ #include <lib_tree_item.h>
+ #include <make_unique.h>
+ #include <utility>
++#include <algorithm>
+ #include <pgm_base.h>
+ #include <kicad_string.h>
+