Attachment 575134 Details for Bug 704518 – Possible compilation fix

[patch] Possible compilation fix

pos.patch (text/plain), 8.56 KB, created by Jan Synacek on 2012-04-04 14:07:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Synacek

Created: 2012-04-04 14:07:07 UTC

Size: 8.56 KB

patch

obsolete

>diff -up coot-0.6.2-old/src/c-inner-main.c coot-0.6.2-new/src/c-inner-main.c
>--- coot-0.6.2-old/src/c-inner-main.c	2011-07-15 10:12:33.000000000 +0200
>+++ coot-0.6.2-new/src/c-inner-main.c	2012-04-02 12:43:49.201028973 +0200
>@@ -24,7 +24,8 @@
> #endif 
> 
> #ifdef USE_GUILE
>-#include <guile/gh.h>
>+#include <libguile.h>
>+#include <guile-fixups.h>
> #endif
> 
> /* On some strange systems still no definition of NULL is found.  Sigh!  */
>diff -up coot-0.6.2-old/src/c-interface.cc coot-0.6.2-new/src/c-interface.cc
>--- coot-0.6.2-old/src/c-interface.cc	2011-07-15 10:12:32.000000000 +0200
>+++ coot-0.6.2-new/src/c-interface.cc	2012-04-02 12:50:50.880945239 +0200
>@@ -41,7 +41,7 @@
> #endif
> 
> #ifdef USE_GUILE
>-#include <guile/gh.h>
>+#include <libguile.h>
> #include "c-interface-scm.hh"
> #include "guile-fixups.h"
> #endif // USE_GUILE
>diff -up coot-0.6.2-old/src/c-interface-gtk2.cc coot-0.6.2-new/src/c-interface-gtk2.cc
>--- coot-0.6.2-old/src/c-interface-gtk2.cc	2011-07-15 10:12:33.000000000 +0200
>+++ coot-0.6.2-new/src/c-interface-gtk2.cc	2012-04-02 12:57:23.712867235 +0200
>@@ -37,7 +37,8 @@
> 
> #ifdef USE_GUILE
> #include <cstdio>  // for std::FILE
>-#include <guile/gh.h>
>+#include <libguile.h>
>+#include <guile-fixups.h>
> #endif 
> 
> #if !defined(WINDOWS_MINGW) && !defined(_MSC_VER)
>diff -up coot-0.6.2-old/src/c-interface-mmdb.hh coot-0.6.2-new/src/c-interface-mmdb.hh
>--- coot-0.6.2-old/src/c-interface-mmdb.hh	2011-07-15 10:12:32.000000000 +0200
>+++ coot-0.6.2-new/src/c-interface-mmdb.hh	2012-04-02 12:47:18.590987395 +0200
>@@ -27,7 +27,7 @@
> #ifdef __cplusplus
> #ifdef USE_GUILE
> #include <libguile.h>	
>-#include <guile/gh.h> // needed for guile-1.6.x
>+#include <guile-fixups.h> // needed for guile-1.6.x
> 
> // return 0 on failure.  An atom with an atom name of "" and element
> // of "" is converted to a Ter atom.
>diff -up coot-0.6.2-old/src/c-interface-validate.cc coot-0.6.2-new/src/c-interface-validate.cc
>--- coot-0.6.2-old/src/c-interface-validate.cc	2011-07-15 10:12:33.000000000 +0200
>+++ coot-0.6.2-new/src/c-interface-validate.cc	2012-04-02 12:58:50.962849909 +0200
>@@ -53,7 +53,8 @@
> #include "graphics-info.h"
> 
> #ifdef USE_GUILE
>-#include <guile/gh.h>
>+#include <libguile.h>
>+#include <guile-fixups.h>
> 
> #if (SCM_MAJOR_VERSION > 1) || (SCM_MINOR_VERSION > 7)
> // no fix up needed 
>diff -up coot-0.6.2-old/src/c-interface-waters-gui.cc coot-0.6.2-new/src/c-interface-waters-gui.cc
>--- coot-0.6.2-old/src/c-interface-waters-gui.cc	2011-07-15 10:12:33.000000000 +0200
>+++ coot-0.6.2-new/src/c-interface-waters-gui.cc	2012-04-02 13:02:07.622810858 +0200
>@@ -53,7 +53,7 @@
> #include "graphics-info.h"
> 
> #ifdef USE_GUILE
>-#include <guile/gh.h>
>+#include <guile-fixups.h>
> #endif // USE_GUILE
> 
> // Including python needs to come after graphics-info.h, because
>diff -up coot-0.6.2-old/src/guile-fixups.h coot-0.6.2-new/src/guile-fixups.h
>--- coot-0.6.2-old/src/guile-fixups.h	2011-07-15 10:12:32.000000000 +0200
>+++ coot-0.6.2-new/src/guile-fixups.h	2012-04-02 15:01:46.542921867 +0200
>@@ -1,5 +1,28 @@
> #ifdef USE_GUILE
>+#include <libguile/version.h>
>+
>+#if SCM_MAJOR_VERSION < 2
> #include <guile/gh.h>
>+
>+#else
>+#include <libguile.h>
>+
>+extern scm_t_option scm_read_opts[];
>+extern scm_t_option scm_debug_opts[];
>+
>+#define SCM_NUM_PROTECTS 13
>+extern SCM scm_sys_protects[SCM_NUM_PROTECTS];
>+
>+/* data conversion scheme->C */
>+int gh_scm2bool (SCM obj);
>+
>+#define SCM_DEVAL_P  scm_debug_opts[11].val
>+#define SCM_BACKTRACE_P scm_debug_opts[10].val
>+#define SCM_RECORD_POSITIONS_P scm_read_opts[1].val
>+#define scm_listofnull scm_sys_protects[1]
>+
>+#endif // SCM_MAJOR_VERSION < 2
>+
> #if (SCM_MAJOR_VERSION > 1) || (SCM_MINOR_VERSION > 7)
> // no fix up needed 
> #else    
>diff -up coot-0.6.2-old/src/main.cc coot-0.6.2-new/src/main.cc
>--- coot-0.6.2-old/src/main.cc	2011-07-15 10:12:33.000000000 +0200
>+++ coot-0.6.2-new/src/main.cc	2012-04-02 12:24:33.281258507 +0200
>@@ -116,7 +116,7 @@
> #include <glob.h>
> 
> #ifdef USE_GUILE
>-#include <guile/gh.h>
>+#include <libguile.h>
> #endif 
> 
> #if defined (USE_PYTHON)
>diff -up coot-0.6.2-old/src/Makefile.am coot-0.6.2-new/src/Makefile.am
>--- coot-0.6.2-old/src/Makefile.am	2011-07-15 10:12:33.000000000 +0200
>+++ coot-0.6.2-new/src/Makefile.am	2012-04-02 14:46:48.655117375 +0200
>@@ -325,6 +325,7 @@ coot_real_SOURCES = \
> 	gtk-widget-conversion-utils.cc \
> 	gtk2-interface.c	 \
> 	gtk-manual.hh		 \
>+	guile-fixups.cc		 \
> 	guile-fixups.h		 \
> 	history_list.hh		 \
> 	interface.c	 	 \
>diff -up coot-0.6.2-old/src/post-process-coot-wrap-guile.sh coot-0.6.2-new/src/post-process-coot-wrap-guile.sh
>--- coot-0.6.2-old/src/post-process-coot-wrap-guile.sh	2011-07-15 10:12:32.000000000 +0200
>+++ coot-0.6.2-new/src/post-process-coot-wrap-guile.sh	2012-04-02 14:09:42.662602053 +0200
>@@ -81,6 +81,24 @@ else
>                $pre > $pre.tmp
>       add_ifdefs $pre.tmp $post
>       ;; 
>+
>+      *2.0*)
>+      # SCM_MUST_MALLOC to be replaced by scm_gc_malloc is more complicated.  scm_gc_malloc takes 2 args and 
>+      # SCM_MUST_MALLOC takes one.  Leave it to be fixed in SWIG.
>+      echo sed -e 's/SCM_STRING_CHARS/scm_to_locale_string/'  \
>+               -e 's/SCM_STRINGP/scm_is_string/'              \
>+               -e 's/SCM_STRING_LENGTH/scm_c_string_length/'  \
>+               -e 's/static char .gswig_const_COOT_SCHEME_DIR/static const char *gswig_const_COOT_SCHEME_DIR/' \
>+               -e '/.libguile.h./{x;s/.*/#include <cstdio>/;G;}' \
>+               $pre ..to.. $pre.tmp
>+           sed -e 's/SCM_STRING_CHARS/scm_to_locale_string/'      \
>+               -e 's/SCM_STRINGP/scm_is_string/'                  \
>+               -e 's/SCM_STRING_LENGTH/scm_c_string_length/'      \
>+               -e 's/static char .gswig_const_COOT_SCHEME_DIR/static const char *gswig_const_COOT_SCHEME_DIR/' \
>+               -e '/.libguile.h./{x;s/.*/#include <cstdio>/;G;}' \
>+               $pre > $pre.tmp
>+      add_ifdefs $pre.tmp $post
>+      ;; 
>    esac
> 
> fi
>diff -up coot-0.6.2-old/src/user-mods.hh coot-0.6.2-new/src/user-mods.hh
>--- coot-0.6.2-old/src/user-mods.hh	2011-07-15 10:12:33.000000000 +0200
>+++ coot-0.6.2-new/src/user-mods.hh	2012-04-02 12:59:19.251844292 +0200
>@@ -4,7 +4,7 @@
> #include <vector>
> 
> #ifdef USE_GUILE
>-#include <guile/gh.h>
>+#include <guile-fixups.h>
> #if (SCM_MAJOR_VERSION > 1) || (SCM_MINOR_VERSION > 7)
> // no fix up needed 
> #else    
>--- coot-0.6.2-old/src/guile-fixups.cc	1970-01-01 01:00:00.000000000 +0100
>+++ coot-0.6.2-new/src/guile-fixups.cc	2012-04-04 15:27:00.266693091 +0200
>@@ -0,0 +1,51 @@
>+#include <guile-fixups.h>
>+
>+scm_t_option scm_read_opts[] = {
>+  { SCM_OPTION_BOOLEAN, "copy", 0,
>+    "Copy source code expressions." },
>+  { SCM_OPTION_BOOLEAN, "positions", 0,
>+    "Record positions of source code expressions." },
>+  { SCM_OPTION_BOOLEAN, "case-insensitive", 0,
>+    "Convert symbols to lower case."},
>+  { SCM_OPTION_SCM, "keywords", SCM_UNPACK (SCM_BOOL_F),
>+    "Style of keyword recognition: #f, 'prefix or 'postfix."}
>+#if SCM_ENABLE_ELISP
>+  ,
>+  { SCM_OPTION_BOOLEAN, "elisp-vectors", 0,
>+    "Support Elisp vector syntax, namely `[...]'."},
>+  { SCM_OPTION_BOOLEAN, "elisp-strings", 0,
>+    "Support `\$' and `\$' in strings."}
>+#endif
>+};
>+
>+scm_t_option scm_debug_opts[] = {
>+  { SCM_OPTION_BOOLEAN, "cheap", 1,
>+    "*This option is now obsolete.  Setting it has no effect." },
>+  { SCM_OPTION_BOOLEAN, "breakpoints", 0, "*Check for breakpoints." },
>+  { SCM_OPTION_BOOLEAN, "trace", 0, "*Trace mode." },
>+  { SCM_OPTION_BOOLEAN, "procnames", 1,
>+    "Record procedure names at definition." },
>+  { SCM_OPTION_BOOLEAN, "backwards", 0,
>+    "Display backtrace in anti-chronological order." },
>+  { SCM_OPTION_INTEGER, "width", 79, "Maximal width of backtrace." },
>+  { SCM_OPTION_INTEGER, "indent", 10, "Maximal indentation in backtrace." },
>+  { SCM_OPTION_INTEGER, "frames", 3,
>+    "Maximum number of tail-recursive frames in backtrace." },
>+  { SCM_OPTION_INTEGER, "maxdepth", 1000,
>+    "Maximal number of stored backtrace frames." },
>+  { SCM_OPTION_INTEGER, "depth", 20, "Maximal length of printed backtrace." },
>+  { SCM_OPTION_BOOLEAN, "backtrace", 0, "Show backtrace on error." },
>+  { SCM_OPTION_BOOLEAN, "debug", 0, "Use the debugging evaluator." },
>+  { SCM_OPTION_INTEGER, "stack", 20000, "Stack size limit (measured in words; 0 = no check)." },
>+  { SCM_OPTION_SCM, "show-file-name", (unsigned long)SCM_BOOL_T, "Show file names and line numbers in backtraces when not `#f'.  A value of `base' displays only base names, while `#t' displays full names."},
>+  { SCM_OPTION_BOOLEAN, "warn-deprecated", 0, "Warn when deprecated features are used." }
>+};
>+
>+SCM scm_sys_protects[SCM_NUM_PROTECTS] = { 0, };
>+
>+/* data conversion scheme->C */
>+int 
>+gh_scm2bool (SCM obj)
>+{
>+  return (scm_is_false (obj)) ? 0 : 1;
>+}

Actions: View | Diff

Attachments on bug 704518: 575134