From e826e17c6ce6563b781f1b08f238e87432735664 Mon Sep 17 00:00:00 2001 From: ebbit1q Date: Sat, 17 Aug 2024 04:32:22 +0200 Subject: [PATCH] add qtimageformats module (#5092) * add qtimageformats module * add qt6-image-formats-plugins to apt depends in cmakelists * too many quotes * add qt6-qtimageformats to rpm deps --- .github/workflows/desktop-build.yml | 4 +--- CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml index 20ece9120..72efd4174 100644 --- a/.github/workflows/desktop-build.yml +++ b/.github/workflows/desktop-build.yml @@ -275,13 +275,11 @@ jobs: - target: 7 qt_version: 5.15.* qt_arch: msvc2019_64 - qt_tools: "tools_opensslv3_x64" - target: 10 qt_version: 6.5.* qt_arch: msvc2019_64 - qt_tools: "tools_opensslv3_x64" - qt_modules: "qtmultimedia qtwebsockets" + qt_modules: "qtimageformats qtmultimedia qtwebsockets" name: Windows ${{matrix.target}} needs: configure diff --git a/CMakeLists.txt b/CMakeLists.txt index 8cb0c3dd2..fae8c394d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -270,7 +270,7 @@ if(UNIX) set(CPACK_RPM_PACKAGE_LICENSE "GPLv2") set(CPACK_RPM_MAIN_COMPONENT "cockatrice") if(Qt6_FOUND) - set(CPACK_RPM_PACKAGE_REQUIRES "protobuf, qt6-qttools, qt6-qtsvg, qt6-qtmultimedia") + set(CPACK_RPM_PACKAGE_REQUIRES "protobuf, qt6-qttools, qt6-qtsvg, qt6-qtmultimedia, qt6-qtimageformats") elseif(Qt5_FOUND) set(CPACK_RPM_PACKAGE_REQUIRES "protobuf, qt5-qttools, qt5-qtsvg, qt5-qtmultimedia") endif() @@ -292,7 +292,7 @@ if(UNIX) set(CPACK_DEBIAN_PACKAGE_SECTION "games") set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "http://github.com/Cockatrice/Cockatrice") if(Qt6_FOUND) - set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt6multimedia6, libqt6svg6, qt6-qpa-plugins") + set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt6multimedia6, libqt6svg6, qt6-qpa-plugins, qt6-image-formats-plugins") elseif(Qt5_FOUND) set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt5multimedia5-plugins, libqt5svg5") endif()