* [gentoo-commits] repo/gentoo:master commit in: dev-python/python_orocos_kdl/, dev-python/python_orocos_kdl/files/
@ 2016-02-23 18:31 Alexis Ballier
0 siblings, 0 replies; 5+ messages in thread
From: Alexis Ballier @ 2016-02-23 18:31 UTC (permalink / raw
To: gentoo-commits
commit: 145ee70a148757886ab09e7da42b1eff5439e354
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 23 18:31:08 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Feb 23 18:31:08 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=145ee70a
dev-python/python_orocos_kdl: set prefix=None instead of "" to let autodetection of python libdir work.
Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
dev-python/python_orocos_kdl/files/libdir.patch | 13 +++++++++++++
dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0.ebuild | 2 +-
dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild | 1 +
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/dev-python/python_orocos_kdl/files/libdir.patch b/dev-python/python_orocos_kdl/files/libdir.patch
new file mode 100644
index 0000000..8235649
--- /dev/null
+++ b/dev-python/python_orocos_kdl/files/libdir.patch
@@ -0,0 +1,13 @@
+Index: python_orocos_kdl/CMakeLists.txt
+===================================================================
+--- python_orocos_kdl.orig/CMakeLists.txt
++++ 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=None))" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE)
+ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+ find_package(SIP REQUIRED)
+ include(SIPMacros)
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0.ebuild
index 726cf37..5938f3f 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
dev-python/sip[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/py3.patch" )
+PATCHES=( "${FILESDIR}/py3.patch" "${FILESDIR}/libdir.patch" )
if [ "${PV#9999}" != "${PV}" ] ; then
S=${WORKDIR}/${P}/python_orocos_kdl
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
index bd767bc..1ddb1df 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
@@ -32,6 +32,7 @@ RDEPEND="
dev-python/sip[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/libdir.patch" )
if [ "${PV#9999}" != "${PV}" ] ; then
S=${WORKDIR}/${P}/python_orocos_kdl
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/python_orocos_kdl/, dev-python/python_orocos_kdl/files/
@ 2016-02-25 9:55 Alexis Ballier
0 siblings, 0 replies; 5+ messages in thread
From: Alexis Ballier @ 2016-02-25 9:55 UTC (permalink / raw
To: gentoo-commits
commit: a43135a13bca0676ffab2c9a8e1340c8c2d83b18
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 25 09:49:42 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Feb 25 09:55:05 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a43135a1
dev-python/python_orocos_kdl: drop libdir patch that completely broke installation of the package; yay for testing.
Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
dev-python/python_orocos_kdl/files/libdir.patch | 13 -------------
...s_kdl-1.3.0.ebuild => python_orocos_kdl-1.3.0-r1.ebuild} | 2 +-
dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild | 1 -
3 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/dev-python/python_orocos_kdl/files/libdir.patch b/dev-python/python_orocos_kdl/files/libdir.patch
deleted file mode 100644
index 8235649..0000000
--- a/dev-python/python_orocos_kdl/files/libdir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: python_orocos_kdl/CMakeLists.txt
-===================================================================
---- python_orocos_kdl.orig/CMakeLists.txt
-+++ 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=None))" OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE)
- list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
- find_package(SIP REQUIRED)
- include(SIPMacros)
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r1.ebuild
similarity index 94%
rename from dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0.ebuild
rename to dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r1.ebuild
index 5938f3f..726cf37 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r1.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
dev-python/sip[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/py3.patch" "${FILESDIR}/libdir.patch" )
+PATCHES=( "${FILESDIR}/py3.patch" )
if [ "${PV#9999}" != "${PV}" ] ; then
S=${WORKDIR}/${P}/python_orocos_kdl
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
index 1ddb1df..bd767bc 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
@@ -32,7 +32,6 @@ RDEPEND="
dev-python/sip[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/libdir.patch" )
if [ "${PV#9999}" != "${PV}" ] ; then
S=${WORKDIR}/${P}/python_orocos_kdl
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/python_orocos_kdl/, dev-python/python_orocos_kdl/files/
@ 2016-10-07 16:16 Alexis Ballier
0 siblings, 0 replies; 5+ messages in thread
From: Alexis Ballier @ 2016-10-07 16:16 UTC (permalink / raw
To: gentoo-commits
commit: 388afd787a605fcaa732f3863cd88bbc8f461059
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 7 16:16:33 2016 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Oct 7 16:16:40 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=388afd78
dev-python/python_orocos_kdl: install package.xml in /usr/share/ros_packages/$PN
Package-Manager: portage-2.3.1
dev-python/python_orocos_kdl/files/gentoo.patch | 11 +++++++++++
..._kdl-1.3.0-r1.ebuild => python_orocos_kdl-1.3.0-r2.ebuild} | 4 ++--
dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild | 3 ++-
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/dev-python/python_orocos_kdl/files/gentoo.patch b/dev-python/python_orocos_kdl/files/gentoo.patch
new file mode 100644
index 00000000..f5e6638
--- /dev/null
+++ b/dev-python/python_orocos_kdl/files/gentoo.patch
@@ -0,0 +1,11 @@
+Index: python_orocos_kdl/CMakeLists.txt
+===================================================================
+--- python_orocos_kdl.orig/CMakeLists.txt
++++ python_orocos_kdl/CMakeLists.txt
+@@ -21,4 +21,4 @@ set(SIP_EXTRA_OPTIONS "-o")
+ set(PYTHON_SITE_PACKAGES_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/${PYTHON_SITE_PACKAGES})
+ add_sip_python_module(PyKDL PyKDL/PyKDL.sip ${orocos_kdl_LIBRARIES})
+
+-install(FILES package.xml DESTINATION share/python_orocos_kdl)
+\ No newline at end of file
++install(FILES package.xml DESTINATION share/ros_packages/python_orocos_kdl)
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r1.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r2.ebuild
similarity index 91%
rename from dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r1.ebuild
rename to dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r2.ebuild
index 928ce27..a281238 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r1.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -32,7 +32,7 @@ RDEPEND="
dev-python/sip[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/py3.patch" )
+PATCHES=( "${FILESDIR}/py3.patch" "${FILESDIR}/gentoo.patch" )
if [ "${PV#9999}" != "${PV}" ] ; then
S=${WORKDIR}/${P}/python_orocos_kdl
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
index 036c759..2d7c718 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -32,6 +32,7 @@ RDEPEND="
dev-python/sip[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/gentoo.patch" )
if [ "${PV#9999}" != "${PV}" ] ; then
S=${WORKDIR}/${P}/python_orocos_kdl
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/python_orocos_kdl/, dev-python/python_orocos_kdl/files/
@ 2017-02-28 11:27 Alexis Ballier
0 siblings, 0 replies; 5+ messages in thread
From: Alexis Ballier @ 2017-02-28 11:27 UTC (permalink / raw
To: gentoo-commits
commit: fb1d5acebd21da9856b796632880466163197dfe
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 28 10:44:33 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Feb 28 11:26:50 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb1d5ace
dev-python/python_orocos_kdl: remove old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-python/python_orocos_kdl/Manifest | 1 -
dev-python/python_orocos_kdl/files/gentoo.patch | 12 -----
dev-python/python_orocos_kdl/files/py3.patch | 58 ----------------------
.../python_orocos_kdl-1.3.0-r2.ebuild | 57 ---------------------
4 files changed, 128 deletions(-)
diff --git a/dev-python/python_orocos_kdl/Manifest b/dev-python/python_orocos_kdl/Manifest
index a695dc0384..a441a3f027 100644
--- a/dev-python/python_orocos_kdl/Manifest
+++ b/dev-python/python_orocos_kdl/Manifest
@@ -1,2 +1 @@
-DIST orocos_kinematics_dynamics-1.3.0.tar.gz 200229 SHA256 7be2dd5e4f4c1ceac2cdf1f4fae3d94d4ffd9fc1af8d483c05f04e80ef84b3f9 SHA512 09ff63f74f1eac3ee8b1090364e0d95b4ae96c9d4435ca34adacb3ded7385f948ddca9be2c1c2c2214c9342b17bbffb7da89ba9b7cd402e7fd4f2c6dbd06a930 WHIRLPOOL 4085fa4aba77e0c24a3c1aab4ab5f98e8b349037525e6a596ff027075ea1dcd33c4f13fa3abd61bbe6a2a3bd13b62616d7b614c030ecda8343be3ed59406bae6
DIST orocos_kinematics_dynamics-1.3.1.tar.gz 202471 SHA256 aff361d2b4e2c6d30ae959308a124022eeef5dc5bea2ce779900f9b36b0537bd SHA512 93abd9dd5aef3710f784f9db8eea4738458bffa5295923993e2d77656c18f7354559412fb7eb5f1e9da7112de19aa36d3f0f68f149852f955bce960fd3b719e7 WHIRLPOOL b7b4d897f4d5f170b73fe5bb48e357051ae37a244b9c44e8c2f120d71fc75c80cc1f69d30cb1463bbe10658ba0af98965f18f3055436910f24ebaab0ce1bd8e7
diff --git a/dev-python/python_orocos_kdl/files/gentoo.patch b/dev-python/python_orocos_kdl/files/gentoo.patch
deleted file mode 100644
index 571ee03482..0000000000
--- a/dev-python/python_orocos_kdl/files/gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: python_orocos_kdl/CMakeLists.txt
-===================================================================
---- python_orocos_kdl.orig/CMakeLists.txt
-+++ python_orocos_kdl/CMakeLists.txt
-@@ -21,4 +21,5 @@ set(SIP_EXTRA_OPTIONS "-o")
- set(PYTHON_SITE_PACKAGES_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/${PYTHON_SITE_PACKAGES})
- add_sip_python_module(PyKDL PyKDL/PyKDL.sip ${orocos_kdl_LIBRARIES})
-
--install(FILES package.xml DESTINATION share/python_orocos_kdl)
-\ No newline at end of file
-+install(FILES package.xml DESTINATION share/python_orocos_kdl)
-+install(FILES package.xml DESTINATION share/ros_packages/python_orocos_kdl)
diff --git a/dev-python/python_orocos_kdl/files/py3.patch b/dev-python/python_orocos_kdl/files/py3.patch
deleted file mode 100644
index dd22f2d412..0000000000
--- a/dev-python/python_orocos_kdl/files/py3.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-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
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r2.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r2.ebuild
deleted file mode 100644
index 040977f5ca..0000000000
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
- SCM="git-r3"
- EGIT_REPO_URI="https://github.com/orocos/orocos_kinematics_dynamics"
-fi
-
-inherit ${SCM} python-r1 cmake-utils
-
-if [ "${PV#9999}" != "${PV}" ] ; then
- KEYWORDS=""
- SRC_URI=""
-else
- KEYWORDS="~amd64 ~arm"
- SRC_URI="https://github.com/orocos/orocos_kinematics_dynamics/archive/v${PV}.tar.gz -> orocos_kinematics_dynamics-${PV}.tar.gz"
-fi
-
-DESCRIPTION="Python bindings for KDL"
-HOMEPAGE="http://www.orocos.org/kdl"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
- sci-libs/orocos_kdl
- dev-python/sip[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/py3.patch" "${FILESDIR}/gentoo.patch" )
-
-if [ "${PV#9999}" != "${PV}" ] ; then
- S=${WORKDIR}/${P}/python_orocos_kdl
-else
- S=${WORKDIR}/orocos_kinematics_dynamics-${PV}/python_orocos_kdl
-fi
-
-src_configure() {
- python_foreach_impl cmake-utils_src_configure
-}
-
-src_compile() {
- python_foreach_impl cmake-utils_src_compile
-}
-
-src_test() {
- python_foreach_impl cmake-utils_src_test
-}
-
-src_install() {
- python_foreach_impl cmake-utils_src_install
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/python_orocos_kdl/, dev-python/python_orocos_kdl/files/
@ 2020-07-29 14:45 Alexis Ballier
0 siblings, 0 replies; 5+ messages in thread
From: Alexis Ballier @ 2020-07-29 14:45 UTC (permalink / raw
To: gentoo-commits
commit: 42b36a01c6a1020fb97ef1e1ed03c891ec718b9b
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 29 14:45:12 2020 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Jul 29 14:45:23 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42b36a01
dev-python/python_orocos_kdl: Fix build with latest sip
Patch from upstream backported by Victor Mataré.
Closes: https://bugs.gentoo.org/728618
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
...ignment-operator-private-for-SIP-Closes-2.patch | 134 +++++++++++++++++++++
.../python_orocos_kdl-1.4.0-r1.ebuild | 1 +
2 files changed, 135 insertions(+)
diff --git a/dev-python/python_orocos_kdl/files/0001-Declare-assignment-operator-private-for-SIP-Closes-2.patch b/dev-python/python_orocos_kdl/files/0001-Declare-assignment-operator-private-for-SIP-Closes-2.patch
new file mode 100644
index 00000000000..b02f18747cf
--- /dev/null
+++ b/dev-python/python_orocos_kdl/files/0001-Declare-assignment-operator-private-for-SIP-Closes-2.patch
@@ -0,0 +1,134 @@
+https://bugs.gentoo.org/728618
+
+Backported by Victor Mataré
+
+From 30e5057f01627539dd170a1e831bb14278433deb Mon Sep 17 00:00:00 2001
+From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
+Date: Fri, 26 Jun 2020 17:04:12 +0200
+Subject: [PATCH] Declare assignment operator private for SIP (Closes: #260)
+
+Starting with v4.19.23 SIP expects a working operator= or one marked
+private explicitly. All classes in this PR have a reference member
+(&chain) resulting in the compiler deleting the default assignment
+operator. This PR makes this known to SIP as well.
+---
+ python_orocos_kdl/PyKDL/dynamics.sip | 3 +++
+ python_orocos_kdl/PyKDL/kinfam.sip | 29 ++++++++++++++++++++++++++++
+ 2 files changed, 32 insertions(+)
+
+diff --git a/python_orocos_kdl/PyKDL/dynamics.sip b/python_orocos_kdl/PyKDL/dynamics.sip
+index e0096dd..36f833c 100644
+--- a/python_orocos_kdl/PyKDL/dynamics.sip
++++ b/python_orocos_kdl/PyKDL/dynamics.sip
+@@ -72,4 +72,7 @@ public:
+ int JntToCoriolis(const JntArray &q, const JntArray &q_dot, JntArray &coriolis);
+ int JntToMass(const JntArray &q, JntSpaceInertiaMatrix& H);
+ int JntToGravity(const JntArray &q,JntArray &gravity);
++
++private:
++ ChainDynParam& operator=(const ChainDynParam&);
+ };
+diff --git a/python_orocos_kdl/PyKDL/kinfam.sip b/python_orocos_kdl/PyKDL/kinfam.sip
+index d87fd00..e87ceb8 100644
+--- a/python_orocos_kdl/PyKDL/kinfam.sip
++++ b/python_orocos_kdl/PyKDL/kinfam.sip
+@@ -344,6 +344,9 @@ public:
+ ChainFkSolverPos_recursive(const Chain& chain);
+ virtual int JntToCart(const JntArray& q_in, Frame& p_out,int segmentNr=-1);
+ virtual void updateInternalDataStructures();
++
++private:
++ ChainFkSolverPos_recursive& operator=(const ChainFkSolverPos_recursive&);
+ };
+
+ class ChainFkSolverVel_recursive : ChainFkSolverVel
+@@ -357,6 +360,9 @@ public:
+ virtual int JntToCart(const JntArrayVel& q_in ,FrameVel& out,int
+ segmentNr=-1 );
+ virtual void updateInternalDataStructures();
++
++private:
++ ChainFkSolverVel_recursive& operator=(const ChainFkSolverVel_recursive&);
+ };
+
+ class ChainIkSolverPos : SolverI {
+@@ -392,6 +398,9 @@ public:
+
+ virtual int CartToJnt(const JntArray& q_init , const Frame& p_in ,JntArray& q_out);
+ virtual void updateInternalDataStructures();
++
++private:
++ ChainIkSolverPos_NR& operator=(const ChainIkSolverPos_NR&);
+ };
+
+ class ChainIkSolverPos_NR_JL : ChainIkSolverPos
+@@ -407,6 +416,9 @@ public:
+
+ virtual int CartToJnt(const JntArray& q_init , const Frame& p_in ,JntArray& q_out);
+ virtual void updateInternalDataStructures();
++
++private:
++ ChainIkSolverPos_NR_JL& operator=(const ChainIkSolverPos_NR_JL&);
+ };
+
+ class ChainIkSolverVel_pinv : ChainIkSolverVel
+@@ -420,6 +432,9 @@ public:
+
+ virtual int CartToJnt(const JntArray& q_in, const Twist& v_in, JntArray& qdot_out);
+ virtual void updateInternalDataStructures();
++
++private:
++ ChainIkSolverVel_pinv& operator=(const ChainIkSolverVel_pinv&);
+ };
+
+ class ChainIkSolverVel_wdls : ChainIkSolverVel
+@@ -506,6 +521,8 @@ public:
+
+ void setLambda(const double& lambda);
+
++private:
++ ChainIkSolverVel_wdls& operator=(const ChainIkSolverVel_wdls&);
+ };
+
+
+@@ -520,6 +537,9 @@ public:
+
+ virtual int CartToJnt(const JntArray& q_init , const Frame& p_in ,JntArray& q_out);
+ virtual void updateInternalDataStructures();
++
++private:
++ ChainIkSolverPos_LMA& operator=(const ChainIkSolverPos_LMA&);
+ };
+
+
+@@ -546,6 +566,9 @@ public:
+ const JntArray& getOptPos()const /Factory/;
+
+ const double& getAlpha()const /Factory/;
++
++private:
++ ChainIkSolverVel_pinv_nso& operator=(const ChainIkSolverVel_pinv_nso&);
+ };
+
+ class ChainIkSolverVel_pinv_givens : ChainIkSolverVel
+@@ -559,6 +582,9 @@ public:
+
+ virtual int CartToJnt(const JntArray& q_in, const Twist& v_in, JntArray& qdot_out);
+ virtual void updateInternalDataStructures();
++
++private:
++ ChainIkSolverVel_pinv_givens& operator=(const ChainIkSolverVel_pinv_givens&);
+ };
+
+ class ChainJntToJacSolver : SolverI
+@@ -571,4 +597,7 @@ public:
+ ChainJntToJacSolver(const Chain& chain);
+ int JntToJac(const JntArray& q_in,Jacobian& jac);
+ virtual void updateInternalDataStructures();
++
++private:
++ ChainJntToJacSolver& operator=(const ChainJntToJacSolver&);
+ };
+--
+2.27.0
+
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
index 06e204006f9..a1f82a9e03e 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
@@ -32,6 +32,7 @@ RDEPEND="
>=sci-libs/orocos_kdl-1.4.0:=
dev-python/sip[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/0001-Declare-assignment-operator-private-for-SIP-Closes-2.patch" )
if [ "${PV#9999}" != "${PV}" ] ; then
S=${WORKDIR}/${P}/python_orocos_kdl
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-07-29 14:45 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-25 9:55 [gentoo-commits] repo/gentoo:master commit in: dev-python/python_orocos_kdl/, dev-python/python_orocos_kdl/files/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2020-07-29 14:45 Alexis Ballier
2017-02-28 11:27 Alexis Ballier
2016-10-07 16:16 Alexis Ballier
2016-02-23 18:31 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox