From bcb75ee2569d6aef24a2d3e1c590d6c6ddb181f2 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Fri, 13 Dec 2024 03:00:22 +0100 Subject: [PATCH] Update ci/travis/conda/libgdal-adbc.patch (again) --- ci/travis/conda/libgdal-adbc.patch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ci/travis/conda/libgdal-adbc.patch b/ci/travis/conda/libgdal-adbc.patch index 12ac334818fe..568ef711fe9d 100644 --- a/ci/travis/conda/libgdal-adbc.patch +++ b/ci/travis/conda/libgdal-adbc.patch @@ -27,10 +27,10 @@ index ddc8ae6..0e6c07e 100644 -DBUILD_JAVA_BINDINGS:BOOL=OFF \ -DBUILD_CSHARP_BINDINGS:BOOL=OFF \ diff --git a/recipe/meta.yaml b/recipe/meta.yaml -index f1d0c48..39ddb31 100644 +index f1d0c48..68e2ca4 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml -@@ -678,6 +678,52 @@ outputs: +@@ -678,6 +678,53 @@ outputs: license: MIT license_file: LICENSE.TXT @@ -63,6 +63,7 @@ index f1d0c48..39ddb31 100644 + # GH992 attempt to workaround dep solver picking wrong libxml2 + - icu # [not win] + - libkml-devel ++ - liblzma-devel + - expat + - libadbc-driver-manager + # dep solver issue