commit: 58b7e8af79445c38cc2dad1129c6d2212fb88ee9 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Sun Jun 30 23:50:54 2019 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Sun Jun 30 23:54:06 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58b7e8af
sci-electronics/gwave: Version bump to 20190116 Closes: https://bugs.gentoo.org/680440 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> sci-electronics/gwave/Manifest | 1 + .../gwave/files/gwave-20190116-as-needed.patch | 125 ++++++++++++++++++++ .../gwave/files/gwave-20190116-fix-configure.patch | 14 +++ .../gwave-20190116-multiple-little-bugfixes.patch | 126 +++++++++++++++++++++ sci-electronics/gwave/gwave-20190116.ebuild | 55 +++++++++ 5 files changed, 321 insertions(+) diff --git a/sci-electronics/gwave/Manifest b/sci-electronics/gwave/Manifest index d49f652ce60..3301677fd77 100644 --- a/sci-electronics/gwave/Manifest +++ b/sci-electronics/gwave/Manifest @@ -1,2 +1,3 @@ +DIST gwave-20190116.tar.gz 472342 BLAKE2B d3781a757d288548600626c2105828162c9eb72930b1a3c741adc63eb275097a98f75fc73c31c4d57bee2e959952ca51e8af54090ff5ea0a2b780ee645da7e4e SHA512 5c83306dfa4aaf7a0e9bb27be3c8a0e9e47d02b15afe78938e23b815d302bb162ab35aab05b67ede132d0a7c51519b15ef64a7f87df4b8da9ca9b93b82410b7b DIST gwave-code-249-trunk.zip 415799 BLAKE2B d128d9497f05f61e334886f0884a745c2cab624131ff2811162dc4ad0d39a244c4f08783dc7ddb12edde3287466744d8f6f8db6a61f77a493811d887ca611a5d SHA512 351e5db7c65a0ff3ff68785986c3c4f16e2fbf2386c944c8ed63ced4b4714e9e00c2d30a12f7180477bb8f1ac56a09208cf6379b0e0074dc92de71ff483d5d87 DIST gwave2-20090213.tar.gz 403957 BLAKE2B aeb1db92bfc5977d1a11e0baad89919f4eafd8c9c8ceaf94e29e8a8a6aed29f38f27bec6a340c8610b0acde83c0f8fa3944313417ae3db7d91e155db920fa358 SHA512 9b39ed2923901af18253abe8e3ae1a6f71a660e31181dce31b0d784eb1dd0800a31ff48158b2c68555fcd268029e20295e87626e8e1d4cebc236b3863fe25e8c diff --git a/sci-electronics/gwave/files/gwave-20190116-as-needed.patch b/sci-electronics/gwave/files/gwave-20190116-as-needed.patch new file mode 100644 index 00000000000..8a0737e6b89 --- /dev/null +++ b/sci-electronics/gwave/files/gwave-20190116-as-needed.patch @@ -0,0 +1,125 @@ +From d2e4cdc91e3100a6a6598eff93df1b24c6ce661c Mon Sep 17 00:00:00 2001 +From: sgtell <sgtell@9168a026-1b44-0410-911b-d774ca5fe8d3> +Date: Thu, 11 Apr 2019 20:52:12 +0000 +Subject: [PATCH 2/2] message typo fixes and Makefile.am improvements + contributed by Ahmed El-Mahmoudy Don't monkey with _LDFLAGS when _LDADD will + do; fixes -Wl,--as-needed + +git-svn-id: https://svn.code.sf.net/p/gwave/code/branches/no-ggp-branch@271 9168a026-1b44-0410-911b-d774ca5fe8d3 +--- + spicefile/Makefile.am | 12 +++++------- + spicefile/ss_hspice.c | 10 +++++----- + spicefile/ss_spice3.c | 2 +- + src/Makefile.am | 5 +---- + 4 files changed, 12 insertions(+), 17 deletions(-) + +diff --git a/spicefile/Makefile.am b/spicefile/Makefile.am +index 83f7508..3b69fbb 100644 +--- a/spicefile/Makefile.am ++++ b/spicefile/Makefile.am +@@ -9,12 +9,10 @@ libspicefile_a_SOURCES = spicestream.c ss_cazm.c ss_hspice.c ss_spice3.c ss_spic + AM_CFLAGS = @GTK_CFLAGS@ + + noinst_PROGRAMS = test_read +-test_read_SOURCES = test_read.c +-test_read_LDFLAGS = @GTK_LIBS@ +-test_read_LDADD = libspicefile.a ++test_read_SOURCES = test_read.c ++test_read_LDADD = libspicefile.a @GTK_LIBS@ + +-bin_PROGRAMS=sp2sp +-sp2sp_SOURCES=sp2sp.c +-sp2sp_LDFLAGS= @GTK_LIBS@ +-sp2sp_LDADD= libspicefile.a ++bin_PROGRAMS = sp2sp ++sp2sp_SOURCES = sp2sp.c ++sp2sp_LDADD = libspicefile.a @GTK_LIBS@ + +diff --git a/spicefile/ss_hspice.c b/spicefile/ss_hspice.c +index 421be14..722eaa4 100644 +--- a/spicefile/ss_hspice.c ++++ b/spicefile/ss_hspice.c +@@ -316,7 +316,7 @@ sf_rdhdr_hsbin(char *name, FILE *fp) + swap_gint32((gint32*)&hh, sizeof(hh)/sizeof(gint32)); + } + if(hh.h1 != 4 || hh.h3 != 4) { +- ss_msg(DBG, "sf_rdhdr_hsbin", "unexepected values in data block header"); ++ ss_msg(DBG, "sf_rdhdr_hsbin", "unexpected values in data block header"); + goto fail; + } + +@@ -574,7 +574,7 @@ sf_getval_hsbin(SpiceStream *sf, double *dvalp) + sf->flags &= ~SSF_ESWAP; + } + if(hh.h1 != 0x00000004 || hh.h3 != 0x00000004) { +- ss_msg(ERR, "sf_getval_hsbin", "unexepected values in block header at offset 0x%lx", pos); ++ ss_msg(ERR, "sf_getval_hsbin", "unexpected values in block header at offset 0x%lx", pos); + return -1; + } + sf->expected_vals = hh.block_nbytes / sf->floatsize; +@@ -584,7 +584,7 @@ sf_getval_hsbin(SpiceStream *sf, double *dvalp) + if(sf->floatsize == 4) { + if(fread(&fval, sizeof(float), 1, sf->fp) != 1) { + pos = ftello64(sf->fp); +- ss_msg(ERR, "sf_getval_hsbin", "unexepected EOF in data at offset 0x%lx", (long) pos); ++ ss_msg(ERR, "sf_getval_hsbin", "unexpected EOF in data at offset 0x%lx", (long) pos); + return 0; + } + if(sf->flags & SSF_ESWAP) { +@@ -594,7 +594,7 @@ sf_getval_hsbin(SpiceStream *sf, double *dvalp) + } else if(sf->floatsize == 8) { + if(fread(&dval, sf->floatsize, 1, sf->fp) != 1) { + pos = ftello64(sf->fp); +- ss_msg(ERR, "sf_getval_hsbin", "unexepected EOF in data at offset 0x%lx", (long) pos); ++ ss_msg(ERR, "sf_getval_hsbin", "unexpected EOF in data at offset 0x%lx", (long) pos); + return 0; + } + if(sf->flags & SSF_ESWAP) { +@@ -652,7 +652,7 @@ sf_getval_hsascii(SpiceStream *sf, double *val) + if(strlen(vbuf) != sf->avalsize) { + /* incomplete float value - probably truncated or + partialy-written file */ +- ss_msg(ERR, "sf_getval_hsascii", "unexepected number \"%s\" near offset 0x%lx", vbuf, (long)ftello64(sf->fp)); ++ ss_msg(ERR, "sf_getval_hsascii", "unexpected number \"%s\" near offset 0x%lx", vbuf, (long)ftello64(sf->fp)); + + return 0; + } +diff --git a/spicefile/ss_spice3.c b/spicefile/ss_spice3.c +index f95b997..4dfd5b9 100644 +--- a/spicefile/ss_spice3.c ++++ b/spicefile/ss_spice3.c +@@ -352,7 +352,7 @@ sf_getval_s3bin(SpiceStream *sf, double *dval) + } + if(fread(&val, sizeof(double), 1, sf->fp) != 1) { + pos = ftello64(sf->fp); +- ss_msg(ERR, "sf_getval_s3bin", "unexepected EOF in data at offset 0x%lx", (long) pos); ++ ss_msg(ERR, "sf_getval_s3bin", "unexpected EOF in data at offset 0x%lx", (long) pos); + return -1; + } + sf->read_vals++; +diff --git a/src/Makefile.am b/src/Makefile.am +index 6efba55..7933bfc 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -15,8 +15,7 @@ gwave_SOURCES = cmd.c wavewin.c draw.c gwave.c event.c \ + rgeval.c xgserver.c measurebtn.c measurebtn.h \ + GtkTable_indel.c GtkTable_indel.h xsnarf.h + +-gwave_LDADD = ../spicefile/libspicefile.a @GTK_LIBS@ -lm +-gwave_LDFLAGS = @GUILE_LDFLAGS@ ++gwave_LDADD = ../spicefile/libspicefile.a @GTK_LIBS@ @GUILE_LIBS@ -lm + + AM_CFLAGS = @GTK_CFLAGS@ @GUILE_CFLAGS@ \ + -DDATADIR=\"$(datadir)\" -DBINGWAVE=\"$(bindir)/gwave\" +@@ -29,8 +28,6 @@ DOT_DOC_FILES = gwave.doc cmd.doc wavewin.doc wavelist.doc scwm_guile.doc \ + + BUILT_SOURCES=init_scheme_string.c $(DOT_X_FILES) + +-#$(DOT_DOC_FILES) +- + init_scheme_string.c: $(top_srcdir)/scheme/minimal.scm + echo "char *init_scheme_string = " > $@ + sed -e 's/;.*$$//g' -e 's/"/\\"/g' -e "s/'/\\\\'/g" -e 's/$$/\\n"/' -e 's/^/"/g' < $(top_srcdir)/scheme/minimal.scm >> $@ +-- +2.21.0 + diff --git a/sci-electronics/gwave/files/gwave-20190116-fix-configure.patch b/sci-electronics/gwave/files/gwave-20190116-fix-configure.patch new file mode 100644 index 00000000000..e0c0c444386 --- /dev/null +++ b/sci-electronics/gwave/files/gwave-20190116-fix-configure.patch @@ -0,0 +1,14 @@ +diff --git a/configure.ac b/configure.ac +index 7a4f1c4..ffcb326 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -86,8 +86,7 @@ AC_CHECK_LIB(termcap, tgoto, [ + AC_CHECK_LIB(readline, readline, [ + READLINE_LIB="-lreadline -lncurses" + AC_DEFINE(HAVE_READLINE,1,[Define this if you have the readline library]) +- AC_CHECK_LIB(readline, add_history, AC_DEFINE(HAVE_HISTORY,1,[Define this if your readline also has add_history]),,"-l +-ncurses") ++ AC_CHECK_LIB(readline, add_history, AC_DEFINE(HAVE_HISTORY,1,[Define this if your readline also has add_history]),,"-lncurses") + ], READLINE_LIB="", "-lncurses") + ], READLINE_LIB="")) + diff --git a/sci-electronics/gwave/files/gwave-20190116-multiple-little-bugfixes.patch b/sci-electronics/gwave/files/gwave-20190116-multiple-little-bugfixes.patch new file mode 100644 index 00000000000..88243381d2f --- /dev/null +++ b/sci-electronics/gwave/files/gwave-20190116-multiple-little-bugfixes.patch @@ -0,0 +1,126 @@ +From ab7e69e688e7868349c1db922fde8dc3da2a4ac8 Mon Sep 17 00:00:00 2001 +From: sgtell <sgtell@9168a026-1b44-0410-911b-d774ca5fe8d3> +Date: Thu, 11 Apr 2019 20:24:27 +0000 +Subject: [PATCH 1/2] multiple little bugfixes missing "return SCM_UNSPECIFIED" + causes crash in some guile environments fix gwave -s scriptname commandline + startup usage; fix script loading finish testing & fixing the new waveform + status popup + +git-svn-id: https://svn.code.sf.net/p/gwave/code/branches/no-ggp-branch@270 9168a026-1b44-0410-911b-d774ca5fe8d3 +--- + scheme/cmds.scm | 2 +- + scheme/extra-menus.scm | 4 ++++ + scheme/std-args.scm | 2 +- + scheme/visiblewave-ops.scm | 4 +--- + spicefile/wavefile.c | 2 -- + src/gtkmisc.c | 2 ++ + src/wavelist.c | 1 + + 7 files changed, 10 insertions(+), 7 deletions(-) + +diff --git a/scheme/cmds.scm b/scheme/cmds.scm +index 2f94a09..75a41cf 100644 +--- a/scheme/cmds.scm ++++ b/scheme/cmds.scm +@@ -351,7 +351,7 @@ + + ;; execute a guile script, ignoring any errors. + (define-public (execute-script fname) +- (false-if-exception (load fname)) ++ (false-if-exception (primitive-load fname)) + ) + + ; global to pass target datafile smob to scripts executed +diff --git a/scheme/extra-menus.scm b/scheme/extra-menus.scm +index 0f72e25..d1edf6b 100644 +--- a/scheme/extra-menus.scm ++++ b/scheme/extra-menus.scm +@@ -35,6 +35,10 @@ + + (define (debug-list-files) + (format #t "wavefile-list: ~a\n" (wavefile-list)) ++ (for-each (lambda (wf) ++ (format #t "wavefile ~a " wf) ++ (format #t "file ~s\n" (wavefile-file-name wf))) ++ (wavefile-list)) + ) + + (define (debug-wave-calc) +diff --git a/scheme/std-args.scm b/scheme/std-args.scm +index bed74d4..d6dddf2 100644 +--- a/scheme/std-args.scm ++++ b/scheme/std-args.scm +@@ -83,7 +83,7 @@ + + ; execute script specified with -s + (if startup-script +- (load startup-script)) ++ (execute-script startup-script)) + )) + + +diff --git a/scheme/visiblewave-ops.scm b/scheme/visiblewave-ops.scm +index f800770..42faeff 100644 +--- a/scheme/visiblewave-ops.scm ++++ b/scheme/visiblewave-ops.scm +@@ -23,12 +23,10 @@ + (define (popup-vw-stats vw) + (popup-text-dialog "wave stats" + (string-append +- (format #f "file: ~s\n" ((wavefile-file-name visiblewave-file vw))) ++ (format #f "file: ~s\n" (wavefile-file-name (visiblewave-file vw))) + (format #f "variable: ~s\n" (visiblewave-varname vw)) + (format #f "minimum: ~f\n" (wavevar-min vw)) + (format #f "maximum: ~f\n" (wavevar-max vw))))) +- +- + + ; hook called when new VisibleWave is added. + (add-hook! +diff --git a/spicefile/wavefile.c b/spicefile/wavefile.c +index 6a35c04..83f2a8b 100644 +--- a/spicefile/wavefile.c ++++ b/spicefile/wavefile.c +@@ -657,8 +657,6 @@ int wf_add_var(WaveFile *wf, char *varname, int ncols, VarType type, + + for(i = 0; i < ncols; i++) { + wf_init_dataset_size(&wv->wds[i], wt->nvalues); +- wds->min = 0.0; +- wds->max = 0.0; + } + } + return 0; +diff --git a/src/gtkmisc.c b/src/gtkmisc.c +index b0484ad..04bfde5 100644 +--- a/src/gtkmisc.c ++++ b/src/gtkmisc.c +@@ -392,6 +392,7 @@ SCM_DEFINE(gwgtk_menu_popup, "gwgtk-menu-popup", 3, 0, 0, + // printf("gwgtk_menu_popup %d\n", mbutton); + menu = build_menu_from_scmlist(list); + gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, mbutton, activate_time); ++ return SCM_UNSPECIFIED; + } + #undef FUNC_NAME + +@@ -458,6 +459,7 @@ SCM_DEFINE(popup_text_dialog, "popup-text-dialog", 2, 0, 0, + VALIDATE_ARG_STR_NEWCOPY_USE_NULL(1,title,ctitle); + VALIDATE_ARG_STR_NEWCOPY_USE_NULL(2,text,ctext); + create_gtktextdialog(ctitle, ctext); ++ return SCM_UNSPECIFIED; + } + #undef FUNC_NAME + +diff --git a/src/wavelist.c b/src/wavelist.c +index 142e229..20cf84d 100644 +--- a/src/wavelist.c ++++ b/src/wavelist.c +@@ -859,6 +859,7 @@ SCM_DEFINE(new_wavevar_calc_x, "new-wavevar-calc!", 3, 1, 0, + if(df->wlist_win) { + gwfile_add_wv_to_list(wvnew, df); + } ++ return SCM_UNSPECIFIED; + } + #undef FUNC_NAME + +-- +2.21.0 + diff --git a/sci-electronics/gwave/gwave-20190116.ebuild b/sci-electronics/gwave/gwave-20190116.ebuild new file mode 100644 index 00000000000..b82fb8c7328 --- /dev/null +++ b/sci-electronics/gwave/gwave-20190116.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools desktop gnome2-utils xdg-utils + +DESCRIPTION="Analog waveform viewer for SPICE-like simulations" +HOMEPAGE="http://gwave.sourceforge.net"; +SRC_URI="mirror://sourceforge/${PN}/gwave3/${P}.tar.gz" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +IUSE="gnuplot plotutils" +SLOT="0" + +DEPEND=" + >=dev-scheme/guile-2[networking] + >=x11-libs/gtk+-2.8.0:2= + sys-libs/readline:0= + sys-libs/ncurses:0=" + +RDEPEND="${DEPEND} + sci-electronics/electronics-menu + gnuplot? ( sci-visualization/gnuplot ) + plotutils? ( media-libs/plotutils )" + +PATCHES=( + "${FILESDIR}"/${P}-multiple-little-bugfixes.patch + "${FILESDIR}"/${P}-as-needed.patch + "${FILESDIR}"/${P}-fix-configure.patch +) + +src_prepare() { + default + eautoreconf +} + +src_install() { + default + newicon icons/wave-drag-ok.xpm gwave.xpm + make_desktop_entry gwave "Gwave" gwave "Electronics" +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_mimeinfo_database_update + gnome2_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_mimeinfo_database_update + gnome2_icon_cache_update +}
