diff options
author | Baudouin Feildel | 2018-11-27 00:25:39 +0100 |
---|---|---|
committer | Baudouin Feildel | 2018-11-27 00:25:39 +0100 |
commit | a4ae2322bbf6480f4c52359ec7adf2cab4797799 (patch) | |
tree | 9b2f5870a3e250c6bd4f5d4c767487554561faa4 | |
parent | 6efd7baba5523ec669f94c4d005204db781f1261 (diff) | |
download | aur-a4ae2322bbf6480f4c52359ec7adf2cab4797799.tar.gz |
Fix compilation with PostgreSQL 11
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 15 | ||||
-rw-r--r-- | pointcloud-1.2.0-fix-compilation-against-pg11.patch | 54 |
3 files changed, 69 insertions, 4 deletions
@@ -1,7 +1,7 @@ pkgbase = pgpointcloud pkgdesc = A PostgreSQL extension for storing point cloud (LIDAR) data pkgver = 1.2.0 - pkgrel = 2 + pkgrel = 3 url = https://github.com/pgpointcloud/pointcloud changelog = pgpointcloud.changelog arch = i686 @@ -14,7 +14,9 @@ pkgbase = pgpointcloud provides = pgpointcloud=1.2.0 conflicts = pgpointcloud-git source = https://github.com/pgpointcloud/pointcloud/archive/v1.2.0.tar.gz + source = pointcloud-1.2.0-fix-compilation-against-pg11.patch sha256sums = 8542a4c714b4d0c67f10d092291a43b5650871b4ec8caf831e492810f25bb93c + sha256sums = aa6b1c74aa88e7ec70b78bcb1125a6458ab99261f0debc385ddf6616fe8f628e pkgname = pgpointcloud @@ -1,7 +1,7 @@ # Maintainer: Baudouin Feildel <baudouin_aur@feildel.fr> pkgname=pgpointcloud pkgver=1.2.0 -pkgrel=2 +pkgrel=3 pkgdesc="A PostgreSQL extension for storing point cloud (LIDAR) data" arch=('i686' 'x86_64') url="https://github.com/pgpointcloud/pointcloud" @@ -12,8 +12,17 @@ makedepends=('cunit' 'laz-perf') provides=("pgpointcloud=$pkgver") conflicts=('pgpointcloud-git') changelog="$pkgname.changelog" -source=("https://github.com/pgpointcloud/pointcloud/archive/v$pkgver.tar.gz") -sha256sums=('8542a4c714b4d0c67f10d092291a43b5650871b4ec8caf831e492810f25bb93c') +source=( + "https://github.com/pgpointcloud/pointcloud/archive/v$pkgver.tar.gz" + "${pkgname#pg}-$pkgver-fix-compilation-against-pg11.patch") +sha256sums=( + '8542a4c714b4d0c67f10d092291a43b5650871b4ec8caf831e492810f25bb93c' + 'aa6b1c74aa88e7ec70b78bcb1125a6458ab99261f0debc385ddf6616fe8f628e') + +prepare() { + cd "${pkgname#pg}-$pkgver" + patch -p1 -i "$srcdir/${pkgname#pg}-$pkgver-fix-compilation-against-pg11.patch" +} build() { cd "${pkgname#pg}-$pkgver" diff --git a/pointcloud-1.2.0-fix-compilation-against-pg11.patch b/pointcloud-1.2.0-fix-compilation-against-pg11.patch new file mode 100644 index 000000000000..38985d4c7cec --- /dev/null +++ b/pointcloud-1.2.0-fix-compilation-against-pg11.patch @@ -0,0 +1,54 @@ +From 3e64c68dd4e0b9b9fdf0a74492ab49023161f6f1 Mon Sep 17 00:00:00 2001 +From: Baudouin Feildel <baudouin@feildel.fr> +Date: Tue, 27 Nov 2018 00:14:13 +0100 +Subject: [PATCH] Fix boolean case errors when compiling againt pg11 + +--- + pgsql/pc_access.c | 8 ++++---- + pgsql/pc_inout.c | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/pgsql/pc_access.c b/pgsql/pc_access.c +index 62599f2..3b29201 100644 +--- a/pgsql/pc_access.c ++++ b/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/pgsql/pc_inout.c b/pgsql/pc_inout.c +index 1378a80..05223f1 100644 +--- a/pgsql/pc_inout.c ++++ b/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); +-- +2.19.2 + |