Skip to content

Commit

Permalink
(#22204) Gdal: Fix conflicts
Browse files Browse the repository at this point in the history
* gdal: remove dead code

* bump deps

* remove outdated versions

* unbump flatbuffers

* Update conanfile.py

* add a workaround for NMakeDeps quoting issues

conan-io/conan#13603

Stolen from @valgur

* unbump maintained recipes

* fix conflicts

with libgeotiff, libtiff, proj

* Update conanfile.py

* use version range for expat

* revert migration to f-strings

to reduce the scope of the change, the potential for regression, and ease review

* restore 3.4.1

* fix line endings

* Update recipes/gdal/pre_3.5.0/conanfile.py

Co-authored-by: Uilian Ries <uilianries@gmail.com>

---------

Co-authored-by: Uilian Ries <uilianries@gmail.com>
  • Loading branch information
ericLemanissier and uilianries authored May 13, 2024
1 parent 680a470 commit 2ba424b
Show file tree
Hide file tree
Showing 8 changed files with 43 additions and 788 deletions.
2 changes: 0 additions & 2 deletions recipes/gdal/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,3 @@ versions:
folder: "pre_3.5.0"
"3.4.1":
folder: "pre_3.5.0"
"3.3.3":
folder: "pre_3.5.0"
9 changes: 0 additions & 9 deletions recipes/gdal/pre_3.5.0/conandata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ sources:
"3.4.1":
url: "https://github.com/OSGeo/gdal/releases/download/v3.4.1/gdal-3.4.1.tar.gz"
sha256: "e360387bc25ec24940f46afbeada48002d72c74aaf9eccf2a40e8d74e711a2e4"
"3.3.3":
url: "https://github.com/OSGeo/gdal/releases/download/v3.3.3/gdal-3.3.3.tar.gz"
sha256: "28925ea4717b02185ee208bfc121a94fa0bc1dfe9cb862fd3868c2a0394d605a"
patches:
"3.4.3":
- patch_file: "patches/3.4.x/fix-autotools-3.4.3.patch"
Expand All @@ -21,9 +18,3 @@ patches:
- patch_file: "patches/3.4.x/fix-include-jsonc-3.4.1.patch"
- patch_file: "patches/3.4.x/fix-include-xerces.patch"
- patch_file: "patches/3.4.x/fix-include-podofo.patch"
"3.3.3":
- patch_file: "patches/3.3.x/fix-autotools-3.3.3.patch"
- patch_file: "patches/3.3.x/fix-nmake.patch"
- patch_file: "patches/3.3.x/fix-include-jsonc.patch"
- patch_file: "patches/3.3.x/fix-include-xerces.patch"
- patch_file: "patches/3.3.x/fix-include-podofo.patch"
161 changes: 43 additions & 118 deletions recipes/gdal/pre_3.5.0/conanfile.py

Large diffs are not rendered by default.

302 changes: 0 additions & 302 deletions recipes/gdal/pre_3.5.0/patches/3.3.x/fix-autotools-3.3.3.patch

This file was deleted.

Loading

0 comments on commit 2ba424b

Please sign in to comment.