pool/nextcloud-desktop
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 828583 from network

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/828583
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nextcloud-desktop?expand=0&rev=4
This commit is contained in:
Dominique Leuenberger 2020-08-24 13:10:05 +00:00 committed by Git OBS Bridge
commit 87c8d66a11
6 changed files with 72 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nextcloud-desktop-2.6.5.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ffb40a2cd15c39baf44edd4a8e64c851eca5602b98fc5421f3c4862740e7c789
size 19128719

3
nextcloud-desktop-3.0.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f99bf467c5bb4b6535d41f186743f7bfc7b376ac584f89fea3e1520d2aead7f7
size 19060293

50
nextcloud-desktop-fix-rpath.patch
View File

@ -1,45 +1,39 @@
Index: desktop-2.6.5/src/cmd/CMakeLists.txt
===================================================================
--- desktop-2.6.5.orig/src/cmd/CMakeLists.txt
+++ desktop-2.6.5/src/cmd/CMakeLists.txt
@@ -23,8 +23,13 @@ if(NOT BUILD_LIBRARIES_ONLY)
diff -burNE desktop-3.0.0.orig/src/cmd/CMakeLists.txt desktop-3.0.0/src/cmd/CMakeLists.txt
--- desktop-3.0.0.orig/src/cmd/CMakeLists.txt 2020-08-21 09:16:36.442970505 +0200
+++ desktop-3.0.0/src/cmd/CMakeLists.txt 2020-08-21 09:17:05.485724098 +0200
@@ -23,8 +23,13 @@
add_executable(${cmd_NAME} ${cmd_SRC})
set_target_properties(${cmd_NAME} PROPERTIES
RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} )
- set_target_properties(${cmd_NAME} PROPERTIES
- INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
+ 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}" )
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-2.6.5/src/crashreporter/CMakeLists.txt
===================================================================
--- desktop-2.6.5.orig/src/crashreporter/CMakeLists.txt
+++ desktop-2.6.5/src/crashreporter/CMakeLists.txt
@@ -29,7 +29,11 @@ if(NOT BUILD_LIBRARIES_ONLY)
diff -burNE desktop-3.0.0.orig/src/crashreporter/CMakeLists.txt desktop-3.0.0/src/crashreporter/CMakeLists.txt
--- desktop-3.0.0.orig/src/crashreporter/CMakeLists.txt 2020-08-21 09:16:36.518967243 +0200
+++ desktop-3.0.0/src/crashreporter/CMakeLists.txt 2020-08-21 09:17:05.489723926 +0200
@@ -29,7 +29,11 @@
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} )
- set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE}" )
+ 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}" )
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-2.6.5/src/gui/CMakeLists.txt
===================================================================
--- desktop-2.6.5.orig/src/gui/CMakeLists.txt
+++ desktop-2.6.5/src/gui/CMakeLists.txt
@@ -310,8 +310,13 @@ set_target_properties( ${APPLICATION_EXE
diff -burNE desktop-3.0.0.orig/src/gui/CMakeLists.txt desktop-3.0.0/src/gui/CMakeLists.txt
--- desktop-3.0.0.orig/src/gui/CMakeLists.txt 2020-08-21 09:16:36.650961579 +0200
+++ desktop-3.0.0/src/gui/CMakeLists.txt 2020-08-21 09:17:05.493723755 +0200
@@ -311,8 +311,13 @@
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
@ -52,24 +46,22 @@ Index: desktop-2.6.5/src/gui/CMakeLists.txt
INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
+endif()
target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::Network Qt5::Xml Qt5::WebEngineWidgets)
target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::Svg Qt5::Network Qt5::Xml Qt5::Qml Qt5::Quick Qt5::QuickControls2 Qt5::WebEngineWidgets)
target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} )
Index: desktop-2.6.5/src/libsync/CMakeLists.txt
===================================================================
--- desktop-2.6.5.orig/src/libsync/CMakeLists.txt
+++ desktop-2.6.5/src/libsync/CMakeLists.txt
@@ -130,8 +130,13 @@ set_target_properties( ${synclib_NAME}
diff -burNE desktop-3.0.0.orig/src/libsync/CMakeLists.txt desktop-3.0.0/src/libsync/CMakeLists.txt
--- desktop-3.0.0.orig/src/libsync/CMakeLists.txt 2020-08-21 09:16:37.282934457 +0200
+++ desktop-3.0.0/src/libsync/CMakeLists.txt 2020-08-21 09:17:05.501723411 +0200
@@ -131,8 +131,13 @@
SOVERSION ${MIRALL_SOVERSION}
RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY}
)
-set_target_properties( ${synclib_NAME} PROPERTIES
- INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
+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}" )
INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/${APPLICATION_EXECUTABLE};${CMAKE_INSTALL_RPATH}" )
+endif()
if(NOT BUILD_OWNCLOUD_OSX_BUNDLE)

