tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
gplates: drop python39
Weijia Wang
2 years ago
28af3205
b98c731d
+80
-6
3 changed files
expand all
collapse all
unified
split
pkgs
applications
science
misc
gplates
boost-placeholders.patch
default.nix
top-level
all-packages.nix
+75
pkgs/applications/science/misc/gplates/boost-placeholders.patch
···
1
1
+
diff --unified --recursive a/src/gui/TopologyTools.cc b/src/gui/TopologyTools.cc
2
2
+
--- a/src/gui/TopologyTools.cc 2021-07-05 05:11:47.000000000 +0200
3
3
+
+++ b/src/gui/TopologyTools.cc 2022-12-07 22:35:20.444054124 +0100
4
4
+
@@ -3448,7 +3448,7 @@
5
5
+
std::find_if(
6
6
+
d_visible_boundary_section_seq.begin(),
7
7
+
d_visible_boundary_section_seq.end(),
8
8
+
- boost::bind(&VisibleSection::d_section_info_index, _1) ==
9
9
+
+ boost::bind(&VisibleSection::d_section_info_index, boost::placeholders::_1) ==
10
10
+
boost::cref(section_index));
11
11
+
12
12
+
if (visible_section_iter == d_visible_boundary_section_seq.end())
13
13
+
@@ -3467,7 +3467,7 @@
14
14
+
std::find_if(
15
15
+
d_visible_interior_section_seq.begin(),
16
16
+
d_visible_interior_section_seq.end(),
17
17
+
- boost::bind(&VisibleSection::d_section_info_index, _1) ==
18
18
+
+ boost::bind(&VisibleSection::d_section_info_index, boost::placeholders::_1) ==
19
19
+
boost::cref(section_index));
20
20
+
21
21
+
if (visible_section_iter == d_visible_interior_section_seq.end())
22
22
+
diff --unified --recursive a/src/presentation/ReconstructionGeometryRenderer.cc b/src/presentation/ReconstructionGeometryRenderer.cc
23
23
+
--- a/src/presentation/ReconstructionGeometryRenderer.cc 2021-07-05 05:11:50.000000000 +0200
24
24
+
+++ b/src/presentation/ReconstructionGeometryRenderer.cc 2022-12-07 22:36:11.117884262 +0100
25
25
+
@@ -274,7 +274,7 @@
26
26
+
GPlatesPresentation::ReconstructionGeometryRenderer::RenderParamsPopulator::visit_reconstruct_visual_layer_params(
27
27
+
const ReconstructVisualLayerParams ¶ms)
28
28
+
{
29
29
+
- d_render_params.show_vgp = boost::bind(&ReconstructVisualLayerParams::show_vgp, ¶ms, _1, _2);
30
30
+
+ d_render_params.show_vgp = boost::bind(&ReconstructVisualLayerParams::show_vgp, ¶ms, boost::placeholders::_1, boost::placeholders::_2);
31
31
+
d_render_params.vgp_draw_circular_error = params.get_vgp_draw_circular_error();
32
32
+
d_render_params.fill_polygons = params.get_fill_polygons();
33
33
+
d_render_params.fill_polylines = params.get_fill_polylines();
34
34
+
diff --unified --recursive a/src/presentation/VisualLayerRegistry.cc b/src/presentation/VisualLayerRegistry.cc
35
35
+
--- a/src/presentation/VisualLayerRegistry.cc 2021-07-05 05:11:50.000000000 +0200
36
36
+
+++ b/src/presentation/VisualLayerRegistry.cc 2022-12-07 22:38:12.950877614 +0100
37
37
+
@@ -448,7 +448,7 @@
38
38
+
&GPlatesQtWidgets::ReconstructScalarCoverageLayerOptionsWidget::create,
39
39
+
boost::bind(
40
40
+
&ReconstructScalarCoverageVisualLayerParams::create,
41
41
+
- _1),
42
42
+
+ boost::placeholders::_1),
43
43
+
true);
44
44
+
45
45
+
registry.register_visual_layer_type(
46
46
+
@@ -498,7 +498,7 @@
47
47
+
// NOTE: We pass in ViewState and not the GlobeAndMapWidget, obtained from
48
48
+
// ViewportWindow, because ViewportWindow is not yet available (a reference to
49
49
+
// it not yet been initialised inside ViewState) so accessing it would crash...
50
50
+
- _1, boost::ref(view_state)),
51
51
+
+ boost::placeholders::_1, boost::ref(view_state)),
52
52
+
true);
53
53
+
54
54
+
// DERIVED_DATA group.
55
55
+
@@ -549,7 +549,7 @@
56
56
+
&GPlatesQtWidgets::VelocityFieldCalculatorLayerOptionsWidget::create,
57
57
+
boost::bind(
58
58
+
&VelocityFieldCalculatorVisualLayerParams::create,
59
59
+
- _1, boost::cref(view_state.get_rendered_geometry_parameters())),
60
60
+
+ boost::placeholders::_1, boost::cref(view_state.get_rendered_geometry_parameters())),
61
61
+
true);
62
62
+
63
63
+
using namespace GPlatesUtils;
64
64
+
diff --unified --recursive a/src/qt-widgets/ViewportWindow.cc b/src/qt-widgets/ViewportWindow.cc
65
65
+
--- a/src/qt-widgets/ViewportWindow.cc 2021-08-05 05:44:01.000000000 +0200
66
66
+
+++ b/src/qt-widgets/ViewportWindow.cc 2022-12-07 22:39:20.487981302 +0100
67
67
+
@@ -326,7 +326,7 @@
68
68
+
*d_geometry_operation_state_ptr,
69
69
+
*d_modify_geometry_state,
70
70
+
*d_measure_distance_state_ptr,
71
71
+
- boost::bind(&canvas_tool_status_message, boost::ref(*this), _1),
72
72
+
+ boost::bind(&canvas_tool_status_message, boost::ref(*this), boost::placeholders::_1),
73
73
+
get_view_state(),
74
74
+
*this);
75
75
+
+4
pkgs/applications/science/misc/gplates/default.nix
···
40
40
sha256 = "0lrcmcxc924ixddii8cyglqlwwxvk7f00g4yzbss5i3fgcbh8n96";
41
41
};
42
42
43
43
+
patches = [
44
44
+
./boost-placeholders.patch
45
45
+
];
46
46
+
43
47
nativeBuildInputs = [
44
48
cmake
45
49
doxygen
+1
-6
pkgs/top-level/all-packages.nix
···
38793
38793
38794
38794
gildas = callPackage ../applications/science/astronomy/gildas { };
38795
38795
38796
38796
-
gplates = libsForQt5.callPackage ../applications/science/misc/gplates {
38797
38797
-
boost = boost175;
38798
38798
-
# build with Python 3.10 fails, because boost <= 1.78 can't find
38799
38799
-
# pythons with double digits in minor versions, like X.YZ
38800
38800
-
python3 = python39;
38801
38801
-
};
38796
38796
+
gplates = libsForQt5.callPackage ../applications/science/misc/gplates { };
38802
38797
38803
38798
grap = callPackage ../tools/security/grap { };
38804
38799