| 1 |
commit: d8acffbbf1110c82aa11ddd40293d5d76c24037d |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Mar 3 13:59:59 2011 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Mar 3 13:59:59 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=d8acffbb |
| 7 |
|
| 8 |
Coot live fixes |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha26/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 | 5 +++-- |
| 15 |
sci-chemistry/coot/files/9999-lidia.patch | 13 +++++++------ |
| 16 |
3 files changed, 14 insertions(+), 8 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog |
| 19 |
index 954daf8..d02adf0 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 |
+ 03 Mar 2011; Justin Lecher <jlec@g.o> files/9999-lidia.patch, |
| 27 |
+ coot-9999.ebuild: |
| 28 |
+ Coot live fixes |
| 29 |
+ |
| 30 |
20 Jan 2011; Justin Lecher <jlec@g.o> coot-9999.ebuild: |
| 31 |
Fix tests |
| 32 |
|
| 33 |
|
| 34 |
diff --git a/sci-chemistry/coot/coot-9999.ebuild b/sci-chemistry/coot/coot-9999.ebuild |
| 35 |
index f957107..d12f36d 100644 |
| 36 |
--- a/sci-chemistry/coot/coot-9999.ebuild |
| 37 |
+++ b/sci-chemistry/coot/coot-9999.ebuild |
| 38 |
@@ -37,10 +37,10 @@ SCIDEPS=" |
| 39 |
|
| 40 |
XDEPS=" |
| 41 |
gnome-base/libgnomecanvas |
| 42 |
- gnome-base/librsvg |
| 43 |
+ gnome-base/librsvg:2 |
| 44 |
media-libs/libpng |
| 45 |
media-libs/freeglut |
| 46 |
- >=x11-libs/gtk+-2.2 |
| 47 |
+ x11-libs/gtk+:2 |
| 48 |
x11-libs/goocanvas |
| 49 |
x11-libs/gtkglext" |
| 50 |
|
| 51 |
@@ -71,6 +71,7 @@ pkg_setup() { |
| 52 |
} |
| 53 |
|
| 54 |
PATCHES=( |
| 55 |
+ "${FILESDIR}"/${PV}-lidia.patch |
| 56 |
"${FILESDIR}"/${PV}-goocanvas.patch |
| 57 |
"${FILESDIR}"/${PV}-clipper.patch |
| 58 |
"${FILESDIR}"/${PV}-include.patch |
| 59 |
|
| 60 |
diff --git a/sci-chemistry/coot/files/9999-lidia.patch b/sci-chemistry/coot/files/9999-lidia.patch |
| 61 |
index 2ac3fcc..5b5039c 100644 |
| 62 |
--- a/sci-chemistry/coot/files/9999-lidia.patch |
| 63 |
+++ b/sci-chemistry/coot/files/9999-lidia.patch |
| 64 |
@@ -1,16 +1,17 @@ |
| 65 |
Index: lbg/Makefile.am |
| 66 |
=================================================================== |
| 67 |
---- lbg/Makefile.am (revision 3299) |
| 68 |
+--- lbg/Makefile.am (revision 3406) |
| 69 |
+++ lbg/Makefile.am (working copy) |
| 70 |
-@@ -24,6 +24,11 @@ |
| 71 |
- lbg-search.cc some-coot-utils.cc residue-circles.cc rdkit-interface.cc \ |
| 72 |
+@@ -25,6 +25,12 @@ |
| 73 |
+ lbg-search.cc residue-circles.cc rdkit-interface.cc \ |
| 74 |
flev-annotations.cc |
| 75 |
|
| 76 |
+libcoot_lidia_la_LIBADD = \ |
| 77 |
+ $(top_builddir)/coot-utils/libcoot-coord-utils.la \ |
| 78 |
+ $(top_builddir)/lidia-core/libcoot-lidia-core.la \ |
| 79 |
-+ $(GSL_LIBS) $(GTK_LIBS) $(GOOCANVAS_LIBS) |
| 80 |
++ $(top_builddir)/geometry/libcoot-geometry.la \ |
| 81 |
++ $(GTK_LIBS) $(GSL_LIBS) $(GOOCANVAS_LIBS) |
| 82 |
+ |
| 83 |
- lidia_SOURCES = lidia-main.cc |
| 84 |
+ lidia_SOURCES = lidia-main.cc lbg-callbacks-outer.cc |
| 85 |
|
| 86 |
- # some-coot-utils.hh needed? |
| 87 |
+ include_HEADERS = lbg.hh wmolecule.hh rdkit-interface.hh flev-annotations.hh |
Archives