diff --git a/games/openlierox/Makefile b/games/openlierox/Makefile index c795f908ff8d..9a2845bcdfb8 100644 --- a/games/openlierox/Makefile +++ b/games/openlierox/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= openlierox -DISTVERSION= 0.58_rc3 -PORTREVISION= 20 +DISTVERSION= 0.58_rc5 PORTEPOCH= 1 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/OpenLieroX%20${DISTVERSION:C/_/%20/} @@ -19,8 +18,6 @@ USES= cmake:insource compiler:c++11-lang gnome localbase pkgconfig \ USE_SDL= sdl image USE_GNOME= libxml2 -CXXFLAGS+= -Wno-c++11-narrowing - CMAKE_ARGS= -DHAWKNL_BUILTIN=YES \ -DLIBZIP_BUILTIN=YES \ -DBREAKPAD=NO \ @@ -50,11 +47,6 @@ DEDICATED_ONLY_LIB_DEPENDS_OFF= libgd.so:graphics/gd post-patch: @${REINPLACE_CMD} -e 's|EXEC_PROGRAM.*OLXVER)|SET(OLXVER "${DISTVERSION}")|; \ s|/usr/local|${LOCALBASE}|' ${WRKSRC}/CMakeOlxCommon.cmake - @${FIND} ${WRKSRC} \( -name "*.cpp" -o -name "*.h" -o -name "*.cc" \) -print0 | ${XARGS} -0 -n1 \ - ${REINPLACE_CMD} -e '/include.*curl\/types.h/ d' -# Convert the static_assert calls to regular, C++ ones. - @${FIND} ${WRKSRC} \( -name "*.cpp" -o -name "*.h" -o -name "*.cc" \) -print0 | ${XARGS} -0 -n1 \ - ${REINPLACE_CMD} -E -e 's/static_assert\((.+), (.+)\)/static_assert\(\1, "\2"\)/g' do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/openlierox ${STAGEDIR}${PREFIX}/bin/ @@ -62,7 +54,7 @@ do-install: ${STAGEDIR}${PREFIX}/share/applications/ ${INSTALL_DATA} ${WRKSRC}/share/OpenLieroX.svg \ ${STAGEDIR}${PREFIX}/share/pixmaps/ - @cd ${WRKSRC}/share/gamedir && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ + @cd ${WRKSRC}/share/gamedir && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/OpenLieroX do-install-DOCS-on: @cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/ diff --git a/games/openlierox/distinfo b/games/openlierox/distinfo index 00d9861d4b03..30be40c5a822 100644 --- a/games/openlierox/distinfo +++ b/games/openlierox/distinfo @@ -1,2 +1,3 @@ -SHA256 (OpenLieroX_0.58_rc3.src.tar.bz2) = 9f246887d38c325e597373d9189990c9374c241cb807b4b5777844eceeed65cc -SIZE (OpenLieroX_0.58_rc3.src.tar.bz2) = 63845193 +TIMESTAMP = 1575633640 +SHA256 (OpenLieroX_0.58_rc5.src.tar.bz2) = 3e029aba20f22d902027293e1f1a196e2f1794455cb2483d099709d7fb6c5fbb +SIZE (OpenLieroX_0.58_rc5.src.tar.bz2) = 64050462 diff --git a/games/openlierox/files/patch-include_GfxPrimitives.h b/games/openlierox/files/patch-include_GfxPrimitives.h deleted file mode 100644 index 006298774f10..000000000000 --- a/games/openlierox/files/patch-include_GfxPrimitives.h +++ /dev/null @@ -1,32 +0,0 @@ -Provide missing constructor. - -./include/CMap.h:423:18: error: no matching constructor for initialization of 'SDLRect' (aka 'OLXRect') - if(!r.clipWith(SDLRect(0, 0, Width, Height))) - ^ ~~~~~~~~~~~~~~~~~~~ -./include/GfxPrimitives.h:161:2: note: candidate constructor not viable: requires single argument 'r', but 4 arguments were provided - OLXRect(const _RectBasic & r): _RectBasic(r) {} - ^ ---- include/GfxPrimitives.h.orig 2017-07-26 12:33:41 UTC -+++ include/GfxPrimitives.h -@@ -106,6 +106,12 @@ class SDLRectBasic : public SDL_Rect { (public) - typedef Uint16 TypeS; - - SDLRectBasic() { this->SDL_Rect::x = this->SDL_Rect::y = this->SDL_Rect::w = this->SDL_Rect::h = 0; } -+ SDLRectBasic(Type x_, Type y_, TypeS w_, TypeS h_) { -+ this->SDL_Rect::x = x_; -+ this->SDL_Rect::y = y_; -+ this->SDL_Rect::w = w_; -+ this->SDL_Rect::h = h_; -+ } - SDLRectBasic(const SDL_Rect & r): SDL_Rect(r) {} - Type& x() { return this->SDL_Rect::x; } - Type& y() { return this->SDL_Rect::y; } -@@ -158,6 +164,8 @@ template - class OLXRect : public _RectBasic { - public: - -+ OLXRect(typename _RectBasic::Type x_, typename _RectBasic::Type y_, -+ typename _RectBasic::TypeS w_, typename _RectBasic::TypeS h_): _RectBasic(x_, y_, w_, h_) {} - OLXRect(const _RectBasic & r): _RectBasic(r) {} - - class GetX2 { diff --git a/games/openlierox/files/patch-include_StaticAssert.h b/games/openlierox/files/patch-include_StaticAssert.h deleted file mode 100644 index 83a727c95ab5..000000000000 --- a/games/openlierox/files/patch-include_StaticAssert.h +++ /dev/null @@ -1,16 +0,0 @@ -Use static_assert provided by the compiler to avoid redefining it and breaking -headers which use the official version. ---- include/StaticAssert.h.orig 2009-10-11 20:53:01 UTC -+++ include/StaticAssert.h -@@ -10,11 +10,5 @@ - #ifndef __OLX__STATICASSERT_H__ - #define __OLX__STATICASSERT_H__ - --template class static_assert_failure; --template <> class static_assert_failure { char foo; }; --template class static_assert_test{}; -- --#define static_assert(X, desc) \ -- typedef static_assert_test< (int)sizeof(static_assert_failure< (bool)(X) >) > static_assert_typedef_##desc; - - #endif diff --git a/games/openlierox/files/patch-libs_pstreams_pstream.h b/games/openlierox/files/patch-libs_pstreams_pstream.h deleted file mode 100644 index 62bb7fdb03c6..000000000000 --- a/games/openlierox/files/patch-libs_pstreams_pstream.h +++ /dev/null @@ -1,49 +0,0 @@ -Use the type basic_pstreambuf::fd_type is a typedef of. - -./libs/pstreams/pstream.h:1742:28: error: return type of out-of-line definition of 'redi::basic_pstreambuf::wpipe' differs from that in the declaration - basic_pstreambuf::wpipe() - ^ -./libs/pstreams/pstream.h:221:7: note: previous declaration is here - wpipe(); - ^ -./libs/pstreams/pstream.h:1750:28: error: return type of out-of-line definition of 'redi::basic_pstreambuf::rpipe' differs from that in the declaration - basic_pstreambuf::rpipe() - ^ -./libs/pstreams/pstream.h:225:7: note: previous declaration is here - rpipe(); - ^ -./libs/pstreams/pstream.h:1758:28: error: return type of out-of-line definition of 'redi::basic_pstreambuf::rpipe' differs from that in the declaration - basic_pstreambuf::rpipe(buf_read_src which) - ^ -./libs/pstreams/pstream.h:229:7: note: previous declaration is here - rpipe(buf_read_src which); - ^ ---- libs/pstreams/pstream.h.orig 2017-07-26 12:51:55 UTC -+++ libs/pstreams/pstream.h -@@ -1738,7 +1738,7 @@ namespace redi - - /** @return a reference to the output file descriptor */ - template -- inline typename basic_pstreambuf::fd_type& -+ inline typename pstreams::fd_type& - basic_pstreambuf::wpipe() - { - return wpipe_; -@@ -1746,7 +1746,7 @@ namespace redi - - /** @return a reference to the active input file descriptor */ - template -- inline typename basic_pstreambuf::fd_type& -+ inline typename pstreams::fd_type& - basic_pstreambuf::rpipe() - { - return rpipe_[rsrc_]; -@@ -1754,7 +1754,7 @@ namespace redi - - /** @return a reference to the specified input file descriptor */ - template -- inline typename basic_pstreambuf::fd_type& -+ inline typename pstreams::fd_type& - basic_pstreambuf::rpipe(buf_read_src which) - { - return rpipe_[which];