From b17f81045810d42aa3ea2939e8c61a3bbd559bb8 Mon Sep 17 00:00:00 2001 From: tqfx Date: Sat, 27 Apr 2024 12:51:27 +0800 Subject: [PATCH] bump(main/edbrowse): 3.8.10 (#19929) --- packages/edbrowse/build.sh | 9 +++++++-- packages/edbrowse/src-makefile.patch | 15 --------------- 2 files changed, 7 insertions(+), 17 deletions(-) delete mode 100644 packages/edbrowse/src-makefile.patch diff --git a/packages/edbrowse/build.sh b/packages/edbrowse/build.sh index 9f3fe1afa8..9c8d51022f 100644 --- a/packages/edbrowse/build.sh +++ b/packages/edbrowse/build.sh @@ -4,9 +4,9 @@ TERMUX_PKG_DESCRIPTION="Line based editor, browser, and mail client" TERMUX_PKG_LICENSE="GPL-2.0, MIT" TERMUX_PKG_LICENSE_FILE="COPYING, LICENSE.quickjs" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION="3.8.9" +TERMUX_PKG_VERSION="3.8.10" TERMUX_PKG_SRCURL=https://github.com/CMB/edbrowse/archive/refs/tags/v${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=dae133d6b52be88864f8e696b8fc4ca4185e04857707713da8a0085bedf04e6b +TERMUX_PKG_SHA256=3c194ce45b7348211ce3ad8e3304a0eacf8b27e623cbf8c08687785f88174e03 TERMUX_PKG_AUTO_UPDATE=true TERMUX_PKG_UPDATE_TAG_TYPE="newest-tag" TERMUX_PKG_DEPENDS="libandroid-glob, libcurl, openssl, pcre2, readline, unixodbc" @@ -15,8 +15,13 @@ TERMUX_PKG_BUILD_IN_SRC=true TERMUX_PKG_EXTRA_MAKE_ARGS="-C src PREFIX=$TERMUX_PREFIX QUICKJS_INCLUDE=$TERMUX_PREFIX/include/quickjs +QUICKJS_LIB=$TERMUX_PREFIX/lib/quickjs " termux_step_post_get_source() { cp $TERMUX_PKG_BUILDER_DIR/LICENSE.quickjs ./ } + +termux_step_pre_configure() { + LDFLAGS+=" -landroid-glob" +} diff --git a/packages/edbrowse/src-makefile.patch b/packages/edbrowse/src-makefile.patch deleted file mode 100644 index 87c92ca092..0000000000 --- a/packages/edbrowse/src-makefile.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/src/makefile -+++ b/src/makefile -@@ -32,10 +32,10 @@ - CFLAGS += $(DEBUGFLAGS) - - # Libraries and linker flags for edbrowse. --LDFLAGS = $(STRIP) $(LINKER_LIBS) -lpthread -lm -lssl -lcrypto -+LDFLAGS = $(STRIP) $(LINKER_LIBS) -lpthread -lm -lssl -lcrypto -landroid-glob - - # LDFLAGS for quickjs loading. --QUICKJS_LDFLAGS = $(QUICKJS_LIB)/libquickjs.a -ldl -+QUICKJS_LDFLAGS = $(PREFIX)/lib/quickjs/libquickjs.a -ldl - ifeq ($(shell uname),Linux) - QUICKJS_LDFLAGS += -latomic - endif