From b4950fe943571a21576eb8328572d47ea022c6a1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Sat, 30 Oct 2021 16:06:34 +0400
Subject: [PATCH] Fix build for Mac App Store.

---
 Telegram/CMakeLists.txt                 |  9 +++--
 Telegram/Telegram/Breakpad.entitlements | 10 ++++++
 Telegram/build/build.sh                 | 46 +++++++++++++------------
 Telegram/build/prepare/prepare.py       |  2 +-
 4 files changed, 42 insertions(+), 25 deletions(-)
 create mode 100644 Telegram/Telegram/Breakpad.entitlements

diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index c8b9daf8b..d4ff533f5 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1281,13 +1281,16 @@ elseif (APPLE)
         source_group(TREE ${res_loc} PREFIX Resources FILES ${strings_path})
     endforeach()
 
+    add_custom_command(TARGET Telegram
+    PRE_LINK
+        COMMAND mkdir -p $<TARGET_FILE_DIR:Telegram>/../Resources
+        COMMAND cp ${CMAKE_BINARY_DIR}/lib_ui.rcc $<TARGET_FILE_DIR:Telegram>/../Resources
+    )
     if (NOT build_macstore)
         add_custom_command(TARGET Telegram
         PRE_LINK
             COMMAND mkdir -p $<TARGET_FILE_DIR:Telegram>/../Frameworks
             COMMAND cp $<TARGET_FILE:Updater> $<TARGET_FILE_DIR:Telegram>/../Frameworks/
-            COMMAND mkdir -p $<TARGET_FILE_DIR:Telegram>/../Resources
-            COMMAND cp ${CMAKE_BINARY_DIR}/lib_ui.rcc $<TARGET_FILE_DIR:Telegram>/../Resources
         )
         if (NOT DESKTOP_APP_DISABLE_CRASH_REPORTS)
             if (DESKTOP_APP_MAC_ARCH STREQUAL "x86_64" OR DESKTOP_APP_MAC_ARCH STREQUAL "arm64")
@@ -1342,6 +1345,8 @@ if (build_macstore)
         COMMAND rm -rf $<TARGET_FILE_DIR:Telegram>/../Frameworks
         COMMAND mkdir -p $<TARGET_FILE_DIR:Telegram>/../Frameworks
         COMMAND cp -a ${libs_loc}/breakpad/src/client/mac/build/Release/Breakpad.framework $<TARGET_FILE_DIR:Telegram>/../Frameworks/Breakpad.framework
+        COMMAND rm -rf $<TARGET_FILE_DIR:Telegram>/../Frameworks/Breakpad.framework/Resources/crash_report_sender.app
+        COMMAND rm -rf $<TARGET_FILE_DIR:Telegram>/../Frameworks/Breakpad.framework/Resources/Inspector
     )
 else()
     set(bundle_identifier "com.tdesktop.Telegram$<$<CONFIG:Debug>:Debug>")
diff --git a/Telegram/Telegram/Breakpad.entitlements b/Telegram/Telegram/Breakpad.entitlements
new file mode 100644
index 000000000..810d8e230
--- /dev/null
+++ b/Telegram/Telegram/Breakpad.entitlements
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>com.apple.security.app-sandbox</key>
+	<true/>
+    <key>com.apple.security.inherit</key>
+    <true/>
+</dict>
+</plist>
diff --git a/Telegram/build/build.sh b/Telegram/build/build.sh
index 33a437a2f..b982a3f5e 100755
--- a/Telegram/build/build.sh
+++ b/Telegram/build/build.sh
@@ -261,15 +261,17 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "macstore" ]; then
 
     cd $FullExecPath
 
-    if [ "$NotarizeRequestIdAMD64" == "" ]; then
-      echo "Preparing single arm64 update.."
-      ./$0 arm64 request_uuid $NotarizeRequestIdARM64
+    if [ "$BuildTarget" == "mac" ]; then
+      if [ "$NotarizeRequestIdAMD64" == "" ]; then
+        echo "Preparing single arm64 update.."
+        ./$0 arm64 request_uuid $NotarizeRequestIdARM64
+      fi
+
+      echo "Preparing single x86_64 update.."
+      ./$0 x86_64 request_uuid $NotarizeRequestIdAMD64
+
+      echo "Done."
     fi
-
-    echo "Preparing single x86_64 update.."
-    ./$0 x86_64 request_uuid $NotarizeRequestIdAMD64
-
-    echo "Done."
     cd $ReleasePath
   fi
   if [ "$NotarizeRequestId" == "" ]; then
@@ -287,27 +289,26 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "macstore" ]; then
       fi
     fi
 
