diff options
| author | plunky <plunky> | 2012-03-15 22:46:01 +0000 |
|---|---|---|
| committer | plunky <plunky> | 2012-03-15 22:46:01 +0000 |
| commit | f763e80c2116481fcdc3a298ab421036c543d764 (patch) | |
| tree | 5204201ddff3a263454eb9277f0f6f80dd8812ea /misc/zyGrib | |
| parent | 3fb4847a5f2f44069e98956d42ad4294dd1bd085 (diff) | |
| download | pkgsrc-f763e80c2116481fcdc3a298ab421036c543d764.tar.gz | |
fix build for proj-4.8.0
Diffstat (limited to 'misc/zyGrib')
| -rw-r--r-- | misc/zyGrib/distinfo | 7 | ||||
| -rw-r--r-- | misc/zyGrib/patches/patch-aa | 4 | ||||
| -rw-r--r-- | misc/zyGrib/patches/patch-ab | 15 | ||||
| -rw-r--r-- | misc/zyGrib/patches/patch-map_Projection__libproj.cpp | 19 |
4 files changed, 37 insertions, 8 deletions
diff --git a/misc/zyGrib/distinfo b/misc/zyGrib/distinfo index c2e9d5aeb25..29bbff836ce 100644 --- a/misc/zyGrib/distinfo +++ b/misc/zyGrib/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.12 2012/03/14 14:49:06 plunky Exp $ +$NetBSD: distinfo,v 1.13 2012/03/15 22:46:01 plunky Exp $ SHA1 (zyGrib-5.1.3.tgz) = e8965dd6ec1f8cbf13a302540f01b9e42ec4bab2 RMD160 (zyGrib-5.1.3.tgz) = 8f378d726f076a701b0ed1d529c9ef2195ede29e Size (zyGrib-5.1.3.tgz) = 17046935 bytes -SHA1 (patch-aa) = 81d67e6ea4e7191752f0f3ea1a757867360be140 -SHA1 (patch-ab) = a65348d043e260835cbf5c832998a7eecb0ad6ea +SHA1 (patch-aa) = be561cd1d7d784d09071cde600819ad4bbc41d22 +SHA1 (patch-ab) = dcd400ea957ae6e1f550e4277ce2f5337fc4eac8 +SHA1 (patch-map_Projection__libproj.cpp) = be1db6ab90cc9d6bff84a5bb8d2ec3a43622c7fa diff --git a/misc/zyGrib/patches/patch-aa b/misc/zyGrib/patches/patch-aa index 81e7aefe88f..be97438d143 100644 --- a/misc/zyGrib/patches/patch-aa +++ b/misc/zyGrib/patches/patch-aa @@ -1,9 +1,9 @@ -$NetBSD: patch-aa,v 1.6 2012/03/09 10:22:33 plunky Exp $ +$NetBSD: patch-aa,v 1.7 2012/03/15 22:46:01 plunky Exp $ libbz2, libz and libproj are all provided by the buildlink3.mk framework; no need to use private versions. ---- zyGrib.pro.orig 2012-02-26 09:02:53.000000000 +0000 +--- zyGrib.pro.orig 2012-03-11 20:26:38.000000000 +0000 +++ zyGrib.pro @@ -5,7 +5,7 @@ TEMPLATE = app TARGET = zyGrib diff --git a/misc/zyGrib/patches/patch-ab b/misc/zyGrib/patches/patch-ab index a3670b015e4..f30cf779173 100644 --- a/misc/zyGrib/patches/patch-ab +++ b/misc/zyGrib/patches/patch-ab @@ -1,13 +1,22 @@ -$NetBSD: patch-ab,v 1.3 2012/03/09 10:22:33 plunky Exp $ +$NetBSD: patch-ab,v 1.4 2012/03/15 22:46:01 plunky Exp $ ---- map/Projection.h.orig 2012-02-26 09:02:53.000000000 +0000 +--- map/Projection.h.orig 2012-03-11 20:26:38.000000000 +0000 +++ map/Projection.h @@ -20,7 +20,7 @@ along with this program. If not, see <h #define PROJECTION_H #include <QObject> -#include "projects.h" // libproj -+#include <projects.h> // libproj ++#include <proj_api.h> // libproj class Projection : public QObject +@@ -136,7 +136,7 @@ class Projection_libproj : public Projec + int getProjection() {return currentProj;} + + private : +- PJ *libProj; ++ projPJ libProj; + int currentProj; + }; + diff --git a/misc/zyGrib/patches/patch-map_Projection__libproj.cpp b/misc/zyGrib/patches/patch-map_Projection__libproj.cpp new file mode 100644 index 00000000000..c5043f652d2 --- /dev/null +++ b/misc/zyGrib/patches/patch-map_Projection__libproj.cpp @@ -0,0 +1,19 @@ +$NetBSD: patch-map_Projection__libproj.cpp,v 1.1 2012/03/15 22:46:01 plunky Exp $ + +--- map/Projection_libproj.cpp.orig 2012-03-15 16:25:37.000000000 +0000 ++++ map/Projection_libproj.cpp +@@ -90,13 +90,13 @@ void Projection_libproj::setProjection(i + } + params[nbpar++] = (char*) "ellps=WGS84"; + params[nbpar++] = (char*) "no_defs"; ++ params[nbpar++] = (char*) "over"; // allow longitude > 180° + + libProj = pj_init(nbpar, params); + if (!libProj) + printf("proj error: %s\n", pj_strerrno(pj_errno)); + assert(libProj); + currentProj = code; +- libProj->over = 1; // allow longitude > 180° + //printf("Projection: %s\n", libProj->descr); + } + |