Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix build on macOS versions pre-11 (down to 10.14) #4563

Merged
merged 1 commit into from
May 31, 2022
Merged

Fix build on macOS versions pre-11 (down to 10.14) #4563

merged 1 commit into from
May 31, 2022

Conversation

claucambra
Copy link
Collaborator

Fixes #4557

@claucambra claucambra self-assigned this May 18, 2022
@claucambra
Copy link
Collaborator Author

/backport to stable-3.5

@claucambra claucambra force-pushed the bugfix/pre-bigsur-build-fix branch 2 times, most recently from 861ca4f to 6082c90 Compare May 25, 2022 12:17
@claucambra
Fix builds on macOS versions pre-11
4bdfe59 
Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
@claucambra claucambra force-pushed the bugfix/pre-bigsur-build-fix branch from 6082c90 to 4bdfe59 Compare May 31, 2022 09:10
@sonarcloud
Copy link

sonarcloud bot commented May 31, 2022

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@claucambra claucambra merged commit 87ebd3f into master May 31, 2022
@claucambra claucambra deleted the bugfix/pre-bigsur-build-fix branch May 31, 2022 09:37
@backportbot-nextcloud backportbot-nextcloud bot mentioned this pull request May 31, 2022
Merged
@nextcloud-desktop-bot
Copy link

AppImage file: Nextcloud-PR-4563-4bdfe5927051741584b86ba6c45054f0679357d4-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@mgallien mgallien added this to the 3.6.0 milestone Jun 21, 2022
@mascguy
Copy link

mascguy commented Jul 11, 2022

This fix didn't work for us, on 10.14 and 10.15. Instead, the following was required:

#if __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000
    completionHandler(UNNotificationPresentationOptionSound + UNNotificationPresentationOptionBanner);
#else
    completionHandler(UNNotificationPresentationOptionSound + UNNotificationPresentationOptionAlert);
#endif

@claucambra claucambra mentioned this pull request Jul 12, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@allexzander allexzander allexzander approved these changes

@mgallien mgallien mgallien approved these changes

@camilasan camilasan Awaiting requested review from camilasan

Assignees

@claucambra claucambra

Labels
None yet
Projects
None yet
Milestone
3.6.0
5 participants
@claucambra @nextcloud-desktop-bot @mascguy @mgallien @allexzander