svn commit: r384527 - in head/games/gtkradiant: . files
Dmitry Marakasov
amdmi3 at FreeBSD.org
Wed Apr 22 22:53:04 UTC 2015
Author: amdmi3
Date: Wed Apr 22 22:53:03 2015
New Revision: 384527
URL: https://svnweb.freebsd.org/changeset/ports/384527
Log:
- Fix build on 64 bit architectures (cast from pointer to int loses precision)
- Drop @dirrm* from plist
- Add empty directories to plist
Approved by: portmgr blanket
Modified:
head/games/gtkradiant/files/patch-radiant_treemodel.cpp
head/games/gtkradiant/pkg-plist
Modified: head/games/gtkradiant/files/patch-radiant_treemodel.cpp
==============================================================================
--- head/games/gtkradiant/files/patch-radiant_treemodel.cpp Wed Apr 22 22:25:44 2015 (r384526)
+++ head/games/gtkradiant/files/patch-radiant_treemodel.cpp Wed Apr 22 22:53:03 2015 (r384527)
@@ -9,7 +9,7 @@
+ // C++ code, and Clang will assume that comparison below always evaluates
+ // to true, resulting in a segmentation fault. Use a dirty hack to force
+ // Clang to check those "bad" references for null nonetheless.
-+ volatile int n = (int)&node;
++ volatile intptr_t n = (intptr_t)&node;
+
+ if(n != 0)
{
@@ -20,7 +20,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 713
++ volatile intptr_t n = (intptr_t)&node; // see the comment on line 713
+
+ if(n != 0)
{
@@ -31,7 +31,7 @@
const char* node_get_name_safe(scene::Node& node)
{
- if(&node == 0)
-+ volatile int n = (int)&node; // see the comment on line 713
++ volatile intptr_t n = (intptr_t)&node; // see the comment on line 713
+
+ if(n == 0)
{
@@ -42,7 +42,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 713
++ volatile intptr_t n = (intptr_t)&node; // see the comment on line 713
+
+ if(n != 0)
{
@@ -53,7 +53,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 713
++ volatile intptr_t n = (intptr_t)&node; // see the comment on line 713
+
+ if(n != 0)
{
Modified: head/games/gtkradiant/pkg-plist
==============================================================================
--- head/games/gtkradiant/pkg-plist Wed Apr 22 22:25:44 2015 (r384526)
+++ head/games/gtkradiant/pkg-plist Wed Apr 22 22:53:03 2015 (r384527)
@@ -177,43 +177,6 @@ bin/gtkradiant
%%DATADIR%%/wolf.game/main/default_shaderlist.txt
%%DATADIR%%/wolf.game/main/wolf_entities.def
%%DATADIR%%/wolf.game/main/wolf_entities.ent
- at dirrm %%DATADIR%%/wolf.game/main
- at dirrm %%DATADIR%%/wolf.game
- at dirrm %%DATADIR%%/stvef.game/baseEF
- at dirrm %%DATADIR%%/stvef.game
- at dirrm %%DATADIR%%/sof2.game/base
- at dirrm %%DATADIR%%/sof2.game
- at dirrm %%DATADIR%%/q4.game/q4base
- at dirrm %%DATADIR%%/q4.game
- at dirrm %%DATADIR%%/q3bp.game/baseq3
- at dirrm %%DATADIR%%/q3bp.game
- at dirrm %%DATADIR%%/q3.game/missionpack
- at dirrm %%DATADIR%%/q3.game/baseq3
- at dirrm %%DATADIR%%/q3.game
- at dirrm %%DATADIR%%/q2.game/baseq2
- at dirrm %%DATADIR%%/q2.game
- at dirrm %%DATADIR%%/q1.game/id1
- at dirrm %%DATADIR%%/q1.game
- at dirrm %%DATADIR%%/modules
- at dirrm %%DATADIR%%/jk2.game/base
- at dirrm %%DATADIR%%/jk2.game
- at dirrm %%DATADIR%%/jabp.game
- at dirrm %%DATADIR%%/ja.game/base
- at dirrm %%DATADIR%%/ja.game
- at dirrm %%DATADIR%%/hlcs.game
- at dirrm %%DATADIR%%/hl.game/valve
- at dirrm %%DATADIR%%/hl.game/cstrike
- at dirrm %%DATADIR%%/hl.game
- at dirrm %%DATADIR%%/heretic2.game/base
- at dirrm %%DATADIR%%/heretic2.game
- at dirrm %%DATADIR%%/heretic2
- at dirrm %%DATADIR%%/gl
- at dirrm %%DATADIR%%/games
- at dirrm %%DATADIR%%/et.game/etmain
- at dirrm %%DATADIR%%/et.game/bitmaps
- at dirrm %%DATADIR%%/et.game
- at dirrm %%DATADIR%%/doom3.game/base
- at dirrm %%DATADIR%%/doom3.game
- at dirrm %%DATADIR%%/bitmaps
- at dirrm %%DATADIR%%/plugins
- at dirrm %%DATADIR%%
+ at dir %%DATADIR%%/hlcs.game
+ at dir %%DATADIR%%/jabp.game
+ at dir %%DATADIR%%/plugins
More information about the svn-ports-head
mailing list