diff --git a/packages/libffi/0001-forward-declare-open_temp_exec_file.patch b/packages/libffi/0001-forward-declare-open_temp_exec_file.patch deleted file mode 100644 index c86f0f8e79..0000000000 --- a/packages/libffi/0001-forward-declare-open_temp_exec_file.patch +++ /dev/null @@ -1,47 +0,0 @@ -https://github.com/termux/termux-packages/issues/15852 -https://github.com/libffi/libffi/commit/ce077e5565366171aa1b4438749b0922fce887a4 - -From ce077e5565366171aa1b4438749b0922fce887a4 Mon Sep 17 00:00:00 2001 -From: serge-sans-paille -Date: Thu, 2 Feb 2023 14:46:29 +0000 -Subject: [PATCH] Forward declare open_temp_exec_file (#764) - -It's defined in closures.c and used in tramp.c. -Also declare it as an hidden symbol, as it should be. - -Co-authored-by: serge-sans-paille ---- - include/ffi_common.h | 4 ++++ - src/tramp.c | 4 ++++ - 2 files changed, 8 insertions(+) - -diff --git a/include/ffi_common.h b/include/ffi_common.h -index 2bd31b03d..c53a79493 100644 ---- a/include/ffi_common.h -+++ b/include/ffi_common.h -@@ -128,6 +128,10 @@ void *ffi_data_to_code_pointer (void *data) FFI_HIDDEN; - static trampoline. */ - int ffi_tramp_is_present (void *closure) FFI_HIDDEN; - -+/* Return a file descriptor of a temporary zero-sized file in a -+ writable and executable filesystem. */ -+int open_temp_exec_file(void) FFI_HIDDEN; -+ - /* Extended cif, used in callback from assembly routine */ - typedef struct - { -diff --git a/src/tramp.c b/src/tramp.c -index 7e005b054..5f19b557f 100644 ---- a/src/tramp.c -+++ b/src/tramp.c -@@ -39,6 +39,10 @@ - #ifdef __linux__ - #define _GNU_SOURCE 1 - #endif -+ -+#include -+#include -+ - #include - #include - #include diff --git a/packages/libffi/0002-put-optional-symbols-behind-ifdefs.patch b/packages/libffi/0002-put-optional-symbols-behind-ifdefs.patch deleted file mode 100644 index 6840e4ff08..0000000000 --- a/packages/libffi/0002-put-optional-symbols-behind-ifdefs.patch +++ /dev/null @@ -1,39 +0,0 @@ -https://github.com/termux/termux-packages/issues/18804 -https://github.com/libffi/libffi/commit/44f6fa3e526c920c61c8ac10661f447ccfe30872 - -From 44f6fa3e526c920c61c8ac10661f447ccfe30872 Mon Sep 17 00:00:00 2001 -From: Alfred Wingate -Date: Fri, 20 Oct 2023 15:02:37 +0300 -Subject: [PATCH] Put optional symbols behind ifdefs (#800) - -Signed-off-by: Alfred Wingate ---- - libffi.map.in | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/libffi.map.in b/libffi.map.in -index de8778ae4..08c50b22d 100644 ---- a/libffi.map.in -+++ b/libffi.map.in -@@ -33,7 +33,10 @@ LIBFFI_BASE_8.0 { - ffi_raw_to_ptrarray; - ffi_raw_size; - -+#if !FFI_NATIVE_RAW_API - ffi_java_raw_call; -+#endif -+ - ffi_java_ptrarray_to_raw; - ffi_java_raw_to_ptrarray; - ffi_java_raw_size; -@@ -62,8 +65,10 @@ LIBFFI_CLOSURE_8.0 { - ffi_prep_closure_loc; - ffi_prep_raw_closure; - ffi_prep_raw_closure_loc; -+#if !FFI_NATIVE_RAW_API - ffi_prep_java_raw_closure; - ffi_prep_java_raw_closure_loc; -+#endif - } LIBFFI_BASE_8.0; - #endif - diff --git a/packages/libffi/build.sh b/packages/libffi/build.sh index 0fb27fbafd..d3f354e5ec 100644 --- a/packages/libffi/build.sh +++ b/packages/libffi/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://sourceware.org/libffi/ TERMUX_PKG_DESCRIPTION="Library providing a portable, high level programming interface to various calling conventions" TERMUX_PKG_LICENSE="MIT" TERMUX_PKG_MAINTAINER="@termux" -TERMUX_PKG_VERSION=3.4.4 -TERMUX_PKG_REVISION=1 +TERMUX_PKG_VERSION="3.4.6" TERMUX_PKG_SRCURL=https://github.com/libffi/libffi/releases/download/v${TERMUX_PKG_VERSION}/libffi-${TERMUX_PKG_VERSION}.tar.gz -TERMUX_PKG_SHA256=d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676 +TERMUX_PKG_SHA256=b0dea9df23c863a7a50e825440f3ebffabd65df1497108e5d437747843895a4e TERMUX_PKG_BREAKS="libffi-dev" TERMUX_PKG_REPLACES="libffi-dev" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--disable-multi-os-directory"