kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
freebsd-ports/games/gtkradiant/files/patch-radiant_treemodel.cpp

62 lines
1.9 KiB
C++
Raw Normal View History

- Fix the build against modern libpng (do not try to access private data) - Clang insists that reference cannot be bound to dereferenced null pointer in well-defined C++ code (that is correct) and evaluates comparisons like &foo == 0 to false, which breaks GtkRadiant; "fix" this with a dirty hack by casting those "bad" references to a local volatile int variable - Remove no longer required and no-op -lpthread vs. -pthread patch hunk - Report operating system and correct compiler version in the About dialog - When fixing annoying "GtkSpinButton: setting an adjustment with non-zero page size is deprecated" warnings, replace find(1) with grep(1) to narrow down initial search results and, subsequently, sed(1) furiousness - Omit port revision bump as the port was BROKEN for quite some time
2015-04-18 18:29:01 +02:00
--- radiant/treemodel.cpp.orig 2006-02-10 22:01:20 UTC
+++ radiant/treemodel.cpp
Oops, incomplete version of the patch was committed in r384239.
2015-04-18 19:10:26 +02:00
@@ -710,7 +710,13 @@ public:
- Fix the build against modern libpng (do not try to access private data) - Clang insists that reference cannot be bound to dereferenced null pointer in well-defined C++ code (that is correct) and evaluates comparisons like &foo == 0 to false, which breaks GtkRadiant; "fix" this with a dirty hack by casting those "bad" references to a local volatile int variable - Remove no longer required and no-op -lpthread vs. -pthread patch hunk - Report operating system and correct compiler version in the About dialog - When fixing annoying "GtkSpinButton: setting an adjustment with non-zero page size is deprecated" warnings, replace find(1) with grep(1) to narrow down initial search results and, subsequently, sed(1) furiousness - Omit port revision bump as the port was BROKEN for quite some time
2015-04-18 18:29:01 +02:00
Oops, incomplete version of the patch was committed in r384239.
2015-04-18 19:10:26 +02:00
void node_attach_name_changed_callback(scene::Node& node, const NameCallback& callback)
- Fix the build against modern libpng (do not try to access private data) - Clang insists that reference cannot be bound to dereferenced null pointer in well-defined C++ code (that is correct) and evaluates comparisons like &foo == 0 to false, which breaks GtkRadiant; "fix" this with a dirty hack by casting those "bad" references to a local volatile int variable - Remove no longer required and no-op -lpthread vs. -pthread patch hunk - Report operating system and correct compiler version in the About dialog - When fixing annoying "GtkSpinButton: setting an adjustment with non-zero page size is deprecated" warnings, replace find(1) with grep(1) to narrow down initial search results and, subsequently, sed(1) furiousness - Omit port revision bump as the port was BROKEN for quite some time
2015-04-18 18:29:01 +02:00
{
Oops, incomplete version of the patch was committed in r384239.
2015-04-18 19:10:26 +02:00
- if(&node != 0)
- Fix the build against modern libpng (do not try to access private data) - Clang insists that reference cannot be bound to dereferenced null pointer in well-defined C++ code (that is correct) and evaluates comparisons like &foo == 0 to false, which breaks GtkRadiant; "fix" this with a dirty hack by casting those "bad" references to a local volatile int variable - Remove no longer required and no-op -lpthread vs. -pthread patch hunk - Report operating system and correct compiler version in the About dialog - When fixing annoying "GtkSpinButton: setting an adjustment with non-zero page size is deprecated" warnings, replace find(1) with grep(1) to narrow down initial search results and, subsequently, sed(1) furiousness - Omit port revision bump as the port was BROKEN for quite some time
2015-04-18 18:29:01 +02:00
+ // Reference cannot be bound to dereferenced null pointer in well-defined
+ // C++ code, and Clang will assume that comparison below always evaluates
Oops, incomplete version of the patch was committed in r384239.
2015-04-18 19:10:26 +02:00
+ // to true, resulting in a segmentation fault. Use a dirty hack to force
+ // Clang to check those "bad" references for null nonetheless.
- 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
2015-04-23 00:53:03 +02:00
+ volatile intptr_t n = (intptr_t)&node;
- Fix the build against modern libpng (do not try to access private data) - Clang insists that reference cannot be bound to dereferenced null pointer in well-defined C++ code (that is correct) and evaluates comparisons like &foo == 0 to false, which breaks GtkRadiant; "fix" this with a dirty hack by casting those "bad" references to a local volatile int variable - Remove no longer required and no-op -lpthread vs. -pthread patch hunk - Report operating system and correct compiler version in the About dialog - When fixing annoying "GtkSpinButton: setting an adjustment with non-zero page size is deprecated" warnings, replace find(1) with grep(1) to narrow down initial search results and, subsequently, sed(1) furiousness - Omit port revision bump as the port was BROKEN for quite some time
2015-04-18 18:29:01 +02:00
+
Oops, incomplete version of the patch was committed in r384239.
2015-04-18 19:10:26 +02:00
+ if(n != 0)
{
Nameable* nameable = Node_getNameable(node);
if(nameable != 0)
@@ -721,7 +727,9 @@ void node_attach_name_changed_callback(s
}
void node_detach_name_changed_callback(scene::Node& node, const NameCallback& callback)
{
- if(&node != 0)
- Fix broken communication with external tools (e.g. q2map): GtkRadiant's network library (libs/l_net) defines its own struct sockaddr_s, which has single ``short sa_family'' field instead of ``unsigned char sa_len'' and ``sa_family_t sa_family'' of struct sockaddr; this, in turn, causes problems when sockaddr_s objects bogusly used as sockaddr ones, e.g.: connect(4, { sa_len = 2, sa_family = 0, ...) ERR#47 'Address family not supported by protocol family' - Fix missing main window icon by calling pixbuf_new_from_file_with_mask() with correct filepath - Since these changes are likely to improve GtkRadiant user's experience, tentatively bump port revision - Fix comment indentation in `radiant/treemodel.cpp' (broken in r384527)
2015-04-23 09:26:09 +02:00
+ volatile intptr_t n = (intptr_t)&node; // see the comment on line 713
Oops, incomplete version of the patch was committed in r384239.
2015-04-18 19:10:26 +02:00
+
+ if(n != 0)
{
Nameable* nameable = Node_getNameable(node);
if(nameable != 0)
@@ -1243,7 +1251,9 @@ const char* node_get_name(scene::Node& n
const char* node_get_name_safe(scene::Node& node)
{
- if(&node == 0)
- Fix broken communication with external tools (e.g. q2map): GtkRadiant's network library (libs/l_net) defines its own struct sockaddr_s, which has single ``short sa_family'' field instead of ``unsigned char sa_len'' and ``sa_family_t sa_family'' of struct sockaddr; this, in turn, causes problems when sockaddr_s objects bogusly used as sockaddr ones, e.g.: connect(4, { sa_len = 2, sa_family = 0, ...) ERR#47 'Address family not supported by protocol family' - Fix missing main window icon by calling pixbuf_new_from_file_with_mask() with correct filepath - Since these changes are likely to improve GtkRadiant user's experience, tentatively bump port revision - Fix comment indentation in `radiant/treemodel.cpp' (broken in r384527)
2015-04-23 09:26:09 +02:00
+ volatile intptr_t n = (intptr_t)&node; // see the comment on line 713
Oops, incomplete version of the patch was committed in r384239.
2015-04-18 19:10:26 +02:00
+
- Fix the build against modern libpng (do not try to access private data) - Clang insists that reference cannot be bound to dereferenced null pointer in well-defined C++ code (that is correct) and evaluates comparisons like &foo == 0 to false, which breaks GtkRadiant; "fix" this with a dirty hack by casting those "bad" references to a local volatile int variable - Remove no longer required and no-op -lpthread vs. -pthread patch hunk - Report operating system and correct compiler version in the About dialog - When fixing annoying "GtkSpinButton: setting an adjustment with non-zero page size is deprecated" warnings, replace find(1) with grep(1) to narrow down initial search results and, subsequently, sed(1) furiousness - Omit port revision bump as the port was BROKEN for quite some time
2015-04-18 18:29:01 +02:00
+ if(n == 0)
{
return "";
}
Oops, incomplete version of the patch was committed in r384239.
2015-04-18 19:10:26 +02:00
@@ -1264,7 +1274,9 @@ GraphTreeNode* graph_tree_model_find_par
- Fix the build against modern libpng (do not try to access private data) - Clang insists that reference cannot be bound to dereferenced null pointer in well-defined C++ code (that is correct) and evaluates comparisons like &foo == 0 to false, which breaks GtkRadiant; "fix" this with a dirty hack by casting those "bad" references to a local volatile int variable - Remove no longer required and no-op -lpthread vs. -pthread patch hunk - Report operating system and correct compiler version in the About dialog - When fixing annoying "GtkSpinButton: setting an adjustment with non-zero page size is deprecated" warnings, replace find(1) with grep(1) to narrow down initial search results and, subsequently, sed(1) furiousness - Omit port revision bump as the port was BROKEN for quite some time
2015-04-18 18:29:01 +02:00
void node_attach_name_changed_callback(scene::Node& node, const NameCallback& callback)
{
- if(&node != 0)
- Fix broken communication with external tools (e.g. q2map): GtkRadiant's network library (libs/l_net) defines its own struct sockaddr_s, which has single ``short sa_family'' field instead of ``unsigned char sa_len'' and ``sa_family_t sa_family'' of struct sockaddr; this, in turn, causes problems when sockaddr_s objects bogusly used as sockaddr ones, e.g.: connect(4, { sa_len = 2, sa_family = 0, ...) ERR#47 'Address family not supported by protocol family' - Fix missing main window icon by calling pixbuf_new_from_file_with_mask() with correct filepath - Since these changes are likely to improve GtkRadiant user's experience, tentatively bump port revision - Fix comment indentation in `radiant/treemodel.cpp' (broken in r384527)
2015-04-23 09:26:09 +02:00
+ volatile intptr_t n = (intptr_t)&node; // see the comment on line 713
- Fix the build against modern libpng (do not try to access private data) - Clang insists that reference cannot be bound to dereferenced null pointer in well-defined C++ code (that is correct) and evaluates comparisons like &foo == 0 to false, which breaks GtkRadiant; "fix" this with a dirty hack by casting those "bad" references to a local volatile int variable - Remove no longer required and no-op -lpthread vs. -pthread patch hunk - Report operating system and correct compiler version in the About dialog - When fixing annoying "GtkSpinButton: setting an adjustment with non-zero page size is deprecated" warnings, replace find(1) with grep(1) to narrow down initial search results and, subsequently, sed(1) furiousness - Omit port revision bump as the port was BROKEN for quite some time
2015-04-18 18:29:01 +02:00
+
+ if(n != 0)
{
Nameable* nameable = Node_getNameable(node);
if(nameable != 0)
Oops, incomplete version of the patch was committed in r384239.
2015-04-18 19:10:26 +02:00
@@ -1275,7 +1287,9 @@ void node_attach_name_changed_callback(s
- Fix the build against modern libpng (do not try to access private data) - Clang insists that reference cannot be bound to dereferenced null pointer in well-defined C++ code (that is correct) and evaluates comparisons like &foo == 0 to false, which breaks GtkRadiant; "fix" this with a dirty hack by casting those "bad" references to a local volatile int variable - Remove no longer required and no-op -lpthread vs. -pthread patch hunk - Report operating system and correct compiler version in the About dialog - When fixing annoying "GtkSpinButton: setting an adjustment with non-zero page size is deprecated" warnings, replace find(1) with grep(1) to narrow down initial search results and, subsequently, sed(1) furiousness - Omit port revision bump as the port was BROKEN for quite some time
2015-04-18 18:29:01 +02:00
}
void node_detach_name_changed_callback(scene::Node& node, const NameCallback& callback)
{
- if(&node != 0)
- Fix broken communication with external tools (e.g. q2map): GtkRadiant's network library (libs/l_net) defines its own struct sockaddr_s, which has single ``short sa_family'' field instead of ``unsigned char sa_len'' and ``sa_family_t sa_family'' of struct sockaddr; this, in turn, causes problems when sockaddr_s objects bogusly used as sockaddr ones, e.g.: connect(4, { sa_len = 2, sa_family = 0, ...) ERR#47 'Address family not supported by protocol family' - Fix missing main window icon by calling pixbuf_new_from_file_with_mask() with correct filepath - Since these changes are likely to improve GtkRadiant user's experience, tentatively bump port revision - Fix comment indentation in `radiant/treemodel.cpp' (broken in r384527)
2015-04-23 09:26:09 +02:00
+ volatile intptr_t n = (intptr_t)&node; // see the comment on line 713
- Fix the build against modern libpng (do not try to access private data) - Clang insists that reference cannot be bound to dereferenced null pointer in well-defined C++ code (that is correct) and evaluates comparisons like &foo == 0 to false, which breaks GtkRadiant; "fix" this with a dirty hack by casting those "bad" references to a local volatile int variable - Remove no longer required and no-op -lpthread vs. -pthread patch hunk - Report operating system and correct compiler version in the About dialog - When fixing annoying "GtkSpinButton: setting an adjustment with non-zero page size is deprecated" warnings, replace find(1) with grep(1) to narrow down initial search results and, subsequently, sed(1) furiousness - Omit port revision bump as the port was BROKEN for quite some time
2015-04-18 18:29:01 +02:00
+
+ if(n != 0)
{
Nameable* nameable = Node_getNameable(node);
if(nameable != 0)
Reference in a new issue Copy permalink