From: meator <meator@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] [WIP] libxslt: fix manpage + remove second distfile
Date: Tue, 28 Sep 2021 14:37:01 +0200 [thread overview]
Message-ID: <20210928123701.r0uprjGanOUSmFC03bUIWF_biVI8zeyoXXWJ20yGugM@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-33119@inbox.vuxu.org>
[-- 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
next prev parent reply other threads:[~2021-09-28 12:37 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-25 15:37 [PR PATCH] " meator
2021-09-27 4:02 ` [PR REVIEW] " ericonr
2021-09-27 14:54 ` meator
2021-09-28 12:37 ` meator [this message]
2021-09-28 12:46 ` 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210928123701.r0uprjGanOUSmFC03bUIWF_biVI8zeyoXXWJ20yGugM@z \
--to=meator@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).