fix(root/encfs): Fix build with current toolchain

See vgough/encfs#641
termux · Jun 18, 2024 · 1c79670 · 1c79670
1 parent b836246
commit 1c79670
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/root-packages/encfs/build.sh b/root-packages/encfs/build.sh
@@ -4,7 +4,7 @@ TERMUX_PKG_LICENSE="LGPL-3.0, GPL-3.0"
 TERMUX_PKG_MAINTAINER="@termux"
 _COMMIT=c444f9b9176beea1ad41a7b2e29ca26e709b57f7
 TERMUX_PKG_VERSION=2020.05.09-${_COMMIT:0:8}
-TERMUX_PKG_REVISION=2
+TERMUX_PKG_REVISION=3
 TERMUX_PKG_SRCURL=https://github.com/vgough/encfs/archive/${_COMMIT}.tar.gz
 TERMUX_PKG_SHA256=4b4d6b7465114ae74e2c9c6faea0411ea59bcea0f11193db72459e8bb73c16c7
 TERMUX_PKG_DEPENDS="libc++, libfuse2, openssl"
diff --git a/root-packages/encfs/unbreak-clang-build.patch b/root-packages/encfs/unbreak-clang-build.patch
@@ -0,0 +1,23 @@
+From 406b63bfe234864710d1d23329bf41d48001fbfa Mon Sep 17 00:00:00 2001
+From: Dmitri Goutnik <[email protected]>
+Date: Sat, 14 May 2022 14:09:40 -0500
+Subject: [PATCH] Unbreak build with llvm13.
+
+Fixes #641
+---
+ encfs/NullCipher.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/encfs/NullCipher.cpp b/encfs/NullCipher.cpp
+index 50dadffd..5e1a4729 100644
+--- a/encfs/NullCipher.cpp
++++ b/encfs/NullCipher.cpp
+@@ -76,7 +76,7 @@ class NullDestructor {
+   NullDestructor &operator=(const NullDestructor &) = delete; // copy assignment
+   NullDestructor& operator=(NullDestructor&& other) = delete; // move assignment
+
+-  void operator()(NullKey *&) {}
++  void operator()(NullKey *) {}
+ };
+ std::shared_ptr<AbstractCipherKey> gNullKey(new NullKey(), NullDestructor());
+