p5-dbd-mysql: Fix variant conflicts issues #26725
Open
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
jhoyt4
force-pushed
the
p5-dbd-mysql
branch
3 times, most recently
from
9b08de3 to
a873787
Compare
cooljeanius
approved these changes
Nov 24, 2024
ryandesign
reviewed
Dec 1, 2024
jhoyt4
force-pushed
the
p5-dbd-mysql
branch
2 times, most recently
from
1f79fa3 to
653f5a7
Compare
jhoyt4
force-pushed
the
p5-dbd-mysql
branch
2 times, most recently
from
4c7d4ac to
487dc63
Compare
jhoyt4
force-pushed
the
p5-dbd-mysql
branch
2 times, most recently
from
17cb02f to
7851ccf
Compare
jhoyt4
force-pushed
the
p5-dbd-mysql
branch
3 times, most recently
from
f5a82ea to
b344b26
Compare
|
WTF does "Merging is blocked" mean? |
|
I've dropped the perl 3.36 / 3.38 commit in hopes that the more basic p5-dbd-mysql fix will get accepted. |
|
I've also now dropped the mariadb10.2 support patch which I got cc'd in trac to look into. This is again in hopes that this can maybe someday get merged or at least get feedback as to why it is not being accepted. |
Fix issue where multiple variant conflicts were being set as a single conflict. Fixing this also allowed for the removal of the active_vartiants workaround. - fix variant conflicts - remove active variants workaround - fix typos Closes: https://trac.macports.org/ticket/60517 Closes: https://trac.macports.org/ticket/71360 Closes: https://trac.macports.org/ticket/71381
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.
Fix issue where multiple variant conflicts were being set as a single
conflict. Fixing this also allowed for the removal of the
active_vartiants workaround.
Closes: https://trac.macports.org/ticket/60517
Closes: https://trac.macports.org/ticket/71360
Closes: https://trac.macports.org/ticket/71381
Note - I have these broken into 2 commits to allow them to be tracked easier.
Description
Correct improper variant conflicts issue where all conflicts were handled as a single port. Additionally, attempt to address typos (at least the ones I can find) and add back the legacy mariadb10_2 variant.
Type(s)
Tested on
macOS 15.1.1 24B91 arm64
Xcode 16.1 16B40
Verification
Have you
port lint --nitpick?sudo port test?sudo port -vst install?