Bdale Garbee <bd...@gag.com> writes: > So... while I'm sure gEDA could be "saved" in Debian with enough effort, > I just don't see the point, and won't put any time or attention on it > myself.
I'd suggest we should do something "soonish". This is the last package holding guile-2.0 in testing, and I'd *really* like to be able to finish the guile-2.0 removal. For what it's worth, I thought I'd see how hard it might be to update to guile-3.0, and the attached (very primitive/incomplete) diff does get the current package to build and pass all but one of the tests here (assuming that wasn't a short-circuit and there are more tests after that). However, unless someone's interested in maintaining the package, pursuing guile-3.0 support, upgrading to 1.10, etc. Perhaps it's best to file for removal now. We can always reintroduce it later, if the situation improves.
diff --git a/configure.ac b/configure.ac index 30328f5..2b42fd6 100644 --- a/configure.ac +++ b/configure.ac @@ -70,7 +70,9 @@ AX_DESKTOP_I18N PKG_PROG_PKG_CONFIG -AX_CHECK_GUILE([1.8.0]) +GUILE_PKG([3.0]) +GUILE_PROGS +GUILE_FLAGS PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.20.0], , AC_MSG_ERROR([GLib 2.20.0 or later is required.])) diff --git a/debian/control b/debian/control index fc66e52..a7a8e0a 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian Electronics Team <pkg-electronics-de...@lists.alioth.debian.org> Uploaders: Peter Clifton <pc...@cam.ac.uk>, أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmo...@users.sourceforge.net>, Bdale Garbee <bd...@gag.com> Standards-Version: 4.2.0 -Build-Depends: debhelper (>= 11), libgtk2.0-dev (>= 2.16.0), guile-2.0-dev, libgd-dev, libxml-parser-perl, ghostscript, transfig, libstroke0-dev, groff, libglib2.0-dev, flex, intltool, texinfo +Build-Depends: debhelper (>= 11), libgtk2.0-dev (>= 2.16.0), guile-3.0-dev, libgd-dev, libxml-parser-perl, ghostscript, transfig, libstroke0-dev, groff, libglib2.0-dev, flex, intltool, texinfo Homepage: http://www.geda-project.org/ Vcs-Git: https://salsa.debian.org/electronics-team/geda-gaf.git Vcs-Browser: https://salsa.debian.org/electronics-team/geda-gaf @@ -48,7 +48,7 @@ Description: GPL EDA -- Electronics design software (library files) Package: libgeda-dev Architecture: any Section: libdevel -Depends: ${misc:Depends}, ${shlibs:Depends}, libgeda42 (= ${binary:Version}), libgtk2.0-dev, guile-2.0-dev [!ia64], guile-1.8-dev [ia64], libgd-dev +Depends: ${misc:Depends}, ${shlibs:Depends}, libgeda42 (= ${binary:Version}), libgtk2.0-dev, guile-3.0-dev, libgd-dev Pre-Depends: ${misc:Pre-Depends} Description: GPL EDA -- Electronics design software (development files) The gEDA project has produced and continues working on a full GPL'd suite and diff --git a/gnetlist/src/parsecmd.c b/gnetlist/src/parsecmd.c index aa31e86..9f15f6d 100644 --- a/gnetlist/src/parsecmd.c +++ b/gnetlist/src/parsecmd.c @@ -206,13 +206,13 @@ parse_commandline (int argc, char *argv[]) backend_params = g_slist_append(backend_params, optarg); break; - case 'c': - scm_internal_stack_catch (SCM_BOOL_T, - (scm_t_catch_body) scm_c_eval_string, - (void *) optarg, - (scm_t_catch_handler) catch_handler, - (void *) optarg); - break; + /* case 'c': */ + /* scm_internal_stack_catch (SCM_BOOL_T, */ + /* (scm_t_catch_body) scm_c_eval_string, */ + /* (void *) optarg, */ + /* (scm_t_catch_handler) catch_handler, */ + /* (void *) optarg); */ + /* break; */ case 'h': usage(argv[0]); diff --git a/gschem/src/Makefile.am b/gschem/src/Makefile.am index 12d22d6..b4cfd24 100644 --- a/gschem/src/Makefile.am +++ b/gschem/src/Makefile.am @@ -98,7 +98,7 @@ SUFFIXES = .x snarf_cpp_opts = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(gschem_CPPFLAGS) $(AM_CFLAGS) $(gschem_CFLAGS) .c.x: - CPP="$(CPP)" $(GUILE_SNARF) -o $@ $< $(snarf_cpp_opts) + CPP="$(CPP)" guile-snarf-$(GUILE_EFFECTIVE_VERSION) -o $@ $< $(snarf_cpp_opts) localedir = @datadir@/locale DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ diff --git a/libgeda/shell/Makefile.am b/libgeda/shell/Makefile.am index d339bb5..87c0645 100644 --- a/libgeda/shell/Makefile.am +++ b/libgeda/shell/Makefile.am @@ -23,6 +23,6 @@ SUFFIXES = .x snarf_cpp_opts = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(geda_shell_CPPFLAGS) $(AM_CFLAGS) $(geda_shell_CFLAGS) .c.x: - CPP="$(CPP)" $(GUILE_SNARF) -o $@ $< $(snarf_cpp_opts) + CPP="$(CPP)" guile-snarf-$(GUILE_EFFECTIVE_VERSION) -o $@ $< $(snarf_cpp_opts) CLEANFILES = $(BUILT_SOURCES) diff --git a/libgeda/src/Makefile.am b/libgeda/src/Makefile.am index c65c979..a866a37 100644 --- a/libgeda/src/Makefile.am +++ b/libgeda/src/Makefile.am @@ -98,7 +98,7 @@ SUFFIXES = .x snarf_cpp_opts = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(libgeda_la_CPPFLAGS) $(AM_CFLAGS) $(libgeda_la_CFLAGS) .c.x: - CPP="$(CPP)" $(GUILE_SNARF) -o $@ $< $(snarf_cpp_opts) + CPP="$(CPP)" guile-snarf-$(GUILE_EFFECTIVE_VERSION) -o $@ $< $(snarf_cpp_opts) MOSTLYCLEANFILES = *.log core FILE *~ CLEANFILES = *.log core FILE *~ $(BUILT_SOURCES) diff --git a/missing.h b/missing.h index 1d4666a..e69de29 100644 --- a/missing.h +++ b/missing.h @@ -1,39 +0,0 @@ - -/* This file contains preprocessor macros which provide substitutes - * for missing functions or other definitions based on the results of - * configure. */ - -/* We need to be able to pass UTF-8 strings to and from libguile. The - * most forward-compatible way to do this is to explicitly use the - * "utf8" API for doing so, but this API is only available from Guile - * 2.0 onwards. - * - * In Guile 2.0 there is a similar "locale" API which encodes/decodes - * strings differently based on the locale, so we need to avoid it in - * case the user decides to set a non-UTF-8 locale. However, the - * "locale" API *is* present in Guile 1.8, in which it doesn't attempt - * to encode/decode the strings its passed, so we can use it as a - * direct replacement for the "utf8" API. - * - * Confused yet? - */ - -#ifndef HAVE_SCM_FROM_UTF8_STRINGN -# define scm_from_utf8_stringn scm_from_locale_stringn -#endif -#ifndef HAVE_SCM_FROM_UTF8_STRING -# define scm_from_utf8_string(x) scm_from_utf8_stringn ((x), -1) -#endif -#ifndef HAVE_SCM_TO_UTF8_STRINGN -# define scm_to_utf8_stringn scm_to_locale_stringn -#endif -#ifndef HAVE_SCM_TO_UTF8_STRING -# define scm_to_utf8_string(x) scm_to_utf8_stringn ((x), NULL) -#endif - -#ifndef HAVE_SCM_FROM_UTF8_SYMBOLN -# define scm_from_utf8_symboln scm_from_locale_symboln -#endif -#ifndef HAVE_SCM_FROM_UTF8_SYMBOL -# define scm_from_utf8_symbol scm_from_locale_symbol -#endif
Thanks -- Rob Browning rlb @defaultvalue.org and @debian.org GPG as of 2011-07-10 E6A9 DA3C C9FD 1FF8 C676 D2C4 C0F0 39E9 ED1B 597A GPG as of 2002-11-03 14DD 432F AE39 534D B592 F9A0 25C8 D377 8C7E 73A4
