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

newsboat: Update from 2.10.2 to 2.11

Browse Source
This commit is contained in:
Fredrik Fornwall 2018-03-30 22:56:21 +02:00
parent 27573c9b4d
commit 8686aa8dd9
4 changed files with 21 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
packages/newsboat/Makefile.patch
View File

@ -1,6 +1,6 @@
diff -u -r ../newsboat-2.10.2/Makefile ./Makefile
--- ../newsboat-2.10.2/Makefile 2017-12-25 18:49:35.000000000 +0100
+++ ./Makefile 2017-12-27 00:19:11.167077932 +0100
diff -u -r ../newsboat-2.11/Makefile ./Makefile
--- ../newsboat-2.11/Makefile 2018-03-25 21:36:30.000000000 +0200
+++ ./Makefile 2018-03-30 22:52:36.721339528 +0200
@@ -9,6 +9,7 @@
# compiler
@ -9,18 +9,25 @@ diff -u -r ../newsboat-2.10.2/Makefile ./Makefile
# compiler and linker flags
DEFINES=-DLOCALEDIR=\"$(localedir)\"
@@ -20,8 +21,8 @@
@@ -20,7 +21,7 @@
WARNFLAGS=-Werror -Wall -Wextra -Wunreachable-code
INCLUDES=-Iinclude -Istfl -Ifilter -I. -Irss
-BARE_CXXFLAGS=-std=c++11 -ggdb $(INCLUDES)
-CXXFLAGS+=$(BARE_CXXFLAGS) $(WARNFLAGS) $(DEFINES)
+BARE_CXXFLAGS=-std=c++11 $(INCLUDES)
+CXXFLAGS+=$(BARE_CXXFLAGS) $(WARNFLAGS) $(DEFINES) $(CPPFLAGS)
-BARE_CXXFLAGS=-std=c++11 -O2 -ggdb $(INCLUDES)
+BARE_CXXFLAGS=-std=c++11 -O2 $(INCLUDES)
LDFLAGS+=-L.
PACKAGE=newsboat
@@ -46,7 +47,7 @@
@@ -34,7 +35,7 @@
LDFLAGS+=-fprofile-arcs -ftest-coverage
endif
-CXXFLAGS:=$(BARE_CXXFLAGS) $(WARNFLAGS) $(DEFINES) $(CXXFLAGS)
+CXXFLAGS:=$(BARE_CXXFLAGS) $(WARNFLAGS) $(DEFINES) $(CXXFLAGS) $(CPPFLAGS)
LIB_SOURCES:=$(shell cat mk/libboat.deps)
LIB_OBJS:=$(patsubst %.cpp,%.o,$(LIB_SOURCES))
@@ -47,7 +48,7 @@
NEWSBOAT=newsboat
NEWSBOAT_SOURCES:=$(shell cat mk/newsboat.deps)
NEWSBOAT_OBJS:=$(patsubst %.cpp,%.o,$(NEWSBOAT_SOURCES))
@ -29,7 +36,7 @@ diff -u -r ../newsboat-2.10.2/Makefile ./Makefile
RSSPPLIB_SOURCES=$(sort $(wildcard rss/*.cpp))
RSSPPLIB_OBJS=$(patsubst rss/%.cpp,rss/%.o,$(RSSPPLIB_SOURCES))
@@ -56,7 +57,7 @@
@@ -57,7 +58,7 @@
PODBOAT=podboat
PODBOAT_SOURCES:=$(shell cat mk/podboat.deps)
PODBOAT_OBJS:=$(patsubst %.cpp,%.o,$(PODBOAT_SOURCES))
@ -38,7 +45,7 @@ diff -u -r ../newsboat-2.10.2/Makefile ./Makefile
ifeq (, $(filter Linux GNU GNU/%, $(shell uname -s)))
NEWSBOAT_LIBS+=-liconv -lintl
@@ -167,13 +168,13 @@
@@ -168,13 +169,13 @@
echo "td > pre { margin: 0; white-space: pre-wrap; }" >> doc/xhtml/docbook-xsl.css
doc/generate: doc/generate.cpp doc/split.h
@ -54,7 +61,7 @@ diff -u -r ../newsboat-2.10.2/Makefile ./Makefile
doc/newsboat-keycmds.txt: doc/generate2 doc/keycmds.dsv
doc/generate2 doc/keycmds.dsv > doc/newsboat-keycmds.txt
@@ -190,7 +191,7 @@
@@ -192,7 +193,7 @@
$(A2X) -f manpage doc/manpage-podboat.txt
doc/gen-example-config: doc/gen-example-config.cpp doc/split.h

4
packages/newsboat/build.sh
View File

@ -1,8 +1,8 @@
TERMUX_PKG_HOMEPAGE=https://newsboat.org/
TERMUX_PKG_DESCRIPTION="RSS/Atom feed reader for the text console"
TERMUX_PKG_VERSION=2.10.2
TERMUX_PKG_VERSION=2.11
TERMUX_PKG_SHA256=1d06e58b7fdd9fc972bafe3671b073773207792921f0e8dc2533e91266c3017a
TERMUX_PKG_SRCURL=https://newsboat.org/releases/${TERMUX_PKG_VERSION}/newsboat-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=fda6b44f5c3a23ce46c85b40a6f4f0257c024d79bb8de325aa2cd73d43ef96f4
TERMUX_PKG_DEPENDS="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"

12
packages/newsboat/src-inoreader_api.cpp.patch
View File

@ -1,12 +0,0 @@
diff -u -r ../newsboat-2.10.2/src/inoreader_api.cpp ./src/inoreader_api.cpp
--- ../newsboat-2.10.2/src/inoreader_api.cpp 2017-12-25 18:49:35.000000000 +0100
+++ ./src/inoreader_api.cpp 2017-12-27 00:18:36.167450052 +0100
@@ -136,7 +136,7 @@
json_object_object_get_ex(sub, "categories", &node);
struct array_list * categories = json_object_get_array(node);
- for (int i = 0; i < array_list_length(categories); i++) {
+ for (size_t i = 0; i < array_list_length(categories); i++) {
json_object* cat = json_object_array_get_idx(node, i);
json_object* label_node {};
json_object_object_get_ex(cat, "label", &label_node);

12
packages/newsboat/src-oldreader_api.cpp.patch
View File

@ -1,12 +0,0 @@
diff -u -r ../newsboat-2.10.2/src/oldreader_api.cpp ./src/oldreader_api.cpp
--- ../newsboat-2.10.2/src/oldreader_api.cpp 2017-12-25 18:49:35.000000000 +0100
+++ ./src/oldreader_api.cpp 2017-12-26 23:50:14.802426368 +0100
@@ -134,7 +134,7 @@
json_object_object_get_ex(sub, "categories", &node);
struct array_list * categories = json_object_get_array(node);
- for (int i = 0; i < array_list_length(categories); i++) {
+ for (size_t i = 0; i < array_list_length(categories); i++) {
json_object* cat = json_object_array_get_idx(node, i);
json_object* label_node {};
json_object_object_get_ex(cat, "label", &label_node);