guix: bump minimum macos to 14.0

diff --git a/contrib/depends/hosts/darwin.mk b/contrib/depends/hosts/darwin.mk
index c69b3a1fba260ac15be1b56a6b1e85332755bdb3..3a1009be4367267c5c62146216efab0b6e79d17a 100644 (file)
--- a/contrib/depends/hosts/darwin.mk
+++ b/contrib/depends/hosts/darwin.mk
@@ -1,8 +1,8 @@
-OSX_MIN_VERSION=12.0
-OSX_SDK_VERSION=12.0
-XCODE_VERSION=12.2
-XCODE_BUILD_ID=12B45b
-LD64_VERSION=711
+OSX_MIN_VERSION=14.0
+OSX_SDK_VERSION=14.0
+XCODE_VERSION=15.0
+XCODE_BUILD_ID=15A240d
+LLD_VERSION=711
 
 OSX_SDK=$(host_prefix)/native/SDK
 
@@ -47,7 +47,7 @@ darwin_LIBTOOL=llvm-libtool-darwin
 #
 
 darwin_CC_=--target=$(host) -mmacosx-version-min=$(OSX_MIN_VERSION) \
-           -mlinker-version=$(LD64_VERSION) \
+           -mlinker-version=$(LLD_VERSION) \
            -isysroot$(OSX_SDK) -nostdlibinc \
            -iwithsysroot/usr/include -iframeworkwithsysroot/System/Library/Frameworks
 darwin_CC=env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH \
@@ -56,7 +56,7 @@ darwin_CC=env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH \
             $(clang_prog) $(darwin_CC_)
 
 darwin_CXX_=--target=$(host) -mmacosx-version-min=$(OSX_MIN_VERSION) \
-            -mlinker-version=$(LD64_VERSION) \
+            -mlinker-version=$(LLD_VERSION) \
                    -isysroot$(OSX_SDK) -nostdlibinc \
                    -iwithsysroot/usr/include/c++/v1 \
                    -iwithsysroot/usr/include -iframeworkwithsysroot/System/Library/Frameworks

diff --git a/contrib/depends/packages/qt.mk b/contrib/depends/packages/qt.mk
index bafca6835a29f1203dc5e8ed39d0663b80e571d4..3aa4085b835d91faef237998b4acf4bfaaefc559 100644 (file)
--- a/contrib/depends/packages/qt.mk
+++ b/contrib/depends/packages/qt.mk
@@ -19,9 +19,7 @@ $(package)_patches += toolchain.cmake
 $(package)_patches += revert-macOS-Silence-warning-about-supporting-secure.patch
 $(package)_patches += no-resonance-audio.patch
 $(package)_patches += fix_static_qt_darwin_camera_permissions.patch
-$(package)_patches += macos-available-qtbase.patch
 $(package)_patches += qtmultimedia_macos_fix_include.patch
-$(package)_patches += qtmultimedia_macos_fix_available.patch
 #$(package)_patches += fix-static-fontconfig-static-linking.patch
 
 $(package)_qttools_file_name=qttools-$($(package)_suffix)
@@ -160,7 +158,6 @@ $(package)_config_opts_darwin += -DQT_FEATURE_accessibility=OFF
 $(package)_config_opts_darwin += -DQT_FEATURE_dbus=OFF
 $(package)_config_opts_darwin += -DQT_FEATURE_freetype=OFF
 $(package)_config_opts_darwin += -DQT_FEATURE_ffmpeg=OFF
-$(package)_config_opts_darwin += -DQMAKE_MACOSX_DEPLOYMENT_TARGET=12.0
 $(package)_config_opts_darwin += -DBUILD_WITH_PCH=OFF
 $(package)_config_opts_darwin += '-DQT_QMAKE_DEVICE_OPTIONS=MAC_SDK_PATH=$(host_prefix)/native/SDK;MAC_SDK_VERSION=$(OSX_SDK_VERSION);CROSS_COMPILE=$(host)-;MAC_TARGET=$(host);XCODE_VERSION=$(XCODE_VERSION)'
 $(package)_config_opts_darwin += -DQT_NO_APPLE_SDK_AND_XCODE_CHECK=ON
@@ -228,12 +225,10 @@ define $(package)_preprocess_cmds
   patch -p1 -i $($(package)_patch_dir)/libxau-fix.patch && \
   patch -p1 -i $($(package)_patch_dir)/revert-macOS-Silence-warning-about-supporting-secure.patch && \
   patch -p1 -i $($(package)_patch_dir)/fix_static_qt_darwin_camera_permissions.patch && \
-  patch -p1 -i $($(package)_patch_dir)/macos-available-qtbase.patch && \
   cd ../qtmultimedia && \
   patch -p1 -i $($(package)_patch_dir)/qtmultimedia-fixes.patch && \
   patch -p1 -i $($(package)_patch_dir)/v4l2.patch && \
-  patch -p1 -i $($(package)_patch_dir)/qtmultimedia_macos_fix_include.patch && \
-  patch -p1 -i $($(package)_patch_dir)/qtmultimedia_macos_fix_available.patch
+  patch -p1 -i $($(package)_patch_dir)/qtmultimedia_macos_fix_include.patch
 endef
 
 

