Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] Joplin
@ 2020-12-05  2:24 fosslinux
  2020-12-05  2:30 ` [PR PATCH] [Updated] Joplin fosslinux
                   ` (43 more replies)
  0 siblings, 44 replies; 45+ messages in thread
From: fosslinux @ 2020-12-05  2:24 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 559 bytes --]

There is a new pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages joplin-new
https://github.com/void-linux/void-packages/pull/26952

Joplin
This PR adds the `joplin-desktop` and `joplin-cli` packages, containing the GUI and CLI versions of Joplin respectively. They are not distributed in the one package as they can and should be installed separately, they are separate applications.

Closes #19585

A patch file from https://github.com/void-linux/void-packages/pull/26952.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-joplin-new-26952.patch --]
[-- Type: text/x-diff, Size: 5104 bytes --]

From 6c380e08ad5dba575723ae3dde0bff61ee7d0088 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 2 Oct 2020 18:44:06 +1000
Subject: [PATCH 1/2] New package: joplin-desktop-1.4.19.

---
 srcpkgs/joplin-desktop/files/joplin-desktop |  2 ++
 srcpkgs/joplin-desktop/files/joplin.desktop |  8 +++++
 srcpkgs/joplin-desktop/template             | 37 +++++++++++++++++++++
 3 files changed, 47 insertions(+)
 create mode 100755 srcpkgs/joplin-desktop/files/joplin-desktop
 create mode 100644 srcpkgs/joplin-desktop/files/joplin.desktop
 create mode 100644 srcpkgs/joplin-desktop/template

