[graphics/krita/krita/6.0] /: [macos] Update MacOS target 10.14->10.15
Dmitry Kazakov <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit b5de53c23343512531808f36959a88cfe1aad842 by Dmitry Kazakov.
Committed on 27/07/2026 at 11:04.
Pushed by dkazakov into branch 'krita/6.0'.
[macos] Update MacOS target 10.14->10.15
Our deps now require access to std::filesystem, which is not
available on 10.14.
M +1 -1 CMakeLists.txt
M +2 -2 build-tools/ci-scripts/macos.yml
M +1 -1 packaging/macos/macos-deploy.py
M +2 -2 packaging/macos/macos_signdmg.py
https://invent.kde.org/graphics/krita/-/commit/b5de53c23343512531808f36959a88cfe1aad842
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e0a874a7135..b45b637ccb6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -103,7 +103,7 @@ if (APPLE)
if (BUILD_WITH_QT6)
set(MACOS_MINIMUM_VERSION 12)
else()
- set(MACOS_MINIMUM_VERSION 10.14)
+ set(MACOS_MINIMUM_VERSION 10.15)
endif()
add_definitions(-mmacosx-version-min=${MACOS_MINIMUM_VERSION} -Wno-macro-redefined -Wno-deprecated-register)
if (CMAKE_OSX_ARCHITECTURES)
diff --git a/build-tools/ci-scripts/macos.yml b/build-tools/ci-scripts/macos.yml
index befa6a3d748..85bc38abcd9 100644
--- a/build-tools/ci-scripts/macos.yml
+++ b/build-tools/ci-scripts/macos.yml
@@ -12,8 +12,8 @@
KDECI_PACKAGE_PROJECT: teams/ci-artifacts/krita-macos
EXTERNALS_DOWNLOAD_DIR: /Users/gitlab/caches/krita-macos/downloads
KDECI_REPO_METADATA_PATH: $CI_PROJECT_DIR/krita-deps-management/repo-metadata
- MACOSX_DEPLOYMENT_TARGET: "10.14"
- QMAKE_MACOSX_DEPLOYMENT_TARGET: "10.14"
+ MACOSX_DEPLOYMENT_TARGET: "10.15"
+ QMAKE_MACOSX_DEPLOYMENT_TARGET: "10.15"
CMAKE_TOOLCHAIN_FILE: $CI_PROJECT_DIR/krita-deps-management/tools/macos-toolchain-krita.cmake
KDECI_EXTRA_CMAKE_ARGS: >
-DHIDE_SAFE_ASSERTS=OFF
diff --git a/packaging/macos/macos-deploy.py b/packaging/macos/macos-deploy.py
index 1ce4a951cfb..51a9fff7c1d 100644
--- a/packaging/macos/macos-deploy.py
+++ b/packaging/macos/macos-deploy.py
@@ -359,7 +359,7 @@ def kritaDeploy(from_install: pathlib.Path, dst: pathlib.Path, source: pathlib.P
qt_version = 5
print(f"Found qt version: {qt_version}")
- osx_deployment_target = "12" if qt_version[0] == 6 else "10.14"
+ osx_deployment_target = "12" if qt_version[0] == 6 else "10.15"
kisenv['MACOSX_DEPLOYMENT_TARGET'] = osx_deployment_target
kisenv['QMAKE_MACOSX_DEPLOYMENT_TARGET'] = osx_deployment_target
diff --git a/packaging/macos/macos_signdmg.py b/packaging/macos/macos_signdmg.py
index 68e4689c386..a9d8b4223be 100644
--- a/packaging/macos/macos_signdmg.py
+++ b/packaging/macos/macos_signdmg.py
@@ -222,8 +222,8 @@ def fix_bundle(bundle_root: pathlib.Path, bundle_version: str="", for_store: boo
def fix_krita_plists(krita_app: pathlib.Path, bundle_id: str, version: str, build_version: str):
- macosx_deployment_target = '10.14' if version.startswith('5') else '12'
- appex_plugins_deployment_target = '10.15' # if user is in 10.14 the old thumbnailer will be used.
+ macosx_deployment_target = '10.15' if version.startswith('5') else '12'
+ appex_plugins_deployment_target = '10.15'
kritaspotlight = pathlib.Path(krita_app, 'Contents', 'Library','Spotlight', 'kritaspotlight.mdimporter', 'Contents')
kritaquicklook = pathlib.Path(krita_app, 'Contents', 'Library', 'Quicklook', 'kritaquicklook.qlgenerator', 'Contents')