Declare assignment operator private for SIP (#70)

3 files changed, 125 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a57c9b5fd192..50f40af75e2d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,10 +8,13 @@ pkgbase = orocos-kdl-python
 	license = GPL
 	makedepends = cmake
 	makedepends = python2-sip
+	makedepends = sip
 	depends = orocos-kdl
 	depends = python-sip
 	source = https://github.com/orocos/orocos_kinematics_dynamics/archive/v1.4.0.tar.gz
+	source = declare-assignment-operator-private-for-SIP.patch
 	sha512sums = 7156465e2aff02f472933617512069355836a03a02d4587cfe03c1b1d667a9762a4e3ed6e055b2a44f1fce1b6746179203c7204389626a7b458dcab1b28930d8
+	sha512sums = 61a2abc5bce5e59dc3b9d6c3b4e10575053a730d08de5984da66bebcfdb4b0a7c5b5f3330974f7c44455012ba306768b8ea20b9f2e3e8a3ba0295339ce696feb
 
 pkgname = orocos-kdl-python
 
diff --git a/PKGBUILD b/PKGBUILD
index 9959cb6a2dd1..cde354367161 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,9 +9,17 @@ arch=('i686' 'x86_64')
 url="http://www.orocos.org/kdl"
 license=('GPL')
 depends=('orocos-kdl' 'python-sip')
-makedepends=('cmake' 'python2-sip')
-source=(https://github.com/orocos/${_pkgname}/archive/v${pkgver}.tar.gz)
-sha512sums=('7156465e2aff02f472933617512069355836a03a02d4587cfe03c1b1d667a9762a4e3ed6e055b2a44f1fce1b6746179203c7204389626a7b458dcab1b28930d8')
+makedepends=('cmake' 'python2-sip' 'sip')
+source=(https://github.com/orocos/${_pkgname}/archive/v${pkgver}.tar.gz
+        declare-assignment-operator-private-for-SIP.patch)
+sha512sums=('7156465e2aff02f472933617512069355836a03a02d4587cfe03c1b1d667a9762a4e3ed6e055b2a44f1fce1b6746179203c7204389626a7b458dcab1b28930d8'
+            '61a2abc5bce5e59dc3b9d6c3b4e10575053a730d08de5984da66bebcfdb4b0a7c5b5f3330974f7c44455012ba306768b8ea20b9f2e3e8a3ba0295339ce696feb')
+
+prepare() {
+    cd "${srcdir}/${_pkgname}-${pkgver}/python_orocos_kdl"
+
+    patch -Np1 -i "$srcdir/declare-assignment-operator-private-for-SIP.patch"
+}
 
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}/python_orocos_kdl"
diff --git a/declare-assignment-operator-private-for-SIP.patch b/declare-assignment-operator-private-for-SIP.patch
new file mode 100644
index 000000000000..031f86ec4506
--- /dev/null
+++ b/declare-assignment-operator-private-for-SIP.patch
@@ -0,0 +1,111 @@
+diff -ru a/PyKDL/dynamics.sip b/PyKDL/dynamics.sip
+--- a/PyKDL/dynamics.sip	2018-03-21 21:48:25.000000000 +0100
++++ b/PyKDL/dynamics.sip	2020-07-21 10:03:20.919999696 +0200
+@@ -72,4 +72,7 @@
+     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 -ru a/PyKDL/kinfam.sip b/PyKDL/kinfam.sip
+--- a/PyKDL/kinfam.sip	2018-03-21 21:48:25.000000000 +0100
++++ b/PyKDL/kinfam.sip	2020-07-21 11:18:02.633332021 +0200
+@@ -344,6 +344,9 @@
+     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 @@
+     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 @@
+     
+     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 @@
+     
+     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 @@
+         
+     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 @@
+ 
+     void setLambda(const double& lambda);
+ 
++private:
++    ChainIkSolverVel_wdls& operator=(const ChainIkSolverVel_wdls&);
+ };
+ 
+ 
+@@ -520,6 +537,9 @@
+ 
+     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 @@
+     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 @@
+         
+     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 @@
+     ChainJntToJacSolver(const Chain& chain);
+     int JntToJac(const JntArray& q_in,Jacobian& jac);
+     virtual void updateInternalDataStructures();
++
++private:
++    ChainJntToJacSolver& operator=(const ChainJntToJacSolver&);
+ };