newsboat: Update from 2.15 to 2.16.1

packages/newsboat/Makefile.patch

@@ -1,7 +1,7 @@
-diff -u -r ../newsboat-2.15/Makefile ./Makefile
---- ../newsboat-2.15/Makefile	2019-03-23 16:51:04.000000000 +0000
-+++ ./Makefile	2019-03-29 23:20:51.088253113 +0000
-@@ -23,7 +23,7 @@
+diff -u -r ../newsboat-2.16.1/Makefile ./Makefile
+--- ../newsboat-2.16.1/Makefile	2019-06-26 17:55:21.000000000 +0000
++++ ./Makefile	2019-08-06 17:59:51.574712056 +0000
+@@ -18,7 +18,7 @@
  
  WARNFLAGS=-Werror -Wall -Wextra -Wunreachable-code
  INCLUDES=-Iinclude -Istfl -Ifilter -I. -Irss
@@ -10,7 +10,7 @@ diff -u -r ../newsboat-2.15/Makefile ./Makefile
  LDFLAGS+=-L.
  
  PACKAGE=newsboat
-@@ -37,7 +37,7 @@
+@@ -32,7 +32,7 @@
  LDFLAGS+=-fprofile-arcs -ftest-coverage
  endif
  
@@ -19,27 +19,21 @@ diff -u -r ../newsboat-2.15/Makefile ./Makefile
  CXXFLAGS_FOR_BUILD?=$(CXXFLAGS)
  
  LIB_SOURCES:=$(shell cat mk/libboat.deps)
-@@ -51,7 +51,7 @@
+@@ -46,7 +46,7 @@
  NEWSBOAT=newsboat
  NEWSBOAT_SOURCES:=$(shell cat mk/newsboat.deps)
  NEWSBOAT_OBJS:=$(patsubst %.cpp,%.o,$(NEWSBOAT_SOURCES))
--NEWSBOAT_LIBS=-lboat -lfilter -lpthread -lrsspp
-+NEWSBOAT_LIBS=-lboat -lfilter -lrsspp -landroid-glob
+-NEWSBOAT_LIBS=-lboat -lnewsboat -lfilter -lpthread -lrsspp -ldl
++NEWSBOAT_LIBS=-lboat -lnewsboat -lfilter -lrsspp -landroid-glob
  
  RSSPPLIB_SOURCES=$(sort $(wildcard rss/*.cpp))
  RSSPPLIB_OBJS=$(patsubst rss/%.cpp,rss/%.o,$(RSSPPLIB_SOURCES))
-@@ -76,12 +76,12 @@
- endif
- CARGO_FLAGS+=--release
- endif
--LDFLAGS+=-lnewsboat -lpthread -ldl
-+LDFLAGS+=-lnewsboat
- 
+@@ -75,7 +75,7 @@
  PODBOAT=podboat
  PODBOAT_SOURCES:=$(shell cat mk/podboat.deps)
  PODBOAT_OBJS:=$(patsubst %.cpp,%.o,$(PODBOAT_SOURCES))
--PODBOAT_LIBS=-lboat -lpthread
-+PODBOAT_LIBS=-lboat
+-PODBOAT_LIBS=-lboat -lnewsboat -lpthread -ldl
++PODBOAT_LIBS=-lboat -lnewsboat -ldl
  
  ifeq (, $(filter Linux GNU GNU/%, $(shell uname -s)))
  NEWSBOAT_LIBS+=-liconv -lintl

packages/newsboat/avoid-gettext.patch

@@ -0,0 +1,53 @@
+diff -u -r ../newsboat-2.16.1/rust/libnewsboat/Cargo.toml ./rust/libnewsboat/Cargo.toml
+--- ../newsboat-2.16.1/rust/libnewsboat/Cargo.toml	2019-06-26 17:55:21.000000000 +0000
++++ ./rust/libnewsboat/Cargo.toml	2019-08-05 00:21:20.075339058 +0000
+@@ -18,7 +18,6 @@
+ unicode-segmentation = "1"
+ curl-sys = "0.4.5"
+ libc = "0.2"
+-gettext-rs = "0.4.1"
+ 
+ # We don't use the following crates, but we pin their versions to make sure
+ # that Newsboat builds with Rust 1.25 and later.
+@@ -35,12 +34,6 @@
+ #   I want as little dependencies as practically possible.
+ default-features = false
+ 
+-[dependencies.gettext-sys]
+-version = "0.19.8"
+-# Don't let the crate build its own copy of gettext; force it to use the one
+-# built into glibc.
+-features = [ "gettext-system" ]
+-
+ [dev-dependencies]
+ tempfile = "3"
+ proptest = "0.7"
+diff -u -r ../newsboat-2.16.1/rust/libnewsboat/src/cliargsparser.rs ./rust/libnewsboat/src/cliargsparser.rs
+--- ../newsboat-2.16.1/rust/libnewsboat/src/cliargsparser.rs	2019-06-26 17:55:21.000000000 +0000
++++ ./rust/libnewsboat/src/cliargsparser.rs	2019-08-05 00:20:55.315653682 +0000
+@@ -1,5 +1,4 @@
+ use clap::{App, Arg};
+-use gettextrs::gettext;
+ use libc::{EXIT_FAILURE, EXIT_SUCCESS};
+ 
+ use logger::Level;
+@@ -281,7 +280,7 @@
+                 }
+                 _ => {
+                     args.display_msg = fmt!(
+-                        &gettext("%s: %s: invalid loglevel value"),
++                        "%s: %s: invalid loglevel value",
+                         &opts[0],
+                         log_level_str
+                     );
+diff -u -r ../newsboat-2.16.1/rust/libnewsboat/src/lib.rs ./rust/libnewsboat/src/lib.rs
+--- ../newsboat-2.16.1/rust/libnewsboat/src/lib.rs	2019-06-26 17:55:21.000000000 +0000
++++ ./rust/libnewsboat/src/lib.rs	2019-08-05 00:21:05.675522029 +0000
+@@ -9,7 +9,6 @@
+ #[macro_use]
+ extern crate proptest;
+ extern crate clap;
+-extern crate gettextrs;
+ extern crate libc;
+ 
+ // This module must be declared before the others because it exports a `log!` macro that everyone

packages/newsboat/build.sh

@@ -1,10 +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.15
-TERMUX_PKG_REVISION=3
+TERMUX_PKG_VERSION=2.16.1
 TERMUX_PKG_SRCURL=https://newsboat.org/releases/${TERMUX_PKG_VERSION}/newsboat-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=da68ce93c02dda908a471ef8994bb3c668f060eb6046d486c3f05649c6650db7
+TERMUX_PKG_SHA256=4023c817b36fc08a3191283eec2c7161949c0727633f60ad837e11c599d3ad53
 TERMUX_PKG_DEPENDS="libc++, libiconv, libandroid-support, libandroid-glob, json-c, libsqlite, libcurl, libxml2, stfl, ncurses, openssl"
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_RM_AFTER_INSTALL="share/locale"
@@ -22,4 +21,6 @@ termux_step_pre_configure() {
 	export CARGO_BUILD_TARGET=$CARGO_TARGET_NAME
 
 	LDFLAGS+=" -liconv"
+
+	export PKG_CONFIG_ALLOW_CROSS=1
 }