[Pkg-electronics-commits] [gwave] 02/05: guile2.0.diff patch: Completed GH to scm transition

[أحمد المحمودي (Ahmed El-Mahmoudy)]

This is an automated email from the git hooks/post-receive script.

aelmahmoudy-guest pushed a commit to branch master
in repository gwave.

commit 1d93a47c6e820266e1725271f159642cdb5eff74
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
Date:   Thu Mar 5 12:57:20 2015 +0200

    guile2.0.diff patch: Completed GH to scm transition
    
    Also, added missing variable declaration
    
    Thanks: Daniel T Chen <crimsun at ubuntu.com>
---
 debian/patches/guile2.0.diff | 86 +++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 78 insertions(+), 8 deletions(-)

diff --git a/debian/patches/guile2.0.diff b/debian/patches/guile2.0.diff
index e4a6428..5ca1bbe 100644
--- a/debian/patches/guile2.0.diff
+++ b/debian/patches/guile2.0.diff
@@ -4,10 +4,8 @@ Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourcef
 Bug: https://sourceforge.net/p/gwave/patches/3/
 Bug-Debian: http://bugs.debian.org/746003
 
-Index: gwave-20090213/src/scwm_guile.h
-===================================================================
---- gwave-20090213.orig/src/scwm_guile.h
-+++ gwave-20090213/src/scwm_guile.h
+--- a/src/scwm_guile.h
++++ b/src/scwm_guile.h
 @@ -12,7 +12,7 @@
  #define SCWM_GUILE_H__
  
@@ -17,10 +15,8 @@ Index: gwave-20090213/src/scwm_guile.h
  #include "validate.h"
  #include <xsnarf.h>
  
-Index: gwave-20090213/src/scwm_guile.c
-===================================================================
---- gwave-20090213.orig/src/scwm_guile.c
-+++ gwave-20090213/src/scwm_guile.c
+--- a/src/scwm_guile.c
++++ b/src/scwm_guile.c
 @@ -31,7 +31,6 @@
  #include <limits.h>
  #include <assert.h>
@@ -29,3 +25,77 @@ Index: gwave-20090213/src/scwm_guile.c
  #include <libguile.h>
  #include <libguile/fluids.h>
  
+@@ -313,6 +312,7 @@
+ }
+ 
+ 
++SCM scm_the_last_stack_fluid_var;
+ SCM 
+ scwm_handle_error (void *ARG_IGNORE(data), SCM tag, SCM throw_args)
+ {
+@@ -398,7 +398,7 @@
+ 
+ void init_scwm_guile()
+ {
+-  run_hook_proc = gh_lookup("run-hook");
++  run_hook_proc = scm_variable_ref (scm_c_lookup("run-hook"));
+ 
+ #ifndef SCM_MAGIC_SNARF_INITS
+ #include "scwm_guile.x"
+--- a/src/guile-compat.c
++++ b/src/guile-compat.c
+@@ -24,7 +24,7 @@
+ #include <config.h>
+ #endif
+ #include <string.h>
+-#include <guile/gh.h>
++#include <libguile.h>
+ 
+ #include "guile-compat.h"
+ 
+@@ -66,7 +66,7 @@
+ 			*lenp = 0;
+ 		return NULL;
+ 	}
+-	len = scm_i_string_length (str);
++	len = scm_c_string_length (str);
+ 	res = scm_malloc (len + 1);
+ 	memcpy (res, scm_i_string_chars (str), len);
+ 	res[len] = '\0';   //unconditionaly null terminate
+--- a/src/rgeval.c
++++ b/src/rgeval.c
+@@ -8,7 +8,7 @@
+  */
+ #include <stdio.h>
+ #include <string.h>
+-#include <guile/gh.h>
++#include <libguile.h>
+ 
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+--- a/src/validate.h
++++ b/src/validate.h
+@@ -192,20 +192,20 @@
+ 
+ #define VALIDATE_ARG_STR_NEWCOPY(pos,scm,pch) \
+   do { \
+- if (SCM_NFALSEP (scm_string_p(scm))) pch = gh_scm2newstr(scm,NULL); \
++ if (SCM_NFALSEP (scm_string_p(scm))) pch = scm_to_locale_stringn(scm,NULL); \
+   else { pch = NULL; scm_wrong_type_arg(FUNC_NAME,pos,scm); } \
+   } while (0)
+ 
+ #define VALIDATE_ARG_STR_NEWCOPY_LEN(pos,scm,pch,len) \
+   do { \
+- if (SCM_NFALSEP (scm_string_p(scm))) pch = gh_scm2newstr(scm,&len); \
++ if (SCM_NFALSEP (scm_string_p(scm))) pch = scm_to_locale_stringn(scm,&len); \
+   else { pch = NULL; scm_wrong_type_arg(FUNC_NAME,pos,scm); } \
+   } while (0)
+ 
+ #define VALIDATE_ARG_STR_NEWCOPY_USE_NULL(pos,scm,pch) \
+   do { \
+   if (UNSET_SCM(scm)) pch = NULL; \
+-  else if (SCM_NFALSEP (scm_string_p(scm))) pch = gh_scm2newstr(scm,NULL); \
++  else if (SCM_NFALSEP (scm_string_p(scm))) pch = scm_to_locale_stringn(scm,NULL); \
+   else { pch = NULL; scm_wrong_type_arg(FUNC_NAME,pos,scm); } \
+   } while (0)
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-electronics/gwave.git