sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

newsboat: Update from 2.14.1 to 2.15

Browse Source
This commit is contained in:
Fredrik Fornwall 2019-03-30 00:30:10 +01:00
parent c18bad6912
commit 27df7a087f
2 changed files with 15 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
packages/newsboat/Makefile.patch
View File

@ -1,15 +1,7 @@
diff -u -r ../newsboat-2.14/Makefile ./Makefile
--- ../newsboat-2.14/Makefile 2018-12-29 13:07:06.000000000 +0000
+++ ./Makefile 2018-12-31 02:05:43.501854145 +0000
@@ -9,6 +9,7 @@
# compiler
CXX?=c++
+CXX_host?=c++
# compiler and linker flags
DEFINES=-DLOCALEDIR=\"$(localedir)\"
@@ -20,7 +21,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 @@
WARNFLAGS=-Werror -Wall -Wextra -Wunreachable-code
INCLUDES=-Iinclude -Istfl -Ifilter -I. -Irss
@ -18,16 +10,16 @@ diff -u -r ../newsboat-2.14/Makefile ./Makefile
LDFLAGS+=-L.
PACKAGE=newsboat
@@ -34,7 +35,7 @@
@@ -37,7 +37,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)
LIB_OBJS:=$(patsubst %.cpp,%.o,$(LIB_SOURCES))
@@ -47,7 +48,7 @@
@@ -51,7 +51,7 @@
NEWSBOAT=newsboat
NEWSBOAT_SOURCES:=$(shell cat mk/newsboat.deps)
NEWSBOAT_OBJS:=$(patsubst %.cpp,%.o,$(NEWSBOAT_SOURCES))
@ -36,8 +28,8 @@ diff -u -r ../newsboat-2.14/Makefile ./Makefile
RSSPPLIB_SOURCES=$(sort $(wildcard rss/*.cpp))
RSSPPLIB_OBJS=$(patsubst rss/%.cpp,rss/%.o,$(RSSPPLIB_SOURCES))
@@ -62,12 +63,12 @@
LDFLAGS+=-L.//target/release
@@ -76,12 +76,12 @@
endif
CARGO_FLAGS+=--release
endif
-LDFLAGS+=-lnewsboat -lpthread -ldl
@ -51,28 +43,3 @@ diff -u -r ../newsboat-2.14/Makefile ./Makefile
ifeq (, $(filter Linux GNU GNU/%, $(shell uname -s)))
NEWSBOAT_LIBS+=-liconv -lintl
@@ -186,13 +187,13 @@
echo "td > pre { margin: 0; white-space: pre-wrap; }" >> doc/xhtml/docbook-xsl.css
doc/generate: doc/generate.cpp doc/split.h
- $(CXX) $(CXXFLAGS) -o doc/generate doc/generate.cpp
+ $(CXX_host) -o doc/generate doc/generate.cpp
doc/newsboat-cfgcmds.txt: doc/generate doc/configcommands.dsv
doc/generate doc/configcommands.dsv > doc/newsboat-cfgcmds.txt
doc/generate2: doc/generate2.cpp
- $(CXX) $(CXXFLAGS) -o doc/generate2 doc/generate2.cpp
+ $(CXX_host) -o doc/generate2 doc/generate2.cpp
doc/newsboat-keycmds.txt: doc/generate2 doc/keycmds.dsv
doc/generate2 doc/keycmds.dsv > doc/newsboat-keycmds.txt
@@ -210,7 +211,7 @@
$(A2X) -f manpage doc/manpage-podboat.txt
doc/gen-example-config: doc/gen-example-config.cpp doc/split.h
- $(CXX) $(CXXFLAGS) -o doc/gen-example-config doc/gen-example-config.cpp
+ $(CXX_host) -o doc/gen-example-config doc/gen-example-config.cpp
doc/example-config: doc/gen-example-config doc/configcommands.dsv
sed 's/+{backslash}"+/`\\"`/g' doc/configcommands.dsv | doc/gen-example-config > doc/example-config

9
packages/newsboat/build.sh
View File

@ -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.14.1
TERMUX_PKG_REVISION=4
TERMUX_PKG_SHA256=4bd0d3b1901a3fc7e0ef73b800587c28181a57b175c36b547dbd84636330df66
TERMUX_PKG_VERSION=2.15
TERMUX_PKG_REVISION=1
TERMUX_PKG_SHA256=da68ce93c02dda908a471ef8994bb3c668f060eb6046d486c3f05649c6650db7
TERMUX_PKG_SRCURL=https://newsboat.org/releases/${TERMUX_PKG_VERSION}/newsboat-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_DEPENDS="libandroid-support, libandroid-glob, json-c, libsqlite, libcurl, libxml2, stfl, ncurses, openssl"
TERMUX_PKG_BUILD_IN_SRC=yes
@ -15,6 +15,9 @@ TERMUX_PKG_REPLACES=newsbeuter
termux_step_pre_configure() {
termux_setup_rust
export CXX_FOR_BUILD=g++
export CXXFLAGS_FOR_BUILD="-O2"
# Used by newsboat Makefile:
export CARGO_BUILD_TARGET=$CARGO_TARGET_NAME
}