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.

Sign up for GitHub

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

Cleanup in deb dependencies, use QT6 in Ubuntu 24.04 build #1093

Merged
merged 3 commits into from
Nov 18, 2024
Merged

Cleanup in deb dependencies, use QT6 in Ubuntu 24.04 build #1093

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d3a341
chore: Remove base qt dependencies from package and define dependenci…
pktiuk Nov 18, 2024
e726f58
docs: Add missing qt6 package to docs
pktiuk Nov 18, 2024
1c22179
ci: Use QT6 in builds for Ubuntu 24
pktiuk Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,14 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Install Dependencies
- name: Install Dependencies with QT5
if: matrix.image != 'ubuntu-24.04'
run: sudo apt-get update && sudo apt-get install extra-cmake-modules qttools5-dev qttools5-dev-tools libsdl2-dev libxi-dev libxtst-dev libx11-dev itstool gettext

- name: Install Dependencies with QT6
if: matrix.image == 'ubuntu-24.04'
run: sudo apt-get update && sudo apt-get install extra-cmake-modules qt6-base-dev qt6-tools-dev-tools libqt6core5compat6-dev qt6-tools-dev libsdl2-dev libxi-dev libxtst-dev libx11-dev itstool gettext

- name: Configure CMake
run: cmake -DCPACK_GENERATOR="DEB" -DCMAKE_BUILD_TYPE=Release -DCHECK_FOR_UPDATES=ON -DANTIMICROX_PKG_VERSION="GitHub deb Release" -B ${{ github.workspace }}/build

Expand Down
4 changes: 2 additions & 2 deletions BUILDING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ installed on your system in order to build this program:
- `cmake`
- `extra-cmake-modules`
- QT libraries:
- For QT6: `qt6-base-dev`, `qt6-tools-dev-tools` `libqt6core5compat6-dev`
- For QT6: `qt6-base-dev`, `qt6-tools-dev-tools` `libqt6core5compat6-dev` `qt6-tools-dev`
- For QT5: `qttools5-dev` and `qttools5-dev-tools` (`qt5-tools` on distros based on Arch Linux)
- `libsdl2-dev` (`sdl2` on distros based on Arch Linux) (SDL2)
- `libxi-dev` (`libxi` on distros based on Arch Linux) (Optional. Needed to compile with X11 and uinput support)
Expand All @@ -51,7 +51,7 @@ sudo dnf install git make cmake gcc cmake extra-cmake-modules qt6-qttools-devel
One-liner for installing above dependencies:

```bash
sudo apt install g++ cmake extra-cmake-modules qt6-base-dev qt6-tools-dev-tools libqt6core5compat6-dev libsdl2-dev libxi-dev libxtst-dev libx11-dev itstool gettext ninja-build
sudo apt install g++ cmake extra-cmake-modules qt6-base-dev qt6-tools-dev-tools libqt6core5compat6-dev qt6-tools-dev libsdl2-dev libxi-dev libxtst-dev libx11-dev itstool gettext ninja-build
```

QT5 Variant:
Expand Down
7 changes: 6 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,7 +822,12 @@ endif()

# Building .deb package
if(CPACK_GENERATOR STREQUAL "DEB")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "qtbase5-dev (>= ${QT_REQUIRED_VERSION}), libsdl2-2.0-0 (>= ${SDL_REQUIRED_VERSION}), libc6")
if(QT_VERSION_MAJOR EQUAL 5)
# TODO use regular, not dev packages
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt5widgets5 (>= ${QT_REQUIRED_VERSION}), libsdl2-2.0-0 (>= ${SDL_REQUIRED_VERSION}), libc6")
else()
set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt6widgets6t64 (>= ${QT_REQUIRED_VERSION}), libsdl2-2.0-0 (>= ${SDL_REQUIRED_VERSION}), libc6")
endif(QT_VERSION_MAJOR EQUAL 5)
set(CPACK_DEBIAN_PACKAGE_MAINTAINER "pktiuk <[email protected]>")
set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "AntiMicroX is a graphical program used to map gamepad buttons to keyboard, mouse, scripts and macros.

Expand Down