From 92ca29b3cd248a1b80373de6850c356c3a1d7165 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Tue, 31 Oct 2023 13:44:25 +0100 Subject: [PATCH] Revert pinfo.list description and fix entitlements. --- linphone-app/cmake_builder/linphone_package/CMakeLists.txt | 2 +- .../cmake_builder/linphone_package/cleanCPack.cmake.in | 2 +- .../cmake_builder/linphone_package/macos/Info.plist.in | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt index 9dadbbc0a..41d691c0d 100644 --- a/linphone-app/cmake_builder/linphone_package/CMakeLists.txt +++ b/linphone-app/cmake_builder/linphone_package/CMakeLists.txt @@ -200,7 +200,7 @@ if (WIN32) # endforeach () elseif (APPLE) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/macos/Info.plist.in" "${CMAKE_CURRENT_BINARY_DIR}/../../Info.plist" @ONLY) - configure_file("${CMAKE_CURRENT_SOURCE_DIR}/macos/entitlements.xml.in" "${CMAKE_CURRENT_BINARY_DIR}/../../entitlements.xml" @ONLY) + configure_file("${CMAKE_CURRENT_SOURCE_DIR}/macos/entitlements.xml.in" "${CMAKE_BINARY_DIR}/entitlements.xml" @ONLY) configure_file("${CMAKE_CURRENT_SOURCE_DIR}/macos/linphone.icns" "${CMAKE_CURRENT_BINARY_DIR}/../../${EXECUTABLE_NAME}.icns" COPYONLY) set(APP_QT_CONF_PATH "[Paths]\nPlugins = PlugIns\nImports = Resources/qml\nQml2Imports = Resources/qml") diff --git a/linphone-app/cmake_builder/linphone_package/cleanCPack.cmake.in b/linphone-app/cmake_builder/linphone_package/cleanCPack.cmake.in index d0ae37506..c0ecda6ef 100644 --- a/linphone-app/cmake_builder/linphone_package/cleanCPack.cmake.in +++ b/linphone-app/cmake_builder/linphone_package/cleanCPack.cmake.in @@ -49,6 +49,6 @@ if(APPLE) #CPack doesn't sign all files. if (DO_SIGNING) execute_process(COMMAND bash "@CMAKE_SOURCE_DIR@/linphone-app/tools/sign_package.sh" codesign "@LINPHONE_BUILDER_SIGNING_IDENTITY@" "${CPACK_TEMPORARY_INSTALL_DIRECTORY}/ALL_IN_ONE") - #execute_process(COMMAND codesign --entitlements" "@CMAKE_CURRENT_BINARY_DIR@/../../entitlements.xml" "--force" "--deep" "--timestamp" "--options" "runtime,library" "--verbose" "-s" "@LINPHONE_BUILDER_SIGNING_IDENTITY@" "@APPLICATION_OUTPUT_DIR@/@APPLICATION_NAME@.app") + execute_process(COMMAND codesign "--entitlements" "@CMAKE_BINARY_DIR@/entitlements.xml" "--force" "--deep" "--timestamp" "--options" "runtime,library" "--verbose" "-s" "@LINPHONE_BUILDER_SIGNING_IDENTITY@" "${CPACK_TEMPORARY_INSTALL_DIRECTORY}/ALL_IN_ONE/@APPLICATION_NAME@.app") endif() endif() diff --git a/linphone-app/cmake_builder/linphone_package/macos/Info.plist.in b/linphone-app/cmake_builder/linphone_package/macos/Info.plist.in index f14ee8638..e36a72d02 100644 --- a/linphone-app/cmake_builder/linphone_package/macos/Info.plist.in +++ b/linphone-app/cmake_builder/linphone_package/macos/Info.plist.in @@ -76,16 +76,12 @@ kTCCServiceMediaLibrary Used media library as attachement or for the ringer com.apple.security.device.camera - Used for video call com.apple.security.device.microphone - Used for call and voice messages com.apple.security.device.audio-input - Used for call and voice messages com.apple.security.personal-information.photos-library - Used to display pictures and avatar