From 6ddfb33852734f87e5889f9cfabd4e691676ecdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20No=C3=ABl?= Date: Sat, 9 Dec 2023 17:11:19 +0100 Subject: [PATCH] Avoid duplicate declarations with latest libcloudproviders MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Only install the .ini if the target version doen't support the .desktop file declaration. Signed-off-by: Corentin Noël --- shell_integration/libcloudproviders/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/shell_integration/libcloudproviders/CMakeLists.txt b/shell_integration/libcloudproviders/CMakeLists.txt index 2e7349ef7834f..0e71670a881cc 100644 --- a/shell_integration/libcloudproviders/CMakeLists.txt +++ b/shell_integration/libcloudproviders/CMakeLists.txt @@ -34,5 +34,8 @@ IF (Qt5DBus_FOUND) set(LIBCLOUDPROVIDERS_DBUS_OBJECT_PATH "/${DBUS_PREFIX}/${DBUS_VENDOR}/${DBUS_APPLICATION_NAME}") dbus_add_activation_service(org.freedesktop.CloudProviders.service.in) - libcloudproviders_add_config(org.freedesktop.CloudProviders.ini.in) + # The .ini file has been replaced by a declaration in the .desktop file in 0.3.3+ + if (${CLOUDPROVIDERS_VERSION} VERSION_LESS "0.3.3") + libcloudproviders_add_config(org.freedesktop.CloudProviders.ini.in) + endif () ENDIF ()