Date: Wed, 22 Apr 2015 21:50:34 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r384522 - in head/games/netradiant: . files Message-ID: <201504222150.t3MLoYAb063565@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Wed Apr 22 21:50:33 2015 New Revision: 384522 URL: https://svnweb.freebsd.org/changeset/ports/384522 Log: - Fix build on 64 bit architectures (cast from pointer to int loses precision) - Drop @dirrm* from plist Approved by: portmgr blanket Modified: head/games/netradiant/files/patch-radiant_treemodel.cpp head/games/netradiant/pkg-plist Modified: head/games/netradiant/files/patch-radiant_treemodel.cpp ============================================================================== --- head/games/netradiant/files/patch-radiant_treemodel.cpp Wed Apr 22 21:29:21 2015 (r384521) +++ head/games/netradiant/files/patch-radiant_treemodel.cpp Wed Apr 22 21:50:33 2015 (r384522) @@ -9,7 +9,7 @@ + // well-defined C++ code, and Clang will assume that comparison + // below always evaluates to true, resulting in segmentation + // fault. Use a dirty hack to force Clang to check for null. -+ volatile int n = (int)&node; ++ volatile intptr_t n = (intptr_t)&node; + if ( n != 0 ) { Nameable* nameable = Node_getNameable( node ); if ( nameable != 0 ) { @@ -19,7 +19,7 @@ } void node_detach_name_changed_callback( scene::Node& node, const NameCallback& callback ){ - if ( &node != 0 ) { -+ volatile int n = (int)&node; // see the comment on line 650 ++ volatile intptr_t n = (intptr_t)&node; // see the comment on line 650 + if ( n != 0 ) { Nameable* nameable = Node_getNameable( node ); if ( nameable != 0 ) { @@ -29,7 +29,7 @@ const char* node_get_name_safe( scene::Node& node ){ - if ( &node == 0 ) { -+ volatile int n = (int)&node; // see the comment on line 650 ++ volatile intptr_t n = (intptr_t)&node; // see the comment on line 650 + if ( n == 0 ) { return ""; } @@ -39,7 +39,7 @@ void node_attach_name_changed_callback( scene::Node& node, const NameCallback& callback ){ - if ( &node != 0 ) { -+ volatile int n = (int)&node; // see the comment on line 650 ++ volatile intptr_t n = (intptr_t)&node; // see the comment on line 650 + if ( n != 0 ) { Nameable* nameable = Node_getNameable( node ); if ( nameable != 0 ) { @@ -49,7 +49,7 @@ } void node_detach_name_changed_callback( scene::Node& node, const NameCallback& callback ){ - if ( &node != 0 ) { -+ volatile int n = (int)&node; // see the comment on line 650 ++ volatile intptr_t n = (intptr_t)&node; // see the comment on line 650 + if ( n != 0 ) { Nameable* nameable = Node_getNameable( node ); if ( nameable != 0 ) { Modified: head/games/netradiant/pkg-plist ============================================================================== --- head/games/netradiant/pkg-plist Wed Apr 22 21:29:21 2015 (r384521) +++ head/games/netradiant/pkg-plist Wed Apr 22 21:50:33 2015 (r384522) @@ -171,25 +171,3 @@ man/man6/q3map2.6.gz %%DATADIR%%/xonotic.game/data/entities.ent %%DATADIR%%/xonotic.game/default_build_menu.xml %%DATADIR%%/xonotic.game/game.xlink -@dirrm %%DATADIR%%/xonotic.game/data -@dirrm %%DATADIR%%/xonotic.game -@dirrm %%DATADIR%%/warsow.game/basewsw -@dirrm %%DATADIR%%/warsow.game -@dirrm %%DATADIR%%/q1.game/id1 -@dirrm %%DATADIR%%/q1.game -@dirrm %%DATADIR%%/plugins/bt -@dirrm %%DATADIR%%/plugins/bitmaps -@dirrm %%DATADIR%%/plugins -@dirrm %%DATADIR%%/osirion.game/base -@dirrm %%DATADIR%%/osirion.game -@dirrm %%DATADIR%%/nexuiz.game/data -@dirrm %%DATADIR%%/nexuiz.game -@dirrm %%DATADIR%%/modules -@dirrm %%DATADIR%%/heretic2 -@dirrm %%DATADIR%%/gl -@dirrm %%DATADIR%%/games -@dirrm %%DATADIR%%/docs -@dirrm %%DATADIR%%/darkplaces.game/id1 -@dirrm %%DATADIR%%/darkplaces.game -@dirrm %%DATADIR%%/bitmaps -@dirrm %%DATADIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504222150.t3MLoYAb063565>