Updating link to change in openSUSE:Factory/mpd revision 9.0
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpd?expand=0&rev=2cee60b6543ef56aea5debc5311dcce6
This commit is contained in:
parent
9988318fb5
commit
d395a54edf
46
GCC9-buildfix.patch
Normal file
46
GCC9-buildfix.patch
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
commit 37b54179d882fef38ca6735b53e322027414b62e
|
||||||
|
Author: Max Kellermann <max@musicpd.org>
|
||||||
|
Date: Wed Apr 3 16:59:53 2019 +0200
|
||||||
|
|
||||||
|
net/IPv[46]Address: add cast to void* to fix GCC9 build failure
|
||||||
|
|
||||||
|
Fixes:
|
||||||
|
|
||||||
|
src/net/IPv4Address.hxx: In member function 'constexpr IPv4Address::operator SocketAddress() const':
|
||||||
|
src/net/IPv4Address.hxx:171:24: error: a reinterpret_cast is not a constant expression
|
||||||
|
171 | return SocketAddress((const struct sockaddr *)&address,
|
||||||
|
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
src/net/IPv6Address.hxx: In member function 'constexpr IPv6Address::operator SocketAddress() const':
|
||||||
|
src/net/IPv6Address.hxx:138:24: error: a reinterpret_cast is not a constant expression
|
||||||
|
138 | return SocketAddress((const struct sockaddr *)&address,
|
||||||
|
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
|
Closes https://github.com/MusicPlayerDaemon/MPD/issues/522
|
||||||
|
|
||||||
|
diff --git a/src/net/IPv4Address.hxx b/src/net/IPv4Address.hxx
|
||||||
|
index d8be8e5..c8fead1 100644
|
||||||
|
--- a/src/net/IPv4Address.hxx
|
||||||
|
+++ b/src/net/IPv4Address.hxx
|
||||||
|
@@ -163,7 +163,7 @@ public:
|
||||||
|
}
|
||||||
|
|
||||||
|
constexpr operator SocketAddress() const noexcept {
|
||||||
|
- return SocketAddress((const struct sockaddr *)&address,
|
||||||
|
+ return SocketAddress((const struct sockaddr *)(const void *)&address,
|
||||||
|
sizeof(address));
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/src/net/IPv6Address.hxx b/src/net/IPv6Address.hxx
|
||||||
|
index 6f21777..0439c0e 100644
|
||||||
|
--- a/src/net/IPv6Address.hxx
|
||||||
|
+++ b/src/net/IPv6Address.hxx
|
||||||
|
@@ -127,7 +127,7 @@ public:
|
||||||
|
}
|
||||||
|
|
||||||
|
constexpr operator SocketAddress() const noexcept {
|
||||||
|
- return SocketAddress((const struct sockaddr *)&address,
|
||||||
|
+ return SocketAddress((const struct sockaddr *)(const void *)&address,
|
||||||
|
sizeof(address));
|
||||||
|
}
|
||||||
|
|
2
mpd.spec
2
mpd.spec
@ -40,6 +40,8 @@ Patch0: %{name}-mpdconf_suse.patch
|
|||||||
Patch3: mpd-docs.patch
|
Patch3: mpd-docs.patch
|
||||||
# PATCH-FIX-OPENSUSE mpd-sndfile.patch
|
# PATCH-FIX-OPENSUSE mpd-sndfile.patch
|
||||||
Patch4: mpd-sndfile.patch
|
Patch4: mpd-sndfile.patch
|
||||||
|
# PATCH-FIX-UPSTREAM GCC9-buildfix.patch
|
||||||
|
Patch5: GCC9-buildfix.patch
|
||||||
%if 0%{?suse_version} >= 1500
|
%if 0%{?suse_version} >= 1500
|
||||||
BuildRequires: libboost_headers-devel >= 1.58
|
BuildRequires: libboost_headers-devel >= 1.58
|
||||||
%else
|
%else
|
||||||
|
Loading…
Reference in New Issue
Block a user