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

Protobuf: Use package provided config if available #11751

Merged
merged 2 commits into from Aug 2, 2023

Conversation

daschuer
Copy link
Member

This is a workaround for a probably outdated CMake Modul.

This aims to fix linking with protobuf v23.4 and the required Abseil.

https://mixxx.zulipchat.com/#narrow/stream/247620-development-help/topic/Compiling.20Error.20on.20Arch

@daschuer daschuer changed the base branch from main to 2.3 July 17, 2023 19:09
@daschuer daschuer added this to the 2.3.6 milestone Jul 18, 2023
@winter1967
Copy link

The workaround have fixed the compile-error for me. (EndeavourOS / Archlinux)

@github-actions github-actions bot added the build label Jul 25, 2023
@daschuer
Copy link
Member Author

I have tested this with an experimental vcpkg environment including v23.4.
You can find the workflow run here:
https://github.com/daschuer/mixxx/actions/runs/5661162465
The module mode has been disabled intentionally so the Ubuntu builds are failing.

@daschuer
Copy link
Member Author

@winter1967 I have improved that PR for Windows and macOS.
Can you confirm that it is still working?

@toszlanyi
Copy link
Contributor

@winter1967 I have improved that PR for Windows and macOS. Can you confirm that it is still working?

@daschuer - I just compiled this PR (GIT Version: 2.3.5-27-gb48611f170 (protobuf-config)) without issues on EndeavourOS

@daschuer
Copy link
Member Author

daschuer commented Aug 1, 2023

Great. Who can review and merge this than?

Copy link
Member

@Swiftb0y Swiftb0y left a comment

Choose a reason for hiding this comment

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

I don't have the issue locally so I can not test whether the PR actually fixes the it, but the changes seem reasonable, so LGTM.

@Swiftb0y Swiftb0y merged commit 6f8248e into mixxxdj:2.3 Aug 2, 2023
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants