* [PR PATCH] pandoc: add pandoc-crossref filter.
@ 2022-02-17 0:57 classabbyamp
2022-02-17 0:58 ` [PR PATCH] [Updated] " classabbyamp
` (9 more replies)
0 siblings, 10 replies; 11+ messages in thread
From: classabbyamp @ 2022-02-17 0:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1498 bytes --]
There is a new pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages pandoc-crossref
https://github.com/void-linux/void-packages/pull/35658
pandoc: add pandoc-crossref filter.
<!-- Uncomment relevant sections and delete options which are not applicable -->
[`pandoc-crossref`](https://github.com/lierdakil/pandoc-crossref) is a filter for pandoc that adds support for numbering figures, equations, tables and cross-references to them in documents. I think a number of pandoc users may find this a useful addition.
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/35658.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pandoc-crossref-35658.patch --]
[-- Type: text/x-diff, Size: 2613 bytes --]
From ad6e06ed76d8dff1d9bc9a5ca6af55bfb0496209 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Wed, 16 Feb 2022 19:54:51 -0500
Subject: [PATCH] pandoc: add pandoc-crossref filter.
---
srcpkgs/pandoc/template | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index d84e94c7b93b..48e494e2b442 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -2,9 +2,11 @@
pkgname=pandoc
# Keep in sync with http://www.stackage.org/lts
version=2.14.0.3
-revision=1
+revision=2
_sidenote_version=0.20.0
_monad_gen_version=0.3.0.1
+_crossref_version=0.3.12.2
+_roman_numerals_version=0.5.1.5
create_wrksrc=yes
build_style=haskell-stack
stackage="lts-18.5"
@@ -18,15 +20,20 @@ maintainer="slotThe <soliditsallgood@mailbox.org>"
license="GPL-2.0-or-later, BSD-3-Clause, MIT"
homepage="http://johnmacfarlane.net/pandoc/"
distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
- https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
- https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
+ https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz
+ https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz
+ https://github.com/lierdakil/pandoc-crossref/archive/v${_crossref_version}.tar.gz
+ https://hackage.haskell.org/package/roman-numerals-${_roman_numerals_version}/roman-numerals-${_roman_numerals_version}.tar.gz"
checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
- be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
+ be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465
+ 0bf80612c5964b433684971ee22dd28a29503470398eae1634bf9142cd27299a
+ b9c7195b69b1662a286d2c28a55fafdcb693c522ba5eb54a11b1d0a4e92eaa81"
nocross=yes
nopie_files="
/usr/bin/pandoc
/usr/bin/pandoc-sidenote
+ /usr/bin/pandoc-crossref
"
post_extract() {
@@ -35,6 +42,8 @@ post_extract() {
}
post_install() {
vman pandoc-${version}/man/pandoc.1
+ $DESTDIR/usr/bin/pandoc -s -t man pandoc-crossref-${_crossref_version}/docs/index.md -o pandoc-crossref-${_crossref_version}/docs/pandoc-crossref.1
+ vman pandoc-crossref-${_crossref_version}/docs/pandoc-crossref.1
vlicense pandoc-${version}/COPYRIGHT LICENSE.pandoc
vlicense pandoc-sidenote-${_sidenote_version}/LICENSE LICENSE.pandoc-sidenote
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] pandoc: add pandoc-crossref filter
2022-02-17 0:57 [PR PATCH] pandoc: add pandoc-crossref filter classabbyamp
@ 2022-02-17 0:58 ` classabbyamp
2022-02-17 1:00 ` classabbyamp
` (8 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: classabbyamp @ 2022-02-17 0:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1502 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages pandoc-crossref
https://github.com/void-linux/void-packages/pull/35658
pandoc: add pandoc-crossref filter
<!-- Uncomment relevant sections and delete options which are not applicable -->
[`pandoc-crossref`](https://github.com/lierdakil/pandoc-crossref) is a filter for pandoc that adds support for numbering figures, equations, tables and cross-references to them in documents. I think a number of pandoc users may find this a useful addition.
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/35658.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pandoc-crossref-35658.patch --]
[-- Type: text/x-diff, Size: 2696 bytes --]
From 71c274cc92633588923198954392825926f369b2 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Wed, 16 Feb 2022 19:54:51 -0500
Subject: [PATCH] pandoc: add pandoc-crossref filter.
---
srcpkgs/pandoc/template | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index d84e94c7b93b..59b02cf88bcb 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -2,9 +2,11 @@
pkgname=pandoc
# Keep in sync with http://www.stackage.org/lts
version=2.14.0.3
-revision=1
+revision=2
_sidenote_version=0.20.0
_monad_gen_version=0.3.0.1
+_crossref_version=0.3.12.2
+_roman_numerals_version=0.5.1.5
create_wrksrc=yes
build_style=haskell-stack
stackage="lts-18.5"
@@ -18,23 +20,31 @@ maintainer="slotThe <soliditsallgood@mailbox.org>"
license="GPL-2.0-or-later, BSD-3-Clause, MIT"
homepage="http://johnmacfarlane.net/pandoc/"
distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
- https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
- https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
+ https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz
+ https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz
+ https://github.com/lierdakil/pandoc-crossref/archive/v${_crossref_version}.tar.gz
+ https://hackage.haskell.org/package/roman-numerals-${_roman_numerals_version}/roman-numerals-${_roman_numerals_version}.tar.gz"
checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
- be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
+ be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465
+ 0bf80612c5964b433684971ee22dd28a29503470398eae1634bf9142cd27299a
+ b9c7195b69b1662a286d2c28a55fafdcb693c522ba5eb54a11b1d0a4e92eaa81"
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
}
+
post_install() {
vman pandoc-${version}/man/pandoc.1
+ $DESTDIR/usr/bin/pandoc -s -t man pandoc-crossref-${_crossref_version}/docs/index.md -o pandoc-crossref-${_crossref_version}/docs/pandoc-crossref.1
+ vman pandoc-crossref-${_crossref_version}/docs/pandoc-crossref.1
vlicense pandoc-${version}/COPYRIGHT LICENSE.pandoc
vlicense pandoc-sidenote-${_sidenote_version}/LICENSE LICENSE.pandoc-sidenote
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] pandoc: add pandoc-crossref filter
2022-02-17 0:57 [PR PATCH] pandoc: add pandoc-crossref filter classabbyamp
2022-02-17 0:58 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-02-17 1:00 ` classabbyamp
2022-02-21 16:29 ` classabbyamp
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: classabbyamp @ 2022-02-17 1:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1588 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages pandoc-crossref
https://github.com/void-linux/void-packages/pull/35658
pandoc: add pandoc-crossref filter
<!-- Uncomment relevant sections and delete options which are not applicable -->
[`pandoc-crossref`](https://github.com/lierdakil/pandoc-crossref) is a filter for pandoc that adds support for numbering figures, equations, tables and cross-references to them in documents. I think a number of pandoc users may find this a useful addition.
Included in the pandoc package for faster compilation, similar to pandoc-sidenote.
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/35658.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pandoc-crossref-35658.patch --]
[-- Type: text/x-diff, Size: 2696 bytes --]
From fa48fde0a7d8725384c4380987cd2a9b419fc7f2 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Wed, 16 Feb 2022 19:54:51 -0500
Subject: [PATCH] pandoc: add pandoc-crossref filter.
---
srcpkgs/pandoc/template | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index d84e94c7b93b..59b02cf88bcb 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -2,9 +2,11 @@
pkgname=pandoc
# Keep in sync with http://www.stackage.org/lts
version=2.14.0.3
-revision=1
+revision=2
_sidenote_version=0.20.0
_monad_gen_version=0.3.0.1
+_crossref_version=0.3.12.2
+_roman_numerals_version=0.5.1.5
create_wrksrc=yes
build_style=haskell-stack
stackage="lts-18.5"
@@ -18,23 +20,31 @@ maintainer="slotThe <soliditsallgood@mailbox.org>"
license="GPL-2.0-or-later, BSD-3-Clause, MIT"
homepage="http://johnmacfarlane.net/pandoc/"
distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
- https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
- https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
+ https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz
+ https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz
+ https://github.com/lierdakil/pandoc-crossref/archive/v${_crossref_version}.tar.gz
+ https://hackage.haskell.org/package/roman-numerals-${_roman_numerals_version}/roman-numerals-${_roman_numerals_version}.tar.gz"
checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
- be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
+ be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465
+ 0bf80612c5964b433684971ee22dd28a29503470398eae1634bf9142cd27299a
+ b9c7195b69b1662a286d2c28a55fafdcb693c522ba5eb54a11b1d0a4e92eaa81"
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
}
+
post_install() {
vman pandoc-${version}/man/pandoc.1
+ $DESTDIR/usr/bin/pandoc -s -t man pandoc-crossref-${_crossref_version}/docs/index.md -o pandoc-crossref-${_crossref_version}/docs/pandoc-crossref.1
+ vman pandoc-crossref-${_crossref_version}/docs/pandoc-crossref.1
vlicense pandoc-${version}/COPYRIGHT LICENSE.pandoc
vlicense pandoc-sidenote-${_sidenote_version}/LICENSE LICENSE.pandoc-sidenote
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] pandoc: add pandoc-crossref filter
2022-02-17 0:57 [PR PATCH] pandoc: add pandoc-crossref filter classabbyamp
2022-02-17 0:58 ` [PR PATCH] [Updated] " classabbyamp
2022-02-17 1:00 ` classabbyamp
@ 2022-02-21 16:29 ` classabbyamp
2022-02-21 16:33 ` classabbyamp
` (6 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: classabbyamp @ 2022-02-21 16:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1670 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages pandoc-crossref
https://github.com/void-linux/void-packages/pull/35658
pandoc: add pandoc-crossref filter
<!-- Uncomment relevant sections and delete options which are not applicable -->
[`pandoc-crossref`](https://github.com/lierdakil/pandoc-crossref) is a filter for pandoc that adds support for numbering figures, equations, tables and cross-references to them in documents. I think a number of pandoc users may find this a useful addition.
Included in the pandoc package for faster compilation, similar to pandoc-sidenote. It may make sense to change this from included in the package to as a subpackage.
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/35658.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pandoc-crossref-35658.patch --]
[-- Type: text/x-diff, Size: 4423 bytes --]
From ef4551830ebf75246e7ec345c7f646aa09fc18db Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Wed, 16 Feb 2022 19:54:51 -0500
Subject: [PATCH] pandoc: add pandoc-crossref filter, move filters to subpkgs
---
srcpkgs/pandoc-crossref | 1 +
srcpkgs/pandoc-sidenote | 1 +
srcpkgs/pandoc/template | 51 ++++++++++++++++++++++++++++++++---------
3 files changed, 42 insertions(+), 11 deletions(-)
create mode 120000 srcpkgs/pandoc-crossref
create mode 120000 srcpkgs/pandoc-sidenote
diff --git a/srcpkgs/pandoc-crossref b/srcpkgs/pandoc-crossref
new file mode 120000
index 000000000000..53ab49c268d6
--- /dev/null
+++ b/srcpkgs/pandoc-crossref
@@ -0,0 +1 @@
+pandoc
\ No newline at end of file
diff --git a/srcpkgs/pandoc-sidenote b/srcpkgs/pandoc-sidenote
new file mode 120000
index 000000000000..53ab49c268d6
--- /dev/null
+++ b/srcpkgs/pandoc-sidenote
@@ -0,0 +1 @@
+pandoc
\ No newline at end of file
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index d84e94c7b93b..a48ba2dc6c6b 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -2,9 +2,11 @@
pkgname=pandoc
# Keep in sync with http://www.stackage.org/lts
version=2.14.0.3
-revision=1
-_sidenote_version=0.20.0
+revision=2
+_sidenote_version=0.20.0.0
_monad_gen_version=0.3.0.1
+_crossref_version=0.3.12.2
+_roman_numerals_version=0.5.1.5
create_wrksrc=yes
build_style=haskell-stack
stackage="lts-18.5"
@@ -15,26 +17,53 @@ hostmakedepends="pkg-config unzip wget"
makedepends="zlib-devel lua53-devel tar"
short_desc="Universal converter between markup formats"
maintainer="slotThe <soliditsallgood@mailbox.org>"
-license="GPL-2.0-or-later, BSD-3-Clause, MIT"
+license="GPL-2.0-or-later, BSD-3-Clause"
homepage="http://johnmacfarlane.net/pandoc/"
-distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
- https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
- https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
+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="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
- 34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
- be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
+ 91f8e96d8470722d677d31d4bbf16c2ac6902567d818ed7a2715bad2617a4cdb
+ be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465
+ 94540325c9c98ae4d5199c634bf402ffa41e3c5b020d7207daef90fd9e224fb4
+ b9c7195b69b1662a286d2c28a55fafdcb693c522ba5eb54a11b1d0a4e92eaa81"
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
}
+
post_install() {
vman pandoc-${version}/man/pandoc.1
- vlicense pandoc-${version}/COPYRIGHT LICENSE.pandoc
- vlicense pandoc-sidenote-${_sidenote_version}/LICENSE LICENSE.pandoc-sidenote
+ $DESTDIR/usr/bin/pandoc -s -t man pandoc-crossref-${_crossref_version}/docs/index.md -o pandoc-crossref-${_crossref_version}/docs/pandoc-crossref.1
+ vlicense pandoc-${version}/COPYRIGHT LICENSE
+}
+
+pandoc-sidenote_package() {
+ depends="pandoc-${version}_${revision}"
+ short_desc="Pandoc filter to convert Markdown-style footnotes into sidenotes"
+ short_desc+=" - version ${_sidenote_version}"
+ license="MIT"
+ pkg_install() {
+ vmove usr/bin/pandoc-sidenote
+ vlicense pandoc-sidenote-${_sidenote_version}/LICENSE
+ }
+}
+
+pandoc-crossref_package() {
+ depends="pandoc-${version}_${revision}"
+ short_desc="Pandoc filter for cross-references"
+ short_desc+=" - version ${_crossref_version}"
+ license="GPL-2.0-or-later"
+ pkg_install() {
+ vmove usr/bin/pandoc-crossref
+ vman pandoc-crossref-${_crossref_version}/docs/pandoc-crossref.1
+ }
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] pandoc: add pandoc-crossref filter
2022-02-17 0:57 [PR PATCH] pandoc: add pandoc-crossref filter classabbyamp
` (2 preceding siblings ...)
2022-02-21 16:29 ` classabbyamp
@ 2022-02-21 16:33 ` classabbyamp
2022-02-22 20:20 ` [PR PATCH] [Updated] pandoc: add pandoc-crossref filter, move filters to subpkgs classabbyamp
` (5 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: classabbyamp @ 2022-02-21 16:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1670 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages pandoc-crossref
https://github.com/void-linux/void-packages/pull/35658
pandoc: add pandoc-crossref filter
<!-- Uncomment relevant sections and delete options which are not applicable -->
[`pandoc-crossref`](https://github.com/lierdakil/pandoc-crossref) is a filter for pandoc that adds support for numbering figures, equations, tables and cross-references to them in documents. I think a number of pandoc users may find this a useful addition.
Included in the pandoc package for faster compilation, similar to pandoc-sidenote. It may make sense to change this from included in the package to as a subpackage.
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/35658.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pandoc-crossref-35658.patch --]
[-- Type: text/x-diff, Size: 4423 bytes --]
From 18048cbaa6e5c13f4bf22d21cf97c9ee550bbbe2 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Wed, 16 Feb 2022 19:54:51 -0500
Subject: [PATCH] pandoc: add pandoc-crossref filter, move filters to subpkgs
---
srcpkgs/pandoc-crossref | 1 +
srcpkgs/pandoc-sidenote | 1 +
srcpkgs/pandoc/template | 51 ++++++++++++++++++++++++++++++++---------
3 files changed, 42 insertions(+), 11 deletions(-)
create mode 120000 srcpkgs/pandoc-crossref
create mode 120000 srcpkgs/pandoc-sidenote
diff --git a/srcpkgs/pandoc-crossref b/srcpkgs/pandoc-crossref
new file mode 120000
index 000000000000..53ab49c268d6
--- /dev/null
+++ b/srcpkgs/pandoc-crossref
@@ -0,0 +1 @@
+pandoc
\ No newline at end of file
diff --git a/srcpkgs/pandoc-sidenote b/srcpkgs/pandoc-sidenote
new file mode 120000
index 000000000000..53ab49c268d6
--- /dev/null
+++ b/srcpkgs/pandoc-sidenote
@@ -0,0 +1 @@
+pandoc
\ No newline at end of file
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index d84e94c7b93b..a48ba2dc6c6b 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -2,9 +2,11 @@
pkgname=pandoc
# Keep in sync with http://www.stackage.org/lts
version=2.14.0.3
-revision=1
-_sidenote_version=0.20.0
+revision=2
+_sidenote_version=0.20.0.0
_monad_gen_version=0.3.0.1
+_crossref_version=0.3.12.2
+_roman_numerals_version=0.5.1.5
create_wrksrc=yes
build_style=haskell-stack
stackage="lts-18.5"
@@ -15,26 +17,53 @@ hostmakedepends="pkg-config unzip wget"
makedepends="zlib-devel lua53-devel tar"
short_desc="Universal converter between markup formats"
maintainer="slotThe <soliditsallgood@mailbox.org>"
-license="GPL-2.0-or-later, BSD-3-Clause, MIT"
+license="GPL-2.0-or-later, BSD-3-Clause"
homepage="http://johnmacfarlane.net/pandoc/"
-distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
- https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
- https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
+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="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
- 34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
- be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
+ 91f8e96d8470722d677d31d4bbf16c2ac6902567d818ed7a2715bad2617a4cdb
+ be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465
+ 94540325c9c98ae4d5199c634bf402ffa41e3c5b020d7207daef90fd9e224fb4
+ b9c7195b69b1662a286d2c28a55fafdcb693c522ba5eb54a11b1d0a4e92eaa81"
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
}
+
post_install() {
vman pandoc-${version}/man/pandoc.1
- vlicense pandoc-${version}/COPYRIGHT LICENSE.pandoc
- vlicense pandoc-sidenote-${_sidenote_version}/LICENSE LICENSE.pandoc-sidenote
+ $DESTDIR/usr/bin/pandoc -s -t man pandoc-crossref-${_crossref_version}/docs/index.md -o pandoc-crossref-${_crossref_version}/docs/pandoc-crossref.1
+ vlicense pandoc-${version}/COPYRIGHT LICENSE
+}
+
+pandoc-sidenote_package() {
+ depends="pandoc-${version}_${revision}"
+ short_desc="Pandoc filter to convert Markdown-style footnotes into sidenotes"
+ short_desc+=" - version ${_sidenote_version}"
+ license="MIT"
+ pkg_install() {
+ vmove usr/bin/pandoc-sidenote
+ vlicense pandoc-sidenote-${_sidenote_version}/LICENSE
+ }
+}
+
+pandoc-crossref_package() {
+ depends="pandoc-${version}_${revision}"
+ short_desc="Pandoc filter for cross-references"
+ short_desc+=" - version ${_crossref_version}"
+ license="GPL-2.0-or-later"
+ pkg_install() {
+ vmove usr/bin/pandoc-crossref
+ vman pandoc-crossref-${_crossref_version}/docs/pandoc-crossref.1
+ }
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] pandoc: add pandoc-crossref filter, move filters to subpkgs
2022-02-17 0:57 [PR PATCH] pandoc: add pandoc-crossref filter classabbyamp
` (3 preceding siblings ...)
2022-02-21 16:33 ` classabbyamp
@ 2022-02-22 20:20 ` classabbyamp
2022-02-22 21:47 ` classabbyamp
` (4 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: classabbyamp @ 2022-02-22 20:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1650 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages pandoc-crossref
https://github.com/void-linux/void-packages/pull/35658
pandoc: add pandoc-crossref filter, move filters to subpkgs
<!-- Uncomment relevant sections and delete options which are not applicable -->
[`pandoc-crossref`](https://github.com/lierdakil/pandoc-crossref) is a filter for pandoc that adds support for numbering figures, equations, tables and cross-references to them in documents. I think a number of pandoc users may find this a useful addition.
Included in the pandoc package for faster compilation, similar to pandoc-sidenote, but now both have been moved to their own subpackages.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/35658.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pandoc-crossref-35658.patch --]
[-- Type: text/x-diff, Size: 4424 bytes --]
From d1c67f8cee9ece632dc68ed37ef2ce42c4bc6d8c Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Wed, 16 Feb 2022 19:54:51 -0500
Subject: [PATCH] pandoc: add pandoc-crossref filter, move filters to subpkgs
---
srcpkgs/pandoc-crossref | 1 +
srcpkgs/pandoc-sidenote | 1 +
srcpkgs/pandoc/template | 51 ++++++++++++++++++++++++++++++++---------
3 files changed, 42 insertions(+), 11 deletions(-)
create mode 120000 srcpkgs/pandoc-crossref
create mode 120000 srcpkgs/pandoc-sidenote
diff --git a/srcpkgs/pandoc-crossref b/srcpkgs/pandoc-crossref
new file mode 120000
index 000000000000..53ab49c268d6
--- /dev/null
+++ b/srcpkgs/pandoc-crossref
@@ -0,0 +1 @@
+pandoc
\ No newline at end of file
diff --git a/srcpkgs/pandoc-sidenote b/srcpkgs/pandoc-sidenote
new file mode 120000
index 000000000000..53ab49c268d6
--- /dev/null
+++ b/srcpkgs/pandoc-sidenote
@@ -0,0 +1 @@
+pandoc
\ No newline at end of file
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index d84e94c7b93b..489b23bd31bb 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -2,9 +2,11 @@
pkgname=pandoc
# Keep in sync with http://www.stackage.org/lts
version=2.14.0.3
-revision=1
-_sidenote_version=0.20.0
+revision=2
+_sidenote_version=0.20.0.0
_monad_gen_version=0.3.0.1
+_crossref_version=0.3.12.2
+_roman_numerals_version=0.5.1.5
create_wrksrc=yes
build_style=haskell-stack
stackage="lts-18.5"
@@ -15,26 +17,53 @@ hostmakedepends="pkg-config unzip wget"
makedepends="zlib-devel lua53-devel tar"
short_desc="Universal converter between markup formats"
maintainer="slotThe <soliditsallgood@mailbox.org>"
-license="GPL-2.0-or-later, BSD-3-Clause, MIT"
+license="GPL-2.0-or-later, BSD-3-Clause"
homepage="http://johnmacfarlane.net/pandoc/"
-distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
- https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
- https://hackage.haskell.org/package/monad-gen-${_monad_gen_version}/monad-gen-${_monad_gen_version}.tar.gz"
+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="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
- 34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
- be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
+ 91f8e96d8470722d677d31d4bbf16c2ac6902567d818ed7a2715bad2617a4cdb
+ be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465
+ 94540325c9c98ae4d5199c634bf402ffa41e3c5b020d7207daef90fd9e224fb4
+ b9c7195b69b1662a286d2c28a55fafdcb693c522ba5eb54a11b1d0a4e92eaa81"
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
}
+
post_install() {
vman pandoc-${version}/man/pandoc.1
- vlicense pandoc-${version}/COPYRIGHT LICENSE.pandoc
- vlicense pandoc-sidenote-${_sidenote_version}/LICENSE LICENSE.pandoc-sidenote
+ vlicense pandoc-${version}/COPYRIGHT LICENSE
+}
+
+pandoc-sidenote_package() {
+ depends="pandoc-${version}_${revision}"
+ short_desc="Pandoc filter to convert Markdown-style footnotes into sidenotes"
+ short_desc+=" - version ${_sidenote_version}"
+ license="MIT"
+ pkg_install() {
+ vmove usr/bin/pandoc-sidenote
+ vlicense pandoc-sidenote-${_sidenote_version}/LICENSE
+ }
+}
+
+pandoc-crossref_package() {
+ depends="pandoc-${version}_${revision}"
+ short_desc="Pandoc filter for cross-references"
+ short_desc+=" - version ${_crossref_version}"
+ license="GPL-2.0-or-later"
+ pkg_install() {
+ vmove usr/bin/pandoc-crossref
+ $DESTDIR/usr/bin/pandoc -s -t man pandoc-crossref-${_crossref_version}/docs/index.md -o pandoc-crossref-${_crossref_version}/docs/pandoc-crossref.1
+ vman pandoc-crossref-${_crossref_version}/docs/pandoc-crossref.1
+ }
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] pandoc: add pandoc-crossref filter, move filters to subpkgs
2022-02-17 0:57 [PR PATCH] pandoc: add pandoc-crossref filter classabbyamp
` (4 preceding siblings ...)
2022-02-22 20:20 ` [PR PATCH] [Updated] pandoc: add pandoc-crossref filter, move filters to subpkgs classabbyamp
@ 2022-02-22 21:47 ` classabbyamp
2022-02-22 21:49 ` classabbyamp
` (3 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: classabbyamp @ 2022-02-22 21:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1650 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages pandoc-crossref
https://github.com/void-linux/void-packages/pull/35658
pandoc: add pandoc-crossref filter, move filters to subpkgs
<!-- Uncomment relevant sections and delete options which are not applicable -->
[`pandoc-crossref`](https://github.com/lierdakil/pandoc-crossref) is a filter for pandoc that adds support for numbering figures, equations, tables and cross-references to them in documents. I think a number of pandoc users may find this a useful addition.
Included in the pandoc package for faster compilation, similar to pandoc-sidenote, but now both have been moved to their own subpackages.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/35658.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pandoc-crossref-35658.patch --]
[-- Type: text/x-diff, Size: 4639 bytes --]
From 2c79f0b17c75b86317c95af5066f3c59c5421eb9 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Wed, 16 Feb 2022 19:54:51 -0500
Subject: [PATCH] pandoc: add pandoc-crossref filter, move filters to subpkgs
---
srcpkgs/pandoc-crossref | 1 +
srcpkgs/pandoc-sidenote | 1 +
srcpkgs/pandoc/template | 59 ++++++++++++++++++++++++++++++++++-------
3 files changed, 51 insertions(+), 10 deletions(-)
create mode 120000 srcpkgs/pandoc-crossref
create mode 120000 srcpkgs/pandoc-sidenote
diff --git a/srcpkgs/pandoc-crossref b/srcpkgs/pandoc-crossref
new file mode 120000
index 000000000000..53ab49c268d6
--- /dev/null
+++ b/srcpkgs/pandoc-crossref
@@ -0,0 +1 @@
+pandoc
\ No newline at end of file
diff --git a/srcpkgs/pandoc-sidenote b/srcpkgs/pandoc-sidenote
new file mode 120000
index 000000000000..53ab49c268d6
--- /dev/null
+++ b/srcpkgs/pandoc-sidenote
@@ -0,0 +1 @@
+pandoc
\ No newline at end of file
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index d84e94c7b93b..3d0593a2ed62 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -2,9 +2,11 @@
pkgname=pandoc
# Keep in sync with http://www.stackage.org/lts
version=2.14.0.3
-revision=1
-_sidenote_version=0.20.0
+revision=2
+_sidenote_version=0.20.0.0
_monad_gen_version=0.3.0.1
+_crossref_version=0.3.12.2
+_roman_numerals_version=0.5.1.5
create_wrksrc=yes
build_style=haskell-stack
stackage="lts-18.5"
@@ -15,26 +17,63 @@ hostmakedepends="pkg-config unzip wget"
makedepends="zlib-devel lua53-devel tar"
short_desc="Universal converter between markup formats"
maintainer="slotThe <soliditsallgood@mailbox.org>"
-license="GPL-2.0-or-later, BSD-3-Clause, MIT"
+license="GPL-2.0-or-later, BSD-3-Clause"
homepage="http://johnmacfarlane.net/pandoc/"
-distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
- https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
+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"
checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
- 34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
+ 91f8e96d8470722d677d31d4bbf16c2ac6902567d818ed7a2715bad2617a4cdb
be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
+subpkgs="pandoc-sidenote"
nocross=yes
nopie_files="
/usr/bin/pandoc
- /usr/bin/pandoc-sidenote
-"
+ /usr/bin/pandoc-sidenote"
+
+# pandoc-crossref is currently broken on musl. See lierdakil/pandoc-crossref#342 and commercialhaskell/stack#5683
+if [ "$XBPS_TARGET_LIBC" != "musl" ]; then
+ distfiles+="
+ 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+="
+ 94540325c9c98ae4d5199c634bf402ffa41e3c5b020d7207daef90fd9e224fb4
+ b9c7195b69b1662a286d2c28a55fafdcb693c522ba5eb54a11b1d0a4e92eaa81"
+ nopie_files+="
+ /usr/bin/pandoc-crossref"
+ subpkgs+="pandoc-crossref"
+fi
post_extract() {
sed -i 's/tasty .*,/tasty,/' pandoc-*/pandoc.cabal
sed -i 's/zip-archive .*,/zip-archive,/' pandoc-*/pandoc.cabal
}
+
post_install() {
vman pandoc-${version}/man/pandoc.1
- vlicense pandoc-${version}/COPYRIGHT LICENSE.pandoc
- vlicense pandoc-sidenote-${_sidenote_version}/LICENSE LICENSE.pandoc-sidenote
+ vlicense pandoc-${version}/COPYRIGHT LICENSE
+}
+
+# pandoc filters should be built with pandoc to ensure compatibility and speed up compiliation
+pandoc-sidenote_package() {
+ depends="pandoc-${version}_${revision}"
+ short_desc="Pandoc filter to convert Markdown-style footnotes into sidenotes"
+ short_desc+=" - version ${_sidenote_version}"
+ license="MIT"
+ pkg_install() {
+ vmove usr/bin/pandoc-sidenote
+ vlicense pandoc-sidenote-${_sidenote_version}/LICENSE
+ }
+}
+
+pandoc-crossref_package() {
+ depends="pandoc-${version}_${revision}"
+ short_desc="Pandoc filter for cross-references"
+ short_desc+=" - version ${_crossref_version}"
+ license="GPL-2.0-or-later"
+ pkg_install() {
+ vmove usr/bin/pandoc-crossref
+ $DESTDIR/usr/bin/pandoc -s -t man pandoc-crossref-${_crossref_version}/docs/index.md -o pandoc-crossref-${_crossref_version}/docs/pandoc-crossref.1
+ vman pandoc-crossref-${_crossref_version}/docs/pandoc-crossref.1
+ }
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] pandoc: add pandoc-crossref filter, move filters to subpkgs
2022-02-17 0:57 [PR PATCH] pandoc: add pandoc-crossref filter classabbyamp
` (5 preceding siblings ...)
2022-02-22 21:47 ` classabbyamp
@ 2022-02-22 21:49 ` classabbyamp
2022-02-22 22:49 ` classabbyamp
` (2 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: classabbyamp @ 2022-02-22 21:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1650 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages pandoc-crossref
https://github.com/void-linux/void-packages/pull/35658
pandoc: add pandoc-crossref filter, move filters to subpkgs
<!-- Uncomment relevant sections and delete options which are not applicable -->
[`pandoc-crossref`](https://github.com/lierdakil/pandoc-crossref) is a filter for pandoc that adds support for numbering figures, equations, tables and cross-references to them in documents. I think a number of pandoc users may find this a useful addition.
Included in the pandoc package for faster compilation, similar to pandoc-sidenote, but now both have been moved to their own subpackages.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/35658.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pandoc-crossref-35658.patch --]
[-- Type: text/x-diff, Size: 4647 bytes --]
From 640a98997925286bbb633afd1950734e92921d65 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Wed, 16 Feb 2022 19:54:51 -0500
Subject: [PATCH] pandoc: add pandoc-crossref filter, move filters to subpkgs
---
srcpkgs/pandoc-crossref | 1 +
srcpkgs/pandoc-sidenote | 1 +
srcpkgs/pandoc/template | 59 ++++++++++++++++++++++++++++++++++-------
3 files changed, 51 insertions(+), 10 deletions(-)
create mode 120000 srcpkgs/pandoc-crossref
create mode 120000 srcpkgs/pandoc-sidenote
diff --git a/srcpkgs/pandoc-crossref b/srcpkgs/pandoc-crossref
new file mode 120000
index 000000000000..53ab49c268d6
--- /dev/null
+++ b/srcpkgs/pandoc-crossref
@@ -0,0 +1 @@
+pandoc
\ No newline at end of file
diff --git a/srcpkgs/pandoc-sidenote b/srcpkgs/pandoc-sidenote
new file mode 120000
index 000000000000..53ab49c268d6
--- /dev/null
+++ b/srcpkgs/pandoc-sidenote
@@ -0,0 +1 @@
+pandoc
\ No newline at end of file
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index d84e94c7b93b..32a5cea80081 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -2,9 +2,11 @@
pkgname=pandoc
# Keep in sync with http://www.stackage.org/lts
version=2.14.0.3
-revision=1
-_sidenote_version=0.20.0
+revision=2
+_sidenote_version=0.20.0.0
_monad_gen_version=0.3.0.1
+_crossref_version=0.3.12.2
+_roman_numerals_version=0.5.1.5
create_wrksrc=yes
build_style=haskell-stack
stackage="lts-18.5"
@@ -15,26 +17,63 @@ hostmakedepends="pkg-config unzip wget"
makedepends="zlib-devel lua53-devel tar"
short_desc="Universal converter between markup formats"
maintainer="slotThe <soliditsallgood@mailbox.org>"
-license="GPL-2.0-or-later, BSD-3-Clause, MIT"
+license="GPL-2.0-or-later, BSD-3-Clause"
homepage="http://johnmacfarlane.net/pandoc/"
-distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
- https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
+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"
checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
- 34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
+ 91f8e96d8470722d677d31d4bbf16c2ac6902567d818ed7a2715bad2617a4cdb
be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
+subpackages="pandoc-sidenote"
nocross=yes
nopie_files="
/usr/bin/pandoc
- /usr/bin/pandoc-sidenote
-"
+ /usr/bin/pandoc-sidenote"
+
+# pandoc-crossref is currently broken on musl. See lierdakil/pandoc-crossref#342 and commercialhaskell/stack#5683
+if [ "$XBPS_TARGET_LIBC" != "musl" ]; then
+ distfiles+="
+ 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+="
+ 94540325c9c98ae4d5199c634bf402ffa41e3c5b020d7207daef90fd9e224fb4
+ b9c7195b69b1662a286d2c28a55fafdcb693c522ba5eb54a11b1d0a4e92eaa81"
+ nopie_files+="
+ /usr/bin/pandoc-crossref"
+ subpackages+="pandoc-crossref"
+fi
post_extract() {
sed -i 's/tasty .*,/tasty,/' pandoc-*/pandoc.cabal
sed -i 's/zip-archive .*,/zip-archive,/' pandoc-*/pandoc.cabal
}
+
post_install() {
vman pandoc-${version}/man/pandoc.1
- vlicense pandoc-${version}/COPYRIGHT LICENSE.pandoc
- vlicense pandoc-sidenote-${_sidenote_version}/LICENSE LICENSE.pandoc-sidenote
+ vlicense pandoc-${version}/COPYRIGHT LICENSE
+}
+
+# pandoc filters should be built with pandoc to ensure compatibility and speed up compiliation
+pandoc-sidenote_package() {
+ depends="pandoc-${version}_${revision}"
+ short_desc="Pandoc filter to convert Markdown-style footnotes into sidenotes"
+ short_desc+=" - version ${_sidenote_version}"
+ license="MIT"
+ pkg_install() {
+ vmove usr/bin/pandoc-sidenote
+ vlicense pandoc-sidenote-${_sidenote_version}/LICENSE
+ }
+}
+
+pandoc-crossref_package() {
+ depends="pandoc-${version}_${revision}"
+ short_desc="Pandoc filter for cross-references"
+ short_desc+=" - version ${_crossref_version}"
+ license="GPL-2.0-or-later"
+ pkg_install() {
+ vmove usr/bin/pandoc-crossref
+ $DESTDIR/usr/bin/pandoc -s -t man pandoc-crossref-${_crossref_version}/docs/index.md -o pandoc-crossref-${_crossref_version}/docs/pandoc-crossref.1
+ vman pandoc-crossref-${_crossref_version}/docs/pandoc-crossref.1
+ }
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] pandoc: add pandoc-crossref filter, move filters to subpkgs
2022-02-17 0:57 [PR PATCH] pandoc: add pandoc-crossref filter classabbyamp
` (6 preceding siblings ...)
2022-02-22 21:49 ` classabbyamp
@ 2022-02-22 22:49 ` classabbyamp
2022-02-22 23:26 ` classabbyamp
2022-02-23 17:47 ` [PR PATCH] [Merged]: " leahneukirchen
9 siblings, 0 replies; 11+ messages in thread
From: classabbyamp @ 2022-02-22 22:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1650 bytes --]
There is an updated pull request by classabbyamp against master on the void-packages repository
https://github.com/classabbyamp/void-packages pandoc-crossref
https://github.com/void-linux/void-packages/pull/35658
pandoc: add pandoc-crossref filter, move filters to subpkgs
<!-- Uncomment relevant sections and delete options which are not applicable -->
[`pandoc-crossref`](https://github.com/lierdakil/pandoc-crossref) is a filter for pandoc that adds support for numbering figures, equations, tables and cross-references to them in documents. I think a number of pandoc users may find this a useful addition.
Included in the pandoc package for faster compilation, similar to pandoc-sidenote, but now both have been moved to their own subpackages.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/35658.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pandoc-crossref-35658.patch --]
[-- Type: text/x-diff, Size: 4650 bytes --]
From 593004f7f4593c0ee2a1c2eb94e485eb5c887a21 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@kb6.ee>
Date: Wed, 16 Feb 2022 19:54:51 -0500
Subject: [PATCH] pandoc: add pandoc-crossref filter, move filters to subpkgs
---
srcpkgs/pandoc-crossref | 1 +
srcpkgs/pandoc-sidenote | 1 +
srcpkgs/pandoc/template | 60 ++++++++++++++++++++++++++++++++++-------
3 files changed, 52 insertions(+), 10 deletions(-)
create mode 120000 srcpkgs/pandoc-crossref
create mode 120000 srcpkgs/pandoc-sidenote
diff --git a/srcpkgs/pandoc-crossref b/srcpkgs/pandoc-crossref
new file mode 120000
index 000000000000..53ab49c268d6
--- /dev/null
+++ b/srcpkgs/pandoc-crossref
@@ -0,0 +1 @@
+pandoc
\ No newline at end of file
diff --git a/srcpkgs/pandoc-sidenote b/srcpkgs/pandoc-sidenote
new file mode 120000
index 000000000000..53ab49c268d6
--- /dev/null
+++ b/srcpkgs/pandoc-sidenote
@@ -0,0 +1 @@
+pandoc
\ No newline at end of file
diff --git a/srcpkgs/pandoc/template b/srcpkgs/pandoc/template
index d84e94c7b93b..0e487510497e 100644
--- a/srcpkgs/pandoc/template
+++ b/srcpkgs/pandoc/template
@@ -2,9 +2,11 @@
pkgname=pandoc
# Keep in sync with http://www.stackage.org/lts
version=2.14.0.3
-revision=1
-_sidenote_version=0.20.0
+revision=2
+_sidenote_version=0.20.0.0
_monad_gen_version=0.3.0.1
+_crossref_version=0.3.12.2
+_roman_numerals_version=0.5.1.5
create_wrksrc=yes
build_style=haskell-stack
stackage="lts-18.5"
@@ -15,26 +17,64 @@ hostmakedepends="pkg-config unzip wget"
makedepends="zlib-devel lua53-devel tar"
short_desc="Universal converter between markup formats"
maintainer="slotThe <soliditsallgood@mailbox.org>"
-license="GPL-2.0-or-later, BSD-3-Clause, MIT"
+license="GPL-2.0-or-later, BSD-3-Clause"
homepage="http://johnmacfarlane.net/pandoc/"
-distfiles="http://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz
- https://github.com/jez/${pkgname}-sidenote/archive/${_sidenote_version}.tar.gz \
+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"
checksum="82e3f55bff3059bf30cf532e93d9876c9e3599aa4eafae9c907fe75a4430eddd
- 34ee7f46d6472c04884b1dcb030d701a32b885d9b0d4307d2c0da327a359cb7a
+ 91f8e96d8470722d677d31d4bbf16c2ac6902567d818ed7a2715bad2617a4cdb
be8485023fce236b5b915f2f6074f7b0470a2040f84cdd137c5227f1b4c98465"
+subpackages="pandoc-sidenote"
nocross=yes
nopie_files="
/usr/bin/pandoc
- /usr/bin/pandoc-sidenote
-"
+ /usr/bin/pandoc-sidenote"
+
+# pandoc-crossref is currently broken on musl. See lierdakil/pandoc-crossref#342 and commercialhaskell/stack#5683
+if [ "$XBPS_TARGET_LIBC" != "musl" ]; then
+ distfiles+="
+ 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+="
+ 94540325c9c98ae4d5199c634bf402ffa41e3c5b020d7207daef90fd9e224fb4
+ b9c7195b69b1662a286d2c28a55fafdcb693c522ba5eb54a11b1d0a4e92eaa81"
+ nopie_files+="
+ /usr/bin/pandoc-crossref"
+ subpackages+="
+ pandoc-crossref"
+fi
post_extract() {
sed -i 's/tasty .*,/tasty,/' pandoc-*/pandoc.cabal
sed -i 's/zip-archive .*,/zip-archive,/' pandoc-*/pandoc.cabal
}
+
post_install() {
vman pandoc-${version}/man/pandoc.1
- vlicense pandoc-${version}/COPYRIGHT LICENSE.pandoc
- vlicense pandoc-sidenote-${_sidenote_version}/LICENSE LICENSE.pandoc-sidenote
+ vlicense pandoc-${version}/COPYRIGHT LICENSE
+}
+
+# pandoc filters should be built with pandoc to ensure compatibility and speed up compiliation
+pandoc-sidenote_package() {
+ depends="pandoc-${version}_${revision}"
+ short_desc="Pandoc filter to convert Markdown-style footnotes into sidenotes"
+ short_desc+=" - version ${_sidenote_version}"
+ license="MIT"
+ pkg_install() {
+ vmove usr/bin/pandoc-sidenote
+ vlicense pandoc-sidenote-${_sidenote_version}/LICENSE
+ }
+}
+
+pandoc-crossref_package() {
+ depends="pandoc-${version}_${revision}"
+ short_desc="Pandoc filter for cross-references"
+ short_desc+=" - version ${_crossref_version}"
+ license="GPL-2.0-or-later"
+ pkg_install() {
+ vmove usr/bin/pandoc-crossref
+ $DESTDIR/usr/bin/pandoc -s -t man pandoc-crossref-${_crossref_version}/docs/index.md -o pandoc-crossref-${_crossref_version}/docs/pandoc-crossref.1
+ vman pandoc-crossref-${_crossref_version}/docs/pandoc-crossref.1
+ }
}
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: pandoc: add pandoc-crossref filter, move filters to subpkgs
2022-02-17 0:57 [PR PATCH] pandoc: add pandoc-crossref filter classabbyamp
` (7 preceding siblings ...)
2022-02-22 22:49 ` classabbyamp
@ 2022-02-22 23:26 ` classabbyamp
2022-02-23 17:47 ` [PR PATCH] [Merged]: " leahneukirchen
9 siblings, 0 replies; 11+ messages in thread
From: classabbyamp @ 2022-02-22 23:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 196 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/35658#issuecomment-1048307334
Comment:
@slotThe @leahneukirchen this is ready for review
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Merged]: pandoc: add pandoc-crossref filter, move filters to subpkgs
2022-02-17 0:57 [PR PATCH] pandoc: add pandoc-crossref filter classabbyamp
` (8 preceding siblings ...)
2022-02-22 23:26 ` classabbyamp
@ 2022-02-23 17:47 ` leahneukirchen
9 siblings, 0 replies; 11+ messages in thread
From: leahneukirchen @ 2022-02-23 17:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1476 bytes --]
There's a merged pull request on the void-packages repository
pandoc: add pandoc-crossref filter, move filters to subpkgs
https://github.com/void-linux/void-packages/pull/35658
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
[`pandoc-crossref`](https://github.com/lierdakil/pandoc-crossref) is a filter for pandoc that adds support for numbering figures, equations, tables and cross-references to them in documents. I think a number of pandoc users may find this a useful addition.
Included in the pandoc package for faster compilation, similar to pandoc-sidenote, but now both have been moved to their own subpackages.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2022-02-23 17:47 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-17 0:57 [PR PATCH] pandoc: add pandoc-crossref filter classabbyamp
2022-02-17 0:58 ` [PR PATCH] [Updated] " classabbyamp
2022-02-17 1:00 ` classabbyamp
2022-02-21 16:29 ` classabbyamp
2022-02-21 16:33 ` classabbyamp
2022-02-22 20:20 ` [PR PATCH] [Updated] pandoc: add pandoc-crossref filter, move filters to subpkgs classabbyamp
2022-02-22 21:47 ` classabbyamp
2022-02-22 21:49 ` classabbyamp
2022-02-22 22:49 ` classabbyamp
2022-02-22 23:26 ` classabbyamp
2022-02-23 17:47 ` [PR PATCH] [Merged]: " leahneukirchen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).