<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1eae322acc3caa00a0801f1a485d5c48364bb6a6">https://github.com/macports/macports-ports/commit/1eae322acc3caa00a0801f1a485d5c48364bb6a6</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 1eae322acc3 ncmpc: update to 0.49, unbreak build
</span>1eae322acc3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1eae322acc3caa00a0801f1a485d5c48364bb6a6
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Sat Aug 19 11:28:59 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> ncmpc: update to 0.49, unbreak build
</span>---
audio/ncmpc/Portfile | 22 +++--
.../0001-Fix-for-missing-u_int32_t-for-macOS.patch | 25 ++++++
audio/ncmpc/files/0002-Fix-environ-for-Apple.patch | 24 ++++++
...t-util-Concepts-remove-obsolete-fallbacks.patch | 98 ++++++++++++++++++++++
4 files changed, 163 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/ncmpc/Portfile b/audio/ncmpc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 376a4e2532c..ff064f7b0fc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/ncmpc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/ncmpc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,11 +5,11 @@ PortGroup meson 1.0
</span> PortGroup boost 1.0
name ncmpc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.46
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 0.49
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 049cdd18f1cdefe820578ddae31bb8bfa22b0e34 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 177f77cf09dd4ab914e8438be399cdd5d83c9aa992abc8d9abac006bb092934e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 289332
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c194047119f7f1131325199bd2727f74d6845a54 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 65bbec0ede9e6bcf62ac647b0c706485beb2bdd5db70ca8d60103f32f162cf29 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 296012
</span>
set branch [join [lrange [split ${version} .] 0 0] .]
categories audio
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,7 +19,6 @@ long_description ncmpc is a client for MPD, the Music Player Daemon.
</span> license GPL-2+
homepage https://www.musicpd.org/clients/${name}/
master_sites https://www.musicpd.org/download/${name}/${branch}/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> use_xz yes
depends_build-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,11 +28,22 @@ depends_lib-append path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span> port:libmpdclient \
port:ncurses \
port:pcre
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args -Dcurses=ncurses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -Dcurses=ncurses
</span> configure.env-append \
LDFLAGS=-lintl
patchfiles-append patch-locale.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/MusicPlayerDaemon/ncmpc/pull/131
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 0001-Fix-for-missing-u_int32_t-for-macOS.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-Fix-environ-for-Apple.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/MusicPlayerDaemon/ncmpc/issues/132
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 0003-Revert-util-Concepts-remove-obsolete-fallbacks.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2020
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.url https://www.musicpd.org/download/${name}/${branch}/
livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/ncmpc/files/0001-Fix-for-missing-u_int32_t-for-macOS.patch b/audio/ncmpc/files/0001-Fix-for-missing-u_int32_t-for-macOS.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..117ce2a216b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/ncmpc/files/0001-Fix-for-missing-u_int32_t-for-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From f7f7f6ba7dd3b8b2b048a494362482db1f4689b6 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: barracuda156 <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 19 Aug 2023 06:25:13 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/3] Fix for missing u_int32_t for macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixes: https://github.com/MusicPlayerDaemon/ncmpc/issues/130
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/net/IPv4Address.hxx | 4 ++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 4 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/net/IPv4Address.hxx src/net/IPv4Address.hxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 36db16a2..878044b8 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/net/IPv4Address.hxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/net/IPv4Address.hxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -38,6 +38,10 @@ class IPv4Address {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef uint32_t in_addr_t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ typedef uint32_t u_int32_t;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static constexpr in_addr_t ConstructInAddrT(uint8_t a, uint8_t b,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint8_t c, uint8_t d) noexcept {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ToBE32((a << 24) | (b << 16) | (c << 8) | d);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/ncmpc/files/0002-Fix-environ-for-Apple.patch b/audio/ncmpc/files/0002-Fix-environ-for-Apple.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..307bbeb0f3b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/ncmpc/files/0002-Fix-environ-for-Apple.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From d8df597d25abda96348490e263d450caf7a788d2 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: barracuda156 <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 19 Aug 2023 10:52:42 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 2/3] Fix environ for Apple
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fixing https://github.com/MusicPlayerDaemon/ncmpc/commit/525ed73404011753f15f78b99b472f81d6dd8342
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/plugin.cxx | 3 +++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 3 insertions(+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/plugin.cxx src/plugin.cxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 719aeab0..8932ce17 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/plugin.cxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/plugin.cxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,6 +23,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/wait.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <crt_externs.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define environ (*_NSGetEnviron())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern char **environ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/ncmpc/files/0003-Revert-util-Concepts-remove-obsolete-fallbacks.patch b/audio/ncmpc/files/0003-Revert-util-Concepts-remove-obsolete-fallbacks.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e19112e6a25
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/ncmpc/files/0003-Revert-util-Concepts-remove-obsolete-fallbacks.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,98 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From d8c70d50503814f712139c0ea67559b2b55f9692 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: barracuda156 <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sat, 19 Aug 2023 10:58:46 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 3/3] Revert "util/Concepts: remove obsolete fallbacks"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This reverts commit 7c88215acb5c1ddd924c53fb6be152cef22a0535.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/util/Concepts.hxx | 30 +++++++++++++++++++++++++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/util/IntrusiveList.hxx | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/util/SortList.hxx | 6 +++---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3 files changed, 33 insertions(+), 5 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/util/Concepts.hxx src/util/Concepts.hxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a741d690..6439dd92 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/util/Concepts.hxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/util/Concepts.hxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,5 +5,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <concepts>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/**
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Compatibility wrapper for std::invocable which is unavailable in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * the Android NDK r25b and Apple Xcode.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(ANDROID) && !defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++template<typename F, typename... Args>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++concept Invocable = std::invocable<F, Args...>;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++template<typename F, typename... Args>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++concept Invocable = requires(F f, Args... args) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { f(args...) };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/**
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Compatibility wrapper for std::predicate which is unavailable in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * the Android NDK r25b and Apple Xcode.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(ANDROID) && !defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++template<typename F, typename... Args>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++concept Predicate = std::predicate<F, Args...>;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++template<typename F, typename... Args>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++concept Predicate = requires(F f, Args... args) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ { f(args...) } -> std::same_as<bool>;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template<typename F, typename T>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-concept Disposer = std::invocable<F, T *>;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++concept Disposer = Invocable<F, T *>;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/util/IntrusiveList.hxx src/util/IntrusiveList.hxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index aa1c67e5..0467f2c6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/util/IntrusiveList.hxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/util/IntrusiveList.hxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -266,7 +266,7 @@ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /**
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * @return the number of removed items
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- std::size_t remove_and_dispose_if(std::predicate<const_reference> auto pred,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::size_t remove_and_dispose_if(Predicate<const_reference> auto pred,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Disposer<value_type> auto dispose) noexcept {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::size_t result = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/util/SortList.hxx src/util/SortList.hxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 54a43745..6856872b 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/util/SortList.hxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/util/SortList.hxx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,10 +3,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #pragma once
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "Concepts.hxx"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "StaticVector.hxx"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <algorithm> // for std::find_if()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <concepts>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /**
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Move all items from #src to #dest, keeping both sorted.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17,7 +17,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template<typename List>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ constexpr void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MergeList(List &dest, List &src,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- std::predicate<typename List::const_reference, typename List::const_reference> auto p) noexcept
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Predicate<typename List::const_reference, typename List::const_reference> auto p) noexcept
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const auto dest_end = dest.end(), src_end = src.end();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -59,7 +59,7 @@ MergeList(List &dest, List &src,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template<typename List>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ constexpr void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SortList(List &list,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- std::predicate <typename List::const_reference, typename List::const_reference> auto p) noexcept
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Predicate <typename List::const_reference, typename List::const_reference> auto p) noexcept
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using std::swap;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>