public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-python/shiboken/, dev-python/shiboken/files/
@ 2017-07-08  2:37 Michael Palimaka
  0 siblings, 0 replies; only message in thread
From: Michael Palimaka @ 2017-07-08  2:37 UTC (permalink / raw
  To: gentoo-commits

commit:     fba2e61745acf4c20d1851ce6dac3cbe78443973
Author:     Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Fri Jul  7 06:23:35 2017 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jul  8 02:36:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fba2e617

dev-python/shiboken: Fix building with GCC-6

Bug: https://bugs.gentoo.org/show_bug.cgi?id=619332
Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-python/shiboken/files/shiboken-1.2.2-gcc6.patch | 20 ++++++++++++++++++++
 dev-python/shiboken/shiboken-1.2.2.ebuild           |  1 +
 2 files changed, 21 insertions(+)

diff --git a/dev-python/shiboken/files/shiboken-1.2.2-gcc6.patch b/dev-python/shiboken/files/shiboken-1.2.2-gcc6.patch
new file mode 100644
index 00000000000..65734232472
--- /dev/null
+++ b/dev-python/shiboken/files/shiboken-1.2.2-gcc6.patch
@@ -0,0 +1,20 @@
+Bug: https://bugs.gentoo.org/619332
+PR: https://github.com/pyside/Shiboken/pull/84
+
+--- a/tests/libsample/simplefile.cpp
++++ b/tests/libsample/simplefile.cpp
+@@ -90,13 +90,13 @@ bool
+ SimpleFile::exists() const
+ {
+     std::ifstream ifile(p->m_filename);
+-    return ifile;
++    return static_cast<bool>(ifile);
+ }
+
+ bool
+ SimpleFile::exists(const char* filename)
+ {
+     std::ifstream ifile(filename);
+-    return ifile;
++    return static_cast<bool>(ifile);
+ }

diff --git a/dev-python/shiboken/shiboken-1.2.2.ebuild b/dev-python/shiboken/shiboken-1.2.2.ebuild
index 89119cb728f..65d6d0be4d1 100644
--- a/dev-python/shiboken/shiboken-1.2.2.ebuild
+++ b/dev-python/shiboken/shiboken-1.2.2.ebuild
@@ -34,6 +34,7 @@ DEPEND="${RDEPEND}
 DOCS=( AUTHORS ChangeLog )
 PATCHES=(
 	"${FILESDIR}/${PV}-Fix-tests-with-Python-3.patch"
+	"${FILESDIR}/${P}-gcc6.patch"
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2017-07-08  2:37 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-08  2:37 [gentoo-commits] repo/gentoo:master commit in: dev-python/shiboken/, dev-python/shiboken/files/ Michael Palimaka

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox