From c7f6c4de27a7674971e64bb18228a072a882e9f9 Mon Sep 17 00:00:00 2001 From: Laishenghao Date: Thu, 14 Sep 2023 18:02:39 +0800 Subject: [PATCH] =?UTF-8?q?fixed=201b39d78=20from=20https://gitee.com/dodd?= =?UTF-8?q?ers/openGauss-third=5Fparty/pulls/214=20=E4=BF=AE=E6=94=B9postg?= =?UTF-8?q?is=20=E8=A1=A5=E4=B8=81=EF=BC=8C=E8=A7=A3=E5=86=B3raster?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=8D=E5=AF=B9=E5=AF=BC=E8=87=B4=E5=88=9B?= =?UTF-8?q?=E5=BB=BApostgis=5Fraster=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gpl_dependency/postgis/postgis_2.4.2-2.patch | 41 ++++++++++++++------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/gpl_dependency/postgis/postgis_2.4.2-2.patch b/gpl_dependency/postgis/postgis_2.4.2-2.patch index 9588d05f5..ea375f3d4 100644 --- a/gpl_dependency/postgis/postgis_2.4.2-2.patch +++ b/gpl_dependency/postgis/postgis_2.4.2-2.patch @@ -1,6 +1,6 @@ diff -uprN a/gdal-1.11.0/frmts/postgisraster/postgisraster.h b/gdal-1.11.0/frmts/postgisraster/postgisraster.h --- a/gdal-1.11.0/frmts/postgisraster/postgisraster.h 2020-09-11 17:27:26.000000000 +0800 -+++ b/gdal-1.11.0/frmts/postgisraster/postgisraster.h 2022-07-26 10:42:35.516751810 +0800 ++++ b/gdal-1.11.0/frmts/postgisraster/postgisraster.h 2023-09-14 17:44:39.190414405 +0800 @@ -38,7 +38,7 @@ #define POSTGISRASTER_H_INCLUDED @@ -12,7 +12,7 @@ diff -uprN a/gdal-1.11.0/frmts/postgisraster/postgisraster.h b/gdal-1.11.0/frmts #include diff -uprN a/gdal-1.11.0/ogr/ogrsf_frmts/pg/ogr_pg.h b/gdal-1.11.0/ogr/ogrsf_frmts/pg/ogr_pg.h --- a/gdal-1.11.0/ogr/ogrsf_frmts/pg/ogr_pg.h 2020-09-11 17:27:26.000000000 +0800 -+++ b/gdal-1.11.0/ogr/ogrsf_frmts/pg/ogr_pg.h 2022-07-26 10:42:35.516751810 +0800 ++++ b/gdal-1.11.0/ogr/ogrsf_frmts/pg/ogr_pg.h 2023-09-14 17:44:39.190414405 +0800 @@ -32,7 +32,7 @@ #define _OGR_PG_H_INCLUDED @@ -24,7 +24,7 @@ diff -uprN a/gdal-1.11.0/ogr/ogrsf_frmts/pg/ogr_pg.h b/gdal-1.11.0/ogr/ogrsf_frm #include "ogrpgutility.h" diff -uprN a/gdal-1.11.0/ogr/ogrsf_frmts/pg/ogrpgutility.h b/gdal-1.11.0/ogr/ogrsf_frmts/pg/ogrpgutility.h --- a/gdal-1.11.0/ogr/ogrsf_frmts/pg/ogrpgutility.h 2020-09-11 17:27:26.000000000 +0800 -+++ b/gdal-1.11.0/ogr/ogrsf_frmts/pg/ogrpgutility.h 2022-07-26 10:42:35.516751810 +0800 ++++ b/gdal-1.11.0/ogr/ogrsf_frmts/pg/ogrpgutility.h 2023-09-14 17:44:39.190414405 +0800 @@ -30,7 +30,7 @@ #ifndef OGRPGUTILITY_H_INCLUDED #define OGRPGUTILITY_H_INCLUDED @@ -36,7 +36,7 @@ diff -uprN a/gdal-1.11.0/ogr/ogrsf_frmts/pg/ogrpgutility.h b/gdal-1.11.0/ogr/ogr int bMultipleCommandAllowed = FALSE); diff -uprN a/postgis-2.4.2/configure b/postgis-2.4.2/configure --- a/postgis-2.4.2/configure 2020-09-11 17:27:26.000000000 +0800 -+++ b/postgis-2.4.2/configure 2022-07-26 10:43:36.516751810 +0800 ++++ b/postgis-2.4.2/configure 2023-09-14 17:44:39.193414430 +0800 @@ -13515,7 +13515,11 @@ if test "x$LIBLWGEOM_ONLY" = "xno"; then PGSQL_MINOR_VERSION=0 fi @@ -52,7 +52,7 @@ diff -uprN a/postgis-2.4.2/configure b/postgis-2.4.2/configure PGSQL_LIBDIR=`"$PG_CONFIG" --libdir` diff -uprN a/postgis-2.4.2/postgis--2.4.2.sql b/postgis-2.4.2/postgis--2.4.2.sql --- a/postgis-2.4.2/postgis--2.4.2.sql 2020-09-11 17:27:26.000000000 +0800 -+++ b/postgis-2.4.2/postgis--2.4.2.sql 2022-07-26 10:42:35.548751810 +0800 ++++ b/postgis-2.4.2/postgis--2.4.2.sql 2023-09-14 17:44:39.204414523 +0800 @@ -1720,7 +1720,7 @@ CREATE TABLE spatial_ref_sys ( auth_srid integer, srtext varchar(2048), @@ -244,15 +244,32 @@ diff -uprN a/postgis-2.4.2/postgis--2.4.2.sql b/postgis-2.4.2/postgis--2.4.2.sql --------------------------------------------------------------- -- 3D-functions --------------------------------------------------------------- +diff -uprN a/postgis-2.4.2/postgis_raster--2.4.2.sql b/postgis-2.4.2/postgis_raster--2.4.2.sql +--- a/postgis-2.4.2/postgis_raster--2.4.2.sql 2020-09-11 17:27:26.000000000 +0800 ++++ b/postgis-2.4.2/postgis_raster--2.4.2.sql 2023-09-14 17:46:32.729369686 +0800 +@@ -52,10 +52,11 @@ CREATE OR REPLACE FUNCTION raster_out(ra + -- Availability: 2.0.0 + CREATE TYPE raster ( + alignment = double, +- internallength = variable, ++ internallength = 8, ++ passedbyvalue = true, + input = raster_in, + output = raster_out, +- storage = extended ++ storage = plain + ); + + ------------------------------------------------------------------------------ diff -uprN a/postgis-2.4.2/postgis_svn_revision.h b/postgis-2.4.2/postgis_svn_revision.h --- a/postgis-2.4.2/postgis_svn_revision.h 2020-09-11 17:27:26.000000000 +0800 -+++ b/postgis-2.4.2/postgis_svn_revision.h 2022-07-26 10:42:35.532751810 +0800 ++++ b/postgis-2.4.2/postgis_svn_revision.h 2023-09-14 17:44:39.206414540 +0800 @@ -1 +1 @@ -#define POSTGIS_SVN_REVISION "2.1.1" +#define POSTGIS_SVN_REVISION '2.1.1' diff -uprN a/postgis-2.4.2/raster/rt_pg/rtpostgis.c b/postgis-2.4.2/raster/rt_pg/rtpostgis.c --- a/postgis-2.4.2/raster/rt_pg/rtpostgis.c 2020-09-11 17:27:26.000000000 +0800 -+++ b/postgis-2.4.2/raster/rt_pg/rtpostgis.c 2022-07-26 10:42:35.532751810 +0800 ++++ b/postgis-2.4.2/raster/rt_pg/rtpostgis.c 2023-09-14 17:44:39.206414540 +0800 @@ -135,7 +135,7 @@ //#include "utils/memutils.h" @@ -280,7 +297,7 @@ diff -uprN a/postgis-2.4.2/raster/rt_pg/rtpostgis.c b/postgis-2.4.2/raster/rt_pg diff -uprN a/postgis-2.4.2/topology/Makefile.in b/postgis-2.4.2/topology/Makefile.in --- a/postgis-2.4.2/topology/Makefile.in 2020-09-11 17:27:26.000000000 +0800 -+++ b/postgis-2.4.2/topology/Makefile.in 2022-07-26 10:42:35.532751810 +0800 ++++ b/postgis-2.4.2/topology/Makefile.in 2023-09-14 17:44:39.206414540 +0800 @@ -64,6 +64,7 @@ PGXS := @PGXS@ # http://www.postgresql.org/message-id/CAB7nPqTsR5o3g-fBi6jbsVdhfPiLFWQ_0cGU5=94Rv_8W3qvFA@mail.gmail.com NO_TEMP_INSTALL=yes @@ -291,7 +308,7 @@ diff -uprN a/postgis-2.4.2/topology/Makefile.in b/postgis-2.4.2/topology/Makefil PERL=@PERL@ diff -uprN a/postgis-2.4.2/topology/postgis_topology.c b/postgis-2.4.2/topology/postgis_topology.c --- a/postgis-2.4.2/topology/postgis_topology.c 2020-09-11 17:27:26.000000000 +0800 -+++ b/postgis-2.4.2/topology/postgis_topology.c 2022-07-26 10:42:35.532751810 +0800 ++++ b/postgis-2.4.2/topology/postgis_topology.c 2023-09-14 17:44:39.207414548 +0800 @@ -22,6 +22,7 @@ #include "funcapi.h" /* for FuncCallContext */ #include "executor/spi.h" /* this is what you need to work with SPI */ @@ -527,7 +544,7 @@ diff -uprN a/postgis-2.4.2/topology/postgis_topology.c b/postgis-2.4.2/topology/ { diff -uprN a/postgis-2.4.2/topology/sql/topogeometry/totopogeom.sql.in b/postgis-2.4.2/topology/sql/topogeometry/totopogeom.sql.in --- a/postgis-2.4.2/topology/sql/topogeometry/totopogeom.sql.in 2020-09-11 17:27:26.000000000 +0800 -+++ b/postgis-2.4.2/topology/sql/topogeometry/totopogeom.sql.in 2022-07-26 10:42:35.532751810 +0800 ++++ b/postgis-2.4.2/topology/sql/topogeometry/totopogeom.sql.in 2023-09-14 17:44:39.207414548 +0800 @@ -199,7 +199,7 @@ BEGIN 'Layer "%" of topology "%" is %, cannot hold a collection feature.', layer_info.layer_id, topology_info.name, layer_info.typename; @@ -566,7 +583,7 @@ diff -uprN a/postgis-2.4.2/topology/sql/topogeometry/totopogeom.sql.in b/postgis RAISE EXCEPTION diff -uprN a/postgis-2.4.2/topology/sql/topogeometry/type.sql.in b/postgis-2.4.2/topology/sql/topogeometry/type.sql.in --- a/postgis-2.4.2/topology/sql/topogeometry/type.sql.in 2020-09-11 17:27:26.000000000 +0800 -+++ b/postgis-2.4.2/topology/sql/topogeometry/type.sql.in 2022-07-26 10:42:35.532751810 +0800 ++++ b/postgis-2.4.2/topology/sql/topogeometry/type.sql.in 2023-09-14 17:44:39.207414548 +0800 @@ -24,10 +24,10 @@ CREATE OR REPLACE FUNCTION topology.Geom AS $$ @@ -599,7 +616,7 @@ diff -uprN a/postgis-2.4.2/topology/sql/topogeometry/type.sql.in b/postgis-2.4.2 $$ diff -uprN a/postgis-2.4.2/topology/topology.sql.in b/postgis-2.4.2/topology/topology.sql.in --- a/postgis-2.4.2/topology/topology.sql.in 2020-09-11 17:27:26.000000000 +0800 -+++ b/postgis-2.4.2/topology/topology.sql.in 2022-07-26 10:42:35.532751810 +0800 ++++ b/postgis-2.4.2/topology/topology.sql.in 2023-09-14 17:44:39.208414557 +0800 @@ -340,7 +340,7 @@ CREATE TYPE topology.TopoGeometry AS ( topology_id integer, layer_id integer, -- Gitee