From 45d2ae67af751d522d149d9fc18484d6ac85e62209f8c0f9c76ef0e98ed9d7cf Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Thu, 9 Jul 2020 18:54:20 +0000 Subject: [PATCH] Accepting request 819778 from home:ecsos Update to 2.6.5 OBS-URL: https://build.opensuse.org/request/show/819778 OBS-URL: https://build.opensuse.org/package/show/network/nextcloud-desktop?expand=0&rev=16 --- nextcloud-desktop-2.6.4.tar.gz | 3 - nextcloud-desktop-2.6.5.tar.gz | 3 + nextcloud-desktop-fix-rpath.patch | 30 ++++++---- nextcloud-desktop-qt_5.15.patch | 11 ---- nextcloud-desktop.changes | 93 +++++++++++++++++++++++++++++++ nextcloud-desktop.spec | 12 ++-- 6 files changed, 120 insertions(+), 32 deletions(-) delete mode 100644 nextcloud-desktop-2.6.4.tar.gz create mode 100644 nextcloud-desktop-2.6.5.tar.gz delete mode 100644 nextcloud-desktop-qt_5.15.patch diff --git a/nextcloud-desktop-2.6.4.tar.gz b/nextcloud-desktop-2.6.4.tar.gz deleted file mode 100644 index 8dfa6bf..0000000 --- a/nextcloud-desktop-2.6.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aea4dff6bf2a6bd2b783a6175ac2393ffcae2949536b15def7aae4372f0c24ef -size 19035129 diff --git a/nextcloud-desktop-2.6.5.tar.gz b/nextcloud-desktop-2.6.5.tar.gz new file mode 100644 index 0000000..097570b --- /dev/null +++ b/nextcloud-desktop-2.6.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ffb40a2cd15c39baf44edd4a8e64c851eca5602b98fc5421f3c4862740e7c789 +size 19128719 diff --git a/nextcloud-desktop-fix-rpath.patch b/nextcloud-desktop-fix-rpath.patch index 40db1f7..5412f2f 100644 --- a/nextcloud-desktop-fix-rpath.patch +++ b/nextcloud-desktop-fix-rpath.patch @@ -1,5 +1,7 @@ ---- a/src/cmd/CMakeLists.txt -+++ b/src/cmd/CMakeLists.txt +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) add_executable(${cmd_NAME} ${cmd_SRC}) set_target_properties(${cmd_NAME} PROPERTIES @@ -16,8 +18,10 @@ target_link_libraries(${cmd_NAME} ocsync ${synclib_NAME} Qt5::Core Qt5::Network) ---- a/src/crashreporter/CMakeLists.txt -+++ b/src/crashreporter/CMakeLists.txt +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) target_include_directories(${CRASHREPORTER_EXECUTABLE} PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) set_target_properties(${CRASHREPORTER_EXECUTABLE} PROPERTIES AUTOMOC ON) @@ -31,9 +35,11 @@ target_link_libraries(${CRASHREPORTER_EXECUTABLE} crashreporter-gui Qt5::Core Qt5::Widgets ---- a/src/gui/CMakeLists.txt -+++ b/src/gui/CMakeLists.txt -@@ -302,8 +302,13 @@ set_target_properties( ${APPLICATION_EXE +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 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 @@ -46,11 +52,13 @@ 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) + target_link_libraries( ${APPLICATION_EXECUTABLE} Qt5::Widgets Qt5::Network Qt5::Xml Qt5::WebEngineWidgets) target_link_libraries( ${APPLICATION_EXECUTABLE} ${synclib_NAME} ) ---- a/src/libsync/CMakeLists.txt -+++ b/src/libsync/CMakeLists.txt -@@ -128,8 +128,13 @@ set_target_properties( ${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} SOVERSION ${MIRALL_SOVERSION} RUNTIME_OUTPUT_DIRECTORY ${BIN_OUTPUT_DIRECTORY} ) diff --git a/nextcloud-desktop-qt_5.15.patch b/nextcloud-desktop-qt_5.15.patch deleted file mode 100644 index 87370a5..0000000 --- a/nextcloud-desktop-qt_5.15.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Pdpru desktop-2.6.4.orig/src/libsync/networkjobs.cpp desktop-2.6.4/src/libsync/networkjobs.cpp ---- desktop-2.6.4.orig/src/libsync/networkjobs.cpp 2020-03-03 20:32:31.000000000 +0100 -+++ desktop-2.6.4/src/libsync/networkjobs.cpp 2020-06-08 16:47:12.416486640 +0200 -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - #include "networkjobs.h" - #include "account.h" diff --git a/nextcloud-desktop.changes b/nextcloud-desktop.changes index 084c0bb..7ec6544 100644 --- a/nextcloud-desktop.changes +++ b/nextcloud-desktop.changes @@ -1,3 +1,96 @@ +------------------------------------------------------------------- +Thu Jul 9 17:43:21 UTC 2020 - ecsos + +- Update to 2.6.5 + - #1449 Linux/Wayland: Updated .desktop file naming scheme + - #1834 Use print() function in both Python 2 and Python 3 + - #1835 Added build for Focal + - #1838 Allow sharing to circles + - #1839 Added Focal-specific files + - #1841 Allow sharing to circles + - #1843 Enhance Version info display (minimal info, hide details) + - #1847 Updater: Enhance UI, make build optional + - #1848 WebView: Add missing Q_OBJECT macros + - #1851 Enhance Version info display (minimal info, hide details) + - #1853 Updater: Fix Tests build (failed with BUILD_UPDATER=NO) + - #1854 Updater: Fix Tests build (failed with BUILD_UPDATER=NO) + - #1855 WebView: Add missing Q_OBJECT macros + - #1859 Provide specific install file for Debian oldstable + - #1879 Add desktop-entry hint to notifications + - #1880 Remove timeout parameter from showMessage + - #1881 Use qEnvironmentVariableIsEmpty + - #1882 Fix container detaching + - #1883 [dolphin] Add icon to context menu + - #1886 Move the proxyfiles to libsync where they make more sense + - #1909 Fix build with Qt 5.15 + - #1931 Fix container detaching + - #1932 [dolphin] Add icon to context menu + - #1933 Fix build of Dolphin integration + - #1934 Fix build of Dolphin integration + - #1954 Fix typos. + - #1956 Update ChangeLog with 2.6 series. + - #1958 Resolve symlinks when checking for registered paths. + - #1972 Fix leak in FileUtil::IsChildFile + - #1973 Fix leak in FileUtil::IsChildFile + - #1974 Don't silently kill debug messages + - #1975 Don't silently kill debug messages + - #1986 Properly handle denormalized href + - #1987 Fix a few leaks + - #1988 Use nullptr when appropriate + - #1989 Remove useless virtual, better use override only + - #1991 Improve sanitizer support + - #1992 Update github links to desktop repository + - #1996 Properly handle denormalized href + - #1997 Use nullptr when appropriate + - #1998 Update github links to desktop repository + - #1999 Remove useless virtual, better use override only + - #2000 Don't use int literals for bools + - #2001 Use default member initialization + - #2005 Use default member initialization + - #2006 Improve URL input field in Wizard + - #2007 Improve URL input field in Wizard + - #2017 Remove redundant initializer + - #2018 Use using instead of typedef + - #2019 Remove redundant void argument list + - #2020 Use make_unique when appropriate + - #2021 Use = default for trivial ctors and dtors + - #2023 Use the return braced init list pattern + - #2024 Use raw string literals when appropriate + - #2025 Remove redundant initializer + - #2026 Use using instead of typedef + - #2027 Remove redundant void argument list + - #2028 Use make_unique when appropriate + - #2029 Use = default for trivial ctors and dtors + - #2032 TestLaunchOnStartup shouldn't fail on dev setup + - #2033 Use the return braced init list pattern + - #2034 testLaunchOnStartup shouldn't fail on dev setup + - #2051 Remove Submodule binary (old upstream binaries) + - #2052 Remove Submodule binary (old upstream binaries) + - #2061 Improve command line version info and help display (gui & cmd) + - #2062 Improve command line version info and help display (gui & cmd) + - #2063 MacOS: Opt In to Dark Mode for building against older macOS SDKs < 10.14 + - #2064 macOS: Opt In to Dark Mode for building against older macOS SDKs < 10.14 + - #2065 Use APPLICATION_ICON_NAME for autostart icon + - #2068 Don't show a message box if the entered url returned an error + - #2069 Use APPLICATION_ICON_NAME for autostart icon + - #2071 Linux/Wayland: Updated .desktop file naming scheme + - #2072 AppImage: Upgrade to Qt 5.12.8 + - #2078 Replace NULL by nullptr in all C++ files + - #2083 Simplify nullptr comparisons where appropriate + - #2084 macOS: Use macdeployqt instead of the old admin/osx/macdeployqt.py + - #2093 Add photothumb.db to sync-exclude.lst + - #2106 Fix libsync exports for proxy changes in #1886 + - #2109 Default system proxy not working with Account Wizard (fixes #2108) + - #2127 ConfigFile security: Migrate Proxy password to keychain + - #2147 Repair and improve logging + - #2152 Don't display quota information when the user has no quota. + - #2162 ConfigFile security: Migrate Proxy password to keychain + - #2168 Display the correct default permissions when creating a share. + - #2170 [stable 2.6] Asemmar/issue 2137 + - #2177 Share link display the correct permissions for files and folders. + - #2179 Display the correct default permissions when creating a share. +- Drop nextcloud-desktop-qt_5.15.patch because now in upstream. + ------------------------------------------------------------------- Mon Jun 8 14:52:29 UTC 2020 - ecsos diff --git a/nextcloud-desktop.spec b/nextcloud-desktop.spec index aaeb668..61a24fd 100644 --- a/nextcloud-desktop.spec +++ b/nextcloud-desktop.spec @@ -19,7 +19,7 @@ %define soname libnextcloudsync %define sover 0 Name: nextcloud-desktop -Version: 2.6.4 +Version: 2.6.5 Release: 0 Summary: Nextcloud desktop synchronisation client License: GPL-2.0-or-later AND LGPL-3.0-or-later @@ -31,8 +31,6 @@ Source1: sysctl-sync-inotify.conf Patch0: nextcloud-desktop-fix-rpath.patch # PATCH-FIX-OPENSUSE nextcloud-desktop-remove-datetime.patch sor.alexei@meowr.ru -- Remove __TIME__ and __DATE__. Patch1: nextcloud-desktop-remove-datetime.patch -# PATCH-FIX-OPENSUSE nextcloud-desktop-qt_5.15.patch - Fix build error with QT 5.15. -Patch2: %{name}-qt_5.15.patch BuildRequires: AppStream BuildRequires: cmake >= 3.2 BuildRequires: fdupes @@ -61,6 +59,7 @@ BuildRequires: pkgconfig(zlib) Requires: %{soname}%{sover} = %{version} Provides: nextcloud-client = %{version} Obsoletes: nextcloud-client < %{version} +Provides: nextcloud-client-lang = %{version} Obsoletes: nextcloud-client-lang < %{version} %if 0%{?is_opensuse} BuildRequires: doxygen @@ -105,7 +104,7 @@ The Nextcloud Desktop Client synchronisation library. %package -n %{soname}-devel Summary: Development files for the Nextcloud synchronisation library -Group: Productivity/Networking/File-Sharing +Group: Development/Libraries/C and C++ Requires: %{soname}%{sover} = %{version} %description -n %{soname}-devel @@ -168,7 +167,6 @@ Dolphin filemanager to display overlay icons. %setup -q -n desktop-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 cp -a %{SOURCE1} sysctl-sync-inotify.conf %build @@ -205,7 +203,7 @@ done #install -Dpm 0644 sysctl-sync-inotify.conf \ # %%{buildroot}%%{_sysconfdir}/sysctl.d/99-%%{name}-sync-inotify.conf -%suse_update_desktop_file nextcloud +%suse_update_desktop_file com.nextcloud.desktopclient.nextcloud %fdupes %{buildroot}%{_datadir}/ %post -n %{soname}%{sover} -p /sbin/ldconfig @@ -218,7 +216,7 @@ done #%%config %%{_sysconfdir}/sysctl.d/99-%%{name}-sync-inotify.conf %{_bindir}/nextcloud* %dir %{_datadir}/nextcloud/ -%{_datadir}/applications/nextcloud.desktop +%{_datadir}/applications/com.nextcloud.desktopclient.nextcloud.desktop %dir %{_datadir}/icons/hicolor/1024x1024/ %dir %{_datadir}/icons/hicolor/1024x1024/apps/ %{_datadir}/icons/hicolor/*/apps/Nextcloud*.*