From owner-svn-ports-head@freebsd.org Sat Oct 1 06:32:16 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5147AC083FD; Sat, 1 Oct 2016 06:32:16 +0000 (UTC) (envelope-from jbeich@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 mx1.freebsd.org (Postfix) with ESMTPS id 053ED1B13; Sat, 1 Oct 2016 06:32:15 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u916WFGL052993; Sat, 1 Oct 2016 06:32:15 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u916WF0m052991; Sat, 1 Oct 2016 06:32:15 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201610010632.u916WF0m052991@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 1 Oct 2016 06:32:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r423035 - in head/devel/rlvm: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Oct 2016 06:32:16 -0000 Author: jbeich Date: Sat Oct 1 06:32:14 2016 New Revision: 423035 URL: https://svnweb.freebsd.org/changeset/ports/423035 Log: devel/rlvm: flatten gcc48 workaround Added: head/devel/rlvm/files/patch-src_base_notification__registrar.cc (contents, props changed) - copied, changed from r423034, head/devel/rlvm/files/extra-patch-gcc48 Deleted: head/devel/rlvm/files/extra-patch-gcc48 Modified: head/devel/rlvm/Makefile (contents, props changed) Modified: head/devel/rlvm/Makefile ============================================================================== --- head/devel/rlvm/Makefile Sat Oct 1 06:28:34 2016 (r423034) +++ head/devel/rlvm/Makefile Sat Oct 1 06:32:14 2016 (r423035) @@ -35,10 +35,6 @@ MAKE_ARGS= VERBOSE=1 INSTALLS_ICONS= yes PORTDOCS= AUTHORS.TXT NEWS.TXT README.md STATUS.TXT notes -# XXX 9.x EOL to phase out USES=compiler, unblocking lang/gcc update -EXTRA_PATCHES+= ${EXTRA_PATCHES_${OPSYS}_${CHOSEN_COMPILER_TYPE}} -EXTRA_PATCHES_FreeBSD_gcc= ${PATCHDIR}/extra-patch-gcc48 - OPTIONS_DEFINE= DEBUG DOCS NLS TEST OPTIONS_DEFAULT=MONA OPTIONS_MULTI= JAPANESE_FONT Copied and modified: head/devel/rlvm/files/patch-src_base_notification__registrar.cc (from r423034, head/devel/rlvm/files/extra-patch-gcc48) ============================================================================== --- head/devel/rlvm/files/extra-patch-gcc48 Sat Oct 1 06:28:34 2016 (r423034, copy source) +++ head/devel/rlvm/files/patch-src_base_notification__registrar.cc Sat Oct 1 06:32:14 2016 (r423035) @@ -1,16 +1,17 @@ https://github.com/eglaysher/rlvm/issues/80 -diff --git src/base/notification_registrar.cc src/base/notification_registrar.cc -index 2b9d99d..2a6f63f 100644 ---- src/base/notification_registrar.cc +--- src/base/notification_registrar.cc.orig 2016-07-30 22:27:57 UTC +++ src/base/notification_registrar.cc -@@ -46,7 +46,8 @@ +@@ -46,7 +46,12 @@ void NotificationRegistrar::Remove(Notif } Record record = { observer, type, source }; -- auto found = std::find(registered_.cbegin(), registered_.cend(), record); ++#if !defined(__clang__) && defined(__GNUC__) && __GNUC__ < 5 + RecordVector::iterator found = std::find( + registered_.begin(), registered_.end(), record); ++#else + auto found = std::find(registered_.cbegin(), registered_.cend(), record); ++#endif registered_.erase(found); // This can be NULL if our owner outlives the NotificationService, e.g. if our