-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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
QLColorCode: update to 4.1.0 #9138
Conversation
It does not work yet:
|
Not sure of the cause. I've tried the following:
|
Also for some reason, my |
Restarting had no effect on the issue. |
Big Sur issue: anthonygelibert/QLColorCode#72 |
Any reason not to merge this, other than the Big Sur issue? |
I'd say it's good to go for all pre-11 systems. I am working on a patch for upstream to fix it on Big Sur. |
@ryandesign I could block it from macOS 11 for now since it's pointless to install on that version. |
I have fixed the Big Sur issue and sent a patch to upstream: anthonygelibert/QLColorCode#73 |
4799a2e
to
3c5ee44
Compare
This now incorporates my patch which is in PR state in upstream. This QuickLook plugin works great now on Big Sur. The building of Lua and Highlight is not ideal, but this project is complicated by having the Highlight dependency as a binary rather than a library. A real solution is to have the native code call the library rather than going through a shell script and linking statically with Highlight. |
Travis Build #15633 Passed. Lint results
Port QLColorCode success on xcode10.3. Log |
3c5ee44
to
872eefd
Compare
This is now a working version for Big Sur. Upstream accepted my patch. Is it an issue if Lua must be at least deactivated for this to install correctly? If I attempt to use the MacPorts, |
I may be missing a flag on the linker: anthonygelibert/QLColorCode#78 |
872eefd
to
16df4fe
Compare
Updated to 4.1.0. |
@Tatsh wow, great work, thank you! So, are the issues with Lua resolved in 4.1.0? Can we merge this? |
This can be merged, but it will conflict with the Lua port temporarily. Solution is to deactivate Lua first and then reactivate it. |
So, if I understand this correctly, this port build and installs its own version of Lua and Highlight and installs them over the Lua install, requiring a If a vendorized copy of highlight and lua is needed, they should be installed in a separate dir, and if they're only a build dependency and statically linked, the libs should not be installed at all. Additionally, rebuilding (and adding a hefty |
Lua only has to be deactivated because the linker needs to not see it during build. |
Because the way bundles and code signing work on Big Sur, the copy of Highlight must be bundled in the QLColorCode bundle. Even if /opt/local/bin/highlight is signed, it still cannot use it. |
Perhaps it's one more thing then: the Highlight source this pulls in needs to be patched to not see liblua.la from MacPorts. Then the conflict will be resolved. |
Thank you for taking the time to explain this properly. Maybe the way to go here should be:
|
It doesn't need a specific version, but it does need it to be within the bundle and signed. I've taken the other route that's more compatible with the upstream project by getting the Highlight source and building it within the Xcode build process. This guarantees the How to sign the already built thing for this? I know we can use
This is the error if
This is a header conflict, not library. I can prove this by putting these lines near the end of
Then it builds fine with |
16df4fe
to
091ba80
Compare
I fixed the include path issue with a patch and I am submitting this to upstream. This port will work without having to deactivate |
Hm, yes, this looks trickier than I thought.
All right then, splendid work, thank you @Tatsh. Is this PR ready to merge with the latest changes, or should we wait for upstream? |
This is ready. I don't think upstream will make a new release just for my build fix. |
Ok, merging then. Thanks for your contribution to MacPorts, @Tatsh! |
Description
Update QLColorCode to 3.1.1 with a few patches. One of the patches fixes selecting the theme.
Type(s)
Tested on
macOS 11.0.1 20B29
Xcode 12.2 12B45b
Verification
Have you
port lint
?sudo port -vst install
?