gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-06 00:48:18 -07:00
Code Issues Projects Releases Wiki Activity

sci-chemistry/gelemental: Allow for compiling with GCC 6

Browse Source 
Gentoo-bug: 593994

Package-Manager: portage-2.3.0
This commit is contained in:
David Seifert
2016-09-17 16:25:59 +02:00
parent d89d781163
commit 2ea5b5d982
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sci-chemistry/gelemental/files/gelemental-1.2.0-fix-c++14.patch Normal file
View File

@@ -0,0 +1,14 @@
Fix building with C++14, which errors out due to bool -> T* conversions
See also: https://bugs.gentoo.org/show_bug.cgi?id=593994
--- a/src/dialogs.cc
+++ b/src/dialogs.cc
@@ -255,7 +255,7 @@
const Gtk::TreePath& tpath, bool)
{
Gtk::TreeIter iter = store->get_iter (tpath);
- return iter ? iter->get_value (cols.property) : false;
+ return iter ? iter->get_value (cols.property) : NULL;
}

3
sci-chemistry/gelemental/gelemental-1.2.0-r1.ebuild
View File

@@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -40,6 +40,7 @@ PATCHES=(
"${WORKDIR}"/debian/patches/fix_zinc_german_translation.patch
"${WORKDIR}"/debian/patches/ftbfs_missing_limits.patch
"${WORKDIR}"/debian/patches/lp673285_link_in_about.patch
"${FILESDIR}"/${PN}-1.2.0-fix-c++14.patch
)
AUTOTOOLS_IN_SOURCE_BUILD=1