Package: elan

I hope to update rust-pulldown-cmark to 0.13 soon. Elan needs
a small patch to build with the new version. I have written
the patch in such a way as to retain compatibility with the
old version.

diff -Nru elan-4.1.2/debian/changelog elan-4.1.2/debian/changelog
--- elan-4.1.2/debian/changelog 2025-09-19 06:43:02.000000000 +0000
+++ elan-4.1.2/debian/changelog 2025-09-23 11:28:16.000000000 +0000
@@ -1,3 +1,11 @@
+elan (4.1.2-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Update pulldown-cmark patch to support newer versions without
+    breaking support for older ones.
+
+ -- Peter Michael Green <[email protected]>  Tue, 23 Sep 2025 11:28:16 +0000
+
 elan (4.1.2-2) unstable; urgency=medium
 
   [ Peter Michael Green ]
diff -Nru elan-4.1.2/debian/patches/pulldown-cmark.patch 
elan-4.1.2/debian/patches/pulldown-cmark.patch
--- elan-4.1.2/debian/patches/pulldown-cmark.patch      2025-09-19 
06:22:39.000000000 +0000
+++ elan-4.1.2/debian/patches/pulldown-cmark.patch      2025-09-23 
11:28:16.000000000 +0000
@@ -5,23 +5,50 @@
 Forwarded: not-needed
 Last-Update: 2025-09-19
 ---
---- a/src/elan-cli/term2.rs
-+++ b/src/elan-cli/term2.rs
-@@ -174,7 +174,7 @@
+Index: elan-4.1.2/src/elan-cli/term2.rs
+===================================================================
+--- elan-4.1.2.orig/src/elan-cli/term2.rs
++++ elan-4.1.2/src/elan-cli/term2.rs
+@@ -174,7 +174,6 @@ impl<'a, T: Instantiable + Isatty + io::
              Tag::TableHead => {}
              Tag::TableRow => {}
              Tag::TableCell => {}
 -            Tag::BlockQuote(_) => {}
-+            Tag::BlockQuote => {}
              Tag::CodeBlock(_) | Tag::HtmlBlock { .. } => {
                  self.wrapper.write_line();
                  self.wrapper.indent += 2;
-@@ -262,8 +262,6 @@
+@@ -196,6 +195,7 @@ impl<'a, T: Instantiable + Isatty + io::
+             Tag::Link { .. } => {}
+             Tag::Image { .. } => {}
+             Tag::FootnoteDefinition(_name) => {}
++            _ => {}
+         }
+     }
+ 
+@@ -212,7 +212,6 @@ impl<'a, T: Instantiable + Isatty + io::
+             TagEnd::TableHead => {}
+             TagEnd::TableRow => {}
+             TagEnd::TableCell => {}
+-            TagEnd::BlockQuote => {}
+             TagEnd::CodeBlock | TagEnd::HtmlBlock => {
+                 self.wrapper.write_line();
+                 self.wrapper.indent -= 2;
+@@ -234,6 +233,7 @@ impl<'a, T: Instantiable + Isatty + io::
+             TagEnd::Image { .. } => {} // shouldn't happen, handled in start
+             TagEnd::FootnoteDefinition => {}
+             TagEnd::MetadataBlock(_) => {}
++            _ => {}
+         }
+     }
+ 
+@@ -261,9 +261,7 @@ impl<'a, T: Instantiable + Isatty + io::
+             FootnoteReference(_name) => {}
              TaskListMarker(true) => {}
              TaskListMarker(false) => {}
-             InlineHtml(_) => {}
+-            InlineHtml(_) => {}
 -            InlineMath(_) => {}
 -            DisplayMath(_) => {}
++            _ => {}
          }
      }
  }

Reply via email to