From a59d7adbb5b967855a5a39f6c78a30bf1765ff6e Mon Sep 17 00:00:00 2001 From: tuibuilder_pel7x64builder0 Date: Wed, 25 Apr 2018 16:45:09 +0200 Subject: [PATCH] added newsbeuter patch files Signed-off-by: tuibuilder_pel7x64builder0 --- ...-2.8-Add-solarized-light-colorscheme.patch | 33 ++++++++++++ ...8-Improve-solarized-dark-colorscheme.patch | 36 +++++++++++++ SOURCES/newsbeuter-2.9-ncurses6.patch | 14 +++++ SOURCES/newsbeuter-2.9_json-c_013.patch | 53 +++++++++++++++++++ 4 files changed, 136 insertions(+) create mode 100644 SOURCES/newsbeuter-2.8-Add-solarized-light-colorscheme.patch create mode 100644 SOURCES/newsbeuter-2.8-Improve-solarized-dark-colorscheme.patch create mode 100644 SOURCES/newsbeuter-2.9-ncurses6.patch create mode 100644 SOURCES/newsbeuter-2.9_json-c_013.patch diff --git a/SOURCES/newsbeuter-2.8-Add-solarized-light-colorscheme.patch b/SOURCES/newsbeuter-2.8-Add-solarized-light-colorscheme.patch new file mode 100644 index 0000000..fdaadd8 --- /dev/null +++ b/SOURCES/newsbeuter-2.8-Add-solarized-light-colorscheme.patch @@ -0,0 +1,33 @@ +From dca71f9bc1c48bfdef339a9c27fada9882b2c10c Mon Sep 17 00:00:00 2001 +From: Jamie Nguyen +Date: Fri, 5 Dec 2014 15:22:31 +0000 +Subject: [PATCH 2/2] Add solarized-light colorscheme + +--- + contrib/colorschemes/solarized-light | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + create mode 100644 contrib/colorschemes/solarized-light + +diff --git a/contrib/colorschemes/solarized-light b/contrib/colorschemes/solarized-light +new file mode 100644 +index 0000000..52b88ea +--- /dev/null ++++ b/contrib/colorschemes/solarized-light +@@ -0,0 +1,14 @@ ++# solarized color scheme for newsbeuter ++# more on solarized: http://ethanschoonover.com/solarized ++ ++color article default default ++color background default default ++color info default white ++color listfocus white yellow ++color listfocus_unread default yellow ++color listnormal default default ++color listnormal_unread black default ++ ++highlight article "^(Title):.*$" blue default ++highlight article "https?://[^ ]+" red default ++highlight article "\\[image\\ [0-9]+\\]" green default +-- +2.1.0 + diff --git a/SOURCES/newsbeuter-2.8-Improve-solarized-dark-colorscheme.patch b/SOURCES/newsbeuter-2.8-Improve-solarized-dark-colorscheme.patch new file mode 100644 index 0000000..9d06af2 --- /dev/null +++ b/SOURCES/newsbeuter-2.8-Improve-solarized-dark-colorscheme.patch @@ -0,0 +1,36 @@ +From 26701fe66aa7d2efc17042e2ec7004e4b0aee233 Mon Sep 17 00:00:00 2001 +From: Jamie Nguyen +Date: Fri, 5 Dec 2014 15:22:13 +0000 +Subject: [PATCH 1/2] Improve solarized-dark colorscheme + +--- + contrib/colorschemes/solarized-dark | 16 +++++++++++----- + 1 file changed, 11 insertions(+), 5 deletions(-) + +diff --git a/contrib/colorschemes/solarized-dark b/contrib/colorschemes/solarized-dark +index d6cbb0d..4e9dc57 100644 +--- a/contrib/colorschemes/solarized-dark ++++ b/contrib/colorschemes/solarized-dark +@@ -1,8 +1,14 @@ + # solarized color scheme for newsbeuter + # more on solarized: http://ethanschoonover.com/solarized + +-color listnormal color244 color234 +-color listfocus color166 color235 +-color info color136 color235 +-color background color244 color234 +-color article color244 color234 ++color article default default ++color background default default ++color info default black ++color listfocus black yellow ++color listfocus_unread default yellow ++color listnormal default default ++color listnormal_unread white default ++ ++highlight article "^(Title):.*$" blue default ++highlight article "https?://[^ ]+" red default ++highlight article "\\[image\\ [0-9]+\\]" green default +-- +2.1.0 + diff --git a/SOURCES/newsbeuter-2.9-ncurses6.patch b/SOURCES/newsbeuter-2.9-ncurses6.patch new file mode 100644 index 0000000..808ae49 --- /dev/null +++ b/SOURCES/newsbeuter-2.9-ncurses6.patch @@ -0,0 +1,14 @@ +diff -u -r -U5 --no-dereference newsbeuter-2.9/config.sh newsbeuter-2.9.ncurses6/config.sh +--- newsbeuter-2.9/config.sh 2015-08-23 10:38:43.468631663 -0400 ++++ newsbeuter-2.9.ncurses6/config.sh 2015-08-23 10:38:01.000000000 -0400 +@@ -108,9 +108,9 @@ + ( check_pkg "json" "" 0.11 || check_pkg "json-c" "" 0.11 ) || fail "json-c" + + if [ `uname -s` = "Darwin" ]; then + check_custom "ncurses5.4" "ncurses5.4-config" || fail "ncurses5.4" + elif [ `uname -s` != "OpenBSD" ]; then +- check_custom "ncursesw5" "ncursesw5-config" || fail "ncursesw" ++ check_custom "ncursesw6" "ncursesw6-config" || fail "ncursesw" + fi + check_ssl_implementation + all_aboard_the_fail_boat diff --git a/SOURCES/newsbeuter-2.9_json-c_013.patch b/SOURCES/newsbeuter-2.9_json-c_013.patch new file mode 100644 index 0000000..71ed8c7 --- /dev/null +++ b/SOURCES/newsbeuter-2.9_json-c_013.patch @@ -0,0 +1,53 @@ +Index: newsbeuter-2.9/src/feedhq_api.cpp +=================================================================== +--- newsbeuter-2.9.orig/src/feedhq_api.cpp ++++ newsbeuter-2.9/src/feedhq_api.cpp +@@ -132,7 +132,7 @@ std::vector feedhq_api:: + // TODO: parse result + + struct json_object * reply = json_tokener_parse(result.c_str()); +- if (is_error(reply)) { ++ if (reply == NULL) { + LOG(LOG_ERROR, "feedhq_api::get_subscribed_urls: failed to parse response as JSON."); + return urls; + } +Index: newsbeuter-2.9/src/oldreader_api.cpp +=================================================================== +--- newsbeuter-2.9.orig/src/oldreader_api.cpp ++++ newsbeuter-2.9/src/oldreader_api.cpp +@@ -134,7 +134,7 @@ std::vector oldreader_ap + // TODO: parse result + + struct json_object * reply = json_tokener_parse(result.c_str()); +- if (is_error(reply)) { ++ if (reply == NULL) { + LOG(LOG_ERROR, "oldreader_api::get_subscribed_urls: failed to parse response as JSON."); + return urls; + } +Index: newsbeuter-2.9/src/ttrss_api.cpp +=================================================================== +--- newsbeuter-2.9.orig/src/ttrss_api.cpp ++++ newsbeuter-2.9/src/ttrss_api.cpp +@@ -113,19 +113,19 @@ struct json_object * ttrss_api::run_op(c + LOG(LOG_DEBUG, "ttrss_api::run_op(%s,...): post=%s reply = %s", op.c_str(), req_data.c_str(), result.c_str()); + + struct json_object * reply = json_tokener_parse(result.c_str()); +- if (is_error(reply)) { ++ if (reply == NULL) { + LOG(LOG_ERROR, "ttrss_api::run_op: reply failed to parse: %s", result.c_str()); + return NULL; + } + + struct json_object * status = json_object_object_get(reply, "status"); +- if (is_error(status)) { ++ if (status == NULL) { + LOG(LOG_ERROR, "ttrss_api::run_op: no status code"); + return NULL; + } + + struct json_object * content = json_object_object_get(reply, "content"); +- if (is_error(content)) { ++ if (content == NULL) { + LOG(LOG_ERROR, "ttrss_api::run_op: no content part in answer from server"); + return NULL; + }