1 |
commit: c37784200792e83b4ff898eb8972fe5d60fc9d35 |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 5 06:44:42 2012 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jun 7 08:43:10 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c3778420 |
7 |
|
8 |
sci-chemistry/mgltools-qslimlib: Fix for gcc-4.7 |
9 |
|
10 |
(Portage version: 2.2.0_alpha109/git/Linux x86_64, unsigned Manifest commit) |
11 |
|
12 |
--- |
13 |
sci-chemistry/mgltools-qslimlib/ChangeLog | 4 ++ |
14 |
.../mgltools-qslimlib/files/1.5.4-gcc4.7.patch | 30 ++++++++++++++++++++ |
15 |
.../mgltools-qslimlib-1.5.6_rc2.ebuild | 4 ++- |
16 |
3 files changed, 37 insertions(+), 1 deletions(-) |
17 |
|
18 |
diff --git a/sci-chemistry/mgltools-qslimlib/ChangeLog b/sci-chemistry/mgltools-qslimlib/ChangeLog |
19 |
index 6e6a045..76cb23c 100644 |
20 |
--- a/sci-chemistry/mgltools-qslimlib/ChangeLog |
21 |
+++ b/sci-chemistry/mgltools-qslimlib/ChangeLog |
22 |
@@ -2,6 +2,10 @@ |
23 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
24 |
# $Header: $ |
25 |
|
26 |
+ 05 Jun 2012; Justin Lecher <jlec@g.o> +files/1.5.4-gcc4.7.patch, |
27 |
+ mgltools-qslimlib-1.5.6_rc2.ebuild: |
28 |
+ Fix for gcc-4.7 |
29 |
+ |
30 |
27 Apr 2012; Justin Lecher <jlec@g.o> |
31 |
mgltools-qslimlib-1.5.4-r1.ebuild, mgltools-qslimlib-1.5.6_rc2.ebuild: |
32 |
Add 2.7-pypy-* to RESTRICT_PYTHON_ABIS |
33 |
|
34 |
diff --git a/sci-chemistry/mgltools-qslimlib/files/1.5.4-gcc4.7.patch b/sci-chemistry/mgltools-qslimlib/files/1.5.4-gcc4.7.patch |
35 |
new file mode 100644 |
36 |
index 0000000..5e94b74 |
37 |
--- /dev/null |
38 |
+++ b/sci-chemistry/mgltools-qslimlib/files/1.5.4-gcc4.7.patch |
39 |
@@ -0,0 +1,30 @@ |
40 |
+ src/mixkit/MxDynBlock.h | 2 +- |
41 |
+ src/mixkit/MxStack.h | 2 +- |
42 |
+ 2 files changed, 2 insertions(+), 2 deletions(-) |
43 |
+ |
44 |
+diff --git a/src/mixkit/MxDynBlock.h b/src/mixkit/MxDynBlock.h |
45 |
+index 51cc89b..4e313d2 100644 |
46 |
+--- a/src/mixkit/MxDynBlock.h |
47 |
++++ b/src/mixkit/MxDynBlock.h |
48 |
+@@ -41,7 +41,7 @@ public: |
49 |
+ |
50 |
+ T& add() |
51 |
+ { |
52 |
+- if( length()==total_space() ) resize(total_space() * 2); |
53 |
++ if( length()==total_space() ) this->resize(total_space() * 2); |
54 |
+ fill++; |
55 |
+ return last(); |
56 |
+ } |
57 |
+diff --git a/src/mixkit/MxStack.h b/src/mixkit/MxStack.h |
58 |
+index 9ed9a05..1275ddd 100644 |
59 |
+--- a/src/mixkit/MxStack.h |
60 |
++++ b/src/mixkit/MxStack.h |
61 |
+@@ -33,7 +33,7 @@ public: |
62 |
+ |
63 |
+ T& pop() { return this->drop(); } |
64 |
+ |
65 |
+- void push(const T& val) { add(val); } |
66 |
++ void push(const T& val) { this->add(val); } |
67 |
+ // |
68 |
+ // NOTE: In this code, it is *crucial* that we do the add() and |
69 |
+ // assignment in separate steps. The obvious alternative |
70 |
|
71 |
diff --git a/sci-chemistry/mgltools-qslimlib/mgltools-qslimlib-1.5.6_rc2.ebuild b/sci-chemistry/mgltools-qslimlib/mgltools-qslimlib-1.5.6_rc2.ebuild |
72 |
index 37ecc7e..c454708 100644 |
73 |
--- a/sci-chemistry/mgltools-qslimlib/mgltools-qslimlib-1.5.6_rc2.ebuild |
74 |
+++ b/sci-chemistry/mgltools-qslimlib/mgltools-qslimlib-1.5.6_rc2.ebuild |
75 |
@@ -45,6 +45,8 @@ src_prepare() { |
76 |
-e 's:^.*LICENSE:#&1:g' \ |
77 |
-i "${S}"/MANIFEST.in || die |
78 |
|
79 |
- epatch "${FILESDIR}"/1.5.4-gcc4.3.patch |
80 |
+ epatch \ |
81 |
+ "${FILESDIR}"/1.5.4-gcc4.3.patch \ |
82 |
+ "${FILESDIR}"/1.5.4-gcc4.7.patch |
83 |
distutils_src_prepare |
84 |
} |