From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5C4AC139695 for ; Sun, 23 Jul 2017 13:09:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7A798E0BE9; Sun, 23 Jul 2017 13:09:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 52D2DE0BE9 for ; Sun, 23 Jul 2017 13:09:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3507C34181B for ; Sun, 23 Jul 2017 13:09:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EDA9474A5 for ; Sun, 23 Jul 2017 13:09:37 +0000 (UTC) From: "Alexey Shvetsov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexey Shvetsov" Message-ID: <1500815344.4dee204fba967426d5a3093d83a7d626b9fc4c30.alexxy@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/coin/, media-libs/coin/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/coin/coin-3.1.3-r2.ebuild media-libs/coin/files/coin-3.1.3-memhandler-initialization.patch X-VCS-Directories: media-libs/coin/ media-libs/coin/files/ X-VCS-Committer: alexxy X-VCS-Committer-Name: Alexey Shvetsov X-VCS-Revision: 4dee204fba967426d5a3093d83a7d626b9fc4c30 X-VCS-Branch: master Date: Sun, 23 Jul 2017 13:09:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: c6f88303-17ea-40a0-9d02-0e0cb970185b X-Archives-Hash: 64bcc8990b8b54cadbf39312d25accee commit: 4dee204fba967426d5a3093d83a7d626b9fc4c30 Author: Peter Levine gmail com> AuthorDate: Wed Jul 19 05:46:56 2017 +0000 Commit: Alexey Shvetsov gentoo org> CommitDate: Sun Jul 23 13:09:04 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dee204f media-libs/coin: Fix segfault with GCC-6 Bug: https://bugs.gentoo.org/show_bug.cgi?id=619378 Package-Manager: Portage-2.3.6, Repoman-2.3.2 media-libs/coin/coin-3.1.3-r2.ebuild | 1 + .../coin-3.1.3-memhandler-initialization.patch | 23 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/media-libs/coin/coin-3.1.3-r2.ebuild b/media-libs/coin/coin-3.1.3-r2.ebuild index c9686db8c42..5edce05a9cb 100644 --- a/media-libs/coin/coin-3.1.3-r2.ebuild +++ b/media-libs/coin/coin-3.1.3-r2.ebuild @@ -45,6 +45,7 @@ PATCHES=( "${FILESDIR}"/${P}-pkgconfig-partial.patch "${FILESDIR}"/${P}-gcc-4.7.patch "${FILESDIR}"/${P}-freetype251.patch + "${FILESDIR}"/${P}-memhandler-initialization.patch ) DOCS=( diff --git a/media-libs/coin/files/coin-3.1.3-memhandler-initialization.patch b/media-libs/coin/files/coin-3.1.3-memhandler-initialization.patch new file mode 100644 index 00000000000..892882b6a3d --- /dev/null +++ b/media-libs/coin/files/coin-3.1.3-memhandler-initialization.patch @@ -0,0 +1,23 @@ +Bug: https://bugs.gentoo.org/show_bug.cgi?id=619378 +Patch http://pkgs.fedoraproject.org/cgit/rpms/Coin3.git/tree/0012-memhandler-initialization.patch?id=ca89ec7227943bdec800ee51b920f578fab87b05 + +--- a/src/misc/SbHash.h ++++ b/src/misc/SbHash.h +@@ -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; +