| 1 |
commit: 065a95be5ffc0c5b37c5f7b6b8aa89271247ab12 |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jun 2 08:39:46 2011 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jun 2 08:39:46 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=065a95be |
| 7 |
|
| 8 |
Fixes for latest HEAD |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha37/git/Linux x86_64, signed Manifest commit with key 70EB7916) |
| 11 |
|
| 12 |
--- |
| 13 |
sci-chemistry/coot/ChangeLog | 4 ++++ |
| 14 |
sci-chemistry/coot/coot-9999.ebuild | 1 + |
| 15 |
sci-chemistry/coot/files/9999-align.patch | 29 +++++++++++++++++++++++++++++ |
| 16 |
3 files changed, 34 insertions(+), 0 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog |
| 19 |
index 61ad2d8..30aec2f 100644 |
| 20 |
--- a/sci-chemistry/coot/ChangeLog |
| 21 |
+++ b/sci-chemistry/coot/ChangeLog |
| 22 |
@@ -2,6 +2,10 @@ |
| 23 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 24 |
# $Header: $ |
| 25 |
|
| 26 |
+ 02 Jun 2011; Justin Lecher <jlec@g.o> +files/9999-align.patch, |
| 27 |
+ coot-9999.ebuild: |
| 28 |
+ Fixes for latest HEAD |
| 29 |
+ |
| 30 |
28 May 2011; Justin Lecher <jlec@g.o> -files/9999-clipper.patch, |
| 31 |
files/9999-lidia.patch, coot-9999.ebuild: |
| 32 |
Cleaned for current HEAD |
| 33 |
|
| 34 |
diff --git a/sci-chemistry/coot/coot-9999.ebuild b/sci-chemistry/coot/coot-9999.ebuild |
| 35 |
index bfeee1e..c6c8953 100644 |
| 36 |
--- a/sci-chemistry/coot/coot-9999.ebuild |
| 37 |
+++ b/sci-chemistry/coot/coot-9999.ebuild |
| 38 |
@@ -75,6 +75,7 @@ PATCHES=( |
| 39 |
"${FILESDIR}"/${PV}-goocanvas.patch |
| 40 |
"${FILESDIR}"/${PV}-include.patch |
| 41 |
"${FILESDIR}"/${PV}-gl.patch |
| 42 |
+ "${FILESDIR}"/${PV}-align.patch |
| 43 |
) |
| 44 |
|
| 45 |
src_unpack() { |
| 46 |
|
| 47 |
diff --git a/sci-chemistry/coot/files/9999-align.patch b/sci-chemistry/coot/files/9999-align.patch |
| 48 |
new file mode 100644 |
| 49 |
index 0000000..17e5787 |
| 50 |
--- /dev/null |
| 51 |
+++ b/sci-chemistry/coot/files/9999-align.patch |
| 52 |
@@ -0,0 +1,29 @@ |
| 53 |
+Index: src/c-interface-mutate.cc |
| 54 |
+=================================================================== |
| 55 |
+--- src/c-interface-mutate.cc (revision 3528) |
| 56 |
++++ src/c-interface-mutate.cc (working copy) |
| 57 |
+@@ -292,7 +292,9 @@ |
| 58 |
+ PyObject *r = Py_False; |
| 59 |
+ if (is_valid_model_molecule(imol)) { |
| 60 |
+ std::pair<bool, std::string> p = |
| 61 |
+- graphics_info_t::molecules[imol].find_terminal_residue_type(chain_id, resno); |
| 62 |
++ graphics_info_t::molecules[imol].find_terminal_residue_type(chain_id, resno, |
| 63 |
++ graphics_info_t::alignment_wgap, |
| 64 |
++ graphics_info_t::alignment_wspace); |
| 65 |
+ if (p.first) { |
| 66 |
+ r = PyString_FromString(p.second.c_str()); |
| 67 |
+ } |
| 68 |
+Index: src/c-interface-validate.cc |
| 69 |
+=================================================================== |
| 70 |
+--- src/c-interface-validate.cc (revision 3528) |
| 71 |
++++ src/c-interface-validate.cc (working copy) |
| 72 |
+@@ -1653,7 +1653,8 @@ |
| 73 |
+ |
| 74 |
+ if (is_valid_model_molecule(imol)) { |
| 75 |
+ std::pair<bool, std::vector<coot::chain_mutation_info_container_t> > ar = |
| 76 |
+- graphics_info_t::molecules[imol].residue_mismatches(); |
| 77 |
++ graphics_info_t::molecules[imol].residue_mismatches(graphics_info_t::alignment_wgap, |
| 78 |
++ graphics_info_t::alignment_wspace); |
| 79 |
+ if (ar.first) |
| 80 |
+ r = PyList_New(0); |
| 81 |
+ for (unsigned int ir=0; ir<ar.second.size(); ir++) { |
Archives