diff options
author | gesh | 2021-12-03 00:40:28 +0200 |
---|---|---|
committer | gesh | 2021-12-03 00:40:28 +0200 |
commit | eec5fda695054887195317db862cd163176d3018 (patch) | |
tree | ff2a5f48570853009c02bfb9e9ec5a3eb9a62592 | |
parent | 1bbeaef63b1fc8a808d8f5e107f6306099d8da84 (diff) | |
download | aur-eec5fda695054887195317db862cd163176d3018.tar.gz |
Revert "Fix lower bounds on pandoc-lua-marshal"
Upstream accepted the patch
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 13 | ||||
-rw-r--r-- | ver-bump.patch | 13 |
3 files changed, 5 insertions, 27 deletions
@@ -1,6 +1,6 @@ pkgbase = pandoc-static-git pkgdesc = Conversion between markup formats (static build, dynamic Lua support) - pkgver = 2.16.2.r18.gc5287e9de + pkgver = 2.14rc.r12.g54ab7a0a3 pkgrel = 1 url = https://pandoc.org arch = x86_64 @@ -8,7 +8,7 @@ pkgbase = pandoc-static-git makedepends = stack>=1.7.0 optdepends = pandoc-citeproc: for citation rendering with pandoc-citeproc filter optdepends = texlive-core: for pdf output - provides = pandoc=2.16.2 + provides = pandoc=2.14 conflicts = haskell-pandoc conflicts = pandoc conflicts = pandoc-bin @@ -16,8 +16,6 @@ pkgbase = pandoc-static-git replaces = pandoc replaces = pandoc-bin source = git+https://github.com/jgm/pandoc.git - source = ver-bump.patch sha512sums = SKIP - sha512sums = 7593c460253fdfa958ce48b79dcef2a781c18fffb5aad31628b27042dc59b4b57ef42e2a21c5069de74eda485bd1ed8b4e2d81ed995cc31fee0b97879598cb76 pkgname = pandoc-static-git @@ -8,7 +8,7 @@ shopt -s extglob pkgname=pandoc-static-git _pkgname="${pkgname%-static-git}" -pkgver=2.16.2.r18.gc5287e9de +pkgver=2.14rc.r12.g54ab7a0a3 pkgrel=1 pkgdesc='Conversion between markup formats (static build, dynamic Lua support)' url='https://pandoc.org' @@ -20,9 +20,8 @@ conflicts=('haskell-pandoc' 'pandoc' 'pandoc-bin') replaces=('haskell-pandoc' 'pandoc' 'pandoc-bin') provides=("pandoc=${pkgver%%*([a-z]).r*}") makedepends=('stack>=1.7.0') -source=("git+https://github.com/jgm/pandoc.git" ver-bump.patch) -sha512sums=('SKIP' - '7593c460253fdfa958ce48b79dcef2a781c18fffb5aad31628b27042dc59b4b57ef42e2a21c5069de74eda485bd1ed8b4e2d81ed995cc31fee0b97879598cb76') +source=("git+https://github.com/jgm/pandoc.git") +sha512sums=('SKIP') pkgver() { cd "$_pkgname" @@ -38,12 +37,6 @@ pkgver() { # sed -i "s|let env' = dynlibEnv ++ |let env' = dynlibEnv ++ [(\"LD_LIBRARY_PATH\", \"$PWD/dist/build\")] ++ |" test/Tests/Command.hs # } -prepare() { - cd "$_pkgname" - patch --forward --strip=1 --input="${srcdir}/ver-bump.patch" -} - - build() { cd "$_pkgname" diff --git a/ver-bump.patch b/ver-bump.patch deleted file mode 100644 index f1ef21de6208..000000000000 --- a/ver-bump.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/pandoc.cabal b/pandoc.cabal -index e7d1349fc..42e28d086 100644 ---- a/pandoc.cabal -+++ b/pandoc.cabal -@@ -477,7 +477,7 @@ library - mtl >= 2.2 && < 2.3, - network >= 2.6, - network-uri >= 2.6 && < 2.8, -- pandoc-lua-marshal >= 0.1 && < 0.2, -+ pandoc-lua-marshal >= 0.1.0.1 && < 0.2, - pandoc-types >= 1.22.1 && < 1.23, - parsec >= 3.1 && < 3.2, - pretty >= 1.1 && < 1.2, |