summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJannick Hemelhof2019-04-14 10:19:42 +0200
committerJannick Hemelhof2019-04-14 10:19:42 +0200
commit9adcacff9af9e2ab26a70669a881df563393afc6 (patch)
treec7f14586b88d10a1c8dcaa0f3e28b831c85fc81e
parent27afb24bc9b071db3d924f0aa2220451895e5fc4 (diff)
downloadaur-9adcacff9af9e2ab26a70669a881df563393afc6.tar.gz
Fixed package for Electron 4 and js-sequence-diagrams
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD10
-rw-r--r--electron_4.patch35
-rw-r--r--fix-js-sequence-diagrams.patch73
4 files changed, 121 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3dd322feef0..7355f82bad6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = boostnote
pkgdesc = Open source note-taking app for programmers
pkgver = 0.11.15
- pkgrel = 1
+ pkgrel = 2
url = https://boostnote.io/
arch = any
license = GPL3
@@ -15,11 +15,15 @@ pkgbase = boostnote
source = boostnote.desktop
source = warning-fix.patch
source = remove-analytics.patch
+ source = fix-js-sequence-diagrams.patch
+ source = electron_4.patch
sha512sums = 531e58d0e8620d745dab1245b036cf39a88e8951d2b1d11dabb4ce6c52cce97c2a961bbc25516cbb2b5b543d359bff66aa2f4f5f6894eb39392630ee1699d69e
sha512sums = 1f0ccd2a3632a12c4714d97b9f909ddc94b53d6f86a9e4bdcab31abd55a93071a2c35c6e1e9527b747de6dd74b8a5276414980c11e174085f28b8f2d2721230a
sha512sums = 18bcda13580da8ceeaa86793a77ec00a053b8fd51451dad7e2b1a19553fe1a467ac647b44b789212e783f3f6a80968cc9404e884ef7ff6b1f6588473b3229d40
sha512sums = a52e5631867e2c5f18465dee6a3201b9b5c546bda373205c4891c9f7b6114599e0854e2b49defb55ee7bea0778a7fde9c9d9f7271dceeeece743a2d72e2fd0c6
sha512sums = 65280bb7e30e07746a63b93be0e32299424683ade760d52031765099048761c863bd2905fbe98a808d85b991777734c6645e887d51493db063984ff236c4fae8
+ sha512sums = c39485dadfaa4c8769e7a1eb4cda637563d95dc3cbd8d391c133dd0cdf7d46ecda1c7a11d46a94ba5de5207dc407c3f07c0f617a81aaab8acd05813f30c9f0cc
+ sha512sums = b6e704343c4bdf48273ea680761ccae38cd87a3ea8f87db3b5cf18c99921351b4519c6a4b2cf20417d58a02a4a20e59f354ff96b1cdbc6328e83bff527654647
pkgname = boostnote
diff --git a/PKGBUILD b/PKGBUILD
index 73a9aecd147..ea96c6f4aba 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
pkgname=boostnote
_pkgname=Boostnote
pkgver=0.11.15
-pkgrel=1
+pkgrel=2
pkgdesc="Open source note-taking app for programmers"
arch=('any')
url="https://boostnote.io/"
@@ -20,19 +20,25 @@ source=(
"${pkgname}.desktop"
"warning-fix.patch"
"remove-analytics.patch"
+ "fix-js-sequence-diagrams.patch"
+ "electron_4.patch"
)
sha512sums=('531e58d0e8620d745dab1245b036cf39a88e8951d2b1d11dabb4ce6c52cce97c2a961bbc25516cbb2b5b543d359bff66aa2f4f5f6894eb39392630ee1699d69e'
'1f0ccd2a3632a12c4714d97b9f909ddc94b53d6f86a9e4bdcab31abd55a93071a2c35c6e1e9527b747de6dd74b8a5276414980c11e174085f28b8f2d2721230a'
'18bcda13580da8ceeaa86793a77ec00a053b8fd51451dad7e2b1a19553fe1a467ac647b44b789212e783f3f6a80968cc9404e884ef7ff6b1f6588473b3229d40'
'a52e5631867e2c5f18465dee6a3201b9b5c546bda373205c4891c9f7b6114599e0854e2b49defb55ee7bea0778a7fde9c9d9f7271dceeeece743a2d72e2fd0c6'
- '65280bb7e30e07746a63b93be0e32299424683ade760d52031765099048761c863bd2905fbe98a808d85b991777734c6645e887d51493db063984ff236c4fae8')
+ '65280bb7e30e07746a63b93be0e32299424683ade760d52031765099048761c863bd2905fbe98a808d85b991777734c6645e887d51493db063984ff236c4fae8'
+ 'c39485dadfaa4c8769e7a1eb4cda637563d95dc3cbd8d391c133dd0cdf7d46ecda1c7a11d46a94ba5de5207dc407c3f07c0f617a81aaab8acd05813f30c9f0cc'
+ 'b6e704343c4bdf48273ea680761ccae38cd87a3ea8f87db3b5cf18c99921351b4519c6a4b2cf20417d58a02a4a20e59f354ff96b1cdbc6328e83bff527654647')
prepare() {
cd "${_pkgname}-${pkgver}"
patch -Np1 -i "${srcdir}/warning-fix.patch"
patch -Np1 -i "${srcdir}/remove-analytics.patch"
+ patch -Np1 -i "${srcdir}/fix-js-sequence-diagrams.patch"
+ patch -Np1 -i "${srcdir}/electron_4.patch"
}
build() {
diff --git a/electron_4.patch b/electron_4.patch
new file mode 100644
index 00000000000..470e7bb8da5
--- /dev/null
+++ b/electron_4.patch
@@ -0,0 +1,35 @@
+diff -ura a/lib/main-app.js b/lib/main-app.js
+--- a/lib/main-app.js 2019-02-08 12:33:20.000000000 +0100
++++ b/lib/main-app.js 2019-04-14 10:06:21.472641974 +0200
+@@ -10,19 +10,20 @@
+
+ var mainWindow = null
+
+-var shouldQuit = app.makeSingleInstance(function (commandLine, workingDirectory) {
+- if (mainWindow) {
+- if (process.platform === 'win32') {
+- mainWindow.minimize()
+- mainWindow.restore()
+- }
+- mainWindow.focus()
+- }
+- return true
+-})
++const gotTheLock = app.requestSingleInstanceLock()
+
+-if (shouldQuit) {
++if (!gotTheLock) {
+ app.quit()
++} else {
++ app.on('second-instance', (event, commandLine, workingDirectory) => {
++ if (mainWindow) {
++ if (process.platform === 'win32') {
++ mainWindow.minimize()
++ mainWindow.restore()
++ }
++ mainWindow.focus()
++ }
++ })
+ }
+
+ var isUpdateReady = false
diff --git a/fix-js-sequence-diagrams.patch b/fix-js-sequence-diagrams.patch
new file mode 100644
index 00000000000..211d6bd5639
--- /dev/null
+++ b/fix-js-sequence-diagrams.patch
@@ -0,0 +1,73 @@
+diff -ura a/browser/components/MarkdownPreview.js b/browser/components/MarkdownPreview.js
+--- a/browser/components/MarkdownPreview.js 2019-02-08 12:33:20.000000000 +0100
++++ b/browser/components/MarkdownPreview.js 2019-04-14 09:28:50.488863230 +0200
+@@ -8,7 +8,7 @@
+ import Raphael from 'raphael'
+ import flowchart from 'flowchart'
+ import mermaidRender from './render/MermaidRender'
+-import SequenceDiagram from 'js-sequence-diagrams'
++import SequenceDiagram from '@rokt33r/js-sequence-diagrams'
+ import Chart from 'chart.js'
+ import eventEmitter from 'browser/main/lib/eventEmitter'
+ import htmlTextHelper from 'browser/lib/htmlTextHelper'
+diff -ura a/lib/main.html b/lib/main.html
+--- a/lib/main.html 2019-02-08 12:33:20.000000000 +0100
++++ b/lib/main.html 2019-04-14 09:30:07.858815447 +0200
+@@ -17,9 +17,11 @@
+ <style>
+ @font-face {
+ font-family: 'OpenSans';
+- src: url('../resources/fonts/Lato-Regular.woff2') format('woff2'), /* Modern Browsers */
+- url('../resources/fonts/Lato-Regular.woff') format('woff'), /* Modern Browsers */
+- url('../resources/fonts/Lato-Regular.ttf') format('truetype');
++ src: url('../resources/fonts/Lato-Regular.woff2') format('woff2'),
++ /* Modern Browsers */
++ url('../resources/fonts/Lato-Regular.woff') format('woff'),
++ /* Modern Browsers */
++ url('../resources/fonts/Lato-Regular.ttf') format('truetype');
+ font-style: normal;
+ font-weight: normal;
+ text-rendering: optimizeLegibility;
+@@ -27,9 +29,11 @@
+
+ @font-face {
+ font-family: 'Lato';
+- src: url('../resources/fonts/Lato-Regular.woff2') format('woff2'), /* Modern Browsers */
+- url('../resources/fonts/Lato-Regular.woff') format('woff'), /* Modern Browsers */
+- url('../resources/fonts/Lato-Regular.ttf') format('truetype');
++ src: url('../resources/fonts/Lato-Regular.woff2') format('woff2'),
++ /* Modern Browsers */
++ url('../resources/fonts/Lato-Regular.woff') format('woff'),
++ /* Modern Browsers */
++ url('../resources/fonts/Lato-Regular.ttf') format('truetype');
+ font-style: normal;
+ font-weight: normal;
+ text-rendering: optimizeLegibility;
+@@ -131,7 +135,7 @@
+ window._ = require('lodash')
+ </script>
+
+- <script src="../node_modules/js-sequence-diagrams/fucknpm/sequence-diagram-min.js"></script>
++ <script src="../node_modules/@rokt33r/js-sequence-diagrams/dist/sequence-diagram-min.js"></script>
+ <script src="../node_modules/react/dist/react.min.js"></script>
+ <script src="../node_modules/react-dom/dist/react-dom.min.js"></script>
+ <script src="../node_modules/redux/dist/redux.min.js"></script>
+diff -ura a/package.json b/package.json
+--- a/package.json 2019-02-08 12:33:20.000000000 +0100
++++ b/package.json 2019-04-14 09:30:50.725905845 +0200
+@@ -50,6 +50,7 @@
+ "homepage": "https://boostnote.io",
+ "dependencies": {
+ "@enyaxu/markdown-it-anchor": "^5.0.2",
++ "@rokt33r/js-sequence-diagrams": "^2.0.6-2",
+ "@rokt33r/markdown-it-math": "^4.0.1",
+ "@rokt33r/season": "^5.3.0",
+ "@susisu/mte-kernel": "^2.0.0",
+@@ -72,7 +73,6 @@
+ "iconv-lite": "^0.4.19",
+ "immutable": "^3.8.1",
+ "invert-color": "^2.0.0",
+- "js-sequence-diagrams": "^1000000.0.6",
+ "js-yaml": "^3.12.0",
+ "katex": "^0.9.0",
+ "lodash": "^4.11.1",