From dd3d67f56d32fe29496fd671f944cf8e185aa1eb Mon Sep 17 00:00:00 2001 From: Butta Date: Sun, 9 Aug 2020 21:31:45 +0530 Subject: [PATCH] newsboat: remove more gettext calls --- packages/newsboat/avoid-gettext.patch | 48 +++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/packages/newsboat/avoid-gettext.patch b/packages/newsboat/avoid-gettext.patch index 1bd3f1cd6..87265cd0c 100644 --- a/packages/newsboat/avoid-gettext.patch +++ b/packages/newsboat/avoid-gettext.patch @@ -40,3 +40,51 @@ diff -uNr newsboat-2.17/rust/libnewsboat/src/cliargsparser.rs newsboat-2.17.mod/ &opts[0], log_level_str ); +diff -ruw newsboat-2.20.1/rust/regex-rs/Cargo.toml src/rust/regex-rs/Cargo.toml +--- newsboat-2.20.1/rust/regex-rs/Cargo.toml 2020-06-24 09:51:43.000000000 +0000 ++++ src/rust/regex-rs/Cargo.toml 2020-08-09 15:53:33.917513569 +0000 +@@ -12,4 +12,3 @@ + + bitflags = "1.0" + libc = ">=0.2.69" +-gettext-rs = "0.4.1" +diff -ruw newsboat-2.20.1/rust/regex-rs/src/lib.rs src/rust/regex-rs/src/lib.rs +--- newsboat-2.20.1/rust/regex-rs/src/lib.rs 2020-06-24 09:51:43.000000000 +0000 ++++ src/rust/regex-rs/src/lib.rs 2020-08-09 15:55:06.893777550 +0000 +@@ -29,7 +29,6 @@ + //! ``` + + use bitflags::bitflags; +-use gettextrs::gettext; + use libc::{regcomp, regerror, regex_t, regexec, regfree, regmatch_t}; + use std::ffi::{CString, OsString}; + use std::mem; +@@ -155,12 +154,12 @@ + } else { + match regex_error_to_str(errcode, ®ex) { + Some(regcomp_errmsg) => { +- let msg = fmt!(&gettext("regcomp returned code %i"), errcode); ++ let msg = fmt!("regcomp returned code %i", errcode); + let msg = format!("{}: {}", msg, regcomp_errmsg); + Err(msg) + } + +- None => Err(fmt!(&gettext("regcomp returned code %i"), errcode)), ++ None => Err(fmt!("regcomp returned code %i", errcode)), + } + } + } +@@ -240,11 +239,11 @@ + _ => unsafe { + match regex_error_to_str(errcode, &self.regex) { + Some(regexec_errmsg) => { +- let msg = fmt!(&gettext("regexec returned code %i"), errcode); ++ let msg = fmt!("regexec returned code %i", errcode); + let msg = format!("{}: {}", msg, regexec_errmsg); + Err(msg) + } +- None => Err(fmt!(&gettext("regexec returned code %i"), errcode)), ++ None => Err(fmt!("regexec returned code %i", errcode)), + } + }, + }