diff options
author | Kristóf Marussy <kristof@marussy.com> | 2021-05-25 15:55:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-25 15:55:12 +0200 |
commit | 9e63320086488899303a0efc63f678fe38343e2c (patch) | |
tree | e0f8ef34b6927b23a390611c3bb7704369309bc2 | |
parent | Fixing README for electron upgrade. (diff) | |
download | ferdium-app-9e63320086488899303a0efc63f678fe38343e2c.tar.gz ferdium-app-9e63320086488899303a0efc63f678fe38343e2c.tar.zst ferdium-app-9e63320086488899303a0efc63f678fe38343e2c.zip |
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.
-rw-r--r-- | package-lock.json | 12 | ||||
-rw-r--r-- | 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 @@ | |||
14118 | "dev": true | 14118 | "dev": true |
14119 | }, | 14119 | }, |
14120 | "dbus-next": { | 14120 | "dbus-next": { |
14121 | "version": "0.8.2", | 14121 | "version": "0.9.2", |
14122 | "resolved": "https://registry.npmjs.org/dbus-next/-/dbus-next-0.8.2.tgz", | 14122 | "resolved": "https://registry.npmjs.org/dbus-next/-/dbus-next-0.9.2.tgz", |
14123 | "integrity": "sha512-E2wkbhZzzsgmY+jxIdeuhA1nVT697I5koRIRJTk3doTeukwtzqSFG89RC5XK8OsLG/eHDZ8PVNptUuEPkhdPbA==", | 14123 | "integrity": "sha512-tzQq/+wrTZ2yU+U5PoeXc97KABhX2v55C/T0finH3tSKYuI8H/SqppIFymBBrUHcK13LvEGY3vdj3ikPPenL5g==", |
14124 | "requires": { | 14124 | "requires": { |
14125 | "@nornagon/put": "0.0.8", | 14125 | "@nornagon/put": "0.0.8", |
14126 | "abstract-socket": "^2.0.0", | 14126 | "abstract-socket": "^2.0.0", |
@@ -27840,9 +27840,9 @@ | |||
27840 | "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=" | 27840 | "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=" |
27841 | }, | 27841 | }, |
27842 | "nan": { | 27842 | "nan": { |
27843 | "version": "2.14.0", | 27843 | "version": "2.14.2", |
27844 | "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz", | 27844 | "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz", |
27845 | "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==" | 27845 | "integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==" |
27846 | }, | 27846 | }, |
27847 | "nanoid": { | 27847 | "nanoid": { |
27848 | "version": "2.1.11", | 27848 | "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 @@ | |||
28 | "manage-translations": "node ./src/i18n/manage-translations.js", | 28 | "manage-translations": "node ./src/i18n/manage-translations.js", |
29 | "prebuild": "preval-build-info-cli && gulp build", | 29 | "prebuild": "preval-build-info-cli && gulp build", |
30 | "build": "electron-builder", | 30 | "build": "electron-builder", |
31 | "rebuild": "electron-rebuild", | 31 | "rebuild": "electron-rebuild --force-abi=98", |
32 | "commit": "git-cz", | 32 | "commit": "git-cz", |
33 | "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s", | 33 | "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s", |
34 | "contributors": "all-contributors", | 34 | "contributors": "all-contributors", |
@@ -75,7 +75,7 @@ | |||
75 | "cld": "2.7.0", | 75 | "cld": "2.7.0", |
76 | "css": "2.2.4", | 76 | "css": "2.2.4", |
77 | "darkreader": "4.7.15", | 77 | "darkreader": "4.7.15", |
78 | "dbus-next": "0.8.2", | 78 | "dbus-next": "0.9.2", |
79 | "du": "^0.1.0", | 79 | "du": "^0.1.0", |
80 | "electron-dl": "1.14.0", | 80 | "electron-dl": "1.14.0", |
81 | "electron-fetch": "1.7.3", | 81 | "electron-fetch": "1.7.3", |