diff --git a/0012-memhandler-initialization.patch b/0012-memhandler-initialization.patch new file mode 100644 index 0000000..4c34648 --- /dev/null +++ b/0012-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(key, obj); ++ entry = new (this->memhandler) SbHashEntry(key, obj, this->memhandler); + entry->next = this->buckets[i]; + this->buckets[i] = entry; + diff --git a/Coin3.spec b/Coin3.spec index 7b1a183..4f2389b 100644 --- a/Coin3.spec +++ b/Coin3.spec @@ -13,7 +13,7 @@ Summary: High-level 3D visualization library Name: Coin3 Version: 3.1.3 -Release: 16%{?dist} +Release: 17%{?dist} # https://bitbucket.org/Coin3D/coin/wiki/Home tells BSD, # but the tarball is GPLv2 @@ -40,6 +40,7 @@ Patch8: 0008-Convert-to-utf-8.patch Patch9: 0009-Convert-to-utf-8.patch Patch10: 0010-GCC-4.8.0-fixes.patch Patch11: 0011-Fix-SoCamera-manpage.patch +Patch12: 0012-memhandler-initialization.patch BuildRequires: libGLU-devel BuildRequires: libXext-devel @@ -88,6 +89,7 @@ Development package for Coin3 %patch9 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 %if (0%{?fedora} > 20) && (0%{?fedora} < 24) # freetype header chaos: @@ -214,6 +216,9 @@ fi %ghost %{_libdir}/pkgconfig/Coin.pc %changelog +* Fri Apr 22 2016 Mamoru TASAKA - 3.1.3-17 +- Initialize memhandler member properly (bug 1323159) + * Wed Feb 03 2016 Fedora Release Engineering - 3.1.3-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild