[PR PATCH] alacritty: remove cargo lefotver

[PR PATCH] alacritty: remove cargo lefotver

[m3tav3rse]

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

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

https://github.com/m3tav3rse/void-packages alacritty
https://github.com/void-linux/void-packages/pull/20672

alacritty: remove cargo lefotver
Fixes #20668

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

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

From 8d734f91fe73eaec555e6f8ca1a6dca307351744 Mon Sep 17 00:00:00 2001
From: m3tav3rse <n6maa10816@tuta.io>
Date: Sun, 5 Apr 2020 17:24:25 +0200
Subject: [PATCH] alacritty: remove cargo lefotver

Fixes #20668
---
 srcpkgs/alacritty/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index 2efd08e9e22..740753bbd76 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,7 +1,7 @@
 # Template file for 'alacritty'
 pkgname=alacritty
 version=0.4.2
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config python3"
 makedepends="freetype-devel fontconfig-devel libxcb-devel"
@@ -16,7 +16,7 @@ checksum=8dda9d580b9ec793cfdb336b000b73b7e98b4eba91c23ee04ee72a1728754ab2
 
 do_install() {
 	cargo install --path ${pkgname} --target ${RUST_TARGET} --root="${DESTDIR}/usr" --locked
-	rm "${DESTDIR}"/usr/.crates.toml
+	rm "${DESTDIR}"/usr/.crates*
 }
 
 post_install() {

Re: alacritty: remove cargo lefotver

[jnbr]

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

New comment by jnbr on void-packages repository

https://github.com/void-linux/void-packages/pull/20672#issuecomment-609435945

Comment:
You could just drop the full `do_install`. It's a leftover and covered by the cargo build-style now.

Re: alacritty: remove cargo lefotver

[m3tav3rse]

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

New comment by m3tav3rse on void-packages repository

https://github.com/void-linux/void-packages/pull/20672#issuecomment-609436749

Comment:
Thanks, I didn't know that.

Re: alacritty: remove cargo lefotver

[m3tav3rse]

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

New comment by m3tav3rse on void-packages repository

https://github.com/void-linux/void-packages/pull/20672#issuecomment-609448471

Comment:
Hm, when I drop this custom do_install cargo fails beacause tarball Cargo.toml is virtual manifest and do_install fails.

Re: alacritty: remove cargo lefotver

[xtraeme]

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

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/20672#issuecomment-609448641

Comment:
Use post_install

Re: alacritty: remove cargo lefotver

[m3tav3rse]

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

New comment by m3tav3rse on void-packages repository

https://github.com/void-linux/void-packages/pull/20672#issuecomment-609449514

Comment:
> Use post_install

Why would I use it?
I think possible solution is to change build_wrksrc to alacritty since default do_install uses --path . and we need --path alacritty here.

Re: alacritty: remove cargo lefotver

[xtraeme]

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

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/20672#issuecomment-609449648

Comment:
Hmm do whatever your think is OK buddy

Re: alacritty: remove cargo lefotver

[m3tav3rse]

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

New comment by m3tav3rse on void-packages repository

https://github.com/void-linux/void-packages/pull/20672#issuecomment-609450047

Comment:
I mean I don't know what would I put in post_install which isn't what is in do_install right now.

Re: [PR PATCH] [Updated] alacritty: remove cargo lefotver

[m3tav3rse]

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

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

https://github.com/m3tav3rse/void-packages alacritty
https://github.com/void-linux/void-packages/pull/20672

alacritty: remove cargo lefotver
Fixes #20668

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

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

From 4d42a201c567469f54c9df9c661edf1cc1a44184 Mon Sep 17 00:00:00 2001
From: m3tav3rse <n6maa10816@tuta.io>
Date: Sun, 5 Apr 2020 17:24:25 +0200
Subject: [PATCH] alacritty: remove custom do_install

Fixes #20668
---
 srcpkgs/alacritty/template | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index 2efd08e9e22..6ca8161e1c8 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,8 +1,9 @@
 # Template file for 'alacritty'
 pkgname=alacritty
 version=0.4.2
-revision=1
+revision=2
 build_style=cargo
+build_wrksrc="${pkgname}"
 hostmakedepends="pkg-config python3"
 makedepends="freetype-devel fontconfig-devel libxcb-devel"
 depends="libXxf86vm ncurses alacritty-terminfo-${version}_${revision}"
@@ -14,20 +15,15 @@ changelog="https://raw.githubusercontent.com/jwilm/${pkgname}/v${version}/CHANGE
 distfiles="https://github.com/jwilm/${pkgname}/archive/v${version}.tar.gz"
 checksum=8dda9d580b9ec793cfdb336b000b73b7e98b4eba91c23ee04ee72a1728754ab2
 
-do_install() {
-	cargo install --path ${pkgname} --target ${RUST_TARGET} --root="${DESTDIR}/usr" --locked
-	rm "${DESTDIR}"/usr/.crates.toml
-}
-
 post_install() {
-	vinstall extra/linux/Alacritty.desktop 644 usr/share/applications
-	vinstall extra/logo/alacritty-term.svg 644 usr/share/pixmaps Alacritty.svg
-	vinstall extra/completions/alacritty.bash 644 usr/share/bash-completion/completions alacritty
-	vinstall extra/completions/_alacritty 644 usr/share/zsh/site-functions
-	vinstall extra/completions/alacritty.fish 644 usr/share/fish/vendor_completions.d
-	vinstall extra/alacritty.info 644 usr/share/terminfo/a
-	vman extra/alacritty.man alacritty.1
-	vsconf alacritty.yml
+	vinstall ../extra/linux/Alacritty.desktop 644 usr/share/applications
+	vinstall ../extra/logo/alacritty-term.svg 644 usr/share/pixmaps Alacritty.svg
+	vinstall ../extra/completions/alacritty.bash 644 usr/share/bash-completion/completions alacritty
+	vinstall ../extra/completions/_alacritty 644 usr/share/zsh/site-functions
+	vinstall ../extra/completions/alacritty.fish 644 usr/share/fish/vendor_completions.d
+	vinstall ../extra/alacritty.info 644 usr/share/terminfo/a
+	vman ../extra/alacritty.man alacritty.1
+	vsconf ../alacritty.yml
 }
 
 alacritty-terminfo_package() {

Re: alacritty: remove cargo lefotver

[jnbr]

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

New comment by jnbr on void-packages repository

https://github.com/void-linux/void-packages/pull/20672#issuecomment-609467111

Comment:
you could use `make_install_args` to set the path, but this works as well

Re: [PR PATCH] [Updated] alacritty: remove cargo lefotver

[m3tav3rse]

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

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

https://github.com/m3tav3rse/void-packages alacritty
https://github.com/void-linux/void-packages/pull/20672

alacritty: remove cargo lefotver
Fixes #20668

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

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

From 5125d6b6f6707d62e66025a1d0d735bc971ce434 Mon Sep 17 00:00:00 2001
From: m3tav3rse <n6maa10816@tuta.io>
Date: Sun, 5 Apr 2020 17:24:25 +0200
Subject: [PATCH] alacritty: remove custom do_install

Fixes #20668
---
 srcpkgs/alacritty/template | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/alacritty/template b/srcpkgs/alacritty/template
index 2efd08e9e22..65fb5690219 100644
--- a/srcpkgs/alacritty/template
+++ b/srcpkgs/alacritty/template
@@ -1,7 +1,8 @@
 # Template file for 'alacritty'
 pkgname=alacritty
 version=0.4.2
-revision=1
+revision=2
+build_wrksrc="${pkgname}"
 build_style=cargo
 hostmakedepends="pkg-config python3"
 makedepends="freetype-devel fontconfig-devel libxcb-devel"
@@ -14,20 +15,15 @@ changelog="https://raw.githubusercontent.com/jwilm/${pkgname}/v${version}/CHANGE
 distfiles="https://github.com/jwilm/${pkgname}/archive/v${version}.tar.gz"
 checksum=8dda9d580b9ec793cfdb336b000b73b7e98b4eba91c23ee04ee72a1728754ab2
 
-do_install() {
-	cargo install --path ${pkgname} --target ${RUST_TARGET} --root="${DESTDIR}/usr" --locked
-	rm "${DESTDIR}"/usr/.crates.toml
-}
-
 post_install() {
-	vinstall extra/linux/Alacritty.desktop 644 usr/share/applications
-	vinstall extra/logo/alacritty-term.svg 644 usr/share/pixmaps Alacritty.svg
-	vinstall extra/completions/alacritty.bash 644 usr/share/bash-completion/completions alacritty
-	vinstall extra/completions/_alacritty 644 usr/share/zsh/site-functions
-	vinstall extra/completions/alacritty.fish 644 usr/share/fish/vendor_completions.d
-	vinstall extra/alacritty.info 644 usr/share/terminfo/a
-	vman extra/alacritty.man alacritty.1
-	vsconf alacritty.yml
+	vinstall ../extra/linux/Alacritty.desktop 644 usr/share/applications
+	vinstall ../extra/logo/alacritty-term.svg 644 usr/share/pixmaps Alacritty.svg
+	vinstall ../extra/completions/alacritty.bash 644 usr/share/bash-completion/completions alacritty
+	vinstall ../extra/completions/_alacritty 644 usr/share/zsh/site-functions
+	vinstall ../extra/completions/alacritty.fish 644 usr/share/fish/vendor_completions.d
+	vinstall ../extra/alacritty.info 644 usr/share/terminfo/a
+	vman ../extra/alacritty.man alacritty.1
+	vsconf ../alacritty.yml
 }
 
 alacritty-terminfo_package() {

Re: alacritty: remove cargo lefotver

[m3tav3rse]

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

New comment by m3tav3rse on void-packages repository

https://github.com/void-linux/void-packages/pull/20672#issuecomment-609497944

Comment:
> you could use `make_install_args` to set the path, but this works as well

I tried this approach but cargo doesn't accept multiple `--path` arguments.
`error: The argument '--path <PATH>' was provided more than once, but cannot be used multiple times`

Re: [PR PATCH] [Merged]: alacritty: remove cargo lefotver

[xtraeme]

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

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

alacritty: remove cargo lefotver
https://github.com/void-linux/void-packages/pull/20672

Description:
Fixes #20668

Re: alacritty: remove cargo lefotver

[travankor]

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

New comment by travankor on void-packages repository

https://github.com/void-linux/void-packages/pull/20672#issuecomment-609628931

Comment:
@m3tav3rse does this fix the make_install_args issue?

Re: alacritty: remove cargo lefotver

[travankor]

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

New comment by travankor on void-packages repository

https://github.com/void-linux/void-packages/pull/20672#issuecomment-609628931

Comment:
@m3tav3rse does [this](https://github.com/void-linux/void-packages/pull/20691) fix the make_install_args issue?

Re: alacritty: remove cargo lefotver

[m3tav3rse]

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

New comment by m3tav3rse on void-packages repository

https://github.com/void-linux/void-packages/pull/20672#issuecomment-609655574

Comment:
@travankor yes, it does.

Re: alacritty: remove cargo lefotver

[m3tav3rse]

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

New comment by m3tav3rse on void-packages repository

https://github.com/void-linux/void-packages/pull/20672#issuecomment-609655574

Comment:
@travankor yes, it does, however it is deprecated.
`warning: Using cargo install to install the binaries for the package in current working directory is deprecated, use cargo install --path . instead. Use cargo build if you want to simply build the package.`

Re: alacritty: remove cargo lefotver

[travankor]

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

New comment by travankor on void-packages repository

https://github.com/void-linux/void-packages/pull/20672#issuecomment-609686716

Comment:
Sorry, but what is deprecated? You're using --path alacritty? `cargo install --path .` was the broken option.

Re: alacritty: remove cargo lefotver

[m3tav3rse]

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

New comment by m3tav3rse on void-packages repository

https://github.com/void-linux/void-packages/pull/20672#issuecomment-609689805

Comment:
My bad, output I posted above is from `cargo install` without path argument.