[postgis] 01/04: Add patch to fix test failures on big endian architectures.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Sun Oct 4 17:57:41 UTC 2015 

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch experimental
in repository postgis.

commit ab9ee28fb06773c33d952950e13773237ea160d9
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Oct 4 18:10:27 2015 +0200

    Add patch to fix test failures on big endian architectures.
---
 debian/changelog                                  |  1 +
 debian/patches/big-endian-regress-lowercase.patch | 35 +++++++++++++++++++++++
 debian/patches/big-endian-regress.patch           | 35 +++++++++++++++++++++++
 debian/patches/series                             |  2 ++
 4 files changed, 73 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9f2da36..f2a3364 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ postgis (2.2.0~rc1+dfsg-1~exp2) UNRELEASED; urgency=medium
 
   [ Bas Couwenberg ]
   * Drop add-lm-for-liblwgeom.patch, fixed upstream.
+  * Add patch to fix test failures on big endian architectures.
 
  -- Markus Wanner <markus at bluegap.ch>  Sat, 26 Sep 2015 16:15:33 +0200
 
diff --git a/debian/patches/big-endian-regress-lowercase.patch b/debian/patches/big-endian-regress-lowercase.patch
new file mode 100644
index 0000000..5bf7c60
--- /dev/null
+++ b/debian/patches/big-endian-regress-lowercase.patch
@@ -0,0 +1,35 @@
+Description: Expect lowercase hex results
+Author: Bas Couwenberg <sebastic at debian.org>
+Bug: https://trac.osgeo.org/postgis/ticket/3314
+
+--- a/regress/sfcgal/regress_expected
++++ b/regress/sfcgal/regress_expected
+@@ -154,7 +154,7 @@ ERROR:  parse error - invalid geometry a
+ 148|LINESTRING(0 0,5 0,10 0)
+ 149|GEOMETRYCOLLECTION EMPTY
+ 150|SRID=6;GEOMETRYCOLLECTION(POLYGON((0 0,1 0,1 1,0 1,0 0)))
+-151|0103000020E61000000100000005000000000000000000000000000000000000000000000000000000000000000000F03F000000000000F03F000000000000F03F000000000000F03F000000000000000000000000000000000000000000000000
++151|0103000020e61000000100000005000000000000000000000000000000000000000000000000000000000000000000f03f000000000000f03f000000000000f03f000000000000f03f000000000000000000000000000000000000000000000000
+ 152|4326
+ 152.1|t
+ 152.2|4326
+@@ -167,7 +167,7 @@ ERROR:  parse error - invalid geometry a
+ 159|MULTIPOLYGON EMPTY
+ 160|MULTIPOINT(1 1)
+ 161|MULTILINESTRING((0 0,1 1),(2 2,3 3))
+-162|010200000003000000F771D98DE33826C00000000000004440F771D98DE33826C000000000008051400000000000805140F771D98DE33826C0
++162|010200000003000000f771d98de33826c00000000000004440f771d98de33826c000000000008051400000000000805140f771d98de33826c0
+ 163|POLYGON((0 0 0,1 0 0,1 1 0,0 1 0,0 0 0))
+ 164|POLYGON((0 0 0,1 0 0,1 1 0,0 1 0,0 0 1))
+ ERROR:  geometry contains non-closed rings
+--- a/regress/sfcgal/tickets_expected
++++ b/regress/sfcgal/tickets_expected
+@@ -114,7 +114,7 @@ NOTICE:  IllegalArgumentException: Inval
+ #687|f
+ #689|f
+ #690
+-010200000003000000F771D98DE33826C00000000000004440F771D98DE33826C000000000008051400000000000805140F771D98DE33826C0
++010200000003000000f771d98de33826c00000000000004440f771d98de33826c000000000008051400000000000805140f771d98de33826c0
+ #693a|POLYGON M ((-71.1319 42.2503 1,-71.132 42.2502 3,-71.1323 42.2504 -2,-71.1322 42.2505 1,-71.1319 42.2503 0))
+ #693b|POLYGON M ((-71.1319 42.2512 0,-71.1318 42.2511 20,-71.1317 42.2511 -20,-71.1317 42.251 5,-71.1317 42.2509 4,-71.132 42.2511 6,-71.1319 42.2512 30))
+ #694
diff --git a/debian/patches/big-endian-regress.patch b/debian/patches/big-endian-regress.patch
new file mode 100644
index 0000000..afaa0d1
--- /dev/null
+++ b/debian/patches/big-endian-regress.patch
@@ -0,0 +1,35 @@
+Description: Force output to little endian, #3314
+Author: Paul Ramsey <pramsey at cleverelephant.ca>
+Origin: https://trac.osgeo.org/postgis/changeset/14182
+
+--- a/regress/sfcgal/regress.sql
++++ b/regress/sfcgal/regress.sql
+@@ -246,7 +246,7 @@ select '149', ST_AsText(ST_segmentize('G
+ 
+ select '150', ST_AsEWKT(ST_ForceCollection(ST_setsrid('POLYGON((0 0, 1 0, 1 1, 0 1, 0 0))'::geometry, 6)));
+ 
+-select '151', ST_MakeEnvelope(0, 0, 1, 1, 4326);
++select '151', encode(ST_AsEWKB(ST_MakeEnvelope(0, 0, 1, 1, 4326),'ndr'),'hex');
+ select '152', ST_SRID(ST_MakeEnvelope(0, 0, 1, 1, 4326));
+ select '152.1', ST_SRID(ST_MakeEnvelope(0, 0, 1, 1)) = ST_SRID('POINT(0 0)'::geometry);
+ select '152.2', ST_SRID(ST_SetSRID(ST_MakeEnvelope(0, 0, 1, 1), 4326));
+@@ -260,7 +260,7 @@ select '158', ST_AsText(ST_CollectionExt
+ select '159', ST_AsText(ST_CollectionExtract('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(LINESTRING(0 0, 1 1), POINT(1 1)),LINESTRING(2 2, 3 3))',3));
+ select '160', ST_AsText(ST_CollectionExtract('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(LINESTRING(0 0, 1 1), POINT(1 1)),LINESTRING(2 2, 3 3))',1));
+ select '161', ST_AsText(ST_CollectionExtract('GEOMETRYCOLLECTION(GEOMETRYCOLLECTION(LINESTRING(0 0, 1 1), GEOMETRYCOLLECTION(POINT(1 1))),LINESTRING(2 2, 3 3))',2));
+-select '162', ST_MakeLine(ST_GeomFromText('POINT(-11.1111111 40)'),ST_GeomFromText('LINESTRING(-11.1111111 70,70 -11.1111111)')) As result;
++select '162', encode(ST_AsEWKB(ST_MakeLine(ST_GeomFromText('POINT(-11.1111111 40)'),ST_GeomFromText('LINESTRING(-11.1111111 70,70 -11.1111111)')),'ndr'),'hex') As result;
+ select '163', ST_AsEWKT('POLYGON((0 0 0, 1 0 0, 1 1 0, 0 1 0, 0 0 0))');
+ select '164', ST_AsEWKT('POLYGON((0 0 0, 1 0 0, 1 1 0, 0 1 0, 0 0 1))');
+ select '165', ST_AsEWKT('POLYGON((0 0 0, 1 0 0, 1 1 0, 0 1 0, 0 0.1 1))');
+--- a/regress/sfcgal/tickets.sql
++++ b/regress/sfcgal/tickets.sql
+@@ -374,7 +374,7 @@ SELECT '#689', ST_CoveredBy(ST_GeomFromT
+ 
+ -- #690 --
+ SELECT '#690';
+-SELECT ST_MakeLine(ST_GeomFromText('POINT(-11.1111111 40)'), ST_GeomFromText('LINESTRING(-11.1111111 70,70 -11.1111111)')) As result;
++SELECT encode(ST_AsEWKB(ST_MakeLine(ST_GeomFromText('POINT(-11.1111111 40)'), ST_GeomFromText('LINESTRING(-11.1111111 70,70 -11.1111111)')),'ndr'),'hex') As result;
+ 
+ -- #693 --
+ SELECT '#693a', ST_AsText(ST_GeomFromEWKT('SRID=4326;POLYGONM((-71.1319 42.2503 1,-71.132 42.2502 3,-71.1323 42.2504 -2,-71.1322 42.2505 1,-71.1319 42.2503 0))'));
diff --git a/debian/patches/series b/debian/patches/series
index e91775e..a3cd1d3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,5 @@ honor-build-flags
 fix-manpage
 de-translation
 fix-hurd-i386-ftbfs.patch
+big-endian-regress.patch
+big-endian-regress-lowercase.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/postgis.git

More information about the Pkg-grass-devel mailing list