From 9c8736b90467031399e1355d82d71c63b626475906088a61135e470ce741224a Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Sat, 1 Jun 2019 07:51:43 +0000 Subject: [PATCH 1/2] Accepting request 706207 from multimedia:apps baserev update by copy to link target OBS-URL: https://build.opensuse.org/request/show/706207 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpd?expand=0&rev=28 --- GCC9-buildfix.patch | 46 --------------------------------------------- mpd.spec | 2 -- 2 files changed, 48 deletions(-) delete mode 100644 GCC9-buildfix.patch diff --git a/GCC9-buildfix.patch b/GCC9-buildfix.patch deleted file mode 100644 index 03024ad..0000000 --- a/GCC9-buildfix.patch +++ /dev/null @@ -1,46 +0,0 @@ -commit 37b54179d882fef38ca6735b53e322027414b62e -Author: Max Kellermann -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)); - } - diff --git a/mpd.spec b/mpd.spec index 5d5430a..0e1b065 100644 --- a/mpd.spec +++ b/mpd.spec @@ -40,8 +40,6 @@ Patch0: %{name}-mpdconf_suse.patch Patch3: mpd-docs.patch # PATCH-FIX-OPENSUSE mpd-sndfile.patch Patch4: mpd-sndfile.patch -# PATCH-FIX-UPSTREAM GCC9-buildfix.patch -Patch5: GCC9-buildfix.patch %if 0%{?suse_version} >= 1500 BuildRequires: libboost_headers-devel >= 1.58 %else From 06e2a324f3cd396fdda170cd23830d6dfbbc2fa8bb5e1dcb5a178192e0d65980 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 23 Jul 2019 07:52:31 +0000 Subject: [PATCH 2/2] Accepting request 717782 from home:13ilya:branches:multimedia:apps - Remove patch GCC9-buildfix.patch (upsteamed) OBS-URL: https://build.opensuse.org/request/show/717782 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/mpd?expand=0&rev=29 --- mpd.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/mpd.changes b/mpd.changes index 3547c30..3c31b66 100644 --- a/mpd.changes +++ b/mpd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 23 07:42:13 UTC 2019 - Илья Индиго + +- Remove patch GCC9-buildfix.patch (upsteamed) + ------------------------------------------------------------------- Fri May 31 10:49:14 UTC 2019 - Tomas Cech