diff options
| author |   Justin Lecher (jlec) <jlec@j-schmitz.net> | 2009-06-04 13:58:18 +0200 |
|---|---|---|
| committer | Justin Lecher (jlec) <jlec@j-schmitz.net> | 2009-06-04 13:58:18 +0200 |
| commit | 9bd69167193138225bb0f3967a6aeef568f07e87 (patch) | |
| tree | 0a74eda50c6301c96ae66a1c6d811684c00def04 /sci-chemistry/coot/files | |
| parent | ccp4-libs version cleanup (diff) | |
| download | sci-9bd69167193138225bb0f3967a6aeef568f07e87.tar.gz sci-9bd69167193138225bb0f3967a6aeef568f07e87.tar.bz2 sci-9bd69167193138225bb0f3967a6aeef568f07e87.zip | |
updated version of coot -- upstream includes our patches
Diffstat (limited to 'sci-chemistry/coot/files')
| -rw-r--r-- | sci-chemistry/coot/files/0.6_pre1-gcc-4.3.patch | 10 | ||||
| -rw-r--r-- | sci-chemistry/coot/files/0.6_pre1-gtk.patch | 29 |
2 files changed, 0 insertions, 39 deletions
diff --git a/sci-chemistry/coot/files/0.6_pre1-gcc-4.3.patch b/sci-chemistry/coot/files/0.6_pre1-gcc-4.3.patch deleted file mode 100644 index 26377ed9d..000000000 --- a/sci-chemistry/coot/files/0.6_pre1-gcc-4.3.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- coot-0.5-pre-1.orig/ligand/rotamer.cc 2008-07-01 18:14:54.000000000 -0700 -+++ coot-0.5-pre-1/ligand/rotamer.cc 2008-07-01 18:15:10.000000000 -0700 -@@ -21,6 +21,7 @@ - * 02110-1301, USA - */ - -+#include <cstring> - #include <fstream> - #include <stdexcept> - diff --git a/sci-chemistry/coot/files/0.6_pre1-gtk.patch b/sci-chemistry/coot/files/0.6_pre1-gtk.patch deleted file mode 100644 index 57a5eb346..000000000 --- a/sci-chemistry/coot/files/0.6_pre1-gtk.patch +++ /dev/null @@ -1,29 +0,0 @@ -#--- src/c-interface-gui.cc 2009-05-26 01:30:03.000000000 +0200 -#+++ src/c-interface-gui.cc.new 2009-06-03 11:14:25.000000000 +0200 -#@@ -74,6 +74,7 @@ -# #include "cmtz-interface.hh" -# #include "mmdb.h" // for centre of molecule -# #include "clipper/core/clipper_instance.h" -#+#include <gtk/gtk.h> -# -# #if (GTK_MAJOR_VERSION > 2 || (GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION > 5)) -# #define HAVE_GTK_COMBO_BOX_GET_ACTIVE_TEXT ---- src/c-interface-gui.cc 2009-06-03 11:55:35.000000000 +0200 -+++ src/c-interface-gui.cc.new 2009-06-03 13:12:19.000000000 +0200 -@@ -5355,11 +5355,12 @@ - #if (GTK_MAJOR_VERSION > 1) - #if (GTK_MAJOR_VERSION > 2) || (GTK_MINOR_VERSION > 14) - for (int i=0; i<5; i++) -- gtk_scale_add_mark(GTK_RANGE(h_scale), -+ gtk_scale_add_mark(GTK_SCALE(h_scale), - float (i-2) * 0.5 * sharpening_limit, -- GTK_POS_BOTTOM); -- gtk_scale_add_mark(GTK_RANGE(h_scale), -sharpening_limit, GTK_POS_BOTTOM, "Blur"); -- gtk_scale_add_mark(GTK_RANGE(h_scale), sharpening_limit, GTK_POS_BOTTOM, "Sharp"); -+ GTK_POS_BOTTOM, -+ ""); -+ gtk_scale_add_mark(GTK_SCALE(h_scale), -sharpening_limit, GTK_POS_BOTTOM, "Blur"); -+ gtk_scale_add_mark(GTK_SCALE(h_scale), sharpening_limit, GTK_POS_BOTTOM, "Sharp"); - #endif - #endif - |