* [PR PATCH] eza: update to 0.18.20
@ 2024-06-27 12:44 tranzystorekk
2024-06-27 14:46 ` [PR PATCH] [Merged]: " cinerea0
0 siblings, 1 reply; 2+ messages in thread
From: tranzystorekk @ 2024-06-27 12:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1242 bytes --]
There is a new pull request by tranzystorekk against master on the void-packages repository
https://github.com/tranzystorekk/void-packages eza
https://github.com/void-linux/void-packages/pull/51023
eza: update to 0.18.20
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### 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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/51023.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-eza-51023.patch --]
[-- Type: text/x-diff, Size: 4094 bytes --]
From f3c4a52c6cb13effc0404fc5131667fb81d368d8 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 27 Jun 2024 14:43:47 +0200
Subject: [PATCH] eza: update to 0.18.20
---
srcpkgs/eza/patches/downgrade-git2.patch | 13 +++++++++
srcpkgs/eza/patches/fix-zsh-completions.patch | 27 +++++++++++++++++++
srcpkgs/eza/template | 12 ++++++---
3 files changed, 48 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/eza/patches/downgrade-git2.patch
create mode 100644 srcpkgs/eza/patches/fix-zsh-completions.patch
diff --git a/srcpkgs/eza/patches/downgrade-git2.patch b/srcpkgs/eza/patches/downgrade-git2.patch
new file mode 100644
index 00000000000000..68d2c5b3bde760
--- /dev/null
+++ b/srcpkgs/eza/patches/downgrade-git2.patch
@@ -0,0 +1,13 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index b76d5c3..5cb3123 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -94,7 +94,7 @@ rayon = "1.10.0"
+ ansi-width = "0.1.0"
+
+ [dependencies.git2]
+-version = "0.19"
++version = "0.18"
+ optional = true
+ default-features = false
+
diff --git a/srcpkgs/eza/patches/fix-zsh-completions.patch b/srcpkgs/eza/patches/fix-zsh-completions.patch
new file mode 100644
index 00000000000000..b52a81c616bed3
--- /dev/null
+++ b/srcpkgs/eza/patches/fix-zsh-completions.patch
@@ -0,0 +1,27 @@
+From 30d78ba5ce7fd2aabae174bcac106d6b202c6d31 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Martin=20Maty=C3=A1=C5=A1ek?= <martin.matyasek@gmail.com>
+Date: Thu, 27 Jun 2024 11:58:57 +0200
+Subject: [PATCH] fix(completions): fix missing line breaks in _eza
+
+Before this change the shell would report a parsing error, which was due
+to missing line breaks after the newly introduced symlinks flags. This
+commit fixes that issue.
+---
+ completions/zsh/_eza | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/completions/zsh/_eza b/completions/zsh/_eza
+index f672e0a59..67cf0284d 100644
+--- a/completions/zsh/_eza
++++ b/completions/zsh/_eza
+@@ -33,8 +33,8 @@ __eza() {
+ {-A,--almost-all}"[Equivalent to --all; included for compatibility with \'ls -A\']" \
+ {-d,--list-dirs}"[List directories like regular files]" \
+ {-D,--only-dirs}"[List only directories]" \
+- --no-symlinks"[Do not show symbolic links]"
+- --show-symlinks"[Explictly show symbolic links: for use with '--only-dirs'| '--only-files']"
++ --no-symlinks"[Do not show symbolic links]" \
++ --show-symlinks"[Explictly show symbolic links: for use with '--only-dirs'| '--only-files']" \
+ {-f,--only-files}"[List only files]" \
+ {-L,--level}"+[Limit the depth of recursion]" \
+ {-w,--width}"+[Limits column output of grid, 0 implies auto-width]" \
diff --git a/srcpkgs/eza/template b/srcpkgs/eza/template
index 5c848a5545a033..0a05ecf06947fd 100644
--- a/srcpkgs/eza/template
+++ b/srcpkgs/eza/template
@@ -1,6 +1,6 @@
# Template file for 'eza'
pkgname=eza
-version=0.18.18
+version=0.18.20
revision=1
build_style=cargo
hostmakedepends="pkg-config"
@@ -11,9 +11,9 @@ license="MIT"
homepage="https://eza.rocks"
changelog="https://raw.githubusercontent.com/eza-community/eza/main/CHANGELOG.md"
distfiles="https://github.com/eza-community/eza/archive/refs/tags/v${version}.tar.gz
-https://github.com/eza-community/eza/releases/download/v${version}/man-${version}.tar.gz"
-checksum="437ea76838fea2464b9592f1adef7df0412e27c9fc2a3e7ff47efcdfb17457f5
- 4ed46167bc31712fc25e46287743eec2870644feeb09241cd14a68b7d6527093"
+ https://github.com/eza-community/eza/releases/download/v${version}/man-${version}.tar.gz"
+checksum="f85a7c1a1859e4fb7913d9517bd5fd04714811562b631a71705077c5aceacd78
+ e376bfd7c8657cf9c8b0c1405543fed9142dd5222f1980b2c7e68309d163d23c"
skip_extraction="man-${version}.tar.gz"
@@ -21,6 +21,10 @@ post_extract() {
vsrcextract -C manpages --strip-components=3 man-${version}.tar.gz
}
+post_patch() {
+ cargo update --package git2@0.19.0 --precise 0.18.3
+}
+
post_install() {
vcompletion completions/bash/eza bash
vcompletion completions/fish/eza.fish fish
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: eza: update to 0.18.20
2024-06-27 12:44 [PR PATCH] eza: update to 0.18.20 tranzystorekk
@ 2024-06-27 14:46 ` cinerea0
0 siblings, 0 replies; 2+ messages in thread
From: cinerea0 @ 2024-06-27 14:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1083 bytes --]
There's a merged pull request on the void-packages repository
eza: update to 0.18.20
https://github.com/void-linux/void-packages/pull/51023
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### 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, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-06-27 14:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-06-27 12:44 [PR PATCH] eza: update to 0.18.20 tranzystorekk
2024-06-27 14:46 ` [PR PATCH] [Merged]: " cinerea0
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).