Eric Schirra
02cff7e979
- Update to 3.1.0
- desktop#2221 Make QML code more declarative by using properties
- desktop#2497 MacOS: Fix memory leak in FolderWatcherPrivate::startWatching
- desktop#2500 Windows MSI: Update Docs & add SKIPAUTOUPDATE property
- desktop#2512 Handle redirects when downloading updates
- desktop#2514 Make it easier for user to provide debug information
- desktop#2520 Handle ask for optional password capability
- desktop#2521 Use friendly user agent during authentication
- desktop#2527 Improve conflict handling gui
- desktop#2530 Repair the Windows build
- desktop#2531 Bring back the "Pause sync" action in the systray context menu
- desktop#2534 Connection wizard improvements
- desktop#2540 Add last / to exclude list file path.
- desktop#2541 Don't use nullptr for QFlags
- desktop#2542 Avoid string translation puzzle
- desktop#2543 Update bookmarks location
- desktop#2551 Fix share dialog animation for enforced password policy
- desktop#2568 Fix crash when clicking on folder with status 403 in the main dialog.
- desktop#2572 Avoid depth infinity propfind for e2ee
- desktop#2575 Expose branding values to qtquick
- desktop#2580 Delay initialization of SettingsDialog
- desktop#2581 Ensure we quickly show/hide the systray window on startup
- desktop#2582 Also output the event flags in the debug logs
- desktop#2586 L10n: Add a space in generalsettings.ui
- desktop#2587 Triple dot to ellipsis
- desktop#2589 Misc fixes for Windows 7
- desktop#2591 Remove last left over of the "remote" wording
- desktop#2603 Get rid of FindQt5Keychain.cmake
- desktop#2615 Fetch apps when we get connected only
- desktop#2616 Move journaldb files back to sync folders
- desktop#2620 Make sure the settings dialog exist before hiding it
- desktop#2621 [documentation] upload chunks config
- desktop#2630 Master is now 3.0.81
- desktop#2647 Cherry pick updater fixes and improvements
- desktop#2648 Issue a warning for Debian pipeline failures but don't fail the CI
- desktop#2652 Handle the case when the release version differs from that in VERSION.cmake
- desktop#2655 Use dynamic path for account online/offline state icon.
Refresh GUI on connection state change.
- desktop#2658 Enable the QML debugger on debug builds
- desktop#2660 FolderWatcher: fixes and improvements
- desktop#2662 Fix QML debugging by removing incorrect dependency
- desktop#2663 Fix Windows compilation broken after QML debugging fix.
- desktop#2665 Sparkle build fixes
- desktop#2666 Notification action buttons and context menu
- desktop#2667 Master is now 3.0.82.
- desktop#2675 Fix AppImage build
- desktop#2677 Fix macOS bug where tray window causes spaces to switch
- desktop#2682 Add debug log to check which folders are being skipped during syncing.
- desktop#2685 Fixed slow sharee search in the share dialog
- desktop#2686 Added sharing via email.
- desktop#2690 Update documentation on how to generate debug logs.
- desktop#2696 Bump master version to 3.1.0
- Rebase nextcloud-desktop-fix-rpath.patch.
OBS-URL: https://build.opensuse.org/request/show/855770
OBS-URL: https://build.opensuse.org/package/show/network/nextcloud-desktop?expand=0&rev=28
73 lines
3.8 KiB
Diff
73 lines
3.8 KiB
Diff
Index: desktop-3.1.0/src/cmd/CMakeLists.txt
|
|
===================================================================
|
|
--- desktop-3.1.0.orig/src/cmd/CMakeLists.txt
|
|
+++ desktop-3.1.0/src/cmd/CMakeLists.txt
|
|
@@ -23,8 +23,13 @@ if(NOT BUILD_LIBRARIES_ONLY)
|
|
add_executable(${cmd_NAME} ${cmd_SRC})
|
|
set_target_properties(${cmd_NAME} PROPERTIES
|
|
RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} )
|
|
+ if(LIB_INSTALL_DIR MATCHES "^/")
|
|
+ set_target_properties(${cmd_NAME} PROPERTIES
|
|
+ INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
|
|
+ else()
|
|
set_target_properties(${cmd_NAME} PROPERTIES
|
|
INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
|
|
+ endif()
|
|
|
|
target_link_libraries(${cmd_NAME} ocsync ${synclib_NAME} Qt5::Core Qt5::Network)
|
|
|
|
Index: desktop-3.1.0/src/crashreporter/CMakeLists.txt
|
|
===================================================================
|
|
--- desktop-3.1.0.orig/src/crashreporter/CMakeLists.txt
|
|
+++ desktop-3.1.0/src/crashreporter/CMakeLists.txt
|
|
@@ -29,7 +29,11 @@ if(NOT BUILD_LIBRARIES_ONLY)
|
|
target_include_directories(${CRASHREPORTER_EXECUTABLE} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
|
|
set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES AUTOMOC ON)
|
|
set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} )
|
|
+ if(LIB_INSTALL_DIR MATCHES "^/")
|
|
+ set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
|
|
+ else()
|
|
set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
|
|
+ endif()
|
|
target_link_libraries(${CRASHREPORTER_EXECUTABLE}
|
|
crashreporter-gui
|
|
Qt5::Core Qt5::Widgets
|
|
Index: desktop-3.1.0/src/gui/CMakeLists.txt
|
|
===================================================================
|
|
--- desktop-3.1.0.orig/src/gui/CMakeLists.txt
|
|
+++ desktop-3.1.0/src/gui/CMakeLists.txt
|
|
@@ -325,8 +325,13 @@ set_target_properties( ${APPLICATION_EXE
|
|
RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY}
|
|
)
|
|
# Only relevant for Linux? On OS X it by default properly checks in the bundle directory next to the exe
|
|
-set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
|
|
+if(LIB_INSTALL_DIR MATCHES "^/")
|
|
+ set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
|
|
+ INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
|
|
+else()
|
|
+ set_target_properties( ${APPLICATION_EXECUTABLE} PROPERTIES
|
|
INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
|
|
+endif()
|
|
|
|
target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::GuiPrivate Qt5::Svg Qt5::Network Qt5::Xml Qt5::Qml Qt5::Quick Qt5::QuickControls2 Qt5::WebEngineWidgets)
|
|
target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )
|
|
Index: desktop-3.1.0/src/libsync/CMakeLists.txt
|
|
===================================================================
|
|
--- desktop-3.1.0.orig/src/libsync/CMakeLists.txt
|
|
+++ desktop-3.1.0/src/libsync/CMakeLists.txt
|
|
@@ -126,8 +126,13 @@ set_target_properties( ${synclib_NAME}
|
|
SOVERSION ${MIRALL_SOVERSION}
|
|
RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY}
|
|
)
|
|
-set_target_properties( ${synclib_NAME} PROPERTIES
|
|
+if(LIB_INSTALL_DIR MATCHES "^/")
|
|
+ set_target_properties( ${synclib_NAME} PROPERTIES
|
|
+ INSTALL_RPATH "${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
|
|
+else()
|
|
+ set_target_properties( ${synclib_NAME} PROPERTIES
|
|
INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
|
|
+endif()
|
|
|
|
if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)
|
|
install(TARGETS ${synclib_NAME}
|