gnucap: update to 20210107

This commit is contained in:
Henrik Grimler 2021-09-12 16:07:52 +02:00
parent a0698575f6
commit 53a68414f1
3 changed files with 6 additions and 29 deletions

View File

@ -1,11 +1,11 @@
--- ./apps/Make1.orig 2019-01-25 23:36:01.916529515 +0100
+++ ./apps/Make1 2019-01-25 23:38:28.213195130 +0100
--- ./apps/Make1.orig 2021-09-12 13:58:56.131980584 +0000
+++ ./apps/Make1 2021-09-12 13:59:54.468571515 +0000
@@ -119,8 +119,8 @@
MAINTAINERCLEANFILES = $(DISTCLEANFILES)
#------------------------------------------------------------------------
#------------------------------------------------------------------------
-LIBPATH = `pwd | sed 's/apps/lib/g'`
-MODELGEN = `pwd | sed 's/apps/modelgen/g'`/gnucap-modelgen
-LIBPATH = `pwd | sed 's/\(.*\)apps/\1lib/'`
-MODELGEN = `pwd | sed 's/\(.*\)apps/\1modelgen/'`/gnucap-modelgen
+LIBPATH = @TERMUX_PKG_HOSTBUILD_DIR@/lib/O
+MODELGEN = @TERMUX_PKG_HOSTBUILD_DIR@/modelgen/O/gnucap-modelgen
#------------------------------------------------------------------------

View File

@ -2,16 +2,14 @@ TERMUX_PKG_HOMEPAGE=https://www.gnu.org/software/gnucap/gnucap.html
TERMUX_PKG_DESCRIPTION="The Gnu Circuit Analysis Package"
TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91"
TERMUX_PKG_LICENSE="GPL-3.0"
TERMUX_PKG_VERSION=20171003
TERMUX_PKG_REVISION=4
TERMUX_PKG_VERSION=20210107
TERMUX_PKG_SRCURL=https://gitlab.com/gnucap/gnucap/-/archive/${TERMUX_PKG_VERSION}/gnucap-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=2facf5e945cf253727bef9b8e2602767599ea77a6c0d8c5d91101764544fa09a
TERMUX_PKG_SHA256=d2c24a66c7e60b379727c9e9487ed1b4a3532646b3f4cc03c6a4305749e3348b
TERMUX_PKG_DEPENDS="libc++, readline"
TERMUX_PKG_BREAKS="gnucap-dev"
TERMUX_PKG_REPLACES="gnucap-dev"
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_HOSTBUILD=true
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--prefix=$TERMUX_PREFIX"
termux_step_host_build () {
cp -r $TERMUX_PKG_SRCDIR/* .

View File

@ -1,21 +0,0 @@
diff -u -r ../gnucap-20171003/lib/c_attach.cc ./lib/c_attach.cc
--- ../gnucap-20171003/lib/c_attach.cc 2017-10-04 00:50:49.000000000 +0200
+++ ./lib/c_attach.cc 2019-01-24 22:30:16.059909732 +0100
@@ -36,7 +36,7 @@
/*--------------------------------------------------------------------------*/
void list()
{
- for (std::map<std::string, void*>::iterator
+ for (std::map<const std::string, void*>::iterator
ii = attach_list.begin(); ii != attach_list.end(); ++ii) {
if (ii->second) {
IO::mstdout << ii->first << '\n';
@@ -179,7 +179,7 @@
void do_it(CS& cmd, CARD_LIST*)
{
if (CARD_LIST::card_list.is_empty()) {
- for (std::map<std::string, void*>::iterator
+ for (std::map<const std::string, void*>::iterator
ii = attach_list.begin(); ii != attach_list.end(); ++ii) {
void* handle = ii->second;
if (handle) {