From c540b40d7f46679e2f5931c77f6c40aa8d29bdcc Mon Sep 17 00:00:00 2001 From: u-235 Date: Thu, 3 Oct 2024 21:35:52 +0300 Subject: [PATCH 1/2] Update README.md --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index 0c899be..cf4f5d7 100644 --- a/README.md +++ b/README.md @@ -61,6 +61,13 @@ On the [release page](https://github.com/GCodeProjects/GCodeWorkShop/releases/la you can find binary builds for Debian, Ubuntu and Windows. For building the application yourself, the [build instructions](INSTALL.md) may be useful. +In addition, third-party builds are available: + +- For [ALT Linux](https://packages.altlinux.org/ru/sisyphus/srpms/gcodeworkshop/), + thanks to Anton Midyukov (antohami). +- For [OpenSuse](https://build.opensuse.org/package/show/home:AndnoVember:LXQt:Qt6/gcodeworkshop), + thanks to Андрей Алыпов (AndnoVember). + Command line options ------------------ From 94c24fea7ee1db53b2856bb4f799d69ef7077334 Mon Sep 17 00:00:00 2001 From: u-235 Date: Fri, 11 Oct 2024 14:40:50 +0300 Subject: [PATCH 2/2] Update INSTALL.md --- INSTALL.md | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 8094f0b..beaf4bc 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -14,14 +14,15 @@ the following steps are needed to build it: - Run make to build the application. -Building in Debian +Building in Ubuntu ------------------ Install the following packages. -``` +```sh apt update -apt install build-essential qtbase5-dev qttools5-dev-tools libqt5serialport5-dev +apt install build-essential \ +qtbase5-dev qttools5-dev-tools libqt5serialport5-dev ``` Switch to the folder with sources. Now you can either build the application @@ -53,6 +54,22 @@ The script creates a .deb package in the current folder and does not require root privileges. +### Peculiarities of building with Qt6 + +Install the following packages. Note that Ubuntu jammy (version 22) does not +have the qt6-serialport-dev package and libqt6serialport6-dev should be +installed instead. + +```sh +apt update +apt install build-essential \ +qt6-base-dev qt6-base-dev-tools qt6-serialport-dev qt6-l10n-tools qt6-translations-l10n +``` + +Next, when building step-by-step, you should type qmake6 instead of qmake +or add the `-q qmake6` switch when running the automatic build script. + + Building in windows with MSYS2 ------------------------------