[Git][haskell-team/DHG_packages][master] 3 commits: haskell-pandoc: Use Python 3 for Python filters (Closes: #1077793)

[Scott Talbert (@swt2c)]

Scott Talbert pushed to branch master at Debian Haskell Group / DHG_packages


Commits:
4fae7162 by Scott Talbert at 2024-09-06T21:45:15-04:00
haskell-pandoc: Use Python 3 for Python filters (Closes: #1077793)

- - - - -
b7f6e9b0 by Scott Talbert at 2024-09-06T21:54:42-04:00
haskell-pandoc: Fix memory leak when converting markdown files (Closes: #1078342)

- - - - -
e6c751c9 by Scott Talbert at 2024-09-06T22:05:35-04:00
haskell-pandoc (3.1.3-3) unstable; urgency=medium

- - - - -


4 changed files:

- p/haskell-pandoc/debian/changelog
- + p/haskell-pandoc/debian/patches/8764027cbba74762fd86b2c6a370abe7f580129a.patch
- p/haskell-pandoc/debian/patches/series
- + p/haskell-pandoc/debian/patches/use-python3.patch


Changes:

=====================================
p/haskell-pandoc/debian/changelog
=====================================
@@ -1,10 +1,14 @@
-haskell-pandoc (3.1.3-3) UNRELEASED; urgency=medium
+haskell-pandoc (3.1.3-3) unstable; urgency=medium
 
   [ zhangdandan <zhangdandan at loongson.cn> ]
   * Use extra --ghc-options and enable tests in d/rules on loong64 (Closes:
     #1071169)
 
- -- Gianfranco Costamagna <locutusofborg at debian.org>  Tue, 13 Aug 2024 14:26:30 +0200
+  [ Scott Talbert ]
+  * Use Python 3 for Python filters (Closes: #1077793)
+  * Fix memory leak when converting markdown files (Closes: #1078342)
+
+ -- Scott Talbert <swt at techie.net>  Fri, 06 Sep 2024 22:04:41 -0400
 
 haskell-pandoc (3.1.3-2) unstable; urgency=medium
 


=====================================
p/haskell-pandoc/debian/patches/8764027cbba74762fd86b2c6a370abe7f580129a.patch
=====================================
@@ -0,0 +1,28 @@
+From 8764027cbba74762fd86b2c6a370abe7f580129a Mon Sep 17 00:00:00 2001
+From: John MacFarlane <jgm at berkeley.edu>
+Date: Wed, 28 Jun 2023 18:35:40 -0700
+Subject: [PATCH] Markdown reader: add strictness annotations.
+
+This fixes the memory leak noted in #8762.
+Closes #8762.
+---
+ src/Text/Pandoc/Readers/Markdown.hs | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Text/Pandoc/Readers/Markdown.hs b/src/Text/Pandoc/Readers/Markdown.hs
+index 6038ecab19d0..0d124ae23fbd 100644
+--- a/src/Text/Pandoc/Readers/Markdown.hs
++++ b/src/Text/Pandoc/Readers/Markdown.hs
+@@ -1908,10 +1908,10 @@ regLink :: PandocMonad m
+         -> F Inlines
+         -> MarkdownParser m (F Inlines)
+ regLink constructor lab = try $ do
+-  (src, tit) <- source
++  (!src, !tit) <- source
+   rebase <- option False (True <$ guardEnabled Ext_rebase_relative_paths)
+   pos <- getPosition
+-  let src' = if rebase then rebasePath pos src else src
++  let !src' = if rebase then rebasePath pos src else src
+   attr <- option nullAttr $
+           guardEnabled Ext_link_attributes >> attributes
+   return $ constructor attr src' tit <$> lab


=====================================
p/haskell-pandoc/debian/patches/series
=====================================
@@ -9,3 +9,5 @@ undo-xml-light-internal-library
 8b523749aebb67f709fe7348b412f3e5e629ceb4.patch
 2001_templates_avoid_privacy_breach.patch
 2002_program_package_hint.patch
+use-python3.patch
+8764027cbba74762fd86b2c6a370abe7f580129a.patch


=====================================
p/haskell-pandoc/debian/patches/use-python3.patch
=====================================
@@ -0,0 +1,15 @@
+Description: Use Python 3 for filters
+Author: Scott Talbert <swt at techie.net>
+Forwarded: not-needed
+
+--- a/src/Text/Pandoc/Filter/JSON.hs
++++ b/src/Text/Pandoc/Filter/JSON.hs
+@@ -50,7 +50,7 @@ externalFilter fenv f args' d = liftIO $
+   let (f', args'') = if exists
+                         then case map toLower (takeExtension f) of
+                                   _      | isExecutable -> ("." </> f, args')
+-                                  ".py"  -> ("python", f:args')
++                                  ".py"  -> ("python3", f:args')
+                                   ".hs"  -> ("runhaskell", f:args')
+                                   ".pl"  -> ("perl", f:args')
+                                   ".rb"  -> ("ruby", f:args')



View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/1e8fac37107678649eccdd9213cb2ccf83b9e8c6...e6c751c90aecadfcd59d92a82e6460cdb464ccdc

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/compare/1e8fac37107678649eccdd9213cb2ccf83b9e8c6...e6c751c90aecadfcd59d92a82e6460cdb464ccdc
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20240907/4fc39457/attachment-0001.htm>