protobuf: Fix namespace conflict #6927
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
|
@mbruel Will this require changes to the remote as well? |
I don't think it will as that has its own copy of the protos and specifies |
jbroadus
force-pushed
the
fix-protobuf-namespace
branch
from
7b77b27
to
cc9e7cd
Compare
Protobuf 3.15 adds a namespace alias for "pb" that conflicts with Clementine's. Modify Clementine to use "cpb". Patch provided by @ahesford Reference: https://github.com/protocolbuffers/protobuf/blob/5c028d6cf42e426d47f5baa6ea3f0f5c86b97beb/src/google/protobuf/port.h#L44
jbroadus
force-pushed
the
fix-protobuf-namespace
branch
from
cc9e7cd
to
c25d1cd
Compare
|
Fixed the formatting issues. |
|
@jbroadus what's the conflict exactly? |
orivej-nixos
pushed a commit
to NixOS/nixpkgs
that referenced
this pull request
Mar 25, 2021
Upstream has fixed but has not released compatibility with 3.15 in clementine-player/Clementine#6927
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.
Protobuf 3.15 adds a namespace alias for "pb" that conflicts with
Clementine's. Modify Clementine to use "cpb".
Patch provided by @ahesford
Reference: https://github.com/protocolbuffers/protobuf/blob/5c028d6cf42e426d47f5baa6ea3f0f5c86b97beb/src/google/protobuf/port.h#L44
Fixes #6926