From 4f90e57fa1cac7afdd57e5f649775cb24aa15612 Mon Sep 17 00:00:00 2001
From: Bas Couwenberg <sebastic@xs4all.nl>
Date: Fri, 1 Dec 2023 08:23:20 +0100
Subject: [PATCH] Fix test failure with PROJ 9.3.1.

Closes: #104
---
https://github.com/OSGeo/libgeotiff/pull/105

 test/testlistgeo | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/test/testlistgeo b/test/testlistgeo
index 48e92eb..4331cc3 100755
--- a/test/testlistgeo
+++ b/test/testlistgeo
@@ -218,6 +218,11 @@ echo "" >>${OUT}
 sed "s/ETRS89-extended/ETRS89/g" < ${OUT} > ${OUT}.tmp
 mv ${OUT}.tmp ${OUT}
 
+sed "s/Projection = 15914 (BLM zone 14N (US survey .*))/Projection = 15914 (BLM zone 14N)/g" < ${OUT} > ${OUT}.tmp
+mv ${OUT}.tmp ${OUT}
+sed "s/Projection = 6753 (Oregon Columbia River West zone (.*))/Projection = 6753 (Oregon Columbia River West zone)/" < ${OUT} > ${OUT}.tmp
+mv ${OUT}.tmp ${OUT}
+
 sed "s/ETRS89-extended/ETRS89/g" < ${TEST_CLI_DIR}/testlistgeo_out.dist > testlistgeo_out.dist.normalized
 
 sed "s/GCS: 4053\/Unspecified datum based upon the International 1924 Authalic Sphere/GCS: 10346\/NSIDC Authalic Sphere/g" < ${OUT} > ${OUT}.tmp
@@ -230,6 +235,11 @@ mv testlistgeo_out.dist.normalized.tmp testlistgeo_out.dist.normalized
 sed "s/Datum: 6053\/Not specified (based on International 1924 Authalic Sphere)/Datum: 1360\/NSIDC International 1924 Authalic Sphere/g" < testlistgeo_out.dist.normalized > testlistgeo_out.dist.normalized.tmp
 mv testlistgeo_out.dist.normalized.tmp testlistgeo_out.dist.normalized
 
+sed "s/Projection = 15914 (BLM zone 14N (US survey .*))/Projection = 15914 (BLM zone 14N)/" < testlistgeo_out.dist.normalized > testlistgeo_out.dist.normalized.tmp
+mv testlistgeo_out.dist.normalized.tmp testlistgeo_out.dist.normalized
+sed "s/Projection = 6753 (Oregon Columbia River West zone (.*))/Projection = 6753 (Oregon Columbia River West zone)/" < testlistgeo_out.dist.normalized > testlistgeo_out.dist.normalized.tmp
+mv testlistgeo_out.dist.normalized.tmp testlistgeo_out.dist.normalized
+
 # do 'diff' with distribution results
 # after cleaning for avoid spurios result due 
 # to different build dir
<a href='/guix/log/tests/hackage.scm?id=0ef8afe1e1e48f9a5e0b695d4cc41ff73dfba917'>hackage.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/hackage.scm?id=0ef8afe1e1e48f9a5e0b695d4cc41ff73dfba917&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-12-03 16:15:29 +0100'>2023-12-03</span></td><td><a href='/guix/commit/tests/hackage.scm?id=ab8612d99eca5c25ecbefe026b04ed9f00e3f8b5'>guix: import: Fix parsing Cabal files that import many stanzas</a><span class='msg-avail'>...<span class='msg-tooltip'>* guix/import/cabal.scm (eval-cabal)[eval]: Split imports to a
normalized list before mapping over it.
* tests/hackage.scm: Test it.

Change-Id: I39ece019251b6a23a937c8562d2d4a545a6bc7df
Signed-off-by: Lars-Dominik Braun &lt;lars@6xq.net&gt;
</span></span></td><td>Saku Laesvuori</td></tr>
<tr><td><span title='2023-12-03 09:11:29 +0100'>2023-12-03</span></td><td><a href='/guix/commit/tests/hackage.scm?id=5bd00bb54235856dddd11e9f0d03481c5469ca63'>guix: import: Parse cabal layout blocks correctly</a><span class='msg-avail'>...<span class='msg-tooltip'>Cabal consideres lines to be part of a layout block if they are indented
at least one space more than the field line the block belongs to.
Previously Guix considered lines to be a part of the block if they were
indented at least as much as the first line in it.

This also makes a workaround that enabled if statements to have multiple
elses redundant and removes it.

Fixes: https://issues.guix.gnu.org/35743

* guix/import/cabal.scm (current-indentation*): Renamed from
current-indentation.
(previous-indentation, current-indentation): New variables.
(make-cabal-parser): Remove outdated comment.
[open]: Use previous-indentation + 1 instead of
current-indentation.
[elif-else]: Split to elif and else to allow only one ELSE in an if
statement.
(read-cabal)[parameterize]: Use current-indentation* and previous-indentation.
* tests/hackage.scm (hackage-&gt;guix-package test mixed layout): Expect to
  pass.

Change-Id: I3a1495b1588a022fabbfe8dad9f3231e578af4f3
Signed-off-by: Lars-Dominik Braun &lt;lars@6xq.net&gt;
</span></span></td><td>Saku Laesvuori</td></tr>