diff --git a/packages/poke/build.sh b/packages/poke/build.sh index a0dbb24a34..ca49eee861 100644 --- a/packages/poke/build.sh +++ b/packages/poke/build.sh @@ -2,9 +2,24 @@ TERMUX_PKG_HOMEPAGE=http://www.jemarch.net/poke.html TERMUX_PKG_DESCRIPTION="Interactive, extensible editor for binary data." TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=2.4 +TERMUX_PKG_VERSION=3.0 TERMUX_PKG_SRCURL=https://mirrors.kernel.org/gnu/poke/poke-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=841e285917c6738ce982a6930e30ebeadecfb0655a79d9184f16f876a9fe6e47 -TERMUX_PKG_DEPENDS="readline, gettext, json-c, libgc" +TERMUX_PKG_SHA256=79a9b2f33c9f8c327c499afadaeeabfeecf6ad4988924d2c6c6f317e50317add +TERMUX_PKG_DEPENDS="gettext, libgc, ncurses, readline" TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" --with-sysroot=$(dirname $TERMUX_PREFIX) --disable-threads --disable-hserver" + +termux_step_pre_configure() { + _NEED_DUMMY_LIBPTHREAD_A= + _LIBPTHREAD_A=$TERMUX_PREFIX/lib/libpthread.a + if [ ! -e $_LIBPTHREAD_A ]; then + _NEED_DUMMY_LIBPTHREAD_A=true + echo '!' > $_LIBPTHREAD_A + fi +} + +termux_step_post_make_install() { + if [ $_NEED_DUMMY_LIBPTHREAD_A ]; then + rm -f $_LIBPTHREAD_A + fi +} diff --git a/packages/poke/gl-libpoke-stdio-impl.h.patch b/packages/poke/gl-libpoke-stdio-impl.h.patch deleted file mode 100644 index 4b595e8317..0000000000 --- a/packages/poke/gl-libpoke-stdio-impl.h.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/gl-libpoke/stdio-impl.h -+++ b/gl-libpoke/stdio-impl.h -@@ -68,8 +68,10 @@ - # elif defined __ANDROID__ /* Android */ - # ifdef __LP64__ - # define _gl_flags_file_t int -+# define _gl_struct_file_off_t int64_t - # else - # define _gl_flags_file_t short -+# define _gl_struct_file_off_t __kernel_off_t - # endif - /* Up to this commit from 2015-10-12 - -@@ -96,7 +98,7 @@ - unsigned char _nbuf[1]; \ - struct { unsigned char *_base; size_t _size; } _lb; \ - int _blksize; \ -- fpos_t _offset; \ -+ _gl_struct_file_off_t _offset; \ - /* More fields, not relevant here. */ \ - } *) fp) - # else diff --git a/packages/poke/gl-stdio-impl.h.patch b/packages/poke/gl-stdio-impl.h.patch deleted file mode 100644 index 84ce567d5e..0000000000 --- a/packages/poke/gl-stdio-impl.h.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/gl/stdio-impl.h -+++ b/gl/stdio-impl.h -@@ -68,8 +68,10 @@ - # elif defined __ANDROID__ /* Android */ - # ifdef __LP64__ - # define _gl_flags_file_t int -+# define _gl_struct_file_off_t int64_t - # else - # define _gl_flags_file_t short -+# define _gl_struct_file_off_t __kernel_off_t - # endif - /* Up to this commit from 2015-10-12 - -@@ -96,7 +98,7 @@ - unsigned char _nbuf[1]; \ - struct { unsigned char *_base; size_t _size; } _lb; \ - int _blksize; \ -- fpos_t _offset; \ -+ _gl_struct_file_off_t _offset; \ - /* More fields, not relevant here. */ \ - } *) fp) - # else