diff options
author | Jannick Hemelhof | 2019-07-04 11:02:58 +0200 |
---|---|---|
committer | Jannick Hemelhof | 2019-07-04 11:02:58 +0200 |
commit | 3314b2cdbddc7ded0dd2791ec65861e2ff52c1b0 (patch) | |
tree | 7557b740f04813fd1936512a670213943c7eefc4 | |
parent | 68e85310b2c2fcabbc17edc503d8129a6b94d18e (diff) | |
download | aur-3314b2cdbddc7ded0dd2791ec65861e2ff52c1b0.tar.gz |
Fix for Electron 5.x compatibility
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 15 | ||||
-rw-r--r-- | electron_5_fix.patch | 15 |
3 files changed, 28 insertions, 8 deletions
@@ -1,11 +1,11 @@ pkgbase = boostnote pkgdesc = Open source note-taking app for programmers pkgver = 0.11.16 - pkgrel = 1 + pkgrel = 2 url = https://boostnote.io/ arch = any license = GPL3 - makedepends = npm + makedepends = yarn makedepends = grunt-cli makedepends = git depends = electron @@ -16,12 +16,14 @@ pkgbase = boostnote source = warning-fix.patch source = remove-analytics.patch source = electron_4.patch + source = electron_5_fix.patch sha512sums = 91b0da92d9ed47649b201a1131b20e1328286295e52e1efe717ec3d731bc41351295f02bc63753f07d46d690d15355120d6bd76e2ba503e0617183b9aa16fc93 sha512sums = 1f0ccd2a3632a12c4714d97b9f909ddc94b53d6f86a9e4bdcab31abd55a93071a2c35c6e1e9527b747de6dd74b8a5276414980c11e174085f28b8f2d2721230a sha512sums = 18bcda13580da8ceeaa86793a77ec00a053b8fd51451dad7e2b1a19553fe1a467ac647b44b789212e783f3f6a80968cc9404e884ef7ff6b1f6588473b3229d40 sha512sums = a52e5631867e2c5f18465dee6a3201b9b5c546bda373205c4891c9f7b6114599e0854e2b49defb55ee7bea0778a7fde9c9d9f7271dceeeece743a2d72e2fd0c6 sha512sums = 1b440e2f65f45270acdf4e8898ef49ed8a5c13f3d3dad25a9d5defd404afded72257a50ec63469b763cd72c97247cb823257328efabb401e5bbf29b33f6e49f5 sha512sums = b6e704343c4bdf48273ea680761ccae38cd87a3ea8f87db3b5cf18c99921351b4519c6a4b2cf20417d58a02a4a20e59f354ff96b1cdbc6328e83bff527654647 + sha512sums = ad745b9643e9a677a2a3840c02c8dad7af33e35007141dbc33ff8f7c084b66bd1a794ef44340925fc9d6d77065f41709be56cc8ac55a978e7dc7d520cf8777bf pkgname = boostnote @@ -6,13 +6,13 @@ pkgname=boostnote _pkgname=Boostnote pkgver=0.11.16 -pkgrel=1 +pkgrel=2 pkgdesc="Open source note-taking app for programmers" arch=('any') url="https://boostnote.io/" license=('GPL3') depends=('electron' 'nodejs') -makedepends=('npm' 'grunt-cli' 'git') +makedepends=('yarn' 'grunt-cli' 'git') source=( "${pkgname}-${pkgver}.tar.gz::https://github.com/BoostIO/"${_pkgname}"/archive/v"${pkgver}".tar.gz" @@ -21,6 +21,7 @@ source=( "warning-fix.patch" "remove-analytics.patch" "electron_4.patch" + "electron_5_fix.patch" ) sha512sums=('91b0da92d9ed47649b201a1131b20e1328286295e52e1efe717ec3d731bc41351295f02bc63753f07d46d690d15355120d6bd76e2ba503e0617183b9aa16fc93' @@ -28,7 +29,8 @@ sha512sums=('91b0da92d9ed47649b201a1131b20e1328286295e52e1efe717ec3d731bc4135129 '18bcda13580da8ceeaa86793a77ec00a053b8fd51451dad7e2b1a19553fe1a467ac647b44b789212e783f3f6a80968cc9404e884ef7ff6b1f6588473b3229d40' 'a52e5631867e2c5f18465dee6a3201b9b5c546bda373205c4891c9f7b6114599e0854e2b49defb55ee7bea0778a7fde9c9d9f7271dceeeece743a2d72e2fd0c6' '1b440e2f65f45270acdf4e8898ef49ed8a5c13f3d3dad25a9d5defd404afded72257a50ec63469b763cd72c97247cb823257328efabb401e5bbf29b33f6e49f5' - 'b6e704343c4bdf48273ea680761ccae38cd87a3ea8f87db3b5cf18c99921351b4519c6a4b2cf20417d58a02a4a20e59f354ff96b1cdbc6328e83bff527654647') + 'b6e704343c4bdf48273ea680761ccae38cd87a3ea8f87db3b5cf18c99921351b4519c6a4b2cf20417d58a02a4a20e59f354ff96b1cdbc6328e83bff527654647' + 'ad745b9643e9a677a2a3840c02c8dad7af33e35007141dbc33ff8f7c084b66bd1a794ef44340925fc9d6d77065f41709be56cc8ac55a978e7dc7d520cf8777bf') prepare() { cd "${_pkgname}-${pkgver}" @@ -36,15 +38,16 @@ prepare() { patch -Np1 -i "${srcdir}/warning-fix.patch" patch -Np1 -i "${srcdir}/remove-analytics.patch" patch -Np1 -i "${srcdir}/electron_4.patch" + patch -Np1 -i "${srcdir}/electron_5_fix.patch" } build() { cd "${_pkgname}-${pkgver}" - npm install --no-optional --no-shrinkwrap - grunt compile + yarn install --ignore-optional + yarn run compile rm -r node_modules/ - npm install --production --no-optional --no-shrinkwrap + yarn install --production --ignore-optional } package() { diff --git a/electron_5_fix.patch b/electron_5_fix.patch new file mode 100644 index 000000000000..ce115bc680a8 --- /dev/null +++ b/electron_5_fix.patch @@ -0,0 +1,15 @@ +diff -ura a/lib/main-window.js b/lib/main-window.js +--- a/lib/main-window.js 2019-05-22 08:20:34.000000000 +0200 ++++ b/lib/main-window.js 2019-07-03 15:16:52.013748142 +0200 +@@ -23,7 +23,10 @@ + minHeight: 320, + webPreferences: { + zoomFactor: 1.0, +- enableBlinkFeatures: 'OverlayScrollbars' ++ enableBlinkFeatures: 'OverlayScrollbars', ++ contextIsolation: false, ++ nodeIntegration: true, ++ webviewTag: true + }, + icon: path.resolve(__dirname, '../resources/app.png') + }) |