Control: tags 1027540 + patch Control: tags 1027540 + pending
Dear maintainer, I've prepared an NMU for newsboat (versioned as 2.21-1.5) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. https://info.comodo.priv.at -- Debian Developer https://www.debian.org : :' : OpenPGP fingerprint D1E1 316E 93A7 60A8 104D 85FA BB3A 6801 8649 AA06 `. `' Member VIBE!AT & SPI Inc. -- Supporter Free Software Foundation Europe `-
diff -Nru newsboat-2.21/debian/changelog newsboat-2.21/debian/changelog --- newsboat-2.21/debian/changelog 2022-09-13 21:56:30.000000000 +0200 +++ newsboat-2.21/debian/changelog 2023-02-03 23:50:51.000000000 +0100 @@ -1,3 +1,14 @@ +newsboat (2.21-1.5) unstable; urgency=medium + + * Non-maintainer upload. + * Fix "FTBFS: src/poddlthread.cpp:63:29: error: + 'CURLOPT_PROGRESSFUNCTION' is deprecated: since 7.32.0. Use + CURLOPT_XFERINFOFUNCTION [-Werror=deprecated-declarations]": + add patch from upstream. + (Closes: #1027540) + + -- gregor herrmann <gre...@debian.org> Fri, 03 Feb 2023 23:50:51 +0100 + newsboat (2.21-1.4) unstable; urgency=low * Non-maintainer upload. diff -Nru newsboat-2.21/debian/patches/curl_7.87.patch newsboat-2.21/debian/patches/curl_7.87.patch --- newsboat-2.21/debian/patches/curl_7.87.patch 1970-01-01 01:00:00.000000000 +0100 +++ newsboat-2.21/debian/patches/curl_7.87.patch 2023-02-03 23:50:07.000000000 +0100 @@ -0,0 +1,55 @@ +From c44b7672627f206e4588964b02fc321a5280b5d8 Mon Sep 17 00:00:00 2001 +From: Dennis van der Schagt <dennissch...@gmail.com> +Date: Sun, 25 Dec 2022 20:19:38 +0100 +Subject: [PATCH] Stop using deprecated curl option: CURLOPT_PROGRESSFUNCTION + +(cherry picked from commit e435697820e141c46195b939c358203aa5bde7d4) + +Fixes #2297. +--- + src/poddlthread.cpp | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +--- a/src/poddlthread.cpp ++++ b/src/poddlthread.cpp +@@ -20,10 +20,10 @@ + static size_t my_write_data(void* buffer, size_t size, size_t nmemb, + void* userp); + static int progress_callback(void* clientp, +- double dltotal, +- double dlnow, +- double ultotal, +- double ulnow); ++ curl_off_t dltotal, ++ curl_off_t dlnow, ++ curl_off_t ultotal, ++ curl_off_t ulnow); + + PodDlThread::PodDlThread(Download* dl_, newsboat::ConfigContainer* c) + : dl(dl_) +@@ -60,8 +60,8 @@ + // set up progress notification: + curl_easy_setopt(easyhandle, CURLOPT_NOPROGRESS, 0); + curl_easy_setopt( +- easyhandle, CURLOPT_PROGRESSFUNCTION, progress_callback); +- curl_easy_setopt(easyhandle, CURLOPT_PROGRESSDATA, this); ++ easyhandle, CURLOPT_XFERINFOFUNCTION, progress_callback); ++ curl_easy_setopt(easyhandle, CURLOPT_XFERINFODATA, this); + + // set up max download speed + int max_dl_speed = cfg->get_configvalue_as_int("max-download-speed"); +@@ -146,10 +146,10 @@ + } + + static int progress_callback(void* clientp, +- double dltotal, +- double dlnow, +- double /* ultotal */, +- double /*ulnow*/) ++ curl_off_t dltotal, ++ curl_off_t dlnow, ++ curl_off_t /* ultotal */, ++ curl_off_t /*ulnow*/) + { + PodDlThread* thread = static_cast<PodDlThread*>(clientp); + return thread->progress(dlnow, dltotal); diff -Nru newsboat-2.21/debian/patches/series newsboat-2.21/debian/patches/series --- newsboat-2.21/debian/patches/series 2022-03-05 23:00:00.000000000 +0100 +++ newsboat-2.21/debian/patches/series 2023-02-03 23:46:51.000000000 +0100 @@ -2,3 +2,4 @@ 02-fix-make.patch relax-deps.diff nom-ContextError.patch +curl_7.87.patch
signature.asc
Description: Digital Signature