diff options
| author | mef <mef@pkgsrc.org> | 2020-06-01 03:50:21 +0000 |
|---|---|---|
| committer | mef <mef@pkgsrc.org> | 2020-06-01 03:50:21 +0000 |
| commit | 203d94fc4c22a37466bd973aeb04eb7ded637234 (patch) | |
| tree | 4bdf8e9e2d4d663cb63ea467313f37c27ccfc62f /cad/kicad | |
| parent | 331e9859f571f3a56080373cf7209fc61ceffaec (diff) | |
| download | pkgsrc-203d94fc4c22a37466bd973aeb04eb7ded637234.tar.gz | |
(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
Diffstat (limited to 'cad/kicad')
| -rw-r--r-- | cad/kicad/Makefile | 6 | ||||
| -rw-r--r-- | cad/kicad/distinfo | 3 | ||||
| -rw-r--r-- | cad/kicad/patches/patch-common_lib__tree__model.cpp | 16 |
3 files changed, 21 insertions, 4 deletions
diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile index bc3a2ac97de..60f409ac14a 100644 --- a/cad/kicad/Makefile +++ b/cad/kicad/Makefile @@ -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 -DKICAD_SCRIPTING_MODULES=OFF 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_BUNDLE[[:>:]]//' # 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 diff --git a/cad/kicad/distinfo b/cad/kicad/distinfo index 0374bccd92b..d078e8ed097 100644 --- a/cad/kicad/distinfo +++ b/cad/kicad/distinfo @@ -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_WriteVersionHeader.cmake) = 153ad7c4cd21358f613a4060164 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 diff --git a/cad/kicad/patches/patch-common_lib__tree__model.cpp b/cad/kicad/patches/patch-common_lib__tree__model.cpp new file mode 100644 index 00000000000..d99063818b5 --- /dev/null +++ b/cad/kicad/patches/patch-common_lib__tree__model.cpp @@ -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> + |