From 2b782ce459d1fc0a1032a12bd5db76b76a67b06a Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@mozilla.com>
Date: Sun, 23 Dec 2018 10:17:38 +0100
Subject: [PATCH]  fix the deps

---
 .../debian/patches/fix-deps-env-logger.diff   | 26 +++++++++++++++
 src/exa/debian/patches/fix-deps-groups.diff   | 32 +++++++++++++++++++
 src/exa/debian/patches/relax-deps.diff        |  2 +-
 src/exa/debian/patches/series                 |  3 ++
 4 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 src/exa/debian/patches/fix-deps-env-logger.diff
 create mode 100644 src/exa/debian/patches/fix-deps-groups.diff

diff --git a/src/exa/debian/patches/fix-deps-env-logger.diff b/src/exa/debian/patches/fix-deps-env-logger.diff
new file mode 100644
index 000000000..22498a32d
--- /dev/null
+++ b/src/exa/debian/patches/fix-deps-env-logger.diff
@@ -0,0 +1,26 @@
+Index: exa/src/bin/main.rs
+===================================================================
+--- exa.orig/src/bin/main.rs
++++ exa/src/bin/main.rs
+@@ -58,17 +58,15 @@ pub fn configure_logger() {
+         None         => false,
+     };
+ 
+-    let mut logs = env_logger::LogBuilder::new();
++    let mut logs = env_logger::Builder::new();
+     if present {
+-        logs.filter(None, log::LogLevelFilter::Debug);
++        logs.filter(None, log::LevelFilter::Debug);
+     }
+     else {
+-        logs.filter(None, log::LogLevelFilter::Off);
++        logs.filter(None, log::LevelFilter::Off);
+     }
+ 
+-    if let Err(e) = logs.init() {
+-        writeln!(stderr(), "Failed to initialise logger: {}", e).unwrap();
+-    }
++    logs.init()
+ }
+ 
+ 
diff --git a/src/exa/debian/patches/fix-deps-groups.diff b/src/exa/debian/patches/fix-deps-groups.diff
new file mode 100644
index 000000000..4ebafbafe
--- /dev/null
+++ b/src/exa/debian/patches/fix-deps-groups.diff
@@ -0,0 +1,32 @@
+Index: exa/src/output/render/groups.rs
+===================================================================
+--- exa.orig/src/output/render/groups.rs
++++ exa/src/output/render/groups.rs
+@@ -19,12 +19,12 @@ impl f::Group {
+         let current_uid = users.get_current_uid();
+         if let Some(current_user) = users.get_user_by_uid(current_uid) {
+             if current_user.primary_group_id() == group.gid()
+-            || group.members().contains(&current_user.name().to_owned()) {
++                || group.members().iter().any(|u| u == current_user.name()) {
+                 style = colours.yours();
+             }
+         }
+ 
+-        TextCell::paint(style, group.name().to_owned())
++        TextCell::paint(style, group.name().to_string_lossy().into())
+     }
+ }
+ 
+Index: exa/src/output/render/users.rs
+===================================================================
+--- exa.orig/src/output/render/users.rs
++++ exa/src/output/render/users.rs
+@@ -9,7 +9,7 @@ use output::cell::TextCell;
+ impl f::User {
+     pub fn render<C: Colours, U: Users>(&self, colours: &C, users: &U) -> TextCell {
+         let user_name = match users.get_user_by_uid(self.0) {
+-            Some(user)  => user.name().to_owned(),
++            Some(user)  => user.name().to_string_lossy().into(),
+             None        => self.0.to_string(),
+         };
+ 
diff --git a/src/exa/debian/patches/relax-deps.diff b/src/exa/debian/patches/relax-deps.diff
index 08c9a73f9..84129fc01 100644
--- a/src/exa/debian/patches/relax-deps.diff
+++ b/src/exa/debian/patches/relax-deps.diff
@@ -14,7 +14,7 @@ Index: exa/Cargo.toml
  
  [dependencies.env_logger]
 -version = "0.3"
-+version = "0.5"
++version = "0.6"
  
  [dependencies.getopts]
  version = "0.2.14"
diff --git a/src/exa/debian/patches/series b/src/exa/debian/patches/series
index fa7eaac47..d23994ec4 100644
--- a/src/exa/debian/patches/series
+++ b/src/exa/debian/patches/series
@@ -1 +1,4 @@
 relax-deps.diff
+0001-Upgrade-libgit2.patch
+fix-deps-groups.diff
+fix-deps-env-logger.diff
-- 
2.39.5