Skip to content

Commit

Permalink
Remove basic support for libcloudproviders
Browse files Browse the repository at this point in the history
Fixes: #11148
  • Loading branch information
TheOneRing committed Aug 31, 2023
1 parent 3d98f43 commit 4a93c7d
Show file tree
Hide file tree
Showing 11 changed files with 8 additions and 428 deletions.
2 changes: 1 addition & 1 deletion .drone.star
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ def gui_test_pipeline(ctx):
return pipelines

def build_client(image = OC_CI_CLIENT, ctest = True):
cmake_options = '-G"%s" -DCMAKE_C_COMPILER="%s" -DCMAKE_CXX_COMPILER="%s" -DCMAKE_BUILD_TYPE="%s" -DWITH_LIBCLOUDPROVIDERS=ON'
cmake_options = '-G"%s" -DCMAKE_C_COMPILER="%s" -DCMAKE_CXX_COMPILER="%s" -DCMAKE_BUILD_TYPE="%s"'
cmake_options = cmake_options % (build_config["generator"], build_config["c_compiler"], build_config["cxx_compiler"], build_config["build_type"])

if ctest:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ jobs:
& "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c dev-utils/nsis
} elseif($IsLinux) {
& "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c dev-utils/linuxdeploy
& "${env:GITHUB_WORKSPACE}/.github/workflows/.craft.ps1" -c --set enableLibcloudproviders=true owncloud/owncloud-client
}
- name: Install dependencies
Expand Down
12 changes: 0 additions & 12 deletions THEME.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,6 @@ if(NOT DEFINED APPLICATION_VIRTUALFILE_SUFFIX)
set(APPLICATION_VIRTUALFILE_SUFFIX "${APPLICATION_SHORTNAME}_virtual" CACHE STRING "Virtual file suffix (not including the .)")
endif()

# Default dbus name and path
if(NOT DEFINED APPLICATION_CLOUDPROVIDERS_DBUS_NAME)
set(APPLICATION_CLOUDPROVIDERS_DBUS_NAME ${APPLICATION_REV_DOMAIN})
endif()
if(NOT DEFINED APPLICATION_CLOUDPROVIDERS_DBUS_PATH)
set(APPLICATION_CLOUDPROVIDERS_DBUS_PATH "/${APPLICATION_CLOUDPROVIDERS_DBUS_NAME}")
string(REPLACE "." "/" APPLICATION_CLOUDPROVIDERS_DBUS_PATH ${APPLICATION_CLOUDPROVIDERS_DBUS_PATH})
# sanitize string to valid characters, see https://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-marshaling-object-path
# note: as we just inserted some /, we may not replace them
string(REGEX REPLACE "[^a-zA-Z0-9_/]" "_" APPLICATION_CLOUDPROVIDERS_DBUS_PATH ${APPLICATION_CLOUDPROVIDERS_DBUS_PATH})
endif()

# need this logic to not mess with re/uninstallations via macosx.pkgproj
if(${APPLICATION_REV_DOMAIN} STREQUAL "com.owncloud.desktopclient")
set(APPLICATION_REV_DOMAIN_INSTALLER "com.ownCloud.client")
Expand Down
7 changes: 7 additions & 0 deletions changelog/unreleased/11157
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Change: Remove basic support of libcloudproviders

Since its implementation in 2019 it support wasn't well maintained by us.
Additionally as far as we can tell it was not picked up by any major Linux distribution.

https://github.com/owncloud/client/issues/11148
https://github.com/owncloud/client/pull/11157
2 changes: 0 additions & 2 deletions src/gui/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,6 @@ endif()
install(TARGETS owncloud ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})

if(UNIX AND NOT APPLE)
include(libcloudproviders/libcloudproviders.cmake)

configure_file(${CMAKE_SOURCE_DIR}/owncloud.desktop.in
${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_EXECUTABLE}.desktop)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${APPLICATION_EXECUTABLE}.desktop DESTINATION ${KDE_INSTALL_DATADIR}/applications )
Expand Down
4 changes: 0 additions & 4 deletions src/gui/libcloudproviders/cloud-provider.ini.in

This file was deleted.

46 changes: 0 additions & 46 deletions src/gui/libcloudproviders/libcloudproviders.cmake

This file was deleted.

240 changes: 0 additions & 240 deletions src/gui/libcloudproviders/libcloudproviders.cpp

This file was deleted.

39 changes: 0 additions & 39 deletions src/gui/libcloudproviders/libcloudproviders.h

This file was deleted.

Loading

0 comments on commit 4a93c7d

Please sign in to comment.