svn commit: r423035 - in head/devel/rlvm: . files

[Jan Beich]

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