aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2012-03-16 12:20:22 +0100
committerJustin Lecher <jlec@gentoo.org>2012-03-16 12:20:22 +0100
commitcff4c2d27310f3f1b94ff5dfc493adbac6a8eecc (patch)
tree70adc0746db1e70960b69ca2181e6337ead76f05 /sci-chemistry/coot/files
parentMerge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/sci (diff)
downloadsci-cff4c2d27310f3f1b94ff5dfc493adbac6a8eecc.tar.gz
sci-cff4c2d27310f3f1b94ff5dfc493adbac6a8eecc.tar.bz2
sci-cff4c2d27310f3f1b94ff5dfc493adbac6a8eecc.zip
Drop gl and test patch -> included upstream
(Portage version: 2.2.0_alpha90/git/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'sci-chemistry/coot/files')
-rw-r--r--sci-chemistry/coot/files/9999-gl.patch10
-rw-r--r--sci-chemistry/coot/files/9999-test.patch16
2 files changed, 0 insertions, 26 deletions
diff --git a/sci-chemistry/coot/files/9999-gl.patch b/sci-chemistry/coot/files/9999-gl.patch
deleted file mode 100644
index bbd858c64..000000000
--- a/sci-chemistry/coot/files/9999-gl.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Index: coot-surface/Makefile.am
-===================================================================
---- coot-surface/Makefile.am (revision 3478)
-+++ coot-surface/Makefile.am (working copy)
-@@ -29,4 +29,4 @@
-
- libcoot_surface_la_LIBADD = \
- $(top_builddir)/surface/libccp4mg-surface.la \
-- $(GLUT_LIBS) $(CLIPPER_LIBS) $(MMDB_LIBS)
-+ $(GLUT_LIBS) $(CLIPPER_LIBS) $(MMDB_LIBS) -lGL
diff --git a/sci-chemistry/coot/files/9999-test.patch b/sci-chemistry/coot/files/9999-test.patch
deleted file mode 100644
index 8cb79e65d..000000000
--- a/sci-chemistry/coot/files/9999-test.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- src/testing.cc | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/src/testing.cc b/src/testing.cc
-index f767bf6..097b9b9 100644
---- a/src/testing.cc
-+++ b/src/testing.cc
-@@ -86,6 +86,8 @@ std::string greg_test(const std::string &file_name) {
- const char *c = getenv("COOT_TEST_DATA_DIR");
- if (c) {
- dd = c;
-+ dd += "/";
-+ dd += file_name;
- } else {
- const char *d = getenv("HOME");
- if (d) {