diff --git a/contrib/depends/patches/qt/macos-available-qtbase.patch b/contrib/depends/patches/qt/macos-available-qtbase.patch
deleted file mode 100644 (file)
index 48153d0..0000000
--- a/contrib/depends/patches/qt/macos-available-qtbase.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/gui/rhi/qrhimetal.mm b/src/gui/rhi/qrhimetal.mm
-index 3046b76427..8c1e7fd13f 100644
---- a/src/gui/rhi/qrhimetal.mm
-+++ b/src/gui/rhi/qrhimetal.mm
-@@ -4710,10 +4710,6 @@ id<MTLLibrary> QRhiMetalData::createMetalLib(const QShader &shader, QShader::Var
-                                              QString *error, QByteArray *entryPoint, QShaderKey *activeKey)
- {
-     QVarLengthArray<int, 8> versions;
--    if (@available(macOS 13, iOS 16, *))
--        versions << 30;
--    if (@available(macOS 12, iOS 15, *))
--        versions << 24;
-     versions << 23 << 22 << 21 << 20 << 12;
- 
-     const QList<QShaderKey> shaders = shader.availableShaders();

diff --git a/contrib/depends/patches/qt/qtmultimedia_macos_fix_available.patch b/contrib/depends/patches/qt/qtmultimedia_macos_fix_available.patch
deleted file mode 100644 (file)
index 3dda0c0..0000000
--- a/contrib/depends/patches/qt/qtmultimedia_macos_fix_available.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/multimedia/darwin/qavfvideodevices.mm b/src/multimedia/darwin/qavfvideodevices.mm
-index c2d1f616f..ae5bbc072 100644
---- a/src/multimedia/darwin/qavfvideodevices.mm
-+++ b/src/multimedia/darwin/qavfvideodevices.mm
-@@ -53,12 +53,7 @@ namespace {
- #endif
-     ];
- 
--    if (@available(macOS 14, iOS 17, *)) {
--        discoveryDevices = [discoveryDevices arrayByAddingObjectsFromArray: @[
--            AVCaptureDeviceTypeExternal,
--            AVCaptureDeviceTypeContinuityCamera
--        ]];
--    } else {
-+    {
- #ifdef Q_OS_MACOS
-     QT_WARNING_PUSH
-         QT_WARNING_DISABLE_DEPRECATED

diff --git a/contrib/depends/patches/qt/toolchain.cmake b/contrib/depends/patches/qt/toolchain.cmake
index a2bcc7e189dc807684604eda6dc99dcedb21bd12..111fed2fffef6493ac2e8f4648f342325780b7e3 100644 (file)
--- a/contrib/depends/patches/qt/toolchain.cmake
+++ b/contrib/depends/patches/qt/toolchain.cmake
@@ -30,7 +30,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     set(CMAKE_EXE_LINKER_FLAGS "@cmake_ld_flags@")
     set(CMAKE_MODULE_LINKER_FLAGS "@cmake_ld_flags@")
     set(CMAKE_SHARED_LINKER_FLAGS "@cmake_ld_flags@")
-    SET(CMAKE_OSX_DEPLOYMENT_TARGET "12.0")
+    SET(CMAKE_OSX_DEPLOYMENT_TARGET "14.0")
 
     set(CMAKE_INSTALL_NAME_TOOL @target@-install_name_tool)
 endif()
\ No newline at end of file

diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in
index 193f6939bd972708f60b6ac265cd4981a69564e6..5ba06971426b2f641c12eb204437b5eace8092d6 100644 (file)
--- a/contrib/depends/toolchain.cmake.in
+++ b/contrib/depends/toolchain.cmake.in
@@ -94,7 +94,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     SET(BUILD_TAG "mac-x64")
     SET(CMAKE_OSX_ARCHITECTURES "x86_64")
   endif()
-  SET(CMAKE_SYSTEM_VERSION 21.0.1)
+  SET(CMAKE_SYSTEM_VERSION 23.0.0)
   SET(_CMAKE_TOOLCHAIN_PREFIX @prefix@/native/bin/${CONF_TRIPLE}-)
   SET(CMAKE_C_COMPILER @CC@)
   SET(CMAKE_C_COMPILER_TARGET ${CLANG_TARGET})
@@ -116,7 +116,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
   SET(BREW OFF)
   SET(PORT OFF)
   SET(CMAKE_OSX_SYSROOT "@prefix@/native/SDK")
-  SET(CMAKE_OSX_DEPLOYMENT_TARGET "12.0")
+  SET(CMAKE_OSX_DEPLOYMENT_TARGET "14.0")
   SET(CMAKE_CXX_STANDARD 17)
 else()
   SET(CMAKE_C_COMPILER @CC@)

diff --git a/contrib/macdeploy/Info.plist.in b/contrib/macdeploy/Info.plist.in
index 2aa752f4a369885c5ea8f36787b714cc9ac0e34c..6a381b9f1f17ead64abd7a4536e62ef6d3f4200e 100644 (file)
--- a/contrib/macdeploy/Info.plist.in
+++ b/contrib/macdeploy/Info.plist.in
@@ -3,7 +3,7 @@
 <plist version="0.9">
 <dict>
   <key>LSMinimumSystemVersion</key>
-  <string>12</string>
+  <string>14</string>
 
   <key>LSArchitecturePriority</key>
   <array>