From 55de509a2b19a80ff914f63ba04a9379c709afd6 Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Mon, 2 Sep 2019 15:36:10 +0100 Subject: [PATCH 1/4] Update version and sha256sums --- PKGBUILD | 6 +++--- joplin.desktop | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 8432eef..42acd7b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # https://github.com/masterkorp/joplin-pkgbuild pkgname=joplin -pkgver=1.0.161 +pkgver=1.0.165 pkgrel=1 pkgdesc="Joplin - a note taking and to-do application with synchronization capabilities for Windows, macOS, Linux, Android and iOS." arch=("x86_64" "i686") @@ -15,10 +15,10 @@ url="https://joplin.cozic.net" license=("MIT") source=("${pkgname}.desktop" "joplin-desktop.sh" "joplin.sh" "https://github.com/laurent22/joplin/archive/v${pkgver}.zip") -sha256sums=('60f203c91887c692bf09d4f89c905a08d0aa7e42944983332530405c0e1449c0' +sha256sums=('1d5676ded18ae55d31d0dfc8e46a1646a045df94d9c169e68451536ebd9cb653' '41bfdc95a6ee285eb644d05eb3bded72a83950d4720c3c8058ddd3c605cd625d' '5245da6f5f647d49fbe044b747994c9f5a8e98b3c2cd02757dd189426a677276' - '7aedc76da32f5bc8b7b015c3a87924e9bd6661e3051c84245e965e97348173b6') + 'a24bd0c1446bbcc88648fe22dc3e1fbbf7029919336504a833a2fee74e64f6a9') build() { diff --git a/joplin.desktop b/joplin.desktop index f0c12dd..c0cfb8c 100644 --- a/joplin.desktop +++ b/joplin.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Version=1.0.161 +Version=1.0.165 Name=Joplin Comment=Joplin - a note taking and to-do application with synchronization capabilities for Windows, macOS, Linux, Android and iOS. Exec=/usr/bin/joplin-desktop From feb40e9835ecd3f48e37808b1d6e4cfc5e2747b1 Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Mon, 2 Sep 2019 15:36:35 +0100 Subject: [PATCH 2/4] Hardcode extra files references --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 42acd7b..d1b3a35 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,7 +13,7 @@ depends=("nodejs" "gconf") provides=("joplin" "joplin-cli") url="https://joplin.cozic.net" license=("MIT") -source=("${pkgname}.desktop" "joplin-desktop.sh" "joplin.sh" +source=("joplin.desktop" "joplin-desktop.sh" "joplin.sh" "https://github.com/laurent22/joplin/archive/v${pkgver}.zip") sha256sums=('1d5676ded18ae55d31d0dfc8e46a1646a045df94d9c169e68451536ebd9cb653' '41bfdc95a6ee285eb644d05eb3bded72a83950d4720c3c8058ddd3c605cd625d' From 3c2ef87ff1ff1904fb7cb0f7e10c44e850296c5a Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Mon, 2 Sep 2019 15:37:04 +0100 Subject: [PATCH 3/4] Force install sqlite3 version 4.0.7 This allows installation on node v12 --- PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index d1b3a35..8bddf11 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -35,10 +35,10 @@ build() { "${srcdir}/${pkgname}-${pkgver}/CliClient/build/" rsync -a --delete "${srcdir}/${pkgname}-${pkgver}/ReactNativeClient/lib/" \ "${srcdir}/${pkgname}-${pkgver}/CliClient/build/lib" - cp "package.json" "${srcdir}/${pkgname}-${pkgver}/CliClient/build" - cp "package-lock.json" "${srcdir}/${pkgname}-${pkgver}/CliClient/build" cd "${srcdir}/${pkgname}-${pkgver}/CliClient/build/" + # NOTE: Manually forcing sqlite 4.0.7 for node v12, remove later on + npm install sqlite3@4.0.7 npm install # Electron App From 26397699bc2b2ab1bf589176954525bf122902b6 Mon Sep 17 00:00:00 2001 From: Alfredo Palhares Date: Mon, 2 Sep 2019 15:38:46 +0100 Subject: [PATCH 4/4] Fix desktop file install path --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 8bddf11..901e9fd 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -65,7 +65,7 @@ package() { install -m755 joplin-desktop.sh "${pkgdir}/usr/bin/joplin-desktop" install -m755 joplin.sh "${pkgdir}/usr/bin/joplin" - install -Dm644 ../joplin.desktop ${pkgdir}/usr/share/applications/joplin.desktop + install -Dm644 joplin.desktop "${pkgdir}/usr/share/applications/joplin.desktop" install -Dm644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" \ "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" }