[gentoo-commits] repo/gentoo:master commit in: sci-electronics/gwave/files/, sci-electronics/gwave/, profiles/

2024-09-18 Thread Arsen Arsenović
commit: 7a3daf8ba3750dda074458a780f42207125bc5a3
Author: Alfred Wingate  protonmail  com>
AuthorDate: Tue Aug 27 15:03:22 2024 +
Commit: Arsen Arsenović  gentoo  org>
CommitDate: Wed Sep 18 13:06:40 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a3daf8b

sci-electronics/gwave: switch to new guile mechanism

Bug: https://bugs.gentoo.org/886139
Signed-off-by: Alfred Wingate  protonmail.com>
Signed-off-by: Arsen Arsenović  gentoo.org>

 profiles/package.mask  |  1 +
 .../gwave/files/gwave-20190116-lfs-shim.patch  | 14 +
 sci-electronics/gwave/gwave-20190116-r100.ebuild   | 63 ++
 3 files changed, 78 insertions(+)

diff --git a/profiles/package.mask b/profiles/package.mask
index 27b90b371360..508f5abed528 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -390,6 +390,7 @@ dev-scheme/guile:3.0
 >=net-irc/weechat-4.3.4-r100
 >=net-mail/mailutils-3.17-r100
 >=sci-electronics/geda-1.10.2-r100
+>=sci-electronics/gwave-20190116-r100
 
 # Eli Schwartz  (2024-08-15)
 # Abandoned upstream since 2011, unmaintained in gentoo since 2017. Tons of

diff --git a/sci-electronics/gwave/files/gwave-20190116-lfs-shim.patch 
b/sci-electronics/gwave/files/gwave-20190116-lfs-shim.patch
new file mode 100644
index ..5957b6a1b6b0
--- /dev/null
+++ b/sci-electronics/gwave/files/gwave-20190116-lfs-shim.patch
@@ -0,0 +1,14 @@
+https://bugs.gentoo.org/886139
+
+--- a/spicefile/sp2sp.c
 b/spicefile/sp2sp.c
+@@ -234,7 +234,7 @@
+   }
+   of = stdout;
+   } else {
+-  of = (FILE *)fopen64(outfilename, "w"); /* DJW: why is the cast 
needed? */
++  of = fopen(outfilename, "w");
+   if(!of) {
+   if(errno)
+   perror(outfilename);
+

diff --git a/sci-electronics/gwave/gwave-20190116-r100.ebuild 
b/sci-electronics/gwave/gwave-20190116-r100.ebuild
new file mode 100644
index ..2b2cd9972339
--- /dev/null
+++ b/sci-electronics/gwave/gwave-20190116-r100.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GUILE_REQ_USE="networking"
+GUILE_COMPAT=( 2-2 )
+inherit autotools desktop flag-o-matic guile-single xdg
+
+DESCRIPTION="Analog waveform viewer for SPICE-like simulations"
+HOMEPAGE="http://gwave.sourceforge.net";
+SRC_URI="https://downloads.sourceforge.net/${PN}/gwave3/${P}.tar.gz";
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="gnuplot plotutils"
+SLOT="0"
+
+REQUIRED_USE="${GUILE_REQUIRED_USE}"
+
+DEPEND="
+   ${GUILE_DEPS}
+   >=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
+   "${FILESDIR}"/${P}-lfs-shim.patch
+)
+
+src_prepare() {
+   guile-single_src_prepare
+
+   sed -i \
+   -e "s|guile-snarf|${GUILESNARF}|" \
+   -e "s|guile-tools|${GUILE/guile/guile-tools}|" \
+   src/Makefile.am || die
+   sed -i \
+   -e "s|guile-tools|${GUILE/guile/guile-tools}|" \
+   scheme/Makefile.am || die
+
+   eautoreconf
+}
+
+src_configure() {
+   # https://bugs.gentoo.org/886139
+   append-lfs-flags
+   econf
+}
+
+src_install() {
+   guile-single_src_install
+   newicon icons/wave-drag-ok.xpm gwave.xpm
+   make_desktop_entry gwave "Gwave" gwave "Electronics"
+}



[gentoo-commits] repo/gentoo:master commit in: sci-electronics/gwave/files/, sci-electronics/gwave/

2019-06-30 Thread Matt Turner
commit: 58b7e8af79445c38cc2dad1129c6d2212fb88ee9
Author: Matt Turner  gentoo  org>
AuthorDate: Sun Jun 30 23:50:54 2019 +
Commit: Matt Turner  gentoo  org>
CommitDate: Sun Jun 30 23:54:06 2019 +
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  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 000..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 
+Date: Thu, 11 Apr 2019 20:52:12 +
+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 != 0x0004 || hh.h3 != 0x0004) {
+-  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);
++