Code

Gdal: Fix conflicts#22204

Code

Merged

conan-center-bot merged 16 commits intoconan-io:masterconan-io/conan-center-index:masterfrom ericLemanissier:gdalericLemanissier/conan-center-index:gdalCopy head branch name to clipboardMay 13, 2024

+43-788

Commits

Commits on Jan 8, 2024

• gdal: remove dead code

  ericLemanissier

  committed
  29aea09

  Copy full SHA for 29aea09

• bump deps

  ericLemanissier

  committed
  19f86b4

  Copy full SHA for 19f86b4

• remove outdated versions

  ericLemanissier

  committed
  01eae33

  Copy full SHA for 01eae33

• unbump flatbuffers

  ericLemanissier

  committed
  dea3f89

  Copy full SHA for dea3f89

• Update conanfile.py

  ericLemanissier

  committed
  4c6e2a9

  Copy full SHA for 4c6e2a9

Commits on Jan 10, 2024

• add a workaround for NMakeDeps quoting issues

  Show description for 168df79
  ericLemanissier

  authored
  168df79

  Copy full SHA for 168df79

Commits on Apr 4, 2024

• Merge branch 'master' into gdal

  ericLemanissier

  authored
  8fd5414

  Copy full SHA for 8fd5414

• unbump maintained recipes

  ericLemanissier

  authored
  ba78dd8

  Copy full SHA for ba78dd8

• fix conflicts

  Show description for 96e48f7
  ericLemanissier

  committed
  96e48f7

  Copy full SHA for 96e48f7

Commits on Apr 17, 2024

• Update conanfile.py

  ericLemanissier

  authored
  2d27282

  Copy full SHA for 2d27282

• Merge branch 'master' into gdal

  ericLemanissier

  authored
  e7f1e41

  Copy full SHA for e7f1e41

• use version range for expat

  ericLemanissier

  authored
  6299612

  Copy full SHA for 6299612

Commits on May 3, 2024

• revert migration to f-strings

  Show description for ee7307e
  ericLemanissier

  authored
  ee7307e

  Copy full SHA for ee7307e

Commits on May 10, 2024

• restore 3.4.1

  ericLemanissier

  authored
  50c2d43

  Copy full SHA for 50c2d43

• fix line endings

  ericLemanissier

  committed
  135712a

  Copy full SHA for 135712a

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

  Show description for 0bac27b
  

  ericLemanissier

  and

  uilianries

  authored
  0bac27b

  Copy full SHA for 0bac27b