From 175bdbb4a632d8e2fbfbf78a6398d294e8e2562b Mon Sep 17 00:00:00 2001 From: Tee KOBAYASHI Date: Sat, 2 Apr 2022 07:53:36 +0900 Subject: [PATCH] new package: catgirl --- packages/catgirl/build.sh | 13 +++++++++++++ packages/catgirl/catgirl.1.patch | 11 +++++++++++ packages/catgirl/chat.h.patch | 15 +++++++++++++++ packages/catgirl/command.c.patch | 11 +++++++++++ packages/catgirl/xdg.c.patch | 19 +++++++++++++++++++ 5 files changed, 69 insertions(+) create mode 100644 packages/catgirl/build.sh create mode 100644 packages/catgirl/catgirl.1.patch create mode 100644 packages/catgirl/chat.h.patch create mode 100644 packages/catgirl/command.c.patch create mode 100644 packages/catgirl/xdg.c.patch diff --git a/packages/catgirl/build.sh b/packages/catgirl/build.sh new file mode 100644 index 000000000..92d18462f --- /dev/null +++ b/packages/catgirl/build.sh @@ -0,0 +1,13 @@ +TERMUX_PKG_HOMEPAGE=https://git.causal.agency/catgirl +TERMUX_PKG_DESCRIPTION="A TLS-only terminal IRC client" +TERMUX_PKG_LICENSE="GPL-3.0" +TERMUX_PKG_MAINTAINER="@termux" +TERMUX_PKG_VERSION=2.1 +TERMUX_PKG_SRCURL=https://git.causal.agency/catgirl/snapshot/catgirl-${TERMUX_PKG_VERSION}.tar.gz +TERMUX_PKG_SHA256=a68bfb82f625bcdf7bc5b7a6e1528fe3559bcded41f0d3c972f8b7e918bcee8e +TERMUX_PKG_DEPENDS="libandroid-support, libretls, ncurses, openssl" +TERMUX_PKG_BUILD_IN_SRC=true +TERMUX_PKG_EXTRA_CONFIGURE_ARGS=" +--mandir=$TERMUX_PREFIX/share/man +" +TERMUX_PKG_EXTRA_MAKE_ARGS="catgirl" diff --git a/packages/catgirl/catgirl.1.patch b/packages/catgirl/catgirl.1.patch new file mode 100644 index 000000000..bb1b1f4bb --- /dev/null +++ b/packages/catgirl/catgirl.1.patch @@ -0,0 +1,11 @@ +--- a/catgirl.1 ++++ b/catgirl.1 +@@ -874,7 +874,7 @@ + The shell used by + .Ic /exec . + The default is +-.Pa /bin/sh . ++.Pa @TERMUX_PREFIX@/bin/sh . + .It Ev USER + The default nickname. + .El diff --git a/packages/catgirl/chat.h.patch b/packages/catgirl/chat.h.patch new file mode 100644 index 000000000..8e0ee9123 --- /dev/null +++ b/packages/catgirl/chat.h.patch @@ -0,0 +1,15 @@ +--- a/chat.h ++++ b/chat.h +@@ -39,6 +39,12 @@ + #include + #include + ++#ifdef __ANDROID__ ++static void *(*volatile explicit_memset)(void *, int, size_t) = memset; ++#undef explicit_bzero ++#define explicit_bzero(s, n) explicit_memset(s, 0, n) ++#endif ++ + #define ARRAY_LEN(a) (sizeof(a) / sizeof(a[0])) + #define BIT(x) x##Bit, x = 1 << x##Bit, x##Bit_ = x##Bit + diff --git a/packages/catgirl/command.c.patch b/packages/catgirl/command.c.patch new file mode 100644 index 000000000..4f86876fc --- /dev/null +++ b/packages/catgirl/command.c.patch @@ -0,0 +1,11 @@ +--- a/command.c ++++ b/command.c +@@ -494,7 +494,7 @@ + dup2(execPipe[1], STDOUT_FILENO); + dup2(utilPipe[1], STDERR_FILENO); + +- const char *shell = getenv("SHELL") ?: "/bin/sh"; ++ const char *shell = getenv("SHELL") ?: "@TERMUX_PREFIX@/bin/sh"; + execl(shell, shell, "-c", params, NULL); + warn("%s", shell); + _exit(EX_UNAVAILABLE); diff --git a/packages/catgirl/xdg.c.patch b/packages/catgirl/xdg.c.patch new file mode 100644 index 000000000..896963e80 --- /dev/null +++ b/packages/catgirl/xdg.c.patch @@ -0,0 +1,19 @@ +--- a/xdg.c ++++ b/xdg.c +@@ -49,14 +49,14 @@ + .envHome = "XDG_CONFIG_HOME", + .envDirs = "XDG_CONFIG_DIRS", + .defHome = ".config", +- .defDirs = "/etc/xdg", ++ .defDirs = "@TERMUX_PREFIX@/etc/xdg", + }; + + static const struct Base Data = { + .envHome = "XDG_DATA_HOME", + .envDirs = "XDG_DATA_DIRS", + .defHome = ".local/share", +- .defDirs = "/usr/local/share:/usr/share", ++ .defDirs = "@TERMUX_PREFIX@/local/share:@TERMUX_PREFIX@/share", + }; + + static char *basePath(