diff options
| author | Johannes Jost Meixner <xmj@FreeBSD.org> | 2015-01-13 11:17:21 +0000 |
|---|---|---|
| committer | Johannes Jost Meixner <xmj@FreeBSD.org> | 2015-01-13 11:17:21 +0000 |
| commit | 923cbfd392cafb991643da41b9a9e8d2844368fc (patch) | |
| tree | 24906c104d8e755bf0d83808fa87da36504b4a14 /databases/postgis21/files/patch-liblwgeom_lwin__geojson.c | |
| parent | Extend the deadline while I work on a pkgng-aware rewrite. (diff) | |
databases/postgis21: update to 2.1.5
update to 2.1.5
remove two patches upstream integrated
PR: 196149
Differential Revision: https://reviews.freebsd.org/D1510
Submitted by: Harrison Grundy <harrison.grundy@astrodoggroup.com>
Approved by: maintainer timeout (three weeks)
Approved by: koobs (mentor)
Diffstat (limited to 'databases/postgis21/files/patch-liblwgeom_lwin__geojson.c')
| -rw-r--r-- | databases/postgis21/files/patch-liblwgeom_lwin__geojson.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/databases/postgis21/files/patch-liblwgeom_lwin__geojson.c b/databases/postgis21/files/patch-liblwgeom_lwin__geojson.c deleted file mode 100644 index c789416310b4..000000000000 --- a/databases/postgis21/files/patch-liblwgeom_lwin__geojson.c +++ /dev/null @@ -1,22 +0,0 @@ ---- liblwgeom/lwin_geojson.c.orig 2014-08-20 10:32:15.721407424 +0600 -+++ liblwgeom/lwin_geojson.c 2014-08-20 10:32:44.823412267 +0600 -@@ -17,8 +17,8 @@ - - #ifdef HAVE_LIBJSON - --#include <json/json.h> --#include <json/json_object_private.h> -+#include <json-c/json.h> -+#include <json-c/json_object_private.h> - #include <string.h> - - static void geojson_lwerror(char *msg, int error_code) -@@ -510,7 +510,7 @@ - if( jstok->err != json_tokener_success) - { - char err[256]; -- snprintf(err, 256, "%s (at offset %d)", json_tokener_errors[jstok->err], jstok->char_offset); -+ snprintf(err, 256, "%s (at offset %d)", json_tokener_error_desc(jstok->err), jstok->char_offset); - json_tokener_free(jstok); - json_object_put(poObj); - geojson_lwerror(err, 1); |