From 2ea96f1398e6f9da3e0cb0be273d030b85c78b67 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Fri, 20 Sep 2024 18:09:15 +0800 Subject: [PATCH 1/3] Bump up minimum system version to 11.0 on macOS (required by Qt 6) Signed-off-by: Claudio Cambra --- cmake/modules/MacOSXBundleInfo.plist.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/modules/MacOSXBundleInfo.plist.in b/cmake/modules/MacOSXBundleInfo.plist.in index 8327c2297..4fcf27c6a 100644 --- a/cmake/modules/MacOSXBundleInfo.plist.in +++ b/cmake/modules/MacOSXBundleInfo.plist.in @@ -5,7 +5,7 @@ NSPrincipalClass NSApplication LSMinimumSystemVersion - 10.13.0 + 11.0 LSUIElement CFBundleDevelopmentRegion From 4e3129f4f4e03ecdb20488e8c4e5a2ddb2f87342 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Fri, 20 Sep 2024 18:09:44 +0800 Subject: [PATCH 2/3] Downgrade deployment target variables to 11.0 as 12.0 is not necessary Signed-off-by: Claudio Cambra --- CMakeLists.txt | 2 +- craftmaster.ini | 2 +- .../NextcloudIntegration.xcodeproj/project.pbxproj | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 635ba0dfd..27102a6f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_policy(SET CMP0071 NEW) # Enable use of QtQuick compiler/generated code project(client) if(APPLE) - set(CMAKE_OSX_DEPLOYMENT_TARGET "12.0" CACHE STRING "Minimum OSX deployment version") + set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0" CACHE STRING "Minimum OSX deployment version") endif() set(CMAKE_CXX_STANDARD 17) diff --git a/craftmaster.ini b/craftmaster.ini index fbd083ba7..154902a5c 100644 --- a/craftmaster.ini +++ b/craftmaster.ini @@ -15,7 +15,7 @@ CreateCache = False # Category is case sensitive [GeneralSettings] -General/MacDeploymentTarget = 12.0 +General/MacDeploymentTarget = 11.0 Compile/BuildType = RelWithDebInfo diff --git a/shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj b/shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj index b2613dddd..57d1b0516 100644 --- a/shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj +++ b/shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.pbxproj @@ -942,7 +942,7 @@ "@executable_path/../Frameworks", "@loader_path/Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 12.0; + MACOSX_DEPLOYMENT_TARGET = 11.0; MARKETING_VERSION = 1.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; @@ -1004,7 +1004,7 @@ "@executable_path/../Frameworks", "@loader_path/Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 12.0; + MACOSX_DEPLOYMENT_TARGET = 11.0; MARKETING_VERSION = 1.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; @@ -1259,7 +1259,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 12.0; + MACOSX_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1310,7 +1310,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 12.0; + MACOSX_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; @@ -1365,7 +1365,7 @@ "@executable_path/../Frameworks", "@executable_path/../../../../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 12.0; + MACOSX_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = YES; OC_APPLICATION_NAME = ownCloud; OC_APPLICATION_REV_DOMAIN = com.owncloud.desktopclient; @@ -1419,7 +1419,7 @@ "@executable_path/../Frameworks", "@executable_path/../../../../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 12.0; + MACOSX_DEPLOYMENT_TARGET = 11.0; MTL_ENABLE_DEBUG_INFO = NO; OC_APPLICATION_NAME = ownCloud; OC_APPLICATION_REV_DOMAIN = com.owncloud.desktopclient; From f2deed5492e3bfaede2a1affcc15c92ae2808a55 Mon Sep 17 00:00:00 2001 From: Claudio Cambra Date: Fri, 20 Sep 2024 18:10:20 +0800 Subject: [PATCH 3/3] Remove now unneeded deployment target checks in CMake Signed-off-by: Claudio Cambra --- src/gui/CMakeLists.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 845066977..ce33b8fc0 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -275,9 +275,7 @@ IF( APPLE ) list(APPEND client_SRCS cocoainitializer_mac.mm) list(APPEND client_SRCS systray_mac_common.mm) - if (CMAKE_OSX_DEPLOYMENT_TARGET VERSION_GREATER_EQUAL 10.14) - list(APPEND client_SRCS systray_mac_usernotifications.mm) - endif() + list(APPEND client_SRCS systray_mac_usernotifications.mm) if (BUILD_FILE_PROVIDER_MODULE) list(APPEND client_SRCS @@ -706,7 +704,7 @@ endif() if (APPLE) if (BUILD_FILE_PROVIDER_MODULE) target_link_libraries(nextcloudCore PUBLIC "-framework UserNotifications -framework FileProvider") - elseif(CMAKE_OSX_DEPLOYMENT_TARGET VERSION_GREATER_EQUAL 10.14) + else() target_link_libraries(nextcloudCore PUBLIC "-framework UserNotifications") endif() endif()