From 70fd49636202fb19a2f283be3f7f06950eeccbdc Mon Sep 17 00:00:00 2001 From: Butta Date: Sun, 9 Aug 2020 20:50:35 +0530 Subject: [PATCH] newsboat: update from 2.19 to 2.20.1 --- packages/newsboat/Makefile.patch | 4 ++-- packages/newsboat/avoid-gettext.patch | 11 ----------- packages/newsboat/build.sh | 5 ++--- 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/packages/newsboat/Makefile.patch b/packages/newsboat/Makefile.patch index 285c598b5..2fd8b1874 100644 --- a/packages/newsboat/Makefile.patch +++ b/packages/newsboat/Makefile.patch @@ -32,8 +32,8 @@ diff -u -r ../newsboat-2.16.1/Makefile ./Makefile PODBOAT=podboat PODBOAT_SOURCES:=$(shell cat mk/podboat.deps) PODBOAT_OBJS:=$(patsubst %.cpp,%.o,$(PODBOAT_SOURCES)) --PODBOAT_LIBS=-lboat -lnewsboat -lpthread -ldl -+PODBOAT_LIBS=-lboat -lnewsboat -ldl +-PODBOAT_LIBS=-lboat -lnewsboat -lfilter -lpthread -ldl ++PODBOAT_LIBS=-lboat -lnewsboat -lfilter -ldl ifeq (, $(filter Linux GNU GNU/%, $(shell uname -s))) NEWSBOAT_LIBS+=-liconv -lintl diff --git a/packages/newsboat/avoid-gettext.patch b/packages/newsboat/avoid-gettext.patch index c447fd7b6..1bd3f1cd6 100644 --- a/packages/newsboat/avoid-gettext.patch +++ b/packages/newsboat/avoid-gettext.patch @@ -40,14 +40,3 @@ 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/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 -@@ -11,7 +11,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 diff --git a/packages/newsboat/build.sh b/packages/newsboat/build.sh index b1ed225e4..1ed94ca82 100644 --- a/packages/newsboat/build.sh +++ b/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.19 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_VERSION=2.20.1 TERMUX_PKG_SRCURL=https://newsboat.org/releases/${TERMUX_PKG_VERSION}/newsboat-${TERMUX_PKG_VERSION}.tar.xz -TERMUX_PKG_SHA256=ba484c825bb903daf6d33d55126107b59e41111b455d368362208f1825403d1b +TERMUX_PKG_SHA256=82782079b75fe307f7a5a17dff9e712aa5975678fa550fb728d5a46867943566 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"