Skip to content

Commit

Permalink
lsd: rebuild with libgit2 1.8.1
Browse files Browse the repository at this point in the history
  • Loading branch information
podsvirov committed Jun 27, 2024
1 parent a19ecce commit bae9be5
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 3 deletions.
39 changes: 39 additions & 0 deletions mingw-w64-lsd/0001-lsd-1.1.2-update-git2.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
diff -Naur lsd-1.1.2.orig/Cargo.lock lsd-1.1.2/Cargo.lock
--- lsd-1.1.2.orig/Cargo.lock 2024-06-27 22:59:25.037591700 +0300
+++ lsd-1.1.2/Cargo.lock 2024-06-27 23:02:19.445220100 +0300
@@ -473,9 +473,9 @@

[[package]]
name = "git2"
-version = "0.18.2"
+version = "0.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b3ba52851e73b46a4c3df1d89343741112003f0f6f13beb0dfac9e457c3fdcd"
+checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724"
dependencies = [
"bitflags 2.4.2",
"libc",
@@ -657,9 +657,9 @@

[[package]]
name = "libgit2-sys"
-version = "0.16.2+1.7.2"
+version = "0.17.0+1.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8"
+checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224"
dependencies = [
"cc",
"libc",
diff -Naur lsd-1.1.2.orig/Cargo.toml lsd-1.1.2/Cargo.toml
--- lsd-1.1.2.orig/Cargo.toml 2024-06-27 22:59:25.037591700 +0300
+++ lsd-1.1.2/Cargo.toml 2024-06-27 23:01:30.336965500 +0300
@@ -48,7 +48,7 @@

[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.18", optional = true, default-features = false }
+git2 = { version = "0.19", optional = true, default-features = false }

[target.'cfg(unix)'.dependencies]
users = { version = "0.11.3", package = "uzers" }
9 changes: 6 additions & 3 deletions mingw-w64-lsd/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ _realname=lsd
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
pkgver=1.1.2
pkgrel=2
pkgrel=3
pkgdesc="The next gen ls command (mingw-w64)"
arch=('any')
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
Expand All @@ -21,15 +21,18 @@ depends=("${MINGW_PACKAGE_PREFIX}-libgit2")
optdepends=("${MINGW_PACKAGE_PREFIX}-ttf-font-nerd: popular collections such as Font Awesome & fonts such as Hack")
#'powerline-fonts: powerline symbols for terminals')
source=("https://github.com/lsd-rs/lsd/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
"https://github.com/lsd-rs/lsd/pull/1021.patch")
'https://github.com/lsd-rs/lsd/pull/1021.patch'
'0001-lsd-1.1.2-update-git2.patch')
sha256sums=('cd80dae9a8f6c4c2061f79084468ea6e04c372e932e3712a165119417960e14e'
'8af2e1dd0a1cf1a55118f1c93d0c7ad5312562faa2ba06af73d2ebd0e32795e7')
'8af2e1dd0a1cf1a55118f1c93d0c7ad5312562faa2ba06af73d2ebd0e32795e7'
'324f053a9a44feea88686f65d6e259a3b3a6f5ce8b7d4fea1a4e81b2f1b0f59c')

prepare() {
cd "${srcdir}/${_realname}-${pkgver}"

# https://github.com/lsd-rs/lsd/pull/1021
patch -Np1 -i "${srcdir}"/1021.patch
patch -Np1 -i "${srcdir}"/0001-lsd-1.1.2-update-git2.patch

cargo fetch --locked --target "$(rustc -vV | sed -n 's/host: //p')"
}
Expand Down

0 comments on commit bae9be5

Please sign in to comment.