From 940fea290e9d7c581557a644b3445e5cd56f6429 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= Date: Tue, 26 Mar 2024 17:13:55 -0300 Subject: [PATCH] pandoc: update to 3.1.11.1. --- srcpkgs/pandoc/patches/fix-musl-build.patch | 43 +++++++++++++++++++++ srcpkgs/pandoc/template | 42 +++++++------------- 2 files changed, 57 insertions(+), 28 deletions(-) create mode 100644 srcpkgs/pandoc/patches/fix-musl-build.patch diff --git a/srcpkgs/pandoc/patches/fix-musl-build.patch b/srcpkgs/pandoc/patches/fix-musl-build.patch new file mode 100644 index 00000000000000..79e439f0f65399 --- /dev/null +++ b/srcpkgs/pandoc/patches/fix-musl-build.patch @@ -0,0 +1,43 @@ +# See https://github.com/lierdakil/pandoc-crossref/issues/342#issuecomment-1073256586 + +--- a/pandoc-crossref-0.3.17.0/pandoc-crossref.cabal 2001-09-08 22:46:40.000000000 -0300 ++++ b/pandoc-crossref-0.3.17.0/pandoc-crossref.cabal 2024-03-26 17:16:02.918173738 -0300 +@@ -127,20 +127,6 @@ + library + exposed-modules: + Text.Pandoc.CrossRef +- hs-source-dirs: +- lib +- ghc-options: -Wall +- build-depends: +- base >=4.11 && <5 +- , mtl >=1.1 && <2.4 +- , pandoc >=3.1.8 && <3.2 +- , pandoc-crossref-internal +- , pandoc-types ==1.23.* +- , text >=1.2.2 && <2.1 +- default-language: Haskell2010 +- +-library pandoc-crossref-internal +- exposed-modules: + Text.Numeral.Roman + Text.Pandoc.CrossRef.References + Text.Pandoc.CrossRef.References.Blocks +@@ -165,7 +151,9 @@ + Text.Pandoc.CrossRef.Util.Template + Text.Pandoc.CrossRef.Util.Util + hs-source-dirs: ++ lib + lib-internal ++ ghc-options: -Wall + build-depends: + base >=4.11 && <5 + , containers >=0.1 && <0.7 +@@ -247,7 +235,6 @@ + , mtl >=1.1 && <2.4 + , pandoc >=3.1.8 && <3.2 + , pandoc-crossref +- , pandoc-crossref-internal + , pandoc-types ==1.23.* + , text >=1.2.2 && <2.1 + if flag(enable_flaky_tests) diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template index 2c3c74e3501eba..cbc10d274e1848 100644 --- a/srcpkgs/pandoc/template +++ b/srcpkgs/pandoc/template @@ -1,52 +1,38 @@ # Template file for 'pandoc' pkgname=pandoc # Keep in sync with http://www.stackage.org/lts -version=2.17.1.1 +version=3.1.11.1 revision=1 -_sidenote_version=0.22.1.0 -_monad_gen_version=0.3.0.1 -_crossref_version=0.3.12.2 -_roman_numerals_version=0.5.1.5 +_sidenote_version=0.23.0.0 +_crossref_version=0.3.17.0 create_wrksrc=yes build_style=haskell-stack -stackage="lts-19.0" +stackage="lts-22.13" make_build_args=" --flag pandoc:embed_data_files --flag=lua:pkg-config" hostmakedepends="pkg-config unzip wget" -makedepends="zlib-devel lua53-devel tar" +makedepends="zlib-devel lua54-devel tar" short_desc="Universal converter between markup formats" maintainer="Orphaned " license="GPL-2.0-or-later, BSD-3-Clause" homepage="http://johnmacfarlane.net/pandoc/" -distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz - https://hackage.haskell.org/package/${pkgname}-sidenote-${_sidenote_version}/${pkgname}-sidenote-${_sidenote_version}.tar.gz - https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz - https://hackage.haskell.org/package/${pkgname}-crossref-${_crossref_version}/${pkgname}-crossref-${_crossref_version}.tar.gz - https://hackage.haskell.org/package/roman-numerals-${_roman_numerals_version}/roman-numerals-${_roman_numerals_version}.tar.gz" -checksum="649ec528d1413130c5ce304b826ff473b3696269eea8834d908589e775bd1ad1 - c39dd7343b9cb4dc5b1c91c9e47c3d357874e9e1a30b8d377bbea0b1d50323b2 - be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465 - 94540325c9c98ae4d5199c634bf402ffa41e3c5b020d7207daef90fd9e224fb4 - b9c7195b69b1662a286d2c28a55fafdcb693c522ba5eb54a11b1d0a4e92eaa81" -subpackages=" - pandoc-sidenote - pandoc-crossref" +distfiles="https://hackage.haskell.org/package/pandoc-${version}/pandoc-${version}.tar.gz + https://hackage.haskell.org/package/pandoc-cli-${version}/pandoc-cli-${version}.tar.gz + https://hackage.haskell.org/package/pandoc-sidenote-${_sidenote_version}/pandoc-sidenote-${_sidenote_version}.tar.gz + https://hackage.haskell.org/package/pandoc-crossref-${_crossref_version}/pandoc-crossref-${_crossref_version}.tar.gz" +checksum="ef968d654000e5b21943573039fee92b132b547790fb1471f363abeb09dbcf79 + b7c8200012e22059410c70c1dab522eed151ca276c0a0d50c825c06df8d0c249 + 2722ca9cf7bed62658f669a3ec2026de0e0e80941b499a25e660adcf977eec2d + 8eb1fab686654cbbb7d2aa651d08b194a9634c3645df1d8d081a7e463db76f9a" nocross=yes nopie_files=" /usr/bin/pandoc /usr/bin/pandoc-sidenote /usr/bin/pandoc-crossref" -post_extract() { - sed -i 's/tasty .*,/tasty,/' pandoc-*/pandoc.cabal - sed -i 's/zip-archive .*,/zip-archive,/' pandoc-*/pandoc.cabal - # See https://github.com/lierdakil/pandoc-crossref/issues/342#issuecomment-1073256586 - cp "${FILESDIR}/pandoc-crossref.cabal" pandoc-crossref-${_crossref_version} -} - post_install() { - vman pandoc-${version}/man/pandoc.1 + vman pandoc-cli-${version}/man/pandoc.1 vlicense pandoc-${version}/COPYRIGHT LICENSE }