[PR PATCH] nextcloud-client: fix kwallet desktop file

[PR PATCH] nextcloud-client: fix kwallet desktop file

[menaechmi]

[-- 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
 	}
 }

Re: [PR REVIEW] nextcloud-client: fix kwallet desktop file

[paper42]

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

New review comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/42051#discussion_r1096663030

Comment:
please move this logic to do_install and just vmove the files here in pkg_install 

Re: [PR REVIEW] nextcloud-client: fix kwallet desktop file

[sgn]

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/42051#discussion_r1096864264

Comment:
And it should be `vinstall` not `vcopy`.

Re: [PR PATCH] [Updated] nextcloud-client: fix kwallet desktop file

[menaechmi]

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

There is an updated 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: 2039 bytes --]

From 50b3e02676b6fc30c63470a9b257857e76f0cfd6 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 | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index 34cb388eb628..b72ff2aee3dd 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"
@@ -53,19 +53,23 @@ if [ "$XBPS_CHECK_PKGS" ]; then
 	esac
 fi
 
+do_install() {
+	vmkdir usr/share/applications
+	vcopy build/src/gui/com.nextcloud.desktopclient.nextcloud.desktop \
+	   ${DESTDIR}/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
+}
+
 nextcloud-client-kwallet_package() {
 	short_desc+=" - kwallet credential backend"
 	depends="nextcloud-client>=${version}_${revision} kwallet"
 	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
-		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
+		vmove usr/share/applications/nextcloud-kwallet.desktop
 		vdoc ${FILESDIR}/kwallet/README.voidlinux
 	}
 }

Re: [PR REVIEW] nextcloud-client: fix kwallet desktop file

[menaechmi]

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

New review comment by menaechmi on void-packages repository

https://github.com/void-linux/void-packages/pull/42051#discussion_r1096925220

Comment:
> And it should be `vinstall` not `vcopy`.

It cannot be a vinstall as the new nextcloud-kwallet.desktop file doesn't exist until this point, because the kwallet is a void-made wrapper not something from upsteam (see #26774). The do_install should be a little neater for this, but let me know if you'd like another solution.

Re: [PR PATCH] [Updated] nextcloud-client: fix kwallet desktop file

[sgn]

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

There is an updated pull request by sgn 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: 2511 bytes --]

From 80fa24a5f746fcd5ea28c4e5f0fb74d772a17293 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 | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index 34cb388eb628..c00fa79351ad 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,10 +1,10 @@
 # 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"
+hostmakedepends="pkg-config inkscape qt5-qmake qt5-host-tools qt5-tools"
 makedepends="qt5-tools-devel qt5-declarative-devel qt5-webchannel-devel
  qt5-location-devel qtkeychain-qt5-devel sqlite-devel libcloudproviders-devel
  qt5-quickcontrols2-devel qt5-websockets-devel qt5-svg-devel
@@ -35,7 +35,6 @@ if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
 fi
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools"
 	# provides desktoptojson
 	hostmakedepends+=" $(vopt_if dolphin 'kcoreaddons')"
 fi
@@ -53,19 +52,22 @@ if [ "$XBPS_CHECK_PKGS" ]; then
 	esac
 fi
 
+post_install() {
+	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' \
+	     build/src/gui/com.nextcloud.desktopclient.nextcloud.desktop
+	vinstall build/src/gui/com.nextcloud.desktopclient.nextcloud.desktop \
+		644 usr/share/applications/
+}
+
 nextcloud-client-kwallet_package() {
 	short_desc+=" - kwallet credential backend"
 	depends="nextcloud-client>=${version}_${revision} kwallet"
 	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
-		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
+		vmove usr/share/applications/nextcloud-kwallet.desktop
 		vdoc ${FILESDIR}/kwallet/README.voidlinux
 	}
 }

Re: [PR REVIEW] nextcloud-client: fix kwallet desktop file

[sgn]

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/42051#discussion_r1096932653

Comment:
It can!

Re: [PR REVIEW] nextcloud-client: fix kwallet desktop file

[sgn]

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

New review comment by sgn on void-packages repository

https://github.com/void-linux/void-packages/pull/42051#discussion_r1096932653

Comment:
It can! See the change was just made.

Re: [PR PATCH] [Updated] nextcloud-client: fix kwallet desktop file

[sgn]

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

There is an updated pull request by sgn 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: 2543 bytes --]

From a9c3f521866ef3980a117411d25c68b295a509a0 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 | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/nextcloud-client/template b/srcpkgs/nextcloud-client/template
index 34cb388eb628..aed9773df1e6 100644
--- a/srcpkgs/nextcloud-client/template
+++ b/srcpkgs/nextcloud-client/template
@@ -1,10 +1,10 @@
 # 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"
+hostmakedepends="pkg-config inkscape qt5-qmake qt5-host-tools qt5-tools"
 makedepends="qt5-tools-devel qt5-declarative-devel qt5-webchannel-devel
  qt5-location-devel qtkeychain-qt5-devel sqlite-devel libcloudproviders-devel
  qt5-quickcontrols2-devel qt5-websockets-devel qt5-svg-devel
@@ -35,7 +35,6 @@ if [ "$XBPS_TARGET_ENDIAN" = "le" ]; then
 fi
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" qt5-qmake qt5-host-tools qt5-tools"
 	# provides desktoptojson
 	hostmakedepends+=" $(vopt_if dolphin 'kcoreaddons')"
 fi
@@ -53,19 +52,23 @@ if [ "$XBPS_CHECK_PKGS" ]; then
 	esac
 fi
 
+post_install() {
+	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' \
+	     build/src/gui/com.nextcloud.desktopclient.nextcloud.desktop
+	vinstall build/src/gui/com.nextcloud.desktopclient.nextcloud.desktop \
+		644 usr/share/applications/ \
+		nextcloud-kwallet.desktop
+}
+
 nextcloud-client-kwallet_package() {
 	short_desc+=" - kwallet credential backend"
 	depends="nextcloud-client>=${version}_${revision} kwallet"
 	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
-		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
+		vmove usr/share/applications/nextcloud-kwallet.desktop
 		vdoc ${FILESDIR}/kwallet/README.voidlinux
 	}
 }

Re: nextcloud-client: fix kwallet desktop file

[github-actions]

[-- 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/42051#issuecomment-1537627678

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.

Re: [PR PATCH] [Closed]: nextcloud-client: fix kwallet desktop file

[github-actions]

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

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

nextcloud-client: fix kwallet desktop file
https://github.com/void-linux/void-packages/pull/42051

Description:
<!-- 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