From 16c0472d4dee71ac89e7c147ca9ab6aa7da22b02 Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Wed, 10 Jul 2024 14:48:27 +0100 Subject: [PATCH] Add `qt6-qpa-plugins` Qt dependency for Debian (#7380) * Add qt6-qpa-plugins * Update ChangeLog --- ChangeLog | 2 +- cmake/Packaging.cmake | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a8a1dbf68..dbbac564b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -46,7 +46,7 @@ Enhancements: - #7374 Add missing DEB and RPM dependencies - #7376 Automated weekly build of Docker images for Linux runners - #7378 Improve workflow triggers to ensure correct run time - +- #7380 Add `qt6-qpa-plugins` Qt dependency for Debian # 1.14.6 diff --git a/cmake/Packaging.cmake b/cmake/Packaging.cmake index 8a4e508f2..441b0e470 100644 --- a/cmake/Packaging.cmake +++ b/cmake/Packaging.cmake @@ -24,6 +24,7 @@ macro(configure_packaging) set(CPACK_PACKAGE_CONTACT "Synergy ") set(CPACK_PACKAGE_DESCRIPTION "Mouse and keyboard sharing utility") set(CPACK_PACKAGE_VENDOR "Symless") + set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE") if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") configure_windows_packaging() @@ -92,6 +93,11 @@ macro(configure_linux_packaging) set(CPACK_DEBIAN_PACKAGE_SECTION "utils") set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) + # HACK: The GUI depends on the Qt6 QPA plugins package, but that's not picked + # up by shlibdeps on Ubuntu 22 (though not a problem on Ubuntu 24 and Debian + # 12), so we must add it manually. + set(CPACK_DEBIAN_PACKAGE_DEPENDS "qt6-qpa-plugins") + set(CPACK_RPM_PACKAGE_LICENSE "GPLv2") set(CPACK_RPM_PACKAGE_GROUP "Applications/System")