diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /dev-python/python_orocos_kdl | |
parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) |
gentoo resync : 25.08.2020
Diffstat (limited to 'dev-python/python_orocos_kdl')
3 files changed, 137 insertions, 1 deletions
diff --git a/dev-python/python_orocos_kdl/Manifest b/dev-python/python_orocos_kdl/Manifest index 8e4afe512c3b..a9cc71fdfd5f 100644 --- a/dev-python/python_orocos_kdl/Manifest +++ b/dev-python/python_orocos_kdl/Manifest @@ -1,4 +1,5 @@ +AUX 0001-Declare-assignment-operator-private-for-SIP-Closes-2.patch 4287 BLAKE2B f3dead6103ff71bccb2ed535fb8e95e4cf0679b57d5ae5bf3ee5888b60c5853db9998ca90ede222b6a2162ec378f76c8bd90aebef1a5747fe95adf4d9b3743fe SHA512 c2bb4a8593de9ed5f9c819939466ba25181d02163000edaaa5130931f20d0fb77cfba587025465e4d086f956d86e3b8574ca2d0ca8e350ff793ca59d5f0db95e DIST orocos_kinematics_dynamics-1.4.0.tar.gz 215004 BLAKE2B 02ca44195af2ae2bd5c2293869893c56846501e2055ca1cacef602ffdd44824fc618ed528d351ee2212b7c087ff5e69438ab87e9fb8813d8a4eb4c143fdbfd27 SHA512 7156465e2aff02f472933617512069355836a03a02d4587cfe03c1b1d667a9762a4e3ed6e055b2a44f1fce1b6746179203c7204389626a7b458dcab1b28930d8 -EBUILD python_orocos_kdl-1.4.0-r1.ebuild 1350 BLAKE2B c0ef6a5b62097d40f4f075841dcdfa5be72060e70e6d17ce277fdda4a3d2fc9a596e32698ecf628fec422863cdb6d98d1793876c96aba0533cda6e66d649f165 SHA512 d85586c93404943304671969e1ed51cb160bff98d9b46b70bca94e2f90e78a2a26e39f78b9b41b3d82c38153c957cc230a8e818cd17738750d31b2765f3ba92a +EBUILD python_orocos_kdl-1.4.0-r1.ebuild 1440 BLAKE2B 61121d421f7eb521c8b784559bc2e8228dcaa32f9217b97557519eb5a0635f57e9a399f903000c62a85215942c3edf8c00d06923d8a14b36b07e1e74773d6c88 SHA512 c86bda45241932f1890c20868dbfa08a0296763c08d4ec1244fb4e6051d6731985ac992e147899629e074c238f99176ce6f4ae8e62575ac7aa4dc50cbfe3106a EBUILD python_orocos_kdl-9999.ebuild 1350 BLAKE2B c0ef6a5b62097d40f4f075841dcdfa5be72060e70e6d17ce277fdda4a3d2fc9a596e32698ecf628fec422863cdb6d98d1793876c96aba0533cda6e66d649f165 SHA512 d85586c93404943304671969e1ed51cb160bff98d9b46b70bca94e2f90e78a2a26e39f78b9b41b3d82c38153c957cc230a8e818cd17738750d31b2765f3ba92a MISC metadata.xml 347 BLAKE2B f798f437c41d07bbcf1918138506db38727087f9437d0abb5082bde5802cc5f7a29173d788fb8b8b8f6c150f5f1c642795dbde30e848512e6d1f9ada39a951d9 SHA512 a32a6de7eece8df29d9542f14dccacb7d046e7205af6bd996d41279175111c9416cddf78cc8a87e2319cc1b25bf880b38e8d2d0573ba6747820a5c328d809074 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 000000000000..b02f18747cfe --- /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 06e204006f9f..a1f82a9e03ef 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 |