1 |
pacho 13/08/31 14:07:29 |
2 |
|
3 |
Added: k3d-0.7.11.0-gcc47.patch |
4 |
Log: |
5 |
Build with gcc47 (#421951 by Peter Asplund) |
6 |
|
7 |
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key A188FBD4) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 media-gfx/k3d/files/k3d-0.7.11.0-gcc47.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/k3d/files/k3d-0.7.11.0-gcc47.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/k3d/files/k3d-0.7.11.0-gcc47.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: k3d-0.7.11.0-gcc47.patch |
16 |
=================================================================== |
17 |
--- k3d-source-0.8.0.2/k3dsdk/gil/boost/gil/extension/dynamic_image/apply_operation_base.hpp 2010-07-02 23:27:47.000000000 -0300 |
18 |
+++ k3d-source-0.8.0.2_patched/k3dsdk/gil/boost/gil/extension/dynamic_image/apply_operation_base.hpp 2012-09-14 15:48:20.000000000 -0300 |
19 |
@@ -114,7 +114,7 @@ |
20 |
template <typename T2, typename Op> |
21 |
struct reduce_bind1 { |
22 |
const T2& _t2; |
23 |
- mutable Op& _op; |
24 |
+ Op& _op; |
25 |
|
26 |
typedef typename Op::result_type result_type; |
27 |
|
28 |
@@ -127,7 +127,7 @@ |
29 |
struct reduce_bind2 { |
30 |
const Bits1& _bits1; |
31 |
std::size_t _index1; |
32 |
- mutable Op& _op; |
33 |
+ Op& _op; |
34 |
|
35 |
typedef typename Op::result_type result_type; |
36 |
|
37 |
--- k3d-source-0.8.0.2/k3dsdk/data.h 2010-07-02 23:27:46.000000000 -0300 |
38 |
+++ k3d-source-0.8.0.2_patched/k3dsdk/data.h 2012-09-14 16:50:20.000000000 -0300 |
39 |
@@ -580,7 +580,7 @@ |
40 |
|
41 |
try |
42 |
{ |
43 |
- set_value(boost::lexical_cast<value_t>(*new_value), Hint); |
44 |
+ this->set_value(boost::lexical_cast<value_t>(*new_value), Hint); |
45 |
return true; |
46 |
} |
47 |
catch(...) |
48 |
@@ -865,7 +865,7 @@ |
49 |
|
50 |
try |
51 |
{ |
52 |
- set_value(boost::lexical_cast<value_t>(*new_value), Hint); |
53 |
+ this->set_value(boost::lexical_cast<value_t>(*new_value), Hint); |
54 |
return true; |
55 |
} |
56 |
catch(...) |
57 |
@@ -1011,7 +1011,7 @@ |
58 |
|
59 |
try |
60 |
{ |
61 |
- set_value(boost::lexical_cast<value_t>(*new_value), Hint); |
62 |
+ this->set_value(boost::lexical_cast<value_t>(*new_value), Hint); |
63 |
return true; |
64 |
} |
65 |
catch(...) |
66 |
@@ -1146,7 +1146,7 @@ |
67 |
if(!new_value) |
68 |
return false; |
69 |
|
70 |
- set_value(*new_value, Hint); |
71 |
+ this->set_value(*new_value, Hint); |
72 |
return true; |
73 |
} |
74 |
|
75 |
@@ -1671,7 +1671,7 @@ |
76 |
/// This little bit of magic makes it possible for base classes (such as node_storage) to update their own values while observing the correct undo policy |
77 |
void internal_set_value(const value_t& Value, ihint* const Hint) |
78 |
{ |
79 |
- set_value(Value, Hint); |
80 |
+ this->set_value(Value, Hint); |
81 |
} |
82 |
}; |
83 |
|
84 |
--- k3d-source-0.8.0.2/modules/animation/interpolator.h 2010-07-02 23:27:55.000000000 -0300 |
85 |
+++ k3d-source-0.8.0.2_patched/modules/animation/interpolator.h 2012-09-14 16:45:16.000000000 -0300 |
86 |
@@ -92,7 +92,7 @@ |
87 |
{ |
88 |
time_t t_lower, t_upper; |
89 |
value_t v_lower, v_upper; |
90 |
- get_surrounding_keys(Time, Keyframes, t_lower, t_upper, v_lower, v_upper); |
91 |
+ this->get_surrounding_keys(Time, Keyframes, t_lower, t_upper, v_lower, v_upper); |
92 |
return lerp(t_lower, t_upper, v_lower, v_upper, Time); |
93 |
} |
94 |
protected: |
95 |
@@ -116,7 +116,7 @@ |
96 |
{ |
97 |
time_t t_lower, t_upper; |
98 |
value_t v_lower, v_upper; |
99 |
- get_surrounding_keys(Time, Keyframes, t_lower, t_upper, v_lower, v_upper); |
100 |
+ this->get_surrounding_keys(Time, Keyframes, t_lower, t_upper, v_lower, v_upper); |
101 |
return lerp(t_lower, t_upper, v_lower, v_upper, Time); |
102 |
} |
103 |
protected: |