-    if [ "$MacArch" != "" ]; then
-      echo "Dumping debug symbols for single $MacArch.."
-      "$HomePath/../../Libraries/breakpad/src/tools/mac/dump_syms/build/Release/dump_syms" "-a" "$MacArch" "$ReleasePath/$BundleName/Contents/MacOS/Telegram" > "$ReleasePath/$BinaryName.$MacArch.sym" 2>/dev/null
+    if [ "$MacArch" == "" ]; then
+      echo "Dumping debug symbols x86_64 from universal.."
+      "$HomePath/../../Libraries/breakpad/src/tools/mac/dump_syms/build/Release/dump_syms" "-a" "x86_64" "$ReleasePath/$BinaryName.app/Contents/MacOS/$BinaryName" > "$ReleasePath/$BinaryName.x86_64.sym" 2>/dev/null
       echo "Done!"
 
-      SymbolsHash=`head -n 1 "$ReleasePath/$BinaryName.$MacArch.sym" | awk -F " " 'END {print $4}'`
-      echo "Copying $BinaryName.$MacArch.sym to $DropboxSymbolsPath/$BinaryName/$SymbolsHash"
+      SymbolsHash=`head -n 1 "$ReleasePath/$BinaryName.x86_64.sym" | awk -F " " 'END {print $4}'`
+      echo "Copying $BinaryName.x86_64.sym to $DropboxSymbolsPath/$BinaryName/$SymbolsHash"
       mkdir -p "$DropboxSymbolsPath/$BinaryName/$SymbolsHash"
-      cp "$ReleasePath/$BinaryName.$MacArch.sym" "$DropboxSymbolsPath/$BinaryName/$SymbolsHash/$BinaryName.sym"
+      cp "$ReleasePath/$BinaryName.x86_64.sym" "$DropboxSymbolsPath/$BinaryName/$SymbolsHash/$BinaryName.sym"
       echo "Done!"
 
-      echo "Dumping debug symbols $MacArch from universal.."
-      "$HomePath/../../Libraries/breakpad/src/tools/mac/dump_syms/build/Release/dump_syms" "-a" "$MacArch" "$ReleasePath/$BinaryName.app/Contents/MacOS/Telegram" > "$ReleasePath/$BinaryName.universal.$MacArch.sym" 2>/dev/null
+      echo "Dumping debug symbols arm64 from universal.."
+      "$HomePath/../../Libraries/breakpad/src/tools/mac/dump_syms/build/Release/dump_syms" "-a" "arm64" "$ReleasePath/$BinaryName.app/Contents/MacOS/$BinaryName" > "$ReleasePath/$BinaryName.arm64.sym" 2>/dev/null
       echo "Done!"
 
-      DiffLines=`diff "$ReleasePath/$BinaryName.$MacArch.sym" "$ReleasePath/$BinaryName.universal.$MacArch.sym" | wc -l | awk -F " " 'END {print $1}'`
-      if [ "$DiffLines" != "0" ]; then
-        Error "Bad symbol dumps, different from universal and single-arch."
-      fi
-
-      rm "$ReleasePath/$BinaryName.universal.$MacArch.sym"
+      SymbolsHash=`head -n 1 "$ReleasePath/$BinaryName.arm64.sym" | awk -F " " 'END {print $4}'`
+      echo "Copying $BinaryName.arm64.sym to $DropboxSymbolsPath/$BinaryName/$SymbolsHash"
+      mkdir -p "$DropboxSymbolsPath/$BinaryName/$SymbolsHash"
+      cp "$ReleasePath/$BinaryName.arm64.sym" "$DropboxSymbolsPath/$BinaryName/$SymbolsHash/$BinaryName.sym"
+      echo "Done!"
     fi
 
     echo "Stripping the executable.."
@@ -322,6 +323,7 @@ if [ "$BuildTarget" == "mac" ] || [ "$BuildTarget" == "macstore" ]; then
     if [ "$BuildTarget" == "mac" ]; then
       codesign --force --deep --timestamp --options runtime --sign "Developer ID Application: John Preston" "$ReleasePath/$BundleName" --entitlements "$HomePath/Telegram/Telegram.entitlements"
     elif [ "$BuildTarget" == "macstore" ]; then
+      codesign --force --sign "3rd Party Mac Developer Application: Telegram FZ-LLC (C67CF9S4VU)" "$ReleasePath/$BundleName/Contents/Frameworks/Breakpad.framework/Versions/A/Resources/breakpadUtilities.dylib" --entitlements "$HomePath/Telegram/Breakpad.entitlements"
       codesign --force --deep --sign "3rd Party Mac Developer Application: Telegram FZ-LLC (C67CF9S4VU)" "$ReleasePath/$BundleName" --entitlements "$HomePath/Telegram/Telegram Lite.entitlements"
       echo "Making an installer.."
       productbuild --sign "3rd Party Mac Developer Installer: Telegram FZ-LLC (C67CF9S4VU)" --component "$ReleasePath/$BundleName" /Applications "$ReleasePath/$BinaryName.pkg"
diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py
index 581c5ff3e..84214179e 100644
--- a/Telegram/build/prepare/prepare.py
+++ b/Telegram/build/prepare/prepare.py
@@ -387,7 +387,7 @@ def runStages():
 stage('patches', """
     git clone https://github.com/desktop-app/patches.git
     cd patches
-    git checkout ab9e042ef6
+    git checkout bc18293b1c
 """)
 
 stage('depot_tools', """