Merge sip patches into one

4 files changed, 143 insertions, 148 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e87a37dbea62..cd9a08f99375 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -20,10 +20,8 @@ pkgbase = ros-melodic-python-orocos-kdl
 	depends = sip
 	source = ros-melodic-python-orocos-kdl-1.4.0.tar.gz::https://github.com/orocos/orocos_kinematics_dynamics/archive/v1.4.0.tar.gz
 	source = sip.patch
-	source = sip2.patch
 	sha256sums = 05b93e759923684dc07433ccae1e476d158d89b3c2be5079c20062406da7b4dd
-	sha256sums = 8c95f5794d6ff18fdf32a836443a2cbfd8bd8255bd3ec792b333d53280213049
-	sha256sums = 0887640880a9fdc3f6a879fd9dce92b64e0b84a712daab28b2758ba7638930a7
+	sha256sums = ec9e21e65c8ea70b5f9e3f651b1d36c0e79be63a008acd0f7d6d3b275c7dc241
 
 pkgname = ros-melodic-python-orocos-kdl
 
diff --git a/PKGBUILD b/PKGBUILD
index 149672d89630..3ff0a2799238 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -34,17 +34,13 @@ depends=(
 
 _dir="orocos_kinematics_dynamics-${pkgver}/python_orocos_kdl"
 source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/orocos/orocos_kinematics_dynamics/archive/v${pkgver}.tar.gz"
-sip.patch
-sip2.patch)
+sip.patch)
 sha256sums=('05b93e759923684dc07433ccae1e476d158d89b3c2be5079c20062406da7b4dd'
-            '8c95f5794d6ff18fdf32a836443a2cbfd8bd8255bd3ec792b333d53280213049'
-            '0887640880a9fdc3f6a879fd9dce92b64e0b84a712daab28b2758ba7638930a7')
+            'ec9e21e65c8ea70b5f9e3f651b1d36c0e79be63a008acd0f7d6d3b275c7dc241')
 
 prepare() {
   cd "${srcdir}/${_dir}"
   patch --forward --strip=0 --input="${srcdir}/sip.patch"
-  patch --forward --strip=0 --input="${srcdir}/sip2.patch"
-
 }
 
 build() {
diff --git a/sip.patch b/sip.patch
index 159171adb021..28f7ce1b78ee 100644
--- a/sip.patch
+++ b/sip.patch
@@ -8,3 +8,143 @@
 +private:
 +    ChainDynParam& operator=(const ChainDynParam&);
  };