14
nextcloud-desktop-remove-datetime.patch
View File

@ -1,6 +1,7 @@
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -124,7 +124,7 @@ html_static_path = ['_shared_assets/stat
diff -burNE desktop-3.0.0.orig/doc/conf.py desktop-3.0.0/doc/conf.py
--- desktop-3.0.0.orig/doc/conf.py 2020-08-21 22:36:32.434056247 +0200
+++ desktop-3.0.0/doc/conf.py 2020-08-21 22:36:57.345005233 +0200
@@ -124,7 +124,7 @@
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
@ -9,9 +10,10 @@
# If true, SmartyPants will be used to convert quotes and dashes to
# typographically correct entities.
--- a/src/libsync/theme.cpp
+++ b/src/libsync/theme.cpp
@@ -319,11 +319,9 @@ QString Theme::gitSHA1() const
diff -burNE desktop-3.0.0.orig/src/libsync/theme.cpp desktop-3.0.0/src/libsync/theme.cpp
--- desktop-3.0.0.orig/src/libsync/theme.cpp 2020-08-21 22:36:34.789956849 +0200
+++ desktop-3.0.0/src/libsync/theme.cpp 2020-08-21 22:36:57.349005064 +0200
@@ -338,11 +338,9 @@
const QString gitSha1(QLatin1String(GIT_SHA1));
devString = QCoreApplication::translate("nextcloudTheme::about()",
"<p><small>Built from Git revision <a href=\"%1\">%2</a>"

37
nextcloud-desktop.changes
View File

@ -1,3 +1,40 @@
-------------------------------------------------------------------
Fri Aug 21 07:26:59 UTC 2020 - Mathias Homann <Mathias.Homann@opensuse.org>
- Update to 3.0.0
- #1886 Move the proxyfiles to libsync where they make more sense
- #1939 Major multi monitor improvements and rewrite of tray window positioning
- #2093 Add photothumb.db to sync-exclude.lst
- #2099 Ease access to main dialog
- #2106 Fix libsync exports for proxy changes in #1886
- #2110 Darken menu border color
- #2119 Fix SEGV (due to circular ownership) at exit
- #2126 Slightly simplify code for Systray positioning
- #2127 ConfigFile security: Migrate Proxy password to keychain
- #2128 Fix subfolder encryption scheme
- #2139 Fix e2ee folder sync connection
- #2144 Fix e2ee upload lock starvation
- #2145 Repair and improve logging
- #2150 Fix e2e moves handling
- #2159 Reach out to the contentItem inside of the ListView to find the width
- #2167 Fix url decoding for folder encryption status
- #2168 Display the correct default permissions when creating a share.
- #2177 Share link display the correct permissions for files and folders.
- #2183 Prevent empty FileMap in local csync to be processed if folder not empty
- #2188 Move existing syncjournal db files from client ver <2.7
- #2201 Disable parallelism for e2e remote mkdir jobs
- #2209 Fix pause sync states
- #2211 Logo update for 2.7
- #2213 Drone: Upload AppImage to GitHub using nextcloud-desktop-bot
- #2215 Change ownCloud reference to Nextcloud
- #2224 Update CI for Qt 5.12.9
- #2227 Support png for branded clients systray
- #2245 Fix #2243
- #2248 There won't be a 2.7, this is called 3.0 instead
- #2257 [stable-3.0] Restore E2EE old key storage format compatibility
- #2259 [stable-3.0] Keep the E2EE info message around to allow displaying mnemonic
-------------------------------------------------------------------
Thu Jul 9 17:43:21 UTC 2020 - ecsos <ecsos@opensuse.org>

4
nextcloud-desktop.spec
View File

@ -19,7 +19,7 @@
%define soname libnextcloudsync
%define sover 0
Name: nextcloud-desktop
Version: 2.6.5
Version: 3.0.0
Release: 0
Summary: Nextcloud desktop synchronisation client
License: GPL-2.0-or-later AND LGPL-3.0-or-later
@ -48,7 +48,9 @@ BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5PrintSupport)
BuildRequires: pkgconfig(Qt5QuickControls2)
BuildRequires: pkgconfig(Qt5Sql)
BuildRequires: pkgconfig(Qt5Svg)
BuildRequires: pkgconfig(Qt5WebEngineWidgets)
BuildRequires: pkgconfig(Qt5WebKitWidgets)
BuildRequires: pkgconfig(Qt5Xml)