From 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 21:03:06 +0100 Subject: gentoo resync : 14.07.2018 --- .../files/1.2.2-Fix-tests-with-Python-3.patch | 49 ++++++++++++++++++++++ dev-python/shiboken/files/rpath.cmake | 10 +++++ .../shiboken/files/shiboken-1.2.2-gcc6.patch | 20 +++++++++ 3 files changed, 79 insertions(+) create mode 100644 dev-python/shiboken/files/1.2.2-Fix-tests-with-Python-3.patch create mode 100644 dev-python/shiboken/files/rpath.cmake create mode 100644 dev-python/shiboken/files/shiboken-1.2.2-gcc6.patch (limited to 'dev-python/shiboken/files') diff --git a/dev-python/shiboken/files/1.2.2-Fix-tests-with-Python-3.patch b/dev-python/shiboken/files/1.2.2-Fix-tests-with-Python-3.patch new file mode 100644 index 000000000000..48e401d1be1d --- /dev/null +++ b/dev-python/shiboken/files/1.2.2-Fix-tests-with-Python-3.patch @@ -0,0 +1,49 @@ +From 7f793442316599ca25014a3d39c5de56c384990f Mon Sep 17 00:00:00 2001 +From: Michael Palimaka +Date: Fri, 23 May 2014 18:10:20 +1000 +Subject: [PATCH] Fix tests with Python 3. + +Change-Id: Ibbf54406ba33dd1f645a46d63c04269868288768 +--- + tests/minimalbinding/typedef_test.py | 2 +- + tests/samplebinding/overflow_test.py | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tests/minimalbinding/typedef_test.py b/tests/minimalbinding/typedef_test.py +index 089b279..b5535fb 100644 +--- a/tests/minimalbinding/typedef_test.py ++++ b/tests/minimalbinding/typedef_test.py +@@ -30,7 +30,7 @@ from py3kcompat import IS_PY3K + + try: + import numpy as np +-except ImportError, e: ++except ImportError: + np = None + + +diff --git a/tests/samplebinding/overflow_test.py b/tests/samplebinding/overflow_test.py +index 5020872..c294c13 100644 +--- a/tests/samplebinding/overflow_test.py ++++ b/tests/samplebinding/overflow_test.py +@@ -45,7 +45,7 @@ class OverflowTest(unittest.TestCase): + '''C++ function receives an long long argument and raise OverflowError if the value is negative.''' + val = 100 + self.assertEqual(doubleLongLong(val), 2 * val) +- val = long(100) ++ val = int(100) + self.assertEqual(doubleLongLong(val), 2 * val) + val = (2 << 64) + 1 + self.assertRaises(OverflowError, doubleLongLong, val) +@@ -54,7 +54,7 @@ class OverflowTest(unittest.TestCase): + '''C++ function receives an unsigned long long argument and raise OverflowError if the value is negative.''' + val = 100 + self.assertEqual(doubleUnsignedLongLong(val), 2 * val) +- val = long(100) ++ val = int(100) + self.assertEqual(doubleUnsignedLongLong(val), 2 * val) + val *= -1 + self.assertRaises(OverflowError, doubleUnsignedLongLong, val) +-- +2.1.0 + diff --git a/dev-python/shiboken/files/rpath.cmake b/dev-python/shiboken/files/rpath.cmake new file mode 100644 index 000000000000..b896c8789185 --- /dev/null +++ b/dev-python/shiboken/files/rpath.cmake @@ -0,0 +1,10 @@ +# use, i.e. don't skip the full RPATH for the build tree +SET(CMAKE_SKIP_BUILD_RPATH FALSE) + +# when building, don't use the install RPATH already +# (but later on when installing) +SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) + +# add the automatically determined parts of the RPATH +# which point to directories outside the build tree to the install RPATH +SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) 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 000000000000..65734232472c --- /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(ifile); + } + + bool + SimpleFile::exists(const char* filename) + { + std::ifstream ifile(filename); +- return ifile; ++ return static_cast(ifile); + } -- cgit v1.2.3