github-wownero/wowlet
1
0
Fork 0
mirror of https://github.com/wownero/wowlet.git synced 2026-10-17 15:21:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

guix: bump minimum macos to 14.0

Browse Source
This commit is contained in:
tobtoht
2025-11-11 16:21:18 +01:00
parent f5c920b3dd
commit 4eaf9300a4
7 changed files with 12 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/depends/hosts/darwin.mk
+7 -7
View File
@@ -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
contrib/depends/packages/qt.mk
+1 -6
View File
@@ -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
contrib/depends/patches/qt/macos-available-qtbase.patch
-15
View File
@@ -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();
contrib/depends/patches/qt/qtmultimedia_macos_fix_available.patch
-18
View File
@@ -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
contrib/depends/patches/qt/toolchain.cmake
+1 -1
View File
@@ -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()
contrib/depends/toolchain.cmake.in
+2 -2
View File
@@ -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@)
contrib/macdeploy/Info.plist.in
+1 -1
View File
@@ -3,7 +3,7 @@
<plist version="0.9">
<dict>
<key>LSMinimumSystemVersion</key>
<string>12</string>
<string>14</string>
<key>LSArchitecturePriority</key>
<array>