diff options
| author |   Matteo Bernardini | 2018-10-18 19:05:41 +0200 |
|---|---|---|
| committer | Matteo Bernardini | 2018-10-18 19:05:41 +0200 |
| commit | c9326a596337c38df416f18a270832c42dda5c1e (patch) | |
| tree | c5e9723b5e84014de3da1d7711e2c3a1ac811c68 /development/Coin | |
| parent | e508b015d1f32339a2049795d646af143139eb87 (diff) | |
| download | slackbuilds-98a9222908b4f812102386eb4be9bc0c76fe642c.tar.gz | |
20181018.1 global branch merge.current-20181018.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'development/Coin')
| -rw-r--r-- | development/Coin/Coin.SlackBuild | 3 | ||||
| -rw-r--r-- | development/Coin/memhandler-initialization.patch | 20 |
2 files changed, 23 insertions, 0 deletions
diff --git a/development/Coin/Coin.SlackBuild b/development/Coin/Coin.SlackBuild index 96953fa909..eb99408893 100644 --- a/development/Coin/Coin.SlackBuild +++ b/development/Coin/Coin.SlackBuild @@ -61,6 +61,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Thanks Fedora +patch -p1 < $CWD/memhandler-initialization.patch + # Thanks Debian patch -p1 < $CWD/coin-include_and_js.patch diff --git a/development/Coin/memhandler-initialization.patch b/development/Coin/memhandler-initialization.patch new file mode 100644 index 0000000000..4c346487ed --- /dev/null +++ b/development/Coin/memhandler-initialization.patch @@ -0,0 +1,20 @@ +--- Coin-3.1.3/src/misc/SbHash.h.init 2010-03-02 22:20:09.000000000 +0900 ++++ Coin-3.1.3/src/misc/SbHash.h 2016-04-22 16:52:39.888883757 +0900 +@@ -89,6 +89,8 @@ + 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; +@@ -218,7 +220,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; + |