[DebianGIS-dev] CVS Update: geos/debian/patches 00list g++4.1-extra-qualifications.dpatch isvalid.dpatch

[shalasz-guest at haydn.debian.org]

  User: shalasz-guest
  Date: 06/03/17 15:32:18

  Added:       debian/patches 00list g++4.1-extra-qualifications.dpatch
  Removed:     debian/patches isvalid.dpatch
  Log:
  * Apply patch for FTBS with g++ from Martin Michlmayr.
  * Provide new C API and libgeos-c1 package.
  
  Revision  Changes    Path
  1.1                  geos/debian/patches/00list
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/geos/debian/patches/00list?annotate=1.1&cvsroot=
  
  CVSWeb: View this file:             http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/geos/debian/patches/00list?rev=1.1&content-type=text/x-cvsweb-markup&cvsroot=
  
  -----------------------------------
  
  Index: 00list
  ===================================================================
  g++4.1-extra-qualifications
  
  
  1.1                  geos/debian/patches/g++4.1-extra-qualifications.dpatch
  
  CVSWEB Options: -------------------
  
  CVSWeb: Annotate this file:            http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/geos/debian/patches/g++4.1-extra-qualifications.dpatch?annotate=1.1&cvsroot=
  
  CVSWeb: View this file:             http://cvs.alioth.debian.org/cgi-bin/cvsweb.cgi/pkg-grass/geos/debian/patches/g++4.1-extra-qualifications.dpatch?rev=1.1&content-type=text/x-cvsweb-markup&cvsroot=
  
  -----------------------------------
  
  Index: g++4.1-extra-qualifications.dpatch
  ===================================================================
  #! /bin/sh /usr/share/dpatch/dpatch-run
  ## g++4.1-extra-qualifications.dpatch by  <debian at adkgis.org>
  ##
  ## All lines beginning with `## DP:' are a description of the patch.
  ## DP: Fix FTBFS with g++ 4.1. Patch from Martin Michlmayr.
  
  @DPATCH@
  diff -urNad geos-2.2.1~/source/headers/geos/geom.h geos-2.2.1/source/headers/geos/geom.h
  --- geos-2.2.1~/source/headers/geos/geom.h	2005-11-29 12:52:21.000000000 -0500
  +++ geos-2.2.1/source/headers/geos/geom.h	2006-03-17 09:44:16.000000000 -0500
  @@ -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));
   	}