diff options
| author | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-02-07 08:06:11 +0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-02-07 08:08:46 +0700 |
| commit | 59b76a143ffe333cc692d01d25c0324c756f377f (patch) | |
| tree | 6d43c40185a2a77e3316c02d42d4cca72ebb1f81 /gis | |
| parent | d93bb82d8b24691d901a4760cd6ad3d2085f798f (diff) | |
gis/pointcloud: Fix build against postgresql 9.5.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'gis')
| -rw-r--r-- | gis/pointcloud/pointcloud.SlackBuild | 14 | ||||
| -rw-r--r-- | gis/pointcloud/postgresql9.5.patch | 19 |
2 files changed, 28 insertions, 5 deletions
diff --git a/gis/pointcloud/pointcloud.SlackBuild b/gis/pointcloud/pointcloud.SlackBuild index c37bfef6726b..236b83aa0cba 100644 --- a/gis/pointcloud/pointcloud.SlackBuild +++ b/gis/pointcloud/pointcloud.SlackBuild @@ -67,11 +67,15 @@ else fi cd $PRGNAM-$VERSION chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +# Upstream commit +# please remove it on next release +patch -p1 < $CWD/postgresql9.5.patch ./autogen.sh CFLAGS="$SLKCFLAGS" \ diff --git a/gis/pointcloud/postgresql9.5.patch b/gis/pointcloud/postgresql9.5.patch new file mode 100644 index 000000000000..a1c21765a72b --- /dev/null +++ b/gis/pointcloud/postgresql9.5.patch @@ -0,0 +1,19 @@ +--- pointcloud-1.0.1/pgsql/pc_access.c.orig 2016-02-07 08:01:10.553181345 +0700 ++++ pointcloud-1.0.1/pgsql/pc_access.c 2016-02-07 08:01:39.528225276 +0700 +@@ -313,15 +313,7 @@ + (errcode(ERRCODE_INVALID_PARAMETER_VALUE), + errmsg("could not determine input data type"))); + +- if (fcinfo->context && IsA(fcinfo->context, AggState)) +- { +- aggcontext = ((AggState *) fcinfo->context)->aggcontext; +- } +- else if (fcinfo->context && IsA(fcinfo->context, WindowAggState)) +- { +- aggcontext = ((WindowAggState *) fcinfo->context)->aggcontext; +- } +- else ++ if ( ! AggCheckCallContext(fcinfo, &aggcontext) ) + { + /* cannot be called directly because of dummy-type argument */ + elog(ERROR, "pointcloud_agg_transfn called in non-aggregate context"); |