From a21cceddda7697d7e642881711050914b03da0ee Mon Sep 17 00:00:00 2001 From: Leonid Pliushch Date: Sun, 7 Feb 2021 20:03:53 +0000 Subject: [PATCH] profanity: update to 0.10.0 --- packages/profanity/build.sh | 5 ++--- packages/profanity/cmd_funcs.c.patch | 31 +++++++--------------------- 2 files changed, 10 insertions(+), 26 deletions(-) diff --git a/packages/profanity/build.sh b/packages/profanity/build.sh index 2554508cac..8959dd3d16 100644 --- a/packages/profanity/build.sh +++ b/packages/profanity/build.sh @@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://profanity-im.github.io TERMUX_PKG_DESCRIPTION="Profanity is a console based XMPP client written in C using ncurses and libstrophe, inspired by Irssi" TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="Oliver Schmidhauser @Neo-Oli" -TERMUX_PKG_VERSION=0.9.5 -TERMUX_PKG_REVISION=2 +TERMUX_PKG_VERSION=0.10.0 TERMUX_PKG_SRCURL=https://github.com/profanity-im/profanity/releases/download/$TERMUX_PKG_VERSION/profanity-$TERMUX_PKG_VERSION.tar.gz -TERMUX_PKG_SHA256=23f7b2e5c6cf85913b9e7a228802bca9ecb1d1cf3bf8f8f285e9676176a24902 +TERMUX_PKG_SHA256=4a05e32590f9ec38430e33735bd02cfa199b257922b4116613f23912ca39ff8c TERMUX_PKG_DEPENDS="libandroid-support, libffi, ncurses, glib, libmesode, libcurl, readline, libuuid, libotr, gpgme, python, libassuan, libgpg-error, zlib, libsignal-protocol-c" TERMUX_PKG_BREAKS="profanity-dev" TERMUX_PKG_REPLACES="profanity-dev" diff --git a/packages/profanity/cmd_funcs.c.patch b/packages/profanity/cmd_funcs.c.patch index 42e190bae7..24a7fee2e0 100644 --- a/packages/profanity/cmd_funcs.c.patch +++ b/packages/profanity/cmd_funcs.c.patch @@ -1,27 +1,12 @@ -diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c -index f4b597c..b88092d 100644 ---- a/src/command/cmd_funcs.c -+++ b/src/command/cmd_funcs.c -@@ -46,7 +46,9 @@ - #include - #include - #include -+#ifndef __ANDROID__ - #include -+#endif - #include - - #include "profanity.h" -@@ -4746,7 +4748,11 @@ cmd_privileges(ProfWin *window, const char *const command, gchar **args) +diff -uNr profanity-0.10.0/src/command/cmd_funcs.c profanity-0.10.0.mod/src/command/cmd_funcs.c +--- profanity-0.10.0/src/command/cmd_funcs.c 2021-01-08 15:35:03.000000000 +0000 ++++ profanity-0.10.0.mod/src/command/cmd_funcs.c 2021-02-07 20:14:53.389297396 +0000 +@@ -5151,7 +5151,7 @@ gboolean - cmd_charset(ProfWin *window, const char *const command, gchar **args) + cmd_charset(ProfWin* window, const char* const command, gchar** args) { -- char *codeset = nl_langinfo(CODESET); -+ #if defined(__ANDROID__) -+ char *codeset = "UTF-8"; -+ #else -+ char *codeset = nl_langinfo(CODESET); -+ #endif - char *lang = getenv("LANG"); +- char* codeset = nl_langinfo(CODESET); ++ char* codeset = "UTF-8"; + char* lang = getenv("LANG"); cons_show("Charset information:");