pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/libfilezilla/patches libfilezilla: remove patch th...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/419495ff9883
branches:  trunk
changeset: 439334:419495ff9883
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Fri Sep 18 07:57:54 2020 +0000

description:
libfilezilla: remove patch that breaks the build on NetBSD

diffstat:

 net/libfilezilla/patches/patch-lib_string.cpp |  26 --------------------------
 1 files changed, 0 insertions(+), 26 deletions(-)

diffs (30 lines):

diff -r 860ee4c31a60 -r 419495ff9883 net/libfilezilla/patches/patch-lib_string.cpp
--- a/net/libfilezilla/patches/patch-lib_string.cpp     Fri Sep 18 07:57:38 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-$NetBSD: patch-lib_string.cpp,v 1.7 2020/09/17 14:48:08 wiz Exp $
-
-Explicitly use std::wcsnrtombs.
-
-https://trac.filezilla-project.org/ticket/12280
-
---- lib/string.cpp.orig        2020-07-07 12:06:31.000000000 +0000
-+++ lib/string.cpp
-@@ -354,7 +354,7 @@ std::string to_string(std::wstring_view
- 
-                       std::mbstate_t ps{};
-                       wchar_t const* in_p = in.data() + start;
--                      size_t len = wcsnrtombs(nullptr, &in_p, inlen, 0, &ps);
-+                      size_t len = std::wcsnrtombs(nullptr, &in_p, inlen, 0, &ps);
-                       if (len != static_cast<size_t>(-1)) {
-                               size_t old = ret.size();
-                               if (start) {
-@@ -364,7 +364,7 @@ std::string to_string(std::wstring_view
-                               char* out_p = &ret[old];
- 
-                               in_p = in.data() + start; // Some implementations of wcsrtombs change src even on null dst
--                              wcsnrtombs(out_p, &in_p, inlen, len, &ps);
-+                              std::wcsnrtombs(out_p, &in_p, inlen, len, &ps);
-                       }
-                       else {
-                               ret.clear();



Home | Main Index | Thread Index | Old Index