deps: update libcommuni and required packages (#6500)

This commit is contained in:
nerix
2025-09-28 11:18:12 +02:00
committed by GitHub
parent c5ced77f9b
commit a7de887ee0
12 changed files with 12 additions and 17 deletions
+1 -1
View File
@@ -3,7 +3,7 @@ freebsd_instance:
task: task:
install_script: install_script:
- pkg install -y boost-libs git libnotify qt6-base qt6-svg qt6-5compat qt6-imageformats qtkeychain-qt6 cmake pkgconf - pkg install -y boost-libs git libnotify qt6-base qt6-svg qt6-imageformats qtkeychain-qt6 cmake pkgconf
script: | script: |
git submodule init git submodule init
git submodule update git submodule update
+1 -1
View File
@@ -165,7 +165,7 @@ jobs:
with: with:
cache: true cache: true
cache-key-prefix: ${{ runner.os }}-QtCache-${{ matrix.qt-version }}-v2 cache-key-prefix: ${{ runner.os }}-QtCache-${{ matrix.qt-version }}-v2
modules: qt5compat qtimageformats modules: qtimageformats
version: ${{ matrix.qt-version }} version: ${{ matrix.qt-version }}
# WINDOWS # WINDOWS
+1 -1
View File
@@ -34,7 +34,7 @@ jobs:
with: with:
cache: true cache: true
cache-key-prefix: ${{ runner.os }}-QtCache-${{ matrix.qt-version }}-v2 cache-key-prefix: ${{ runner.os }}-QtCache-${{ matrix.qt-version }}-v2
modules: qt5compat qtimageformats modules: qtimageformats
version: ${{ matrix.qt-version }} version: ${{ matrix.qt-version }}
dir: ${{ github.workspace }}/.qtinstall dir: ${{ github.workspace }}/.qtinstall
set-env: false set-env: false
+1 -1
View File
@@ -29,7 +29,7 @@ jobs:
- name: Install dependencies - name: Install dependencies
run: | run: |
sudo pacman -Sy sudo pacman -Sy
sudo pacman -S --noconfirm 'qt6-base' 'qt6-tools' 'boost-libs' 'openssl' 'qt6-imageformats' 'qtkeychain-qt6' 'qt6-5compat' 'qt6-svg' 'libnotify' sudo pacman -S --noconfirm 'qt6-base' 'qt6-tools' 'boost-libs' 'openssl' 'qt6-imageformats' 'qtkeychain-qt6' 'qt6-svg' 'libnotify'
sudo pacman -S --noconfirm 'git' 'boost' 'cmake' 'benchmark' sudo pacman -S --noconfirm 'git' 'boost' 'cmake' 'benchmark'
- uses: actions/checkout@v5 - uses: actions/checkout@v5
+1 -1
View File
@@ -27,7 +27,7 @@ jobs:
qt-version: [6.4.3, 6.7.1] qt-version: [6.4.3, 6.7.1]
fail-fast: false fail-fast: false
env: env:
QT_MODULES: ${{ startsWith(matrix.qt-version, '6.') && 'qt5compat qtimageformats' || '' }} QT_MODULES: qtimageformats
steps: steps:
- uses: actions/checkout@v5 - uses: actions/checkout@v5
+1 -1
View File
@@ -28,7 +28,7 @@ jobs:
skip-crashpad: [false] skip-crashpad: [false]
fail-fast: false fail-fast: false
env: env:
QT_MODULES: ${{ startsWith(matrix.qt-version, '6.') && 'qt5compat qtimageformats' || '' }} QT_MODULES: qtimageformats
C2_USE_OPENSSL3: ${{ startsWith(matrix.qt-version, '6.') && 'True' || 'False' }} C2_USE_OPENSSL3: ${{ startsWith(matrix.qt-version, '6.') && 'True' || 'False' }}
C2_CONAN_CACHE_SUFFIX: ${{ startsWith(matrix.qt-version, '6.') && '-QT6' || '' }} C2_CONAN_CACHE_SUFFIX: ${{ startsWith(matrix.qt-version, '6.') && '-QT6' || '' }}
+1 -1
View File
@@ -9,7 +9,7 @@ high that this also works on older FreeBSD releases, architectures and
FreeBSD 15.0-SNAP. FreeBSD 15.0-SNAP.
1. Install build dependencies from package sources (or build from the 1. Install build dependencies from package sources (or build from the
ports tree): `# pkg install boost-libs git libnotify qt6-base qt6-svg qt6-5compat qt6-imageformats qtkeychain-qt6 cmake` ports tree): `# pkg install boost-libs git libnotify qt6-base qt6-svg qt6-imageformats qtkeychain-qt6 cmake`
1. In the project directory, create a build directory and enter it 1. In the project directory, create a build directory and enter it
```sh ```sh
mkdir build mkdir build
+3 -3
View File
@@ -17,13 +17,13 @@ The built binary should be exportable from the final image & able to run on your
### Debian 12 (bookworm) or later ### Debian 12 (bookworm) or later
```sh ```sh
sudo apt install qt6-base-dev qt6-5compat-dev qt6-svg-dev qt6-image-formats-plugins libboost1.81-dev libnotify-dev libssl-dev cmake g++ git sudo apt install qt6-base-dev qt6-svg-dev qt6-image-formats-plugins libboost1.81-dev libnotify-dev libssl-dev cmake g++ git
``` ```
### Arch Linux ### Arch Linux
```sh ```sh
sudo pacman -S --needed qt6-base qt6-tools boost-libs openssl qt6-imageformats qt6-5compat qt6-svg boost libnotify rapidjson pkgconf cmake sudo pacman -S --needed qt6-base qt6-tools boost-libs openssl qt6-imageformats qt6-svg boost libnotify rapidjson pkgconf cmake
``` ```
If you use Wayland, you will also need to ensure `qt6-wayland` is installed. If you use Wayland, you will also need to ensure `qt6-wayland` is installed.
@@ -35,7 +35,7 @@ Alternatively you can use the [chatterino2-git](https://aur.archlinux.org/packag
_Most likely works the same for other Red Hat-like distros. Substitute `dnf` with `yum`._ _Most likely works the same for other Red Hat-like distros. Substitute `dnf` with `yum`._
```sh ```sh
sudo dnf install qt6-qtbase-devel qt6-qtimageformats qt6-qtsvg-devel qt6-qt5compat-devel g++ git openssl-devel boost-devel libnotify-devel cmake sudo dnf install qt6-qtbase-devel qt6-qtimageformats qt6-qtsvg-devel g++ git openssl-devel boost-devel libnotify-devel cmake
``` ```
### NixOS 18.09+ ### NixOS 18.09+
-1
View File
@@ -34,7 +34,6 @@ When prompted which components to install, do the following:
2. Unfold the top most tree element (latest stable Qt version, e.g. `Qt 6.5.3`) 2. Unfold the top most tree element (latest stable Qt version, e.g. `Qt 6.5.3`)
3. Under this version, select the following entries: 3. Under this version, select the following entries:
- `MSVC 2019 64-bit` (or `MSVC 2022 64-bit` from Qt 6.8 onwards) - `MSVC 2019 64-bit` (or `MSVC 2022 64-bit` from Qt 6.8 onwards)
- `Qt 5 Compatibility Module`
- `Additional Libraries` > `Qt Image Formats` - `Additional Libraries` > `Qt Image Formats`
4. Under the "Tools" tree element (at the bottom), ensure that `Qt Creator X.X.X` and `Debugging Tools for Windows` are selected. (they should be checked by default) 4. Under the "Tools" tree element (at the bottom), ensure that `Qt Creator X.X.X` and `Debugging Tools for Windows` are selected. (they should be checked by default)
5. Continue through the installer and let the installer finish installing Qt. 5. Continue through the installer and let the installer finish installing Qt.
+1
View File
@@ -9,6 +9,7 @@
- Dev: Find Boost's CMake Config file instead of module file. (#6499) - Dev: Find Boost's CMake Config file instead of module file. (#6499)
- Dev: Fix 32-bit compile in PluginRepl. (#6483) - Dev: Fix 32-bit compile in PluginRepl. (#6483)
- Dev: Fix the WinGet release workflow. (#6497) - Dev: Fix the WinGet release workflow. (#6497)
- Dev: Removed dependency to Qt5 Compatibility module by updating libcommuni. (#6500)
## 2.5.4 ## 2.5.4
-5
View File
@@ -13,11 +13,6 @@
"boost-json", "boost-json",
"boost-signals2", "boost-signals2",
"boost-variant", "boost-variant",
{
"name": "qt5compat",
"default-features": false,
"features": ["textcodec"]
},
{ {
"name": "qtbase", "name": "qtbase",
"default-features": false, "default-features": false,