| 1 |
commit: f0c8b800774b3d554c462bd55f2901734108277a |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 28 08:39:59 2011 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 28 08:39:59 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=f0c8b800 |
| 7 |
|
| 8 |
Fixed underlinking problems |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha30/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-gl.patch | 10 ++++++++++ |
| 16 |
sci-chemistry/coot/files/9999-lidia.patch | 19 +++++++++++++++---- |
| 17 |
4 files changed, 30 insertions(+), 4 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog |
| 20 |
index c44d9a6..accf687 100644 |
| 21 |
--- a/sci-chemistry/coot/ChangeLog |
| 22 |
+++ b/sci-chemistry/coot/ChangeLog |
| 23 |
@@ -2,6 +2,10 @@ |
| 24 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 25 |
# $Header: $ |
| 26 |
|
| 27 |
+ 28 Apr 2011; Justin Lecher <jlec@g.o> +files/9999-gl.patch, |
| 28 |
+ files/9999-lidia.patch, coot-9999.ebuild: |
| 29 |
+ Fixed underlinking problems |
| 30 |
+ |
| 31 |
28 Apr 2011; Justin Lecher <jlec@g.o> -files/9999-gsl.patch, |
| 32 |
-files/9999-openmp.patch, -files/9999-rappermc.patch, |
| 33 |
-files/fix-namespace-error.patch, -files/glib.m4, -files/gtk.m4: |
| 34 |
|
| 35 |
diff --git a/sci-chemistry/coot/coot-9999.ebuild b/sci-chemistry/coot/coot-9999.ebuild |
| 36 |
index f9481c4..e8f1076 100644 |
| 37 |
--- a/sci-chemistry/coot/coot-9999.ebuild |
| 38 |
+++ b/sci-chemistry/coot/coot-9999.ebuild |
| 39 |
@@ -75,6 +75,7 @@ PATCHES=( |
| 40 |
"${FILESDIR}"/${PV}-goocanvas.patch |
| 41 |
"${FILESDIR}"/${PV}-clipper.patch |
| 42 |
"${FILESDIR}"/${PV}-include.patch |
| 43 |
+ "${FILESDIR}"/${PV}-gl.patch |
| 44 |
) |
| 45 |
|
| 46 |
src_unpack() { |
| 47 |
|
| 48 |
diff --git a/sci-chemistry/coot/files/9999-gl.patch b/sci-chemistry/coot/files/9999-gl.patch |
| 49 |
new file mode 100644 |
| 50 |
index 0000000..bbd858c |
| 51 |
--- /dev/null |
| 52 |
+++ b/sci-chemistry/coot/files/9999-gl.patch |
| 53 |
@@ -0,0 +1,10 @@ |
| 54 |
+Index: coot-surface/Makefile.am |
| 55 |
+=================================================================== |
| 56 |
+--- coot-surface/Makefile.am (revision 3478) |
| 57 |
++++ coot-surface/Makefile.am (working copy) |
| 58 |
+@@ -29,4 +29,4 @@ |
| 59 |
+ |
| 60 |
+ libcoot_surface_la_LIBADD = \ |
| 61 |
+ $(top_builddir)/surface/libccp4mg-surface.la \ |
| 62 |
+- $(GLUT_LIBS) $(CLIPPER_LIBS) $(MMDB_LIBS) |
| 63 |
++ $(GLUT_LIBS) $(CLIPPER_LIBS) $(MMDB_LIBS) -lGL |
| 64 |
|
| 65 |
diff --git a/sci-chemistry/coot/files/9999-lidia.patch b/sci-chemistry/coot/files/9999-lidia.patch |
| 66 |
index 5b5039c..0ca154c 100644 |
| 67 |
--- a/sci-chemistry/coot/files/9999-lidia.patch |
| 68 |
+++ b/sci-chemistry/coot/files/9999-lidia.patch |
| 69 |
@@ -1,10 +1,10 @@ |
| 70 |
Index: lbg/Makefile.am |
| 71 |
=================================================================== |
| 72 |
---- lbg/Makefile.am (revision 3406) |
| 73 |
+--- lbg/Makefile.am (revision 3478) |
| 74 |
+++ lbg/Makefile.am (working copy) |
| 75 |
-@@ -25,6 +25,12 @@ |
| 76 |
- lbg-search.cc residue-circles.cc rdkit-interface.cc \ |
| 77 |
- flev-annotations.cc |
| 78 |
+@@ -32,6 +32,12 @@ |
| 79 |
+ $(top_builddir)/utils/libcoot-utils.la \ |
| 80 |
+ $(CLIPPER_LIBS) $(MMDB_LIBS) $(GSL_LIBS) $(RDKIT_LIBS) $(GOOCANVAS_LIBS) $(GTK_LIBS) |
| 81 |
|
| 82 |
+libcoot_lidia_la_LIBADD = \ |
| 83 |
+ $(top_builddir)/coot-utils/libcoot-coord-utils.la \ |
| 84 |
@@ -15,3 +15,14 @@ Index: lbg/Makefile.am |
| 85 |
lidia_SOURCES = lidia-main.cc lbg-callbacks-outer.cc |
| 86 |
|
| 87 |
include_HEADERS = lbg.hh wmolecule.hh rdkit-interface.hh flev-annotations.hh |
| 88 |
+Index: lidia-core/Makefile.am |
| 89 |
+=================================================================== |
| 90 |
+--- lidia-core/Makefile.am (revision 3478) |
| 91 |
++++ lidia-core/Makefile.am (working copy) |
| 92 |
+@@ -29,3 +29,6 @@ |
| 93 |
+ |
| 94 |
+ libcoot_lidia_core_la_SOURCES = lbg-molfile.cc lig-build.cc |
| 95 |
+ |
| 96 |
++libcoot_lidia_core_la_LIBADD = \ |
| 97 |
++ $(top_builddir)/geometry/libcoot-geometry.la \ |
| 98 |
++ $(MMDB_LIBS) |
Archives