[kf5bluezqt] Update to 5.112.0. JB#57391 #8
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
|
Ah damn. Had few upstream changes here I hadn't fetched. Will check. |
Some churn on the patches: - pkgconfig patch no longer needed, upstream has the functionality. - MediaTransport patch dropped. Upstream has it an implementation for that. Not 100% the same as we did, but close enough. - Rest reordered a bit to include more upstreamable ones first. - Small adjustments following upstream, avoid QWeakPointer::data() and Q_EMIT instead of emit, etc. - Reverting now more things that need new qt. Most peculiar the one reverting minimum cmake version bump which broke the build here by duplicate symbols on .o files. Could be related to our Qt version(?) Dropped the remaining bluez4 conflicts. That should be gone everywhere by now.
pvuorela
force-pushed
the
update_5112
branch
from
6f5adfe
to
0bff152
Compare
|
Phew, now applies cleanly and includes the local patching I missed earlier. |
spiiroin
approved these changes
Dec 15, 2023
mlehtima
approved these changes
Dec 15, 2023
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.
Some churn on the patches:
Dropped the remaining bluez4 conflicts. That should be gone everywhere by now.