clap - eliminate dev-dependency on unic-emoji-char

diff --git a/src/clap/debian/changelog b/src/clap/debian/changelog
index 676ed47e9f4ba5119896e5c5e98d184c011e316f..d94de0bab52170ffe651377ecad983facd9bad69 100644 (file)
--- a/src/clap/debian/changelog
+++ b/src/clap/debian/changelog
@@ -10,6 +10,8 @@ rust-clap (4.0.29-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
     is no longer an issue.
   * Update remaining patches for new upstream.
   * Revert upstream switch from atty to is_terminal.
+  * Remove dev-dependency on unic-emoji-char and disable the test that depends
+    on it so the rest of the tests can run.
 
  -- Peter Michael Green <plugwash@debian.org>  Tue, 13 Dec 2022 14:23:36 +0000
 

diff --git a/src/clap/debian/patches/disable-unic-emoji-char.patch b/src/clap/debian/patches/disable-unic-emoji-char.patch
new file mode 100644 (file)
index 0000000..97aa25a
--- /dev/null
+++ b/src/clap/debian/patches/disable-unic-emoji-char.patch
@@ -0,0 +1,36 @@
+Index: clap/Cargo.toml
+===================================================================
+--- clap.orig/Cargo.toml
++++ clap/Cargo.toml
+@@ -408,9 +408,6 @@ version = "1.1.0"
+ [dev-dependencies.trybuild]
+ version = "1.0.71"
+ 
+-[dev-dependencies.unic-emoji-char]
+-version = "0.9.0"
+-
+ [features]
+ cargo = ["dep:once_cell"]
+ color = [
+Index: clap/src/output/textwrap/core.rs
+===================================================================
+--- clap.orig/src/output/textwrap/core.rs
++++ clap/src/output/textwrap/core.rs
+@@ -90,7 +90,7 @@ mod tests {
+     #[cfg(feature = "unicode")]
+     use unicode_width::UnicodeWidthChar;
+ 
+-    #[test]
++    /*#[test]
+     fn emojis_have_correct_width() {
+         use unic_emoji_char::is_emoji;
+ 
+@@ -129,7 +129,7 @@ mod tests {
+ 
+         // The remaining planes contain almost no assigned code points
+         // and thus also no emojis.
+-    }
++    }*/
+ 
+     #[test]
+     #[cfg(feature = "unicode")]

diff --git a/src/clap/debian/patches/series b/src/clap/debian/patches/series
index 5d9a63096048d30ab8d312f0db3ffdd4e63d68dd..137658685ee09e4d06028f264edc80da14d1cbe5 100644 (file)
--- a/src/clap/debian/patches/series
+++ b/src/clap/debian/patches/series
@@ -3,3 +3,4 @@ disable-unstable-doc.patch
 disable-unstable-v5.patch
 disable-snapbox.patch
 revert-switch-to-is-terminal.patch
+disable-unic-emoji-char.patch