1 |
commit: fba2e61745acf4c20d1851ce6dac3cbe78443973 |
2 |
Author: Peter Levine <plevine457 <AT> gmail <DOT> com> |
3 |
AuthorDate: Fri Jul 7 06:23:35 2017 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 8 02:36:59 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fba2e617 |
7 |
|
8 |
dev-python/shiboken: Fix building with GCC-6 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/show_bug.cgi?id=619332 |
11 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
12 |
|
13 |
dev-python/shiboken/files/shiboken-1.2.2-gcc6.patch | 20 ++++++++++++++++++++ |
14 |
dev-python/shiboken/shiboken-1.2.2.ebuild | 1 + |
15 |
2 files changed, 21 insertions(+) |
16 |
|
17 |
diff --git a/dev-python/shiboken/files/shiboken-1.2.2-gcc6.patch b/dev-python/shiboken/files/shiboken-1.2.2-gcc6.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..65734232472 |
20 |
--- /dev/null |
21 |
+++ b/dev-python/shiboken/files/shiboken-1.2.2-gcc6.patch |
22 |
@@ -0,0 +1,20 @@ |
23 |
+Bug: https://bugs.gentoo.org/619332 |
24 |
+PR: https://github.com/pyside/Shiboken/pull/84 |
25 |
+ |
26 |
+--- a/tests/libsample/simplefile.cpp |
27 |
++++ b/tests/libsample/simplefile.cpp |
28 |
+@@ -90,13 +90,13 @@ bool |
29 |
+ SimpleFile::exists() const |
30 |
+ { |
31 |
+ std::ifstream ifile(p->m_filename); |
32 |
+- return ifile; |
33 |
++ return static_cast<bool>(ifile); |
34 |
+ } |
35 |
+ |
36 |
+ bool |
37 |
+ SimpleFile::exists(const char* filename) |
38 |
+ { |
39 |
+ std::ifstream ifile(filename); |
40 |
+- return ifile; |
41 |
++ return static_cast<bool>(ifile); |
42 |
+ } |
43 |
|
44 |
diff --git a/dev-python/shiboken/shiboken-1.2.2.ebuild b/dev-python/shiboken/shiboken-1.2.2.ebuild |
45 |
index 89119cb728f..65d6d0be4d1 100644 |
46 |
--- a/dev-python/shiboken/shiboken-1.2.2.ebuild |
47 |
+++ b/dev-python/shiboken/shiboken-1.2.2.ebuild |
48 |
@@ -34,6 +34,7 @@ DEPEND="${RDEPEND} |
49 |
DOCS=( AUTHORS ChangeLog ) |
50 |
PATCHES=( |
51 |
"${FILESDIR}/${PV}-Fix-tests-with-Python-3.patch" |
52 |
+ "${FILESDIR}/${P}-gcc6.patch" |
53 |
) |
54 |
|
55 |
src_prepare() { |