summaryrefslogtreecommitdiff
path: root/geography
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2006-08-24 18:30:24 +0000
committerwiz <wiz@pkgsrc.org>2006-08-24 18:30:24 +0000
commit85ef505aa70da3e71bafa157ba08462d6c1f97b9 (patch)
tree8dd8228cdd897e84a3b46afd94669ad91f841afa /geography
parentb31fccbb477036cd713af567bdbaeb86835d120e (diff)
downloadpkgsrc-85ef505aa70da3e71bafa157ba08462d6c1f97b9.tar.gz
Fix build with gcc4. Patch provided by Brook Milligan
in PR 34273.
Diffstat (limited to 'geography')
-rw-r--r--geography/geos/distinfo3
-rw-r--r--geography/geos/patches/patch-ad105
2 files changed, 107 insertions, 1 deletions
diff --git a/geography/geos/distinfo b/geography/geos/distinfo
index 226a8909392..6e7613e73ce 100644
--- a/geography/geos/distinfo
+++ b/geography/geos/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2005/11/06 10:36:46 minskim Exp $
+$NetBSD: distinfo,v 1.2 2006/08/24 18:30:24 wiz Exp $
SHA1 (geos-2.0.0.tar.bz2) = 68ebffa7e18f4edf932e98bd3cf20d58a439c22e
RMD160 (geos-2.0.0.tar.bz2) = b3873169d215beb3202870618fbefbe96593fa90
@@ -6,3 +6,4 @@ Size (geos-2.0.0.tar.bz2) = 512262 bytes
SHA1 (patch-aa) = 7b05c8507f9f06ca0492ab8b219aad6922685a4e
SHA1 (patch-ab) = 2257c2a6bc5448486dcd1826138c1b16b1b78a4f
SHA1 (patch-ac) = e6fa156825bf9afb7324c63d5cc4c88a88cae96b
+SHA1 (patch-ad) = f665165e73d235c6dfd4119de50ea47a37414935
diff --git a/geography/geos/patches/patch-ad b/geography/geos/patches/patch-ad
new file mode 100644
index 00000000000..9c3df9dccd3
--- /dev/null
+++ b/geography/geos/patches/patch-ad
@@ -0,0 +1,105 @@
+$NetBSD: patch-ad,v 1.1 2006/08/24 18:30:24 wiz Exp $
+
+--- source/headers/geos/geom.h.orig 2004-07-27 16:35:46.000000000 +0000
++++ source/headers/geos/geom.h
+@@ -546,47 +546,47 @@ public:
+ //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;
+ }
+
+- Coordinate::Coordinate(const Coordinate& c){
++ Coordinate(const Coordinate& c){
+ x=c.x;
+ y=c.y;
+ z=c.z;
+ }
+
+- 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;
+ }
+@@ -596,7 +596,7 @@ public:
+ return true;
+ }
+
+- int Coordinate::compareTo(const Coordinate& other) const {
++ int compareTo(const Coordinate& other) const {
+ if (x < other.x) {
+ return -1;
+ }
+@@ -612,22 +612,22 @@ public:
+ 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)||(z==DoubleNotANumber && other.z==DoubleNotANumber));
+ }
+
+- 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);
+@@ -639,7 +639,7 @@ public:
+ * 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));
+ }