[proj4] Update to version 6.2.0 #8621
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Well, we have a PR #7917 to solve this, but version is 6.1.1 |
|
So, #7917 has been merged, plz merge it to your branch. Thanks. |
|
Some (or parts of) of my commits are obsolete and will result in a merge conflict. I'll look into them next week when I have time to work on this PR again. |
|
Brief update: I've rebased this branch onto the master branch on my local machine and resolved any conflicts. It seems to compile, but I'm still currently running some tests. I might be able to push my changes to the remote branch by tomorrow. |
ShinNoNoir
force-pushed
the
proj4-6.2.0
branch
from
fb4fd87
to
24cd5b0
Compare
|
I've resolved the conflicts and pushed the new commits. The delta has become quite small. 😅 |
JackBoosY
suggested changes
Oct 22, 2019
JackBoosY
approved these changes
Oct 23, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR updates
proj4from 4.9 to 6.2.This newer version, however, introduces some breaking changes:
proj_api.hhas now been deprecated. Using it will result in a compile-time error, unlessACCEPT_USE_OF_DEPRECATED_PROJ_API_Hhas been defined. The following ports have been updated as well to accommodate this change:libgeotifflibspatialiteprojects.hhas been removed. Thevtkpackage was using it. A future release will address this issue.In the meantime, the port has been adjusted to use this patch.Edit: These breaking changes were addressed in #7917.
Additionally, this PR changes
gdal'sCONTROLfile to depend onproj4, not onproj.