(#15386) gdal < 3.5 : conan v2 support

* conan v2 support * needs conan >= 1.58 for proper implementation of NMakeDeps
conan-io · Feb 13, 2023 · 45e349e · 45e349e
1 parent 8de4be2
commit 45e349e
Show file tree

Hide file tree

Showing 6 changed files with 415 additions and 435 deletions.
diff --git a/recipes/gdal/pre_3.5.0/conandata.yml b/recipes/gdal/pre_3.5.0/conandata.yml
@@ -17,60 +17,33 @@ sources:
 patches:
   "3.4.3":
     - patch_file: "patches/3.4.x/fix-autotools-3.4.3.patch"
-      base_path: "source_subfolder"
     - patch_file: "patches/3.4.x/fix-nmake.patch"
-      base_path: "source_subfolder"
     - patch_file: "patches/3.4.x/fix-include-jsonc-3.4.3.patch"
-      base_path: "source_subfolder"
     - patch_file: "patches/3.4.x/fix-include-xerces.patch"
-      base_path: "source_subfolder"
     - patch_file: "patches/3.4.x/fix-include-podofo.patch"
-      base_path: "source_subfolder"
   "3.4.1":
     - patch_file: "patches/3.4.x/fix-autotools-3.4.1.patch"
-      base_path: "source_subfolder"
     - patch_file: "patches/3.4.x/fix-nmake.patch"
-      base_path: "source_subfolder"
     - patch_file: "patches/3.4.x/fix-include-jsonc-3.4.1.patch"
-      base_path: "source_subfolder"
     - patch_file: "patches/3.4.x/fix-include-xerces.patch"
-      base_path: "source_subfolder"
     - patch_file: "patches/3.4.x/fix-include-podofo.patch"
-      base_path: "source_subfolder"
   "3.3.3":
     - patch_file: "patches/3.3.x/fix-autotools-3.3.3.patch"
-      base_path: "source_subfolder"
     - patch_file: "patches/3.3.x/fix-nmake.patch"
-      base_path: "source_subfolder"
     - patch_file: "patches/3.3.x/fix-include-jsonc.patch"
-      base_path: "source_subfolder"
     - patch_file: "patches/3.3.x/fix-include-xerces.patch"
-      base_path: "source_subfolder"
     - patch_file: "patches/3.3.x/fix-include-podofo.patch"
-      base_path: "source_subfolder"
   "3.2.3":
     - patch_file: "patches/3.2.x/fix-autotools.patch"
-      base_path: "source_subfolder"
     - patch_file: "patches/3.2.x/fix-nmake.patch"
-      base_path: "source_subfolder"
     - patch_file: "patches/3.2.x/fix-include-jsonc.patch"
-      base_path: "source_subfolder"
     - patch_file: "patches/3.2.x/fix-include-xerces.patch"
-      base_path: "source_subfolder"
     - patch_file: "patches/3.2.x/fix-include-podofo.patch"
-      base_path: "source_subfolder"
   "3.1.4":
     - patch_file: "patches/3.1.x/fix-autotools-3.1.4.patch"
-      base_path: "source_subfolder"
     - patch_file: "patches/3.1.x/fix-nmake-common.patch"
-      base_path: "source_subfolder"
     - patch_file: "patches/3.1.x/fix-nmake-opt-3.1.2.patch"
-      base_path: "source_subfolder"
     - patch_file: "patches/3.1.x/fix-import-dll-msvc.patch"
-      base_path: "source_subfolder"
     - patch_file: "patches/3.1.x/fix-include-jsonc.patch"
-      base_path: "source_subfolder"
     - patch_file: "patches/3.1.x/fix-include-xerces-3.1.2.patch"
-      base_path: "source_subfolder"
     - patch_file: "patches/3.1.x/fix-include-podofo.patch"
-      base_path: "source_subfolder"