diff options
author | jbeich <jbeich@FreeBSD.org> | 2016-09-29 17:02:54 +0800 |
---|---|---|
committer | jbeich <jbeich@FreeBSD.org> | 2016-09-29 17:02:54 +0800 |
commit | 24d33f9db55d4ec9b80f6b7cfd25250ce0a09f7b (patch) | |
tree | bffaa084a2b15f857b7fa0888687c9bcc28bcf05 /devel | |
parent | 4f2110737972d09f45fc69ea0790795877b2c6fc (diff) | |
download | freebsd-ports-gnome-24d33f9db55d4ec9b80f6b7cfd25250ce0a09f7b.tar.gz freebsd-ports-gnome-24d33f9db55d4ec9b80f6b7cfd25250ce0a09f7b.tar.zst freebsd-ports-gnome-24d33f9db55d4ec9b80f6b7cfd25250ce0a09f7b.zip |
devel/rlvm: update to 0.14.67 (20160730 snapshot)
Switch to |git describe --tags| versioning scheme. Tag offsets better
show the amount of changes happenning between snapshots.
Changes: https://github.com/eglaysher/rlvm/compare/373a3db...9350209
Diffstat (limited to 'devel')
-rw-r--r-- | devel/rlvm/Makefile | 12 | ||||
-rw-r--r-- | devel/rlvm/distinfo | 5 | ||||
-rw-r--r-- | devel/rlvm/files/extra-patch-gcc48 | 16 | ||||
-rw-r--r-- | devel/rlvm/files/patch-test_medium__object__promotion.cc | 2 |
4 files changed, 28 insertions, 7 deletions
diff --git a/devel/rlvm/Makefile b/devel/rlvm/Makefile index 37426be5b09a..cf4dfa6375c7 100644 --- a/devel/rlvm/Makefile +++ b/devel/rlvm/Makefile @@ -1,7 +1,9 @@ # $FreeBSD$ PORTNAME= rlvm -PORTVERSION= 0.14.0.20150425 +DISTVERSIONPREFIX= release- +DISTVERSION= 0.14-67 +DISTVERSIONSUFFIX= -g9350209 CATEGORIES= devel games MAINTAINER= jbeich@FreeBSD.org @@ -18,7 +20,6 @@ RUN_DEPENDS= ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu USE_GITHUB= yes GH_ACCOUNT= eglaysher -GH_TAGNAME= 373a3db # release-${PORTVERSION} USES= compiler:c++11-lib pkgconfig scons USE_GL= glew glu @@ -27,12 +28,15 @@ USE_SDL= image mixer ttf EXCLUDE= GLEW SDL_image SDL_mixer SDL_ttf gmock gtest guichan \ luabind utf8cpp # leaving only pygame, xclannad, *.cpp EXTRACT_AFTER_ARGS=${EXCLUDE:S,^,--exclude vendor/,} +CFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528 +LDFLAGS+= -Wl,--as-needed # avoid overlinking (gtk deps) MAKE_ARGS= VERBOSE=1 INSTALLS_ICONS= yes PORTDOCS= AUTHORS.TXT NEWS.TXT README.md STATUS.TXT notes -CFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528 -LDFLAGS+= -Wl,--as-needed # avoid overlinking (gtk deps) +# 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_GROUP= JAPANESE_FONT diff --git a/devel/rlvm/distinfo b/devel/rlvm/distinfo index a8c8d013ac0a..a47264ac056c 100644 --- a/devel/rlvm/distinfo +++ b/devel/rlvm/distinfo @@ -1,2 +1,3 @@ -SHA256 (eglaysher-rlvm-0.14.0.20150425-373a3db_GH0.tar.gz) = 35fdabf1ded01f397a6736bd60ac13ccb614d88dcbec8192fbe4510f5b80b7aa -SIZE (eglaysher-rlvm-0.14.0.20150425-373a3db_GH0.tar.gz) = 1929198 +TIMESTAMP = 1475126655 +SHA256 (eglaysher-rlvm-release-0.14-67-g9350209_GH0.tar.gz) = 70a48aeca8e9298c1c5d3e4c7c4d9abd49bfc96e1afad5f2141039feb304df50 +SIZE (eglaysher-rlvm-release-0.14-67-g9350209_GH0.tar.gz) = 1895634 diff --git a/devel/rlvm/files/extra-patch-gcc48 b/devel/rlvm/files/extra-patch-gcc48 new file mode 100644 index 000000000000..5fc05af639bf --- /dev/null +++ b/devel/rlvm/files/extra-patch-gcc48 @@ -0,0 +1,16 @@ +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 +@@ -46,7 +46,8 @@ + } + + Record record = { observer, type, source }; +- auto found = std::find(registered_.cbegin(), registered_.cend(), record); ++ RecordVector::iterator found = std::find( ++ registered_.begin(), registered_.end(), record); + registered_.erase(found); + + // This can be NULL if our owner outlives the NotificationService, e.g. if our diff --git a/devel/rlvm/files/patch-test_medium__object__promotion.cc b/devel/rlvm/files/patch-test_medium__object__promotion.cc index 91d97f5a7f4d..e42a549f2d83 100644 --- a/devel/rlvm/files/patch-test_medium__object__promotion.cc +++ b/devel/rlvm/files/patch-test_medium__object__promotion.cc @@ -1,7 +1,7 @@ To workaround the following error unknown file: Failure - C++ exception with description "ExpressionPiece::GetStringValue() invalid on this object" thrown in the test body. + C++ exception with description "ExpressionPiece::GetIntegerValue() invalid on object of type 2" thrown in the test body. [ FAILED ] MediumObjectPoromotion/PromotionTest.BgLayerPromotion/49, where GetParam() = ("recMulti", 1, (3, "\"file\"$\xFF\0\0\0\0$\xFF\xFF\0\0\0"), true) (1 ms) --- test/medium_object_promotion.cc~ |