[Git][debian-gis-team/postgis][master] 2 commits: Add upstream patch to fix test failures with GEOS 3.10.0.

[Bas Couwenberg (@sebastic)]

Bas Couwenberg pushed to branch master at Debian GIS Project / postgis


Commits:
b8c4866f by Bas Couwenberg at 2021-10-21T06:25:58+02:00
Add upstream patch to fix test failures with GEOS 3.10.0.

- - - - -
741a5eac by Bas Couwenberg at 2021-10-21T06:26:14+02:00
Set distribution to unstable.

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/0001-Round-off-some-regression-results-to-avoid-spurious-.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+postgis (3.1.4+dfsg-3) unstable; urgency=medium
+
+  * Add upstream patch to fix test failures with GEOS 3.10.0.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Thu, 21 Oct 2021 06:25:59 +0200
+
 postgis (3.1.4+dfsg-2) unstable; urgency=medium
 
   * Bump Standards-Version to 4.6.0, no changes.


=====================================
debian/patches/0001-Round-off-some-regression-results-to-avoid-spurious-.patch
=====================================
@@ -0,0 +1,46 @@
+Description: Round off some regression results to avoid spurious regression test failures under the latest GEOS release.
+Author: Paul Ramsey <pramsey at cleverelephant.ca>
+Origin: https://git.osgeo.org/gitea/postgis/postgis/commit/ec7f996bc9537919ea900f2517ab6ceae78c2b70
+Bug: https://lists.osgeo.org/pipermail/geos-devel/2021-October/010434.html
+
+--- a/regress/core/regress_buffer_params.sql
++++ b/regress/core/regress_buffer_params.sql
+@@ -5,7 +5,7 @@
+ 
+ -- Ouput is snapped to grid to account for small floating numbers
+ -- differences between architectures
+-SELECT 'point quadsegs=2', ST_AsText(st_buffer('POINT(0 0)', 1, 'quad_segs=2'), 4);
++SELECT 'point quadsegs=2', ST_AsText(ST_SnapToGrid(st_buffer('POINT(0 0)', 1, 'quad_segs=2'),0.0001), 4);
+ SELECT 'line quadsegs=2', ST_AsText(st_buffer('LINESTRING(0 0, 10 0)', 2, 'quad_segs=2'), 3);
+ SELECT 'line quadsegs=2 endcap=flat', ST_AsText(st_buffer('LINESTRING(0 0, 10 0)', 2, 'quad_segs=2 endcap=flat'), 5);
+ SELECT 'line quadsegs=2 endcap=butt', ST_AsText(st_buffer('LINESTRING(0 0, 10 0)', 2, 'quad_segs=2 endcap=butt'), 5);
+--- a/regress/core/regress_buffer_params_expected
++++ b/regress/core/regress_buffer_params_expected
+@@ -1,4 +1,4 @@
+-point quadsegs=2|POLYGON((1 0,0.7071 -0.7071,1.6155e-15 -1,-0.7071 -0.7071,-1 -3.2311e-15,-0.7071 0.7071,-4.6246e-15 1,0.7071 0.7071,1 0))
++point quadsegs=2|POLYGON((1 0,0.7071 -0.7071,0 -1,-0.7071 -0.7071,-1 0,-0.7071 0.7071,0 1,0.7071 0.7071,1 0))
+ line quadsegs=2|POLYGON((10 2,11.414 1.414,12 0,11.414 -1.414,10 -2,0 -2,-1.414 -1.414,-2 2.449e-16,-1.414 1.414,0 2,10 2))
+ line quadsegs=2 endcap=flat|POLYGON((10 2,10 -2,0 -2,0 2,10 2))
+ line quadsegs=2 endcap=butt|POLYGON((10 2,10 -2,0 -2,0 2,10 2))
+--- a/regress/core/tickets.sql
++++ b/regress/core/tickets.sql
+@@ -311,7 +311,7 @@ SELECT '#650', ST_AsText(ST_Collect(ARRA
+ --SELECT '#662', ST_MakePolygon(ST_AddPoint(ST_AddPoint(ST_MakeLine(ST_SetSRID(ST_MakePointM(i+m,j,m),4326),ST_SetSRID(ST_MakePointM(j+m,i-m,m),4326)),ST_SetSRID(ST_MakePointM(i,j,m),4326)),ST_SetSRID(ST_MakePointM(i+m,j,m),4326))) As the_geom FROM generate_series(-10,50,20) As i CROSS JOIN generate_series(50,70, 20) As j CROSS JOIN generate_series(1,2) As m ORDER BY i, j, m, i*j*m LIMIT 1;
+ 
+ -- #667 --
+-SELECT '#667', ST_AsEWKT(ST_LineToCurve(ST_Buffer(ST_SetSRID(ST_Point(i,j),4326), j))) As the_geom FROM generate_series(-10,50,10) As i CROSS JOIN generate_series(40,70, 20) As j ORDER BY i, j, i*j LIMIT 1;
++SELECT '#667', ST_AsText(ST_LineToCurve(ST_Buffer(ST_SetSRID(ST_Point(i,j),4326), j)),4) As geom FROM generate_series(-10,50,10) As i CROSS JOIN generate_series(40,70, 20) As j ORDER BY i, j, i*j LIMIT 1;
+ 
+ -- #677 --
+ SELECT '#677.deprecated',round(ST_DistanceSpheroid(ST_GeomFromEWKT('MULTIPOLYGON(((-10 40,-10 55,-10 70,5 40,-10 40)))'), ST_GeomFromEWKT('MULTIPOINT(20 40,20 55,20 70,35 40,35 55,35 70,50 40,50 55,50 70)'), 'SPHEROID["GRS_1980",6378137,298.257222101]')) As result;
+--- a/regress/core/tickets_expected
++++ b/regress/core/tickets_expected
+@@ -93,7 +93,7 @@ NOTICE:  IllegalArgumentException: Inval
+ #835.11|MULTILINESTRING EMPTY
+ #835.12|MULTIPOLYGON EMPTY
+ #650|MULTIPOINT(0 0,1 1,2 2)
+-#667|SRID=4326;CURVEPOLYGON(CIRCULARSTRING(30 40,-50 39.99999999999987,30 40))
++#667|CURVEPOLYGON(CIRCULARSTRING(30 40,-50 40,30 40))
+ #677.deprecated|1121395
+ #677|1121395
+ #680|01d107000000000000000024c000000000000049400000000000000040


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@ relax-test-timing-constraints.patch
 chaikin
 incorrect-path-for-interpreter.patch
 0001-Revert-Harmonize-with-old-behaviour.patch
+0001-Round-off-some-regression-results-to-avoid-spurious-.patch



View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/-/compare/cd1fd4914f3517539f9bc6892b4815cdac1071bd...741a5eac1303ece3346bd55f8c9c9b300ece0b9b

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/postgis/-/compare/cd1fd4914f3517539f9bc6892b4815cdac1071bd...741a5eac1303ece3346bd55f8c9c9b300ece0b9b
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20211021/001d8cb4/attachment-0001.htm>