+
+--- PyKDL/kinfam.sip.1	2020-08-27 21:18:09.940551356 +0200
++++ PyKDL/kinfam.sip	2020-08-27 21:17:39.073671833 +0200
+@@ -321,6 +321,9 @@
+ using namespace KDL;
+ %End
+     virtual int JntToCart(const JntArray& q_in, Frame& p_out,int segmentNr=-1)=0;
++
++private:
++    ChainFkSolverPos& operator=(const ChainFkSolverPos&);
+ };
+ 
+ class ChainFkSolverVel : SolverI
+@@ -331,6 +334,9 @@
+ %End
+     virtual int JntToCart(const JntArrayVel& q_in, FrameVel& p_out,int
+     segmentNr=-1)=0;
++
++private:
++    ChainFkSolverVel& operator=(const ChainFkSolverVel&);
+ };
+ 
+ class ChainFkSolverPos_recursive : ChainFkSolverPos
+@@ -344,6 +350,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 +366,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 {
+@@ -367,6 +379,9 @@
+ public:
+     virtual int CartToJnt(const JntArray& q_init , const Frame& p_in, JntArray& q_out )=0;
+     virtual void updateInternalDataStructures()=0;
++
++private:
++    ChainIkSolverPos& operator=(const ChainIkSolverPos&);
+ };
+ 
+ class ChainIkSolverVel : SolverI {
+@@ -378,6 +393,9 @@
+     virtual int CartToJnt(const JntArray& q_in , const Twist& v_in , JntArray& qdot_out )=0;
+     virtual int CartToJnt(const JntArray& q_init , const FrameVel& v_in , JntArrayVel& q_out )=0;
+     virtual void updateInternalDataStructures()=0;
++
++private:
++    ChainIkSolverVel& operator=(const ChainIkSolverVel&);
+ };
+ 
+ class ChainIkSolverPos_NR : ChainIkSolverPos
+@@ -392,6 +410,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 +428,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 +444,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 +533,8 @@
+ 
+     void setLambda(const double& lambda);
+ 
++private:
++    ChainIkSolverVel_wdls& operator=(const ChainIkSolverVel_wdls&);
+ };
+ 
+ 
+@@ -520,6 +549,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 +578,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 +594,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 +609,7 @@
+     ChainJntToJacSolver(const Chain& chain);
+     int JntToJac(const JntArray& q_in,Jacobian& jac);
+     virtual void updateInternalDataStructures();
++
++private:
++    ChainJntToJacSolver& operator=(const ChainJntToJacSolver&);
+ };
diff --git a/sip2.patch b/sip2.patch
deleted file mode 100644
index e827e9798bf9..000000000000
--- a/sip2.patch
+++ /dev/null
@@ -1,139 +0,0 @@
---- PyKDL/kinfam.sip.1	2020-08-27 21:18:09.940551356 +0200
-+++ PyKDL/kinfam.sip	2020-08-27 21:17:39.073671833 +0200
-@@ -321,6 +321,9 @@
- using namespace KDL;
- %End
-     virtual int JntToCart(const JntArray& q_in, Frame& p_out,int segmentNr=-1)=0;
-+
-+private:
-+    ChainFkSolverPos& operator=(const ChainFkSolverPos&);
- };
- 
- class ChainFkSolverVel : SolverI
-@@ -331,6 +334,9 @@
- %End
-     virtual int JntToCart(const JntArrayVel& q_in, FrameVel& p_out,int
-     segmentNr=-1)=0;
-+
-+private:
-+    ChainFkSolverVel& operator=(const ChainFkSolverVel&);
- };
- 
- class ChainFkSolverPos_recursive : ChainFkSolverPos
-@@ -344,6 +350,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 +366,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 {
-@@ -367,6 +379,9 @@
- public:
-     virtual int CartToJnt(const JntArray& q_init , const Frame& p_in, JntArray& q_out )=0;
-     virtual void updateInternalDataStructures()=0;
-+
-+private:
-+    ChainIkSolverPos& operator=(const ChainIkSolverPos&);
- };
- 
- class ChainIkSolverVel : SolverI {
-@@ -378,6 +393,9 @@
-     virtual int CartToJnt(const JntArray& q_in , const Twist& v_in , JntArray& qdot_out )=0;
-     virtual int CartToJnt(const JntArray& q_init , const FrameVel& v_in , JntArrayVel& q_out )=0;
-     virtual void updateInternalDataStructures()=0;
-+
-+private:
-+    ChainIkSolverVel& operator=(const ChainIkSolverVel&);
- };
- 
- class ChainIkSolverPos_NR : ChainIkSolverPos
-@@ -392,6 +410,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 +428,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 +444,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 +533,8 @@
- 
-     void setLambda(const double& lambda);
- 
-+private:
-+    ChainIkSolverVel_wdls& operator=(const ChainIkSolverVel_wdls&);
- };
- 
- 
-@@ -520,6 +549,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 +578,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 +594,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 +609,7 @@
-     ChainJntToJacSolver(const Chain& chain);
-     int JntToJac(const JntArray& q_in,Jacobian& jac);
-     virtual void updateInternalDataStructures();
-+
-+private:
-+    ChainJntToJacSolver& operator=(const ChainJntToJacSolver&);
- };