svn commit: r327508 - in head: devel/libclaw devel/libclaw/files games/plee-the-bear games/plee-the-bear/files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Wed Sep 18 02:36:29 UTC 2013
Author: amdmi3
Date: Wed Sep 18 02:36:27 2013
New Revision: 327508
URL: http://svnweb.freebsd.org/changeset/ports/327508
Log:
Fix build with clang/libc++
Added:
head/devel/libclaw/files/
head/devel/libclaw/files/patch-claw-impl-box__2d.tpp (contents, props changed)
head/devel/libclaw/files/patch-claw-impl-rectangle.tpp (contents, props changed)
head/devel/libclaw/files/patch-claw-impl-socket__stream.tpp (contents, props changed)
head/games/plee-the-bear/files/patch-bear-engine-core-src-engine-model-code-model__action.cpp (contents, props changed)
head/games/plee-the-bear/files/patch-bear-engine-core-src-engine-script-code-script__runner.cpp (contents, props changed)
head/games/plee-the-bear/files/patch-plee-the-bear-src-ptb-expr-impl-boolean__player__function.tpp (contents, props changed)
Modified:
head/devel/libclaw/Makefile
head/games/plee-the-bear/Makefile
Modified: head/devel/libclaw/Makefile
==============================================================================
--- head/devel/libclaw/Makefile Tue Sep 17 22:48:50 2013 (r327507)
+++ head/devel/libclaw/Makefile Wed Sep 18 02:36:27 2013 (r327508)
@@ -16,7 +16,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boos
USES= cmake gettext
CMAKE_ARGS= -DCLAW_CMAKE_MODULES_INSTALL_PATH="${DATADIR}/cmake"
USE_LDCONFIG= yes
-USE_GCC= yes
+#USE_GCC= yes
post-patch:
@${REINPLACE_CMD} -e '/subdirs/ s|doc||' ${WRKSRC}/CMakeLists.txt
Added: head/devel/libclaw/files/patch-claw-impl-box__2d.tpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/libclaw/files/patch-claw-impl-box__2d.tpp Wed Sep 18 02:36:27 2013 (r327508)
@@ -0,0 +1,13 @@
+--- claw/impl/box_2d.tpp.orig 2013-07-03 23:34:38.000000000 +0400
++++ claw/impl/box_2d.tpp 2013-09-14 02:59:04.591227299 +0400
+@@ -136,8 +136,8 @@
+ claw::math::box_2d<U> claw::math::box_2d<T>::cast_value_type_to() const
+ {
+ return claw::math::box_2d<U>
+- ( first_point.cast_value_type_to<U>(),
+- second_point.cast_value_type_to<U>() );
++ ( first_point.template cast_value_type_to<U>(),
++ second_point.template cast_value_type_to<U>() );
+ } // box_2d::cast_value_type_to()
+
+ /*----------------------------------------------------------------------------*/
Added: head/devel/libclaw/files/patch-claw-impl-rectangle.tpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/libclaw/files/patch-claw-impl-rectangle.tpp Wed Sep 18 02:36:27 2013 (r327508)
@@ -0,0 +1,11 @@
+--- claw/impl/rectangle.tpp.orig 2013-07-03 23:34:38.000000000 +0400
++++ claw/impl/rectangle.tpp 2013-09-14 02:57:21.105226690 +0400
+@@ -140,7 +140,7 @@
+ claw::math::rectangle<U> claw::math::rectangle<T>::cast_value_type_to() const
+ {
+ return claw::math::rectangle<U>
+- ( position.cast_value_type_to<U>(), (U)width, (U)height );
++ ( position.template cast_value_type_to<U>(), (U)width, (U)height );
+ } // rectangle::cast_value_type_to()
+
+ /*----------------------------------------------------------------------------*/
Added: head/devel/libclaw/files/patch-claw-impl-socket__stream.tpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/libclaw/files/patch-claw-impl-socket__stream.tpp Wed Sep 18 02:36:27 2013 (r327508)
@@ -0,0 +1,20 @@
+--- claw/impl/socket_stream.tpp.orig 2013-07-03 23:34:38.000000000 +0400
++++ claw/impl/socket_stream.tpp 2013-09-14 03:12:49.742226665 +0400
+@@ -37,7 +37,7 @@
+ template<typename CharT, typename Traits>
+ claw::net::basic_socket_stream<CharT, Traits>::basic_socket_stream
+ ( int read_delay )
+- : m_buffer(read_delay)
++ : std::basic_iostream<CharT, Traits>(&m_buffer), m_buffer(read_delay)
+ {
+ this->init(&m_buffer);
+ } // basic_socket_stream::basic_socket_stream()
+@@ -53,7 +53,7 @@
+ template<typename CharT, typename Traits>
+ claw::net::basic_socket_stream<CharT, Traits>::basic_socket_stream
+ ( const char* address, int port, int read_delay )
+- : m_buffer(read_delay)
++ : std::basic_iostream<CharT, Traits>(&m_buffer), m_buffer(read_delay)
+ {
+ this->init(&m_buffer);
+ open(address, port);
Modified: head/games/plee-the-bear/Makefile
==============================================================================
--- head/games/plee-the-bear/Makefile Tue Sep 17 22:48:50 2013 (r327507)
+++ head/games/plee-the-bear/Makefile Wed Sep 18 02:36:27 2013 (r327508)
@@ -25,7 +25,6 @@ USE_GL= gl glu
WANT_GNOME= yes
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
-USE_GCC= yes
USES= cmake
CMAKE_ARGS= -Dlibclaw_DIR="${LOCALBASE}/share/libclaw/cmake" \
Added: head/games/plee-the-bear/files/patch-bear-engine-core-src-engine-model-code-model__action.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/plee-the-bear/files/patch-bear-engine-core-src-engine-model-code-model__action.cpp Wed Sep 18 02:36:27 2013 (r327508)
@@ -0,0 +1,11 @@
+--- bear-engine/core/src/engine/model/code/model_action.cpp.orig 2011-07-17 23:01:25.000000000 +0400
++++ bear-engine/core/src/engine/model/code/model_action.cpp 2013-09-14 03:46:40.203322514 +0400
+@@ -396,7 +396,7 @@
+ bear::engine::model_action::get_snapshot_const_iterator_at
+ ( universe::time_type t ) const
+ {
+- if ( claw::real_number<universe::time_type>(t) > get_duration() )
++ if ( (double)claw::real_number<universe::time_type>(t) > get_duration() )
+ return m_snapshot.end();
+ else if ( m_snapshot.empty() )
+ return m_snapshot.end();
Added: head/games/plee-the-bear/files/patch-bear-engine-core-src-engine-script-code-script__runner.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/plee-the-bear/files/patch-bear-engine-core-src-engine-script-code-script__runner.cpp Wed Sep 18 02:36:27 2013 (r327508)
@@ -0,0 +1,11 @@
+--- bear-engine/core/src/engine/script/code/script_runner.cpp.orig 2011-07-17 23:01:25.000000000 +0400
++++ bear-engine/core/src/engine/script/code/script_runner.cpp 2013-09-17 23:44:12.620520919 +0400
+@@ -108,7 +108,7 @@
+ bool done(false);
+
+ while ( !done && (m_current_call != m_sequence.end()) )
+- if ( claw::real_number<universe::time_type>(m_current_call->date) > m_date )
++ if ( claw::real_number<universe::time_type>(m_current_call->date) > claw::real_number<universe::time_type>(m_date) )
+ done = true;
+ else
+ {
Added: head/games/plee-the-bear/files/patch-plee-the-bear-src-ptb-expr-impl-boolean__player__function.tpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/games/plee-the-bear/files/patch-plee-the-bear-src-ptb-expr-impl-boolean__player__function.tpp Wed Sep 18 02:36:27 2013 (r327508)
@@ -0,0 +1,11 @@
+--- plee-the-bear/src/ptb/expr/impl/boolean_player_function.tpp.orig 2011-07-17 23:01:25.000000000 +0400
++++ plee-the-bear/src/ptb/expr/impl/boolean_player_function.tpp 2013-09-18 00:33:39.358695760 +0400
+@@ -37,7 +37,7 @@
+ template<typename FunctionType>
+ ptb::boolean_player_function<FunctionType>::boolean_player_function
+ ( unsigned int player_index, const bear::engine::level_globals* g )
+- : m_player_index(player_index), m_player(NULL), m_level_globals(g)
++ : m_player_index(player_index), m_player(), m_level_globals(g)
+ {
+ search_player();
+ } // boolean_player_function::boolean_player_function()
More information about the svn-ports-all
mailing list