Package: gwave
Version: 20090213-5
Followup-For: Bug #765154
Dear Maintainer,
Attached is git commit against current src:gwave master from pkg-electronics
to resolve FTBFS. These changes were test-compiled against Ubuntu Vivid/amd64.
-- System Information:
Debian Release: jessie/sid
APT prefers trusty-updates
APT policy: (500, 'trusty-updates'), (500, 'trusty-security'), (500,
'trusty-proposed'), (500, 'trusty'), (100, 'trusty-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.16.0-31-generic (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
commit 2b2b5ea0bedbd0b0b23158c297efba715c199656
Author: Dan <crimsun@ubuntu-server>
Date: Wed Mar 4 16:48:35 2015 -0500
Resolved FTBFS
diff --git a/debian/changelog b/debian/changelog
index 200ef65..f8f0a0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+gwave (20090213-5ubuntu1) vivid-proposed; urgency=low
+
+ * Rebased on Debian's git
+ * Resolved FTBFS (Closes: #765154):
+ + Completed GH to scm transition
+ + Added missing variable declaration
+ + Added missing library to link
+
+ -- Daniel T Chen <[email protected]> Wed, 04 Mar 2015 12:15:14 -0500
+
gwave (20090213-5) unstable; urgency=medium
* debian/control:
diff --git a/debian/control b/debian/control
index 3defcf0..1eb8d48 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
Source: gwave
Section: electronics
Priority: optional
-Maintainer: Debian Electronics Team <[email protected]>
+Maintainer: Ubuntu Developers <[email protected]>
+Original-Maintainer: Debian Electronics Team <[email protected]>
Uploaders: Hamish Moffatt <[email protected]>, أحمد المحمودي (Ahmed El-Mahmoudy) <[email protected]>
Standards-Version: 3.9.5
Build-Depends: debhelper (>= 9), libgtk2.0-dev, guile-2.0-dev | libguile-dev, libglib2.0-dev, libreadline-dev, guile-gnome2-dev, guile-cairo-dev, libgwrap-runtime-dev
diff --git a/debian/patches/fix_as-needed_linking.diff b/debian/patches/fix_as-needed_linking.diff
index 102b59b..87e470c 100644
--- a/debian/patches/fix_as-needed_linking.diff
+++ b/debian/patches/fix_as-needed_linking.diff
@@ -8,8 +8,10 @@ Bug-Debian: http://bugs.debian.org/641725
Bug-Ubuntu: https://launchpad.net/bugs/770956
Last-Update: 2011-09-15
---- a/spicefile/Makefile.am
-+++ b/spicefile/Makefile.am
+Index: gwave-20090213/spicefile/Makefile.am
+===================================================================
+--- gwave-20090213.orig/spicefile/Makefile.am 2015-03-04 14:53:49.184605415 -0500
++++ gwave-20090213/spicefile/Makefile.am 2015-03-04 14:53:49.180605415 -0500
@@ -10,11 +10,9 @@
noinst_PROGRAMS = test_read
@@ -24,8 +26,10 @@ Last-Update: 2011-09-15
-sp2sp_LDADD= libspicefile.a
+sp2sp_LDADD= libspicefile.a @GTK_LIBS@
---- a/src/Makefile.in
-+++ b/src/Makefile.in
+Index: gwave-20090213/src/Makefile.in
+===================================================================
+--- gwave-20090213.orig/src/Makefile.in 2015-03-04 14:53:49.184605415 -0500
++++ gwave-20090213/src/Makefile.in 2015-03-04 14:59:00.784607430 -0500
@@ -55,7 +55,7 @@
GtkTable_indel.$(OBJEXT)
gwave_OBJECTS = $(am_gwave_OBJECTS)
@@ -35,8 +39,19 @@ Last-Update: 2011-09-15
$(LDFLAGS) -o $@
DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
---- a/spicefile/Makefile.in
-+++ b/spicefile/Makefile.in
+@@ -189,7 +189,7 @@
+ rgeval.c xgserver.c measurebtn.c measurebtn.h \
+ GtkTable_indel.c GtkTable_indel.h xsnarf.h
+
+-gwave_LDADD = ../spicefile/libspicefile.a @GTK_LIBS@ @GUILE_GNOME_LIBS@ -lX11
++gwave_LDADD = ../spicefile/libspicefile.a @GTK_LIBS@ @GUILE_GNOME_LIBS@ -lX11 -lm
+ gwave_LDFLAGS = @GUILE_LDFLAGS@
+ AM_CFLAGS = @GTK_CFLAGS@ @GUILE_CFLAGS@ @GUILE_GNOME_CFLAGS@ \
+ -DDATADIR=\"$(datadir)\" -DBINGWAVE=\"$(bindir)/gwave\"
+Index: gwave-20090213/spicefile/Makefile.in
+===================================================================
+--- gwave-20090213.orig/spicefile/Makefile.in 2015-03-04 14:53:49.184605415 -0500
++++ gwave-20090213/spicefile/Makefile.in 2015-03-04 14:53:49.184605415 -0500
@@ -186,11 +186,9 @@
libspicefile_a_SOURCES = spicestream.c ss_cazm.c ss_hspice.c ss_spice3.c ss_spice2.c ss_nsout.c spicestream.h wavefile.c wavefile.h spice2.h ssintern.h
AM_CFLAGS = @GTK_CFLAGS@
diff --git a/debian/patches/guile2.0.diff b/debian/patches/guile2.0.diff
index e4a6428..38b76b3 100644
--- a/debian/patches/guile2.0.diff
+++ b/debian/patches/guile2.0.diff
@@ -6,8 +6,8 @@ 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
+--- gwave-20090213.orig/src/scwm_guile.h 2015-03-04 14:59:23.528607577 -0500
++++ gwave-20090213/src/scwm_guile.h 2015-03-04 14:59:23.524607577 -0500
@@ -12,7 +12,7 @@
#define SCWM_GUILE_H__
@@ -19,8 +19,8 @@ Index: gwave-20090213/src/scwm_guile.h
Index: gwave-20090213/src/scwm_guile.c
===================================================================
---- gwave-20090213.orig/src/scwm_guile.c
-+++ gwave-20090213/src/scwm_guile.c
+--- gwave-20090213.orig/src/scwm_guile.c 2015-03-04 14:59:23.528607577 -0500
++++ gwave-20090213/src/scwm_guile.c 2015-03-04 15:07:09.192610590 -0500
@@ -31,7 +31,6 @@
#include <limits.h>
#include <assert.h>
@@ -29,3 +29,83 @@ 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"
+Index: gwave-20090213/src/guile-compat.c
+===================================================================
+--- gwave-20090213.orig/src/guile-compat.c 2015-03-04 14:59:23.528607577 -0500
++++ gwave-20090213/src/guile-compat.c 2015-03-04 15:10:38.404611943 -0500
+@@ -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
+Index: gwave-20090213/src/rgeval.c
+===================================================================
+--- gwave-20090213.orig/src/rgeval.c 2015-03-04 14:59:23.528607577 -0500
++++ gwave-20090213/src/rgeval.c 2015-03-04 14:59:23.524607577 -0500
+@@ -8,7 +8,7 @@
+ */
+ #include <stdio.h>
+ #include <string.h>
+-#include <guile/gh.h>
++#include <libguile.h>
+
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+Index: gwave-20090213/src/validate.h
+===================================================================
+--- gwave-20090213.orig/src/validate.h 2015-03-04 12:10:31.403748978 -0500
++++ gwave-20090213/src/validate.h 2015-03-04 15:04:51.840609701 -0500
+@@ -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)
+
