Ecosystem/feather
Ecosystem/feather
1
0
Fork 0
mirror of https://github.com/feather-wallet/feather.git synced 2024-12-22 19:49:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

depends: qt: fix macos camera permissions

Browse source
This commit is contained in:
tobtoht 2024-03-12 19:29:10 +01:00
parent 9c2dbe2211
commit b94135ba4e
No known key found for this signature in database
GPG key ID: E45B10DD027D2472
2 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
contrib/depends/packages/qt.mk
View file

@ -21,6 +21,7 @@ $(package)_patches += libxau-fix.patch
$(package)_patches += toolchain.cmake $(package)_patches += toolchain.cmake
$(package)_patches += revert-macOS-Silence-warning-about-supporting-secure.patch $(package)_patches += revert-macOS-Silence-warning-about-supporting-secure.patch
$(package)_patches += no-resonance-audio.patch $(package)_patches += no-resonance-audio.patch
$(package)_patches += fix_static_qt_darwin_camera_permissions.patch
#$(package)_patches += fix-static-fontconfig-static-linking.patch #$(package)_patches += fix-static-fontconfig-static-linking.patch
$(package)_qttools_file_name=qttools-$($(package)_suffix) $(package)_qttools_file_name=qttools-$($(package)_suffix)
@ -196,6 +197,7 @@ define $(package)_preprocess_cmds
patch -p1 -i $($(package)_patch_dir)/xcb-util-image-fix.patch && \ patch -p1 -i $($(package)_patch_dir)/xcb-util-image-fix.patch && \
patch -p1 -i $($(package)_patch_dir)/libxau-fix.patch && \ 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)/revert-macOS-Silence-warning-about-supporting-secure.patch && \
patch -p1 -i $($(package)_patch_dir)/fix_static_qt_darwin_camera_permissions.patch && \
cd ../qtmultimedia && \ cd ../qtmultimedia && \
patch -p1 -i $($(package)_patch_dir)/qtmultimedia-fixes.patch && \ patch -p1 -i $($(package)_patch_dir)/qtmultimedia-fixes.patch && \
patch -p1 -i $($(package)_patch_dir)/v4l2.patch && \ patch -p1 -i $($(package)_patch_dir)/v4l2.patch && \

27
contrib/depends/patches/qt/fix_static_qt_darwin_camera_permissions.patch Normal file
View file

@ -0,0 +1,27 @@
diff --git a/src/corelib/platform/darwin/qdarwinpermissionplugin_camera.mm b/src/corelib/platform/darwin/qdarwinpermissionplugin_camera.mm
index 51c517d6f3..ed3135fba3 100644
--- a/src/corelib/platform/darwin/qdarwinpermissionplugin_camera.mm
+++ b/src/corelib/platform/darwin/qdarwinpermissionplugin_camera.mm
@@ -7,8 +7,6 @@
QT_DEFINE_PERMISSION_STATUS_CONVERTER(AVAuthorizationStatus);
-#ifndef BUILDING_PERMISSION_REQUEST
-
@implementation QDarwinCameraPermissionHandler
- (Qt::PermissionStatus)checkPermission:(QPermission)permission
{
@@ -25,8 +23,6 @@ QT_DEFINE_PERMISSION_STATUS_CONVERTER(AVAuthorizationStatus);
#include "moc_qdarwinpermissionplugin_p_p.cpp"
-#else // Building request
-
@implementation QDarwinCameraPermissionHandler (Request)
- (void)requestPermission:(QPermission)permission withCallback:(PermissionCallback)callback
{
@@ -39,4 +35,3 @@ QT_DEFINE_PERMISSION_STATUS_CONVERTER(AVAuthorizationStatus);
}
@end
-#endif // BUILDING_PERMISSION_REQUEST