* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/xnec2c/files/, sci-electronics/xnec2c/
@ 2021-12-04 15:20 Thomas Beierlein
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Beierlein @ 2021-12-04 15:20 UTC (permalink / raw
To: gentoo-commits
commit: ef54588473f4d660dd9b17d7e62ee958385bc615
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 4 15:19:54 2021 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Sat Dec 4 15:19:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef545884
sci-electronics/xnec2c: Version bump
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
sci-electronics/xnec2c/Manifest | 1 +
sci-electronics/xnec2c/files/xnec2c-template.patch | 28 +++++++++++++
sci-electronics/xnec2c/xnec2c-4.2.ebuild | 46 ++++++++++++++++++++++
3 files changed, 75 insertions(+)
diff --git a/sci-electronics/xnec2c/Manifest b/sci-electronics/xnec2c/Manifest
index 2e9161df57da..3f5c8f207b13 100644
--- a/sci-electronics/xnec2c/Manifest
+++ b/sci-electronics/xnec2c/Manifest
@@ -1 +1,2 @@
DIST xnec2c-4.1.1.tar.bz2 947969 BLAKE2B 81794dc557d5cc845043be97e07b628e69dcd26fddb3886d11bf31374eba0187491ad9787187f8f4a19cf04f644288c680d3b8778a7b6e144209951b25bbfbf1 SHA512 3a97521f568d79158d5d224958e4cb3708de8214476ba228f9ce0ac122899eb9b06f596d5b0c43a85a18dbd6d86e0751f1a70128c14dd8972f10deeb5a1db980
+DIST xnec2c-4.2.tar.bz2 939408 BLAKE2B 5fbecf436bfebb6979c12d7f76d708a21d784ee5f4f38c6010c5fd16ebe5324ea5469ea578c4ac7fabc26a82e7ea5d5bf6206be79482a9e454183c7b082a20a8 SHA512 bc0929e3cb01eb355c1eb8615087cc70c4585db75d0e6664237e8e268c5dc2159ec9852d917c9fe6b06a3fa780d7ae0b806c2e5cbf48a60622ee4558d9d82063
diff --git a/sci-electronics/xnec2c/files/xnec2c-template.patch b/sci-electronics/xnec2c/files/xnec2c-template.patch
new file mode 100644
index 000000000000..fa09bbdb9830
--- /dev/null
+++ b/sci-electronics/xnec2c/files/xnec2c-template.patch
@@ -0,0 +1,28 @@
+# Install template files in /usr/share/xnec2c
+diff --git a/Makefile.am b/Makefile.am
+index 9e8873a..6f6203e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -62,7 +62,7 @@ install-data-local:
+ $(install_sh_DATA) doc/$(PACKAGE).1.gz $(DESTDIR)$(mandir)/man1/; \
+ fi;
+ if test -d .$(PACKAGE)/; then \
+- $(MKDIR_P) $(DESTDIR)$(datarootdir)/examples/$(PACKAGE)/;\
+- cp -r .$(PACKAGE)/* $(DESTDIR)$(datarootdir)/examples/$(PACKAGE)/; \
++ $(MKDIR_P) $(DESTDIR)$(datarootdir)/$(PACKAGE)/;\
++ cp -r .$(PACKAGE)/* $(DESTDIR)$(datarootdir)/$(PACKAGE)/; \
+ fi;
+
+diff --git a/src/main.c b/src/main.c
+index 4cb541e..6883ceb 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -88,7 +88,7 @@ main (int argc, char *argv[])
+ /* Create file path to xnec2c examples directory */
+ exe_path[bytes] = '\0';
+ Strlcpy( file_path, exe_path, sizeof(file_path) );
+- Strlcat( file_path, "/share/examples/xnec2c", sizeof(file_path) );
++ Strlcat( file_path, "/share/xnec2c", sizeof(file_path) );
+ fprintf( stderr, "xnec2c: creating xnec2c config directory from: %s\n", file_path );
+
+ /* Create system command to copy examples/xnec2c to ~/.xnec2c */
diff --git a/sci-electronics/xnec2c/xnec2c-4.2.ebuild b/sci-electronics/xnec2c/xnec2c-4.2.ebuild
new file mode 100644
index 000000000000..bdc030a2fa5c
--- /dev/null
+++ b/sci-electronics/xnec2c/xnec2c-4.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools xdg-utils
+
+DESCRIPTION="A GTK+ graphical interactive version of nec2c"
+HOMEPAGE="https://www.qsl.net/5b4az/pages/nec2.html"
+SRC_URI="https://www.qsl.net/5b4az/pkg/nec2/xnec2c/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RDEPEND="dev-libs/glib:2
+ x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+ sys-devel/gettext"
+
+src_prepare() {
+ eapply_user
+ eapply "${FILESDIR}/${PN}-template.patch"
+ eautoreconf
+}
+
+src_install() {
+ default
+
+ docompress -x /usr/share/man
+ dodoc AUTHORS README doc/*.txt
+ use doc && dodoc -r doc/*.html doc/images
+ if use examples ; then
+ docinto examples
+ dodoc examples/*
+ fi
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sci-electronics/xnec2c/files/, sci-electronics/xnec2c/
@ 2022-02-25 5:54 Thomas Beierlein
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Beierlein @ 2022-02-25 5:54 UTC (permalink / raw
To: gentoo-commits
commit: 5ffa7558b47964913a0c88edb85c0eca3020d7bc
Author: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 25 05:54:02 2022 +0000
Commit: Thomas Beierlein <tomjbe <AT> gentoo <DOT> org>
CommitDate: Fri Feb 25 05:54:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ffa7558
sci-electronics/xnec2c: Fix musl related compile problems
After discussion with upstream drop left overs from experiments with
handling of some dynamic libraries. That fixes the problems with the use
of dlinfo() and backtrack_symbols().
Closes: https://bugs.gentoo.org/832744
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Thomas Beierlein <tomjbe <AT> gentoo.org>
.../xnec2c/files/xnec2c-4.4.5-musl.patch | 63 ++++++++++++++++++++++
sci-electronics/xnec2c/xnec2c-4.4.5.ebuild | 3 ++
2 files changed, 66 insertions(+)
diff --git a/sci-electronics/xnec2c/files/xnec2c-4.4.5-musl.patch b/sci-electronics/xnec2c/files/xnec2c-4.4.5-musl.patch
new file mode 100644
index 000000000000..a995463224b0
--- /dev/null
+++ b/sci-electronics/xnec2c/files/xnec2c-4.4.5-musl.patch
@@ -0,0 +1,63 @@
+diff --git a/src/mathlib.c b/src/mathlib.c
+index 5354240..b28033e 100644
+--- a/src/mathlib.c
++++ b/src/mathlib.c
+@@ -155,9 +155,6 @@ int open_mathlib(mathlib_t *lib)
+ return 0;
+ }
+
+- if (dlinfo(lib->handle, RTLD_DI_LMID, &lib->lmid) == -1)
+- printf("dlinfo: %s: %s\n", lib->lib, dlerror());
+-
+ // Call the init() function if configured
+ if (lib->init != NULL)
+ lib->init(lib);
+@@ -217,14 +214,7 @@ void init_mathlib()
+ mathlibs[libidx].available = 1;
+
+ // At this point the library load was successful, provide detail:
+- if (mathlibs[libidx].handle != NULL)
+- {
+- char lpath[PATH_MAX];
+- dlinfo(mathlibs[libidx].handle, RTLD_DI_ORIGIN, lpath);
+- printf(" loaded ok: %s/%s\n", lpath, mathlibs[libidx].lib);
+- }
+- else
+- printf(" loaded ok.\n");
++ printf(" loaded ok.\n");
+
+ // Set the default to the first one we find:
+ if (current_mathlib == NULL)
+diff --git a/src/utils.c b/src/utils.c
+index b803402..1462df2 100644
+--- a/src/utils.c
++++ b/src/utils.c
+@@ -17,7 +17,7 @@
+ * https://www.xnec2c.org/
+ */
+
+-#include <execinfo.h>
++//#include <execinfo.h>
+
+ #include "utils.h"
+ #include "shared.h"
+@@ -736,18 +736,7 @@ void _print_backtrace(char **strings)
+ // Return an array of backtrace strings. The value returned must be free()'ed.
+ char **_get_backtrace()
+ {
+- void *array[10];
+- char **strings;
+- int size;
+-
+- size = backtrace(array, 10);
+- strings = backtrace_symbols(array, size);
+-
+- // This wastes an array entry, but allows _print_backtrace() to find
+- // the end of the list without realloc'ing space for a NULL:
+- strings[size-1] = NULL;
+-
+- return strings;
++ return NULL;
+ }
+
+ void print_backtrace(char *msg)
diff --git a/sci-electronics/xnec2c/xnec2c-4.4.5.ebuild b/sci-electronics/xnec2c/xnec2c-4.4.5.ebuild
index d305cccd2dda..6c495a7c80f8 100644
--- a/sci-electronics/xnec2c/xnec2c-4.4.5.ebuild
+++ b/sci-electronics/xnec2c/xnec2c-4.4.5.ebuild
@@ -21,10 +21,13 @@ RDEPEND="dev-libs/glib:2
DEPEND="${RDEPEND}
sys-devel/gettext"
+PATCHES=( "${FILESDIR}/$PN-4.4.5-musl.patch" )
+
S="${WORKDIR}/${MY_P}"
src_prepare() {
eapply_user
+ eapply ${PATCHES[@]}
eautoreconf
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-02-25 5:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-04 15:20 [gentoo-commits] repo/gentoo:master commit in: sci-electronics/xnec2c/files/, sci-electronics/xnec2c/ Thomas Beierlein
-- strict thread matches above, loose matches on Subject: below --
2022-02-25 5:54 Thomas Beierlein
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox