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

dev-python/python_orocos_kdl: initial import. ebuild by me.

Browse Source 
Package-Manager: portage-2.2.20.1
This commit is contained in:
Alexis Ballier
2015-09-17 13:58:58 +02:00
parent efd14559f7
commit 62a295688c
5 changed files with 177 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
dev-python/python_orocos_kdl/files/py3.patch Normal file
View File

@@ -0,0 +1,58 @@
Upstream status: Pending.
https://github.com/orocos/orocos_kinematics_dynamics/pull/44
Index: orocos_kinematics_dynamics-1.3.0/python_orocos_kdl/CMakeLists.txt
===================================================================
--- orocos_kinematics_dynamics-1.3.0.orig/python_orocos_kdl/CMakeLists.txt
+++ orocos_kinematics_dynamics-1.3.0/python_orocos_kdl/CMakeLists.txt
@@ -8,7 +8,7 @@ link_directories(${orocos_kdl_LIBRARY_DI
find_package(PythonInterp REQUIRED)
find_package(PythonLibs ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} REQUIRED)
-execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(plat_specific=True, prefix='')" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE)
+execute_process(COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(plat_specific=True, prefix=''))" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE)
list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
find_package(SIP REQUIRED)
include(SIPMacros)
Index: orocos_kinematics_dynamics-1.3.0/python_orocos_kdl/PyKDL/std_string.sip
===================================================================
--- orocos_kinematics_dynamics-1.3.0.orig/python_orocos_kdl/PyKDL/std_string.sip
+++ orocos_kinematics_dynamics-1.3.0/python_orocos_kdl/PyKDL/std_string.sip
@@ -27,7 +27,7 @@
newstring = PyUnicode_DecodeUTF8(sipCpp->c_str(), sipCpp->length(), NULL);
if(newstring == NULL) {
PyErr_Clear();
- newstring = PyString_FromString(sipCpp->c_str());
+ newstring = PyUnicode_FromString(sipCpp->c_str());
}
return newstring;
%End
@@ -38,21 +38,27 @@
// If argument is a Unicode string, just decode it to UTF-8
// If argument is a Python string, assume it's UTF-8
if (sipIsErr == NULL)
+#if PY_MAJOR_VERSION < 3
return (PyString_Check(sipPy) || PyUnicode_Check(sipPy));
+#else
+ return PyUnicode_Check(sipPy);
+#endif
if (sipPy == Py_None) {
*sipCppPtr = new std::string;
return 1;
}
if (PyUnicode_Check(sipPy)) {
PyObject* s = PyUnicode_AsEncodedString(sipPy, "UTF-8", "");
- *sipCppPtr = new std::string(PyString_AS_STRING(s));
+ *sipCppPtr = new std::string(PyUnicode_AS_DATA(s));
Py_DECREF(s);
return 1;
}
+#if PY_MAJOR_VERSION < 3
if (PyString_Check(sipPy)) {
*sipCppPtr = new std::string(PyString_AS_STRING(sipPy));
return 1;
}
+#endif
return 0;
%End