From a7de887ee0bbd42e3a9cf51c2cfd68dc17726c16 Mon Sep 17 00:00:00 2001 From: nerix Date: Sun, 28 Sep 2025 11:18:12 +0200 Subject: [PATCH] deps: update libcommuni and required packages (#6500) --- .cirrus.yml | 2 +- .github/workflows/build.yml | 2 +- .github/workflows/clang-tidy.yml | 2 +- .github/workflows/test-arch-linux.yml | 2 +- .github/workflows/test-macos.yml | 2 +- .github/workflows/test-windows.yml | 2 +- BUILDING_ON_FREEBSD.md | 2 +- BUILDING_ON_LINUX.md | 6 +++--- BUILDING_ON_WINDOWS.md | 1 - CHANGELOG.md | 1 + lib/libcommuni | 2 +- vcpkg.json | 5 ----- 12 files changed, 12 insertions(+), 17 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 17b87376..ad19804e 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -3,7 +3,7 @@ freebsd_instance: task: 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: | git submodule init git submodule update diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e2e30859..82a775bc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -165,7 +165,7 @@ jobs: with: cache: true cache-key-prefix: ${{ runner.os }}-QtCache-${{ matrix.qt-version }}-v2 - modules: qt5compat qtimageformats + modules: qtimageformats version: ${{ matrix.qt-version }} # WINDOWS diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml index 8b96eb5b..f40d51db 100644 --- a/.github/workflows/clang-tidy.yml +++ b/.github/workflows/clang-tidy.yml @@ -34,7 +34,7 @@ jobs: with: cache: true cache-key-prefix: ${{ runner.os }}-QtCache-${{ matrix.qt-version }}-v2 - modules: qt5compat qtimageformats + modules: qtimageformats version: ${{ matrix.qt-version }} dir: ${{ github.workspace }}/.qtinstall set-env: false diff --git a/.github/workflows/test-arch-linux.yml b/.github/workflows/test-arch-linux.yml index 6e248554..5c6cf381 100644 --- a/.github/workflows/test-arch-linux.yml +++ b/.github/workflows/test-arch-linux.yml @@ -29,7 +29,7 @@ jobs: - name: Install dependencies run: | 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' - uses: actions/checkout@v5 diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml index 4c96927f..6528e5d1 100644 --- a/.github/workflows/test-macos.yml +++ b/.github/workflows/test-macos.yml @@ -27,7 +27,7 @@ jobs: qt-version: [6.4.3, 6.7.1] fail-fast: false env: - QT_MODULES: ${{ startsWith(matrix.qt-version, '6.') && 'qt5compat qtimageformats' || '' }} + QT_MODULES: qtimageformats steps: - uses: actions/checkout@v5 diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml index 9c47e11d..f799700c 100644 --- a/.github/workflows/test-windows.yml +++ b/.github/workflows/test-windows.yml @@ -28,7 +28,7 @@ jobs: skip-crashpad: [false] fail-fast: false env: - QT_MODULES: ${{ startsWith(matrix.qt-version, '6.') && 'qt5compat qtimageformats' || '' }} + QT_MODULES: qtimageformats C2_USE_OPENSSL3: ${{ startsWith(matrix.qt-version, '6.') && 'True' || 'False' }} C2_CONAN_CACHE_SUFFIX: ${{ startsWith(matrix.qt-version, '6.') && '-QT6' || '' }} diff --git a/BUILDING_ON_FREEBSD.md b/BUILDING_ON_FREEBSD.md index 22a08e04..09f75e6c 100644 --- a/BUILDING_ON_FREEBSD.md +++ b/BUILDING_ON_FREEBSD.md @@ -9,7 +9,7 @@ high that this also works on older FreeBSD releases, architectures and FreeBSD 15.0-SNAP. 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 ```sh mkdir build diff --git a/BUILDING_ON_LINUX.md b/BUILDING_ON_LINUX.md index 2e1b4733..9db03518 100644 --- a/BUILDING_ON_LINUX.md +++ b/BUILDING_ON_LINUX.md @@ -17,13 +17,13 @@ The built binary should be exportable from the final image & able to run on your ### Debian 12 (bookworm) or later ```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 ```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. @@ -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`._ ```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+ diff --git a/BUILDING_ON_WINDOWS.md b/BUILDING_ON_WINDOWS.md index d4a9e80a..ff438edd 100644 --- a/BUILDING_ON_WINDOWS.md +++ b/BUILDING_ON_WINDOWS.md @@ -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`) 3. Under this version, select the following entries: - `MSVC 2019 64-bit` (or `MSVC 2022 64-bit` from Qt 6.8 onwards) - - `Qt 5 Compatibility Module` - `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) 5. Continue through the installer and let the installer finish installing Qt. diff --git a/CHANGELOG.md b/CHANGELOG.md index 520f9076..eb0576fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ - Dev: Find Boost's CMake Config file instead of module file. (#6499) - Dev: Fix 32-bit compile in PluginRepl. (#6483) - Dev: Fix the WinGet release workflow. (#6497) +- Dev: Removed dependency to Qt5 Compatibility module by updating libcommuni. (#6500) ## 2.5.4 diff --git a/lib/libcommuni b/lib/libcommuni index 2979eb96..bb5417c4 160000 --- a/lib/libcommuni +++ b/lib/libcommuni @@ -1 +1 @@ -Subproject commit 2979eb96262756047a8dca47f2e509168138c0d0 +Subproject commit bb5417c451d764f57f2f1b3e1c9a81496b5521bd diff --git a/vcpkg.json b/vcpkg.json index 4ae4829b..e323cb11 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -13,11 +13,6 @@ "boost-json", "boost-signals2", "boost-variant", - { - "name": "qt5compat", - "default-features": false, - "features": ["textcodec"] - }, { "name": "qtbase", "default-features": false,