Browse Source

newsboat: Update from 2.11.1 to 2.12

android-5
Fredrik Fornwall 7 years ago
parent
commit
03c14ddea2
  1. 5
      packages/newsboat/build.sh
  2. 26
      packages/newsboat/src-fslock.cpp.patch
  3. 14
      packages/newsboat/src-remote_api.cpp.patch

5
packages/newsboat/build.sh

@ -1,7 +1,8 @@
TERMUX_PKG_HOMEPAGE=https://newsboat.org/
TERMUX_PKG_DESCRIPTION="RSS/Atom feed reader for the text console"
TERMUX_PKG_VERSION=2.11.1
TERMUX_PKG_SHA256=aab67dcd386a3512812e1af0fddb8e1f4dce08d2a106946fe5ad405210ed37cf
TERMUX_PKG_API_LEVEL=24
TERMUX_PKG_VERSION=2.12
TERMUX_PKG_SHA256=9bbdbc2bca9e0c75a75588d89de3862f72e3fcb41c5d7db6210e2b491ffd43f4
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

26
packages/newsboat/src-fslock.cpp.patch

@ -1,26 +0,0 @@
diff -u -r ../newsboat-2.10.2/src/fslock.cpp ./src/fslock.cpp
--- ../newsboat-2.10.2/src/fslock.cpp 2017-12-25 18:49:35.000000000 +0100
+++ ./src/fslock.cpp 2017-12-26 23:47:20.520356104 +0100
@@ -5,6 +5,10 @@
#include <fcntl.h>
#include <string.h>
+#ifdef __ANDROID__
+#include <sys/file.h>
+#endif
+
#include <logger.h>
namespace newsboat {
@@ -40,7 +44,11 @@
}
// then we lock it (returns immediately if locking is not possible)
+#ifdef __ANDROID__
+ if (flock(fd, LOCK_EX) == 0) {
+#else
if (lockf(fd, F_TLOCK, 0) == 0) {
+#endif
LOG(level::DEBUG, "FSLock: locked `%s', writing PID...", new_lock_filepath);
std::string pidtext = std::to_string(getpid());
// locking successful -> truncate file and write own PID into it

14
packages/newsboat/src-remote_api.cpp.patch

@ -1,7 +1,7 @@
diff -u -r ../newsboat-2.10.1/src/remote_api.cpp ./src/remote_api.cpp
--- ../newsboat-2.10.1/src/remote_api.cpp 2017-09-22 22:01:50.000000000 +0200
+++ ./src/remote_api.cpp 2017-10-15 00:14:41.848769212 +0200
@@ -36,6 +36,22 @@
diff -u -r ../newsboat-2.12/src/remote_api.cpp ./src/remote_api.cpp
--- ../newsboat-2.12/src/remote_api.cpp 2018-06-24 21:30:30.000000000 +0200
+++ ./src/remote_api.cpp 2018-06-26 03:56:48.528961214 +0200
@@ -39,6 +39,22 @@
return pass;
}
@ -21,6 +21,6 @@ diff -u -r ../newsboat-2.10.1/src/remote_api.cpp ./src/remote_api.cpp
+}
+#endif
+
credentials remote_api::get_credentials(const std::string& scope, const std::string& name) {
std::string user = cfg->get_configvalue(scope+"-login");
std::string pass = cfg->get_configvalue(scope+"-password");
credentials remote_api::get_credentials(const std::string& scope,
const std::string& name)
{

Loading…
Cancel
Save