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

Update cutter-deps to QT6 #3363

Merged
merged 6 commits into from
Jul 26, 2024
Merged

Update cutter-deps to QT6 #3363

merged 6 commits into from
Jul 26, 2024

Conversation

karliss
Copy link
Member

@karliss karliss commented Jul 14, 2024

IMPORTANT
Do not merge before rizinorg/cutter-deps#16 is finished and switching cutter-deps-qt URL back to rizinorg !
IMPORTANT

This is part 3/3 from

Your checklist for this pull request

Detailed description

Update cutter deps to the new ones with QT6 and Python 3.12.

Reorganize Linux CI builds. There are now 4:

  • linux-x86_64 -> building the main Appimage (using cutter-deps QT6)
  • linux-x86_64-qt5 -> Appimage with maximum old system compatiblity using Qt5, should work on Ubuntu18.04 and similar age distros
  • linux-x86_64-qt6-system-deps -> system deps on a recent distro with Qt6
  • linux-x86_64-system-deps -> system deps on oldest system (Ubuntu 18.04 + system Qt5)

The new linux Appimage should now include Qt wayland backend.

macOS:
Do both x86_64 and ARM64 builds on GHA. This somewhat makes the woodpecker build redundant.
Do we still need it? If I remember correctly it was introduced when Github didn't have ARM64 builders yet. Currently not only github supports that but they are the default ones (macos-latest).

Meat of the testing should be done once the cutter-deps PR have been merged and this one is using using cutter-deps from them. I have done preliminary testing for most of the cases, but they should be redone with final build of cutter-deps once it's merged.

Followup tasks

Test plan (required)

In each platform config make sure:

  • Cutter opens
  • Python sample plugin works
  • Sample python plugin is properly listed in the plugin list

Testing platforms:

  • Windows
  • macOS arm native
  • macOS intel (ideally tested on intel hardware instead of arm with Rosetta)
  • Linux qt6 appimage on Ubuntu 20.04
  • Linux qt6 appimage on a more recent distro
    • with desktop in wayland mode
    • with desktop in x11 mode
  • Linux qt5 appimage on Ubuntu 18.04

Closing issues

closes #3211
unblocks #3296

TODO

  • update the example python plugin
  • appveyor build
  • cleanup commented out x86_64-qt5 x86_64-system-deps configs, which are replaced by seperate jobs matrix (due to how docker in GHA works)

scripts/fetch_deps.sh Outdated Show resolved Hide resolved
@karliss karliss marked this pull request as ready for review July 15, 2024 22:23
.github/workflows/ci.yml Outdated Show resolved Hide resolved
src/bindings/bindings.xml.in Outdated Show resolved Hide resolved
@XVilka
Copy link
Member

XVilka commented Jul 22, 2024

Tested it (basic testing procedure) on these platforms:

  • macOS 14.5 ARM64
  • Windows 11 (x86_64)
  • also a friend of mine checked on macOS x86_64 natively - seems everything is in order.

@Rot127
Copy link
Member

Rot127 commented Jul 22, 2024

Both AppImages work for me (qt5 and qt6). Tested on Debian 11 x86_64

echo $XDG_SESSION_TYPE
x11

@wargio
Copy link
Member

wargio commented Jul 22, 2024

i have tested linux qt5 and qt6 and works.

$ echo $XDG_SESSION_TYPE
wayland

@insaneninja117
Copy link

This is probably obvious to everyone already but unless a special Qt5 build is added for Windows moving forwards this will mean support for Windows 7 will be dropped with this change.

@XVilka XVilka closed this Jul 24, 2024
@XVilka XVilka reopened this Jul 24, 2024
@XVilka
Copy link
Member

XVilka commented Jul 24, 2024

Sorry, pressed the wrong button

Copy link
Member

@Rot127 Rot127 left a comment

Choose a reason for hiding this comment

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

Only revert the link to the Rizin repo please.

@karliss karliss merged commit 9669644 into rizinorg:dev Jul 26, 2024
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CMake >=2.27 - migrate from FindPythonInterp and FindPythonLibs to FindPython
5 participants