- obsolete

Changed files:
    geos-config.patch -> 1.4
    geos-gcc4.patch -> 1.2

diff --git a/geos-config.patch b/geos-config.patch
deleted file mode 100644 (file)
index c13ddb7..0000000
--- a/geos-config.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- geos-2.1.1/tools/geos-config.in.orig       2004-11-09 21:22:52.000000000 +0100
-+++ geos-2.1.1/tools/geos-config.in    2005-01-16 01:52:48.888261784 +0100
-@@ -34,7 +34,7 @@
-     echo -I@prefix@/include 
-       ;;
-     --libs)
--      echo -L@prefix@/lib -lgeos
-+      echo -L@libdir@ -lgeos
-       ;;
-     --includes)
-       echo @prefix@/include

diff --git a/geos-gcc4.patch b/geos-gcc4.patch
deleted file mode 100644 (file)
index b2749aa..0000000
--- a/geos-gcc4.patch
+++ /dev/null
@@ -1,109 +0,0 @@
---- geos-2.2.0/source/headers/geos/geom.h.orig 2005-11-29 18:52:21.000000000 +0100
-+++ geos-2.2.0/source/headers/geos/geom.h      2005-12-11 00:29:14.530893368 +0100
-@@ -358,52 +358,52 @@
-       //double distance(Coordinate& p);
-       static Coordinate nullCoord;
- 
--      void Coordinate::setNull() {
-+      void setNull() {
-               x=DoubleNotANumber;
-               y=DoubleNotANumber;
-               z=DoubleNotANumber;
-       }
- 
--      static Coordinate& Coordinate::getNull() {
-+      static Coordinate& getNull() {
-               return nullCoord;
-       }
- 
--      Coordinate::Coordinate() {
-+      Coordinate() {
-               x=0.0;
-               y=0.0;
-               z=DoubleNotANumber;
-       }
- 
--      Coordinate::Coordinate(double xNew, double yNew, double zNew) {
-+      Coordinate(double xNew, double yNew, double zNew) {
-               x=xNew;
-               y=yNew;
-               z=zNew;
-       }
- 
- #ifndef PROFILE_COORDINATE_COPIES
--      Coordinate::Coordinate(const Coordinate& c){
-+      Coordinate(const Coordinate& c){
-               x=c.x;
-               y=c.y;
-               z=c.z;
-       }
- #else
--      Coordinate::Coordinate(const Coordinate& c);
-+      Coordinate(const Coordinate& c);
-       Coordinate &operator=(const Coordinate &c);
- #endif
- 
--      Coordinate::Coordinate(double xNew, double yNew){
-+      Coordinate(double xNew, double yNew){
-               x=xNew;
-               y=yNew;
-               z=DoubleNotANumber;
-       }
- 
--      void Coordinate::setCoordinate(const Coordinate& other) {
-+      void setCoordinate(const Coordinate& other) {
-               x = other.x;
-               y = other.y;
-               z = other.z;
-       }
- 
--      bool Coordinate::equals2D(const Coordinate& other) const {
-+      bool equals2D(const Coordinate& other) const {
-               if (x != other.x) {
-               return false;
-               }
-@@ -413,7 +413,7 @@
-               return true;
-       }
- 
--      int Coordinate::compareTo(const Coordinate& other) const {
-+      int compareTo(const Coordinate& other) const {
-               if (x < other.x) {
-               return -1;
-               }
-@@ -429,22 +429,22 @@
-               return 0;
-       }
- 
--      bool Coordinate::equals3D(const Coordinate& other) const {
-+      bool equals3D(const Coordinate& other) const {
-               return (x == other.x) && ( y == other.y) && ((z == other.z)||(ISNAN(z) && ISNAN(other.z)));
-       }
- 
--      void Coordinate::makePrecise(const PrecisionModel *precisionModel) {
-+      void makePrecise(const PrecisionModel *precisionModel) {
-               x = precisionModel->makePrecise(x);
-               y = precisionModel->makePrecise(y);
-       }
- 
--      double Coordinate::distance(const Coordinate& p) const {
-+      double distance(const Coordinate& p) const {
-               double dx = x - p.x;
-               double dy = y - p.y;
-               return sqrt(dx * dx + dy * dy);
-       }
- 
--      int Coordinate::hashCode() {
-+      int hashCode() {
-               //Algorithm from Effective Java by Joshua Bloch [Jon Aquino]
-               int result = 17;
-               result = 37 * result + hashCode(x);
-@@ -456,7 +456,7 @@
-       * Returns a hash code for a double value, using the algorithm from
-       * Joshua Bloch's book <i>Effective Java</i>
-       */
--      static int Coordinate::hashCode(double x) {
-+      static int hashCode(double x) {
-               int64 f = (int64)(x);
-               return (int)(f^(f>>32));
-       }