diff options
| author | jbeich <jbeich@FreeBSD.org> | 2016-10-01 14:32:14 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2016-10-01 14:32:14 +0800 |
| commit | b1b313c81a604e076eb0b0d5028d643eedb88514 (patch) | |
| tree | eff35eb1a72f8b52b1ee5237aabc5856989d9c73 | |
| parent | d50d1e14053aea3a8ecacbe24ddd816e78da8908 (diff) | |
| download | freebsd-ports-gnome-b1b313c81a604e076eb0b0d5028d643eedb88514.tar.gz freebsd-ports-gnome-b1b313c81a604e076eb0b0d5028d643eedb88514.tar.zst freebsd-ports-gnome-b1b313c81a604e076eb0b0d5028d643eedb88514.zip | |
devel/rlvm: flatten gcc48 workaround
| -rw-r--r-- | devel/rlvm/Makefile | 4 | ||||
| -rw-r--r-- | devel/rlvm/files/patch-src_base_notification__registrar.cc (renamed from devel/rlvm/files/extra-patch-gcc48) | 11 |
2 files changed, 6 insertions, 9 deletions
diff --git a/devel/rlvm/Makefile b/devel/rlvm/Makefile index bb5a2673138c..55dd23e9f258 100644 --- a/devel/rlvm/Makefile +++ b/devel/rlvm/Makefile @@ -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 diff --git a/devel/rlvm/files/extra-patch-gcc48 b/devel/rlvm/files/patch-src_base_notification__registrar.cc index 5fc05af639bf..55f6f09bc3c4 100644 --- a/devel/rlvm/files/extra-patch-gcc48 +++ b/devel/rlvm/files/patch-src_base_notification__registrar.cc @@ -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 |