From owner-svn-ports-all@freebsd.org Thu Jul 5 13:01:56 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 930B010270A2; Thu, 5 Jul 2018 13:01:56 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 43EC97B06E; Thu, 5 Jul 2018 13:01:56 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 24E2C1A3EE; Thu, 5 Jul 2018 13:01:56 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w65D1uCl035214; Thu, 5 Jul 2018 13:01:56 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w65D1u1A035213; Thu, 5 Jul 2018 13:01:56 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201807051301.w65D1u1A035213@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Thu, 5 Jul 2018 13:01:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r473967 - head/games/supertux/files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: head/games/supertux/files X-SVN-Commit-Revision: 473967 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jul 2018 13:01:56 -0000 Author: adridg Date: Thu Jul 5 13:01:55 2018 New Revision: 473967 URL: https://svnweb.freebsd.org/changeset/ports/473967 Log: Fix build with Clang6 /usr/include/c++/v1/utility:639:1: note: candidate function not viable: 1st argument ('const std::string' (aka 'const basic_string, allocator >')) would lose const qualifier make_pair(_T1&& __t1, _T2&& __t2) Patch includes more explanation. Reported by: linimon Added: head/games/supertux/files/ head/games/supertux/files/patch-src_music__manager.cpp (contents, props changed) Added: head/games/supertux/files/patch-src_music__manager.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/supertux/files/patch-src_music__manager.cpp Thu Jul 5 13:01:55 2018 (r473967) @@ -0,0 +1,16 @@ +Fix build with Clang6. + +file is a const std::string&, which needs to be (explicitly) copied +into the pair when the pair's first member is std::string (non-const). + +--- src/music_manager.cpp.orig 2018-07-05 12:45:32 UTC ++++ src/music_manager.cpp +@@ -66,7 +66,7 @@ MusicManager::exists_music(const std::string& file) + // insert into music list + std::pair::iterator, bool> result = + musics.insert( +- std::make_pair (file, MusicResource())); ++ std::make_pair (std::string(file), MusicResource())); + MusicResource& resource = result.first->second; + resource.manager = this; + resource.music = song;