From 0688462562ddb0bf4bef1d5bfd9e60afa53185a7 Mon Sep 17 00:00:00 2001 From: Leonid Plyushch Date: Fri, 29 Nov 2019 14:10:51 +0200 Subject: [PATCH] disabled-packages: add guile, guile18, gopass from unstable repo --- disabled-packages/gopass/build.sh | 30 +++++++++ disabled-packages/gopass/clipboard.go.patch | 12 ++++ disabled-packages/guile/build.sh | 34 ++++++++-- disabled-packages/guile18/build.sh | 47 ++++++++++++++ disabled-packages/guile18/configure.patch | 70 +++++++++++++++++++++ 5 files changed, 189 insertions(+), 4 deletions(-) create mode 100644 disabled-packages/gopass/build.sh create mode 100644 disabled-packages/gopass/clipboard.go.patch create mode 100644 disabled-packages/guile18/build.sh create mode 100644 disabled-packages/guile18/configure.patch diff --git a/disabled-packages/gopass/build.sh b/disabled-packages/gopass/build.sh new file mode 100644 index 0000000000..0d2aa4452c --- /dev/null +++ b/disabled-packages/gopass/build.sh @@ -0,0 +1,30 @@ +TERMUX_PKG_HOMEPAGE=https://github.com/gopasspw/gopass +TERMUX_PKG_DESCRIPTION="The slightly more awesome standard unix password manager for teams." +TERMUX_PKG_LICENSE="MIT" +TERMUX_PKG_MAINTAINER="Leonid Plyushch " +TERMUX_PKG_VERSION=1.8.6 +TERMUX_PKG_SRCURL=https://github.com/gopasspw/gopass/archive/v$TERMUX_PKG_VERSION.tar.gz +TERMUX_PKG_SHA256=77bbf6ed9ecdcf153f40bdaa014835fe99ed505762b20f8d33be1c2f72199fdf +TERMUX_PKG_DEPENDS="git, gnupg" +TERMUX_PKG_SUGGESTS="termux-api" + +termux_step_make() { + termux_setup_golang + export GOPATH=$TERMUX_PKG_BUILDDIR + + mkdir -p ./src + mv "$TERMUX_PKG_SRCDIR"/vendor/* src/ + mkdir -p ./src/github.com/gopasspw + ln -sf "$TERMUX_PKG_SRCDIR" ./src/github.com/gopasspw/gopass + + # Build gopass for host so we can generate completion for shells. + GOOS=linux GOARCH=amd64 CC=gcc LD=gcc make -C ./src/github.com/gopasspw/gopass build completion + make -C ./src/github.com/gopasspw/gopass install PREFIX="$TERMUX_PREFIX" + + # Finally build gopass for target. + rm -f ./src/github.com/gopasspw/gopass/gopass + make -C ./src/github.com/gopasspw/gopass build + install -Dm700 \ + ./src/github.com/gopasspw/gopass/gopass \ + "$TERMUX_PREFIX"/bin/gopass +} diff --git a/disabled-packages/gopass/clipboard.go.patch b/disabled-packages/gopass/clipboard.go.patch new file mode 100644 index 0000000000..fd76aca160 --- /dev/null +++ b/disabled-packages/gopass/clipboard.go.patch @@ -0,0 +1,12 @@ +diff -uNr gopass-1.8.4/pkg/clipboard/clipboard.go gopass-1.8.4.mod/pkg/clipboard/clipboard.go +--- gopass-1.8.4/pkg/clipboard/clipboard.go 2018-12-26 19:16:38.000000000 +0200 ++++ gopass-1.8.4.mod/pkg/clipboard/clipboard.go 2019-01-30 14:46:13.327735051 +0200 +@@ -14,7 +14,7 @@ + + var ( + // ErrNotSupported is returned when the clipboard is not accessible +- ErrNotSupported = fmt.Errorf("WARNING: No clipboard available. Install xsel or xclip or use -p to print to console") ++ ErrNotSupported = fmt.Errorf("WARNING: No clipboard available. Install termux-api or use -p to print to console") + ) + + // CopyTo copies the given data to the clipboard and enqueues automatic diff --git a/disabled-packages/guile/build.sh b/disabled-packages/guile/build.sh index 8d6caab830..5136f57c0f 100644 --- a/disabled-packages/guile/build.sh +++ b/disabled-packages/guile/build.sh @@ -1,5 +1,31 @@ TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/guile/ -TERMUX_PKG_DESCRIPTION="GNU extension language and Scheme interpreter" -TERMUX_PKG_VERSION=2.0.11 -TERMUX_PKG_SRCURL=ftp://ftp.gnu.org/gnu/guile/guile-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_DEPENDS="libgmp, libunistring, libffi, libgc" +TERMUX_PKG_DESCRIPTION="Portable, embeddable Scheme implementation written in C" +TERMUX_PKG_LICENSE="GPL-2.0" +TERMUX_PKG_MAINTAINER="Leonid Plyushch " +TERMUX_PKG_VERSION=2.2.6 +TERMUX_PKG_SRCURL=https://ftp.gnu.org/gnu/guile/guile-$TERMUX_PKG_VERSION.tar.gz +TERMUX_PKG_SHA256=08c0e7487777740b61cdd97949b69e8a5e2997d8c2fe6c7e175819eb18444506 +TERMUX_PKG_DEPENDS="libandroid-support, libffi, libgc, libgmp, libltdl, libunistring" +TERMUX_PKG_BUILD_DEPENDS="libtool" +TERMUX_PKG_BREAKS="guile-dev" +TERMUX_PKG_REPLACES="guile-dev" +TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_type_complex_double=no ac_cv_search_clock_getcpuclockid=false ac_cv_func_GC_move_disappearing_link=yes ac_cv_func_GC_is_heap_ptr=yes" +TERMUX_PKG_HOSTBUILD=true + +termux_step_host_build() { + mkdir HOSTBUILDINSTALL + + ../src/configure --prefix=$TERMUX_PKG_HOSTBUILD_DIR/HOSTBUILDINSTALL # CFLAGS="-m32" LDFLAGS=" -L/usr/lib/i386-linux-gnu" --host=i386-linux-gnu + make -j $TERMUX_MAKE_PROCESSES + make install +} + +termux_step_pre_configure() { + + export GUILE_FOR_BUILD="$TERMUX_PKG_HOSTBUILD_DIR"/HOSTBUILDINSTALL/bin/guile + export LD_LIBRARY_PATH="$TERMUX_PKG_HOSTBUILD_DIR"/HOSTBUILDINSTALL/lib +} + +termux_step_post_massage() { + sed -i 's',"$TERMUX_STANDALONE_TOOLCHAIN/bin/$TERMUX_HOST_PLATFORM-pkg-config","$TERMUX_PREFIX/bin/pkg-config",'g' $TERMUX_PKG_MASSAGEDIR$TERMUX_PREFIX/bin/guile-config +} diff --git a/disabled-packages/guile18/build.sh b/disabled-packages/guile18/build.sh new file mode 100644 index 0000000000..fec096db0a --- /dev/null +++ b/disabled-packages/guile18/build.sh @@ -0,0 +1,47 @@ +TERMUX_PKG_HOMEPAGE=http://www.gnu.org/software/guile/ +TERMUX_PKG_DESCRIPTION="Portable, embeddable Scheme implementation written in C. (legacy branch)" +TERMUX_PKG_LICENSE="GPL-2.0" +TERMUX_PKG_MAINTAINER="Leonid Plyushch " +TERMUX_PKG_VERSION=1.8.8 +TERMUX_PKG_REVISION=8 +TERMUX_PKG_SRCURL=ftp://ftp.gnu.org/pub/gnu/guile/guile-$TERMUX_PKG_VERSION.tar.gz +TERMUX_PKG_SHA256=c3471fed2e72e5b04ad133bbaaf16369e8360283679bcf19800bc1b381024050 +TERMUX_PKG_DEPENDS="libcrypt, libgmp, libltdl, ncurses, readline" +TERMUX_PKG_BUILD_DEPENDS="libtool" +TERMUX_PKG_BREAKS="guile18-dev" +TERMUX_PKG_REPLACES="guile18-dev" +TERMUX_PKG_HOSTBUILD=true + +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +--program-suffix=1.8 +--disable-error-on-warning" + +termux_step_host_build() { + mkdir HOSTBUILDINSTALL + + ../src/configure \ + --prefix="$TERMUX_PKG_HOSTBUILD_DIR"/HOSTBUILDINSTALL \ + --program-suffix=1.8 \ + --disable-error-on-warning + + make -j "$TERMUX_MAKE_PROCESSES" + make install +} + +termux_step_pre_configure() { + CFLAGS=${CFLAGS/Oz/Os} + + if [ $TERMUX_ARCH = "i686" ]; then + TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --without-threads" + fi + + export GUILE_FOR_BUILD="$TERMUX_PKG_HOSTBUILD_DIR"/HOSTBUILDINSTALL/bin/guile1.8 + export LD_LIBRARY_PATH="$TERMUX_PKG_HOSTBUILD_DIR"/HOSTBUILDINSTALL/lib +} + +termux_step_post_make_install() { + sed -i '1s/guile/guile1.8/' -i "$TERMUX_PREFIX"/bin/guile-config1.8 + mv -f \ + "$TERMUX_PREFIX"/share/aclocal/guile.m4 \ + "$TERMUX_PREFIX"/share/aclocal/guile18.m4 +} diff --git a/disabled-packages/guile18/configure.patch b/disabled-packages/guile18/configure.patch new file mode 100644 index 0000000000..9b84361d26 --- /dev/null +++ b/disabled-packages/guile18/configure.patch @@ -0,0 +1,70 @@ +diff -uNr guile-1.8.8/configure guile-1.8.8.mod/configure +--- guile-1.8.8/configure 2010-12-13 21:29:32.000000000 +0200 ++++ guile-1.8.8.mod/configure 2019-02-05 17:02:45.956253956 +0200 +@@ -19794,66 +19794,9 @@ + + + +-## Check whether pthread_attr_getstack works for the main thread +- + if test "$with_threads" = pthreads; then +- +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthread_attr_getstack works for the main thread" >&5 +-$as_echo_n "checking whether pthread_attr_getstack works for the main thread... " >&6; } +-old_CFLAGS="$CFLAGS" +-CFLAGS="$PTHREAD_CFLAGS $CFLAGS" +-if test "$cross_compiling" = yes; then : +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error $? "cannot run test program while cross compiling +-See \`config.log' for more details" "$LINENO" 5; } +-else +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-#if HAVE_PTHREAD_ATTR_GETSTACK +-#include +- +-int main () +-{ +- pthread_attr_t attr; +- void *start, *end; +- size_t size; +- +- pthread_getattr_np (pthread_self (), &attr); +- pthread_attr_getstack (&attr, &start, &size); +- end = (char *)start + size; +- +- if ((void *)&attr < start || (void *)&attr >= end) +- return 1; +- else +- return 0; +-} +-#else +-int main () +-{ +- return 1; +-} +-#endif +- +-_ACEOF +-if ac_fn_c_try_run "$LINENO"; then : +- works=yes +- + $as_echo "#define PTHREAD_ATTR_GETSTACK_WORKS 1" >>confdefs.h +- +-else +- works=no + fi +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ +- conftest.$ac_objext conftest.beam conftest.$ac_ext +-fi +- +-CFLAGS="$old_CFLAGS" +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $works" >&5 +-$as_echo "$works" >&6; } +- +-fi # with_threads=pthreads + + + ## Cross building