gnu: Add kafs-client
[jackhill/guix/guix.git] / gnu / packages / patches / libgeotiff-adapt-test-script-for-proj-6.2.patch
CommitLineData
f9d32883
AI
1From 678ffd97db2d63cf6856428bea65a93e069f812f Mon Sep 17 00:00:00 2001
2From: Even Rouault <even.rouault@spatialys.com>
3Date: Wed, 4 Sep 2019 16:11:37 +0200
4Subject: [PATCH 1/2] Adapt test script for PROJ 6.2 EPSG database (fixes #22)
5
6---
7 libgeotiff/test/testlistgeo | 8 +++++++-
8 libgeotiff/test/testlistgeo_out.dist | 4 ++--
9 2 files changed, 9 insertions(+), 3 deletions(-)
10
11diff --git a/libgeotiff/test/testlistgeo b/libgeotiff/test/testlistgeo
12index 7fb4a2f..571f5d0 100755
13--- a/test/testlistgeo
14+++ b/test/testlistgeo
15@@ -210,10 +210,15 @@ echo "Testing listgeo equidistant_cylindrical.tif" >> ${OUT}
16 $EXE ${DATA_DIR}/equidistant_cylindrical.tif >>${OUT}
17 echo "" >>${OUT}
18
19+# Normalize for results depending on the exact version of PROJ / EPSG database
20+sed "s/ETRS89-extended/ETRS89/g" < ${OUT} > ${OUT}.tmp
21+mv ${OUT}.tmp ${OUT}
22+
23+sed "s/ETRS89-extended/ETRS89/g" < ${TEST_CLI_DIR}/testlistgeo_out.dist > testlistgeo_out.dist.tmp
24
25 # do 'diff' with distribution results
26 echo "diff ${OUT} with testlistgeo_out.dist"
27-diff -u ${OUT} ${TEST_CLI_DIR}/testlistgeo_out.dist
28+diff -u ${OUT} testlistgeo_out.dist.tmp
29 if [ $? -ne 0 ] ; then
30 echo ""
31 echo "PROBLEMS HAVE OCCURRED"
32@@ -224,6 +229,7 @@ else
33 echo "TEST OK"
34 echo "test file ${OUT} removed"
35 echo
36+ rm testlistgeo_out.dist.tmp
37 /bin/rm -f ${OUT}
38 exit 0
39 fi
40diff --git a/libgeotiff/test/testlistgeo_out.dist b/libgeotiff/test/testlistgeo_out.dist
41index 68a948c..c157f00 100644
42--- a/test/testlistgeo_out.dist
43+++ b/test/testlistgeo_out.dist
44@@ -1738,11 +1738,11 @@ Geotiff_Information:
45 Keyed_Information:
46 GTModelTypeGeoKey (Short,1): ModelTypeProjected
47 GTRasterTypeGeoKey (Short,1): RasterPixelIsArea
48- ProjectedCSTypeGeoKey (Short,1): Code-3035 (ETRS89 / LAEA Europe)
49+ ProjectedCSTypeGeoKey (Short,1): Code-3035 (ETRS89-extended / LAEA Europe)
50 End_Of_Keys.
51 End_Of_Geotiff.
52
53-PCS = 3035 (ETRS89 / LAEA Europe)
54+PCS = 3035 (ETRS89-extended / LAEA Europe)
55 Projection = 19986 (Europe Equal Area 2001)
56 Projection Method: CT_LambertAzimEqualArea
57 ProjCenterLatGeoKey: 52.000000 ( 52d 0' 0.00"N)
58
59From 15af10648c4cb7b4c55cbe08caaf9884c1d156d9 Mon Sep 17 00:00:00 2001
60From: Even Rouault <even.rouault@spatialys.com>
61Date: Wed, 4 Sep 2019 19:13:11 +0200
62Subject: [PATCH 2/2] appveyor.yml: build vcpkg from source to fix issue with
63 VS2015