diffstat for starship-1.22.1 starship-1.22.1

 changelog                                  |    7 +++++
 patches/disable-gix-features-zlib-ng.patch |    9 -------
 patches/newer-gix.patch                    |   37 +++++++++++++++++++++++++++++
 patches/series                             |    2 -
 4 files changed, 45 insertions(+), 10 deletions(-)

diff -Nru starship-1.22.1/debian/changelog starship-1.22.1/debian/changelog
--- starship-1.22.1/debian/changelog	2026-01-12 01:51:26.000000000 +0200
+++ starship-1.22.1/debian/changelog	2026-04-03 16:52:04.000000000 +0300
@@ -1,3 +1,10 @@
+starship (1.22.1-8.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Patch for newer gix. (Closes: #1129915)
+
+ -- Adrian Bunk <bunk@debian.org>  Fri, 03 Apr 2026 16:52:04 +0300
+
 starship (1.22.1-8) unstable; urgency=medium
 
   * Team upload
diff -Nru starship-1.22.1/debian/patches/disable-gix-features-zlib-ng.patch starship-1.22.1/debian/patches/disable-gix-features-zlib-ng.patch
--- starship-1.22.1/debian/patches/disable-gix-features-zlib-ng.patch	2025-08-19 12:07:50.000000000 +0300
+++ starship-1.22.1/debian/patches/disable-gix-features-zlib-ng.patch	1970-01-01 02:00:00.000000000 +0200
@@ -1,9 +0,0 @@
-Description: Disable zlib-ng feature of gix-features disabled in Debian
- essentially making gix-max-perf an alias for gix-faster.
-Forwarded: not-needed
-Last-Update: 2024-10-13
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -39 +39 @@
--gix-max-perf = ["gix-features/zlib-ng", "gix/fast-sha1"]
-+gix-max-perf = ["gix-faster"] # ["gix-features/zlib-ng", "gix/fast-sha1"]
diff -Nru starship-1.22.1/debian/patches/newer-gix.patch starship-1.22.1/debian/patches/newer-gix.patch
--- starship-1.22.1/debian/patches/newer-gix.patch	1970-01-01 02:00:00.000000000 +0200
+++ starship-1.22.1/debian/patches/newer-gix.patch	2026-04-03 16:52:04.000000000 +0300
@@ -0,0 +1,37 @@
+Description: Patch for newer gix
+Author: Adrian Bunk <bunk@debian.org>
+Bug-Debian: https://bugs.debian.org/1129915
+
+--- starship-1.22.1.orig/Cargo.toml
++++ starship-1.22.1/Cargo.toml
+@@ -29,18 +29,11 @@ The minimal, blazing-fast, and infinitel
+ """
+ 
+ [features]
+-default = ["battery", "notify", "gix-max-perf"]
++default = ["battery", "notify"]
+ battery = ["starship-battery"]
+ config-schema = ["schemars"]
+ notify = ["notify-rust"]
+ 
+-# Enables most of the `max-performance` features of the `gix` module for better performance.
+-# This can be more difficult to build in some conditions and requires cmake.
+-gix-max-perf = ["gix-features/zlib-ng", "gix/fast-sha1"]
+-# Slower than `git-repository-max-perf`, but better than the default.
+-# Unlike `git-repository-max-perf` this does not require cmake and allows dynamic zlib linking.
+-gix-faster = ["gix-features/zlib-stock", "gix/fast-sha1"]
+-
+ [dependencies]
+ chrono = { version = "0.4.39", default-features = false, features = ["clock", "std", "wasmbind"] }
+ clap = { version = "4.5", features = ["derive", "cargo", "unicode"] }
+@@ -48,8 +41,8 @@ clap_complete = "4.5.40"
+ dirs = "6.0.0"
+ dunce = "1.0.5"
+ # default feature restriction addresses https://github.com/starship/starship/issues/4251
+-gix = { version = "0.69.1", default-features = false, features = ["max-performance-safe", "revision"] }
+-gix-features = { version = "0.39.1", optional = true }
++gix = { version = ">= 0.69.1", default-features = false, features = ["max-performance-safe", "revision"] }
++gix-features = { version = ">= 0.39.1", optional = true }
+ indexmap = { version = "2.7.0", features = ["serde"] }
+ log = { version = "0.4.24", features = ["std"] }
+ # notify-rust is optional (on by default) because the crate doesn't currently build for darwin with nix
diff -Nru starship-1.22.1/debian/patches/series starship-1.22.1/debian/patches/series
--- starship-1.22.1/debian/patches/series	2026-01-12 01:43:16.000000000 +0200
+++ starship-1.22.1/debian/patches/series	2026-04-03 16:52:04.000000000 +0300
@@ -1,6 +1,6 @@
 relax-deps.patch
-disable-gix-features-zlib-ng.patch
 disable-windows.patch
 inline-guess_host_triple.patch
 turn-off-strip.patch
 quick-xml-0.38.patch
+newer-gix.patch
