From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: Joplin
Date: Mon, 14 Dec 2020 04:20:17 +0100 [thread overview]
Message-ID: <20201214032017.IRj5dBMz1HYmnimqMNxtIIeJyTZCmpSAJmTG4zHMBs8@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: 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}
```
next prev parent reply other threads:[~2020-12-14 3:20 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 ` sgn [this message]
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
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=20201214032017.IRj5dBMz1HYmnimqMNxtIIeJyTZCmpSAJmTG4zHMBs8@z \
--to=sgn@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).