Fix Electron v10 compatiblity

2 files changed, 32 insertions, 3 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 5799bb13d1b6..8670135a98e0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,7 +20,7 @@ source=(
   "${pkgname}.desktop"
   "warning-fix.patch"
   "remove-analytics.patch"
-  "electron_5_fix.patch"
+  "latest_electron_compatibility.patch"
   )
 
 sha512sums=('eeb37f835bc74f7022f5f7cdf55513541f1aafd9b0d055ce84072b05d35645d8de544349e52a6243a0ff739de6e565aeec04bd9306584da9aa5f1bbc0a8755f2'
@@ -28,14 +28,14 @@ sha512sums=('eeb37f835bc74f7022f5f7cdf55513541f1aafd9b0d055ce84072b05d35645d8de5
             '18bcda13580da8ceeaa86793a77ec00a053b8fd51451dad7e2b1a19553fe1a467ac647b44b789212e783f3f6a80968cc9404e884ef7ff6b1f6588473b3229d40'
             'a52e5631867e2c5f18465dee6a3201b9b5c546bda373205c4891c9f7b6114599e0854e2b49defb55ee7bea0778a7fde9c9d9f7271dceeeece743a2d72e2fd0c6'
             'aa25e326f7bddb0855f4d38c3105a6347e69b780ab86e18612c80fe4b004a7adb83aee8daf7f75f4806411164676235b83968037f017ae6def6b7d8183984674'
-            'ad745b9643e9a677a2a3840c02c8dad7af33e35007141dbc33ff8f7c084b66bd1a794ef44340925fc9d6d77065f41709be56cc8ac55a978e7dc7d520cf8777bf')
+            'c178e46a51e11285087b0859e95f352cf167aa578134f9d19fefe867579ec8add95a2b24ff75e226d2ad9ab9fa960ce3f00e625d53997307e0c0df213eb26b35')
 
 prepare() {
   cd "${_pkgname}-${pkgver}"
 
   patch -Np1 -i "${srcdir}/warning-fix.patch"
   patch -Np1 -i "${srcdir}/remove-analytics.patch"
-  patch -Np1 -i "${srcdir}/electron_5_fix.patch"
+  patch -Np1 -i "${srcdir}/latest_electron_compatibility.patch"
 }
 
 build() {
diff --git a/latest_electron_compatibility.patch b/latest_electron_compatibility.patch
new file mode 100644
index 000000000000..3fb3aac13e76
--- /dev/null
+++ b/latest_electron_compatibility.patch
@@ -0,0 +1,29 @@
+diff --color -ura a/browser/main/lib/dataApi/formatPDF.js b/browser/main/lib/dataApi/formatPDF.js
+--- a/browser/main/lib/dataApi/formatPDF.js	2020-09-04 16:47:01.000000000 +0200
++++ b/browser/main/lib/dataApi/formatPDF.js	2020-10-25 10:29:34.265677941 +0100
+@@ -5,7 +5,7 @@
+   return function(note, targetPath, exportTasks) {
+     const printout = new remote.BrowserWindow({
+       show: false,
+-      webPreferences: { webSecurity: false, javascript: false }
++      webPreferences: { webSecurity: false, javascript: false, enableRemoteModule: true }
+     })
+ 
+     printout.loadURL(
+Alleen in b: compiled
+diff --color -ura a/lib/main-window.js b/lib/main-window.js
+--- a/lib/main-window.js	2020-09-04 16:47:01.000000000 +0200
++++ b/lib/main-window.js	2020-10-25 10:40:39.929617534 +0100
+@@ -50,7 +50,11 @@
+   minHeight: 320,
+   webPreferences: {
+     zoomFactor: 1.0,
+-    enableBlinkFeatures: 'OverlayScrollbars'
++    enableBlinkFeatures: 'OverlayScrollbars',
++    contextIsolation: false,
++    nodeIntegration: true,
++    webviewTag: true,
++    enableRemoteModule: true
+   },
+   icon: path.resolve(__dirname, '../resources/app.png')
+ })