Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: starship #995

Merged
merged 10 commits into from
Mar 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions anda/langs/rust/starship/0001-gix-0.61.1-0.61.0.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From b62e3879abe83e0b879421a023d8e944e31f00cb Mon Sep 17 00:00:00 2001
From: madomado <[email protected]>
Date: Mon, 25 Mar 2024 18:33:25 +0800
Subject: [PATCH] gix 0.61.1 -> 0.61.0

---
Cargo.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index d98ba90..c3059c9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -82,7 +82,7 @@ version = "1.0.4"
version = "0.4.3"

[dependencies.gix]
-version = "0.61.1"
+version = "0.61.0"
features = [
"max-performance-safe",
"revision",
--
2.44.0

22 changes: 12 additions & 10 deletions anda/langs/rust/starship/rust-starship.spec
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
%global debug_package %{nil}
# Generated by rust2rpm 24
%bcond_without check
# Generated by rust2rpm 26
#bcond_without check

%global crate starship

Name: rust-starship
Version: 1.18.1
Release: 1%?dist
Release: %autorelease
Summary: Minimal, blazing-fast, and infinitely customizable prompt for any shell! ☄🌌️

License: ISC
URL: https://crates.io/crates/starship
Source: %{crates_source}
# Automatically generated patch to strip foreign dependencies
Patch: starship-fix-metadata-auto.diff
# Automatically generated patch to strip dependencies and normalize metadata
Patch0: starship-fix-metadata-auto.diff
Patch1: 0001-gix-0.61.1-0.61.0.patch

BuildRequires: rust-packaging >= 21
BuildRequires: cargo-rpm-macros >= 24
BuildRequires: anda-srpm-macros
BuildRequires: cmake
BuildRequires: pkgconfig
Expand All @@ -29,11 +29,13 @@ shell! ☄🌌️.}

%package -n %{crate}
Summary: %{summary}
License: ISC

%description -n %{crate} %{_description}

%files -n %{crate}
%license LICENSE
#license LICENSE.dependencies
%doc README.md
%{_bindir}/starship

Expand Down Expand Up @@ -170,14 +172,14 @@ use the "starship-battery" feature of the "%{crate}" crate.
%ghost %{crate_instdir}/Cargo.toml

%prep
%autosetup -n %{crate}-%{version_no_tilde} -p1
%autosetup -n %{crate}-%{version} -p1
%cargo_prep_online

%build
%cargo_build
%{cargo_build}

%install
%cargo_install
%{cargo_install}

%if %{with check}
%check
Expand Down
8 changes: 4 additions & 4 deletions anda/langs/rust/starship/starship-fix-metadata-auto.diff
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
--- starship-1.14.2/Cargo.toml 1970-01-01T00:00:01+00:00
+++ starship-1.14.2/Cargo.toml 2023-04-25T12:48:23.509565+00:00
@@ -254,18 +254,3 @@
--- starship-1.18.1/Cargo.toml 1970-01-01T00:00:01+00:00
+++ starship-1.18.1/Cargo.toml 2024-03-24T13:14:24.022475+00:00
@@ -263,18 +263,3 @@
]
default-features = false

-[target."cfg(windows)".dependencies.deelevate]
-version = "0.2.0"
-
-[target."cfg(windows)".dependencies.windows]
-version = "0.48.0"
-version = "0.54.0"
-features = [
- "Win32_Foundation",
- "Win32_UI_Shell",
Expand Down
Loading