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
add protobuf package version 3.21.4 #12079
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
32d05eb
add protobuf package version 3.21.4
pgeler e516272
fix
pgeler 60b6f63
fix
pgeler 555064f
Merge branch 'conan-io:master' into master
pgeler c2366b3
Use scm.Version
uilianries 47fa583
Adopt new tools
uilianries cb67c47
Merge pull request #2 from uilianries/protobuf-3.21.4
pgeler 56c9ac5
remove old versions
pgeler f58856e
fix
pgeler File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,66 +1,20 @@ | ||
sources: | ||
"3.21.1": | ||
url: "https://github.com/protocolbuffers/protobuf/archive/v3.21.1.tar.gz" | ||
sha256: "a295dd3b9551d3e2749a9969583dea110c6cdcc39d02088f7c7bb1100077e081" | ||
"3.21.4": | ||
url: "https://github.com/protocolbuffers/protobuf/archive/v3.21.4.tar.gz" | ||
sha256: "85d42d4485f36f8cec3e475a3b9e841d7d78523cd775de3a86dba77081f4ca25" | ||
"3.20.0": | ||
url: "https://github.com/protocolbuffers/protobuf/archive/v3.20.0.tar.gz" | ||
sha256: "b07772d38ab07e55eca4d50f4b53da2d998bb221575c60a4f81100242d4b4889" | ||
"3.19.4": | ||
url: "https://github.com/protocolbuffers/protobuf/archive/v3.19.4.tar.gz" | ||
sha256: "3bd7828aa5af4b13b99c191e8b1e884ebfa9ad371b0ce264605d347f135d2568" | ||
"3.19.2": | ||
url: "https://github.com/protocolbuffers/protobuf/archive/v3.19.2.tar.gz" | ||
sha256: "4dd35e788944b7686aac898f77df4e9a54da0ca694b8801bd6b2a9ffc1b3085e" | ||
"3.18.1": | ||
url: "https://github.com/protocolbuffers/protobuf/archive/v3.18.1.tar.gz" | ||
sha256: "9111bf0b542b631165fadbd80aa60e7fb25b25311c532139ed2089d76ddf6dd7" | ||
"3.17.1": | ||
url: "https://github.com/protocolbuffers/protobuf/archive/v3.17.1.tar.gz" | ||
sha256: "036d66d6eec216160dd898cfb162e9d82c1904627642667cc32b104d407bb411" | ||
"3.16.0": | ||
url: "https://github.com/protocolbuffers/protobuf/archive/v3.16.0.tar.gz" | ||
sha256: "7892a35d979304a404400a101c46ce90e85ec9e2a766a86041bb361f626247f5" | ||
"3.15.8": | ||
url: "https://github.com/protocolbuffers/protobuf/archive/v3.15.8.tar.gz" | ||
sha256: "0cbdc9adda01f6d2facc65a22a2be5cecefbefe5a09e5382ee8879b522c04441" | ||
"3.15.5": | ||
url: "https://github.com/protocolbuffers/protobuf/archive/v3.15.5.tar.gz" | ||
sha256: "bc3dbf1f09dba1b2eb3f2f70352ee97b9049066c9040ce0c9b67fb3294e91e4b" | ||
"3.13.0": | ||
url: "https://github.com/protocolbuffers/protobuf/archive/v3.13.0.tar.gz" | ||
sha256: "9b4ee22c250fe31b16f1a24d61467e40780a3fbb9b91c3b65be2a376ed913a1a" | ||
"3.12.4": | ||
url: "https://github.com/protocolbuffers/protobuf/archive/v3.12.4.tar.gz" | ||
sha256: "512e5a674bf31f8b7928a64d8adf73ee67b8fe88339ad29adaa3b84dbaa570d8" | ||
"3.11.4": | ||
url: "https://github.com/protocolbuffers/protobuf/archive/v3.11.4.tar.gz" | ||
sha256: "a79d19dcdf9139fa4b81206e318e33d245c4c9da1ffed21c87288ed4380426f9" | ||
"3.9.1": | ||
url: "https://github.com/protocolbuffers/protobuf/archive/v3.9.1.tar.gz" | ||
sha256: "98e615d592d237f94db8bf033fba78cd404d979b0b70351a9e5aaff725398357" | ||
patches: | ||
"3.19.4": | ||
- patch_file: "patches/upstream-pr-9153-msvc-runtime.patch" | ||
base_path: "source_subfolder" | ||
"3.19.2": | ||
- patch_file: "patches/upstream-pr-9153-msvc-runtime.patch" | ||
base_path: "source_subfolder" | ||
"3.15.5": | ||
- patch_file: "patches/upstream-pr-8301-bundle-destination.patch" | ||
base_path: "source_subfolder" | ||
"3.13.0": | ||
- patch_file: "patches/upstream-pr-7761-cmake-regex-fix.patch" | ||
base_path: "source_subfolder" | ||
- patch_file: "patches/upstream-pr-7288-android-log.patch" | ||
base_path: "source_subfolder" | ||
- patch_file: "patches/upstream-pr-8301-bundle-destination.patch" | ||
base_path: "source_subfolder" | ||
"3.12.4": | ||
- patch_file: "patches/upstream-pr-7761-cmake-regex-fix.patch" | ||
base_path: "source_subfolder" | ||
- patch_file: "patches/upstream-issue-7567-no-export-template-define.patch" | ||
base_path: "source_subfolder" | ||
- patch_file: "patches/upstream-pr-7288-android-log.patch" | ||
base_path: "source_subfolder" | ||
- patch_file: "patches/upstream-pr-8301-bundle-destination.patch" | ||
base_path: "source_subfolder" |
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
20 changes: 0 additions & 20 deletions
20
recipes/protobuf/all/patches/upstream-issue-7567-no-export-template-define.patch
This file was deleted.
Oops, something went wrong.
26 changes: 0 additions & 26 deletions
26
recipes/protobuf/all/patches/upstream-pr-7288-android-log.patch
This file was deleted.
Oops, something went wrong.
36 changes: 0 additions & 36 deletions
36
recipes/protobuf/all/patches/upstream-pr-7761-cmake-regex-fix.patch
This file was deleted.
Oops, something went wrong.
11 changes: 0 additions & 11 deletions
11
recipes/protobuf/all/patches/upstream-pr-8301-bundle-destination.patch
This file was deleted.
Oops, something went wrong.
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,27 +1,11 @@ | ||
versions: | ||
"3.21.1": | ||
"3.21.4": | ||
folder: all | ||
"3.20.0": | ||
folder: all | ||
"3.19.4": | ||
folder: all | ||
"3.19.2": | ||
folder: all | ||
"3.18.1": | ||
folder: all | ||
"3.17.1": | ||
folder: all | ||
"3.16.0": | ||
folder: all | ||
"3.15.8": | ||
folder: all | ||
"3.15.5": | ||
folder: all | ||
"3.13.0": | ||
folder: all | ||
"3.12.4": | ||
folder: all | ||
"3.11.4": | ||
folder: all | ||
"3.9.1": | ||
folder: all |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it the reason of this regression #12474?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In any case, build_modules should only be assigned to the root component (check 1.51 changelog - this PR)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
cmake_build_modules
property is properly assigned to the root here.build_modules
is the legacy build modules, and it can't be assigned to root when there are components.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can confirm this is the reason why
CONAN_BUILD_MODULES_PATHS_PROTOBUF
is empty forcmake_paths
(and otherscmake_*
generators too).I don't really know if those cmake files were supposed to be there in the first place, but the problem is that
protobuf_generate_cpp
(which gets defined there) is pretty essential, so why would they not be?@pgeler any reasoning for this change?