newsboat: Update from 2.17.1 to 2.18

packages/newsboat/avoid-gettext.patch

@@ -40,56 +40,6 @@ diff -uNr newsboat-2.17/rust/libnewsboat/src/cliargsparser.rs newsboat-2.17.mod/
                          &opts[0],
                          log_level_str
                      );
-diff -uNr newsboat-2.17/rust/libnewsboat/src/configpaths.rs newsboat-2.17.mod/rust/libnewsboat/src/configpaths.rs
---- newsboat-2.17/rust/libnewsboat/src/configpaths.rs	2019-09-22 17:19:19.000000000 +0300
-+++ newsboat-2.17.mod/rust/libnewsboat/src/configpaths.rs	2019-09-24 21:04:18.205613586 +0300
-@@ -1,6 +1,5 @@
- use cliargsparser::CliArgsParser;
- use dirs;
--use gettextrs::gettext;
- use libc;
- use logger::{self, Level};
- use std::fs::{self, DirBuilder};
-@@ -69,11 +68,9 @@
-             let uid = unsafe { libc::getuid() };
- 
-             config_paths.error_message = fmt!(
--                &gettext(
-                     "Fatal error: couldn't determine home directory!\n\
-                      Please set the HOME environment variable or add \
--                     a valid user for UID %u!"
--                ),
-+                     a valid user for UID %u!",
-                 uid
-             );
- 
-@@ -131,7 +128,7 @@
-         if !self.silent {
-             eprintln!(
-                 "{}",
--                &gettext("Migrating configs and data from Newsbeuter's XDG dirs...")
-+                "Migrating configs and data from Newsbeuter's XDG dirs..."
-             );
-         }
- 
-@@ -187,7 +184,7 @@
-         if !self.silent {
-             eprintln!(
-                 "{}",
--                &gettext("Migrating configs and data from Newsbeuter's dotdir...")
-+                "Migrating configs and data from Newsbeuter's dotdir..."
-             );
-         }
- 
-@@ -199,7 +196,7 @@
-                     eprintln!(
-                         "{}",
-                         &fmt!(
--                            &gettext("Aborting migration because mkdir on `%s' failed: %s"),
-+                            "Aborting migration because mkdir on `%s' failed: %s",
-                             &newsboat_dir.to_string_lossy().into_owned(),
-                             err.to_string()
-                         )
 diff -uNr newsboat-2.17/rust/libnewsboat/src/lib.rs newsboat-2.17.mod/rust/libnewsboat/src/lib.rs
 --- newsboat-2.17/rust/libnewsboat/src/lib.rs	2019-09-22 17:19:19.000000000 +0300
 +++ newsboat-2.17.mod/rust/libnewsboat/src/lib.rs	2019-09-24 20:56:44.030818719 +0300

packages/newsboat/build.sh

@@ -1,9 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://newsboat.org/
 TERMUX_PKG_DESCRIPTION="RSS/Atom feed reader for the text console"
 TERMUX_PKG_LICENSE="MIT"
-TERMUX_PKG_VERSION=2.17.1
+TERMUX_PKG_VERSION=2.18
 TERMUX_PKG_SRCURL=https://newsboat.org/releases/${TERMUX_PKG_VERSION}/newsboat-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=c1ebd24b017173156e817a1a3dd1d982808dec30a891e1f487806e5f86171997
+TERMUX_PKG_SHA256=f23932c0226ec3f69eac7668da444e73175048498e15e9d773451648b2cba4b0
 TERMUX_PKG_DEPENDS="libc++, libiconv, libandroid-support, libandroid-glob, json-c, libsqlite, libcurl, libxml2, stfl, ncurses, openssl"
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_RM_AFTER_INSTALL="share/locale"

packages/newsboat/fix-paths.patch

@@ -46,15 +46,3 @@ diff -uNr newsboat-2.14.1/src/pbcontroller.cpp newsboat-2.14.1.mod/src/pbcontrol
  		cfgparser.parse(config_file);
  	} catch (const ConfigException& ex) {
  		std::cout << ex.what() << std::endl;
-diff -uNr newsboat-2.14.1/src/rssparser.cpp newsboat-2.14.1.mod/src/rssparser.cpp
---- newsboat-2.14.1/src/rssparser.cpp	2019-02-10 18:07:09.000000000 +0200
-+++ newsboat-2.14.1.mod/src/rssparser.cpp	2019-03-01 21:51:38.203971227 +0200
-@@ -291,7 +291,7 @@
- {
- 	std::string buf = utils::retrieve_url(uri, cfgcont);
- 
--	char* argv[4] = {const_cast<char*>("/bin/sh"),
-+	char* argv[4] = {const_cast<char*>("@TERMUX_PREFIX@/bin/sh"),
- 		const_cast<char*>("-c"),
- 		const_cast<char*>(filter.c_str()),
- 		nullptr};

packages/newsboat/rust-libnewsboat-src-configpaths.rs.patch

@@ -0,0 +1,50 @@
+diff -u -r ../newsboat-2.18/rust/libnewsboat/src/configpaths.rs ./rust/libnewsboat/src/configpaths.rs
+--- ../newsboat-2.18/rust/libnewsboat/src/configpaths.rs	2019-12-22 11:56:20.000000000 +0000
++++ ./rust/libnewsboat/src/configpaths.rs	2020-01-02 20:41:18.852245000 +0000
+@@ -1,6 +1,5 @@
+ use cliargsparser::CliArgsParser;
+ use dirs;
+-use gettextrs::gettext;
+ use libc;
+ use logger::{self, Level};
+ use std::fs::{self, DirBuilder};
+@@ -69,11 +68,9 @@
+             let uid = unsafe { libc::getuid() };
+ 
+             config_paths.error_message = fmt!(
+-                &gettext(
+                     "Fatal error: couldn't determine home directory!\n\
+                      Please set the HOME environment variable or add \
+-                     a valid user for UID %u!"
+-                ),
++                     a valid user for UID %u!",
+                 uid
+             );
+ 
+@@ -131,7 +128,7 @@
+         if !self.silent {
+             eprintln!(
+                 "{}",
+-                &gettext("Migrating configs and data from Newsbeuter's XDG dirs...")
++                "Migrating configs and data from Newsbeuter's XDG dirs..."
+             );
+         }
+ 
+@@ -187,7 +184,7 @@
+         if !self.silent {
+             eprintln!(
+                 "{}",
+-                &gettext("Migrating configs and data from ~/.newsbeuter/...")
++                "Migrating configs and data from ~/.newsbeuter/..."
+             );
+         }
+ 
+@@ -199,7 +196,7 @@
+                     eprintln!(
+                         "{}",
+                         &fmt!(
+-                            &gettext("Aborting migration because mkdir on `%s' failed: %s"),
++                            "Aborting migration because mkdir on `%s' failed: %s",
+                             &newsboat_dir.to_string_lossy().into_owned(),
+                             err.to_string()
+                         )

packages/newsboat/src-rssparser.cpp.patch

@@ -0,0 +1,12 @@
+diff -u -r ../newsboat-2.18/src/rssparser.cpp ./src/rssparser.cpp
+--- ../newsboat-2.18/src/rssparser.cpp	2019-12-22 11:56:20.000000000 +0000
++++ ./src/rssparser.cpp	2020-01-02 20:37:50.905020000 +0000
+@@ -305,7 +305,7 @@
+ {
+ 	std::string buf = utils::retrieve_url(uri, cfgcont);
+ 
+-	char* argv[4] = {const_cast<char*>("/bin/sh"),
++	char* argv[4] = {const_cast<char*>("@TERMUX_PREFIX@/bin/sh"),
+ 			const_cast<char*>("-c"),
+ 			const_cast<char*>(filter.c_str()),
+ 			nullptr