From: tranzystorek-io <tranzystorek-io@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] lsd: update to 1.0.0
Date: Wed, 30 Aug 2023 17:46:03 +0200 [thread overview]
Message-ID: <20230830154603.ne2l9rEGT5Xqegt-zFCyA3oYU201KXh3kRJWqHAhmmI@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-45821@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1249 bytes --]
There is an updated pull request by tranzystorek-io against master on the void-packages repository
https://github.com/tranzystorek-io/void-packages lsd
https://github.com/void-linux/void-packages/pull/45821
lsd: update to 1.0.0
<!-- 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/45821.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-lsd-45821.patch --]
[-- Type: text/x-diff, Size: 3029 bytes --]
From 2e52435af4fdbbe8910af90fece23e013c24548f Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 28 Aug 2023 09:48:41 +0200
Subject: [PATCH] lsd: update to 1.0.0
---
srcpkgs/lsd/patches/bump-git2.patch | 13 +++++++++++++
srcpkgs/lsd/template | 24 +++++++++++++-----------
2 files changed, 26 insertions(+), 11 deletions(-)
create mode 100644 srcpkgs/lsd/patches/bump-git2.patch
diff --git a/srcpkgs/lsd/patches/bump-git2.patch b/srcpkgs/lsd/patches/bump-git2.patch
new file mode 100644
index 0000000000000..54319caba11e9
--- /dev/null
+++ b/srcpkgs/lsd/patches/bump-git2.patch
@@ -0,0 +1,13 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 30fa892..460cf13 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -45,7 +45,7 @@ vsort = "0.1.0"
+
+ [target."cfg(not(all(windows, target_arch = \"x86\", target_env = \"gnu\")))".dependencies]
+ # if ssl feature is enabled compilation will fail on arm-unknown-linux-gnueabihf and i686-pc-windows-gnu
+-git2 = { version = "0.16", optional = true, default-features = false }
++git2 = { version = "0.17", optional = true, default-features = false }
+
+ [target.'cfg(unix)'.dependencies]
+ users = "0.11.*"
diff --git a/srcpkgs/lsd/template b/srcpkgs/lsd/template
index 94f30f6e85393..b07f510bff495 100644
--- a/srcpkgs/lsd/template
+++ b/srcpkgs/lsd/template
@@ -1,31 +1,33 @@
# Template file for 'lsd'
pkgname=lsd
-version=0.23.1
-revision=2
+version=1.0.0
+revision=1
build_style=cargo
+hostmakedepends="pkg-config"
+makedepends="libgit2-devel"
+checkdepends="git"
short_desc="Next gen ls command with lots of pretty colors and awesome icons"
maintainer="Marcin Puc <tranzystorek.io@protonmail.com>"
license="Apache-2.0"
-homepage="https://github.com/Peltoche/lsd"
+homepage="https://github.com/lsd-rs/lsd"
changelog="https://raw.githubusercontent.com/Peltoche/lsd/master/CHANGELOG.md"
-distfiles="https://github.com/Peltoche/lsd/archive/${version}.tar.gz"
-checksum=9698919689178cc095f39dcb6a8a41ce32d5a1283e6fe62755e9a861232c307d
+distfiles="https://github.com/lsd-rs/lsd/archive/refs/tags/v${version}.tar.gz"
+checksum=ab34e9c85bc77cfa42b43bfb54414200433a37419f3b1947d0e8cfbb4b7a6325
conflicts="disputils"
# The 'cannot_access_subdir_exit_status' fails on CI
# because the runner seems to allow setting the b dir in a/b/c to readonly (0400)
# and then navigating this structure recursively (like in `tree`)
-#
-# The other test needs to be skipped because it incorrectly intercepts the skip arguments
-# and fails the whole test (see https://github.com/Peltoche/lsd/pull/744)
if [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ]; then
- make_check_args="--
- --skip test_cannot_access_subdir_exit_status
- --skip test_symlink_arrow_from_args_none"
+ make_check_args="-- --skip test_cannot_access_subdir_exit_status"
fi
export SHELL_COMPLETIONS_DIR="${wrksrc}"
+post_patch() {
+ cargo update --package git2@0.16.1 --precise 0.17.2
+}
+
post_install() {
vcompletion lsd.bash bash
vcompletion lsd.fish fish
next prev parent reply other threads:[~2023-08-30 15:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-30 15:34 [PR PATCH] " tranzystorek-io
2023-08-30 15:46 ` tranzystorek-io [this message]
2023-08-30 19:02 ` [PR PATCH] [Updated] " tranzystorek-io
2023-08-31 0:55 ` [PR PATCH] [Merged]: " classabbyamp
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=20230830154603.ne2l9rEGT5Xqegt-zFCyA3oYU201KXh3kRJWqHAhmmI@z \
--to=tranzystorek-io@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).