head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.52 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.50 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.48 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.46 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.44 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.42 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.40 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.38 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.36 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.34 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.32 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.30 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.28 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.26 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.24 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.22 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.20 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.18 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.16 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.14 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.12 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.10 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.8 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.6 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.2 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.4 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.1.0.2 pkgsrc-2019Q3-base:1.1; locks; strict; comment @// @; 1.2 date 2019.10.24.21.50.08; author kamil; state Exp; branches; next 1.1; commitid NdhrIiUUG3KisaIB; 1.1 date 2019.09.14.12.19.40; author nia; state Exp; branches; next ; commitid mqdWZVHhqN9sAYCB; desc @@ 1.2 log @ncmpc: Fix build on NetBSD 9.99.17 Adapt the local patch for the POSIX iconv(3) API change in new NetBSD. @ text @$NetBSD: patch-src_charset.cxx,v 1.1 2019/09/14 12:19:40 nia Exp $ Don't strip constness for the iconv input on SunOS and old NetBSD. --- src/charset.cxx.orig 2019-09-14 12:24:35.000000000 +0000 +++ src/charset.cxx @@@@ -20,6 +20,15 @@@@ #include "charset.hxx" #include "util/ScopeExit.hxx" +#if defined(__NetBSD__) +#include +#if __NetBSD_Prereq__(9,99,17) +#define NETBSD_POSIX_ICONV 1 +#else +#define NETBSD_POSIX_ICONV 0 +#endif +#endif + #include #include @@@@ -64,9 +73,13 @@@@ Iconv(iconv_t i, --dest_size; /* reserve once byte for the null terminator */ while (src_length > 0) { +#if (defined(__NetBSD__) && !NETBSD_POSIX_ICONV) || defined(__sun) + size_t err = iconv(i, &src, &src_length, &dest, &dest_size); +#else size_t err = iconv(i, const_cast(&src), &src_length, &dest, &dest_size); +#endif if (err == (size_t)-1) { switch (errno) { case EILSEQ: @@@@ -130,9 +143,13 @@@@ Iconv(iconv_t i, char buffer[1024], *outbuf = buffer; size_t outbytesleft = sizeof(buffer); +#if (defined(__NetBSD__) && !NETBSD_POSIX_ICONV) || defined(__sun) + size_t err = iconv(i, &src, &src_length, &outbuf, &outbytesleft); +#else size_t err = iconv(i, const_cast(&src), &src_length, &outbuf, &outbytesleft); +#endif dest.append(buffer, outbuf); if (err == (size_t)-1) { switch (errno) { @ 1.1 log @ncmpc: Update to 0.34 ncmpc 0.34 - (2019-04-10) * show total duration of range selection in status bar * fix high CPU usage in key bindings check * fix high CPU usage during text input * fix background color "none" * adapt to Boost 1.70.0 API changes * fixed manual install dir ncmpc 0.33 - (2018-10-22) * artist page: rename to "library" * library page: make tag list configurable * fix color configuration parser bug * fix build failure when libpcre is not found * remove support for liblircclient (only liblirc) * build: require Meson 0.47 * build: use Meson option type `feature` * build: remove obsolete option `tcp` * build: add option to disable regular expression support ncmpc 0.32 - (2018-10-05) * fix crash bug on queue page * fix crash bug on lyrics page * fix off-by-one buffer overflow bug * fix manpage installation directory * fix build breakages with some ncurses builds * work around GCC 4.9 build failure * remove doxygen support * new dependency: Boost * remove dependency on GLib ncmpc 0.31 - (2018-09-19) * fix "No such song" in search screen * fix progressbar when colors are disabled * enable colors by default * allow configuring per-style background colors * keep current song in xterm title when MPD is paused * load configuration from $XDG_CONFIG_HOME/ncmpc/config * always show the screen list at the top * fix memory leak * require MPD 0.19 ncmpc 0.30 - (2018-04-04) * fix crash after pressing ^W in search screen * fix crash bug in chat screen * fix completion list * new color "progressbar-background" * switch the code base to C++14 * build manual with Sphinx ncmpc 0.29 - (2017-11-05) * fix crash after losing MPD connection * fix crash after DNS lookup error * add Meson option "lyrics_plugin_dir" * fallback libncurses detection without pkg-config ncmpc 0.28 - (2017-09-21) * fix crash on lyrics screen * fix memory leak * hide the MPD password from the queue screen title * implement password for asynchronous connect * build with Meson instead of autotools ncmpc 0.27 - (2017-03-25) * work around connect failure if /var/run/mpd/socket does not exist * remove the status bar clock (option "display-time") * fix assertion failure after connect failure * several Windows build fixes ncmpc 0.26 - (2017-03-20) * require libmpdclient 2.9 * adapt to lirc 0.9.4 * lyricswiki: update regex * screen_song: show "f" and "dsd" formats * connect asynchronously * fix flickering in color mode * fix gcc 7 warnings @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 2 Don't strip constness for the iconv input on SunOS and NetBSD, which continue to have the input as const. d5 1 a5 1 --- src/charset.cxx.orig 2019-04-10 09:08:34.000000000 +0000 d7 17 a23 1 @@@@ -64,9 +64,13 @@@@ Iconv(iconv_t i, d27 3 a29 1 +#if !defined(__NetBSD__) && !defined(__sun) a32 2 +#else + size_t err = iconv(i, &src, &src_length, &dest, &dest_size); d37 1 a37 1 @@@@ -130,9 +134,13 @@@@ Iconv(iconv_t i, d41 3 a43 1 +#if !defined(__NetBSD__) && !defined(__sun) a46 2 +#else + size_t err = iconv(i, &src, &src_length, &outbuf, &outbytesleft); @