From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/gelemental/files/, sci-chemistry/gelemental/
Date: Sat, 17 Sep 2016 17:44:09 +0000 (UTC) [thread overview]
Message-ID: <1474134235.2ea5b5d982ed56fcfa17d5c06c9f5a34fbaba727.soap@gentoo> (raw)
commit: 2ea5b5d982ed56fcfa17d5c06c9f5a34fbaba727
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 17 14:25:59 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Sep 17 17:43:55 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ea5b5d9
sci-chemistry/gelemental: Allow for compiling with GCC 6
Gentoo-bug: 593994
Package-Manager: portage-2.3.0
.../gelemental/files/gelemental-1.2.0-fix-c++14.patch | 14 ++++++++++++++
sci-chemistry/gelemental/gelemental-1.2.0-r1.ebuild | 3 ++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/sci-chemistry/gelemental/files/gelemental-1.2.0-fix-c++14.patch b/sci-chemistry/gelemental/files/gelemental-1.2.0-fix-c++14.patch
new file mode 100644
index 00000000..0965fe1
--- /dev/null
+++ b/sci-chemistry/gelemental/files/gelemental-1.2.0-fix-c++14.patch
@@ -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;
+ }
+
+
diff --git a/sci-chemistry/gelemental/gelemental-1.2.0-r1.ebuild b/sci-chemistry/gelemental/gelemental-1.2.0-r1.ebuild
index e85ddb0..43e2cb8 100644
--- a/sci-chemistry/gelemental/gelemental-1.2.0-r1.ebuild
+++ b/sci-chemistry/gelemental/gelemental-1.2.0-r1.ebuild
@@ -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
next reply other threads:[~2016-09-17 17:44 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-17 17:44 David Seifert [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-05-01 17:58 [gentoo-commits] repo/gentoo:master commit in: sci-chemistry/gelemental/files/, sci-chemistry/gelemental/ Matthias Maier
2022-04-24 13:28 Matthias Maier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1474134235.2ea5b5d982ed56fcfa17d5c06c9f5a34fbaba727.soap@gentoo \
--to=soap@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox