diff --git a/www/nextcloud-client/Portfile b/www/nextcloud-client/Portfile index 017750883546a..e5f73918b68bb 100644 --- a/www/nextcloud-client/Portfile +++ b/www/nextcloud-client/Portfile @@ -7,10 +7,10 @@ PortGroup compiler_blacklist_versions 1.0 PortGroup github 1.0 epoch 1 -github.setup nextcloud desktop 3.4.4 v -checksums rmd160 3a1a6ec0bf29efd43f23b4b731935e26cd7f3284 \ - sha256 8a3f60a3f7f35f6dbbf975216e194989631596554c09b89b6e38325210585663 \ - size 14352115 +github.setup nextcloud desktop 3.5.2 v +checksums rmd160 8175c77b5ad78618740ada31b7531ef57f87a5fb \ + sha256 161d82a4db5faabf3c69266b7b3aea1073ad98d14db6e3381fa1ae2a8fdef829 \ + size 15432939 revision 0 name nextcloud-client @@ -41,6 +41,11 @@ patchfiles patch-use-system-sqlite.diff \ patch-no-deployqt.diff \ patch-remove-inkscape.diff +# Fix builds pre macOS 11 - may be removed in future release +# Note that upstream patch doesn't work as-is; required updating to use preprocessor block, rather than runtime +# https://github.com/nextcloud/desktop/pull/4563/commits/4bdfe5927051741584b86ba6c45054f0679357d4 +patchfiles-append patch-fix-build-pre-macos-11.diff + cmake.install_prefix ${applications_dir} configure.args-append -DCMAKE_INSTALL_NAME_DIR=${applications_dir}/Nextcloud.app/Contents/MacOS \ diff --git a/www/nextcloud-client/files/patch-fix-build-pre-macos-11.diff b/www/nextcloud-client/files/patch-fix-build-pre-macos-11.diff new file mode 100644 index 0000000000000..e742bcebc04c6 --- /dev/null +++ b/www/nextcloud-client/files/patch-fix-build-pre-macos-11.diff @@ -0,0 +1,19 @@ +--- src/gui/systray.mm.orig 2022-07-11 15:31:05.040339481 -0400 ++++ src/gui/systray.mm 2022-07-11 15:32:04.592952997 -0400 +@@ -18,11 +18,11 @@ + willPresentNotification:(UNNotification *)notification + withCompletionHandler:(void (^)(UNNotificationPresentationOptions options))completionHandler + { +- if (@available(macOS 11.0, *)) { +- completionHandler(UNNotificationPresentationOptionSound + UNNotificationPresentationOptionBanner); +- } else { +- completionHandler(UNNotificationPresentationOptionSound + UNNotificationPresentationOptionAlert); +- } ++#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000 ++ completionHandler(UNNotificationPresentationOptionSound + UNNotificationPresentationOptionBanner); ++#else ++ completionHandler(UNNotificationPresentationOptionSound + UNNotificationPresentationOptionAlert); ++#endif + } + + - (void)userNotificationCenter:(UNUserNotificationCenter *)center