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.

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

proj: add v9.4.0, drop old versions #21512

Merged
merged 14 commits into from
Jun 11, 2024
Merged

Conversation

valgur
Copy link
Contributor

@valgur valgur commented Nov 30, 2023

@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

@conan-center-bot

This comment has been minimized.

@ErixenCruz ErixenCruz mentioned this pull request Dec 20, 2023
@valgur valgur changed the title proj: bump v6, simplify patching proj: bump version, simplify patching Dec 21, 2023
@valgur valgur changed the title proj: bump version, simplify patching proj: bump versions, simplify patching Dec 21, 2023
@conan-center-bot

This comment has been minimized.

@ghost ghost mentioned this pull request Jan 1, 2024
3 tasks
@conan-center-bot

This comment has been minimized.

@SpaceIm
Copy link
Contributor

SpaceIm commented Jan 1, 2024

Sorry I don't see the point of this modification of patches. I prefer to have patches per version instead of an external cmake file injected to some magic line in upstream CMakeLists. It's hard to reason about CMake logic with this kind of external cmake file.
Currently we just have to maintain a small patch, is it really a big deal? Why not just submit a PR upstream (by defining SQLite::SQLite3 target in FindSqlite3.cmake, and link to this target), so that we won't need a patch anymore.

Patches are better when fixes can be submitted upstream, because it doesn't require any modification in conanfile when it's fixed upstream. With your pattern, it's worse for maintenance, because we will have to remove all this logic in conanfile conditionally once fixed upstream...

@ErixenCruz
Copy link

PROJ will use SQLite::SQLite3 target in next release. that is when the patches can be removed.

@conan-center-bot

This comment has been minimized.

valgur added a commit to valgur/conan-center-index that referenced this pull request Apr 20, 2024
@conan-center-bot

This comment has been minimized.

valgur added a commit to valgur/conan-center-index that referenced this pull request May 14, 2024
AbrilRBS
AbrilRBS previously approved these changes Jun 5, 2024
Copy link
Member

@AbrilRBS AbrilRBS left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@AbrilRBS AbrilRBS self-assigned this Jun 5, 2024
@perseoGI
Copy link
Contributor

perseoGI commented Jun 6, 2024

Hi @valgur, thanks for your contribution!
PROJ 9.4.1 was released 5 days ago: OSGeo/PROJ@9.4.0...9.4.1
Maybe we can use this PR to add the latest.

@perseoGI perseoGI self-assigned this Jun 6, 2024
@AbrilRBS AbrilRBS removed their assignment Jun 6, 2024
@valgur
Copy link
Contributor Author

valgur commented Jun 6, 2024 via email

@valgur
Copy link
Contributor Author

valgur commented Jun 6, 2024 via email

@conan-center-bot

This comment has been minimized.

perseoGI
perseoGI previously approved these changes Jun 7, 2024
Copy link
Contributor

@perseoGI perseoGI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@perseoGI perseoGI requested a review from AbrilRBS June 7, 2024 10:30
Copy link
Contributor

@perseoGI perseoGI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@conan-center-bot
Copy link
Collaborator

Conan v1 pipeline ✔️

All green in build 17 (bc31fb1a772701c1bba82c29c4c6cc5713dd67ba):

  • proj/9.4.1:
    All packages built successfully! (All logs)

  • proj/9.3.0:
    All packages built successfully! (All logs)

  • proj/9.3.1:
    All packages built successfully! (All logs)

  • proj/9.2.1:
    All packages built successfully! (All logs)

  • proj/7.2.1:
    All packages built successfully! (All logs)

  • proj/6.3.1:
    All packages built successfully! (All logs)

  • proj/8.2.1:
    All packages built successfully! (All logs)


Conan v2 pipeline ✔️

Note: Conan v2 builds are now mandatory. Please read our discussion about it.

All green in build 16 (bc31fb1a772701c1bba82c29c4c6cc5713dd67ba):

  • proj/9.3.1:
    All packages built successfully! (All logs)

  • proj/9.4.1:
    All packages built successfully! (All logs)

  • proj/6.3.1:
    All packages built successfully! (All logs)

  • proj/9.2.1:
    All packages built successfully! (All logs)

  • proj/9.3.0:
    All packages built successfully! (All logs)

  • proj/8.2.1:
    All packages built successfully! (All logs)

  • proj/7.2.1:
    All packages built successfully! (All logs)

@conan-center-bot conan-center-bot merged commit b087c3e into conan-io:master Jun 11, 2024
43 checks passed
valgur added a commit to valgur/conan-center-index that referenced this pull request Nov 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

PROJ 9.4.0
7 participants