summaryrefslogtreecommitdiff
path: root/sci-electronics/gwave/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-08-02 19:14:55 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-08-02 19:14:55 +0100
commitb24bd25253fe093f722ab576d29fdc41d04cb1ee (patch)
tree0fcf2afd9f852c4d4c291cf8afaa2c244d598105 /sci-electronics/gwave/files
parent121ed4eec41fbf03e1998d09eede1bf449da63b9 (diff)
gentoo resync : 02.08.2019
Diffstat (limited to 'sci-electronics/gwave/files')
-rw-r--r--sci-electronics/gwave/files/gwave-20090213-as-needed.patch54
-rw-r--r--sci-electronics/gwave/files/gwave-20120229_as-needed.patch58
-rw-r--r--sci-electronics/gwave/files/gwave-20120229_doc.patch42
-rw-r--r--sci-electronics/gwave/files/gwave-20120229_missing_externs.patch23
-rw-r--r--sci-electronics/gwave/files/gwave-20120229_remove_gh.patch92
-rw-r--r--sci-electronics/gwave/files/gwave-20120229_remove_old_and_broken_compatibility_check.patch45
-rw-r--r--sci-electronics/gwave/files/gwave-20120229_stdlib.patch11
-rw-r--r--sci-electronics/gwave/files/gwave-20120229_unistd.patch23
8 files changed, 0 insertions, 348 deletions
diff --git a/sci-electronics/gwave/files/gwave-20090213-as-needed.patch b/sci-electronics/gwave/files/gwave-20090213-as-needed.patch
deleted file mode 100644
index 7ec72ed2aab7..000000000000
--- a/sci-electronics/gwave/files/gwave-20090213-as-needed.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- gwave2-20090213.orig/src/Makefile.am 2008-01-22 05:36:59.000000000 +0100
-+++ gwave2-20090213/src/Makefile.am 2010-02-06 18:10:38.011218381 +0100
-@@ -15,8 +15,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@
--gwave_LDFLAGS = @GUILE_LDFLAGS@
-+gwave_LDADD = ../spicefile/libspicefile.a @GTK_LIBS@ @GUILE_GNOME_LIBS@ @GUILE_LDFLAGS@
-
- AM_CFLAGS = @GTK_CFLAGS@ @GUILE_CFLAGS@ @GUILE_GNOME_CFLAGS@ \
- -DDATADIR=\"$(datadir)\" -DBINGWAVE=\"$(bindir)/gwave\"
---- gwave2-20090213.orig/spicefile/Makefile.am 2008-01-22 05:31:45.000000000 +0100
-+++ gwave2-20090213/spicefile/Makefile.am 2010-02-06 18:11:53.008964326 +0100
-@@ -10,11 +10,9 @@
-
- noinst_PROGRAMS = test_read
- test_read_SOURCES = test_read.c
--test_read_LDFLAGS = @GTK_LIBS@
--test_read_LDADD = libspicefile.a
-+test_read_LDADD = libspicefile.a @GTK_LIBS@
-
- bin_PROGRAMS=sp2sp
- sp2sp_SOURCES=sp2sp.c
--sp2sp_LDFLAGS= @GTK_LIBS@
--sp2sp_LDADD= libspicefile.a
-+sp2sp_LDADD= libspicefile.a @GTK_LIBS@
-
---- gwave2-20090213.orig/configure.ac 2009-02-13 06:00:57.000000000 +0100
-+++ gwave2-20090213/configure.ac 2010-02-06 18:23:11.522964311 +0100
-@@ -84,7 +84,8 @@
- dnl GUILE_MODULE_REQUIRED(gnome gtk)
-
- PKG_CHECK_MODULES(GUILE_GNOME, guile-gnome-gtk-2, ,AC_MSG_ERROR(Can not find Guile-gnome-platform))
--
-+PKG_CHECK_MODULES([X11], [x11])
-+PKG_CHECK_MODULES([GLIB], [glib-2.0])
- dnl remind myself how to check for somthing I know exists
- dnl GUILE_MODULE_EXPORTS(foo_widget_show, (gnome-0)(gnome gtk),gtk-widget-show)
- dnl if test "$foo_widget_show" = yes; then
---- gwave2-20090213.orig/remote/Makefile.am 2010-02-06 18:33:14.340215309 +0100
-+++ gwave2-20090213/remote/Makefile.am 2010-02-06 18:34:19.810967947 +0100
-@@ -4,7 +4,9 @@
- AM_CFLAGS = @GTK_CFLAGS@
- bin_PROGRAMS=gwave-exec gwaverepl
- gwave_exec_SOURCES=gwave-exec.c xgclient.c xgexec.h
--gwave_exec_LDADD= @GTK_LIBS@
-+gwave_exec_CFLAGS= @X11_CFLAGS@
-+gwave_exec_LDADD= @GTK_LIBS@ @X11_LIBS@
-
- gwaverepl_SOURCES=gwaverepl.c xgclient.c xgexec.h repllib.c
--gwaverepl_LDADD= @GTK_LIBS@ @READLINE_LIB@
-+gwaverepl_CFLAGS= @X11_CFLAGS@ @GLIB_CFLAGS@
-+gwaverepl_LDADD= @GTK_LIBS@ @READLINE_LIB@ @X11_LIBS@ @GLIB_LIBS@
diff --git a/sci-electronics/gwave/files/gwave-20120229_as-needed.patch b/sci-electronics/gwave/files/gwave-20120229_as-needed.patch
deleted file mode 100644
index 75d57f26b710..000000000000
--- a/sci-electronics/gwave/files/gwave-20120229_as-needed.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -ur gwave-code-249-trunk.orig/configure.ac gwave-code-249-trunk/configure.ac
---- gwave-code-249-trunk.orig/configure.ac 2016-08-15 12:51:39.170423625 -0600
-+++ gwave-code-249-trunk/configure.ac 2016-08-15 12:53:13.049707178 -0600
-@@ -140,6 +140,9 @@
- AC_SUBST(ggtk_hack_cflags)
- AC_SUBST(ggtk_extra_loadpath)
-
-+PKG_CHECK_MODULES([X11], [x11])
-+PKG_CHECK_MODULES([GLIB], [glib-2.0])
-+
- dnl doesn't work if prefix isn't specified.
- dnl AC_DEFINE_UNQUOTED(DATADIR,"${datadir}",Installation prefix for finding necessary guile code)
-
-diff -ur gwave-code-249-trunk.orig/remote/Makefile.am gwave-code-249-trunk/remote/Makefile.am
---- gwave-code-249-trunk.orig/remote/Makefile.am 2016-08-15 12:51:39.170423625 -0600
-+++ gwave-code-249-trunk/remote/Makefile.am 2016-08-15 12:52:15.810144514 -0600
-@@ -4,7 +4,9 @@
- AM_CFLAGS = @GTK_CFLAGS@
- bin_PROGRAMS=gwave-exec gwaverepl
- gwave_exec_SOURCES=gwave-exec.c xgclient.c xgexec.h
--gwave_exec_LDADD= @GTK_LIBS@
-+gwave_exec_LDADD= @GTK_LIBS@ @X11_LIBS@
-+gwave_exec_CFLAGS= @X11_CFLAGS@
-
- gwaverepl_SOURCES=gwaverepl.c xgclient.c xgexec.h repllib.c
--gwaverepl_LDADD= @GTK_LIBS@ @READLINE_LIB@
-+gwaverepl_LDADD= @GTK_LIBS@ @READLINE_LIB@ @X11_LIBS@ @GLIB_LIBS@
-+gwaverepl_CFLAGS= @X11_CFLAGS@ @GLIB_CFLAGS@
-diff -ur gwave-code-249-trunk.orig/spicefile/Makefile.am gwave-code-249-trunk/spicefile/Makefile.am
---- gwave-code-249-trunk.orig/spicefile/Makefile.am 2016-08-15 12:51:39.170423625 -0600
-+++ gwave-code-249-trunk/spicefile/Makefile.am 2016-08-15 12:52:15.810144514 -0600
-@@ -10,11 +10,9 @@
-
- noinst_PROGRAMS = test_read
- test_read_SOURCES = test_read.c
--test_read_LDFLAGS = @GTK_LIBS@
--test_read_LDADD = libspicefile.a
-+test_read_LDADD = libspicefile.a @GTK_LIBS@
-
- bin_PROGRAMS=sp2sp
- sp2sp_SOURCES=sp2sp.c
--sp2sp_LDFLAGS= @GTK_LIBS@
--sp2sp_LDADD= libspicefile.a
-+sp2sp_LDADD= libspicefile.a @GTK_LIBS@
-
-diff -ur gwave-code-249-trunk.orig/src/Makefile.am gwave-code-249-trunk/src/Makefile.am
---- gwave-code-249-trunk.orig/src/Makefile.am 2016-08-15 12:51:39.170423625 -0600
-+++ gwave-code-249-trunk/src/Makefile.am 2016-08-15 12:52:15.810144514 -0600
-@@ -16,8 +16,7 @@
- rgeval.c xgserver.c measurebtn.c measurebtn.h \
- GtkTable_indel.c GtkTable_indel.h xsnarf.h
-
--gwave_LDADD = ../spicefile/libspicefile.a @GTK_LIBS@ @GUILEGTK_LIBS@
--gwave_LDFLAGS = @GUILE_LDFLAGS@
-+gwave_LDADD = ../spicefile/libspicefile.a @GTK_LIBS@ @GUILEGTK_LIBS@ @GUILE_LDFLAGS@ -lX11 -lm
-
- AM_CFLAGS = @GTK_CFLAGS@ @GUILE_CFLAGS@ @GUILEGTK_CFLAGS@ \
- -DDATADIR=\"$(datadir)\" -DBINGWAVE=\"$(bindir)/gwave\" @ggtk_hack_cflags@
diff --git a/sci-electronics/gwave/files/gwave-20120229_doc.patch b/sci-electronics/gwave/files/gwave-20120229_doc.patch
deleted file mode 100644
index 558de4aa75ee..000000000000
--- a/sci-electronics/gwave/files/gwave-20120229_doc.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -ur gwave-code-249-trunk.orig/doc/Makefile.am gwave-code-249-trunk/doc/Makefile.am
---- gwave-code-249-trunk.orig/doc/Makefile.am 2003-12-24 13:42:48.000000000 -0700
-+++ gwave-code-249-trunk/doc/Makefile.am 2016-08-17 13:11:07.142818075 -0600
-@@ -18,7 +18,7 @@
-
- # Make the reference-document textfiles
- gwave-procedures.txt gwave-variables.txt gwave-hooks.txt gwave-concepts.txt:
-- @GUILE@ -e main -s $(top_srcdir)/utilities/doc-split --basename gwave $(top_srcdir)/src/*.doc $(top_srcdir)/scheme/*.doc
-+ guile -e main -s $(top_srcdir)/utilities/doc-split --basename gwave $(top_srcdir)/src/*.doc $(top_srcdir)/scheme/*.doc
-
- html: gwave.sgml
- mkdir -p html && cd html && \
-@@ -39,7 +39,7 @@
- SUFFIXES=.sgml .1 .5
-
- .sgml.1:
-- docbook-to-man $*.sgml > $@
-+ docbook2man $*.sgml
-
- .PHONY: html tex dvi ps pdf
-
-diff -ur gwave-code-249-trunk.orig/utilities/doc-split.in gwave-code-249-trunk/utilities/doc-split.in
---- gwave-code-249-trunk.orig/utilities/doc-split.in 2008-01-22 20:52:08.000000000 -0700
-+++ gwave-code-249-trunk/utilities/doc-split.in 2016-08-17 13:13:59.944653789 -0600
-@@ -100,13 +100,13 @@
- (if (not (eof-object? line))
- (begin
- (cond
-- ((regexp-exec #+"^Concept: " line)
-+ ((regexp-exec (make-regexp "^Concept: ") line)
- (set! fp concept-fp))
-- ((regexp-exec #+"^Hook: " line)
-+ ((regexp-exec (make-regexp "^Hook: ") line)
- (set! fp hook-fp))
-- ((regexp-exec #+"^Variable: " line)
-+ ((regexp-exec (make-regexp "^Variable: ") line)
- (set! fp var-fp))
-- ((regexp-exec #+"^Procedure: " line)
-+ ((regexp-exec (make-regexp "^Procedure: ") line)
- (set! fp proc-fp))
- (else
- (set! fp #f)))
diff --git a/sci-electronics/gwave/files/gwave-20120229_missing_externs.patch b/sci-electronics/gwave/files/gwave-20120229_missing_externs.patch
deleted file mode 100644
index c3c48ecddcfc..000000000000
--- a/sci-electronics/gwave/files/gwave-20120229_missing_externs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur gwave-code-249-trunk.orig/remote/gwaverepl.c gwave-code-249-trunk/remote/gwaverepl.c
---- gwave-code-249-trunk.orig/remote/gwaverepl.c 2000-11-05 23:39:09.000000000 -0700
-+++ gwave-code-249-trunk/remote/gwaverepl.c 2016-08-17 13:20:17.071406553 -0600
-@@ -32,6 +32,8 @@
- Window w;
-
- extern char *split_at(char **to_split, int i);
-+extern int check_balance(char *expr);
-+extern int appending_fgets(char **sofar);
-
-
- int
-diff -ur gwave-code-249-trunk.orig/spicefile/spicestream.h gwave-code-249-trunk/spicefile/spicestream.h
---- gwave-code-249-trunk.orig/spicefile/spicestream.h 2004-12-26 20:10:24.000000000 -0700
-+++ gwave-code-249-trunk/spicefile/spicestream.h 2016-08-17 13:20:24.208011807 -0600
-@@ -100,6 +100,7 @@
- extern int fread_line(FILE *fp, char **bufp, int *bufsize);
- extern void ss_msg(SSMsgLevel type, const char *id, const char *msg, ...);
- extern char *ss_filetype_name(int n);
-+extern void ss_delete(SpiceStream *ss);
-
-
- #ifdef __cplusplus
diff --git a/sci-electronics/gwave/files/gwave-20120229_remove_gh.patch b/sci-electronics/gwave/files/gwave-20120229_remove_gh.patch
deleted file mode 100644
index 64cb026474af..000000000000
--- a/sci-electronics/gwave/files/gwave-20120229_remove_gh.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff -ur gwave-code-249-trunk.orig/src/guile-compat.c gwave-code-249-trunk/src/guile-compat.c
---- gwave-code-249-trunk.orig/src/guile-compat.c 2008-12-27 12:19:42.000000000 -0700
-+++ gwave-code-249-trunk/src/guile-compat.c 2016-08-15 11:35:19.686041341 -0600
-@@ -23,7 +23,7 @@
- #include <config.h>
- #endif
-
--#include <guile/gh.h>
-+#include <libguile.h>
-
- #include "guile-compat.h"
-
-@@ -56,7 +56,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
-diff -ur gwave-code-249-trunk.orig/src/rgeval.c gwave-code-249-trunk/src/rgeval.c
---- gwave-code-249-trunk.orig/src/rgeval.c 2008-12-27 12:19:42.000000000 -0700
-+++ gwave-code-249-trunk/src/rgeval.c 2016-08-15 11:35:19.686041341 -0600
-@@ -8,7 +8,7 @@
- */
- #include <stdio.h>
- #include <string.h>
--#include <guile/gh.h>
-+#include <libguile.h>
-
- #ifdef HAVE_CONFIG_H
- #include "config.h"
-diff -ur gwave-code-249-trunk.orig/src/scwm_guile.c gwave-code-249-trunk/src/scwm_guile.c
---- gwave-code-249-trunk.orig/src/scwm_guile.c 2008-01-22 20:52:08.000000000 -0700
-+++ gwave-code-249-trunk/src/scwm_guile.c 2016-08-15 11:37:03.732234328 -0600
-@@ -31,7 +31,6 @@
- #include <limits.h>
- #include <assert.h>
-
--#include <guile/gh.h>
- #include <libguile.h>
- #include <libguile/fluids.h>
-
-@@ -401,7 +400,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"
-diff -ur gwave-code-249-trunk.orig/src/scwm_guile.h gwave-code-249-trunk/src/scwm_guile.h
---- gwave-code-249-trunk.orig/src/scwm_guile.h 2008-01-22 20:52:08.000000000 -0700
-+++ gwave-code-249-trunk/src/scwm_guile.h 2016-08-15 11:35:19.686041341 -0600
-@@ -12,7 +12,7 @@
- #define SCWM_GUILE_H__
-
- #include "arg_unused.h"
--#include <guile/gh.h>
-+#include <libguile.h>
- #include "validate.h"
- #include <xsnarf.h>
-
-diff -ur gwave-code-249-trunk.orig/src/validate.h gwave-code-249-trunk/src/validate.h
---- gwave-code-249-trunk.orig/src/validate.h 2008-01-19 12:28:50.000000000 -0700
-+++ gwave-code-249-trunk/src/validate.h 2016-08-15 11:35:19.686041341 -0600
-@@ -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_string(scm); \
- 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_from_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_from_locale_string(scm); \
- else { pch = NULL; scm_wrong_type_arg(FUNC_NAME,pos,scm); } \
- } while (0)
-
diff --git a/sci-electronics/gwave/files/gwave-20120229_remove_old_and_broken_compatibility_check.patch b/sci-electronics/gwave/files/gwave-20120229_remove_old_and_broken_compatibility_check.patch
deleted file mode 100644
index b3444f6d5545..000000000000
--- a/sci-electronics/gwave/files/gwave-20120229_remove_old_and_broken_compatibility_check.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ur gwave-code-249-trunk.orig/src/scwm_guile.c gwave-code-249-trunk/src/scwm_guile.c
---- gwave-code-249-trunk.orig/src/scwm_guile.c 2016-08-12 16:55:04.598733712 -0600
-+++ gwave-code-249-trunk/src/scwm_guile.c 2016-08-12 16:55:43.508392247 -0600
-@@ -328,41 +328,6 @@
- SCM port = scm_current_error_port();
- #endif
-
-- /* GJB:FIXME:MS: is this a guile compatibility test that can be dropped
-- now? */
-- if (scm_ilength (throw_args) >= 3)
-- {
-- SCM fl;
-- fl = SCM_VARIABLE_REF (scm_the_last_stack_fluid_var);
--
-- /* GJB:FIXME:MS: This is a horrible hack,
-- but DEREF_LAST_STACK macro was throwing a wrong type
-- argument at weird times, and I'm trying to avoid
-- 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 subr = SCM_CAR (throw_args);
-- SCM message = SCM_CADR (throw_args);
-- SCM args = SCM_CADDR (throw_args);
--
-- scm_newline(port);
-- scm_display_backtrace (stack, port, SCM_UNDEFINED, SCM_UNDEFINED);
-- scm_newline(port);
-- scm_display_error (stack, port, subr, message, args, SCM_EOL);
-- } else {
--/* scwm_msg(ERR,"scwm_handle_error","scm_the_last_stack_fluid not holding a fluid!"); */
-- }
-- }
-- else
-- {
-- scm_puts ("uncaught throw to ", port);
-- scm_prin1 (tag, port, 0);
-- scm_puts (": ", port);
-- scm_prin1 (throw_args, port, 1);
-- scm_putc ('\n', port);
-- exit (2);
-- }
- /* GJB:FIXME:MS: can the scheme code display a backtrace without the
- stack argument? */
- return scwm_run_hook_message_only(error_hook, scm_cons(tag, throw_args));
diff --git a/sci-electronics/gwave/files/gwave-20120229_stdlib.patch b/sci-electronics/gwave/files/gwave-20120229_stdlib.patch
deleted file mode 100644
index fd7d6f6f6419..000000000000
--- a/sci-electronics/gwave/files/gwave-20120229_stdlib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur gwave-code-249-trunk.orig/src/xgserver.c gwave-code-249-trunk/src/xgserver.c
---- gwave-code-249-trunk.orig/src/xgserver.c 2016-08-15 13:12:41.694012802 -0600
-+++ gwave-code-249-trunk/src/xgserver.c 2016-08-15 13:13:26.810327097 -0600
-@@ -22,6 +22,7 @@
- #include <sys/time.h>
- #include <unistd.h>
- #include <signal.h>
-+#include <stdlib.h>
-
- #include <X11/Xlib.h>
- #include <X11/Xatom.h>
diff --git a/sci-electronics/gwave/files/gwave-20120229_unistd.patch b/sci-electronics/gwave/files/gwave-20120229_unistd.patch
deleted file mode 100644
index a9644468ff72..000000000000
--- a/sci-electronics/gwave/files/gwave-20120229_unistd.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur gwave-code-249-trunk.orig/spicefile/sp2sp.c gwave-code-249-trunk/spicefile/sp2sp.c
---- gwave-code-249-trunk.orig/spicefile/sp2sp.c 2016-08-12 14:00:32.647427290 -0600
-+++ gwave-code-249-trunk/spicefile/sp2sp.c 2016-08-12 14:03:21.445956110 -0600
-@@ -26,6 +26,8 @@
- #include <float.h>
- #include <errno.h>
- #include <glib.h>
-+#include <unistd.h>
-+
- #include "spicestream.h"
-
- #define SWEEP_NONE 0
-diff -ur gwave-code-249-trunk.orig/spicefile/test_read.c gwave-code-249-trunk/spicefile/test_read.c
---- gwave-code-249-trunk.orig/spicefile/test_read.c 2016-08-12 14:00:32.647427290 -0600
-+++ gwave-code-249-trunk/spicefile/test_read.c 2016-08-12 14:02:52.806205722 -0600
-@@ -27,6 +27,7 @@
- #include <string.h>
- #include <errno.h>
- #include <glib.h>
-+#include <unistd.h>
-
- #include "wavefile.h"
-