ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 06:45:54 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #29159 from timor/coin3d-sbhashentry-fix

Browse Source 
coin3d: include fix for newer compilers
This commit is contained in:
Jörg Thalheim 2017-09-11 21:32:14 +01:00 committed by GitHub
commit c3887f0253
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/libraries/coin3d/default.nix
View File

@ -16,6 +16,9 @@ stdenv.mkDerivation rec {
sha256 = "076dyc52swk8qc7ylps53fg6iqmd52x8s7m18i80x49dd109yw20";
})
./gcc-4.8.patch # taken from FC-17 source rpm
# see https://bitbucket.org/Coin3D/coin/issues/128/crash-in-cc_memalloc_deallocate
# patch adapted from https://bitbucket.org/Coin3D/coin/pull-requests/75/added-fix-for-issue-128-provided-by-fedora/diff
./sbhashentry.patch
];
buildInputs = [ mesa ];

25
pkgs/development/libraries/coin3d/sbhashentry.patch Normal file
View File

@ -0,0 +1,25 @@
diff -u --label /tmp/Coin-3.1.3/src/misc/SbHash.h --label \#\<buffer\ SbHash.h\> /tmp/Coin-3.1.3/src/misc/SbHash.h /tmp/buffer-content-21756V0
--- a/src/misc/SbHash.h
+++ b/src/misc/SbHash.h
@@ -88,8 +88,8 @@
SbHashEntry<Type, Key> * entry = static_cast<SbHashEntry<Type, Key> *>( ptr);
cc_memalloc_deallocate(entry->memhandler, ptr);
}
- SbHashEntry(const Key & key, const Type & obj) : key(key), obj(obj) {}
-
+ SbHashEntry(const Key & key, const Type & obj, cc_memalloc *memhandler)
+ : key(key), obj(obj), memhandler(memhandler) {}
Key key;
Type obj;
SbHashEntry<Type, Key> * next;
@@ -218,7 +218,7 @@
/* Key not already in the hash table; insert a new
* entry as the first element in the bucket
*/
- entry = new (this->memhandler) SbHashEntry<Type, Key>(key, obj);
+ entry = new (this->memhandler) SbHashEntry<Type, Key>(key, obj, this->memhandler);
entry->next = this->buckets[i];
this->buckets[i] = entry;
Diff finished. Sat Sep 9 19:50:32 2017