Control: tags -1 patch
I am uploading a NMU with the attached changes.
diff -Nru newsboat-2.36/debian/changelog newsboat-2.36/debian/changelog --- newsboat-2.36/debian/changelog 2024-12-02 21:58:53.000000000 +0100 +++ newsboat-2.36/debian/changelog 2025-09-18 19:57:55.000000000 +0200 @@ -1,3 +1,11 @@ +newsboat (2.36-1.2) unstable; urgency=medium + + * Non-maintainer upload + * Work around Curl 8.16.0 curl_proxytype issue (Closes: #1114221) + * Build with -Wno-error to prevent FTBFS (Closes: #1033633) + + -- Bastian Germann <[email protected]> Thu, 18 Sep 2025 19:57:55 +0200 + newsboat (2.36-1.1) unstable; urgency=medium * Non-maintainer upload diff -Nru newsboat-2.36/debian/patches/03-curl_proxytype-workaround.patch newsboat-2.36/debian/patches/03-curl_proxytype-workaround.patch --- newsboat-2.36/debian/patches/03-curl_proxytype-workaround.patch 1970-01-01 01:00:00.000000000 +0100 +++ newsboat-2.36/debian/patches/03-curl_proxytype-workaround.patch 2025-09-18 19:57:55.000000000 +0200 @@ -0,0 +1,53 @@ +Origin: https://github.com/newsboat/newsboat/pull/3169 +From: Dennis van der Schagt <[email protected]> +Date: Sat, 13 Sep 2025 14:35:25 +0200 +Subject: Work around Curl 8.16.0 curl_proxytype issue +--- +--- a/rss/parser.h ++++ b/rss/parser.h +@@ -24,7 +24,7 @@ class Parser { + const std::string& user_agent = "", + const std::string& proxy = "", + const std::string& proxy_auth = "", +- curl_proxytype proxy_type = CURLPROXY_HTTP, ++ curl_proxytype proxy_type = static_cast<curl_proxytype>(CURLPROXY_HTTP), + const bool ssl_verify = true); + ~Parser(); + Feed parse_url(const std::string& url, +--- a/src/utils.cpp ++++ b/src/utils.cpp +@@ -650,20 +650,20 @@ std::string utils::get_basename(const std::string& url) + curl_proxytype utils::get_proxy_type(const std::string& type) + { + if (type == "http") { +- return CURLPROXY_HTTP; ++ return static_cast<curl_proxytype>(CURLPROXY_HTTP); + } + if (type == "socks4") { +- return CURLPROXY_SOCKS4; ++ return static_cast<curl_proxytype>(CURLPROXY_SOCKS4); + } + if (type == "socks5") { +- return CURLPROXY_SOCKS5; ++ return static_cast<curl_proxytype>(CURLPROXY_SOCKS5); + } + if (type == "socks5h") { +- return CURLPROXY_SOCKS5_HOSTNAME; ++ return static_cast<curl_proxytype>(CURLPROXY_SOCKS5_HOSTNAME); + } + #ifdef CURLPROXY_SOCKS4A + if (type == "socks4a") { +- return CURLPROXY_SOCKS4A; ++ return static_cast<curl_proxytype>(CURLPROXY_SOCKS4A); + } + #endif + +@@ -672,7 +672,7 @@ curl_proxytype utils::get_proxy_type(const std::string& type) + "you configured an invalid proxy type: %s", + type); + } +- return CURLPROXY_HTTP; ++ return static_cast<curl_proxytype>(CURLPROXY_HTTP); + } + + std::string utils::unescape_url(const std::string& url) diff -Nru newsboat-2.36/debian/patches/series newsboat-2.36/debian/patches/series --- newsboat-2.36/debian/patches/series 2024-07-27 16:04:46.000000000 +0200 +++ newsboat-2.36/debian/patches/series 2025-09-18 19:18:11.000000000 +0200 @@ -1,4 +1,5 @@ 01-use-policy-compliant-perl-hashbang.patch 02-fix-make.patch +03-curl_proxytype-workaround.patch relax-deps.diff link-catch.patch diff -Nru newsboat-2.36/debian/rules newsboat-2.36/debian/rules --- newsboat-2.36/debian/rules 2024-12-02 21:58:53.000000000 +0100 +++ newsboat-2.36/debian/rules 2025-09-18 19:57:55.000000000 +0200 @@ -6,7 +6,7 @@ include /usr/share/dpkg/buildflags.mk CFLAGS += $(CPPFLAGS) -CXXFLAGS += $(CPPFLAGS) +CXXFLAGS += $(CPPFLAGS) -Wno-error %: dh $@
