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.
Your checklist for this pull request
Detailed description
This fixes 2 issues with the build script.
SHIBOKEN_INCLUDE_DIRS
), which broke build, so I simply changed it to reference the directories directly.Test plan (required)
Make sure this builds with Pyside 6 and without bundling Rizin. Personally I used the following flags:
-DCUTTER_USE_BUNDLED_RIZIN=OFF -DCUTTER_ENABLE_PYTHON=ON -DCUTTER_ENABLE_PYTHON_BINDINGS=ON -DCUTTER_ENABLE_GRAPHVIZ=ON -DCUTTER_QT6=ON
Note that if you have most stuff in
/usr
or/usr/local
, the issue might not have appeared on your system at all even before this commit. In my case, it's necessary for building Cutter on NixOS: NixOS/nixpkgs#268874.Closing issues