From 2bc18d8892db8a4e8a7e2b75020dde96935103f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 17 Sep 2026 10:16:48 -0700 Subject: [PATCH] gdal: fix tests with PROJ 9.9.0 --- pkgs/by-name/gd/gdal/package.nix | 5 ++++ pkgs/by-name/gd/gdal/proj-9.9.0-compat.patch | 29 ++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/by-name/gd/gdal/proj-9.9.0-compat.patch diff --git a/pkgs/by-name/gd/gdal/package.nix b/pkgs/by-name/gd/gdal/package.nix index bc92f8925726..9fb0081b3197 100644 --- a/pkgs/by-name/gd/gdal/package.nix +++ b/pkgs/by-name/gd/gdal/package.nix @@ -92,6 +92,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-8rTCv0Nsb+BhRypwXDY5SWP7Bo1vqJBlm7y6YCOMa2M="; }; + patches = [ + # https://github.com/OSGeo/gdal/pull/15259 + ./proj-9.9.0-compat.patch + ]; + nativeBuildInputs = [ bison cmake diff --git a/pkgs/by-name/gd/gdal/proj-9.9.0-compat.patch b/pkgs/by-name/gd/gdal/proj-9.9.0-compat.patch new file mode 100644 index 000000000000..97a338f4b698 --- /dev/null +++ b/pkgs/by-name/gd/gdal/proj-9.9.0-compat.patch @@ -0,0 +1,29 @@ +diff --git a/autotest/utilities/test_gdalalg_mdim_info.py b/autotest/utilities/test_gdalalg_mdim_info.py +index 33b87f60fc..63c283b350 100755 +--- a/autotest/utilities/test_gdalalg_mdim_info.py ++++ b/autotest/utilities/test_gdalalg_mdim_info.py +@@ -180,7 +180,14 @@ def test_gdalalg_mdim_info_all_options(): + def test_gdalalg_mdim_info_binary(gdal_path): + + out = gdaltest.runexternal(f"{gdal_path} mdim info ../gdrivers/data/netcdf/byte.nc") +- assert json.loads(out) == { ++ ++ info = json.loads(out) ++ ++ # make PROJ 9.9.0 output equivalent to previous versions (#15250) ++ srs = info["arrays"]["Band1"]["srs"] ++ srs["wkt"] = srs["wkt"].replace("(E)", "easting").replace("(N)", "northing") ++ ++ expected = { + "arrays": { + "Band1": { + "attributes": { +@@ -313,6 +320,8 @@ def test_gdalalg_mdim_info_binary(gdal_path): + "type": "group", + } + ++ assert info == expected ++ + + def test_gdalalg_mdim_info_completion_array_invalid_ds(gdal_path): +