From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] libxslt+xmlsec1: remove cross cruft
Date: Tue, 19 May 2020 17:21:42 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22135@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 385 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages remove-cross-cruft
https://github.com/void-linux/void-packages/pull/22135
libxslt+xmlsec1: remove cross cruft
@pullmoll affecting libreoffice
@Gottox maintainer
#19642
A patch file from https://github.com/void-linux/void-packages/pull/22135.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-remove-cross-cruft-22135.patch --]
[-- Type: text/x-diff, Size: 2798 bytes --]
From ab6c31e0ac6722f5cc2a45fe926d5b45310a7c37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx+sgn@gmail.com>
Date: Tue, 19 May 2020 21:55:50 +0700
Subject: [PATCH 1/2] libxslt: remove $XBPS_CROSS_BASE reference from
pkg-config
Partial-fixes: #19642
---
srcpkgs/libxslt/template | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libxslt/template b/srcpkgs/libxslt/template
index a488405bdb9..c35af48b073 100644
--- a/srcpkgs/libxslt/template
+++ b/srcpkgs/libxslt/template
@@ -1,7 +1,7 @@
# Template file for 'libxslt'
pkgname=libxslt
version=1.1.34
-revision=2
+revision=3
build_style=gnu-configure
configure_args="--disable-static --disable-dependency-tracking"
hostmakedepends="libtool"
@@ -34,7 +34,15 @@ post_configure() {
post_install() {
# Remove references to the install(1) wrapper.
- sed -e "s,${XBPS_WRAPPERDIR},/usr/bin,g" -i ${DESTDIR}/usr/bin/xslt-config
+ vsed -e "s,${XBPS_WRAPPERDIR},/usr/bin,g" -i ${DESTDIR}/usr/bin/xslt-config
+ if [ "$CROSS_BUILD" ]; then
+ # Remove $XBPS_CROSS_BASE in pkg-config
+ vsed -i -e "s,$XBPS_CROSS_BASE,,g" \
+ $DESTDIR/usr/bin/xslt-config \
+ $DESTDIR/usr/lib/xsltConf.sh \
+ $DESTDIR/usr/lib/pkgconfig/libxslt.pc \
+ $DESTDIR/usr/lib/pkgconfig/libexslt.pc
+ fi
vlicense COPYING
}
@@ -56,7 +64,6 @@ libxslt-devel_package() {
libxslt-python_package() {
lib32disabled=yes
short_desc+=" - python extension"
- pycompile_module="libxslt.py"
pkg_install() {
vmove "usr/lib/python*"
vmove usr/share/doc/${sourcepkg}-python-${version}
From f19e237764cda9d3b1ba615ae46bc8ceceb9bab7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx+sgn@gmail.com>
Date: Tue, 19 May 2020 21:55:50 +0700
Subject: [PATCH 2/2] xmlsec1: remove $XBPS_CROSS_BASE reference from
pkg-config
Partial-fixes: #19642
---
srcpkgs/xmlsec1/template | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xmlsec1/template b/srcpkgs/xmlsec1/template
index 1f28d8c0803..6f77396dec1 100644
--- a/srcpkgs/xmlsec1/template
+++ b/srcpkgs/xmlsec1/template
@@ -1,7 +1,7 @@
# Template file for 'xmlsec1'
pkgname=xmlsec1
version=1.2.30
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config gnutls-devel"
makedepends="libxslt-devel libltdl-devel libgcrypt-devel gnutls-devel
@@ -19,7 +19,10 @@ pre_configure() {
post_install() {
if [ "$CROSS_BUILD" ]; then
- vsed -e "s,${XBPS_CROSS_BASE},,g" -i ${DESTDIR}/usr/lib/xmlsec1Conf.sh
+ vsed -e "s,${XBPS_CROSS_BASE},,g" -i \
+ $DESTDIR/usr/bin/xmlsec1-config \
+ $DESTDIR/usr/lib/xmlsec1Conf.sh \
+ $DESTDIR/usr/lib/pkgconfig/xmlsec1-gnutls.pc
fi
vlicense COPYING
next reply other threads:[~2020-05-19 15:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-19 15:21 sgn [this message]
2020-05-20 1:06 ` [PR PATCH] [Updated] Remove $XBPS_CROSS_BASE cruft sgn
2020-05-20 14:29 ` [PR PATCH] [Closed]: " 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=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22135@inbox.vuxu.org \
--to=sgn@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).