diff options
Diffstat (limited to 'net-news/newsboat/files')
6 files changed, 50 insertions, 249 deletions
diff --git a/net-news/newsboat/files/newsboat-2.11-flags.patch b/net-news/newsboat/files/newsboat-2.11-flags.patch deleted file mode 100644 index bcee380dd304..000000000000 --- a/net-news/newsboat/files/newsboat-2.11-flags.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- newsboat-2.11/Makefile -+++ newsboat-2.11/Makefile -@@ -18,9 +18,9 @@ - DEFINES+=-DGIT_HASH=\"$(GIT_HASH)\" - endif - --WARNFLAGS=-Werror -Wall -Wextra -Wunreachable-code -+WARNFLAGS=-Wall -Wextra -Wunreachable-code - INCLUDES=-Iinclude -Istfl -Ifilter -I. -Irss --BARE_CXXFLAGS=-std=c++11 -O2 -ggdb $(INCLUDES) -+BARE_CXXFLAGS=-std=c++11 $(INCLUDES) - LDFLAGS+=-L. - - PACKAGE=newsboat diff --git a/net-news/newsboat/files/newsboat-2.13-json-c-0.14.0.patch b/net-news/newsboat/files/newsboat-2.13-json-c-0.14.0.patch deleted file mode 100644 index 4e46843c6b7f..000000000000 --- a/net-news/newsboat/files/newsboat-2.13-json-c-0.14.0.patch +++ /dev/null @@ -1,37 +0,0 @@ -Patch merged upstream for future versions of newsboat: https://github.com/newsboat/newsboat/pull/883 - -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org> -Date: Mon, 13 Apr 2020 12:52:46 +0200 -Subject: [PATCH] Add support for upcoming json-c 0.14.0. - -TRUE/FALSE are not defined anymore. 1 and 0 are used instead. - - ---- - src/newsblurapi.cpp | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/src/newsblur_api.cpp b/src/newsblur_api.cpp -index 2d1acdae..e124852d 100644 ---- a/src/newsblur_api.cpp -+++ b/src/newsblur_api.cpp -@@ -9,6 +9,19 @@ - #include "strprintf.h" - #include "utils.h" - -+/* json-c 0.13.99 does not define TRUE/FALSE anymore -+ * the json-c maintainers replaced them with pure 1/0 -+ * https://github.com/json-c/json-c/commit/0992aac61f8b -+ */ -+#if defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) | 99) -+#ifndef FALSE -+#define FALSE 0 -+#endif -+#ifndef TRUE -+#define TRUE 1 -+#endif -+#endif -+ - #define NEWSBLUR_ITEMS_PER_PAGE 6 - - namespace newsboat { diff --git a/net-news/newsboat/files/newsboat-2.19-json-c-0.14.0.patch b/net-news/newsboat/files/newsboat-2.19-json-c-0.14.0.patch deleted file mode 100644 index 79c4da5e726a..000000000000 --- a/net-news/newsboat/files/newsboat-2.19-json-c-0.14.0.patch +++ /dev/null @@ -1,34 +0,0 @@ -From db70049f436a965767e8a1273389e1be92e946fa Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org> -Date: Mon, 13 Apr 2020 12:52:46 +0200 -Subject: [PATCH] Add support for upcoming json-c 0.14.0. - -TRUE/FALSE are not defined anymore. 1 and 0 are used instead. ---- - src/newsblurapi.cpp | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/src/newsblurapi.cpp b/src/newsblurapi.cpp -index 2d1acdae..e124852d 100644 ---- a/src/newsblurapi.cpp -+++ b/src/newsblurapi.cpp -@@ -9,6 +9,19 @@ - #include "strprintf.h" - #include "utils.h" - -+/* json-c 0.13.99 does not define TRUE/FALSE anymore -+ * the json-c maintainers replaced them with pure 1/0 -+ * https://github.com/json-c/json-c/commit/0992aac61f8b -+ */ -+#if defined JSON_C_VERSION_NUM && JSON_C_VERSION_NUM >= ((13 << 8) | 99) -+#ifndef FALSE -+#define FALSE 0 -+#endif -+#ifndef TRUE -+#define TRUE 1 -+#endif -+#endif -+ - #define NEWSBLUR_ITEMS_PER_PAGE 6 - - namespace newsboat { diff --git a/net-news/newsboat/files/newsboat-2.19-libressl.patch b/net-news/newsboat/files/newsboat-2.19-libressl.patch deleted file mode 100644 index 86dff345a56a..000000000000 --- a/net-news/newsboat/files/newsboat-2.19-libressl.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index ca8ce060..b738b0b2 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -124,12 +124,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - - [[package]] - name = "curl-sys" --version = "0.4.5" -+version = "0.4.12" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "cc 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "libz-sys 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libz-sys 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", - "vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -234,12 +234,12 @@ dependencies = [ - "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", - "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "curl-sys 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "curl-sys 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", - "gettext-rs 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gettext-sys 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -- "libz-sys 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libz-sys 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", - "natord 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", - "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "once_cell 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -265,7 +265,7 @@ dependencies = [ - - [[package]] - name = "libz-sys" --version = "1.0.17" -+version = "1.0.18" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "cc 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -863,7 +863,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - "checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" - "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" - "checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e" --"checksum curl-sys 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "71c63a540a9ee4e15e56c3ed9b11a2f121239b9f6d7b7fe30f616e048148df9a" -+"checksum curl-sys 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "78800a6de442f65dab6ce26c6f369c14fc585686432bf4b77119d2d384216c31" - "checksum dirs 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "88972de891f6118092b643d85a0b28e0678e0f948d7f879aa32f2d5aafe97d2a" - "checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2" - "checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1" -@@ -876,7 +876,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - "checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73" - "checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1" - "checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" --"checksum libz-sys 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "44ebbc760fd2d2f4d93de09a0e13d97e057612052e871da9985cedcb451e6bd5" -+"checksum libz-sys 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)" = "87f737ad6cc6fd6eefe3d9dc5412f1573865bded441300904d2f42269e140f16" - "checksum locale_config 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "14fbee0e39bc2dd6a2427c4fdea66e9826cc1fd09b0a0b7550359f5f6efe1dab" - "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" - "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" -diff --git a/rust/libnewsboat/Cargo.toml b/rust/libnewsboat/Cargo.toml -index 6b9d78dd..5943d43a 100644 ---- a/rust/libnewsboat/Cargo.toml -+++ b/rust/libnewsboat/Cargo.toml -@@ -16,14 +16,14 @@ xdg = "2.2.0" - backtrace = "= 0.3" - unicode-width = "0.1.5" - nom = "^4.1" --curl-sys = "0.4.5" -+curl-sys = "0.4.12" - 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. --libz-sys = "= 1.0.17" -+libz-sys = "= 1.0.18" - - # The following constraints close security holes - # https://rustsec.org/advisories/RUSTSEC-2019-0009 diff --git a/net-news/newsboat/files/newsboat-2.20.1-libressl.patch b/net-news/newsboat/files/newsboat-2.20.1-libressl.patch deleted file mode 100644 index 2a2bf35039c4..000000000000 --- a/net-news/newsboat/files/newsboat-2.20.1-libressl.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index b25f598d..ad928616 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -151,12 +151,12 @@ dependencies = [ - - [[package]] - name = "curl-sys" --version = "0.4.5" -+version = "0.4.12" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "cc 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", -- "libz-sys 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libz-sys 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", - "vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -273,12 +273,12 @@ dependencies = [ - "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", - "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", - "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", -- "curl-sys 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "curl-sys 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "gettext-rs 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "gettext-sys 0.19.8 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)", -- "libz-sys 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libz-sys 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)", - "natord 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", - "nom 5.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "once_cell 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -305,7 +305,7 @@ dependencies = [ - - [[package]] - name = "libz-sys" --version = "1.0.17" -+version = "1.0.18" - source = "registry+https://github.com/rust-lang/crates.io-index" - dependencies = [ - "cc 1.0.29 (registry+https://github.com/rust-lang/crates.io-index)", -@@ -822,7 +822,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" - "checksum constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - "checksum crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" --"checksum curl-sys 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "71c63a540a9ee4e15e56c3ed9b11a2f121239b9f6d7b7fe30f616e048148df9a" -+"checksum curl-sys 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "78800a6de442f65dab6ce26c6f369c14fc585686432bf4b77119d2d384216c31" - "checksum dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" - "checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" - "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" -@@ -836,7 +836,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" - "checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1" - "checksum lexical-core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d7043aa5c05dd34fb73b47acb8c3708eac428de4545ea3682ed2f11293ebd890" - "checksum libc 0.2.69 (registry+https://github.com/rust-lang/crates.io-index)" = "99e85c08494b21a9054e7fe1374a732aeadaff3980b6990b94bfd3a70f690005" --"checksum libz-sys 1.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "44ebbc760fd2d2f4d93de09a0e13d97e057612052e871da9985cedcb451e6bd5" -+"checksum libz-sys 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)" = "87f737ad6cc6fd6eefe3d9dc5412f1573865bded441300904d2f42269e140f16" - "checksum locale_config 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "14fbee0e39bc2dd6a2427c4fdea66e9826cc1fd09b0a0b7550359f5f6efe1dab" - "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" - "checksum memchr 2.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e1dd4eaac298c32ce07eb6ed9242eda7d82955b9170b7d6db59b2e02cc63fcb8" -diff --git a/rust/libnewsboat/Cargo.toml b/rust/libnewsboat/Cargo.toml -index 6f661009..744ba057 100644 ---- a/rust/libnewsboat/Cargo.toml -+++ b/rust/libnewsboat/Cargo.toml -@@ -18,14 +18,14 @@ xdg = "2.2.0" - backtrace = "= 0.3" - unicode-width = "0.1.5" - nom = "5" --curl-sys = "0.4.5" -+curl-sys = "0.4.12" - 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. --libz-sys = "= 1.0.17" -+libz-sys = "= 1.0.18" - - # The following constraints close security holes - # https://rustsec.org/advisories/RUSTSEC-2019-0009 diff --git a/net-news/newsboat/files/newsboat-2.30.1-gcc-13.patch b/net-news/newsboat/files/newsboat-2.30.1-gcc-13.patch new file mode 100644 index 000000000000..82092f29c037 --- /dev/null +++ b/net-news/newsboat/files/newsboat-2.30.1-gcc-13.patch @@ -0,0 +1,50 @@ +https://github.com/newsboat/newsboat/commit/ca1fe3c9fcea89fb9cc0a5ea8740732ae480c6bd +https://github.com/newsboat/newsboat/commit/7ecea2591df830baea41c7b46b3c5d8a2cbd985e + +From ca1fe3c9fcea89fb9cc0a5ea8740732ae480c6bd Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyich@gmail.com> +Date: Sun, 8 Jan 2023 09:31:36 +0000 +Subject: [PATCH] include/listwidgetbackend.h: add missing <cstdint> include + +Upcoming `gcc-13` made `<string>` leaner and does not include `<cstdint>` +implicitly anymore. As a result build fails without the change as: + + include/listwidgetbackend.h:16:37: error: 'std::uint32_t' has not been declared + 16 | void stfl_replace_list(std::uint32_t number_of_lines, std::string stfl); + | ^~~~~~~~ +--- a/include/listwidgetbackend.h ++++ b/include/listwidgetbackend.h +@@ -1,6 +1,7 @@ + #ifndef NEWSBOAT_LISTWIDGETBACKEND_H_ + #define NEWSBOAT_LISTWIDGETBACKEND_H_ + ++#include <cstdint> + #include <string> + + #include "listformatter.h" + +From 7ecea2591df830baea41c7b46b3c5d8a2cbd985e Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyich@gmail.com> +Date: Sun, 8 Jan 2023 09:32:59 +0000 +Subject: [PATCH] include/matcherexception.h: add missing <cstdint> include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upcoming `gcc-13` made `<string>` leaner and does not include `<cstdint>` +implicitly anymore. As a result build fails without the change as: + + include/matcherexception.h:14:14: error: elaborated-type-specifier for a scoped enum must not use the «class» keyword [-Werror] + 14 | enum class Type : std::uint8_t { ATTRIB_UNAVAIL = 0, INVALID_REGEX = 1 }; + | ~~~~ ^~~~~ + | ----- +--- a/include/matcherexception.h ++++ b/include/matcherexception.h +@@ -1,6 +1,7 @@ + #ifndef NEWSBOAT_MATCHEREXCEPTON_H_ + #define NEWSBOAT_MATCHEREXCEPTON_H_ + ++#include <cstdint> + #include <stdexcept> + #include <string> + |