From: fosslinux <fosslinux@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Joplin
Date: Thu, 17 Dec 2020 04:12:30 +0100 [thread overview]
Message-ID: <20201217031230.e6q17CI9ml42Mr-mOEHQzlAaKjLxshkoNCdo9H5TnZ8@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-26952@inbox.vuxu.org>
[-- 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
+}
next prev parent reply other threads:[~2020-12-17 3:12 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
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 ` fosslinux [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201217031230.e6q17CI9ml42Mr-mOEHQzlAaKjLxshkoNCdo9H5TnZ8@z \
--to=fosslinux@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).