From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 09788138252 for ; Tue, 10 May 2016 07:11:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C758EE0810; Tue, 10 May 2016 07:11:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 63D70E0810 for ; Tue, 10 May 2016 07:11:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0AD7233FE7D for ; Tue, 10 May 2016 07:11:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 59DCD32D for ; Tue, 10 May 2016 07:11:41 +0000 (UTC) From: "Michael Sterrett" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Sterrett" Message-ID: <1462864282.d612d994f4d12ea0c6f8624e10564deedf68b020.mr_bones_@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/sdlmame/, games-emulation/sdlmame/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-emulation/sdlmame/files/sdlmame-0.173-cxx14.patch games-emulation/sdlmame/sdlmame-0.173.ebuild X-VCS-Directories: games-emulation/sdlmame/files/ games-emulation/sdlmame/ X-VCS-Committer: mr_bones_ X-VCS-Committer-Name: Michael Sterrett X-VCS-Revision: d612d994f4d12ea0c6f8624e10564deedf68b020 X-VCS-Branch: master Date: Tue, 10 May 2016 07:11:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7de4f688-c2eb-41b1-a2c4-92c6d3ac6672 X-Archives-Hash: df4b569c84f45ea5a7477c98a3beb5b1 commit: d612d994f4d12ea0c6f8624e10564deedf68b020 Author: Michael Sterrett gentoo org> AuthorDate: Tue May 10 07:11:05 2016 +0000 Commit: Michael Sterrett gentoo org> CommitDate: Tue May 10 07:11:22 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d612d994 games-emulation/sdlmame: fix buildins with gcc-4.9.3 with patch from Alexander Miller (bug #582576) Package-Manager: portage-2.2.26 .../sdlmame/files/sdlmame-0.173-cxx14.patch | 28 ++++++++++++++++++++++ games-emulation/sdlmame/sdlmame-0.173.ebuild | 4 +++- 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/games-emulation/sdlmame/files/sdlmame-0.173-cxx14.patch b/games-emulation/sdlmame/files/sdlmame-0.173-cxx14.patch new file mode 100644 index 0000000..bd88cb4 --- /dev/null +++ b/games-emulation/sdlmame/files/sdlmame-0.173-cxx14.patch @@ -0,0 +1,28 @@ +# work around gcc-4.9.3's implementation of cxx14 +# bug 582576 with patch from Alexander Miller +# https://bugs.gentoo.org/show_bug.cgi?id=582576 + +--- a/src/lib/util/strformat.h ++++ b/src/lib/util/strformat.h +@@ -185,9 +185,8 @@ + #include + #include + +-#if defined(__GLIBCXX__) && (__GLIBCXX__ < 20150413) +-namespace std +-{ ++namespace std { ++namespace mame_cxx14_compat { + template + inline constexpr auto + cbegin(const _Container& __cont) noexcept(noexcept(std::begin(__cont)))-> decltype(std::begin(__cont)) +@@ -198,7 +197,8 @@ + cend(const _Container& __cont) noexcept(noexcept(std::end(__cont)))-> decltype(std::end(__cont)) + { return std::end(__cont); } + } +-#endif ++using namespace mame_cxx14_compat; ++} + + namespace util { + namespace detail { diff --git a/games-emulation/sdlmame/sdlmame-0.173.ebuild b/games-emulation/sdlmame/sdlmame-0.173.ebuild index e5d5a0e..edac5fe 100644 --- a/games-emulation/sdlmame/sdlmame-0.173.ebuild +++ b/games-emulation/sdlmame/sdlmame-0.173.ebuild @@ -73,7 +73,9 @@ src_unpack() { } src_prepare() { - epatch "${FILESDIR}"/${P}-qt.patch + epatch \ + "${FILESDIR}"/${P}-qt.patch \ + "${FILESDIR}"/${P}-cxx14.patch # Disable using bundled libraries enable_feature USE_SYSTEM_LIB_EXPAT enable_feature USE_SYSTEM_LIB_FLAC