newsboat: update fix-paths.patch

This commit is contained in:
Leonid Pliushch 2020-03-29 23:00:31 +03:00
parent bf6df5db2f
commit f6d325062e

View File

@ -1,7 +1,7 @@
diff -uNr newsboat-2.14.1/src/controller.cpp newsboat-2.14.1.mod/src/controller.cpp
--- newsboat-2.14.1/src/controller.cpp 2019-02-10 18:07:09.000000000 +0200
+++ newsboat-2.14.1.mod/src/controller.cpp 2019-03-01 21:52:00.350784451 +0200
@@ -768,7 +768,7 @@
diff -uNr newsboat-2.19/src/controller.cpp newsboat-2.19.mod/src/controller.cpp
--- newsboat-2.19/src/controller.cpp 2020-03-22 20:54:24.000000000 +0200
+++ newsboat-2.19.mod/src/controller.cpp 2020-03-29 22:59:00.640650862 +0300
@@ -787,7 +787,7 @@
} else {
snprintf(filename,
sizeof(filename),
@ -10,34 +10,34 @@ diff -uNr newsboat-2.14.1/src/controller.cpp newsboat-2.14.1.mod/src/controller.
}
int fd = mkstemp(filename);
if (fd != -1) {
diff -uNr newsboat-2.14.1/src/formaction.cpp newsboat-2.14.1.mod/src/formaction.cpp
--- newsboat-2.14.1/src/formaction.cpp 2019-02-10 18:07:09.000000000 +0200
+++ newsboat-2.14.1.mod/src/formaction.cpp 2019-03-01 21:51:38.197304516 +0200
@@ -540,7 +540,7 @@
diff -uNr newsboat-2.19/src/formaction.cpp newsboat-2.19.mod/src/formaction.cpp
--- newsboat-2.19/src/formaction.cpp 2020-03-22 20:54:24.000000000 +0200
+++ newsboat-2.19.mod/src/formaction.cpp 2020-03-29 22:59:57.654933862 +0300
@@ -545,7 +545,7 @@
return "";
} else {
char* my_argv[4];
- my_argv[0] = const_cast<char*>("/bin/sh");
+ my_argv[0] = const_cast<char*>("@TERMUX_PREFIX@/bin/sh");
my_argv[1] = const_cast<char*>("-c");
my_argv[2] = const_cast<char*>(cmdline.c_str());
const char* my_argv[4];
- my_argv[0] = "/bin/sh";
+ my_argv[0] = "@TERMUX_PREFIX@/bin/sh";
my_argv[1] = "-c";
my_argv[2] = cmdline.c_str();
my_argv[3] = nullptr;
diff -uNr newsboat-2.14.1/src/itemrenderer.cpp newsboat-2.14.1.mod/src/itemrenderer.cpp
--- newsboat-2.14.1/src/itemrenderer.cpp 2019-02-10 18:07:09.000000000 +0200
+++ newsboat-2.14.1.mod/src/itemrenderer.cpp 2019-03-01 21:51:38.200637872 +0200
@@ -92,7 +92,7 @@
diff -uNr newsboat-2.19/src/itemrenderer.cpp newsboat-2.19.mod/src/itemrenderer.cpp
--- newsboat-2.19/src/itemrenderer.cpp 2020-03-22 20:54:24.000000000 +0200
+++ newsboat-2.19.mod/src/itemrenderer.cpp 2020-03-29 22:59:38.589839238 +0300
@@ -106,7 +106,7 @@
rnd.render(source, lines, thelinks, url);
} else {
char* argv[4];
- argv[0] = const_cast<char*>("/bin/sh");
+ argv[0] = const_cast<char*>("@TERMUX_PREFIX@/bin/sh");
argv[1] = const_cast<char*>("-c");
argv[2] = const_cast<char*>(renderer.c_str());
const char* argv[4];
- argv[0] = "/bin/sh";
+ argv[0] = "@TERMUX_PREFIX@/bin/sh";
argv[1] = "-c";
argv[2] = renderer.c_str();
argv[3] = nullptr;
diff -uNr newsboat-2.14.1/src/pbcontroller.cpp newsboat-2.14.1.mod/src/pbcontroller.cpp
--- newsboat-2.14.1/src/pbcontroller.cpp 2019-02-10 18:07:09.000000000 +0200
+++ newsboat-2.14.1.mod/src/pbcontroller.cpp 2019-03-01 21:51:38.200637872 +0200
@@ -281,7 +281,7 @@
diff -uNr newsboat-2.19/src/pbcontroller.cpp newsboat-2.19.mod/src/pbcontroller.cpp
--- newsboat-2.19/src/pbcontroller.cpp 2020-03-22 20:54:24.000000000 +0200
+++ newsboat-2.19.mod/src/pbcontroller.cpp 2020-03-29 22:59:00.641650867 +0300
@@ -283,7 +283,7 @@
cfgparser.register_handler("reset-unread-on-update", &null_cah);
try {
@ -46,3 +46,15 @@ diff -uNr newsboat-2.14.1/src/pbcontroller.cpp newsboat-2.14.1.mod/src/pbcontrol
cfgparser.parse(config_file);
} catch (const ConfigException& ex) {
std::cout << ex.what() << std::endl;
diff -uNr newsboat-2.19/src/rssparser.cpp newsboat-2.19.mod/src/rssparser.cpp
--- newsboat-2.19/src/rssparser.cpp 2020-03-22 20:54:24.000000000 +0200
+++ newsboat-2.19.mod/src/rssparser.cpp 2020-03-29 22:59:48.009885990 +0300
@@ -282,7 +282,7 @@
{
std::string buf = utils::retrieve_url(uri, cfgcont);
- const char* argv[4] = {"/bin/sh",
+ const char* argv[4] = {"@TERMUX_PREFIX@/bin/sh",
"-c",
filter.c_str(),
nullptr