From fccc08cced544f12b52f893929c20fe6569db40f Mon Sep 17 00:00:00 2001 From: Larry Rosenman Date: Mon, 3 Jun 2019 09:37:48 +0000 Subject: [PATCH] databases/pointcloud: Backport upstream PR for PostgreSQL 11 support. PR: 238302 Approved by: lbartoletti@tuxfamily.org (maintainer) Obtained from: https://github.com/pgpointcloud/pointcloud/commit/3e64c68dd4e0b9b9fdf0a74492ab49023161f6f1 MFH: 2019Q2 --- databases/pointcloud/Makefile | 2 +- .../pointcloud/files/patch-pgsql_pc__access.c | 26 +++++++++++++++++++ .../pointcloud/files/patch-pgsql_pc__inout.c | 11 ++++++++ 3 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 databases/pointcloud/files/patch-pgsql_pc__access.c create mode 100644 databases/pointcloud/files/patch-pgsql_pc__inout.c diff --git a/databases/pointcloud/Makefile b/databases/pointcloud/Makefile index 0782e047cffc..1cb0c12a63ee 100644 --- a/databases/pointcloud/Makefile +++ b/databases/pointcloud/Makefile @@ -3,7 +3,7 @@ PORTNAME= pointcloud PORTVERSION= 1.2.0 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v CATEGORIES= databases geography diff --git a/databases/pointcloud/files/patch-pgsql_pc__access.c b/databases/pointcloud/files/patch-pgsql_pc__access.c new file mode 100644 index 000000000000..79ab03075b31 --- /dev/null +++ b/databases/pointcloud/files/patch-pgsql_pc__access.c @@ -0,0 +1,26 @@ +--- pgsql/pc_access.c.orig 2018-08-22 09:36:04 UTC ++++ pgsql/pc_access.c +@@ -879,9 +879,9 @@ Datum pcpatch_intersects(PG_FUNCTION_ARGS) + + if ( pc_bounds_intersects(&(serpa1->bounds), &(serpa2->bounds)) ) + { +- PG_RETURN_BOOL(TRUE); ++ PG_RETURN_BOOL(true); + } +- PG_RETURN_BOOL(FALSE); ++ PG_RETURN_BOOL(false); + } + + PG_FUNCTION_INFO_V1(pcpatch_size); +@@ -939,9 +939,9 @@ PG_FUNCTION_INFO_V1(pc_lazperf_enabled); + Datum pc_lazperf_enabled(PG_FUNCTION_ARGS) + { + #ifdef HAVE_LAZPERF +- PG_RETURN_BOOL(TRUE); ++ PG_RETURN_BOOL(true); + #else +- PG_RETURN_BOOL(FALSE); ++ PG_RETURN_BOOL(false); + #endif + } + diff --git a/databases/pointcloud/files/patch-pgsql_pc__inout.c b/databases/pointcloud/files/patch-pgsql_pc__inout.c new file mode 100644 index 000000000000..21997eb40e1a --- /dev/null +++ b/databases/pointcloud/files/patch-pgsql_pc__inout.c @@ -0,0 +1,11 @@ +--- pgsql/pc_inout.c.orig 2018-08-22 09:36:04 UTC ++++ pgsql/pc_inout.c +@@ -171,7 +171,7 @@ Datum pcschema_is_valid(PG_FUNCTION_ARGS) + + if ( !schema ) + { +- PG_RETURN_BOOL(FALSE); ++ PG_RETURN_BOOL(false); + } + + valid = pc_schema_is_valid(schema);