diff --git a/packages/newsboat/Makefile.patch b/packages/newsboat/Makefile.patch index 1605d095a..285c598b5 100644 --- a/packages/newsboat/Makefile.patch +++ b/packages/newsboat/Makefile.patch @@ -1,6 +1,6 @@ -diff -uNr newsboat-2.20/Makefile newsboat-2.20.mod/Makefile ---- newsboat-2.20/Makefile 2020-06-20 18:54:45.000000000 +0300 -+++ newsboat-2.20.mod/Makefile 2020-06-21 19:53:36.104143404 +0300 +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 @@ -10,12 +10,21 @@ diff -uNr newsboat-2.20/Makefile newsboat-2.20.mod/Makefile LDFLAGS+=-L. PACKAGE=newsboat +@@ -32,7 +32,7 @@ + LDFLAGS+=-fprofile-arcs -ftest-coverage + endif + +-CXXFLAGS:=$(BARE_CXXFLAGS) $(WARNFLAGS) $(DEFINES) $(CXXFLAGS) ++CXXFLAGS:=$(BARE_CXXFLAGS) $(WARNFLAGS) $(DEFINES) $(CXXFLAGS) $(CPPFLAGS) + CXXFLAGS_FOR_BUILD?=$(CXXFLAGS) + + LIB_SOURCES:=$(shell cat mk/libboat.deps) @@ -46,7 +46,7 @@ NEWSBOAT=newsboat NEWSBOAT_SOURCES:=$(shell cat mk/newsboat.deps) NEWSBOAT_OBJS:=$(patsubst %.cpp,%.o,$(NEWSBOAT_SOURCES)) -NEWSBOAT_LIBS=-lboat -lnewsboat -lfilter -lpthread -lrsspp -ldl -+NEWSBOAT_LIBS=-lboat -lnewsboat -lfilter -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)) @@ -23,8 +32,8 @@ diff -uNr newsboat-2.20/Makefile newsboat-2.20.mod/Makefile PODBOAT=podboat PODBOAT_SOURCES:=$(shell cat mk/podboat.deps) PODBOAT_OBJS:=$(patsubst %.cpp,%.o,$(PODBOAT_SOURCES)) --PODBOAT_LIBS=-lboat -lnewsboat -lfilter -lpthread -ldl -+PODBOAT_LIBS=-lboat -lnewsboat -lfilter -ldl +-PODBOAT_LIBS=-lboat -lnewsboat -lpthread -ldl ++PODBOAT_LIBS=-lboat -lnewsboat -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 1bd3f1cd6..c447fd7b6 100644 --- a/packages/newsboat/avoid-gettext.patch +++ b/packages/newsboat/avoid-gettext.patch @@ -40,3 +40,14 @@ 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