Bas Couwenberg pushed to branch master at Debian GIS Project / postgis
Commits: 9b2e1e1b by Bas Couwenberg at 2021-03-20T14:27:02+01:00 Fix patch headers. - - - - - 4 changed files: - debian/patches/chaikin - debian/patches/fix-pj-get-release-error.patch - debian/patches/incorrect-path-for-interpreter.patch - debian/patches/relax-test-timing-constraints.patch Changes: ===================================== debian/patches/chaikin ===================================== @@ -1,20 +1,11 @@ -From: Christoph Berg <[email protected]> -Date: Fri, 19 Mar 2021 23:27:00 +0100 -Subject: Revert chaikin tests failing on ppc64el. - +Description: Revert chaikin tests failing on ppc64el. + Work around https://trac.osgeo.org/postgis/ticket/4533 +Author: Christoph Berg <[email protected]> Bug: https://trac.osgeo.org/postgis/ticket/4533 -Work around https://trac.osgeo.org/postgis/ticket/4533 ---- - regress/core/chaikin.sql | 7 ------- - regress/core/chaikin_expected | 1 - - 2 files changed, 8 deletions(-) - -diff --git a/regress/core/chaikin.sql b/regress/core/chaikin.sql -index 8bcd067..f799c71 100644 --- a/regress/core/chaikin.sql +++ b/regress/core/chaikin.sql -@@ -4,10 +4,3 @@ SELECT '3', ST_astext(ST_ChaikinSmoothing('LINESTRING(0 0, 8 8, 0 16)',0)); +@@ -4,10 +4,3 @@ SELECT '3', ST_astext(ST_ChaikinSmoothin SELECT '4', ST_astext(ST_ChaikinSmoothing('LINESTRING(0 0, 8 8, 0 16)',2)); SELECT '5', ST_astext(ST_ChaikinSmoothing('POINT(0 0)')); SELECT '6', ST_astext(ST_ChaikinSmoothing('GEOMETRYCOLLECTION(POINT(1 1), LINESTRING(1 1, 1 3, 1 5), POLYGON((5 5, 5 10, 10 10, 10 5, 5 5), (6 6, 6 7, 7 7, 7 6, 6 6 )))', 2, 't')); @@ -26,11 +17,9 @@ index 8bcd067..f799c71 100644 -) -SELECT '7', ST_AsText(g) as geometry, postgis_getbbox(g) AS box from geom; \ No newline at end of file -diff --git a/regress/core/chaikin_expected b/regress/core/chaikin_expected -index b6f2d34..b4d19f2 100644 --- a/regress/core/chaikin_expected +++ b/regress/core/chaikin_expected -@@ -4,4 +4,3 @@ ERROR: Number of iterations must be between 1 and 5 : LWGEOM_ChaikinSmoothing +@@ -4,4 +4,3 @@ ERROR: Number of iterations must be bet 4|LINESTRING(0 0,4.5 4.5,6 7,6 9,4.5 11.5,0 16) 5|POINT(0 0) 6|GEOMETRYCOLLECTION(POINT(1 1),LINESTRING(1 1,1 2.125,1 2.75,1 3.25,1 3.875,1 5),POLYGON((5 5,5 7.8125,5.3125 9.0625,5.9375 9.6875,6.875 10,8.125 10,9.0625 9.6875,9.6875 9.0625,10 8.125,10 6.875,9.6875 5.9375,9.0625 5.3125,7.8125 5,5 5),(6 6,6 6.5625,6.0625 6.8125,6.1875 6.9375,6.375 7,6.625 7,6.8125 6.9375,6.9375 6.8125,7 6.625,7 6.375,6.9375 6.1875,6.8125 6.0625,6.5625 6,6 6))) ===================================== debian/patches/fix-pj-get-release-error.patch ===================================== @@ -1,14 +1,9 @@ -From: Paul Ramsey <[email protected]> -Date: Fri, 19 Mar 2021 23:29:22 +0100 -Subject: fix_pj_get_release_error +Description: If pg_get_release is not present, test for proj_info instead when configuring. +Author: Paul Ramsey <[email protected]> +Origin: https://trac.osgeo.org/postgis/changeset/9522a6f869ee6d170d97e7c593d7e5d71ec02a9b/git +Bug: https://trac.osgeo.org/postgis/ticket/4860 +Bug-Debian: https://bugs.debian.org/983256 -Closes: #983256 ---- - configure.ac | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 1bc6cca..0712658 100644 --- a/configure.ac +++ b/configure.ac @@ -902,12 +902,15 @@ AC_SUBST([PROJ_LDFLAGS]) ===================================== debian/patches/incorrect-path-for-interpreter.patch ===================================== @@ -1,14 +1,7 @@ -From: Bas Couwenberg <[email protected]> -Date: Fri, 19 Mar 2021 23:27:00 +0100 -Subject: Fix incorrect-path-for-interpreter issue. - +Description: Fix incorrect-path-for-interpreter issue. +Author: Bas Couwenberg <[email protected]> Forwarded: not-needed ---- - utils/postgis_restore.pl.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/utils/postgis_restore.pl.in b/utils/postgis_restore.pl.in -index 8498c54..fdf437a 100644 --- a/utils/postgis_restore.pl.in +++ b/utils/postgis_restore.pl.in @@ -1,4 +1,4 @@ ===================================== debian/patches/relax-test-timing-constraints.patch ===================================== @@ -1,20 +1,10 @@ -From: Markus Wanner <[email protected]> -Date: Fri, 19 Mar 2021 23:27:00 +0100 -Subject: Relax timing constraints for some tests. - +Description: Relax timing constraints for some tests. + With a statement_timeout of 100ms, increase the allowed _timecheck interval + from 200ms or 250ms to 500ms. This should increase chances of tests passing + even on busy or slow systems. +Author: Markus Wanner <[email protected]> Forwarded: not-needed -With a statement_timeout of 100ms, increase the allowed _timecheck interval -from 200ms or 250ms to 500ms. This should increase chances of tests passing -even on busy or slow systems. ---- - regress/core/interrupt.sql | 2 +- - regress/core/interrupt_buffer.sql | 2 +- - regress/core/interrupt_relate.sql | 16 ++++++++-------- - 3 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/regress/core/interrupt.sql b/regress/core/interrupt.sql -index e44c760..b5d52b1 100644 --- a/regress/core/interrupt.sql +++ b/regress/core/interrupt.sql @@ -24,7 +24,7 @@ $$ LANGUAGE 'plpgsql' VOLATILE; @@ -26,11 +16,9 @@ index e44c760..b5d52b1 100644 SET statement_timeout TO 0; -- Not affected by old timeout SELECT '1',ST_AsText(ST_Segmentize('LINESTRING(0 0,4 0)'::geometry, 2)); -diff --git a/regress/core/interrupt_buffer.sql b/regress/core/interrupt_buffer.sql -index e45db0c..2cbf1e3 100644 --- a/regress/core/interrupt_buffer.sql +++ b/regress/core/interrupt_buffer.sql -@@ -36,7 +36,7 @@ select ST_Buffer(g,100) from _inputs WHERE id = 1; +@@ -36,7 +36,7 @@ select ST_Buffer(g,100) from _inputs WHE --( select (st_dumppoints(st_buffer(st_makepoint(0,0),10000,100000))).geom g) foo; -- it may take some more to interrupt st_buffer, see -- https://travis-ci.org/postgis/postgis/builds/40211116#L2222-L2223 @@ -39,11 +27,9 @@ index e45db0c..2cbf1e3 100644 -- Not affected by old timeout SELECT '1', ST_NPoints(ST_Buffer('POINT(4 0)'::geometry, 2, 1)); -diff --git a/regress/core/interrupt_relate.sql b/regress/core/interrupt_relate.sql -index 0fd2b47..2a13204 100644 --- a/regress/core/interrupt_relate.sql +++ b/regress/core/interrupt_relate.sql -@@ -34,29 +34,29 @@ UPDATE _time SET t = now(); -- reset time as creating tables spends some +@@ -34,29 +34,29 @@ UPDATE _time SET t = now(); -- reset tim SET statement_timeout TO 100; select ST_Contains(g,g) from _inputs WHERE id = 1; -- 6+ seconds View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/-/commit/9b2e1e1b6a0d8774bd610009101f11869d4441ce -- View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/-/commit/9b2e1e1b6a0d8774bd610009101f11869d4441ce You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
