Fixed compatibility with Electron v2.0.x

3 files changed, 44 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d3a71d84dec1..054c8349b2d3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = boostnote
 	pkgdesc = Open source note-taking app for programmers
 	pkgver = 0.11.4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://boostnote.io/
 	arch = any
 	license = GPL3
@@ -15,11 +15,13 @@ pkgbase = boostnote
 	source = boostnote.desktop
 	source = warning-fix.patch
 	source = remove-analytics.patch
+	source = electron-v2-compatibility.patch
 	sha512sums = 218fd8d362053b26a01fd92cd6b115211f3809c00342dafbd6bc4f3f9c6d0e95aaeb367b7d3474857fb4e714b5e8a556d85feeb3bea648a785084a13d5b4ccde
 	sha512sums = 1f0ccd2a3632a12c4714d97b9f909ddc94b53d6f86a9e4bdcab31abd55a93071a2c35c6e1e9527b747de6dd74b8a5276414980c11e174085f28b8f2d2721230a
 	sha512sums = 18bcda13580da8ceeaa86793a77ec00a053b8fd51451dad7e2b1a19553fe1a467ac647b44b789212e783f3f6a80968cc9404e884ef7ff6b1f6588473b3229d40
 	sha512sums = 415eb95c889eee8076cc92ea30058505f9f3c1b73b0bc9712b92ffc65ddb5be250e962b20449946be2fffccaf31153b9923fa63e11412525db33dbf1c3215974
 	sha512sums = d6ff77413aa606c38db9a38cde0f38b2818194649cf0def93d003b52f90825c2f095ab82d98bb8200080546fe96f0d9c356eec32e21a9fb2bf46831699af550e
+	sha512sums = 21d97cb7a877333dd6c3d980a6ab0a606b53d88b5234648d07e7b4435330e3e16727afc8beded158e14f6397713cdb00d655b131021bc191ca116567ef92d068
 
 pkgname = boostnote
 
diff --git a/PKGBUILD b/PKGBUILD
index 3e840eeba349..0640dda81545 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=boostnote
 _pkgname=Boostnote
 pkgver=0.11.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Open source note-taking app for programmers"
 arch=('any')
 url="https://boostnote.io/"
@@ -20,19 +20,22 @@ source=(
   "${pkgname}.desktop"
   "warning-fix.patch"
   "remove-analytics.patch"
+  "electron-v2-compatibility.patch"
   )
 
 sha512sums=('218fd8d362053b26a01fd92cd6b115211f3809c00342dafbd6bc4f3f9c6d0e95aaeb367b7d3474857fb4e714b5e8a556d85feeb3bea648a785084a13d5b4ccde'
             '1f0ccd2a3632a12c4714d97b9f909ddc94b53d6f86a9e4bdcab31abd55a93071a2c35c6e1e9527b747de6dd74b8a5276414980c11e174085f28b8f2d2721230a'
             '18bcda13580da8ceeaa86793a77ec00a053b8fd51451dad7e2b1a19553fe1a467ac647b44b789212e783f3f6a80968cc9404e884ef7ff6b1f6588473b3229d40'
             '415eb95c889eee8076cc92ea30058505f9f3c1b73b0bc9712b92ffc65ddb5be250e962b20449946be2fffccaf31153b9923fa63e11412525db33dbf1c3215974'
-            'd6ff77413aa606c38db9a38cde0f38b2818194649cf0def93d003b52f90825c2f095ab82d98bb8200080546fe96f0d9c356eec32e21a9fb2bf46831699af550e')
+            'd6ff77413aa606c38db9a38cde0f38b2818194649cf0def93d003b52f90825c2f095ab82d98bb8200080546fe96f0d9c356eec32e21a9fb2bf46831699af550e'
+            '21d97cb7a877333dd6c3d980a6ab0a606b53d88b5234648d07e7b4435330e3e16727afc8beded158e14f6397713cdb00d655b131021bc191ca116567ef92d068')
 
 prepare() {
   cd "${_pkgname}-${pkgver}"
 
   patch -Np1 -i "${srcdir}/warning-fix.patch"
   patch -Np1 -i "${srcdir}/remove-analytics.patch"
+  patch -Np1 -i "${srcdir}/electron-v2-compatibility.patch"
 }
 
 build() {
diff --git a/electron-v2-compatibility.patch b/electron-v2-compatibility.patch
new file mode 100644
index 000000000000..b24f5191c141
--- /dev/null
+++ b/electron-v2-compatibility.patch
@@ -0,0 +1,36 @@
+diff -ura a/lib/main.html b/lib/main.html
+--- a/lib/main.html	2018-04-11 01:16:20.000000000 +0200
++++ b/lib/main.html	2018-06-13 07:35:01.495445739 +0200
+@@ -114,7 +114,7 @@
+   <script src="../node_modules/react-redux/dist/react-redux.min.js"></script>
+   <script type='text/javascript'>
+     const electron = require('electron')
+-    electron.webFrame.setZoomLevelLimits(1, 1)
++    electron.webFrame.setVisualZoomLevelLimits(1, 1)
+     var scriptUrl = window._.find(electron.remote.process.argv, (a) => a === '--hot')
+       ? 'http://localhost:8080/assets/main.js'
+       : '../compiled/main.js'
+diff -ura a/lib/main-window.js b/lib/main-window.js
+--- a/lib/main-window.js	2018-04-11 01:16:20.000000000 +0200
++++ b/lib/main-window.js	2018-06-13 07:34:34.968829173 +0200
+@@ -17,7 +17,7 @@
+   autoHideMenuBar: showMenu,
+   webPreferences: {
+     zoomFactor: 1.0,
+-    blinkFeatures: 'OverlayScrollbars'
++    enableBlinkFeatures: 'OverlayScrollbars'
+   },
+   icon: path.resolve(__dirname, '../resources/app.png')
+ })
+diff -ura a/package.json b/package.json
+--- a/package.json	2018-06-13 07:45:37.000000000 +0200
++++ b/package.json	2018-06-13 07:46:48.993660686 +0200
+@@ -110,7 +110,7 @@
+     "css-loader": "^0.19.0",
+     "devtron": "^1.1.0",
+     "dom-storage": "^2.0.2",
+-    "electron": "1.7.11",
++    "electron": "2.0.2",
+     "electron-packager": "^8.6.0",
+     "eslint": "^3.13.1",
+     "eslint-config-standard": "^6.2.1",