Mon Jun 1 03:50:21 2020 UTC ()
(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


(mef)
diff -r1.46 -r1.47 pkgsrc/cad/kicad/Makefile
diff -r1.12 -r1.13 pkgsrc/cad/kicad/distinfo
diff -r0 -r1.1 pkgsrc/cad/kicad/patches/patch-common_lib__tree__model.cpp
cvs diff -r1.46 -r1.47 pkgsrc/cad/kicad/Makefile (expand / switch to unified diff)

--- pkgsrc/cad/kicad/Makefile 2020/05/22 10:55:57 1.46
+++ pkgsrc/cad/kicad/Makefile 2020/06/01 03:50:21 1.47
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.46 2020/05/22 10:55:57 adam Exp $ 1# $NetBSD: Makefile,v 1.47 2020/06/01 03:50:21 mef Exp $
2# 2#
3 3
4V= 5.1.4 4V= 5.1.4
5DISTNAME= kicad-${V} 5DISTNAME= kicad-${V}
6PKGREVISION= 6 6PKGREVISION= 6
7CATEGORIES= cad 7CATEGORIES= cad
8MASTER_SITES= https://launchpad.net/kicad/5.0/${V}/+download/ 8MASTER_SITES= https://launchpad.net/kicad/5.0/${V}/+download/
9EXTRACT_SUFX= .tar.xz 9EXTRACT_SUFX= .tar.xz
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= https://www.kicad-pcb.org/ 12HOMEPAGE= https://www.kicad-pcb.org/
13COMMENT= Schematic and PCB CAD software (stable branch) 13COMMENT= Schematic and PCB CAD software (stable branch)
14LICENSE= gnu-gpl-v3 14LICENSE= gnu-gpl-v3
@@ -16,44 +16,44 @@ LICENSE= gnu-gpl-v3 @@ -16,44 +16,44 @@ LICENSE= gnu-gpl-v3
16DEPENDS+= git-base-[0-9]*:../../devel/git-base 16DEPENDS+= git-base-[0-9]*:../../devel/git-base
17 17
18USE_PKGLOCALEDIR= yes 18USE_PKGLOCALEDIR= yes
19USE_LANGUAGES= c c++11 19USE_LANGUAGES= c c++11
20USE_CMAKE= yes 20USE_CMAKE= yes
21 21
22CMAKE_ARGS+= -DKICAD_REPO_NAME=stable -DKICAD_BUILD_VERSION=${V} 22CMAKE_ARGS+= -DKICAD_REPO_NAME=stable -DKICAD_BUILD_VERSION=${V}
23CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release -DKICAD_SKIP_BOOST=ON 23CMAKE_ARGS+= -DCMAKE_BUILD_TYPE=Release -DKICAD_SKIP_BOOST=ON
24CMAKE_ARGS+= -DKICAD_SPICE=OFF -DKICAD_USE_OCE=OFF 24CMAKE_ARGS+= -DKICAD_SPICE=OFF -DKICAD_USE_OCE=OFF
25CMAKE_ARGS+= -DKICAD_SCRIPTING=OFF -DKICAD_SCRIPTING_MODULES=OFF 25CMAKE_ARGS+= -DKICAD_SCRIPTING=OFF -DKICAD_SCRIPTING_MODULES=OFF
26CMAKE_ARGS+= -DKICAD_SCRIPTING_ACTION_MENU=OFF 26CMAKE_ARGS+= -DKICAD_SCRIPTING_ACTION_MENU=OFF
27CMAKE_ARGS+= -DKICAD_SCRIPTING_WXPYTHON=OFF 27CMAKE_ARGS+= -DKICAD_SCRIPTING_WXPYTHON=OFF
28 28
29CMAKE_MODULE_PATH_OVERRIDE = \ 29CMAKE_MODULE_PATH_OVERRIDE= \
30 new/CMakeLists.txt 30 new/CMakeLists.txt
31 31
32PY_PATCHPLIST= yes 32PY_PATCHPLIST= yes
33 33
34SUBST_CLASSES+= macosx 34SUBST_CLASSES+= macosx
35SUBST_STAGE.macosx= pre-configure 35SUBST_STAGE.macosx= pre-configure
36SUBST_MESSAGE.macosx= Eliminating Mac OS X build specific for ${PKGNAME} 36SUBST_MESSAGE.macosx= Eliminating Mac OS X build specific for ${PKGNAME}
37SUBST_FILES.macosx= bitmap2component/CMakeLists.txt \ 37SUBST_FILES.macosx= bitmap2component/CMakeLists.txt \
38 kicad/CMakeLists.txt 38 kicad/CMakeLists.txt
39SUBST_SED.macosx= -e 's/[[:<:]]MACOSX_BUNDLE[[:>:]]//' 39SUBST_SED.macosx= -e 's/[[:<:]]MACOSX_BUNDLE[[:>:]]//'
40 40
41.include "../../mk/bsd.prefs.mk" 41.include "../../mk/bsd.prefs.mk"
42 42
43# PR 48980: no fabsl on netbsd-5 43# PR 48980: no fabsl on netbsd-5
44.if !empty(MACHINE_PLATFORM:MNetBSD-5.*) 44.if !empty(MACHINE_PLATFORM:MNetBSD-5.*)
45SUBST_CLASSES+= netbsd5 45SUBST_CLASSES+= netbsd5
46SUBST_STAGE.netbsd5= pre-patch 46SUBST_STAGE.netbsd5= post-extract
47SUBST_MESSAGE.netbsd5= Substituting fabs() for fabsl() for NetBSD-5 47SUBST_MESSAGE.netbsd5= Substituting fabs() for fabsl() for NetBSD-5
48SUBST_FILES.netbsd5= pcbnew/legacy_plugin.cpp \ 48SUBST_FILES.netbsd5= pcbnew/legacy_plugin.cpp \
49 tools/test-nm-biu-to-ascii-mm-round-tripping.cpp 49 tools/test-nm-biu-to-ascii-mm-round-tripping.cpp
50SUBST_SED.netbsd5= -e 's/fabsl/fabs/g' 50SUBST_SED.netbsd5= -e 's/fabsl/fabs/g'
51.endif 51.endif
52 52
53.include "../../mk/compiler.mk" 53.include "../../mk/compiler.mk"
54.if !empty(PKGSRC_COMPILER:Mclang) 54.if !empty(PKGSRC_COMPILER:Mclang)
55CXXFLAGS+= -Wno-error=non-pod-varargs 55CXXFLAGS+= -Wno-error=non-pod-varargs
56.endif 56.endif
57 57
58.include "../../devel/boost-libs/buildlink3.mk" 58.include "../../devel/boost-libs/buildlink3.mk"
59.include "../../devel/cmake/buildlink3.mk" 59.include "../../devel/cmake/buildlink3.mk"
cvs diff -r1.12 -r1.13 pkgsrc/cad/kicad/distinfo (expand / switch to unified diff)

--- pkgsrc/cad/kicad/distinfo 2019/08/29 15:36:39 1.12
+++ pkgsrc/cad/kicad/distinfo 2020/06/01 03:50:21 1.13
@@ -1,24 +1,25 @@ @@ -1,24 +1,25 @@
1$NetBSD: distinfo,v 1.12 2019/08/29 15:36:39 bouyer Exp $ 1$NetBSD: distinfo,v 1.13 2020/06/01 03:50:21 mef Exp $
2 2
3SHA1 (kicad-5.1.4.tar.xz) = 5c4a2cf2f99afc67a57433ead0686e0083dd6fb2 3SHA1 (kicad-5.1.4.tar.xz) = 5c4a2cf2f99afc67a57433ead0686e0083dd6fb2
4RMD160 (kicad-5.1.4.tar.xz) = ed8e53cebddf76df70e80ec1f221cf5bf69be060 4RMD160 (kicad-5.1.4.tar.xz) = ed8e53cebddf76df70e80ec1f221cf5bf69be060
5SHA512 (kicad-5.1.4.tar.xz) = ce0efb740686eafdbbdf8cda68ad800a70c8991302f984be3db4bbdb3bfafe1634871ec6ea26bb6854a417db6336880e5a043dc022ef8126c0e98abc90671337 5SHA512 (kicad-5.1.4.tar.xz) = ce0efb740686eafdbbdf8cda68ad800a70c8991302f984be3db4bbdb3bfafe1634871ec6ea26bb6854a417db6336880e5a043dc022ef8126c0e98abc90671337
6Size (kicad-5.1.4.tar.xz) = 14198672 bytes 6Size (kicad-5.1.4.tar.xz) = 14198672 bytes
7SHA1 (patch-3d-viewer_3d_cache_sg_CMakeLists.txt) = 0863d6b03025fb2afd2dcb290bb08809685a0500 7SHA1 (patch-3d-viewer_3d_cache_sg_CMakeLists.txt) = 0863d6b03025fb2afd2dcb290bb08809685a0500
8SHA1 (patch-CMakeLists.txt) = 081f986cb9e3cb5aba40c737f49bafde23e66c66 8SHA1 (patch-CMakeLists.txt) = 081f986cb9e3cb5aba40c737f49bafde23e66c66
9SHA1 (patch-CMakeModules_Functions.cmake) = 9517d3451fd90eeb7ef6a98f08b08a925757e360 9SHA1 (patch-CMakeModules_Functions.cmake) = 9517d3451fd90eeb7ef6a98f08b08a925757e360
10SHA1 (patch-CMakeModules_WriteVersionHeader.cmake) = 153ad7c4cd21358f613a406016407658090ed390 10SHA1 (patch-CMakeModules_WriteVersionHeader.cmake) = 153ad7c4cd21358f613a406016407658090ed390
11SHA1 (patch-CMakeModules_config.h.cmake) = 7d2edb2cf7482724d255b8db0232dd28f6b7e517 11SHA1 (patch-CMakeModules_config.h.cmake) = 7d2edb2cf7482724d255b8db0232dd28f6b7e517
12SHA1 (patch-bitmaps_png_CMakeLists.txt) = 1202783b39af4ddf83b9def91eb72b058f2da5bb 12SHA1 (patch-bitmaps_png_CMakeLists.txt) = 1202783b39af4ddf83b9def91eb72b058f2da5bb
13SHA1 (patch-common_CMakeLists.txt) = 29b3dbcbb5f82b3f16881e7c83a8cc11e2d8bd85 13SHA1 (patch-common_CMakeLists.txt) = 29b3dbcbb5f82b3f16881e7c83a8cc11e2d8bd85
 14SHA1 (patch-common_lib__tree__model.cpp) = 09977f6e8ed3e103dc9f9e60b015feddbad0716d
14SHA1 (patch-cvpcb_CMakeLists.txt) = 664ad5a5788c7c2b28911b60a71697012ceed260 15SHA1 (patch-cvpcb_CMakeLists.txt) = 664ad5a5788c7c2b28911b60a71697012ceed260
15SHA1 (patch-eeschema_CMakeLists.txt) = 351f684b4a6ff58532634086a7df1e35ea02d792 16SHA1 (patch-eeschema_CMakeLists.txt) = 351f684b4a6ff58532634086a7df1e35ea02d792
16SHA1 (patch-gerbview_CMakeLists.txt) = 0a9417eeb432919d57afbfaa07a9651f7df4acb0 17SHA1 (patch-gerbview_CMakeLists.txt) = 0a9417eeb432919d57afbfaa07a9651f7df4acb0
17SHA1 (patch-include_hashtables.h) = 4b26adef481406b61c1c9cf660f69847aa76142d 18SHA1 (patch-include_hashtables.h) = 4b26adef481406b61c1c9cf660f69847aa76142d
18SHA1 (patch-include_kiway.h) = 7208f474e895ea07ba5e5f56bab46d4d529b9e57 19SHA1 (patch-include_kiway.h) = 7208f474e895ea07ba5e5f56bab46d4d529b9e57
19SHA1 (patch-include_system_libcontext.h) = 895ae55ab10dd2582d6b258aa2f7358721b27972 20SHA1 (patch-include_system_libcontext.h) = 895ae55ab10dd2582d6b258aa2f7358721b27972
20SHA1 (patch-pagelayout_editor_CMakeLists.txt) = 5107e7fa37227143a3a0950847b607438b5c97dd 21SHA1 (patch-pagelayout_editor_CMakeLists.txt) = 5107e7fa37227143a3a0950847b607438b5c97dd
21SHA1 (patch-pcb_calculator_CMakeLists.txt) = bf335e3cb8e513fb9d6a1518f479dfe9786c70da 22SHA1 (patch-pcb_calculator_CMakeLists.txt) = bf335e3cb8e513fb9d6a1518f479dfe9786c70da
22SHA1 (patch-pcbnew_CMakeLists.txt) = 3ec0b39483c18888f5c5d185ff81a28b597ee4d5 23SHA1 (patch-pcbnew_CMakeLists.txt) = 3ec0b39483c18888f5c5d185ff81a28b597ee4d5
23SHA1 (patch-plugins_3d_idf_CMakeLists.txt) = 1c58b6925d2947bcfbaf4e91cc5ee28068899998 24SHA1 (patch-plugins_3d_idf_CMakeLists.txt) = 1c58b6925d2947bcfbaf4e91cc5ee28068899998
24SHA1 (patch-plugins_3d_vrml_CMakeLists.txt) = 3336027c7eacf8fceb61875e9757480aae81a245 25SHA1 (patch-plugins_3d_vrml_CMakeLists.txt) = 3336027c7eacf8fceb61875e9757480aae81a245
File Added: pkgsrc/cad/kicad/patches/Attic/patch-common_lib__tree__model.cpp
$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>