<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3484230d1f4607b447df535563eb97c599080411">https://github.com/macports/macports-ports/commit/3484230d1f4607b447df535563eb97c599080411</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 3484230d1f4607b447df535563eb97c599080411
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Jan 11 22:03:03 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> xmms2 +cpp: Fix clang build failure
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/64156
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The header being patched gets installed, so increase revision.
</span>---
audio/xmms2/Portfile | 8 ++++++--
audio/xmms2/files/const.patch | 17 +++++++++++++++++
2 files changed, 23 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/xmms2/Portfile b/audio/xmms2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a7c321e1bcd..8f7192b5edb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/xmms2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/xmms2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup waf 1.0
</span>
name xmms2
version 0.8DrO_o
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 23
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 24
</span> categories audio
# Mostly LGPL, some plugins and clients are GPL
license LGPL-2.1+ GPL-2+ GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,6 +65,7 @@ patchfiles patch-ffmpeg-2.0.diff \
</span> patch-src-clients-vistest-wscript.diff \
patch-src-plugins-cdda-cdda.c.diff \
patch-dnssd-fd-check.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ const.patch \
</span> patch-openssl-1.1.0.diff
post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,7 +79,10 @@ configure.args --conf-prefix=${prefix} \
</span> --without-optionals python
variant cpp description {C++ development support} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:boost
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup boost 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --boost-includes [boost::include_dir] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --boost-libs [boost::lib_dir]
</span> }
if {![variant_isset cpp]} {
configure.args-append --without-optionals xmmsclient++,xmmsclient++-glib
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/xmms2/files/const.patch b/audio/xmms2/files/const.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b5a3eda6d16
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/xmms2/files/const.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Const-cast Coll in AbstractElement.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This is how the implementation of the declaration works, and now clang
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+is happy.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/xmms2/xmms2-devel/commit/2af8dcb1dadee505ee38ef4a9b5a373a7df14f18
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/include/xmmsclient/xmmsclient++/coll.h.orig 2011-10-20 14:26:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/include/xmmsclient/xmmsclient++/coll.h 2022-01-11 21:59:34.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -612,7 +612,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ template< typename keyT, typename valT >
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AbstractElement< keyT, valT >::AbstractElement( const Coll& coll, keyT index )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- : coll_ (coll), index_( index )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ : coll_ ( const_cast< Coll& >( coll ) ), index_( index )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xmmsv_coll_ref( coll_.getColl() );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span></pre><pre style='margin:0'>
</pre>