Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Gdal: Fix conflicts #22204

Merged
merged 16 commits into from
May 13, 2024
Merged

Gdal: Fix conflicts #22204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
29aea09
gdal: remove dead code
ericLemanissier Jan 8, 2024
19f86b4
bump deps
ericLemanissier Jan 8, 2024
01eae33
remove outdated versions
ericLemanissier Jan 8, 2024
dea3f89
unbump flatbuffers
ericLemanissier Jan 8, 2024
4c6e2a9
Update conanfile.py
ericLemanissier Jan 8, 2024
168df79
add a workaround for NMakeDeps quoting issues
ericLemanissier Jan 10, 2024
8fd5414
Merge branch 'master' into gdal
ericLemanissier Apr 4, 2024
ba78dd8
unbump maintained recipes
ericLemanissier Apr 4, 2024
96e48f7
fix conflicts
ericLemanissier Apr 4, 2024
2d27282
Update conanfile.py
ericLemanissier Apr 17, 2024
e7f1e41
Merge branch 'master' into gdal
ericLemanissier Apr 17, 2024
6299612
use version range for expat
ericLemanissier Apr 17, 2024
ee7307e
revert migration to f-strings
ericLemanissier May 3, 2024
50c2d43
restore 3.4.1
ericLemanissier May 10, 2024
135712a
fix line endings
ericLemanissier May 10, 2024
0bac27b
Update recipes/gdal/pre_3.5.0/conanfile.py
ericLemanissier May 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions recipes/gdal/config.yml
View file
Open in desktop
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,16 @@
"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"

Check warning on line 10 in recipes/gdal/pre_3.5.0/conandata.yml

View workflow job for this annotation

GitHub Actions / Lint changed files (YAML files)

conandata.yml schema warning 

Schema outlined in https://github.com/conan-io/conan-center-index/blob/master/docs/adding_packages/conandata_yml_format.md#patches-fields is not followed.

required key(s) 'patch_description', 'patch_type' not found in 
      - patch_file: patches/3.4.x/fi ... 
    ^ (line: 10)
- patch_file: "patches/3.4.x/fix-nmake.patch"

Check warning on line 11 in recipes/gdal/pre_3.5.0/conandata.yml

View workflow job for this annotation

GitHub Actions / Lint changed files (YAML files)

conandata.yml schema warning 

Schema outlined in https://github.com/conan-io/conan-center-index/blob/master/docs/adding_packages/conandata_yml_format.md#patches-fields is not followed.

required key(s) 'patch_description', 'patch_type' not found in 
      - patch_file: patches/3.4.x/fi ... 
    ^ (line: 11)
- patch_file: "patches/3.4.x/fix-include-jsonc-3.4.3.patch"

Check warning on line 12 in recipes/gdal/pre_3.5.0/conandata.yml

View workflow job for this annotation

GitHub Actions / Lint changed files (YAML files)

conandata.yml schema warning 

Schema outlined in https://github.com/conan-io/conan-center-index/blob/master/docs/adding_packages/conandata_yml_format.md#patches-fields is not followed.

required key(s) 'patch_description', 'patch_type' not found in 
      - patch_file: patches/3.4.x/fi ... 
    ^ (line: 12)
- patch_file: "patches/3.4.x/fix-include-xerces.patch"

Check warning on line 13 in recipes/gdal/pre_3.5.0/conandata.yml

View workflow job for this annotation

GitHub Actions / Lint changed files (YAML files)

conandata.yml schema warning 

Schema outlined in https://github.com/conan-io/conan-center-index/blob/master/docs/adding_packages/conandata_yml_format.md#patches-fields is not followed.

required key(s) 'patch_description', 'patch_type' not found in 
      - patch_file: patches/3.4.x/fi ... 
    ^ (line: 13)
- patch_file: "patches/3.4.x/fix-include-podofo.patch"

Check warning on line 14 in recipes/gdal/pre_3.5.0/conandata.yml

View workflow job for this annotation

GitHub Actions / Lint changed files (YAML files)

conandata.yml schema warning 

Schema outlined in https://github.com/conan-io/conan-center-index/blob/master/docs/adding_packages/conandata_yml_format.md#patches-fields is not followed.

required key(s) 'patch_description', 'patch_type' not found in 
      - patch_file: patches/3.4.x/fi ... 
    ^ (line: 14)
"3.4.1":
- patch_file: "patches/3.4.x/fix-autotools-3.4.1.patch"

Check warning on line 16 in recipes/gdal/pre_3.5.0/conandata.yml

View workflow job for this annotation

GitHub Actions / Lint changed files (YAML files)

conandata.yml schema warning 

Schema outlined in https://github.com/conan-io/conan-center-index/blob/master/docs/adding_packages/conandata_yml_format.md#patches-fields is not followed.

required key(s) 'patch_description', 'patch_type' not found in 
      - patch_file: patches/3.4.x/fi ... 
    ^ (line: 16)
- patch_file: "patches/3.4.x/fix-nmake.patch"

Check warning on line 17 in recipes/gdal/pre_3.5.0/conandata.yml

View workflow job for this annotation

GitHub Actions / Lint changed files (YAML files)

conandata.yml schema warning 

Schema outlined in https://github.com/conan-io/conan-center-index/blob/master/docs/adding_packages/conandata_yml_format.md#patches-fields is not followed.

required key(s) 'patch_description', 'patch_type' not found in 
      - patch_file: patches/3.4.x/fi ... 
    ^ (line: 17)
- patch_file: "patches/3.4.x/fix-include-jsonc-3.4.1.patch"

Check warning on line 18 in recipes/gdal/pre_3.5.0/conandata.yml

View workflow job for this annotation

GitHub Actions / Lint changed files (YAML files)

conandata.yml schema warning 

Schema outlined in https://github.com/conan-io/conan-center-index/blob/master/docs/adding_packages/conandata_yml_format.md#patches-fields is not followed.

required key(s) 'patch_description', 'patch_type' not found in 
      - patch_file: patches/3.4.x/fi ... 
    ^ (line: 18)
- patch_file: "patches/3.4.x/fix-include-xerces.patch"

Check warning on line 19 in recipes/gdal/pre_3.5.0/conandata.yml

View workflow job for this annotation

GitHub Actions / Lint changed files (YAML files)

conandata.yml schema warning 

Schema outlined in https://github.com/conan-io/conan-center-index/blob/master/docs/adding_packages/conandata_yml_format.md#patches-fields is not followed.

required key(s) 'patch_description', 'patch_type' not found in 
      - patch_file: patches/3.4.x/fi ... 
    ^ (line: 19)
- patch_file: "patches/3.4.x/fix-include-podofo.patch"

Check warning on line 20 in recipes/gdal/pre_3.5.0/conandata.yml

View workflow job for this annotation

GitHub Actions / Lint changed files (YAML files)

conandata.yml schema warning 

Schema outlined in https://github.com/conan-io/conan-center-index/blob/master/docs/adding_packages/conandata_yml_format.md#patches-fields is not followed.

required key(s) 'patch_description', 'patch_type' not found in 
      - patch_file: patches/3.4.x/fi ... 
    ^ (line: 20)
"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
View file
Open in desktop

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
View file
Open in desktop

This file was deleted.

Loading
Loading