Merge pull request #6365 from nextcloud/backport/6275/stable-3.11

[stable-3.11] Avoid duplicate declarations with latest libcloudproviders
nextcloud · Jan 29, 2024 · df6c483 · df6c483
2 parents c65a8fd + 1d3f242
commit df6c483
Showing 1 changed file with 4 additions and 1 deletion.
diff --git 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 ()