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

newsboat: update to 2.17

Browse Source
This commit is contained in:
Leonid Pliushch 2019-09-24 21:23:16 +03:00
parent 7b03075a2d
commit 3f93a0ff54
2 changed files with 67 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
packages/newsboat/avoid-gettext.patch
View File

@ -1,15 +1,15 @@
diff -u -r ../newsboat-2.16.1/rust/libnewsboat/Cargo.toml ./rust/libnewsboat/Cargo.toml
--- ../newsboat-2.16.1/rust/libnewsboat/Cargo.toml 2019-06-26 17:55:21.000000000 +0000
+++ ./rust/libnewsboat/Cargo.toml 2019-08-05 00:21:20.075339058 +0000
@@ -18,7 +18,6 @@
diff -uNr newsboat-2.17/rust/libnewsboat/Cargo.toml newsboat-2.17.mod/rust/libnewsboat/Cargo.toml
--- newsboat-2.17/rust/libnewsboat/Cargo.toml 2019-09-22 17:19:19.000000000 +0300
+++ newsboat-2.17.mod/rust/libnewsboat/Cargo.toml 2019-09-24 20:57:10.680900795 +0300
@@ -19,7 +19,6 @@
unicode-segmentation = "1"
curl-sys = "0.4.5"
libc = "0.2"
-gettext-rs = "0.4.1"
natord = "1.0.9"
# We don't use the following crates, but we pin their versions to make sure
# that Newsboat builds with Rust 1.25 and later.
@@ -35,12 +34,6 @@
@@ -37,12 +36,6 @@
# I want as little dependencies as practically possible.
default-features = false
@ -22,16 +22,16 @@ diff -u -r ../newsboat-2.16.1/rust/libnewsboat/Cargo.toml ./rust/libnewsboat/Car
[dev-dependencies]
tempfile = "3"
proptest = "0.7"
diff -u -r ../newsboat-2.16.1/rust/libnewsboat/src/cliargsparser.rs ./rust/libnewsboat/src/cliargsparser.rs
--- ../newsboat-2.16.1/rust/libnewsboat/src/cliargsparser.rs 2019-06-26 17:55:21.000000000 +0000
+++ ./rust/libnewsboat/src/cliargsparser.rs 2019-08-05 00:20:55.315653682 +0000
diff -uNr newsboat-2.17/rust/libnewsboat/src/cliargsparser.rs newsboat-2.17.mod/rust/libnewsboat/src/cliargsparser.rs
--- newsboat-2.17/rust/libnewsboat/src/cliargsparser.rs 2019-09-22 17:19:19.000000000 +0300
+++ newsboat-2.17.mod/rust/libnewsboat/src/cliargsparser.rs 2019-09-24 20:56:44.030818719 +0300
@@ -1,5 +1,4 @@
use clap::{App, Arg};
-use gettextrs::gettext;
use libc::{EXIT_FAILURE, EXIT_SUCCESS};
use std::path::PathBuf;
use logger::Level;
@@ -281,7 +280,7 @@
@@ -282,7 +281,7 @@
}
_ => {
args.display_msg = fmt!(
@ -40,10 +40,60 @@ diff -u -r ../newsboat-2.16.1/rust/libnewsboat/src/cliargsparser.rs ./rust/libne
&opts[0],
log_level_str
);
diff -u -r ../newsboat-2.16.1/rust/libnewsboat/src/lib.rs ./rust/libnewsboat/src/lib.rs
--- ../newsboat-2.16.1/rust/libnewsboat/src/lib.rs 2019-06-26 17:55:21.000000000 +0000
+++ ./rust/libnewsboat/src/lib.rs 2019-08-05 00:21:05.675522029 +0000
@@ -9,7 +9,6 @@
diff -uNr newsboat-2.17/rust/libnewsboat/src/configpaths.rs newsboat-2.17.mod/rust/libnewsboat/src/configpaths.rs
--- newsboat-2.17/rust/libnewsboat/src/configpaths.rs 2019-09-22 17:19:19.000000000 +0300
+++ newsboat-2.17.mod/rust/libnewsboat/src/configpaths.rs 2019-09-24 21:04:18.205613586 +0300
@@ -1,6 +1,5 @@
use cliargsparser::CliArgsParser;
use dirs;
-use gettextrs::gettext;
use libc;
use logger::{self, Level};
use std::fs::{self, DirBuilder};
@@ -69,11 +68,9 @@
let uid = unsafe { libc::getuid() };
config_paths.error_message = fmt!(
- &gettext(
"Fatal error: couldn't determine home directory!\n\
Please set the HOME environment variable or add \
- a valid user for UID %u!"
- ),
+ a valid user for UID %u!",
uid
);
@@ -131,7 +128,7 @@
if !self.silent {
eprintln!(
"{}",
- &gettext("Migrating configs and data from Newsbeuter's XDG dirs...")
+ "Migrating configs and data from Newsbeuter's XDG dirs..."
);
}
@@ -187,7 +184,7 @@
if !self.silent {
eprintln!(
"{}",
- &gettext("Migrating configs and data from Newsbeuter's dotdir...")
+ "Migrating configs and data from Newsbeuter's dotdir..."
);
}
@@ -199,7 +196,7 @@
eprintln!(
"{}",
&fmt!(
- &gettext("Aborting migration because mkdir on `%s' failed: %s"),
+ "Aborting migration because mkdir on `%s' failed: %s",
&newsboat_dir.to_string_lossy().into_owned(),
err.to_string()
)
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;

5
packages/newsboat/build.sh
View File

@ -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.16.1
TERMUX_PKG_REVISION=1
TERMUX_PKG_VERSION=2.17
TERMUX_PKG_SRCURL=https://newsboat.org/releases/${TERMUX_PKG_VERSION}/newsboat-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=4023c817b36fc08a3191283eec2c7161949c0727633f60ad837e11c599d3ad53
TERMUX_PKG_SHA256=88c3f73b676f5fc52a0c935922eb520b463b388c7ef2325e67d847bee41efa79
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"