Index: head/devel/rlvm/Makefile =================================================================== --- head/devel/rlvm/Makefile (revision 422910) +++ head/devel/rlvm/Makefile (revision 422911) @@ -1,96 +1,100 @@ # $FreeBSD$ PORTNAME= rlvm -PORTVERSION= 0.14.0.20150425 +DISTVERSIONPREFIX= release- +DISTVERSION= 0.14-67 +DISTVERSIONSUFFIX= -g9350209 CATEGORIES= devel games MAINTAINER= jbeich@FreeBSD.org COMMENT= RealLive virtual machine clone LICENSE= GPLv2 GPLv3 MIT LICENSE_COMB= multi BUILD_DEPENDS= ${LOCALBASE}/include/utf8.h:devel/utf8cpp LIB_DEPENDS= libvorbisfile.so:audio/libvorbis \ libboost_serialization.so:devel/boost-libs \ libguichan.so:devel/guichan 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 USE_GNOME= gtk20 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 OPTIONS_GROUP_JAPANESE_FONT=KOCHI MONA SAZANAMI OPTIONS_SUB= yes JAPANESE_FONT_DESC=msgothic.ttc alternatives with verified metrics (unless --font) KOCHI_DESC= kochi-gothic-subst.ttf from japanese/font-kochi KOCHI_RUN_DEPENDS=${LOCALBASE}/share/fonts/TTF/kochi-gothic-subst.ttf:japanese/font-kochi MONA_DESC= mona.ttf from japanese/monafonts-ttf MONA_RUN_DEPENDS=${LOCALBASE}/share/fonts/TrueType/mona.ttf:japanese/monafonts-ttf SAZANAMI_DESC= sazanami-gothic.ttf from japanese/font-sazanami SAZANAMI_RUN_DEPENDS=${LOCALBASE}/share/fonts/TTF/sazanami-gothic.ttf:japanese/font-sazanami DEBUG_MAKE_ARGS_OFF=--release NLS_USES= gettext NLS_EXTRA_PATCHES_OFF=${FILESDIR}/extra-patch-disable-nls TEST_USES= lua:51 TEST_BUILD_DEPENDS=googletest>=1.7.0:devel/googletest \ googlemock>=1.7.0:devel/googlemock \ luabind>0:devel/luabind TEST_EXTRA_PATCHES_OFF=${FILESDIR}/extra-patch-disable-test post-patch: @${GREP} -Flr 'utf8cpp/' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \ -i .bak.utf8cpp -e 's,utf8cpp/,,' # Default to TTF/ subdir where japanese/ fonts are often installed @${GREP} -Flr '/usr/share' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} \ -i .bak.paths \ -e 's,/usr/share,${PREFIX}/share,' \ -e 's,truetype/ttf-dejavu,dejavu,' \ -e 's,truetype/mona,TrueType,' \ -e 's,truetype/[^/"]*,TTF,' pre-install-TEST-on: (cd ${WRKSRC} && build/${PORTNAME}_unittests) do-install: ${INSTALL_PROGRAM} ${WRKSRC}/build/${PORTNAME} \ ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/debian/${PORTNAME}.6 \ ${STAGEDIR}${MAN6PREFIX}/man/man6 ${INSTALL_DATA} ${WRKSRC}/src/platforms/gtk/${PORTNAME}.desktop \ ${STAGEDIR}${DESKTOPDIR} @(cd ${WRKSRC}/resources && for f in */${PORTNAME}.png; do \ ${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${f%/*}x$${f%/*}/apps; \ ${INSTALL_DATA} -v $$f \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/$${f%/*}x$${f%/*}/apps; \ done) post-install-NLS-on: (cd ${WRKSRC}/build/locale && ${COPYTREE_SHARE} \ . ${STAGEDIR}${PREFIX}/share/locale) post-install-DOCS-on: (cd ${WRKSRC} && ${COPYTREE_SHARE} \ "${PORTDOCS:Nnotes}" ${STAGEDIR}${DOCSDIR}) (cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \ notes ${STAGEDIR}${DOCSDIR}) .include Index: head/devel/rlvm/distinfo =================================================================== --- head/devel/rlvm/distinfo (revision 422910) +++ head/devel/rlvm/distinfo (revision 422911) @@ -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 Index: head/devel/rlvm/files/extra-patch-gcc48 =================================================================== --- head/devel/rlvm/files/extra-patch-gcc48 (nonexistent) +++ head/devel/rlvm/files/extra-patch-gcc48 (revision 422911) @@ -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 Property changes on: head/devel/rlvm/files/extra-patch-gcc48 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/rlvm/files/patch-test_medium__object__promotion.cc =================================================================== --- head/devel/rlvm/files/patch-test_medium__object__promotion.cc (revision 422910) +++ head/devel/rlvm/files/patch-test_medium__object__promotion.cc (revision 422911) @@ -1,19 +1,19 @@ 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~ +++ test/medium_object_promotion.cc @@ -246,10 +246,6 @@ std::vector data = { 0, TestMachine::Arg("file", 0), SHOULD_PROMOTE_BG), - std::make_tuple("recMulti", - 1, - TestMachine::Arg("file", 0, 255), - SHOULD_PROMOTE_BG), std::make_tuple("grpOpen", 0, TestMachine::Arg("file", 0),