[Pkg-electronics-commits] [gwave] 01/01: Release 20090213-6.1

[Patricio Paez]

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

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

commit 11e5d7a6c167a184f39169c44f9060829ac9b5cb
Author: Patricio Paez <pp at pp.com.mx>
Date:   Thu Sep 22 07:28:06 2016 -0500

    Release 20090213-6.1
    
    Closes: #779990
---
 debian/changelog               | 13 +++++++++++++
 debian/patches/make_stack.diff | 30 ++++++++++++++++++++++++++++++
 debian/patches/series          |  2 ++
 debian/patches/std_menus.diff  | 24 ++++++++++++++++++++++++
 4 files changed, 69 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 518f3ab..e05dddb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+gwave (20090213-6.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload
+  * Added make_stack.diff patch to remove use of
+    scm_the_last_stack_fluid_var that was deprecated from guile in
+    commit ec16eb7847895247be3438c25d2d27ce2e137b83 dated 19 Jun 2010.
+  * Added std_menus.diff patch to replace gtk-menu-append and
+    gtk-menu-bar-append with gtk-menu-shell-append, preventing
+    the use of the append generic that is missing in guile-gnome.
+  * Closes #779990
+
+ -- Patricio Paez <pp at pp.com.mx>  Mon, 22 Aug 2016 12:30:03 -0500
+
 gwave (20090213-6) unstable; urgency=medium
 
   * Added guile2.0.diff patch to update used header file for Guile 2.0 migration
diff --git a/debian/patches/make_stack.diff b/debian/patches/make_stack.diff
new file mode 100644
index 0000000..3e55e15
--- /dev/null
+++ b/debian/patches/make_stack.diff
@@ -0,0 +1,30 @@
+Index: gwave-20090213/src/scwm_guile.c
+===================================================================
+--- gwave-20090213.orig/src/scwm_guile.c
++++ gwave-20090213/src/scwm_guile.c
+@@ -312,7 +312,6 @@ scwm_body_eval_str (void *body_data)
+ }
+ 
+ 
+-SCM scm_the_last_stack_fluid_var;
+ SCM 
+ scwm_handle_error (void *ARG_IGNORE(data), SCM tag, SCM throw_args)
+ {
+@@ -330,7 +329,7 @@ scwm_handle_error (void *ARG_IGNORE(data
+   if (scm_ilength (throw_args) >= 3)
+     {
+       SCM fl;
+-      fl = SCM_VARIABLE_REF (scm_the_last_stack_fluid_var);
++      fl = scm_make_stack(SCM_BOOL_T, SCM_EOL);
+ 
+       /* GJB:FIXME:MS: This is a horrible hack,
+          but DEREF_LAST_STACK macro was throwing a wrong type 
+@@ -338,7 +337,7 @@ scwm_handle_error (void *ARG_IGNORE(data
+          a crash when I demo to RMS tomorrow, hence this
+          ugly hack --04/27/99 gjb */
+       if (SCM_NIMP (fl) && SCM_FLUIDP (fl)) {
+-        SCM stack = DEREF_LAST_STACK;
++        SCM stack = scm_make_stack(SCM_BOOL_T, SCM_EOL);
+         SCM subr = SCM_CAR (throw_args);
+         SCM message = SCM_CADR (throw_args);
+         SCM args = SCM_CADDR (throw_args);
diff --git a/debian/patches/series b/debian/patches/series
index b5312b0..05cd743 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@
 fix_indirect_linking.diff
 fix_as-needed_linking.diff
 guile2.0.diff
+make_stack.diff
+std_menus.diff
diff --git a/debian/patches/std_menus.diff b/debian/patches/std_menus.diff
new file mode 100644
index 0000000..fc0a6f3
--- /dev/null
+++ b/debian/patches/std_menus.diff
@@ -0,0 +1,24 @@
+Index: gwave-20090213/scheme/std-menus.scm
+===================================================================
+--- gwave-20090213.orig/scheme/std-menus.scm
++++ gwave-20090213/scheme/std-menus.scm
+@@ -32,8 +32,8 @@
+     (if proc
+ 	(gtk-signal-connect item "activate" 
+ 			    (lambda (m) (proc))))
+-    (cond ((gtk-menu? parent) (gtk-menu-append parent item))
+-	  ((gtk-menu-bar? parent) (gtk-menu-bar-append parent item)))
++    (cond ((gtk-menu? parent) (gtk-menu-shell-append parent item))
++	  ((gtk-menu-bar? parent) (gtk-menu-shell-append parent item)))
+     item))
+ 
+ ;
+@@ -66,7 +66,7 @@
+ 	(gtk-signal-connect item "activate" (lambda (x) (proc))))
+     (if active
+ 	(gtk-check-menu-item-set-active item active))
+-    (cond ((gtk-menu? parent) (gtk-menu-append parent item))
++    (cond ((gtk-menu? parent) (gtk-menu-shell-append parent item))
+ 	  ((gtk-menu-bar? parent) (gtk-menu-bar-append parent item)))
+     (gtk-radio-menu-item-get-group item)
+ ))

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