x11/metisse: add <unistd.h> and other c++ fixes

Approved by:	portmgr (bapt, implicit)

4 files changed, 115 insertions, 0 deletions

diff --git a/x11/metisse/files/patch-FvwmCompositor_eigen_ludecomposition.h b/x11/metisse/files/patch-FvwmCompositor_eigen_ludecomposition.h
new file mode 100644
index 000000000000..a8e97b608cc2
--- /dev/null
+++ b/x11/metisse/files/patch-FvwmCompositor_eigen_ludecomposition.h
@@ -0,0 +1,20 @@
+--- FvwmCompositor/eigen/ludecomposition.h.orig	2008-03-25 17:15:13.000000000 +0000
++++ FvwmCompositor/eigen/ludecomposition.h
+@@ -85,7 +85,7 @@ class LUDecomposition
+ public:
+ 
+     /** Performs the LU Decomposition of mat. Use this constructor. */
+-    LUDecomposition( const Matrix<T, Size> & mat ) { perform( mat ); }
++    LUDecomposition( const Matrix<T, Size> & mat ) { this->perform( mat ); }
+ 
+ protected:
+     /** Default constructor. Does nothing. \internal
+@@ -128,7 +128,7 @@ class LUDecompositionX
+ 
+ public:
+     /** Performs the LU Decomposition of mat. Use this constructor. */
+-    LUDecompositionX( const MatrixX<T> & mat ) { perform( mat ); }
++    LUDecompositionX( const MatrixX<T> & mat ) { this->perform( mat ); }
+ 
+ protected:
+     /** Default constructor. Does nothing. \internal
diff --git a/x11/metisse/files/patch-FvwmCompositor_eigen_matrix.h b/x11/metisse/files/patch-FvwmCompositor_eigen_matrix.h
new file mode 100644
index 000000000000..33db6bf3de12
--- /dev/null
+++ b/x11/metisse/files/patch-FvwmCompositor_eigen_matrix.h
@@ -0,0 +1,38 @@
+--- FvwmCompositor/eigen/matrix.h.orig	2008-03-25 17:15:13.000000000 +0000
++++ FvwmCompositor/eigen/matrix.h
+@@ -170,7 +170,7 @@ public:
+       */
+     Matrix( const Matrix & other )
+     {
+-        readArray( other.array() );
++        this->readArray( other.array() );
+     }
+ 
+     /**
+@@ -179,7 +179,7 @@ public:
+       */
+     Matrix( const T * array )
+     {
+-        readArray( array );
++        this->readArray( array );
+     }
+ 
+     /**
+@@ -322,7 +322,7 @@ public:
+     MatrixX( const MatrixX & other )
+     {
+         init( other.size() );
+-        readArray( other.array() );
++        this->readArray( other.array() );
+     }
+ 
+     /**
+@@ -336,7 +336,7 @@ public:
+     MatrixX( int size, const T * array )
+     {
+         init( size );
+-        readArray( array );
++        this->readArray( array );
+     }
+ 
+     /**
diff --git a/x11/metisse/files/patch-FvwmCompositor_eigen_vector.h b/x11/metisse/files/patch-FvwmCompositor_eigen_vector.h
new file mode 100644
index 000000000000..8b527968742e
--- /dev/null
+++ b/x11/metisse/files/patch-FvwmCompositor_eigen_vector.h
@@ -0,0 +1,47 @@
+--- FvwmCompositor/eigen/vector.h.orig	2008-03-25 17:15:13.000000000 +0000
++++ FvwmCompositor/eigen/vector.h
+@@ -141,7 +141,7 @@ public:
+       */
+     Vector( const Vector &v )
+     {
+-        readArray( v.array() );
++        this->readArray( v.array() );
+     }
+ 
+     /**
+@@ -149,7 +149,7 @@ public:
+       */
+     Vector( const T *array )
+     {
+-        readArray( array );
++        this->readArray( array );
+     }
+ 
+     /**
+@@ -160,7 +160,7 @@ public:
+     Vector( int unused_size, const T *array )
+     {
+         assert( unused_size == this->size() );
+-        readArray( array );
++        this->readArray( array );
+     }
+ 
+     /**
+@@ -312,7 +312,7 @@ public:
+     VectorX( const VectorX & other )
+     {
+         init( other._size() );
+-        readArray( other.array() );
++        this->readArray( other.array() );
+     }
+ 
+     /**
+@@ -328,7 +328,7 @@ public:
+     VectorX( int size, const T * array )
+     {
+         init( size );
+-        readArray( array );
++        this->readArray( array );
+     }
+ 
+     ~VectorX()
diff --git a/x11/metisse/files/patch-FvwmCompositor_main_AScreen.cxx b/x11/metisse/files/patch-FvwmCompositor_main_AScreen.cxx
new file mode 100644
index 000000000000..dc9366d5ab05
--- /dev/null
+++ b/x11/metisse/files/patch-FvwmCompositor_main_AScreen.cxx
@@ -0,0 +1,10 @@
+--- FvwmCompositor/main/AScreen.cxx.orig	2008-11-25 10:22:45.000000000 +0000
++++ FvwmCompositor/main/AScreen.cxx
+@@ -10,6 +10,7 @@
+  *
+  */
+ 
++#include <unistd.h>
+ #ifdef HAVE_CONFIG_H
+ #include "config-not-xserver.h"
+ #endif