From 9e63320086488899303a0efc63f678fe38343e2c Mon Sep 17 00:00:00 2001
From: Kristóf Marussy <kristof@marussy.com>
Date: Tue, 25 May 2021 15:55:12 +0200
Subject: Electron 13 support on Linux (#1447)

* Bump dbus-next to 0.9.2

Older dbus-next seems to have problems with building with Electron 13
ABI. Also upgrades nan (a transitive dependency of dbus-next) to 2.14.2.

* Explcitly specify Electron ABI 89

electron-rebuild seems to have problems with finding the correct ABI for
Electron 13, despite node-abi being updated to the latest version and
containing an entry for Electron 13 in abi-registry.json. This is
probably caused by Electron 13 still being marked as a future target in
abi-registry.json.

This commit pins the ABI version to 89 for Electron 13 and should be
reverted once node-abi marks Electron 13 as released.
---
 package-lock.json | 12 ++++++------
 package.json      |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0f37ba6de..e209f62a4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14118,9 +14118,9 @@
       "dev": true
     },
     "dbus-next": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/dbus-next/-/dbus-next-0.8.2.tgz",
-      "integrity": "sha512-E2wkbhZzzsgmY+jxIdeuhA1nVT697I5koRIRJTk3doTeukwtzqSFG89RC5XK8OsLG/eHDZ8PVNptUuEPkhdPbA==",
+      "version": "0.9.2",
+      "resolved": "https://registry.npmjs.org/dbus-next/-/dbus-next-0.9.2.tgz",
+      "integrity": "sha512-tzQq/+wrTZ2yU+U5PoeXc97KABhX2v55C/T0finH3tSKYuI8H/SqppIFymBBrUHcK13LvEGY3vdj3ikPPenL5g==",
       "requires": {
         "@nornagon/put": "0.0.8",
         "abstract-socket": "^2.0.0",
@@ -27840,9 +27840,9 @@
       "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s="
     },
     "nan": {
-      "version": "2.14.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
-      "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="
+      "version": "2.14.2",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
+      "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ=="
     },
     "nanoid": {
       "version": "2.1.11",
diff --git a/package.json b/package.json
index ef27a202c..3bfbf1125 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "manage-translations": "node ./src/i18n/manage-translations.js",
     "prebuild": "preval-build-info-cli && gulp build",
     "build": "electron-builder",
-    "rebuild": "electron-rebuild",
+    "rebuild": "electron-rebuild --force-abi=98",
     "commit": "git-cz",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
     "contributors": "all-contributors",
@@ -75,7 +75,7 @@
     "cld": "2.7.0",
     "css": "2.2.4",
     "darkreader": "4.7.15",
-    "dbus-next": "0.8.2",
+    "dbus-next": "0.9.2",
     "du": "^0.1.0",
     "electron-dl": "1.14.0",
     "electron-fetch": "1.7.3",
-- 
cgit v1.2.3-70-g09d2