From 62011039fc825145c9eef2f93828183ea89daf1a37265865718a37ba87efbe0b Mon Sep 17 00:00:00 2001 From: Eric Schirra Date: Fri, 29 Jul 2022 16:43:35 +0000 Subject: [PATCH] Accepting request 991739 from home:ecsos - Update to 3.5.3 - desktop#4726 [stable-3.5] Fix the system tray menu not being correctly replaced in setupContextMenu on GNOME - desktop#4727 [stable-3.5] Ensure call notification stays on top of other windows - desktop#4729 [stable-3.5] Work around issues with window positioning on Linux DEs, hardcode tray window to screen center when new account added - desktop#4731 [stable-3.5] Clean up systray methods, make more QML-friendly - desktop#4739 [stable-3.5] Refactor tray window opening code for clarity and efficiency - desktop#4740 [stable-3.5] Only set _FORTIFY_SOURCE when a higher level of this flag has not been set - desktop#4741 [stable-3.5] Limit concurrent notifications - desktop#4742 [stable-3.5] Take ints by value rather than reference in UserModel methods - desktop#4743 [stable-3.5] Respect skipAutoUpdateCheck in nextcloud.cfg with Sparkle on macOS - desktop#4744 [stable-3.5] Use preprocessor directive rather than normal 'if' for UNNotification types - desktop#4745 [stable-3.5] QML-ify the UserModel, use properties rather than setter methods - desktop#4750 [stable-3.5] Fix ActivityItemContent QML paintedWidth errors - desktop#4763 [stable-3.5] Stop clearing notifications when new notifications are received - desktop#4764 [stable-3.5] Ensure debug archive contents are readable by any user - desktop#4765 [stable-3.5] Stop styling QML unified search items hierarchically, use global Style constants - desktop#4766 [stable-3.5] Update macOS Info.plist - desktop#4767 [stable-3.5] print sync direction in SyncFileStatusTracker::slotAboutToPropagate - desktop#4772 [stable-3.5] Remove Ubuntu Impish, add Kinetic - desktop#4775 [stable-3.5] Ensure that throttled notifications still appear in tray activity model - desktop#4783 [stable-3.5] Make apps menu scrollable when content taller than available vertical space, preventing borking of layout - Drop nextcloud-remove-fortify-source-2.patch, because the fortify problem is now handled in code from upstream. OBS-URL: https://build.opensuse.org/request/show/991739 OBS-URL: https://build.opensuse.org/package/show/network/nextcloud-desktop?expand=0&rev=69 --- nextcloud-desktop-3.5.2.tar.gz | 3 --- nextcloud-desktop-3.5.3.tar.gz | 3 +++ nextcloud-desktop.changes | 29 ++++++++++++++++++++++ nextcloud-desktop.spec | 4 +-- nextcloud-remove-fortify-source-2.patch | 33 ------------------------- 5 files changed, 33 insertions(+), 39 deletions(-) delete mode 100644 nextcloud-desktop-3.5.2.tar.gz create mode 100644 nextcloud-desktop-3.5.3.tar.gz delete mode 100644 nextcloud-remove-fortify-source-2.patch diff --git a/nextcloud-desktop-3.5.2.tar.gz b/nextcloud-desktop-3.5.2.tar.gz deleted file mode 100644 index 689bfe1..0000000 --- a/nextcloud-desktop-3.5.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0c467310e1a1b32593446584c6a5d7a931b7e2da3d1721dac8b0ac53cc493088 -size 15433543 diff --git a/nextcloud-desktop-3.5.3.tar.gz b/nextcloud-desktop-3.5.3.tar.gz new file mode 100644 index 0000000..be9c026 --- /dev/null +++ b/nextcloud-desktop-3.5.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c581310d814cc5a075b77890112ba69774c9ed6d8c42b4d129635482d2cee57e +size 15436522 diff --git a/nextcloud-desktop.changes b/nextcloud-desktop.changes index 8c5c0bc..df8e524 100644 --- a/nextcloud-desktop.changes +++ b/nextcloud-desktop.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Fri Jul 29 16:09:27 UTC 2022 - ecsos + +- Update to 3.5.3 + - desktop#4726 [stable-3.5] Fix the system tray menu not being correctly replaced in setupContextMenu on GNOME + - desktop#4727 [stable-3.5] Ensure call notification stays on top of other windows + - desktop#4729 [stable-3.5] Work around issues with window positioning on Linux DEs, + hardcode tray window to screen center when new account added + - desktop#4731 [stable-3.5] Clean up systray methods, make more QML-friendly + - desktop#4739 [stable-3.5] Refactor tray window opening code for clarity and efficiency + - desktop#4740 [stable-3.5] Only set _FORTIFY_SOURCE when a higher level of this flag has not been set + - desktop#4741 [stable-3.5] Limit concurrent notifications + - desktop#4742 [stable-3.5] Take ints by value rather than reference in UserModel methods + - desktop#4743 [stable-3.5] Respect skipAutoUpdateCheck in nextcloud.cfg with Sparkle on macOS + - desktop#4744 [stable-3.5] Use preprocessor directive rather than normal 'if' for UNNotification types + - desktop#4745 [stable-3.5] QML-ify the UserModel, use properties rather than setter methods + - desktop#4750 [stable-3.5] Fix ActivityItemContent QML paintedWidth errors + - desktop#4763 [stable-3.5] Stop clearing notifications when new notifications are received + - desktop#4764 [stable-3.5] Ensure debug archive contents are readable by any user + - desktop#4765 [stable-3.5] Stop styling QML unified search items hierarchically, use global Style constants + - desktop#4766 [stable-3.5] Update macOS Info.plist + - desktop#4767 [stable-3.5] print sync direction in SyncFileStatusTracker::slotAboutToPropagate + - desktop#4772 [stable-3.5] Remove Ubuntu Impish, add Kinetic + - desktop#4775 [stable-3.5] Ensure that throttled notifications still appear in tray activity model + - desktop#4783 [stable-3.5] Make apps menu scrollable when content taller than available vertical space, + preventing borking of layout +- Drop nextcloud-remove-fortify-source-2.patch, because the fortify + problem is now handled in code from upstream. + ------------------------------------------------------------------- Mon Jul 4 17:09:14 UTC 2022 - ecsos diff --git a/nextcloud-desktop.spec b/nextcloud-desktop.spec index ba92770..00e379d 100644 --- a/nextcloud-desktop.spec +++ b/nextcloud-desktop.spec @@ -19,7 +19,7 @@ %define soname libnextcloudsync %define sover 0 Name: nextcloud-desktop -Version: 3.5.2 +Version: 3.5.3 Release: 0 Summary: Nextcloud desktop synchronisation client License: GPL-2.0-or-later AND LGPL-3.0-or-later @@ -29,8 +29,6 @@ Source: https://github.com/nextcloud/desktop/archive/v%{version}/%{name} Source1: sysctl-sync-inotify.conf # 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-remove-fortify-source-2.patch code@bnavigator.de -- Remove hardcoding of _FORTIFY_SOURCE=2 in order to not conflict with distribtion presets, boo#1201070, gh#nextcloud/desktop#4697 -Patch2: nextcloud-remove-fortify-source-2.patch BuildRequires: AppStream BuildRequires: cmake >= 3.2 BuildRequires: extra-cmake-modules diff --git a/nextcloud-remove-fortify-source-2.patch b/nextcloud-remove-fortify-source-2.patch deleted file mode 100644 index 636a2c4..0000000 --- a/nextcloud-remove-fortify-source-2.patch +++ /dev/null @@ -1,33 +0,0 @@ -Index: desktop-3.5.1/cmake/modules/DefineCompilerFlags.cmake -=================================================================== ---- desktop-3.5.1.orig/cmake/modules/DefineCompilerFlags.cmake -+++ desktop-3.5.1/cmake/modules/DefineCompilerFlags.cmake -@@ -45,15 +45,6 @@ if (${CMAKE_C_COMPILER_ID} MATCHES "(GNU - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector") - endif (WITH_STACK_PROTECTOR AND NOT WIN32) - -- if (CMAKE_BUILD_TYPE) -- string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER) -- if (CMAKE_BUILD_TYPE_LOWER MATCHES "(release|relwithdebinfo|minsizerel)") -- check_c_compiler_flag("-Wp,-D_FORTIFY_SOURCE=2" WITH_FORTIFY_SOURCE) -- if (WITH_FORTIFY_SOURCE) -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wp,-D_FORTIFY_SOURCE=2") -- endif (WITH_FORTIFY_SOURCE) -- endif() -- endif() - endif (${CMAKE_C_COMPILER_ID} MATCHES "(GNU|Clang)") - - if (UNIX AND NOT WIN32) -Index: desktop-3.5.1/src/CMakeLists.txt -=================================================================== ---- desktop-3.5.1.orig/src/CMakeLists.txt -+++ desktop-3.5.1/src/CMakeLists.txt -@@ -32,8 +32,6 @@ if(NOT MSVC) - - string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER) - if(CMAKE_BUILD_TYPE_LOWER MATCHES "(release|relwithdebinfo|minsizerel)") -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FORTIFY_SOURCE=2") -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_FORTIFY_SOURCE=2") - endif() - - if (CMAKE_CXX_COMPILER MATCHES "Clang")