| 1 |
commit: 3bdd9d0c7138075bded9befe7eb76591dfd9b8af |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 14 12:11:08 2012 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 14 12:11:08 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=3bdd9d0c |
| 7 |
|
| 8 |
sci-chemistry/coot: Fix for gcc-4.7 |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha110/git/Linux x86_64, unsigned Manifest commit) |
| 11 |
|
| 12 |
--- |
| 13 |
sci-chemistry/coot/ChangeLog | 4 ++ |
| 14 |
sci-chemistry/coot/coot-9999.ebuild | 1 + |
| 15 |
sci-chemistry/coot/files/coot-9999-gcc47.patch | 47 ++++++++++++++++++++++++ |
| 16 |
3 files changed, 52 insertions(+), 0 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog |
| 19 |
index 0b2d8a9..6facbcb 100644 |
| 20 |
--- a/sci-chemistry/coot/ChangeLog |
| 21 |
+++ b/sci-chemistry/coot/ChangeLog |
| 22 |
@@ -2,6 +2,10 @@ |
| 23 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 24 |
# $Header: $ |
| 25 |
|
| 26 |
+ 14 Jun 2012; Justin Lecher <jlec@g.o> coot-9999.ebuild, |
| 27 |
+ +files/coot-9999-gcc47.patch: |
| 28 |
+ Fix for gcc-4.7 |
| 29 |
+ |
| 30 |
25 Apr 2012; Justin Lecher <jlec@g.o> -files/9999-libpng-1.5.patch, |
| 31 |
coot-9999.ebuild: |
| 32 |
Drop libpng-1.5 patch, included upstream |
| 33 |
|
| 34 |
diff --git a/sci-chemistry/coot/coot-9999.ebuild b/sci-chemistry/coot/coot-9999.ebuild |
| 35 |
index fc6ca94..87215ab 100644 |
| 36 |
--- a/sci-chemistry/coot/coot-9999.ebuild |
| 37 |
+++ b/sci-chemistry/coot/coot-9999.ebuild |
| 38 |
@@ -85,6 +85,7 @@ PATCHES=( |
| 39 |
"${FILESDIR}"/${PV}-goocanvas.patch |
| 40 |
"${FILESDIR}"/${PV}-mmdb-config.patch |
| 41 |
"${FILESDIR}"/${PV}-ssm.patch |
| 42 |
+ "${FILESDIR}"/${P}-gcc47.patch |
| 43 |
) |
| 44 |
|
| 45 |
src_unpack() { |
| 46 |
|
| 47 |
diff --git a/sci-chemistry/coot/files/coot-9999-gcc47.patch b/sci-chemistry/coot/files/coot-9999-gcc47.patch |
| 48 |
new file mode 100644 |
| 49 |
index 0000000..465923a |
| 50 |
--- /dev/null |
| 51 |
+++ b/sci-chemistry/coot/files/coot-9999-gcc47.patch |
| 52 |
@@ -0,0 +1,47 @@ |
| 53 |
+Index: utils/coot-utils.cc |
| 54 |
+=================================================================== |
| 55 |
+--- utils/coot-utils.cc (revision 4235) |
| 56 |
++++ utils/coot-utils.cc (working copy) |
| 57 |
+@@ -28,6 +28,7 @@ |
| 58 |
+ #include <stdexcept> // for string_to_int. |
| 59 |
+ #include <sstream> // ditto. |
| 60 |
+ #include <cstdio> // 20090806 Justin Lecher says we need this on Gentoo |
| 61 |
++#include <unistd.h> |
| 62 |
+ |
| 63 |
+ #include "coot-sysdep.h" |
| 64 |
+ #if defined _MSC_VER |
| 65 |
+Index: coot-utils/coot-coord-utils.cc |
| 66 |
+=================================================================== |
| 67 |
+--- coot-utils/coot-coord-utils.cc (revision 4235) |
| 68 |
++++ coot-utils/coot-coord-utils.cc (working copy) |
| 69 |
+@@ -196,7 +196,7 @@ |
| 70 |
+ clipper::Coord_frac cf = coot::util::shift_to_origin(mol); |
| 71 |
+ clipper::Coord_orth co = cf.coord_orth(csp.first); |
| 72 |
+ for(int imod = 1; imod<=mol->GetNumberOfModels(); imod++) { |
| 73 |
+- int imod = 1; |
| 74 |
++// int imod = 1; |
| 75 |
+ CModel *model_p = mol->GetModel(imod); |
| 76 |
+ CChain *chain_p; |
| 77 |
+ int nchains = model_p->GetNumberOfChains(); |
| 78 |
+@@ -2779,7 +2779,7 @@ |
| 79 |
+ short int whole_res_flag = 1; |
| 80 |
+ |
| 81 |
+ for(int imod = 1; imod<=mol_in->GetNumberOfModels(); imod++) { |
| 82 |
+- int imod = 1; |
| 83 |
++// int imod = 1; |
| 84 |
+ CModel *model_p = mol_in->GetModel(imod); |
| 85 |
+ CModel *new_model_p = new CModel; |
| 86 |
+ int nchains = model_p->GetNumberOfChains(); |
| 87 |
+Index: src/molecule-class-info-residues.cc |
| 88 |
+=================================================================== |
| 89 |
+--- src/molecule-class-info-residues.cc (revision 4235) |
| 90 |
++++ src/molecule-class-info-residues.cc (working copy) |
| 91 |
+@@ -145,7 +145,7 @@ |
| 92 |
+ |
| 93 |
+ int r = 0; |
| 94 |
+ for(int imod = 1; imod<=atom_sel.mol->GetNumberOfModels(); imod++) { |
| 95 |
+- int imod = 1; |
| 96 |
++// int imod = 1; |
| 97 |
+ CModel *model_p = atom_sel.mol->GetModel(imod); |
| 98 |
+ CChain *chain_p; |
| 99 |
+ // run over chains of the existing mol |
Archives