From 580f7757aede4d74720f49c6376c8d93b9210eb3 Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Wed, 26 Jun 2024 00:17:41 +0200
Subject: [PATCH] [Github CI] Attempt to fix macOS code signing

Signed-off-by: Christian Parpart <christian@parpart.family>
---
 .github/workflows/build.yml        |  5 ++++-
 metainfo.xml                       |  1 +
 src/contour/CMakeLists.txt         |  1 +
 src/contour/res/entitlements.plist | 10 ++++++++++
 4 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 src/contour/res/entitlements.plist

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f0ef2692b7..eb56c52295 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -385,10 +385,13 @@ jobs:
         run: |
           # create variables
           CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
-          PP_PATH=$RUNNER_TEMP/build_pp.mobileprovision
+          PP_PATH=$RUNNER_TEMP/build_pp.provisionprofile
           KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
 
           # import certificate and provisioning profile from secrets
+          echo "certificate:"
+          echo "$BUILD_CERTIFICATE_BASE64"
+          echo ""
           echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH
           echo -n "$BUILD_PROVISION_PROFILE_BASE64" | base64 --decode -o $PP_PATH
 
diff --git a/metainfo.xml b/metainfo.xml
index 5b06fd3985..822a5a17dd 100644
--- a/metainfo.xml
+++ b/metainfo.xml
@@ -107,6 +107,7 @@
     <release version="0.4.4" urgency="medium" type="development">
       <description>
         <ul>
+          <li>macOS package signing is now done with a valid Apple ID</li>
           <li>macOS package is now Apple Silicon native</li>
           <li>Add CoreText font fallback implementation for macOS (#1533)</li>
           <li>Add Ubuntu-24.04 in github actions (#1460)</li>
diff --git a/src/contour/CMakeLists.txt b/src/contour/CMakeLists.txt
index 3ff3a9f4d7..7dfc680769 100644
--- a/src/contour/CMakeLists.txt
+++ b/src/contour/CMakeLists.txt
@@ -445,6 +445,7 @@ elseif(APPLE)
 
     # Install application icon
     install(FILES "res/images/contour-logo.icns" DESTINATION "${INSTALL_CMAKE_DIR}" RENAME "contour.icns")
+    install(FILES "res/entitlements.plist" DESTINATION "${App_Contents}")
     install(DIRECTORY "${terminfo_basedir}" DESTINATION "${INSTALL_CMAKE_DIR}")
     install(DIRECTORY "shell-integration" DESTINATION "${INSTALL_CMAKE_DIR}")
 
diff --git a/src/contour/res/entitlements.plist b/src/contour/res/entitlements.plist
new file mode 100644
index 0000000000..73d41299f1
--- /dev/null
+++ b/src/contour/res/entitlements.plist
@@ -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.application-identifier</key>
+        <string>org.contourterminal.Terminal</string>
+        <key>com.apple.developer.team-identifier</key>
+        <string>6T525MU9UR</string>
+    </dict>
+</plist>