From: menaechmi <menaechmi@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] nextcloud-client: fix kwallet desktop file
Date: Fri, 03 Feb 2023 04:09:34 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-42051@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1744 bytes --]
There is a new pull request by menaechmi against master on the void-packages repository
https://github.com/menaechmi/nextcloud-desktopfix nextcloud-desktopfix
https://github.com/void-linux/void-packages/pull/42051
nextcloud-client: fix kwallet desktop file
<!-- Uncomment relevant sections and delete options which are not applicable -->
nextcloud-client had a problem where installing nextcloud-client would also install the "Nextcloud Desktop - use kwallet" desktop file. But it wouldn't work because the executable it pointed to didn't exist. As far as I could tell, the issue was a `${DESTDIR}` instead of `${PKGDESTDIR}.` Also changed a `cp` to a `vcopy,` which seems preferred in the codebase.
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, x86_64 glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- armv7l (successful)
- x86_64 musl failed "unable to find argp.h" like in #39467 and upstream https://github.com/nextcloud/desktop/issues/3200
A patch file from https://github.com/void-linux/void-packages/pull/42051.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-nextcloud-desktopfix-42051.patch --]
[-- Type: text/x-diff, Size: 1542 bytes --]
From ec3879ad8e2eda2cb6ba9ca84bf162cfc484944d Mon Sep 17 00:00:00 2001
From: menaechmi <menaechmi@protonmail.com>
Date: Thu, 2 Feb 2023 18:36:06 -0600
Subject: [PATCH] nextcloud-client: fix kwallet desktop file
---
srcpkgs/nextcloud-client/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index 34cb388eb628..487dbba4f37e 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,7 +1,7 @@
# Template file for 'nextcloud-client'
pkgname=nextcloud-client
version=3.6.6
-revision=1
+revision=2
build_style=cmake
configure_args="-Wno-dev"
hostmakedepends="pkg-config inkscape"
@@ -59,13 +59,13 @@ nextcloud-client-kwallet_package() {
pkg_install() {
vbin ${FILESDIR}/kwallet/nextcloud.kwallet
vmkdir usr/share/applications
- cp build/src/gui/com.nextcloud.desktopclient.nextcloud.desktop \
- ${DESTDIR}/usr/share/applications/nextcloud-kwallet.desktop
+ vcopy build/src/gui/com.nextcloud.desktopclient.nextcloud.desktop \
+ usr/share/applications/nextcloud-kwallet.desktop
vsed -i -e 's,^Exec=.*,Exec=/usr/bin/nextcloud.kwallet,' \
-e 's,\(^Name=.*\),\1 - use kwallet,' \
-e 's,\(^Comment=.*\),\1 - use kwallet credential storage,' \
-e '/^# Translations/,$d' \
- ${DESTDIR}/usr/share/applications/nextcloud-kwallet.desktop
+ ${PKGDESTDIR}/usr/share/applications/nextcloud-kwallet.desktop
vdoc ${FILESDIR}/kwallet/README.voidlinux
}
}
next reply other threads:[~2023-02-03 3:09 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-03 3:09 menaechmi [this message]
2023-02-05 10:51 ` [PR REVIEW] " paper42
2023-02-06 1:21 ` sgn
2023-02-06 3:44 ` [PR PATCH] [Updated] " menaechmi
2023-02-06 4:04 ` [PR REVIEW] " menaechmi
2023-02-06 4:24 ` [PR PATCH] [Updated] " sgn
2023-02-06 4:25 ` [PR REVIEW] " sgn
2023-02-06 4:25 ` sgn
2023-02-06 12:21 ` [PR PATCH] [Updated] " sgn
2023-05-08 1:53 ` github-actions
2023-05-22 1:57 ` [PR PATCH] [Closed]: " 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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-42051@inbox.vuxu.org \
--to=menaechmi@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).