diff --git a/srcpkgs/joplin-desktop/files/joplin-desktop b/srcpkgs/joplin-desktop/files/joplin-desktop
new file mode 100755
index 00000000000..ea7f12ba1b0
--- /dev/null
+++ b/srcpkgs/joplin-desktop/files/joplin-desktop
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec electron10 /usr/libexec/joplin-desktop/resources/app.asar "$@"
diff --git a/srcpkgs/joplin-desktop/files/joplin.desktop b/srcpkgs/joplin-desktop/files/joplin.desktop
new file mode 100644
index 00000000000..37852543a51
--- /dev/null
+++ b/srcpkgs/joplin-desktop/files/joplin.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+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
+Icon=/usr/libexec/joplin/resources/build/icons/128x128.png
+Terminal=false
+Type=Application
+Categories=Application;Office;
diff --git a/srcpkgs/joplin-desktop/template b/srcpkgs/joplin-desktop/template
new file mode 100644
index 00000000000..669756d2b5f
--- /dev/null
+++ b/srcpkgs/joplin-desktop/template
@@ -0,0 +1,37 @@
+# Template file for 'joplin-desktop'
+pkgname=joplin-desktop
+version=1.4.19
+revision=1
+wrksrc="joplin-${version}"
+hostmakedepends="nodejs python3 pkg-config rsync git p7zip tar app-builder
+ squashfs-tools"
+makedepends="libvips-devel libsecret-devel"
+depends="electron10"
+short_desc="Open source note taking and to-do application - Desktop version"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="MIT"
+homepage="https://joplinapp.org"
+distfiles="https://github.com/laurent22/joplin/archive/v${version}.tar.gz"
+checksum=55aad4fe50e2da980983a69bc7c0870626064db971550d522e266feb17d38916
+
+export USE_SYSTEM_7ZA="true"
+export USE_SYSTEM_APP_BUILDER="true"
+export USE_SYSTEM_MKSQUASHFS="true"
+
+do_build() {
+	# Remove unused modules
+	rm -rf packages/{app-mobile,app-cli,generator-joplin,app-clipper}
+
+	npm install
+	cd packages/app-desktop
+	npm run dist
+}
+
+do_install() {
+	vmkdir usr/libexec/joplin-desktop
+	vcopy packages/app-desktop/dist/linux-unpacked/* usr/libexec/joplin-desktop/
+	rm -rf "${DESTDIR}/usr/libexec/joplin-desktop/resources/app.asar.unpacked/node_modules/7zip-bin-linux"
+	vinstall "${FILESDIR}/joplin.desktop" 644 usr/share/applications/ joplin.desktop
+	vbin "${FILESDIR}/joplin-desktop"
+	vlicense LICENSE
+}

From 3076c7e461f1d62d244892ab1d5ac1d513b44ffb Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 5 Dec 2020 13:19:21 +1100
Subject: [PATCH 2/2] New package: joplin-cli-1.4.19.

---
 srcpkgs/joplin-cli/files/joplin-cli |  3 ++
 srcpkgs/joplin-cli/template         | 51 +++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 srcpkgs/joplin-cli/files/joplin-cli
 create mode 100644 srcpkgs/joplin-cli/template

diff --git a/srcpkgs/joplin-cli/files/joplin-cli b/srcpkgs/joplin-cli/files/joplin-cli
new file mode 100644
index 00000000000..9564abca48a
--- /dev/null
+++ b/srcpkgs/joplin-cli/files/joplin-cli
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /usr/share/joplin-cli/app-cli
+node main.js "$@"
diff --git a/srcpkgs/joplin-cli/template b/srcpkgs/joplin-cli/template
new file mode 100644
index 00000000000..56651beedc8
--- /dev/null
+++ b/srcpkgs/joplin-cli/template
@@ -0,0 +1,51 @@
+# Template file for 'joplin-cli'
+pkgname=joplin-cli
+version=1.4.19
+revision=1
+wrksrc="joplin-${version}"
+hostmakedepends="nodejs git python3 pkg-config"
+makedepends="libvips-devel libsecret-devel"
+depends="nodejs"
+short_desc="Open source note taking and to-do application - CLI version"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="MIT"
+homepage="https://joplinapp.org"
+distfiles="https://github.com/laurent22/joplin/archive/v${version}.tar.gz"
+checksum=55aad4fe50e2da980983a69bc7c0870626064db971550d522e266feb17d38916
+python_version=3
+
+do_build() {
+	# Remove unused modules
+	rm -rf packages/{app-mobile,app-desktop,app-clipper,generator-joplin}
+
+	npm install
+}
+
+do_install() {
+	cd packages
+	
+	for d in app-cli fork-htmlparser2 fork-sax; do
+		vmkdir "usr/libexec/joplin-cli/${d}"
+	done
+
+	pushd app-cli
+	for d in app node_modules; do
+		vcopy "${d}" usr/libexec/joplin-cli/app-cli/
+	done
+	popd
+	
+	pushd fork-htmlparser2
+	vcopy src usr/libexec/joplin-cli/fork-htmlparser2/
+	popd
+
+	pushd fork-sax
+	vcopy lib usr/libexec/joplin-cli/fork-sax/
+	popd
+
+	for d in renderer lib; do
+		vcopy "${d}" usr/libexec/joplin-cli/
+	done
+
+	vbin "${FILESDIR}/joplin-cli"
+	vlicense ../LICENSE
+}

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR PATCH] [Updated] Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
@ 2020-12-05  2:30 ` fosslinux
  2020-12-05  2:37 ` Joplin fosslinux
                   ` (42 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: fosslinux @ 2020-12-05  2:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 564 bytes --]

There is an updated pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages joplin-new
https://github.com/void-linux/void-packages/pull/26952

Joplin
This PR adds the `joplin-desktop` and `joplin-cli` packages, containing the GUI and CLI versions of Joplin respectively. They are not distributed in the one package as they can and should be installed separately, they are separate applications.

Closes #19585

A patch file from https://github.com/void-linux/void-packages/pull/26952.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-joplin-new-26952.patch --]
[-- Type: text/x-diff, Size: 5102 bytes --]

From 6c380e08ad5dba575723ae3dde0bff61ee7d0088 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 2 Oct 2020 18:44:06 +1000
Subject: [PATCH 1/2] New package: joplin-desktop-1.4.19.

---
 srcpkgs/joplin-desktop/files/joplin-desktop |  2 ++
 srcpkgs/joplin-desktop/files/joplin.desktop |  8 +++++
 srcpkgs/joplin-desktop/template             | 37 +++++++++++++++++++++
 3 files changed, 47 insertions(+)
 create mode 100755 srcpkgs/joplin-desktop/files/joplin-desktop
 create mode 100644 srcpkgs/joplin-desktop/files/joplin.desktop
 create mode 100644 srcpkgs/joplin-desktop/template

diff --git a/srcpkgs/joplin-desktop/files/joplin-desktop b/srcpkgs/joplin-desktop/files/joplin-desktop
new file mode 100755
index 00000000000..ea7f12ba1b0
--- /dev/null
+++ b/srcpkgs/joplin-desktop/files/joplin-desktop
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec electron10 /usr/libexec/joplin-desktop/resources/app.asar "$@"
diff --git a/srcpkgs/joplin-desktop/files/joplin.desktop b/srcpkgs/joplin-desktop/files/joplin.desktop
new file mode 100644
index 00000000000..37852543a51
--- /dev/null
+++ b/srcpkgs/joplin-desktop/files/joplin.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+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
+Icon=/usr/libexec/joplin/resources/build/icons/128x128.png
+Terminal=false
+Type=Application
+Categories=Application;Office;
diff --git a/srcpkgs/joplin-desktop/template b/srcpkgs/joplin-desktop/template
new file mode 100644
index 00000000000..669756d2b5f
--- /dev/null
+++ b/srcpkgs/joplin-desktop/template
@@ -0,0 +1,37 @@
+# Template file for 'joplin-desktop'
+pkgname=joplin-desktop
+version=1.4.19
+revision=1
+wrksrc="joplin-${version}"
+hostmakedepends="nodejs python3 pkg-config rsync git p7zip tar app-builder
+ squashfs-tools"
+makedepends="libvips-devel libsecret-devel"
+depends="electron10"
+short_desc="Open source note taking and to-do application - Desktop version"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="MIT"
+homepage="https://joplinapp.org"
+distfiles="https://github.com/laurent22/joplin/archive/v${version}.tar.gz"
+checksum=55aad4fe50e2da980983a69bc7c0870626064db971550d522e266feb17d38916
+
+export USE_SYSTEM_7ZA="true"
+export USE_SYSTEM_APP_BUILDER="true"
+export USE_SYSTEM_MKSQUASHFS="true"
+
+do_build() {
+	# Remove unused modules
+	rm -rf packages/{app-mobile,app-cli,generator-joplin,app-clipper}
+
+	npm install
+	cd packages/app-desktop
+	npm run dist
+}
+
+do_install() {
+	vmkdir usr/libexec/joplin-desktop
+	vcopy packages/app-desktop/dist/linux-unpacked/* usr/libexec/joplin-desktop/
+	rm -rf "${DESTDIR}/usr/libexec/joplin-desktop/resources/app.asar.unpacked/node_modules/7zip-bin-linux"
+	vinstall "${FILESDIR}/joplin.desktop" 644 usr/share/applications/ joplin.desktop
+	vbin "${FILESDIR}/joplin-desktop"
+	vlicense LICENSE
+}

From d797c64a0c3e0eade6562c1c1e4203548a82a1e1 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 5 Dec 2020 13:19:21 +1100
Subject: [PATCH 2/2] New package: joplin-cli-1.4.19.

---
 srcpkgs/joplin-cli/files/joplin-cli |  3 ++
 srcpkgs/joplin-cli/template         | 51 +++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 srcpkgs/joplin-cli/files/joplin-cli
 create mode 100644 srcpkgs/joplin-cli/template

diff --git a/srcpkgs/joplin-cli/files/joplin-cli b/srcpkgs/joplin-cli/files/joplin-cli
new file mode 100644
index 00000000000..9564abca48a
--- /dev/null
+++ b/srcpkgs/joplin-cli/files/joplin-cli
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /usr/share/joplin-cli/app-cli
+node main.js "$@"
diff --git a/srcpkgs/joplin-cli/template b/srcpkgs/joplin-cli/template
new file mode 100644
index 00000000000..ccb02d5c480
--- /dev/null
+++ b/srcpkgs/joplin-cli/template
@@ -0,0 +1,51 @@
+# Template file for 'joplin-cli'
+pkgname=joplin-cli
+version=1.4.19
+revision=1
+wrksrc="joplin-${version}"
+hostmakedepends="nodejs git python3 pkg-config"
+makedepends="libvips-devel libsecret-devel"
+depends="nodejs"
+short_desc="Open source note taking and to-do application - CLI version"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="MIT"
+homepage="https://joplinapp.org"
+distfiles="https://github.com/laurent22/joplin/archive/v${version}.tar.gz"
+checksum=55aad4fe50e2da980983a69bc7c0870626064db971550d522e266feb17d38916
+python_version=3
+
+do_build() {
+	# Remove unused modules
+	rm -rf packages/{app-mobile,app-desktop,app-clipper,generator-joplin}
+
+	npm install
+}
+
+do_install() {
+	cd packages
+
+	for d in app-cli fork-htmlparser2 fork-sax; do
+		vmkdir "usr/libexec/joplin-cli/${d}"
+	done
+
+	pushd app-cli
+	for d in app node_modules; do
+		vcopy "${d}" usr/libexec/joplin-cli/app-cli/
+	done
+	popd
+
+	pushd fork-htmlparser2
+	vcopy src usr/libexec/joplin-cli/fork-htmlparser2/
+	popd
+
+	pushd fork-sax
+	vcopy lib usr/libexec/joplin-cli/fork-sax/
+	popd
+
+	for d in renderer lib; do
+		vcopy "${d}" usr/libexec/joplin-cli/
+	done
+
+	vbin "${FILESDIR}/joplin-cli"
+	vlicense ../LICENSE
+}

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
  2020-12-05  2:30 ` [PR PATCH] [Updated] Joplin fosslinux
@ 2020-12-05  2:37 ` fosslinux
  2020-12-05  3:16 ` Joplin ericonr
                   ` (41 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: fosslinux @ 2020-12-05  2:37 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 185 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/26952#issuecomment-739110422

Comment:
I cannot reproduce this travis failure....

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
  2020-12-05  2:30 ` [PR PATCH] [Updated] Joplin fosslinux
  2020-12-05  2:37 ` Joplin fosslinux
@ 2020-12-05  3:16 ` ericonr
  2020-12-05  4:20 ` Joplin ndowens
                   ` (40 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: ericonr @ 2020-12-05  3:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 194 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26952#issuecomment-739114837

Comment:
> sh: electron-builder: command not found

weird...

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (2 preceding siblings ...)
  2020-12-05  3:16 ` Joplin ericonr
@ 2020-12-05  4:20 ` ndowens
  2020-12-05  4:46 ` Joplin fosslinux
                   ` (39 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: ndowens @ 2020-12-05  4:20 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 318 bytes --]

New comment by ndowens on void-packages repository

https://github.com/void-linux/void-packages/pull/26952#issuecomment-739122831

Comment:



> > sh: electron-builder: command not found
> 
> weird...

I don't know if this would help, but searching I found https://github.com/electron-userland/electron-builder

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (3 preceding siblings ...)
  2020-12-05  4:20 ` Joplin ndowens
@ 2020-12-05  4:46 ` fosslinux
  2020-12-05 10:31 ` [PR PATCH] [Updated] Joplin fosslinux
                   ` (38 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: fosslinux @ 2020-12-05  4:46 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 273 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/26952#issuecomment-739125419

Comment:
... yes, I found that too... and it means nothing, other than that electron-builder exists, and it builds fine on my local machine

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR PATCH] [Updated] Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (4 preceding siblings ...)
  2020-12-05  4:46 ` Joplin fosslinux
@ 2020-12-05 10:31 ` fosslinux
  2020-12-05 13:48 ` Joplin sgn
                   ` (37 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: fosslinux @ 2020-12-05 10:31 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 564 bytes --]

There is an updated pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages joplin-new
https://github.com/void-linux/void-packages/pull/26952

Joplin
This PR adds the `joplin-desktop` and `joplin-cli` packages, containing the GUI and CLI versions of Joplin respectively. They are not distributed in the one package as they can and should be installed separately, they are separate applications.

Closes #19585

A patch file from https://github.com/void-linux/void-packages/pull/26952.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-joplin-new-26952.patch --]
[-- Type: text/x-diff, Size: 5099 bytes --]

From 6c380e08ad5dba575723ae3dde0bff61ee7d0088 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 2 Oct 2020 18:44:06 +1000
Subject: [PATCH 1/2] New package: joplin-desktop-1.4.19.

---
 srcpkgs/joplin-desktop/files/joplin-desktop |  2 ++
 srcpkgs/joplin-desktop/files/joplin.desktop |  8 +++++
 srcpkgs/joplin-desktop/template             | 37 +++++++++++++++++++++
 3 files changed, 47 insertions(+)
 create mode 100755 srcpkgs/joplin-desktop/files/joplin-desktop
 create mode 100644 srcpkgs/joplin-desktop/files/joplin.desktop
 create mode 100644 srcpkgs/joplin-desktop/template

diff --git a/srcpkgs/joplin-desktop/files/joplin-desktop b/srcpkgs/joplin-desktop/files/joplin-desktop
new file mode 100755
index 00000000000..ea7f12ba1b0
--- /dev/null
+++ b/srcpkgs/joplin-desktop/files/joplin-desktop
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec electron10 /usr/libexec/joplin-desktop/resources/app.asar "$@"
diff --git a/srcpkgs/joplin-desktop/files/joplin.desktop b/srcpkgs/joplin-desktop/files/joplin.desktop
new file mode 100644
index 00000000000..37852543a51
--- /dev/null
+++ b/srcpkgs/joplin-desktop/files/joplin.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+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
+Icon=/usr/libexec/joplin/resources/build/icons/128x128.png
+Terminal=false
+Type=Application
+Categories=Application;Office;
diff --git a/srcpkgs/joplin-desktop/template b/srcpkgs/joplin-desktop/template
new file mode 100644
index 00000000000..669756d2b5f
--- /dev/null
+++ b/srcpkgs/joplin-desktop/template
@@ -0,0 +1,37 @@
+# Template file for 'joplin-desktop'
+pkgname=joplin-desktop
+version=1.4.19
+revision=1
+wrksrc="joplin-${version}"
+hostmakedepends="nodejs python3 pkg-config rsync git p7zip tar app-builder
+ squashfs-tools"
+makedepends="libvips-devel libsecret-devel"
+depends="electron10"
+short_desc="Open source note taking and to-do application - Desktop version"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="MIT"
+homepage="https://joplinapp.org"
+distfiles="https://github.com/laurent22/joplin/archive/v${version}.tar.gz"
+checksum=55aad4fe50e2da980983a69bc7c0870626064db971550d522e266feb17d38916
+
+export USE_SYSTEM_7ZA="true"
+export USE_SYSTEM_APP_BUILDER="true"
+export USE_SYSTEM_MKSQUASHFS="true"
+
+do_build() {
+	# Remove unused modules
+	rm -rf packages/{app-mobile,app-cli,generator-joplin,app-clipper}
+
+	npm install
+	cd packages/app-desktop
+	npm run dist
+}
+
+do_install() {
+	vmkdir usr/libexec/joplin-desktop
+	vcopy packages/app-desktop/dist/linux-unpacked/* usr/libexec/joplin-desktop/
+	rm -rf "${DESTDIR}/usr/libexec/joplin-desktop/resources/app.asar.unpacked/node_modules/7zip-bin-linux"
+	vinstall "${FILESDIR}/joplin.desktop" 644 usr/share/applications/ joplin.desktop
+	vbin "${FILESDIR}/joplin-desktop"
+	vlicense LICENSE
+}

From 88a9eb6e65b28dcc0d484a3bc2f3ad1effe97cec Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 5 Dec 2020 13:19:21 +1100
Subject: [PATCH 2/2] New package: joplin-cli-1.4.19.

---
 srcpkgs/joplin-cli/files/joplin-cli |  3 ++
 srcpkgs/joplin-cli/template         | 45 +++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 srcpkgs/joplin-cli/files/joplin-cli
 create mode 100644 srcpkgs/joplin-cli/template

diff --git a/srcpkgs/joplin-cli/files/joplin-cli b/srcpkgs/joplin-cli/files/joplin-cli
new file mode 100644
index 00000000000..e65e75598db
--- /dev/null
+++ b/srcpkgs/joplin-cli/files/joplin-cli
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /usr/libexec/joplin-cli/app-cli
+node app/main.js "$@"
diff --git a/srcpkgs/joplin-cli/template b/srcpkgs/joplin-cli/template
new file mode 100644
index 00000000000..463598af152
--- /dev/null
+++ b/srcpkgs/joplin-cli/template
@@ -0,0 +1,45 @@
+# Template file for 'joplin-cli'
+pkgname=joplin-cli
+version=1.4.19
+revision=1
+wrksrc="joplin-${version}"
+hostmakedepends="nodejs git python3 pkg-config"
+makedepends="libvips-devel libsecret-devel"
+depends="nodejs"
+short_desc="Open source note taking and to-do application - CLI version"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="MIT"
+homepage="https://joplinapp.org"
+distfiles="https://github.com/laurent22/joplin/archive/v${version}.tar.gz"
+checksum=55aad4fe50e2da980983a69bc7c0870626064db971550d522e266feb17d38916
+python_version=3
+
+do_build() {
+	# Remove unused modules
+	rm -rf packages/{app-mobile,app-desktop,app-clipper,generator-joplin}
+
+	npm install
+
+	cd packages
+	# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=joplin-cli#n30
+	# Unsure why this is needed, but it is
+	for d in app-cli lib renderer tools; do
+		pushd "${d}"
+		mv node_modules/@joplin .
+		npm prune --production
+		mv @joplin node_modules/
+		popd
+	done
+}
+
+do_install() {
+	cd packages
+
+	vmkdir usr/libexec/joplin-cli
+	for d in app-cli fork-sax fork-htmlparser2 renderer lib tools; do
+		vcopy "${d}" usr/libexec/joplin-cli/
+	done
+
+	vbin "${FILESDIR}/joplin-cli"
+	vlicense ../LICENSE
+}

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (5 preceding siblings ...)
  2020-12-05 10:31 ` [PR PATCH] [Updated] Joplin fosslinux
@ 2020-12-05 13:48 ` sgn
  2020-12-05 14:12 ` Joplin sgn
                   ` (36 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: sgn @ 2020-12-05 13:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 224 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/26952#issuecomment-739253445

Comment:
It may relate to the fact that CI run `xbps-src` as root. I can reproduce in my docker.

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (6 preceding siblings ...)
  2020-12-05 13:48 ` Joplin sgn
@ 2020-12-05 14:12 ` sgn
  2020-12-05 14:18 ` [PR PATCH] [Updated] Joplin sgn
                   ` (35 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: sgn @ 2020-12-05 14:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 566 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/26952#issuecomment-739256082

Comment:
```diff
diff --git a/srcpkgs/joplin-desktop/template b/srcpkgs/joplin-desktop/template
index 669756d2b5..410abb23be 100644
--- a/srcpkgs/joplin-desktop/template
+++ b/srcpkgs/joplin-desktop/template
@@ -22,7 +22,7 @@ do_build() {
 	# Remove unused modules
 	rm -rf packages/{app-mobile,app-cli,generator-joplin,app-clipper}
 
-	npm install
+	npm install --unsafe-perm
 	cd packages/app-desktop
 	npm run dist
 }
```

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR PATCH] [Updated] Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (7 preceding siblings ...)
  2020-12-05 14:12 ` Joplin sgn
@ 2020-12-05 14:18 ` sgn
  2020-12-05 14:28 ` Joplin sgn
                   ` (34 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: sgn @ 2020-12-05 14:18 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 558 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/fosslinux/void-packages joplin-new
https://github.com/void-linux/void-packages/pull/26952

Joplin
This PR adds the `joplin-desktop` and `joplin-cli` packages, containing the GUI and CLI versions of Joplin respectively. They are not distributed in the one package as they can and should be installed separately, they are separate applications.

Closes #19585

A patch file from https://github.com/void-linux/void-packages/pull/26952.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-joplin-new-26952.patch --]
[-- Type: text/x-diff, Size: 6651 bytes --]

From 6c380e08ad5dba575723ae3dde0bff61ee7d0088 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 2 Oct 2020 18:44:06 +1000
Subject: [PATCH 1/4] New package: joplin-desktop-1.4.19.

---
 srcpkgs/joplin-desktop/files/joplin-desktop |  2 ++
 srcpkgs/joplin-desktop/files/joplin.desktop |  8 +++++
 srcpkgs/joplin-desktop/template             | 37 +++++++++++++++++++++
 3 files changed, 47 insertions(+)
 create mode 100755 srcpkgs/joplin-desktop/files/joplin-desktop
 create mode 100644 srcpkgs/joplin-desktop/files/joplin.desktop
 create mode 100644 srcpkgs/joplin-desktop/template

diff --git a/srcpkgs/joplin-desktop/files/joplin-desktop b/srcpkgs/joplin-desktop/files/joplin-desktop
new file mode 100755
index 00000000000..ea7f12ba1b0
--- /dev/null
+++ b/srcpkgs/joplin-desktop/files/joplin-desktop
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec electron10 /usr/libexec/joplin-desktop/resources/app.asar "$@"
diff --git a/srcpkgs/joplin-desktop/files/joplin.desktop b/srcpkgs/joplin-desktop/files/joplin.desktop
new file mode 100644
index 00000000000..37852543a51
--- /dev/null
+++ b/srcpkgs/joplin-desktop/files/joplin.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+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
+Icon=/usr/libexec/joplin/resources/build/icons/128x128.png
+Terminal=false
+Type=Application
+Categories=Application;Office;
diff --git a/srcpkgs/joplin-desktop/template b/srcpkgs/joplin-desktop/template
new file mode 100644
index 00000000000..669756d2b5f
--- /dev/null
+++ b/srcpkgs/joplin-desktop/template
@@ -0,0 +1,37 @@
+# Template file for 'joplin-desktop'
+pkgname=joplin-desktop
+version=1.4.19
+revision=1
+wrksrc="joplin-${version}"
+hostmakedepends="nodejs python3 pkg-config rsync git p7zip tar app-builder
+ squashfs-tools"
+makedepends="libvips-devel libsecret-devel"
+depends="electron10"
+short_desc="Open source note taking and to-do application - Desktop version"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="MIT"
+homepage="https://joplinapp.org"
+distfiles="https://github.com/laurent22/joplin/archive/v${version}.tar.gz"
+checksum=55aad4fe50e2da980983a69bc7c0870626064db971550d522e266feb17d38916
+
+export USE_SYSTEM_7ZA="true"
+export USE_SYSTEM_APP_BUILDER="true"
+export USE_SYSTEM_MKSQUASHFS="true"
+
+do_build() {
+	# Remove unused modules
+	rm -rf packages/{app-mobile,app-cli,generator-joplin,app-clipper}
+
+	npm install
+	cd packages/app-desktop
+	npm run dist
+}
+
+do_install() {
+	vmkdir usr/libexec/joplin-desktop
+	vcopy packages/app-desktop/dist/linux-unpacked/* usr/libexec/joplin-desktop/
+	rm -rf "${DESTDIR}/usr/libexec/joplin-desktop/resources/app.asar.unpacked/node_modules/7zip-bin-linux"
+	vinstall "${FILESDIR}/joplin.desktop" 644 usr/share/applications/ joplin.desktop
+	vbin "${FILESDIR}/joplin-desktop"
+	vlicense LICENSE
+}

From 88a9eb6e65b28dcc0d484a3bc2f3ad1effe97cec Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 5 Dec 2020 13:19:21 +1100
Subject: [PATCH 2/4] New package: joplin-cli-1.4.19.

---
 srcpkgs/joplin-cli/files/joplin-cli |  3 ++
 srcpkgs/joplin-cli/template         | 45 +++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 srcpkgs/joplin-cli/files/joplin-cli
 create mode 100644 srcpkgs/joplin-cli/template

diff --git a/srcpkgs/joplin-cli/files/joplin-cli b/srcpkgs/joplin-cli/files/joplin-cli
new file mode 100644
index 00000000000..e65e75598db
--- /dev/null
+++ b/srcpkgs/joplin-cli/files/joplin-cli
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /usr/libexec/joplin-cli/app-cli
+node app/main.js "$@"
diff --git a/srcpkgs/joplin-cli/template b/srcpkgs/joplin-cli/template
new file mode 100644
index 00000000000..463598af152
--- /dev/null
+++ b/srcpkgs/joplin-cli/template
@@ -0,0 +1,45 @@
+# Template file for 'joplin-cli'
+pkgname=joplin-cli
+version=1.4.19
+revision=1
+wrksrc="joplin-${version}"
+hostmakedepends="nodejs git python3 pkg-config"
+makedepends="libvips-devel libsecret-devel"
+depends="nodejs"
+short_desc="Open source note taking and to-do application - CLI version"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="MIT"
+homepage="https://joplinapp.org"
+distfiles="https://github.com/laurent22/joplin/archive/v${version}.tar.gz"
+checksum=55aad4fe50e2da980983a69bc7c0870626064db971550d522e266feb17d38916
+python_version=3
+
+do_build() {
+	# Remove unused modules
+	rm -rf packages/{app-mobile,app-desktop,app-clipper,generator-joplin}
+
+	npm install
+
+	cd packages
+	# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=joplin-cli#n30
+	# Unsure why this is needed, but it is
+	for d in app-cli lib renderer tools; do
+		pushd "${d}"
+		mv node_modules/@joplin .
+		npm prune --production
+		mv @joplin node_modules/
+		popd
+	done
+}
+
+do_install() {
+	cd packages
+
+	vmkdir usr/libexec/joplin-cli
+	for d in app-cli fork-sax fork-htmlparser2 renderer lib tools; do
+		vcopy "${d}" usr/libexec/joplin-cli/
+	done
+
+	vbin "${FILESDIR}/joplin-cli"
+	vlicense ../LICENSE
+}

From 7e80ba3a0eb65204497477f1ac963cf8aaca71f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 5 Dec 2020 21:16:38 +0700
Subject: [PATCH 3/4] fixup! New package: joplin-desktop-1.4.19.

---
 srcpkgs/joplin-desktop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/joplin-desktop/template b/srcpkgs/joplin-desktop/template
index 669756d2b5f..410abb23bed 100644
--- a/srcpkgs/joplin-desktop/template
+++ b/srcpkgs/joplin-desktop/template
@@ -22,7 +22,7 @@ do_build() {
 	# Remove unused modules
 	rm -rf packages/{app-mobile,app-cli,generator-joplin,app-clipper}
 
-	npm install
+	npm install --unsafe-perm
 	cd packages/app-desktop
 	npm run dist
 }

From 9f5e993e2d1fcb0d2b029c3c683ef87a4f6bbf1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 5 Dec 2020 21:18:01 +0700
Subject: [PATCH 4/4] fixup! New package: joplin-cli-1.4.19.

---
 srcpkgs/joplin-cli/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/joplin-cli/template b/srcpkgs/joplin-cli/template
index 463598af152..113e50af3bf 100644
--- a/srcpkgs/joplin-cli/template
+++ b/srcpkgs/joplin-cli/template
@@ -18,7 +18,7 @@ do_build() {
 	# Remove unused modules
 	rm -rf packages/{app-mobile,app-desktop,app-clipper,generator-joplin}
 
-	npm install
+	npm install --unsafe-perm
 
 	cd packages
 	# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=joplin-cli#n30

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (8 preceding siblings ...)
  2020-12-05 14:18 ` [PR PATCH] [Updated] Joplin sgn
@ 2020-12-05 14:28 ` sgn
  2020-12-05 22:05 ` Joplin fosslinux
                   ` (33 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: sgn @ 2020-12-05 14:28 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 651 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/26952#issuecomment-739257740

Comment:
Actually, this is what I think better:
```diff
diff --git a/srcpkgs/joplin-desktop/template b/srcpkgs/joplin-desktop/template
index 410abb23be..ff200fcd7c 100644
--- a/srcpkgs/joplin-desktop/template
+++ b/srcpkgs/joplin-desktop/template
@@ -22,7 +22,7 @@ do_build() {
 	# Remove unused modules
 	rm -rf packages/{app-mobile,app-cli,generator-joplin,app-clipper}
 
-	npm install --unsafe-perm
+	npm install ${XBPS_ALLOW_CHROOT_BREAKOUT:+--unsafe-perm}
 	cd packages/app-desktop
 	npm run dist
 }
```

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (9 preceding siblings ...)
  2020-12-05 14:28 ` Joplin sgn
@ 2020-12-05 22:05 ` fosslinux
  2020-12-05 22:06 ` Joplin fosslinux
                   ` (32 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: fosslinux @ 2020-12-05 22:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 173 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/26952#issuecomment-739422346

Comment:
I agree, thank you. I will fix

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (10 preceding siblings ...)
  2020-12-05 22:05 ` Joplin fosslinux
@ 2020-12-05 22:06 ` fosslinux
  2020-12-05 22:19 ` [PR PATCH] [Updated] Joplin fosslinux
                   ` (31 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: fosslinux @ 2020-12-05 22:06 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 271 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/26952#issuecomment-739422473

Comment:
@sgn could you check if something similar happens for mattermost-desktop element-desktop and friends? It may need a similar fix.

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR PATCH] [Updated] Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (11 preceding siblings ...)
  2020-12-05 22:06 ` Joplin fosslinux
@ 2020-12-05 22:19 ` fosslinux
  2020-12-05 23:38 ` [PR REVIEW] Joplin sgn
                   ` (30 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: fosslinux @ 2020-12-05 22:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 564 bytes --]

There is an updated pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages joplin-new
https://github.com/void-linux/void-packages/pull/26952

Joplin
This PR adds the `joplin-desktop` and `joplin-cli` packages, containing the GUI and CLI versions of Joplin respectively. They are not distributed in the one package as they can and should be installed separately, they are separate applications.

Closes #19585

A patch file from https://github.com/void-linux/void-packages/pull/26952.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-joplin-new-26952.patch --]
[-- Type: text/x-diff, Size: 5144 bytes --]

From e1ee3aa7c1b2bbc69b5e7ebfc15fa577375ab428 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 2 Oct 2020 18:44:06 +1000
Subject: [PATCH 1/2] New package: joplin-desktop-1.4.19.

---
 srcpkgs/joplin-desktop/files/joplin-desktop |  2 ++
 srcpkgs/joplin-desktop/files/joplin.desktop |  8 +++++
 srcpkgs/joplin-desktop/template             | 37 +++++++++++++++++++++
 3 files changed, 47 insertions(+)
 create mode 100755 srcpkgs/joplin-desktop/files/joplin-desktop
 create mode 100644 srcpkgs/joplin-desktop/files/joplin.desktop
 create mode 100644 srcpkgs/joplin-desktop/template

diff --git a/srcpkgs/joplin-desktop/files/joplin-desktop b/srcpkgs/joplin-desktop/files/joplin-desktop
new file mode 100755
index 00000000000..ea7f12ba1b0
--- /dev/null
+++ b/srcpkgs/joplin-desktop/files/joplin-desktop
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec electron10 /usr/libexec/joplin-desktop/resources/app.asar "$@"
diff --git a/srcpkgs/joplin-desktop/files/joplin.desktop b/srcpkgs/joplin-desktop/files/joplin.desktop
new file mode 100644
index 00000000000..37852543a51
--- /dev/null
+++ b/srcpkgs/joplin-desktop/files/joplin.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+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
+Icon=/usr/libexec/joplin/resources/build/icons/128x128.png
+Terminal=false
+Type=Application
+Categories=Application;Office;
diff --git a/srcpkgs/joplin-desktop/template b/srcpkgs/joplin-desktop/template
new file mode 100644
index 00000000000..ff200fcd7c3
--- /dev/null
+++ b/srcpkgs/joplin-desktop/template
@@ -0,0 +1,37 @@
+# Template file for 'joplin-desktop'
+pkgname=joplin-desktop
+version=1.4.19
+revision=1
+wrksrc="joplin-${version}"
+hostmakedepends="nodejs python3 pkg-config rsync git p7zip tar app-builder
+ squashfs-tools"
+makedepends="libvips-devel libsecret-devel"
+depends="electron10"
+short_desc="Open source note taking and to-do application - Desktop version"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="MIT"
+homepage="https://joplinapp.org"
+distfiles="https://github.com/laurent22/joplin/archive/v${version}.tar.gz"
+checksum=55aad4fe50e2da980983a69bc7c0870626064db971550d522e266feb17d38916
+
+export USE_SYSTEM_7ZA="true"
+export USE_SYSTEM_APP_BUILDER="true"
+export USE_SYSTEM_MKSQUASHFS="true"
+
+do_build() {
+	# Remove unused modules
+	rm -rf packages/{app-mobile,app-cli,generator-joplin,app-clipper}
+
+	npm install ${XBPS_ALLOW_CHROOT_BREAKOUT:+--unsafe-perm}
+	cd packages/app-desktop
+	npm run dist
+}
+
+do_install() {
+	vmkdir usr/libexec/joplin-desktop
+	vcopy packages/app-desktop/dist/linux-unpacked/* usr/libexec/joplin-desktop/
+	rm -rf "${DESTDIR}/usr/libexec/joplin-desktop/resources/app.asar.unpacked/node_modules/7zip-bin-linux"
+	vinstall "${FILESDIR}/joplin.desktop" 644 usr/share/applications/ joplin.desktop
+	vbin "${FILESDIR}/joplin-desktop"
+	vlicense LICENSE
+}

From 34e813da784a5a975773fdc2f725a61779f1c6b8 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 5 Dec 2020 13:19:21 +1100
Subject: [PATCH 2/2] New package: joplin-cli-1.4.19.

---
 srcpkgs/joplin-cli/files/joplin-cli |  3 ++
 srcpkgs/joplin-cli/template         | 45 +++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 srcpkgs/joplin-cli/files/joplin-cli
 create mode 100644 srcpkgs/joplin-cli/template

diff --git a/srcpkgs/joplin-cli/files/joplin-cli b/srcpkgs/joplin-cli/files/joplin-cli
new file mode 100644
index 00000000000..e65e75598db
--- /dev/null
+++ b/srcpkgs/joplin-cli/files/joplin-cli
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /usr/libexec/joplin-cli/app-cli
+node app/main.js "$@"
diff --git a/srcpkgs/joplin-cli/template b/srcpkgs/joplin-cli/template
new file mode 100644
index 00000000000..463598af152
--- /dev/null
+++ b/srcpkgs/joplin-cli/template
@@ -0,0 +1,45 @@
+# Template file for 'joplin-cli'
+pkgname=joplin-cli
+version=1.4.19
+revision=1
+wrksrc="joplin-${version}"
+hostmakedepends="nodejs git python3 pkg-config"
+makedepends="libvips-devel libsecret-devel"
+depends="nodejs"
+short_desc="Open source note taking and to-do application - CLI version"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="MIT"
+homepage="https://joplinapp.org"
+distfiles="https://github.com/laurent22/joplin/archive/v${version}.tar.gz"
+checksum=55aad4fe50e2da980983a69bc7c0870626064db971550d522e266feb17d38916
+python_version=3
+
+do_build() {
+	# Remove unused modules
+	rm -rf packages/{app-mobile,app-desktop,app-clipper,generator-joplin}
+
+	npm install
+
+	cd packages
+	# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=joplin-cli#n30
+	# Unsure why this is needed, but it is
+	for d in app-cli lib renderer tools; do
+		pushd "${d}"
+		mv node_modules/@joplin .
+		npm prune --production
+		mv @joplin node_modules/
+		popd
+	done
+}
+
+do_install() {
+	cd packages
+
+	vmkdir usr/libexec/joplin-cli
+	for d in app-cli fork-sax fork-htmlparser2 renderer lib tools; do
+		vcopy "${d}" usr/libexec/joplin-cli/
+	done
+
+	vbin "${FILESDIR}/joplin-cli"
+	vlicense ../LICENSE
+}

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR REVIEW] Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (12 preceding siblings ...)
  2020-12-05 22:19 ` [PR PATCH] [Updated] Joplin fosslinux
@ 2020-12-05 23:38 ` sgn
  2020-12-06  4:34 ` [PR PATCH] [Updated] Joplin fosslinux
                   ` (29 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: sgn @ 2020-12-05 23:38 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 167 bytes --]

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/26952#discussion_r536914567

Comment:
It need a fix here, too.

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR PATCH] [Updated] Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (13 preceding siblings ...)
  2020-12-05 23:38 ` [PR REVIEW] Joplin sgn
@ 2020-12-06  4:34 ` fosslinux
  2020-12-14  3:20 ` Joplin sgn
                   ` (28 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: fosslinux @ 2020-12-06  4:34 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 564 bytes --]

There is an updated pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages joplin-new
https://github.com/void-linux/void-packages/pull/26952

Joplin
This PR adds the `joplin-desktop` and `joplin-cli` packages, containing the GUI and CLI versions of Joplin respectively. They are not distributed in the one package as they can and should be installed separately, they are separate applications.

Closes #19585

A patch file from https://github.com/void-linux/void-packages/pull/26952.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-joplin-new-26952.patch --]
[-- Type: text/x-diff, Size: 5189 bytes --]

From e1ee3aa7c1b2bbc69b5e7ebfc15fa577375ab428 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 2 Oct 2020 18:44:06 +1000
Subject: [PATCH 1/2] New package: joplin-desktop-1.4.19.

---
 srcpkgs/joplin-desktop/files/joplin-desktop |  2 ++
 srcpkgs/joplin-desktop/files/joplin.desktop |  8 +++++
 srcpkgs/joplin-desktop/template             | 37 +++++++++++++++++++++
 3 files changed, 47 insertions(+)
 create mode 100755 srcpkgs/joplin-desktop/files/joplin-desktop
 create mode 100644 srcpkgs/joplin-desktop/files/joplin.desktop
 create mode 100644 srcpkgs/joplin-desktop/template

diff --git a/srcpkgs/joplin-desktop/files/joplin-desktop b/srcpkgs/joplin-desktop/files/joplin-desktop
new file mode 100755
index 00000000000..ea7f12ba1b0
--- /dev/null
+++ b/srcpkgs/joplin-desktop/files/joplin-desktop
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec electron10 /usr/libexec/joplin-desktop/resources/app.asar "$@"
diff --git a/srcpkgs/joplin-desktop/files/joplin.desktop b/srcpkgs/joplin-desktop/files/joplin.desktop
new file mode 100644
index 00000000000..37852543a51
--- /dev/null
+++ b/srcpkgs/joplin-desktop/files/joplin.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+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
+Icon=/usr/libexec/joplin/resources/build/icons/128x128.png
+Terminal=false
+Type=Application
+Categories=Application;Office;
diff --git a/srcpkgs/joplin-desktop/template b/srcpkgs/joplin-desktop/template
new file mode 100644
index 00000000000..ff200fcd7c3
--- /dev/null
+++ b/srcpkgs/joplin-desktop/template
@@ -0,0 +1,37 @@
+# Template file for 'joplin-desktop'
+pkgname=joplin-desktop
+version=1.4.19
+revision=1
+wrksrc="joplin-${version}"
+hostmakedepends="nodejs python3 pkg-config rsync git p7zip tar app-builder
+ squashfs-tools"
+makedepends="libvips-devel libsecret-devel"
+depends="electron10"
+short_desc="Open source note taking and to-do application - Desktop version"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="MIT"
+homepage="https://joplinapp.org"
+distfiles="https://github.com/laurent22/joplin/archive/v${version}.tar.gz"
+checksum=55aad4fe50e2da980983a69bc7c0870626064db971550d522e266feb17d38916
+
+export USE_SYSTEM_7ZA="true"
+export USE_SYSTEM_APP_BUILDER="true"
+export USE_SYSTEM_MKSQUASHFS="true"
+
+do_build() {
+	# Remove unused modules
+	rm -rf packages/{app-mobile,app-cli,generator-joplin,app-clipper}
+
+	npm install ${XBPS_ALLOW_CHROOT_BREAKOUT:+--unsafe-perm}
+	cd packages/app-desktop
+	npm run dist
+}
+
+do_install() {
+	vmkdir usr/libexec/joplin-desktop
+	vcopy packages/app-desktop/dist/linux-unpacked/* usr/libexec/joplin-desktop/
+	rm -rf "${DESTDIR}/usr/libexec/joplin-desktop/resources/app.asar.unpacked/node_modules/7zip-bin-linux"
+	vinstall "${FILESDIR}/joplin.desktop" 644 usr/share/applications/ joplin.desktop
+	vbin "${FILESDIR}/joplin-desktop"
+	vlicense LICENSE
+}

From 2e6434a0e52639c3e88bf7807834700553404e71 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 5 Dec 2020 13:19:21 +1100
Subject: [PATCH 2/2] New package: joplin-cli-1.4.19.

---
 srcpkgs/joplin-cli/files/joplin-cli |  3 ++
 srcpkgs/joplin-cli/template         | 45 +++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 srcpkgs/joplin-cli/files/joplin-cli
 create mode 100644 srcpkgs/joplin-cli/template

diff --git a/srcpkgs/joplin-cli/files/joplin-cli b/srcpkgs/joplin-cli/files/joplin-cli
new file mode 100644
index 00000000000..e65e75598db
--- /dev/null
+++ b/srcpkgs/joplin-cli/files/joplin-cli
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /usr/libexec/joplin-cli/app-cli
+node app/main.js "$@"
diff --git a/srcpkgs/joplin-cli/template b/srcpkgs/joplin-cli/template
new file mode 100644
index 00000000000..2f04a10dd0f
--- /dev/null
+++ b/srcpkgs/joplin-cli/template
@@ -0,0 +1,45 @@
+# Template file for 'joplin-cli'
+pkgname=joplin-cli
+version=1.4.19
+revision=1
+wrksrc="joplin-${version}"
+hostmakedepends="nodejs git python3 pkg-config"
+makedepends="libvips-devel libsecret-devel"
+depends="nodejs"
+short_desc="Open source note taking and to-do application - CLI version"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="MIT"
+homepage="https://joplinapp.org"
+distfiles="https://github.com/laurent22/joplin/archive/v${version}.tar.gz"
+checksum=55aad4fe50e2da980983a69bc7c0870626064db971550d522e266feb17d38916
+python_version=3
+
+do_build() {
+	# Remove unused modules
+	rm -rf packages/{app-mobile,app-desktop,app-clipper,generator-joplin}
+
+	npm install ${XBPS_ALLOW_CHROOT_BREAKOUT:+--unsafe-perm}
+
+	cd packages
+	# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=joplin-cli#n30
+	# Unsure why this is needed, but it is
+	for d in app-cli lib renderer tools; do
+		pushd "${d}"
+		mv node_modules/@joplin .
+		npm prune --production
+		mv @joplin node_modules/
+		popd
+	done
+}
+
+do_install() {
+	cd packages
+
+	vmkdir usr/libexec/joplin-cli
+	for d in app-cli fork-sax fork-htmlparser2 renderer lib tools; do
+		vcopy "${d}" usr/libexec/joplin-cli/
+	done
+
+	vbin "${FILESDIR}/joplin-cli"
+	vlicense ../LICENSE
+}

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (14 preceding siblings ...)
  2020-12-06  4:34 ` [PR PATCH] [Updated] Joplin fosslinux
@ 2020-12-14  3:20 ` sgn
  2020-12-14  6:13 ` Joplin fosslinux
                   ` (27 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: sgn @ 2020-12-14  3:20 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1882 bytes --]

New comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/26952#issuecomment-744140330

Comment:
This could be used to fix cross, but I don't know why npm doesn't pick wrapped `pkg-config`
```diff
diff --git a/srcpkgs/joplin-cli/template b/srcpkgs/joplin-cli/template
index 2f04a10dd0..abfeddbd98 100644
--- a/srcpkgs/joplin-cli/template
+++ b/srcpkgs/joplin-cli/template
@@ -14,6 +14,12 @@ distfiles="https://github.com/laurent22/joplin/archive/v${version}.tar.gz"
 checksum=55aad4fe50e2da980983a69bc7c0870626064db971550d522e266feb17d38916
 python_version=3
 
+if [ "$CROSS_BUILD" ]; then
+	export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
+	export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/usr/lib/pkgconfig"
+	export PKG_CONFIG_PATH="$PKG_CONFIG_LIBDIR:$XBPS_CROSS_BASE/usr/share/pkgconfig"
+fi
+
 do_build() {
 	# Remove unused modules
 	rm -rf packages/{app-mobile,app-desktop,app-clipper,generator-joplin}
diff --git a/srcpkgs/joplin-desktop/template b/srcpkgs/joplin-desktop/template
index ff200fcd7c..6fc7ab0faf 100644
--- a/srcpkgs/joplin-desktop/template
+++ b/srcpkgs/joplin-desktop/template
@@ -13,11 +13,18 @@ license="MIT"
 homepage="https://joplinapp.org"
 distfiles="https://github.com/laurent22/joplin/archive/v${version}.tar.gz"
 checksum=55aad4fe50e2da980983a69bc7c0870626064db971550d522e266feb17d38916
+no_generic_pkgconfig_link=yes
 
 export USE_SYSTEM_7ZA="true"
 export USE_SYSTEM_APP_BUILDER="true"
 export USE_SYSTEM_MKSQUASHFS="true"
 
+if [ "$CROSS_BUILD" ]; then
+	export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
+	export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/usr/lib/pkgconfig"
+	export PKG_CONFIG_PATH="$PKG_CONFIG_LIBDIR:$XBPS_CROSS_BASE/usr/share/pkgconfig"
+fi
+
 do_build() {
 	# Remove unused modules
 	rm -rf packages/{app-mobile,app-cli,generator-joplin,app-clipper}
```

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (15 preceding siblings ...)
  2020-12-14  3:20 ` Joplin sgn
@ 2020-12-14  6:13 ` fosslinux
  2020-12-14  6:15 ` [PR PATCH] [Updated] Joplin fosslinux
                   ` (26 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: fosslinux @ 2020-12-14  6:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 200 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/26952#issuecomment-744196124

Comment:
Sorry, I didn't test crosss... oops. Will push fixes now.

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR PATCH] [Updated] Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (16 preceding siblings ...)
  2020-12-14  6:13 ` Joplin fosslinux
@ 2020-12-14  6:15 ` fosslinux
  2020-12-14  6:19 ` Joplin fosslinux
                   ` (25 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: fosslinux @ 2020-12-14  6:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 564 bytes --]

There is an updated pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages joplin-new
https://github.com/void-linux/void-packages/pull/26952

Joplin
This PR adds the `joplin-desktop` and `joplin-cli` packages, containing the GUI and CLI versions of Joplin respectively. They are not distributed in the one package as they can and should be installed separately, they are separate applications.

Closes #19585

A patch file from https://github.com/void-linux/void-packages/pull/26952.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-joplin-new-26952.patch --]
[-- Type: text/x-diff, Size: 5684 bytes --]

From 434aa62d88555a91091e2e2a90cabdc6ceff7e47 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 2 Oct 2020 18:44:06 +1000
Subject: [PATCH 1/2] New package: joplin-desktop-1.4.19.

---
 srcpkgs/joplin-desktop/files/joplin-desktop |  2 +
 srcpkgs/joplin-desktop/files/joplin.desktop |  8 ++++
 srcpkgs/joplin-desktop/template             | 44 +++++++++++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100755 srcpkgs/joplin-desktop/files/joplin-desktop
 create mode 100644 srcpkgs/joplin-desktop/files/joplin.desktop
 create mode 100644 srcpkgs/joplin-desktop/template

diff --git a/srcpkgs/joplin-desktop/files/joplin-desktop b/srcpkgs/joplin-desktop/files/joplin-desktop
new file mode 100755
index 00000000000..ea7f12ba1b0
--- /dev/null
+++ b/srcpkgs/joplin-desktop/files/joplin-desktop
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec electron10 /usr/libexec/joplin-desktop/resources/app.asar "$@"
diff --git a/srcpkgs/joplin-desktop/files/joplin.desktop b/srcpkgs/joplin-desktop/files/joplin.desktop
new file mode 100644
index 00000000000..37852543a51
--- /dev/null
+++ b/srcpkgs/joplin-desktop/files/joplin.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+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
+Icon=/usr/libexec/joplin/resources/build/icons/128x128.png
+Terminal=false
+Type=Application
+Categories=Application;Office;
diff --git a/srcpkgs/joplin-desktop/template b/srcpkgs/joplin-desktop/template
new file mode 100644
index 00000000000..6fc7ab0faf4
--- /dev/null
+++ b/srcpkgs/joplin-desktop/template
@@ -0,0 +1,44 @@
+# Template file for 'joplin-desktop'
+pkgname=joplin-desktop
+version=1.4.19
+revision=1
+wrksrc="joplin-${version}"
+hostmakedepends="nodejs python3 pkg-config rsync git p7zip tar app-builder
+ squashfs-tools"
+makedepends="libvips-devel libsecret-devel"
+depends="electron10"
+short_desc="Open source note taking and to-do application - Desktop version"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="MIT"
+homepage="https://joplinapp.org"
+distfiles="https://github.com/laurent22/joplin/archive/v${version}.tar.gz"
+checksum=55aad4fe50e2da980983a69bc7c0870626064db971550d522e266feb17d38916
+no_generic_pkgconfig_link=yes
+
+export USE_SYSTEM_7ZA="true"
+export USE_SYSTEM_APP_BUILDER="true"
+export USE_SYSTEM_MKSQUASHFS="true"
+
+if [ "$CROSS_BUILD" ]; then
+	export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
+	export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/usr/lib/pkgconfig"
+	export PKG_CONFIG_PATH="$PKG_CONFIG_LIBDIR:$XBPS_CROSS_BASE/usr/share/pkgconfig"
+fi
+
+do_build() {
+	# Remove unused modules
+	rm -rf packages/{app-mobile,app-cli,generator-joplin,app-clipper}
+
+	npm install ${XBPS_ALLOW_CHROOT_BREAKOUT:+--unsafe-perm}
+	cd packages/app-desktop
+	npm run dist
+}
+
+do_install() {
+	vmkdir usr/libexec/joplin-desktop
+	vcopy packages/app-desktop/dist/linux-unpacked/* usr/libexec/joplin-desktop/
+	rm -rf "${DESTDIR}/usr/libexec/joplin-desktop/resources/app.asar.unpacked/node_modules/7zip-bin-linux"
+	vinstall "${FILESDIR}/joplin.desktop" 644 usr/share/applications/ joplin.desktop
+	vbin "${FILESDIR}/joplin-desktop"
+	vlicense LICENSE
+}

From e85100236597629c8934e5c5b40a1914df3f8e18 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 5 Dec 2020 13:19:21 +1100
Subject: [PATCH 2/2] New package: joplin-cli-1.4.19.

---
 srcpkgs/joplin-cli/files/joplin-cli |  3 ++
 srcpkgs/joplin-cli/template         | 51 +++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 srcpkgs/joplin-cli/files/joplin-cli
 create mode 100644 srcpkgs/joplin-cli/template

diff --git a/srcpkgs/joplin-cli/files/joplin-cli b/srcpkgs/joplin-cli/files/joplin-cli
new file mode 100644
index 00000000000..e65e75598db
--- /dev/null
+++ b/srcpkgs/joplin-cli/files/joplin-cli
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /usr/libexec/joplin-cli/app-cli
+node app/main.js "$@"
diff --git a/srcpkgs/joplin-cli/template b/srcpkgs/joplin-cli/template
new file mode 100644
index 00000000000..abfeddbd981
--- /dev/null
+++ b/srcpkgs/joplin-cli/template
@@ -0,0 +1,51 @@
+# Template file for 'joplin-cli'
+pkgname=joplin-cli
+version=1.4.19
+revision=1
+wrksrc="joplin-${version}"
+hostmakedepends="nodejs git python3 pkg-config"
+makedepends="libvips-devel libsecret-devel"
+depends="nodejs"
+short_desc="Open source note taking and to-do application - CLI version"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="MIT"
+homepage="https://joplinapp.org"
+distfiles="https://github.com/laurent22/joplin/archive/v${version}.tar.gz"
+checksum=55aad4fe50e2da980983a69bc7c0870626064db971550d522e266feb17d38916
+python_version=3
+
+if [ "$CROSS_BUILD" ]; then
+	export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
+	export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/usr/lib/pkgconfig"
+	export PKG_CONFIG_PATH="$PKG_CONFIG_LIBDIR:$XBPS_CROSS_BASE/usr/share/pkgconfig"
+fi
+
+do_build() {
+	# Remove unused modules
+	rm -rf packages/{app-mobile,app-desktop,app-clipper,generator-joplin}
+
+	npm install ${XBPS_ALLOW_CHROOT_BREAKOUT:+--unsafe-perm}
+
+	cd packages
+	# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=joplin-cli#n30
+	# Unsure why this is needed, but it is
+	for d in app-cli lib renderer tools; do
+		pushd "${d}"
+		mv node_modules/@joplin .
+		npm prune --production
+		mv @joplin node_modules/
+		popd
+	done
+}
+
+do_install() {
+	cd packages
+
+	vmkdir usr/libexec/joplin-cli
+	for d in app-cli fork-sax fork-htmlparser2 renderer lib tools; do
+		vcopy "${d}" usr/libexec/joplin-cli/
+	done
+
+	vbin "${FILESDIR}/joplin-cli"
+	vlicense ../LICENSE
+}

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (17 preceding siblings ...)
  2020-12-14  6:15 ` [PR PATCH] [Updated] Joplin fosslinux
@ 2020-12-14  6:19 ` fosslinux
  2020-12-14  7:35 ` Joplin fosslinux
                   ` (24 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: fosslinux @ 2020-12-14  6:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 202 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/26952#issuecomment-744199214

Comment:
I wonder, can we make CI not fail for a cross dependency...

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (18 preceding siblings ...)
  2020-12-14  6:19 ` Joplin fosslinux
@ 2020-12-14  7:35 ` fosslinux
  2020-12-17  1:53 ` Joplin fosslinux
                   ` (23 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: fosslinux @ 2020-12-14  7:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 232 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/26952#issuecomment-744238751

Comment:
Patch dosen't work, will investigate further. Seems to be using host cflags but cross CC.

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (19 preceding siblings ...)
  2020-12-14  7:35 ` Joplin fosslinux
@ 2020-12-17  1:53 ` fosslinux
  2020-12-17  3:12 ` [PR PATCH] [Updated] Joplin fosslinux
                   ` (22 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: fosslinux @ 2020-12-17  1:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 278 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/26952#issuecomment-747152547

Comment:
No idea what's happening here, somehow `-m64` appears out of nowhere, breaking the build. Going to leave joplin-cli as nocross for now.

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR PATCH] [Updated] Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (20 preceding siblings ...)
  2020-12-17  1:53 ` Joplin fosslinux
@ 2020-12-17  3:12 ` fosslinux
  2020-12-19  0:42 ` Joplin fosslinux
                   ` (21 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: fosslinux @ 2020-12-17  3:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 564 bytes --]

There is an updated pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages joplin-new
https://github.com/void-linux/void-packages/pull/26952

Joplin
This PR adds the `joplin-desktop` and `joplin-cli` packages, containing the GUI and CLI versions of Joplin respectively. They are not distributed in the one package as they can and should be installed separately, they are separate applications.

Closes #19585

A patch file from https://github.com/void-linux/void-packages/pull/26952.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-joplin-new-26952.patch --]
[-- Type: text/x-diff, Size: 5755 bytes --]

From 3dbb1967ae246c6f056c9c968dabfc627904ffbf Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 2 Oct 2020 18:44:06 +1000
Subject: [PATCH 1/2] New package: joplin-desktop-1.4.19.

---
 srcpkgs/joplin-desktop/files/joplin-desktop |  2 +
 srcpkgs/joplin-desktop/files/joplin.desktop |  8 ++++
 srcpkgs/joplin-desktop/template             | 44 +++++++++++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100755 srcpkgs/joplin-desktop/files/joplin-desktop
 create mode 100644 srcpkgs/joplin-desktop/files/joplin.desktop
 create mode 100644 srcpkgs/joplin-desktop/template

diff --git a/srcpkgs/joplin-desktop/files/joplin-desktop b/srcpkgs/joplin-desktop/files/joplin-desktop
new file mode 100755
index 00000000000..ea7f12ba1b0
--- /dev/null
+++ b/srcpkgs/joplin-desktop/files/joplin-desktop
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec electron10 /usr/libexec/joplin-desktop/resources/app.asar "$@"
diff --git a/srcpkgs/joplin-desktop/files/joplin.desktop b/srcpkgs/joplin-desktop/files/joplin.desktop
new file mode 100644
index 00000000000..37852543a51
--- /dev/null
+++ b/srcpkgs/joplin-desktop/files/joplin.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+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
+Icon=/usr/libexec/joplin/resources/build/icons/128x128.png
+Terminal=false
+Type=Application
+Categories=Application;Office;
diff --git a/srcpkgs/joplin-desktop/template b/srcpkgs/joplin-desktop/template
new file mode 100644
index 00000000000..6fc7ab0faf4
--- /dev/null
+++ b/srcpkgs/joplin-desktop/template
@@ -0,0 +1,44 @@
+# Template file for 'joplin-desktop'
+pkgname=joplin-desktop
+version=1.4.19
+revision=1
+wrksrc="joplin-${version}"
+hostmakedepends="nodejs python3 pkg-config rsync git p7zip tar app-builder
+ squashfs-tools"
+makedepends="libvips-devel libsecret-devel"
+depends="electron10"
+short_desc="Open source note taking and to-do application - Desktop version"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="MIT"
+homepage="https://joplinapp.org"
+distfiles="https://github.com/laurent22/joplin/archive/v${version}.tar.gz"
+checksum=55aad4fe50e2da980983a69bc7c0870626064db971550d522e266feb17d38916
+no_generic_pkgconfig_link=yes
+
+export USE_SYSTEM_7ZA="true"
+export USE_SYSTEM_APP_BUILDER="true"
+export USE_SYSTEM_MKSQUASHFS="true"
+
+if [ "$CROSS_BUILD" ]; then
+	export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
+	export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/usr/lib/pkgconfig"
+	export PKG_CONFIG_PATH="$PKG_CONFIG_LIBDIR:$XBPS_CROSS_BASE/usr/share/pkgconfig"
+fi
+
+do_build() {
+	# Remove unused modules
+	rm -rf packages/{app-mobile,app-cli,generator-joplin,app-clipper}
+
+	npm install ${XBPS_ALLOW_CHROOT_BREAKOUT:+--unsafe-perm}
+	cd packages/app-desktop
+	npm run dist
+}
+
+do_install() {
+	vmkdir usr/libexec/joplin-desktop
+	vcopy packages/app-desktop/dist/linux-unpacked/* usr/libexec/joplin-desktop/
+	rm -rf "${DESTDIR}/usr/libexec/joplin-desktop/resources/app.asar.unpacked/node_modules/7zip-bin-linux"
+	vinstall "${FILESDIR}/joplin.desktop" 644 usr/share/applications/ joplin.desktop
+	vbin "${FILESDIR}/joplin-desktop"
+	vlicense LICENSE
+}

From 81aea34ceb5b8a0555dd559809d8bb8924d0c146 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 5 Dec 2020 13:19:21 +1100
Subject: [PATCH 2/2] New package: joplin-cli-1.4.19.

---
 srcpkgs/joplin-cli/files/joplin-cli |  3 ++
 srcpkgs/joplin-cli/template         | 52 +++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 srcpkgs/joplin-cli/files/joplin-cli
 create mode 100644 srcpkgs/joplin-cli/template

diff --git a/srcpkgs/joplin-cli/files/joplin-cli b/srcpkgs/joplin-cli/files/joplin-cli
new file mode 100644
index 00000000000..e65e75598db
--- /dev/null
+++ b/srcpkgs/joplin-cli/files/joplin-cli
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /usr/libexec/joplin-cli/app-cli
+node app/main.js "$@"
diff --git a/srcpkgs/joplin-cli/template b/srcpkgs/joplin-cli/template
new file mode 100644
index 00000000000..2ea1a6f7e9a
--- /dev/null
+++ b/srcpkgs/joplin-cli/template
@@ -0,0 +1,52 @@
+# Template file for 'joplin-cli'
+pkgname=joplin-cli
+version=1.4.19
+revision=1
+wrksrc="joplin-${version}"
+hostmakedepends="nodejs git python3 pkg-config libvips-devel"
+makedepends="libvips-devel libsecret-devel"
+depends="nodejs"
+short_desc="Open source note taking and to-do application - CLI version"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="MIT"
+homepage="https://joplinapp.org"
+distfiles="https://github.com/laurent22/joplin/archive/v${version}.tar.gz"
+checksum=55aad4fe50e2da980983a69bc7c0870626064db971550d522e266feb17d38916
+python_version=3
+nocross="somehow -m64 appears in CFLAGS out of nowhere"
+
+if [ "$CROSS_BUILD" ]; then
+	export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
+	export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/usr/lib/pkgconfig"
+	export PKG_CONFIG_PATH="$PKG_CONFIG_LIBDIR:$XBPS_CROSS_BASE/usr/share/pkgconfig"
+fi
+
+do_build() {
+	# Remove unused modules
+	rm -rf packages/{app-mobile,app-desktop,app-clipper,generator-joplin}
+
+	npm install ${XBPS_ALLOW_CHROOT_BREAKOUT:+--unsafe-perm}
+
+	cd packages
+	# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=joplin-cli#n30
+	# Unsure why this is needed, but it is
+	for d in app-cli lib renderer tools; do
+		pushd "${d}"
+		mv node_modules/@joplin .
+		npm prune --production
+		mv @joplin node_modules/
+		popd
+	done
+}
+
+do_install() {
+	cd packages
+
+	vmkdir usr/libexec/joplin-cli
+	for d in app-cli fork-sax fork-htmlparser2 renderer lib tools; do
+		vcopy "${d}" usr/libexec/joplin-cli/
+	done
+
+	vbin "${FILESDIR}/joplin-cli"
+	vlicense ../LICENSE
+}

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (21 preceding siblings ...)
  2020-12-17  3:12 ` [PR PATCH] [Updated] Joplin fosslinux
@ 2020-12-19  0:42 ` fosslinux
  2020-12-25 22:25 ` Joplin fosslinux
                   ` (20 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: fosslinux @ 2020-12-19  0:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 166 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/26952#issuecomment-748390195

Comment:
WTF is up with i686 CI?

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (22 preceding siblings ...)
  2020-12-19  0:42 ` Joplin fosslinux
@ 2020-12-25 22:25 ` fosslinux
  2021-01-01  9:46 ` [PR PATCH] [Updated] Joplin fosslinux
                   ` (19 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: fosslinux @ 2020-12-25 22:25 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 147 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/26952#issuecomment-751295941

Comment:
Ping

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR PATCH] [Updated] Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (23 preceding siblings ...)
  2020-12-25 22:25 ` Joplin fosslinux
@ 2021-01-01  9:46 ` fosslinux
  2021-01-01  9:47 ` fosslinux
                   ` (18 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: fosslinux @ 2021-01-01  9:46 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 564 bytes --]

There is an updated pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages joplin-new
https://github.com/void-linux/void-packages/pull/26952

Joplin
This PR adds the `joplin-desktop` and `joplin-cli` packages, containing the GUI and CLI versions of Joplin respectively. They are not distributed in the one package as they can and should be installed separately, they are separate applications.

Closes #19585

A patch file from https://github.com/void-linux/void-packages/pull/26952.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-joplin-new-26952.patch --]
[-- Type: text/x-diff, Size: 5790 bytes --]

From 2734cce561a8be48ea7ce1c6cf8d6048c8da7457 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 2 Oct 2020 18:44:06 +1000
Subject: [PATCH 1/2] New package: joplin-desktop-1.4.19.

---
 srcpkgs/joplin-desktop/files/joplin-desktop |  2 +
 srcpkgs/joplin-desktop/files/joplin.desktop |  8 ++++
 srcpkgs/joplin-desktop/template             | 48 +++++++++++++++++++++
 3 files changed, 58 insertions(+)
 create mode 100755 srcpkgs/joplin-desktop/files/joplin-desktop
 create mode 100644 srcpkgs/joplin-desktop/files/joplin.desktop
 create mode 100644 srcpkgs/joplin-desktop/template

diff --git a/srcpkgs/joplin-desktop/files/joplin-desktop b/srcpkgs/joplin-desktop/files/joplin-desktop
new file mode 100755
index 00000000000..ea7f12ba1b0
--- /dev/null
+++ b/srcpkgs/joplin-desktop/files/joplin-desktop
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec electron10 /usr/libexec/joplin-desktop/resources/app.asar "$@"
diff --git a/srcpkgs/joplin-desktop/files/joplin.desktop b/srcpkgs/joplin-desktop/files/joplin.desktop
new file mode 100644
index 00000000000..37852543a51
--- /dev/null
+++ b/srcpkgs/joplin-desktop/files/joplin.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+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
+Icon=/usr/libexec/joplin/resources/build/icons/128x128.png
+Terminal=false
+Type=Application
+Categories=Application;Office;
diff --git a/srcpkgs/joplin-desktop/template b/srcpkgs/joplin-desktop/template
new file mode 100644
index 00000000000..456126673d0
--- /dev/null
+++ b/srcpkgs/joplin-desktop/template
@@ -0,0 +1,48 @@
+# Template file for 'joplin-desktop'
+pkgname=joplin-desktop
+version=1.5.14
+revision=1
+wrksrc="joplin-${version}"
+hostmakedepends="nodejs python3 pkg-config rsync git p7zip tar app-builder
+ squashfs-tools"
+makedepends="libvips-devel libsecret-devel"
+depends="electron10"
+short_desc="Open source note taking and to-do application - Desktop version"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="MIT"
+homepage="https://joplinapp.org"
+distfiles="https://github.com/laurent22/joplin/archive/v${version}.tar.gz"
+checksum=b4d7bbde4ad00447bfc34d586c68d1064f2a48f117c30a914d89a2814b549137
+no_generic_pkgconfig_link=yes
+
+export USE_SYSTEM_7ZA="true"
+export USE_SYSTEM_APP_BUILDER="true"
+export USE_SYSTEM_MKSQUASHFS="true"
+
+if [ "$CROSS_BUILD" ]; then
+	export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
+	export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/usr/lib/pkgconfig"
+	export PKG_CONFIG_PATH="$PKG_CONFIG_LIBDIR:$XBPS_CROSS_BASE/usr/share/pkgconfig"
+fi
+
+do_build() {
+	# Remove unused modules
+	rm -rf packages/{app-mobile,app-cli,generator-joplin,app-clipper}
+
+	npm install ${XBPS_ALLOW_CHROOT_BREAKOUT:+--unsafe-perm}
+	cd packages/app-desktop
+	npm run dist
+}
+
+do_check() {
+	npm run test
+}
+
+do_install() {
+	vmkdir usr/libexec/joplin-desktop
+	vcopy packages/app-desktop/dist/linux-*unpacked/* usr/libexec/joplin-desktop/
+	rm -rf "${DESTDIR}/usr/libexec/joplin-desktop/resources/app.asar.unpacked/node_modules/7zip-bin-linux"
+	vinstall "${FILESDIR}/joplin.desktop" 644 usr/share/applications/ joplin.desktop
+	vbin "${FILESDIR}/joplin-desktop"
+	vlicense LICENSE
+}

From 9e23a491acfa3e2c5140fc885cd2032c714b5a03 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 5 Dec 2020 13:19:21 +1100
Subject: [PATCH 2/2] New package: joplin-cli-1.4.19.

---
 srcpkgs/joplin-cli/files/joplin-cli |  3 ++
 srcpkgs/joplin-cli/template         | 52 +++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 srcpkgs/joplin-cli/files/joplin-cli
 create mode 100644 srcpkgs/joplin-cli/template

diff --git a/srcpkgs/joplin-cli/files/joplin-cli b/srcpkgs/joplin-cli/files/joplin-cli
new file mode 100644
index 00000000000..e65e75598db
--- /dev/null
+++ b/srcpkgs/joplin-cli/files/joplin-cli
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /usr/libexec/joplin-cli/app-cli
+node app/main.js "$@"
diff --git a/srcpkgs/joplin-cli/template b/srcpkgs/joplin-cli/template
new file mode 100644
index 00000000000..18d8f577361
--- /dev/null
+++ b/srcpkgs/joplin-cli/template
@@ -0,0 +1,52 @@
+# Template file for 'joplin-cli'
+pkgname=joplin-cli
+version=1.5.14
+revision=1
+wrksrc="joplin-${version}"
+hostmakedepends="nodejs git python3 pkg-config libvips-devel"
+makedepends="libvips-devel libsecret-devel"
+depends="nodejs"
+short_desc="Open source note taking and to-do application - CLI version"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="MIT"
+homepage="https://joplinapp.org"
+distfiles="https://github.com/laurent22/joplin/archive/v${version}.tar.gz"
+checksum=b4d7bbde4ad00447bfc34d586c68d1064f2a48f117c30a914d89a2814b549137
+python_version=3
+nocross="somehow -m64 appears in CFLAGS out of nowhere"
+
+if [ "$CROSS_BUILD" ]; then
+	export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
+	export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/usr/lib/pkgconfig"
+	export PKG_CONFIG_PATH="$PKG_CONFIG_LIBDIR:$XBPS_CROSS_BASE/usr/share/pkgconfig"
+fi
+
+do_build() {
+	# Remove unused modules
+	rm -rf packages/{app-mobile,app-desktop,app-clipper,generator-joplin}
+
+	npm install ${XBPS_ALLOW_CHROOT_BREAKOUT:+--unsafe-perm}
+
+	cd packages
+	# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=joplin-cli#n30
+	# Unsure why this is needed, but it is
+	for d in app-cli lib renderer tools; do
+		pushd "${d}"
+		mv node_modules/@joplin .
+		npm prune --production
+		mv @joplin node_modules/
+		popd
+	done
+}
+
+do_install() {
+	cd packages
+
+	vmkdir usr/libexec/joplin-cli
+	for d in app-cli fork-sax fork-htmlparser2 renderer lib tools; do
+		vcopy "${d}" usr/libexec/joplin-cli/
+	done
+
+	vbin "${FILESDIR}/joplin-cli"
+	vlicense ../LICENSE
+}

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR PATCH] [Updated] Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (24 preceding siblings ...)
  2021-01-01  9:46 ` [PR PATCH] [Updated] Joplin fosslinux
@ 2021-01-01  9:47 ` fosslinux
  2021-01-01  9:48 ` Joplin fosslinux
                   ` (17 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: fosslinux @ 2021-01-01  9:47 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 564 bytes --]

There is an updated pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages joplin-new
https://github.com/void-linux/void-packages/pull/26952

Joplin
This PR adds the `joplin-desktop` and `joplin-cli` packages, containing the GUI and CLI versions of Joplin respectively. They are not distributed in the one package as they can and should be installed separately, they are separate applications.

Closes #19585

A patch file from https://github.com/void-linux/void-packages/pull/26952.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-joplin-new-26952.patch --]
[-- Type: text/x-diff, Size: 5790 bytes --]

From 81119b7d37141e17b5daa3c408fb06d34cc5cfad Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 2 Oct 2020 18:44:06 +1000
Subject: [PATCH 1/2] New package: joplin-desktop-1.5.14.

---
 srcpkgs/joplin-desktop/files/joplin-desktop |  2 +
 srcpkgs/joplin-desktop/files/joplin.desktop |  8 ++++
 srcpkgs/joplin-desktop/template             | 48 +++++++++++++++++++++
 3 files changed, 58 insertions(+)
 create mode 100755 srcpkgs/joplin-desktop/files/joplin-desktop
 create mode 100644 srcpkgs/joplin-desktop/files/joplin.desktop
 create mode 100644 srcpkgs/joplin-desktop/template

diff --git a/srcpkgs/joplin-desktop/files/joplin-desktop b/srcpkgs/joplin-desktop/files/joplin-desktop
new file mode 100755
index 00000000000..ea7f12ba1b0
--- /dev/null
+++ b/srcpkgs/joplin-desktop/files/joplin-desktop
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec electron10 /usr/libexec/joplin-desktop/resources/app.asar "$@"
diff --git a/srcpkgs/joplin-desktop/files/joplin.desktop b/srcpkgs/joplin-desktop/files/joplin.desktop
new file mode 100644
index 00000000000..37852543a51
--- /dev/null
+++ b/srcpkgs/joplin-desktop/files/joplin.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+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
+Icon=/usr/libexec/joplin/resources/build/icons/128x128.png
+Terminal=false
+Type=Application
+Categories=Application;Office;
diff --git a/srcpkgs/joplin-desktop/template b/srcpkgs/joplin-desktop/template
new file mode 100644
index 00000000000..456126673d0
--- /dev/null
+++ b/srcpkgs/joplin-desktop/template
@@ -0,0 +1,48 @@
+# Template file for 'joplin-desktop'
+pkgname=joplin-desktop
+version=1.5.14
+revision=1
+wrksrc="joplin-${version}"
+hostmakedepends="nodejs python3 pkg-config rsync git p7zip tar app-builder
+ squashfs-tools"
+makedepends="libvips-devel libsecret-devel"
+depends="electron10"
+short_desc="Open source note taking and to-do application - Desktop version"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="MIT"
+homepage="https://joplinapp.org"
+distfiles="https://github.com/laurent22/joplin/archive/v${version}.tar.gz"
+checksum=b4d7bbde4ad00447bfc34d586c68d1064f2a48f117c30a914d89a2814b549137
+no_generic_pkgconfig_link=yes
+
+export USE_SYSTEM_7ZA="true"
+export USE_SYSTEM_APP_BUILDER="true"
+export USE_SYSTEM_MKSQUASHFS="true"
+
+if [ "$CROSS_BUILD" ]; then
+	export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
+	export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/usr/lib/pkgconfig"
+	export PKG_CONFIG_PATH="$PKG_CONFIG_LIBDIR:$XBPS_CROSS_BASE/usr/share/pkgconfig"
+fi
+
+do_build() {
+	# Remove unused modules
+	rm -rf packages/{app-mobile,app-cli,generator-joplin,app-clipper}
+
+	npm install ${XBPS_ALLOW_CHROOT_BREAKOUT:+--unsafe-perm}
+	cd packages/app-desktop
+	npm run dist
+}
+
+do_check() {
+	npm run test
+}
+
+do_install() {
+	vmkdir usr/libexec/joplin-desktop
+	vcopy packages/app-desktop/dist/linux-*unpacked/* usr/libexec/joplin-desktop/
+	rm -rf "${DESTDIR}/usr/libexec/joplin-desktop/resources/app.asar.unpacked/node_modules/7zip-bin-linux"
+	vinstall "${FILESDIR}/joplin.desktop" 644 usr/share/applications/ joplin.desktop
+	vbin "${FILESDIR}/joplin-desktop"
+	vlicense LICENSE
+}

From 8f1a5f68a24628da8b1a40de5efaa15da130f137 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 5 Dec 2020 13:19:21 +1100
Subject: [PATCH 2/2] New package: joplin-cli-1.5.14.

---
 srcpkgs/joplin-cli/files/joplin-cli |  3 ++
 srcpkgs/joplin-cli/template         | 52 +++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 srcpkgs/joplin-cli/files/joplin-cli
 create mode 100644 srcpkgs/joplin-cli/template

diff --git a/srcpkgs/joplin-cli/files/joplin-cli b/srcpkgs/joplin-cli/files/joplin-cli
new file mode 100644
index 00000000000..e65e75598db
--- /dev/null
+++ b/srcpkgs/joplin-cli/files/joplin-cli
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /usr/libexec/joplin-cli/app-cli
+node app/main.js "$@"
diff --git a/srcpkgs/joplin-cli/template b/srcpkgs/joplin-cli/template
new file mode 100644
index 00000000000..18d8f577361
--- /dev/null
+++ b/srcpkgs/joplin-cli/template
@@ -0,0 +1,52 @@
+# Template file for 'joplin-cli'
+pkgname=joplin-cli
+version=1.5.14
+revision=1
+wrksrc="joplin-${version}"
+hostmakedepends="nodejs git python3 pkg-config libvips-devel"
+makedepends="libvips-devel libsecret-devel"
+depends="nodejs"
+short_desc="Open source note taking and to-do application - CLI version"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="MIT"
+homepage="https://joplinapp.org"
+distfiles="https://github.com/laurent22/joplin/archive/v${version}.tar.gz"
+checksum=b4d7bbde4ad00447bfc34d586c68d1064f2a48f117c30a914d89a2814b549137
+python_version=3
+nocross="somehow -m64 appears in CFLAGS out of nowhere"
+
+if [ "$CROSS_BUILD" ]; then
+	export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
+	export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/usr/lib/pkgconfig"
+	export PKG_CONFIG_PATH="$PKG_CONFIG_LIBDIR:$XBPS_CROSS_BASE/usr/share/pkgconfig"
+fi
+
+do_build() {
+	# Remove unused modules
+	rm -rf packages/{app-mobile,app-desktop,app-clipper,generator-joplin}
+
+	npm install ${XBPS_ALLOW_CHROOT_BREAKOUT:+--unsafe-perm}
+
+	cd packages
+	# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=joplin-cli#n30
+	# Unsure why this is needed, but it is
+	for d in app-cli lib renderer tools; do
+		pushd "${d}"
+		mv node_modules/@joplin .
+		npm prune --production
+		mv @joplin node_modules/
+		popd
+	done
+}
+
+do_install() {
+	cd packages
+
+	vmkdir usr/libexec/joplin-cli
+	for d in app-cli fork-sax fork-htmlparser2 renderer lib tools; do
+		vcopy "${d}" usr/libexec/joplin-cli/
+	done
+
+	vbin "${FILESDIR}/joplin-cli"
+	vlicense ../LICENSE
+}

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (25 preceding siblings ...)
  2021-01-01  9:47 ` fosslinux
@ 2021-01-01  9:48 ` fosslinux
  2021-01-01  9:48 ` Joplin fosslinux
                   ` (16 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: fosslinux @ 2021-01-01  9:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 419 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/26952#issuecomment-753294494

Comment:
Updated to 1.5.14, i686 issue could be reproduced there, oddly, and is now fixed. Cross joplin-cli is still an issue. Tests enabled on joplin-desktop as they work but not on joplin-cli as it requires a hard-to-package toll which I might or might not come back to (jest, FWIW).

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (26 preceding siblings ...)
  2021-01-01  9:48 ` Joplin fosslinux
@ 2021-01-01  9:48 ` fosslinux
  2021-01-01 10:23 ` Joplin fosslinux
                   ` (15 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: fosslinux @ 2021-01-01  9:48 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 419 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/26952#issuecomment-753294494

Comment:
Updated to 1.5.14, i686 issue could be reproduced there, oddly, and is now fixed. Cross joplin-cli is still an issue. Tests enabled on joplin-desktop as they work but not on joplin-cli as it requires a hard-to-package tool which I might or might not come back to (jest, FWIW).

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (27 preceding siblings ...)
  2021-01-01  9:48 ` Joplin fosslinux
@ 2021-01-01 10:23 ` fosslinux
  2021-01-04  6:29 ` [PR PATCH] [Updated] Joplin fosslinux
                   ` (14 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: fosslinux @ 2021-01-01 10:23 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 165 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/26952#issuecomment-753297745

Comment:
musl runtime is broken

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR PATCH] [Updated] Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (28 preceding siblings ...)
  2021-01-01 10:23 ` Joplin fosslinux
@ 2021-01-04  6:29 ` fosslinux
  2021-01-04  6:30 ` Joplin fosslinux
                   ` (13 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: fosslinux @ 2021-01-04  6:29 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 564 bytes --]

There is an updated pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages joplin-new
https://github.com/void-linux/void-packages/pull/26952

Joplin
This PR adds the `joplin-desktop` and `joplin-cli` packages, containing the GUI and CLI versions of Joplin respectively. They are not distributed in the one package as they can and should be installed separately, they are separate applications.

Closes #19585

A patch file from https://github.com/void-linux/void-packages/pull/26952.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-joplin-new-26952.patch --]
[-- Type: text/x-diff, Size: 7018 bytes --]

From de8b29cd4c2ea869f0b88fe8a084c4d0b7e778eb Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 2 Oct 2020 18:44:06 +1000
Subject: [PATCH 1/2] New package: joplin-desktop-1.5.14.

---
 srcpkgs/joplin-desktop/files/joplin-desktop   |  2 +
 srcpkgs/joplin-desktop/files/joplin.desktop   |  8 +++
 .../joplin-desktop/patches/electron-ver.patch | 11 ++++
 srcpkgs/joplin-desktop/template               | 55 +++++++++++++++++++
 4 files changed, 76 insertions(+)
 create mode 100755 srcpkgs/joplin-desktop/files/joplin-desktop
 create mode 100644 srcpkgs/joplin-desktop/files/joplin.desktop
 create mode 100644 srcpkgs/joplin-desktop/patches/electron-ver.patch
 create mode 100644 srcpkgs/joplin-desktop/template

diff --git a/srcpkgs/joplin-desktop/files/joplin-desktop b/srcpkgs/joplin-desktop/files/joplin-desktop
new file mode 100755
index 00000000000..ea7f12ba1b0
--- /dev/null
+++ b/srcpkgs/joplin-desktop/files/joplin-desktop
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec electron10 /usr/libexec/joplin-desktop/resources/app.asar "$@"
diff --git a/srcpkgs/joplin-desktop/files/joplin.desktop b/srcpkgs/joplin-desktop/files/joplin.desktop
new file mode 100644
index 00000000000..37852543a51
--- /dev/null
+++ b/srcpkgs/joplin-desktop/files/joplin.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+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
+Icon=/usr/libexec/joplin/resources/build/icons/128x128.png
+Terminal=false
+Type=Application
+Categories=Application;Office;
diff --git a/srcpkgs/joplin-desktop/patches/electron-ver.patch b/srcpkgs/joplin-desktop/patches/electron-ver.patch
new file mode 100644
index 00000000000..21abc2df8d7
--- /dev/null
+++ b/srcpkgs/joplin-desktop/patches/electron-ver.patch
@@ -0,0 +1,11 @@
+--- packages/app-desktop/package.json	2021-01-03 20:03:05.818525142 +1100
++++ packages/app-desktop/package.json	2021-01-03 20:04:24.352069708 +1100
+@@ -36,6 +36,8 @@
+     "afterAllArtifactBuild": "./generateSha512.js",
+     "asar": true,
+     "asarUnpack": "./node_modules/node-notifier/vendor/**",
++    "electronDist": "/usr/lib/electron10",
++    "electronVersion": "@ELECTRON_VER@",
+     "win": {
+       "rfc3161TimeStampServer": "http://timestamp.comodoca.com/rfc3161",
+       "icon": "../../Assets/ImageSources/Joplin.ico",
diff --git a/srcpkgs/joplin-desktop/template b/srcpkgs/joplin-desktop/template
new file mode 100644
index 00000000000..e9663444519
--- /dev/null
+++ b/srcpkgs/joplin-desktop/template
@@ -0,0 +1,55 @@
+# Template file for 'joplin-desktop'
+pkgname=joplin-desktop
+version=1.5.14
+revision=1
+_electronver=10.2.0
+wrksrc="joplin-${version}"
+hostmakedepends="nodejs python3 pkg-config rsync git p7zip tar app-builder
+ squashfs-tools"
+makedepends="libvips-devel libsecret-devel electron10"
+depends="electron10"
+short_desc="Open source note taking and to-do application - Desktop version"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="MIT"
+homepage="https://joplinapp.org"
+distfiles="https://github.com/laurent22/joplin/archive/v${version}.tar.gz"
+checksum=b4d7bbde4ad00447bfc34d586c68d1064f2a48f117c30a914d89a2814b549137
+no_generic_pkgconfig_link=yes
+nopie_files="/usr/libexec/joplin-desktop/@joplinapp-desktop
+ /usr/libexec/joplin-desktop/chrome-sandbox"
+
+export USE_SYSTEM_7ZA="true"
+export USE_SYSTEM_APP_BUILDER="true"
+export USE_SYSTEM_MKSQUASHFS="true"
+
+if [ "$CROSS_BUILD" ]; then
+	export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
+	export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/usr/lib/pkgconfig"
+	export PKG_CONFIG_PATH="$PKG_CONFIG_LIBDIR:$XBPS_CROSS_BASE/usr/share/pkgconfig"
+fi
+
+do_configure() {
+	# Remove unused modules
+	rm -rf packages/{app-mobile,app-cli,generator-joplin,app-clipper}
+	# Set electron version
+	sed -i "s/@ELECTRON_VER@/$(cat /usr/lib/electron10/version)/" packages/app-desktop/package.json
+}
+
+do_build() {
+	npm install ${XBPS_ALLOW_CHROOT_BREAKOUT:+--unsafe-perm}
+	cd packages/app-desktop
+	npm run dist
+}
+
+do_check() {
+	npm run test
+}
+
+do_install() {
+	vmkdir usr/libexec/joplin-desktop
+	rm -rf packages/app-desktop/dist/linux-*unpacked/resources/app.asar.unpacked/node_modules/7zip-bin-linux
+	vcopy packages/app-desktop/dist/linux-*unpacked/* usr/libexec/joplin-desktop/
+	vinstall "${FILESDIR}/joplin.desktop" 644 usr/share/applications/ joplin.desktop
+	vbin "${FILESDIR}/joplin-desktop"
+	vlicense LICENSE
+}

From 0efa2c55100094d0e9f8b038c40989fe1ac30f65 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 5 Dec 2020 13:19:21 +1100
Subject: [PATCH 2/2] New package: joplin-cli-1.5.14.

---
 srcpkgs/joplin-cli/files/joplin-cli |  3 ++
 srcpkgs/joplin-cli/template         | 52 +++++++++++++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 srcpkgs/joplin-cli/files/joplin-cli
 create mode 100644 srcpkgs/joplin-cli/template

diff --git a/srcpkgs/joplin-cli/files/joplin-cli b/srcpkgs/joplin-cli/files/joplin-cli
new file mode 100644
index 00000000000..e65e75598db
--- /dev/null
+++ b/srcpkgs/joplin-cli/files/joplin-cli
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /usr/libexec/joplin-cli/app-cli
+node app/main.js "$@"
diff --git a/srcpkgs/joplin-cli/template b/srcpkgs/joplin-cli/template
new file mode 100644
index 00000000000..eda39ae5155
--- /dev/null
+++ b/srcpkgs/joplin-cli/template
@@ -0,0 +1,52 @@
+# Template file for 'joplin-cli'
+pkgname=joplin-cli
+version=1.5.14
+revision=1
+wrksrc="joplin-${version}"
+hostmakedepends="nodejs git python3 pkg-config libvips-devel"
+makedepends="libvips-devel libsecret-devel"
+depends="nodejs"
+short_desc="Open source note taking and to-do application - CLI version"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="MIT"
+homepage="https://joplinapp.org"
+distfiles="https://github.com/laurent22/joplin/archive/v${version}.tar.gz"
+checksum=b4d7bbde4ad00447bfc34d586c68d1064f2a48f117c30a914d89a2814b549137
+python_version=3
+nocross="somehow -m64 appears in CFLAGS out of nowhere"
+
+if [ "$CROSS_BUILD" ]; then
+	export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
+	export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/usr/lib/pkgconfig"
+	export PKG_CONFIG_PATH="$PKG_CONFIG_LIBDIR:$XBPS_CROSS_BASE/usr/share/pkgconfig"
+fi
+
+do_build() {
+	# Remove unused modules
+	rm -rf packages/{app-mobile,app-desktop,app-clipper,generator-joplin}
+
+	npm install ${XBPS_ALLOW_CHROOT_BREAKOUT:+--unsafe-perm} --build-from-source
+
+	cd packages
+	# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=joplin-cli#n30
+	# Unsure why this is needed, but it is
+	for d in app-cli lib renderer tools; do
+		pushd "${d}"
+		mv node_modules/@joplin .
+		npm prune --production
+		mv @joplin node_modules/
+		popd
+	done
+}
+
+do_install() {
+	cd packages
+
+	vmkdir usr/libexec/joplin-cli
+	for d in app-cli fork-sax fork-htmlparser2 renderer lib tools; do
+		vcopy "${d}" usr/libexec/joplin-cli/
+	done
+
+	vbin "${FILESDIR}/joplin-cli"
+	vlicense ../LICENSE
+}

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (29 preceding siblings ...)
  2021-01-04  6:29 ` [PR PATCH] [Updated] Joplin fosslinux
@ 2021-01-04  6:30 ` fosslinux
  2021-02-01 20:10 ` Joplin ericonr
                   ` (12 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: fosslinux @ 2021-01-04  6:30 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 286 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/26952#issuecomment-753785007

Comment:
musl has now been fixed on both joplin-desktop and joplin-cli. It has been runtime tested extensively on x86_64{,-musl} and is ready for merge.

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (30 preceding siblings ...)
  2021-01-04  6:30 ` Joplin fosslinux
@ 2021-02-01 20:10 ` ericonr
  2021-02-01 20:10 ` Joplin ericonr
                   ` (11 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: ericonr @ 2021-02-01 20:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 204 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26952#issuecomment-771125460

Comment:
Segfaults when launched, on msul + wayland. Haven't tried on X.

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (31 preceding siblings ...)
  2021-02-01 20:10 ` Joplin ericonr
@ 2021-02-01 20:10 ` ericonr
  2021-04-18  5:12 ` Joplin ericonr
                   ` (10 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: ericonr @ 2021-02-01 20:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 204 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26952#issuecomment-771125460

Comment:
Segfaults when launched, on musl + wayland. Haven't tried on X.

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (32 preceding siblings ...)
  2021-02-01 20:10 ` Joplin ericonr
@ 2021-04-18  5:12 ` ericonr
  2021-04-18  7:46 ` Joplin fosslinux
                   ` (9 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: ericonr @ 2021-04-18  5:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 267 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26952#issuecomment-821934477

Comment:
@fosslinux are you interested in merging this even with the intermittent status of electron on musl?

It looks generally ok.

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (33 preceding siblings ...)
  2021-04-18  5:12 ` Joplin ericonr
@ 2021-04-18  7:46 ` fosslinux
  2021-07-02  6:15 ` [PR PATCH] [Updated] Joplin fosslinux
                   ` (8 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: fosslinux @ 2021-04-18  7:46 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 277 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/26952#issuecomment-821949564

Comment:
Yes I am still interested in getting this merged.

Perhaps I should update the package before merge though... come back in 24 hrs :P

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR PATCH] [Updated] Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (34 preceding siblings ...)
  2021-04-18  7:46 ` Joplin fosslinux
@ 2021-07-02  6:15 ` fosslinux
  2021-07-02  6:16 ` fosslinux
                   ` (7 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: fosslinux @ 2021-07-02  6:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 564 bytes --]

There is an updated pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages joplin-new
https://github.com/void-linux/void-packages/pull/26952

Joplin
This PR adds the `joplin-desktop` and `joplin-cli` packages, containing the GUI and CLI versions of Joplin respectively. They are not distributed in the one package as they can and should be installed separately, they are separate applications.

Closes #19585

A patch file from https://github.com/void-linux/void-packages/pull/26952.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-joplin-new-26952.patch --]
[-- Type: text/x-diff, Size: 7466 bytes --]

From b7839cf9c999f00e6088aa4a491fcfb7e401fd77 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 2 Oct 2020 18:44:06 +1000
Subject: [PATCH 1/2] New package: joplin-desktop-2.1.7.

---
 srcpkgs/joplin-desktop/files/joplin-desktop   |  2 +
 srcpkgs/joplin-desktop/files/joplin.desktop   |  8 +++
 .../joplin-desktop/patches/electron-ver.patch | 11 ++++
 srcpkgs/joplin-desktop/template               | 55 +++++++++++++++++++
 4 files changed, 76 insertions(+)
 create mode 100755 srcpkgs/joplin-desktop/files/joplin-desktop
 create mode 100644 srcpkgs/joplin-desktop/files/joplin.desktop
 create mode 100644 srcpkgs/joplin-desktop/patches/electron-ver.patch
 create mode 100644 srcpkgs/joplin-desktop/template

diff --git a/srcpkgs/joplin-desktop/files/joplin-desktop b/srcpkgs/joplin-desktop/files/joplin-desktop
new file mode 100755
index 000000000000..ea7f12ba1b04
--- /dev/null
+++ b/srcpkgs/joplin-desktop/files/joplin-desktop
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec electron10 /usr/libexec/joplin-desktop/resources/app.asar "$@"
diff --git a/srcpkgs/joplin-desktop/files/joplin.desktop b/srcpkgs/joplin-desktop/files/joplin.desktop
new file mode 100644
index 000000000000..37852543a51a
--- /dev/null
+++ b/srcpkgs/joplin-desktop/files/joplin.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+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
+Icon=/usr/libexec/joplin/resources/build/icons/128x128.png
+Terminal=false
+Type=Application
+Categories=Application;Office;
diff --git a/srcpkgs/joplin-desktop/patches/electron-ver.patch b/srcpkgs/joplin-desktop/patches/electron-ver.patch
new file mode 100644
index 000000000000..de21dd83ab22
--- /dev/null
+++ b/srcpkgs/joplin-desktop/patches/electron-ver.patch
@@ -0,0 +1,11 @@
+--- a/packages/app-desktop/package.json	2021-01-03 20:03:05.818525142 +1100
++++ b/packages/app-desktop/package.json	2021-01-03 20:04:24.352069708 +1100
+@@ -36,6 +36,8 @@
+     "afterAllArtifactBuild": "./generateSha512.js",
+     "asar": true,
+     "asarUnpack": "./node_modules/node-notifier/vendor/**",
++    "electronDist": "/usr/lib/electron10",
++    "electronVersion": "@ELECTRON_VER@",
+     "win": {
+       "rfc3161TimeStampServer": "http://timestamp.comodoca.com/rfc3161",
+       "icon": "../../Assets/ImageSources/Joplin.ico",
diff --git a/srcpkgs/joplin-desktop/template b/srcpkgs/joplin-desktop/template
new file mode 100644
index 000000000000..834e02ef092b
--- /dev/null
+++ b/srcpkgs/joplin-desktop/template
@@ -0,0 +1,55 @@
+# Template file for 'joplin-desktop'
+pkgname=joplin-desktop
+version=2.1.7
+revision=1
+wrksrc="joplin-${version}"
+hostmakedepends="nodejs python3 pkg-config rsync git p7zip tar app-builder
+ squashfs-tools"
+makedepends="libvips-devel libsecret-devel electron10"
+depends="electron10"
+short_desc="Open source note taking and to-do application - Desktop version"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="MIT"
+homepage="https://joplinapp.org"
+distfiles="https://github.com/laurent22/joplin/archive/v${version}.tar.gz"
+checksum=b8d4fedb636d41d93718e51fcd99a5d889471db3f86002d9f3c1d90fc386f68c
+no_generic_pkgconfig_link=yes
+nopie_files="/usr/libexec/joplin-desktop/@joplinapp-desktop
+ /usr/libexec/joplin-desktop/chrome-sandbox"
+
+export USE_SYSTEM_7ZA="true"
+export USE_SYSTEM_APP_BUILDER="true"
+export USE_SYSTEM_MKSQUASHFS="true"
+
+if [ "$CROSS_BUILD" ]; then
+	export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
+	export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/usr/lib/pkgconfig"
+	export PKG_CONFIG_PATH="$PKG_CONFIG_LIBDIR:$XBPS_CROSS_BASE/usr/share/pkgconfig"
+fi
+
+do_configure() {
+	# Remove unused modules
+	rm -rf packages/{app-mobile,app-cli,generator-joplin,app-clipper}
+	# Set electron version
+	sed -i "s/@ELECTRON_VER@/$(cat /usr/lib/electron10/version)/" packages/app-desktop/package.json
+}
+
+do_build() {
+	npm install ${XBPS_ALLOW_CHROOT_BREAKOUT:+--unsafe-perm} \
+		--build-from-source
+	cd packages/app-desktop
+	npm run dist
+}
+
+do_check() {
+	npm run test
+}
+
+do_install() {
+	vmkdir usr/libexec/joplin-desktop
+	rm -rf packages/app-desktop/dist/linux-*unpacked/resources/app.asar.unpacked/node_modules/7zip-bin-linux
+	vcopy packages/app-desktop/dist/linux-*unpacked/* usr/libexec/joplin-desktop/
+	vinstall "${FILESDIR}/joplin.desktop" 644 usr/share/applications/ joplin.desktop
+	vbin "${FILESDIR}/joplin-desktop"
+	vlicense LICENSE
+}

From 1afc6907bf1ac1e29eb0a465c1951ef3ea99880f Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 5 Dec 2020 13:19:21 +1100
Subject: [PATCH 2/2] New package: joplin-cli-2.1.7.

---
 srcpkgs/joplin-cli/files/joplin-cli |  3 ++
 srcpkgs/joplin-cli/template         | 69 +++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+)
 create mode 100644 srcpkgs/joplin-cli/files/joplin-cli
 create mode 100644 srcpkgs/joplin-cli/template

diff --git a/srcpkgs/joplin-cli/files/joplin-cli b/srcpkgs/joplin-cli/files/joplin-cli
new file mode 100644
index 000000000000..e65e75598db5
--- /dev/null
+++ b/srcpkgs/joplin-cli/files/joplin-cli
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /usr/libexec/joplin-cli/app-cli
+node app/main.js "$@"
diff --git a/srcpkgs/joplin-cli/template b/srcpkgs/joplin-cli/template
new file mode 100644
index 000000000000..16a61924f3f9
--- /dev/null
+++ b/srcpkgs/joplin-cli/template
@@ -0,0 +1,69 @@
+# Template file for 'joplin-cli'
+pkgname=joplin-cli
+version=2.1.7
+revision=1
+wrksrc="joplin-${version}"
+hostmakedepends="nodejs git python3 pkg-config libvips-devel rsync"
+makedepends="libvips-devel libsecret-devel"
+depends="nodejs"
+short_desc="Open source note taking and to-do application - CLI version"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="MIT"
+homepage="https://joplinapp.org"
+distfiles="https://github.com/laurent22/joplin/archive/v${version}.tar.gz"
+checksum=b8d4fedb636d41d93718e51fcd99a5d889471db3f86002d9f3c1d90fc386f68c
+python_version=3
+#nocross="somehow -m64 appears in CFLAGS out of nowhere"
+
+# A first step to cross working...
+if [ "$CROSS_BUILD" ]; then
+	export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
+	export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/usr/lib/pkgconfig"
+	export PKG_CONFIG_PATH="$PKG_CONFIG_LIBDIR:$XBPS_CROSS_BASE/usr/share/pkgconfig"
+fi
+
+do_build() {
+	# Remove unused modules
+	rm -rf packages/{app-mobile,app-desktop,app-clipper,generator-joplin}
+
+	platform="linux"
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		platform="linuxmusl"
+	fi
+	arch=""
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64*) arch=x64 ;;
+		i686*) arch=ia32 ;;
+		*) # Dummy of arm; allows to be compiled from source
+			if [ "$XBPS_TARGET_WORDSIZE" = "64" ]; then
+				arch=arm64
+			else
+				arch=arm
+			fi ;;
+	esac
+	npm install ${XBPS_ALLOW_CHROOT_BREAKOUT:+--unsafe-perm} --build-from-source \
+		--platform="${platform}" --arch="${arch}"
+
+	cd packages
+	# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=joplin-cli#n30
+	# Unsure why this is needed, but it is
+	for d in app-cli lib renderer tools; do
+		pushd "${d}"
+		mv node_modules/@joplin .
+		npm prune --production
+		mv @joplin node_modules/
+		popd
+	done
+}
+
+do_install() {
+	cd packages
+
+	vmkdir usr/libexec/joplin-cli
+	for d in app-cli fork-sax fork-htmlparser2 renderer lib tools; do
+		vcopy "${d}" usr/libexec/joplin-cli/
+	done
+
+	vbin "${FILESDIR}/joplin-cli"
+	vlicense ../LICENSE
+}

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR PATCH] [Updated] Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (35 preceding siblings ...)
  2021-07-02  6:15 ` [PR PATCH] [Updated] Joplin fosslinux
@ 2021-07-02  6:16 ` fosslinux
  2021-07-02  6:16 ` fosslinux
                   ` (6 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: fosslinux @ 2021-07-02  6:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 564 bytes --]

There is an updated pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages joplin-new
https://github.com/void-linux/void-packages/pull/26952

Joplin
This PR adds the `joplin-desktop` and `joplin-cli` packages, containing the GUI and CLI versions of Joplin respectively. They are not distributed in the one package as they can and should be installed separately, they are separate applications.

Closes #19585

A patch file from https://github.com/void-linux/void-packages/pull/26952.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-joplin-new-26952.patch --]
[-- Type: text/x-diff, Size: 7402 bytes --]

From b7839cf9c999f00e6088aa4a491fcfb7e401fd77 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 2 Oct 2020 18:44:06 +1000
Subject: [PATCH 1/2] New package: joplin-desktop-2.1.7.

---
 srcpkgs/joplin-desktop/files/joplin-desktop   |  2 +
 srcpkgs/joplin-desktop/files/joplin.desktop   |  8 +++
 .../joplin-desktop/patches/electron-ver.patch | 11 ++++
 srcpkgs/joplin-desktop/template               | 55 +++++++++++++++++++
 4 files changed, 76 insertions(+)
 create mode 100755 srcpkgs/joplin-desktop/files/joplin-desktop
 create mode 100644 srcpkgs/joplin-desktop/files/joplin.desktop
 create mode 100644 srcpkgs/joplin-desktop/patches/electron-ver.patch
 create mode 100644 srcpkgs/joplin-desktop/template

diff --git a/srcpkgs/joplin-desktop/files/joplin-desktop b/srcpkgs/joplin-desktop/files/joplin-desktop
new file mode 100755
index 000000000000..ea7f12ba1b04
--- /dev/null
+++ b/srcpkgs/joplin-desktop/files/joplin-desktop
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec electron10 /usr/libexec/joplin-desktop/resources/app.asar "$@"
diff --git a/srcpkgs/joplin-desktop/files/joplin.desktop b/srcpkgs/joplin-desktop/files/joplin.desktop
new file mode 100644
index 000000000000..37852543a51a
--- /dev/null
+++ b/srcpkgs/joplin-desktop/files/joplin.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+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
+Icon=/usr/libexec/joplin/resources/build/icons/128x128.png
+Terminal=false
+Type=Application
+Categories=Application;Office;
diff --git a/srcpkgs/joplin-desktop/patches/electron-ver.patch b/srcpkgs/joplin-desktop/patches/electron-ver.patch
new file mode 100644
index 000000000000..de21dd83ab22
--- /dev/null
+++ b/srcpkgs/joplin-desktop/patches/electron-ver.patch
@@ -0,0 +1,11 @@
+--- a/packages/app-desktop/package.json	2021-01-03 20:03:05.818525142 +1100
++++ b/packages/app-desktop/package.json	2021-01-03 20:04:24.352069708 +1100
+@@ -36,6 +36,8 @@
+     "afterAllArtifactBuild": "./generateSha512.js",
+     "asar": true,
+     "asarUnpack": "./node_modules/node-notifier/vendor/**",
++    "electronDist": "/usr/lib/electron10",
++    "electronVersion": "@ELECTRON_VER@",
+     "win": {
+       "rfc3161TimeStampServer": "http://timestamp.comodoca.com/rfc3161",
+       "icon": "../../Assets/ImageSources/Joplin.ico",
diff --git a/srcpkgs/joplin-desktop/template b/srcpkgs/joplin-desktop/template
new file mode 100644
index 000000000000..834e02ef092b
--- /dev/null
+++ b/srcpkgs/joplin-desktop/template
@@ -0,0 +1,55 @@
+# Template file for 'joplin-desktop'
+pkgname=joplin-desktop
+version=2.1.7
+revision=1
+wrksrc="joplin-${version}"
+hostmakedepends="nodejs python3 pkg-config rsync git p7zip tar app-builder
+ squashfs-tools"
+makedepends="libvips-devel libsecret-devel electron10"
+depends="electron10"
+short_desc="Open source note taking and to-do application - Desktop version"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="MIT"
+homepage="https://joplinapp.org"
+distfiles="https://github.com/laurent22/joplin/archive/v${version}.tar.gz"
+checksum=b8d4fedb636d41d93718e51fcd99a5d889471db3f86002d9f3c1d90fc386f68c
+no_generic_pkgconfig_link=yes
+nopie_files="/usr/libexec/joplin-desktop/@joplinapp-desktop
+ /usr/libexec/joplin-desktop/chrome-sandbox"
+
+export USE_SYSTEM_7ZA="true"
+export USE_SYSTEM_APP_BUILDER="true"
+export USE_SYSTEM_MKSQUASHFS="true"
+
+if [ "$CROSS_BUILD" ]; then
+	export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
+	export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/usr/lib/pkgconfig"
+	export PKG_CONFIG_PATH="$PKG_CONFIG_LIBDIR:$XBPS_CROSS_BASE/usr/share/pkgconfig"
+fi
+
+do_configure() {
+	# Remove unused modules
+	rm -rf packages/{app-mobile,app-cli,generator-joplin,app-clipper}
+	# Set electron version
+	sed -i "s/@ELECTRON_VER@/$(cat /usr/lib/electron10/version)/" packages/app-desktop/package.json
+}
+
+do_build() {
+	npm install ${XBPS_ALLOW_CHROOT_BREAKOUT:+--unsafe-perm} \
+		--build-from-source
+	cd packages/app-desktop
+	npm run dist
+}
+
+do_check() {
+	npm run test
+}
+
+do_install() {
+	vmkdir usr/libexec/joplin-desktop
+	rm -rf packages/app-desktop/dist/linux-*unpacked/resources/app.asar.unpacked/node_modules/7zip-bin-linux
+	vcopy packages/app-desktop/dist/linux-*unpacked/* usr/libexec/joplin-desktop/
+	vinstall "${FILESDIR}/joplin.desktop" 644 usr/share/applications/ joplin.desktop
+	vbin "${FILESDIR}/joplin-desktop"
+	vlicense LICENSE
+}

From 1103360d5ed3a61c2a9dde26e7538f15f3416838 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 5 Dec 2020 13:19:21 +1100
Subject: [PATCH 2/2] New package: joplin-cli-2.1.7.

---
 srcpkgs/joplin-cli/files/joplin-cli |  3 ++
 srcpkgs/joplin-cli/template         | 68 +++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 srcpkgs/joplin-cli/files/joplin-cli
 create mode 100644 srcpkgs/joplin-cli/template

diff --git a/srcpkgs/joplin-cli/files/joplin-cli b/srcpkgs/joplin-cli/files/joplin-cli
new file mode 100644
index 000000000000..e65e75598db5
--- /dev/null
+++ b/srcpkgs/joplin-cli/files/joplin-cli
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /usr/libexec/joplin-cli/app-cli
+node app/main.js "$@"
diff --git a/srcpkgs/joplin-cli/template b/srcpkgs/joplin-cli/template
new file mode 100644
index 000000000000..8f36f154d166
--- /dev/null
+++ b/srcpkgs/joplin-cli/template
@@ -0,0 +1,68 @@
+# Template file for 'joplin-cli'
+pkgname=joplin-cli
+version=2.1.7
+revision=1
+wrksrc="joplin-${version}"
+hostmakedepends="nodejs git python3 pkg-config libvips-devel rsync"
+makedepends="libvips-devel libsecret-devel"
+depends="nodejs"
+short_desc="Open source note taking and to-do application - CLI version"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="MIT"
+homepage="https://joplinapp.org"
+distfiles="https://github.com/laurent22/joplin/archive/v${version}.tar.gz"
+checksum=b8d4fedb636d41d93718e51fcd99a5d889471db3f86002d9f3c1d90fc386f68c
+python_version=3
+
+if [ "$CROSS_BUILD" ]; then
+	export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
+	export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/usr/lib/pkgconfig"
+	export PKG_CONFIG_PATH="$PKG_CONFIG_LIBDIR:$XBPS_CROSS_BASE/usr/share/pkgconfig"
+fi
+
+do_build() {
+	# Remove unused modules
+	rm -rf packages/{app-mobile,app-desktop,app-clipper,generator-joplin}
+
+	# Needed for cross to build
+	platform="linux"
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		platform="linuxmusl"
+	fi
+	arch=""
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64*) arch=x64 ;;
+		i686*) arch=ia32 ;;
+		*) # Dummy of arm; allows to be compiled from source
+			if [ "$XBPS_TARGET_WORDSIZE" = "64" ]; then
+				arch=arm64
+			else
+				arch=arm
+			fi ;;
+	esac
+	npm install ${XBPS_ALLOW_CHROOT_BREAKOUT:+--unsafe-perm} --build-from-source \
+		--platform="${platform}" --arch="${arch}"
+
+	cd packages
+	# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=joplin-cli#n30
+	# Unsure why this is needed, but it is
+	for d in app-cli lib renderer tools; do
+		pushd "${d}"
+		mv node_modules/@joplin .
+		npm prune --production
+		mv @joplin node_modules/
+		popd
+	done
+}
+
+do_install() {
+	cd packages
+
+	vmkdir usr/libexec/joplin-cli
+	for d in app-cli fork-sax fork-htmlparser2 renderer lib tools; do
+		vcopy "${d}" usr/libexec/joplin-cli/
+	done
+
+	vbin "${FILESDIR}/joplin-cli"
+	vlicense ../LICENSE
+}

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR PATCH] [Updated] Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (36 preceding siblings ...)
  2021-07-02  6:16 ` fosslinux
@ 2021-07-02  6:16 ` fosslinux
  2021-07-02  6:17 ` Joplin fosslinux
                   ` (5 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: fosslinux @ 2021-07-02  6:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 564 bytes --]

There is an updated pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages joplin-new
https://github.com/void-linux/void-packages/pull/26952

Joplin
This PR adds the `joplin-desktop` and `joplin-cli` packages, containing the GUI and CLI versions of Joplin respectively. They are not distributed in the one package as they can and should be installed separately, they are separate applications.

Closes #19585

A patch file from https://github.com/void-linux/void-packages/pull/26952.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-joplin-new-26952.patch --]
[-- Type: text/x-diff, Size: 7402 bytes --]

From 7c961390eec1999d92e7aa1d880b1cc19ecbbc46 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 2 Oct 2020 18:44:06 +1000
Subject: [PATCH 1/2] New package: joplin-desktop-2.1.7.

---
 srcpkgs/joplin-desktop/files/joplin-desktop   |  2 +
 srcpkgs/joplin-desktop/files/joplin.desktop   |  8 +++
 .../joplin-desktop/patches/electron-ver.patch | 11 ++++
 srcpkgs/joplin-desktop/template               | 55 +++++++++++++++++++
 4 files changed, 76 insertions(+)
 create mode 100755 srcpkgs/joplin-desktop/files/joplin-desktop
 create mode 100644 srcpkgs/joplin-desktop/files/joplin.desktop
 create mode 100644 srcpkgs/joplin-desktop/patches/electron-ver.patch
 create mode 100644 srcpkgs/joplin-desktop/template

diff --git a/srcpkgs/joplin-desktop/files/joplin-desktop b/srcpkgs/joplin-desktop/files/joplin-desktop
new file mode 100755
index 000000000000..ea7f12ba1b04
--- /dev/null
+++ b/srcpkgs/joplin-desktop/files/joplin-desktop
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec electron10 /usr/libexec/joplin-desktop/resources/app.asar "$@"
diff --git a/srcpkgs/joplin-desktop/files/joplin.desktop b/srcpkgs/joplin-desktop/files/joplin.desktop
new file mode 100644
index 000000000000..37852543a51a
--- /dev/null
+++ b/srcpkgs/joplin-desktop/files/joplin.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+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
+Icon=/usr/libexec/joplin/resources/build/icons/128x128.png
+Terminal=false
+Type=Application
+Categories=Application;Office;
diff --git a/srcpkgs/joplin-desktop/patches/electron-ver.patch b/srcpkgs/joplin-desktop/patches/electron-ver.patch
new file mode 100644
index 000000000000..de21dd83ab22
--- /dev/null
+++ b/srcpkgs/joplin-desktop/patches/electron-ver.patch
@@ -0,0 +1,11 @@
+--- a/packages/app-desktop/package.json	2021-01-03 20:03:05.818525142 +1100
++++ b/packages/app-desktop/package.json	2021-01-03 20:04:24.352069708 +1100
+@@ -36,6 +36,8 @@
+     "afterAllArtifactBuild": "./generateSha512.js",
+     "asar": true,
+     "asarUnpack": "./node_modules/node-notifier/vendor/**",
++    "electronDist": "/usr/lib/electron10",
++    "electronVersion": "@ELECTRON_VER@",
+     "win": {
+       "rfc3161TimeStampServer": "http://timestamp.comodoca.com/rfc3161",
+       "icon": "../../Assets/ImageSources/Joplin.ico",
diff --git a/srcpkgs/joplin-desktop/template b/srcpkgs/joplin-desktop/template
new file mode 100644
index 000000000000..834e02ef092b
--- /dev/null
+++ b/srcpkgs/joplin-desktop/template
@@ -0,0 +1,55 @@
+# Template file for 'joplin-desktop'
+pkgname=joplin-desktop
+version=2.1.7
+revision=1
+wrksrc="joplin-${version}"
+hostmakedepends="nodejs python3 pkg-config rsync git p7zip tar app-builder
+ squashfs-tools"
+makedepends="libvips-devel libsecret-devel electron10"
+depends="electron10"
+short_desc="Open source note taking and to-do application - Desktop version"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="MIT"
+homepage="https://joplinapp.org"
+distfiles="https://github.com/laurent22/joplin/archive/v${version}.tar.gz"
+checksum=b8d4fedb636d41d93718e51fcd99a5d889471db3f86002d9f3c1d90fc386f68c
+no_generic_pkgconfig_link=yes
+nopie_files="/usr/libexec/joplin-desktop/@joplinapp-desktop
+ /usr/libexec/joplin-desktop/chrome-sandbox"
+
+export USE_SYSTEM_7ZA="true"
+export USE_SYSTEM_APP_BUILDER="true"
+export USE_SYSTEM_MKSQUASHFS="true"
+
+if [ "$CROSS_BUILD" ]; then
+	export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
+	export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/usr/lib/pkgconfig"
+	export PKG_CONFIG_PATH="$PKG_CONFIG_LIBDIR:$XBPS_CROSS_BASE/usr/share/pkgconfig"
+fi
+
+do_configure() {
+	# Remove unused modules
+	rm -rf packages/{app-mobile,app-cli,generator-joplin,app-clipper}
+	# Set electron version
+	sed -i "s/@ELECTRON_VER@/$(cat /usr/lib/electron10/version)/" packages/app-desktop/package.json
+}
+
+do_build() {
+	npm install ${XBPS_ALLOW_CHROOT_BREAKOUT:+--unsafe-perm} \
+		--build-from-source
+	cd packages/app-desktop
+	npm run dist
+}
+
+do_check() {
+	npm run test
+}
+
+do_install() {
+	vmkdir usr/libexec/joplin-desktop
+	rm -rf packages/app-desktop/dist/linux-*unpacked/resources/app.asar.unpacked/node_modules/7zip-bin-linux
+	vcopy packages/app-desktop/dist/linux-*unpacked/* usr/libexec/joplin-desktop/
+	vinstall "${FILESDIR}/joplin.desktop" 644 usr/share/applications/ joplin.desktop
+	vbin "${FILESDIR}/joplin-desktop"
+	vlicense LICENSE
+}

From 95337d65e6dc921d1e1845d13717f9501e493816 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 5 Dec 2020 13:19:21 +1100
Subject: [PATCH 2/2] New package: joplin-cli-2.1.7.

---
 srcpkgs/joplin-cli/files/joplin-cli |  3 ++
 srcpkgs/joplin-cli/template         | 68 +++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+)
 create mode 100644 srcpkgs/joplin-cli/files/joplin-cli
 create mode 100644 srcpkgs/joplin-cli/template

diff --git a/srcpkgs/joplin-cli/files/joplin-cli b/srcpkgs/joplin-cli/files/joplin-cli
new file mode 100644
index 000000000000..e65e75598db5
--- /dev/null
+++ b/srcpkgs/joplin-cli/files/joplin-cli
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /usr/libexec/joplin-cli/app-cli
+node app/main.js "$@"
diff --git a/srcpkgs/joplin-cli/template b/srcpkgs/joplin-cli/template
new file mode 100644
index 000000000000..8f36f154d166
--- /dev/null
+++ b/srcpkgs/joplin-cli/template
@@ -0,0 +1,68 @@
+# Template file for 'joplin-cli'
+pkgname=joplin-cli
+version=2.1.7
+revision=1
+wrksrc="joplin-${version}"
+hostmakedepends="nodejs git python3 pkg-config libvips-devel rsync"
+makedepends="libvips-devel libsecret-devel"
+depends="nodejs"
+short_desc="Open source note taking and to-do application - CLI version"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="MIT"
+homepage="https://joplinapp.org"
+distfiles="https://github.com/laurent22/joplin/archive/v${version}.tar.gz"
+checksum=b8d4fedb636d41d93718e51fcd99a5d889471db3f86002d9f3c1d90fc386f68c
+python_version=3
+
+if [ "$CROSS_BUILD" ]; then
+	export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
+	export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/usr/lib/pkgconfig"
+	export PKG_CONFIG_PATH="$PKG_CONFIG_LIBDIR:$XBPS_CROSS_BASE/usr/share/pkgconfig"
+fi
+
+do_build() {
+	# Remove unused modules
+	rm -rf packages/{app-mobile,app-desktop,app-clipper,generator-joplin}
+
+	# Needed for cross to build
+	platform="linux"
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		platform="linuxmusl"
+	fi
+	arch=""
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64*) arch=x64 ;;
+		i686*) arch=ia32 ;;
+		*) # Dummy of arm; allows to be compiled from source
+			if [ "$XBPS_TARGET_WORDSIZE" = "64" ]; then
+				arch=arm64
+			else
+				arch=arm
+			fi ;;
+	esac
+	npm install ${XBPS_ALLOW_CHROOT_BREAKOUT:+--unsafe-perm} --build-from-source \
+		--platform="${platform}" --arch="${arch}"
+
+	cd packages
+	# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=joplin-cli#n30
+	# Unsure why this is needed, but it is
+	for d in app-cli lib renderer tools; do
+		pushd "${d}"
+		mv node_modules/@joplin .
+		npm prune --production
+		mv @joplin node_modules/
+		popd
+	done
+}
+
+do_install() {
+	cd packages
+
+	vmkdir usr/libexec/joplin-cli
+	for d in app-cli fork-sax fork-htmlparser2 renderer lib tools; do
+		vcopy "${d}" usr/libexec/joplin-cli/
+	done
+
+	vbin "${FILESDIR}/joplin-cli"
+	vlicense ../LICENSE
+}

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (37 preceding siblings ...)
  2021-07-02  6:16 ` fosslinux
@ 2021-07-02  6:17 ` fosslinux
  2021-07-02 12:40 ` [PR PATCH] [Updated] Joplin fosslinux
                   ` (4 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: fosslinux @ 2021-07-02  6:17 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 203 bytes --]

New comment by fosslinux on void-packages repository

https://github.com/void-linux/void-packages/pull/26952#issuecomment-872746955

Comment:
Ping.

- cross has been fixed
- updated to latest version

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR PATCH] [Updated] Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (38 preceding siblings ...)
  2021-07-02  6:17 ` Joplin fosslinux
@ 2021-07-02 12:40 ` fosslinux
  2021-09-11 14:57 ` Joplin notramo
                   ` (3 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: fosslinux @ 2021-07-02 12:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 564 bytes --]

There is an updated pull request by fosslinux against master on the void-packages repository

https://github.com/fosslinux/void-packages joplin-new
https://github.com/void-linux/void-packages/pull/26952

Joplin
This PR adds the `joplin-desktop` and `joplin-cli` packages, containing the GUI and CLI versions of Joplin respectively. They are not distributed in the one package as they can and should be installed separately, they are separate applications.

Closes #19585

A patch file from https://github.com/void-linux/void-packages/pull/26952.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-joplin-new-26952.patch --]
[-- Type: text/x-diff, Size: 7457 bytes --]

From 7c961390eec1999d92e7aa1d880b1cc19ecbbc46 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Fri, 2 Oct 2020 18:44:06 +1000
Subject: [PATCH 1/2] New package: joplin-desktop-2.1.7.

---
 srcpkgs/joplin-desktop/files/joplin-desktop   |  2 +
 srcpkgs/joplin-desktop/files/joplin.desktop   |  8 +++
 .../joplin-desktop/patches/electron-ver.patch | 11 ++++
 srcpkgs/joplin-desktop/template               | 55 +++++++++++++++++++
 4 files changed, 76 insertions(+)
 create mode 100755 srcpkgs/joplin-desktop/files/joplin-desktop
 create mode 100644 srcpkgs/joplin-desktop/files/joplin.desktop
 create mode 100644 srcpkgs/joplin-desktop/patches/electron-ver.patch
 create mode 100644 srcpkgs/joplin-desktop/template

diff --git a/srcpkgs/joplin-desktop/files/joplin-desktop b/srcpkgs/joplin-desktop/files/joplin-desktop
new file mode 100755
index 000000000000..ea7f12ba1b04
--- /dev/null
+++ b/srcpkgs/joplin-desktop/files/joplin-desktop
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec electron10 /usr/libexec/joplin-desktop/resources/app.asar "$@"
diff --git a/srcpkgs/joplin-desktop/files/joplin.desktop b/srcpkgs/joplin-desktop/files/joplin.desktop
new file mode 100644
index 000000000000..37852543a51a
--- /dev/null
+++ b/srcpkgs/joplin-desktop/files/joplin.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+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
+Icon=/usr/libexec/joplin/resources/build/icons/128x128.png
+Terminal=false
+Type=Application
+Categories=Application;Office;
diff --git a/srcpkgs/joplin-desktop/patches/electron-ver.patch b/srcpkgs/joplin-desktop/patches/electron-ver.patch
new file mode 100644
index 000000000000..de21dd83ab22
--- /dev/null
+++ b/srcpkgs/joplin-desktop/patches/electron-ver.patch
@@ -0,0 +1,11 @@
+--- a/packages/app-desktop/package.json	2021-01-03 20:03:05.818525142 +1100
++++ b/packages/app-desktop/package.json	2021-01-03 20:04:24.352069708 +1100
+@@ -36,6 +36,8 @@
+     "afterAllArtifactBuild": "./generateSha512.js",
+     "asar": true,
+     "asarUnpack": "./node_modules/node-notifier/vendor/**",
++    "electronDist": "/usr/lib/electron10",
++    "electronVersion": "@ELECTRON_VER@",
+     "win": {
+       "rfc3161TimeStampServer": "http://timestamp.comodoca.com/rfc3161",
+       "icon": "../../Assets/ImageSources/Joplin.ico",
diff --git a/srcpkgs/joplin-desktop/template b/srcpkgs/joplin-desktop/template
new file mode 100644
index 000000000000..834e02ef092b
--- /dev/null
+++ b/srcpkgs/joplin-desktop/template
@@ -0,0 +1,55 @@
+# Template file for 'joplin-desktop'
+pkgname=joplin-desktop
+version=2.1.7
+revision=1
+wrksrc="joplin-${version}"
+hostmakedepends="nodejs python3 pkg-config rsync git p7zip tar app-builder
+ squashfs-tools"
+makedepends="libvips-devel libsecret-devel electron10"
+depends="electron10"
+short_desc="Open source note taking and to-do application - Desktop version"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="MIT"
+homepage="https://joplinapp.org"
+distfiles="https://github.com/laurent22/joplin/archive/v${version}.tar.gz"
+checksum=b8d4fedb636d41d93718e51fcd99a5d889471db3f86002d9f3c1d90fc386f68c
+no_generic_pkgconfig_link=yes
+nopie_files="/usr/libexec/joplin-desktop/@joplinapp-desktop
+ /usr/libexec/joplin-desktop/chrome-sandbox"
+
+export USE_SYSTEM_7ZA="true"
+export USE_SYSTEM_APP_BUILDER="true"
+export USE_SYSTEM_MKSQUASHFS="true"
+
+if [ "$CROSS_BUILD" ]; then
+	export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
+	export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/usr/lib/pkgconfig"
+	export PKG_CONFIG_PATH="$PKG_CONFIG_LIBDIR:$XBPS_CROSS_BASE/usr/share/pkgconfig"
+fi
+
+do_configure() {
+	# Remove unused modules
+	rm -rf packages/{app-mobile,app-cli,generator-joplin,app-clipper}
+	# Set electron version
+	sed -i "s/@ELECTRON_VER@/$(cat /usr/lib/electron10/version)/" packages/app-desktop/package.json
+}
+
+do_build() {
+	npm install ${XBPS_ALLOW_CHROOT_BREAKOUT:+--unsafe-perm} \
+		--build-from-source
+	cd packages/app-desktop
+	npm run dist
+}
+
+do_check() {
+	npm run test
+}
+
+do_install() {
+	vmkdir usr/libexec/joplin-desktop
+	rm -rf packages/app-desktop/dist/linux-*unpacked/resources/app.asar.unpacked/node_modules/7zip-bin-linux
+	vcopy packages/app-desktop/dist/linux-*unpacked/* usr/libexec/joplin-desktop/
+	vinstall "${FILESDIR}/joplin.desktop" 644 usr/share/applications/ joplin.desktop
+	vbin "${FILESDIR}/joplin-desktop"
+	vlicense LICENSE
+}

From cf6f50949b2ada206a0dbf181685aef9d15854fb Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sat, 5 Dec 2020 13:19:21 +1100
Subject: [PATCH 2/2] New package: joplin-cli-2.1.7.

---
 srcpkgs/joplin-cli/files/joplin-cli |  3 ++
 srcpkgs/joplin-cli/template         | 69 +++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+)
 create mode 100644 srcpkgs/joplin-cli/files/joplin-cli
 create mode 100644 srcpkgs/joplin-cli/template

diff --git a/srcpkgs/joplin-cli/files/joplin-cli b/srcpkgs/joplin-cli/files/joplin-cli
new file mode 100644
index 000000000000..e65e75598db5
--- /dev/null
+++ b/srcpkgs/joplin-cli/files/joplin-cli
@@ -0,0 +1,3 @@
+#!/bin/sh
+cd /usr/libexec/joplin-cli/app-cli
+node app/main.js "$@"
diff --git a/srcpkgs/joplin-cli/template b/srcpkgs/joplin-cli/template
new file mode 100644
index 000000000000..eea15ed73983
--- /dev/null
+++ b/srcpkgs/joplin-cli/template
@@ -0,0 +1,69 @@
+# Template file for 'joplin-cli'
+pkgname=joplin-cli
+version=2.1.7
+revision=1
+wrksrc="joplin-${version}"
+hostmakedepends="nodejs git python3 pkg-config libvips-devel rsync"
+makedepends="libvips-devel libsecret-devel"
+depends="nodejs"
+short_desc="Open source note taking and to-do application - CLI version"
+maintainer="fosslinux <fosslinux@aussies.space>"
+license="MIT"
+homepage="https://joplinapp.org"
+distfiles="https://github.com/laurent22/joplin/archive/v${version}.tar.gz"
+checksum=b8d4fedb636d41d93718e51fcd99a5d889471db3f86002d9f3c1d90fc386f68c
+python_version=3
+make_check=extended # Some tests are broken (why?)
+
+if [ "$CROSS_BUILD" ]; then
+	export PKG_CONFIG_SYSROOT_DIR="$XBPS_CROSS_BASE"
+	export PKG_CONFIG_LIBDIR="$XBPS_CROSS_BASE/usr/lib/pkgconfig"
+	export PKG_CONFIG_PATH="$PKG_CONFIG_LIBDIR:$XBPS_CROSS_BASE/usr/share/pkgconfig"
+fi
+
+do_build() {
+	# Remove unused modules
+	rm -rf packages/{app-mobile,app-desktop,app-clipper,generator-joplin}
+
+	# Needed for cross to build
+	platform="linux"
+	if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+		platform="linuxmusl"
+	fi
+	local arch
+	case "$XBPS_TARGET_MACHINE" in
+		x86_64*) arch=x64 ;;
+		i686*) arch=ia32 ;;
+		*) # Dummy of arm; allows to be compiled from source
+			if [ "$XBPS_TARGET_WORDSIZE" = "64" ]; then
+				arch=arm64
+			else
+				arch=arm
+			fi ;;
+	esac
+	npm install ${XBPS_ALLOW_CHROOT_BREAKOUT:+--unsafe-perm} --build-from-source \
+		--platform="${platform}" --arch="${arch}"
+
+	cd packages
+	# https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=joplin-cli#n30
+	# Unsure why this is needed, but it is
+	for d in app-cli lib renderer tools; do
+		pushd "${d}"
+		mv node_modules/@joplin .
+		npm prune --production
+		mv @joplin node_modules/
+		popd
+	done
+}
+
+do_install() {
+	cd packages
+
+	vmkdir usr/libexec/joplin-cli
+	for d in app-cli fork-sax fork-htmlparser2 renderer lib tools; do
+		vcopy "${d}" usr/libexec/joplin-cli/
+	done
+
+	vbin "${FILESDIR}/joplin-cli"
+	vlicense ../LICENSE
+}

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (39 preceding siblings ...)
  2021-07-02 12:40 ` [PR PATCH] [Updated] Joplin fosslinux
@ 2021-09-11 14:57 ` notramo
  2021-09-11 19:40 ` Joplin ericonr
                   ` (2 subsequent siblings)
  43 siblings, 0 replies; 45+ messages in thread
From: notramo @ 2021-09-11 14:57 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 246 bytes --]

New comment by notramo on void-packages repository

https://github.com/void-linux/void-packages/pull/26952#issuecomment-917420993

Comment:
Why does it segfault on musl Wayland? It's probably not because of Electron as Element Desktop runs fine.

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (40 preceding siblings ...)
  2021-09-11 14:57 ` Joplin notramo
@ 2021-09-11 19:40 ` ericonr
  2022-04-30  2:14 ` Joplin github-actions
  2022-05-14  2:16 ` [PR PATCH] [Closed]: Joplin github-actions
  43 siblings, 0 replies; 45+ messages in thread
From: ericonr @ 2021-09-11 19:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 237 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/26952#issuecomment-917466333

Comment:
Electron is very fiddly on musl. I had crashes with vscode but not element-desktop, for example.

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (41 preceding siblings ...)
  2021-09-11 19:40 ` Joplin ericonr
@ 2022-04-30  2:14 ` github-actions
  2022-05-14  2:16 ` [PR PATCH] [Closed]: Joplin github-actions
  43 siblings, 0 replies; 45+ messages in thread
From: github-actions @ 2022-04-30  2:14 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 305 bytes --]

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/26952#issuecomment-1113893162

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

^ permalink raw reply	[flat|nested] 45+ messages in thread

* Re: [PR PATCH] [Closed]: Joplin
  2020-12-05  2:24 [PR PATCH] Joplin fosslinux
                   ` (42 preceding siblings ...)
  2022-04-30  2:14 ` Joplin github-actions
@ 2022-05-14  2:16 ` github-actions
  43 siblings, 0 replies; 45+ messages in thread
From: github-actions @ 2022-05-14  2:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 401 bytes --]

There's a closed pull request on the void-packages repository

Joplin
https://github.com/void-linux/void-packages/pull/26952

Description:
This PR adds the `joplin-desktop` and `joplin-cli` packages, containing the GUI and CLI versions of Joplin respectively. They are not distributed in the one package as they can and should be installed separately, they are separate applications.

Closes #19585

^ permalink raw reply	[flat|nested] 45+ messages in thread

end of thread, other threads:[~2022-05-14  2:16 UTC | newest]

Thread overview: 45+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-05  2:24 [PR PATCH] Joplin fosslinux
2020-12-05  2:30 ` [PR PATCH] [Updated] Joplin fosslinux
2020-12-05  2:37 ` Joplin fosslinux
2020-12-05  3:16 ` Joplin ericonr
2020-12-05  4:20 ` Joplin ndowens
2020-12-05  4:46 ` Joplin fosslinux
2020-12-05 10:31 ` [PR PATCH] [Updated] Joplin fosslinux
2020-12-05 13:48 ` Joplin sgn
2020-12-05 14:12 ` Joplin sgn
2020-12-05 14:18 ` [PR PATCH] [Updated] Joplin sgn
2020-12-05 14:28 ` Joplin sgn
2020-12-05 22:05 ` Joplin fosslinux
2020-12-05 22:06 ` Joplin fosslinux
2020-12-05 22:19 ` [PR PATCH] [Updated] Joplin fosslinux
2020-12-05 23:38 ` [PR REVIEW] Joplin sgn
2020-12-06  4:34 ` [PR PATCH] [Updated] Joplin fosslinux
2020-12-14  3:20 ` Joplin sgn
2020-12-14  6:13 ` Joplin fosslinux
2020-12-14  6:15 ` [PR PATCH] [Updated] Joplin fosslinux
2020-12-14  6:19 ` Joplin fosslinux
2020-12-14  7:35 ` Joplin fosslinux
2020-12-17  1:53 ` Joplin fosslinux
2020-12-17  3:12 ` [PR PATCH] [Updated] Joplin fosslinux
2020-12-19  0:42 ` Joplin fosslinux
2020-12-25 22:25 ` Joplin fosslinux
2021-01-01  9:46 ` [PR PATCH] [Updated] Joplin fosslinux
2021-01-01  9:47 ` fosslinux
2021-01-01  9:48 ` Joplin fosslinux
2021-01-01  9:48 ` Joplin fosslinux
2021-01-01 10:23 ` Joplin fosslinux
2021-01-04  6:29 ` [PR PATCH] [Updated] Joplin fosslinux
2021-01-04  6:30 ` Joplin fosslinux
2021-02-01 20:10 ` Joplin ericonr
2021-02-01 20:10 ` Joplin ericonr
2021-04-18  5:12 ` Joplin ericonr
2021-04-18  7:46 ` Joplin fosslinux
2021-07-02  6:15 ` [PR PATCH] [Updated] Joplin fosslinux
2021-07-02  6:16 ` fosslinux
2021-07-02  6:16 ` fosslinux
2021-07-02  6:17 ` Joplin fosslinux
2021-07-02 12:40 ` [PR PATCH] [Updated] Joplin fosslinux
2021-09-11 14:57 ` Joplin notramo
2021-09-11 19:40 ` Joplin ericonr
2022-04-30  2:14 ` Joplin github-actions
2022-05-14  2:16 ` [PR PATCH] [Closed]: Joplin github-actions

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).