* [PR PATCH] libxslt: fix manpage + remove second distfile
@ 2021-09-25 15:37 meator
2021-09-27 4:02 ` [PR REVIEW] " ericonr
` (8 more replies)
0 siblings, 9 replies; 10+ messages in thread
From: meator @ 2021-09-25 15:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 893 bytes --]
There is a new pull request by meator against master on the void-packages repository
https://github.com/meator/void-packages libxslt
https://github.com/void-linux/void-packages/pull/33119
libxslt: fix manpage + remove second distfile
<!-- Mark items with [x] where applicable -->
The second distfile seems superfluous, so this PR removes it. It also fixes `xsltproc(1)`.
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
A patch file from https://github.com/void-linux/void-packages/pull/33119.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libxslt-33119.patch --]
[-- Type: text/x-diff, Size: 2802 bytes --]
From 475728745f3378b48e3a92d62663ef554179ca38 Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Sat, 25 Sep 2021 17:22:09 +0200
Subject: [PATCH] libxslt: fix manpage + remove second distfile
---
srcpkgs/libxslt/patches/fix-manpage.patch | 13 +++++++++++++
srcpkgs/libxslt/template | 16 ++++++++++------
2 files changed, 23 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/libxslt/patches/fix-manpage.patch
diff --git a/srcpkgs/libxslt/patches/fix-manpage.patch b/srcpkgs/libxslt/patches/fix-manpage.patch
new file mode 100644
index 000000000000..881338aca482
--- /dev/null
+++ b/srcpkgs/libxslt/patches/fix-manpage.patch
@@ -0,0 +1,13 @@
+--- a/doc/xsltproc.xml 2019-10-30 21:02:14.000000000 +0100
++++ b/doc/xsltproc.xml 2021-09-24 21:00:52.628526237 +0200
+@@ -1,8 +1,8 @@
+ <?xml version="1.0"?>
+ <?xml-stylesheet type="text/xsl"
+- href="http://cdn.docbook.org/release/xsl/current//manpages/docbook.xsl"?>
++ href="/usr/share/xsl/docbook/manpages/docbook.xsl"?>
+ <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+- "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
++ "/usr/share/xml/docbook/4.2/docbookx.dtd" [
+
+ <!ENTITY xsltproc "<command>xsltproc</command>">
+ ]>
diff --git a/srcpkgs/libxslt/template b/srcpkgs/libxslt/template
index 42d80f08ac98..0ec69a7ea7af 100644
--- a/srcpkgs/libxslt/template
+++ b/srcpkgs/libxslt/template
@@ -1,19 +1,17 @@
# Template file for 'libxslt'
pkgname=libxslt
version=1.1.34
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--disable-static --disable-dependency-tracking"
-hostmakedepends="libtool python-devel libxml2-python pkg-config"
+hostmakedepends="docbook-xml docbook-xsl libtool python-devel libxml2-python pkg-config"
makedepends="python-devel libxml2-devel libxml2-python libgcrypt-devel"
short_desc="XSLT parser library from the GNOME project"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://xmlsoft.org/XSLT/"
-distfiles="http://xmlsoft.org/sources/libxslt-${version}.tar.gz
- ftp://xmlsoft.org/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum="98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f
- 98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f"
+distfiles="http://xmlsoft.org/sources/libxslt-${version}.tar.gz"
+checksum="98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f"
post_configure() {
# Remove missing seperators and errors
@@ -28,6 +26,12 @@ post_configure() {
fi
}
+post_build() {
+ # xsltproc manpage depends on xsltproc, this remakes it after
+ # libxslt is build
+ make -C doc XSLTPROC=${wrksrc}/xsltproc/xsltproc xsltproc.1
+}
+
post_install() {
if [ "$CROSS_BUILD" ]; then
# Remove $XBPS_CROSS_BASE in pkg-config
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR REVIEW] libxslt: fix manpage + remove second distfile
2021-09-25 15:37 [PR PATCH] libxslt: fix manpage + remove second distfile meator
@ 2021-09-27 4:02 ` ericonr
2021-09-27 14:54 ` meator
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: ericonr @ 2021-09-27 4:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 181 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/33119#discussion_r716343975
Comment:
Any idea why this works for cross?
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR REVIEW] libxslt: fix manpage + remove second distfile
2021-09-25 15:37 [PR PATCH] libxslt: fix manpage + remove second distfile meator
2021-09-27 4:02 ` [PR REVIEW] " ericonr
@ 2021-09-27 14:54 ` meator
2021-09-28 12:37 ` [PR PATCH] [Updated] [WIP] " meator
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: meator @ 2021-09-27 14:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 178 bytes --]
New review comment by meator on void-packages repository
https://github.com/void-linux/void-packages/pull/33119#discussion_r716772671
Comment:
_That's a really good question._
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Updated] [WIP] libxslt: fix manpage + remove second distfile
2021-09-25 15:37 [PR PATCH] libxslt: fix manpage + remove second distfile meator
2021-09-27 4:02 ` [PR REVIEW] " ericonr
2021-09-27 14:54 ` meator
@ 2021-09-28 12:37 ` meator
2021-09-28 12:46 ` [PR REVIEW] " meator
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: meator @ 2021-09-28 12:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 904 bytes --]
There is an updated pull request by meator against master on the void-packages repository
https://github.com/meator/void-packages libxslt
https://github.com/void-linux/void-packages/pull/33119
[WIP] libxslt: fix manpage + remove second distfile
<!-- Mark items with [x] where applicable -->
The second distfile seems superfluous, so this PR removes it. It also fixes `xsltproc(1)`.
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
A patch file from https://github.com/void-linux/void-packages/pull/33119.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libxslt-33119.patch --]
[-- Type: text/x-diff, Size: 2802 bytes --]
From 475728745f3378b48e3a92d62663ef554179ca38 Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Sat, 25 Sep 2021 17:22:09 +0200
Subject: [PATCH] libxslt: fix manpage + remove second distfile
---
srcpkgs/libxslt/patches/fix-manpage.patch | 13 +++++++++++++
srcpkgs/libxslt/template | 16 ++++++++++------
2 files changed, 23 insertions(+), 6 deletions(-)
create mode 100644 srcpkgs/libxslt/patches/fix-manpage.patch
diff --git a/srcpkgs/libxslt/patches/fix-manpage.patch b/srcpkgs/libxslt/patches/fix-manpage.patch
new file mode 100644
index 000000000000..881338aca482
--- /dev/null
+++ b/srcpkgs/libxslt/patches/fix-manpage.patch
@@ -0,0 +1,13 @@
+--- a/doc/xsltproc.xml 2019-10-30 21:02:14.000000000 +0100
++++ b/doc/xsltproc.xml 2021-09-24 21:00:52.628526237 +0200
+@@ -1,8 +1,8 @@
+ <?xml version="1.0"?>
+ <?xml-stylesheet type="text/xsl"
+- href="http://cdn.docbook.org/release/xsl/current//manpages/docbook.xsl"?>
++ href="/usr/share/xsl/docbook/manpages/docbook.xsl"?>
+ <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
+- "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
++ "/usr/share/xml/docbook/4.2/docbookx.dtd" [
+
+ <!ENTITY xsltproc "<command>xsltproc</command>">
+ ]>
diff --git a/srcpkgs/libxslt/template b/srcpkgs/libxslt/template
index 42d80f08ac98..0ec69a7ea7af 100644
--- a/srcpkgs/libxslt/template
+++ b/srcpkgs/libxslt/template
@@ -1,19 +1,17 @@
# Template file for 'libxslt'
pkgname=libxslt
version=1.1.34
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--disable-static --disable-dependency-tracking"
-hostmakedepends="libtool python-devel libxml2-python pkg-config"
+hostmakedepends="docbook-xml docbook-xsl libtool python-devel libxml2-python pkg-config"
makedepends="python-devel libxml2-devel libxml2-python libgcrypt-devel"
short_desc="XSLT parser library from the GNOME project"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://xmlsoft.org/XSLT/"
-distfiles="http://xmlsoft.org/sources/libxslt-${version}.tar.gz
- ftp://xmlsoft.org/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum="98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f
- 98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f"
+distfiles="http://xmlsoft.org/sources/libxslt-${version}.tar.gz"
+checksum="98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f"
post_configure() {
# Remove missing seperators and errors
@@ -28,6 +26,12 @@ post_configure() {
fi
}
+post_build() {
+ # xsltproc manpage depends on xsltproc, this remakes it after
+ # libxslt is build
+ make -C doc XSLTPROC=${wrksrc}/xsltproc/xsltproc xsltproc.1
+}
+
post_install() {
if [ "$CROSS_BUILD" ]; then
# Remove $XBPS_CROSS_BASE in pkg-config
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR REVIEW] libxslt: fix manpage + remove second distfile
2021-09-25 15:37 [PR PATCH] libxslt: fix manpage + remove second distfile meator
` (2 preceding siblings ...)
2021-09-28 12:37 ` [PR PATCH] [Updated] [WIP] " meator
@ 2021-09-28 12:46 ` meator
2021-09-28 16:13 ` [PR PATCH] [Closed]: " sgn
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: meator @ 2021-09-28 12:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 334 bytes --]
New review comment by meator on void-packages repository
https://github.com/void-linux/void-packages/pull/33119#discussion_r717538512
Comment:
I didn't think of that. It (of course) doesn't work for cross, it just ignores errors while generating the manpage. I have included a premade manpage for use in the cross compiled version.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PR PATCH] [Closed]: libxslt: fix manpage + remove second distfile
2021-09-25 15:37 [PR PATCH] libxslt: fix manpage + remove second distfile meator
` (3 preceding siblings ...)
2021-09-28 12:46 ` [PR REVIEW] " meator
@ 2021-09-28 16:13 ` sgn
2021-09-28 16:22 ` meator
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: sgn @ 2021-09-28 16:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 744 bytes --]
There's a closed pull request on the void-packages repository
libxslt: fix manpage + remove second distfile
https://github.com/void-linux/void-packages/pull/33119
Description:
<!-- Mark items with [x] where applicable -->
The second distfile seems superfluous, so this PR removes it. It also fixes `xsltproc(1)`.
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: libxslt: fix manpage + remove second distfile
2021-09-25 15:37 [PR PATCH] libxslt: fix manpage + remove second distfile meator
` (4 preceding siblings ...)
2021-09-28 16:13 ` [PR PATCH] [Closed]: " sgn
@ 2021-09-28 16:22 ` meator
2021-09-28 16:22 ` meator
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: meator @ 2021-09-28 16:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 200 bytes --]
New comment by meator on void-packages repository
https://github.com/void-linux/void-packages/pull/33119#issuecomment-929382613
Comment:
Making `xsltproc` depend on `xsltproc`? Interesting. Thanks!
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: libxslt: fix manpage + remove second distfile
2021-09-25 15:37 [PR PATCH] libxslt: fix manpage + remove second distfile meator
` (5 preceding siblings ...)
2021-09-28 16:22 ` meator
@ 2021-09-28 16:22 ` meator
2021-09-29 14:16 ` meator
2021-09-29 14:18 ` sgn
8 siblings, 0 replies; 10+ messages in thread
From: meator @ 2021-09-28 16:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 198 bytes --]
New comment by meator on void-packages repository
https://github.com/void-linux/void-packages/pull/33119#issuecomment-929382613
Comment:
Making `libxslt` depend on `libxslt`? Interesting. Thanks!
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: libxslt: fix manpage + remove second distfile
2021-09-25 15:37 [PR PATCH] libxslt: fix manpage + remove second distfile meator
` (6 preceding siblings ...)
2021-09-28 16:22 ` meator
@ 2021-09-29 14:16 ` meator
2021-09-29 14:18 ` sgn
8 siblings, 0 replies; 10+ messages in thread
From: meator @ 2021-09-29 14:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 186 bytes --]
New comment by meator on void-packages repository
https://github.com/void-linux/void-packages/pull/33119#issuecomment-930220135
Comment:
@sgn Why did you leave the second distfile in?
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: libxslt: fix manpage + remove second distfile
2021-09-25 15:37 [PR PATCH] libxslt: fix manpage + remove second distfile meator
` (7 preceding siblings ...)
2021-09-29 14:16 ` meator
@ 2021-09-29 14:18 ` sgn
8 siblings, 0 replies; 10+ messages in thread
From: sgn @ 2021-09-29 14:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 253 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/33119#issuecomment-930222071
Comment:
> @sgn Why did you leave the second distfile in?
I forget, I don't apply your changes, only leave your name there.
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2021-09-29 14:18 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-25 15:37 [PR PATCH] libxslt: fix manpage + remove second distfile meator
2021-09-27 4:02 ` [PR REVIEW] " ericonr
2021-09-27 14:54 ` meator
2021-09-28 12:37 ` [PR PATCH] [Updated] [WIP] " meator
2021-09-28 12:46 ` [PR REVIEW] " meator
2021-09-28 16:13 ` [PR PATCH] [Closed]: " sgn
2021-09-28 16:22 ` meator
2021-09-28 16:22 ` meator
2021-09-29 14:16 ` meator
2021-09-29 14:18 ` sgn
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).