From da34532f6b228826cf67d31665588c94eb994ed0 Mon Sep 17 00:00:00 2001
From: Robert Palmer <robd003@gmail.com>
Date: Fri, 10 Dec 2021 20:56:09 -0500
Subject: [PATCH 1/4] Start of universal binary for macOS

Currently it's building x64 and arm64 electron apps.
We *could* make DMGs of each and have end users select their
platform.
---
 CHANGELOG.md          |  1 +
 electron-builder.json | 11 ++++++++++-
 package.json          |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ef9494f9..47bc01ae9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Paginated 'All Playlists' page ([#7268](https://github.com/lbryio/lbry-desktop/pull/7268))
 - Expanded playlist ordering tools ([#7305](https://github.com/lbryio/lbry-desktop/pull/7305))
 - Setting to upgrade to alpha prerelease builds ([#7353](https://github.com/lbryio/lbry-desktop/pull/7353))
+- Support for macOS arm64
 
 ### Changed
 - Changing the supported language from Filipino to Tagalog _community pr!_ ([#6951](https://github.com/lbryio/lbry-desktop/pull/6951))
diff --git a/electron-builder.json b/electron-builder.json
index 1809ef683..6b7830acb 100644
--- a/electron-builder.json
+++ b/electron-builder.json
@@ -37,7 +37,16 @@
     }
   ],
   "mac": {
-    "category": "public.app-category.entertainment"
+    "category": "public.app-category.entertainment",
+    "target": [
+      {
+        "target": "default",
+        "arch": [
+          "x64",
+          "arm64"
+        ]
+      }
+    ],
   },
   "dmg": {
     "iconSize": 128,
diff --git a/package.json b/package.json
index 4da1e059b..3f4b97101 100644
--- a/package.json
+++ b/package.json
@@ -122,7 +122,7 @@
     "dotenv-defaults": "^2.0.1",
     "dotenv-webpack": "^1.8.0",
     "electron": "11.5.0",
-    "electron-builder": "^22.9.1",
+    "electron-builder": "^22.14.5",
     "electron-devtools-installer": "^3.1.1",
     "electron-is-dev": "^0.3.0",
     "electron-webpack": "^2.8.2",
-- 
2.45.3


From 3e46772411b9cd4c96932636099de75a834834b5 Mon Sep 17 00:00:00 2001
From: Robert Palmer <robd003@gmail.com>
Date: Fri, 10 Dec 2021 21:30:12 -0500
Subject: [PATCH 2/4] Force APFS DMG image for M1 Macs

---
 electron-builder.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/electron-builder.json b/electron-builder.json
index 6b7830acb..b7e577ae5 100644
--- a/electron-builder.json
+++ b/electron-builder.json
@@ -68,7 +68,8 @@
       "width": 500,
       "height": 300
     },
-    "background": "./build/background.png"
+    "background": "./build/background.png",
+    "filesystem": "APFS",
   },
   "protocols": [
     {
-- 
2.45.3


From 6cc1188bd3da3ff2be2ee069a08a3e59f687fb4b Mon Sep 17 00:00:00 2001
From: Robert Palmer <robd003@gmail.com>
Date: Fri, 10 Dec 2021 21:33:18 -0500
Subject: [PATCH 3/4] Updated electron-updater

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3f4b97101..89e5b5a84 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "electron-dl": "^3.2.0",
     "electron-log": "^2.2.12",
     "electron-notarize": "^1.0.0",
-    "electron-updater": "^4.2.4",
+    "electron-updater": "^4.6.5",
     "express": "^4.17.1",
     "humanize-duration": "^3.27.0",
     "if-env": "^1.0.4",
-- 
2.45.3


From 156be15e5cbe8bc82aac25fe478b4bd772ab12b5 Mon Sep 17 00:00:00 2001
From: Robert Palmer <robd003@gmail.com>
Date: Fri, 10 Dec 2021 21:41:46 -0500
Subject: [PATCH 4/4] Remove filesytem config in DMG. Will submit patch to
 electron-builder

---
 electron-builder.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/electron-builder.json b/electron-builder.json
index b7e577ae5..9c75cdce3 100644
--- a/electron-builder.json
+++ b/electron-builder.json
@@ -69,7 +69,6 @@
       "height": 300
     },
     "background": "./build/background.png",
-    "filesystem": "APFS",
   },
   "protocols": [
     {
-- 
2.45.3