From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] libxslt: fix cross config; recoll update to 1.30.0
Date: Thu, 08 Apr 2021 03:46:59 +0200 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-30086@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1634 bytes --]
There is a new pull request by sgn against master on the void-packages repository
https://github.com/sgn/void-packages libxslt-fix-config-recoll-bump-1.30.0
https://github.com/void-linux/void-packages/pull/30086
libxslt: fix cross config; recoll update to 1.30.0
<!-- Mark items with [x] where applicable -->
#### 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
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] 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/30086.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libxslt-fix-config-recoll-bump-1.30.0-30086.patch --]
[-- Type: text/x-diff, Size: 4428 bytes --]
From a339b4e22f7e8242b16a24ea36443dce10d8b147 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Thu, 8 Apr 2021 08:12:32 +0700
Subject: [PATCH 1/2] libxslt: fix xslt-config
---
srcpkgs/libxslt/template | 27 ++++++++++-----------------
1 file changed, 10 insertions(+), 17 deletions(-)
diff --git a/srcpkgs/libxslt/template b/srcpkgs/libxslt/template
index e38b28fff11b..42d80f08ac98 100644
--- a/srcpkgs/libxslt/template
+++ b/srcpkgs/libxslt/template
@@ -1,10 +1,10 @@
# Template file for 'libxslt'
pkgname=libxslt
version=1.1.34
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--disable-static --disable-dependency-tracking"
-hostmakedepends="libtool"
+hostmakedepends="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>"
@@ -15,33 +15,26 @@ distfiles="http://xmlsoft.org/sources/libxslt-${version}.tar.gz
checksum="98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f
98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f"
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends="libtool automake gettext-devel ${makedepends}"
- pre_build() {
- sed -e "s|/usr/\(include/python2.7\)|$XBPS_CROSS_BASE/\1|g" \
- -e "s|/usr/\(lib/python2.7/site-packages\)|$XBPS_CROSS_BASE/\1|g" \
- -i python/Makefile
- }
-fi
-
post_configure() {
# Remove missing seperators and errors
# on don't know how to make target, needed
# by Usage:
# Makefile is created after configure so fix here
find ${wrksrc} -type f -name Makefile | xargs sed -i '/Usage/,/--version/d'
+ if [ "$CROSS_BUILD" ]; then
+ sed -e "s|/usr/include/python2.7|$XBPS_CROSS_BASE/&|g" \
+ -e "s|/usr/lib/python2.7/site-packages|$XBPS_CROSS_BASE/&|g" \
+ -i python/Makefile
+ fi
}
post_install() {
- # Remove references to the install(1) wrapper.
- 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,-I${XBPS_CROSS_BASE}/usr/include,-I\${includedir}," \
+ $DESTDIR/usr/bin/xslt-config
vsed -i -e "s,$XBPS_CROSS_BASE,,g" \
- $DESTDIR/usr/bin/xslt-config \
- $DESTDIR/usr/lib/pkgconfig/libxslt.pc \
- $DESTDIR/usr/lib/pkgconfig/libexslt.pc \
- $DESTDIR/usr/lib/xsltConf.sh
+ $DESTDIR/usr/lib/pkgconfig/libexslt.pc
fi
vlicense COPYING
}
From 5475a32a1beb0aea52d6f2dbd709b39c03332040 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
<congdanhqx@gmail.com>
Date: Tue, 6 Apr 2021 22:46:16 +0700
Subject: [PATCH 2/2] recoll: update to 1.30.0.
---
srcpkgs/recoll/template | 21 +++++----------------
1 file changed, 5 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/recoll/template b/srcpkgs/recoll/template
index 98fda41bbcad..8c5de6966a46 100644
--- a/srcpkgs/recoll/template
+++ b/srcpkgs/recoll/template
@@ -1,12 +1,13 @@
# Template file for 'recoll'
pkgname=recoll
-version=1.26.1
-revision=2
+version=1.30.0
+revision=1
build_style=gnu-configure
build_helper=qmake
configure_args="--disable-python-module --disable-python-chm
--enable-recollq --disable-x11mon"
-hostmakedepends="automake libtool gettext-devel qt5-qmake"
+hostmakedepends="automake libtool gettext-devel qt5-qmake pkg-config
+ qt5-host-tools"
makedepends="xapian-core-devel zlib-devel libuuid-devel qt5-webkit-devel qt5-devel
aspell-devel libxslt-devel libxml2-devel"
short_desc="Full text search tool based on Xapian backend"
@@ -14,16 +15,4 @@ maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
license="GPL-2.0-or-later"
homepage="https://www.lesbonscomptes.com/recoll/"
distfiles="https://www.lesbonscomptes.com/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=438f251c24baf954020cf3298872c74982f4c4abffd10197d7700db83072e732
-
-if [ "$CROSS_BUILD" ]; then
- hostmakedepends+=" qt5-host-tools qt5-devel qt5-webkit-devel"
-
- pre_configure() {
- # xslt-config has the libxml2 hardcoded to /usr/include/libxml2
- # use cross path instead.
- vsed -e 's;-I/usr/include/libxml2;-I${includedir}/libxml2;' \
- -e 's;libs="-lxslt -L/usr/lib -lxml2";libs="-lxslt -lxml2";g' \
- -i ${XBPS_WRAPPERDIR}/xslt-config
- }
-fi
+checksum=17a8e684a8d5560dc7b44cd4b2962cb46476a75bdc107f622051235076d11885
next reply other threads:[~2021-04-08 1:47 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-08 1:46 sgn [this message]
2021-04-08 1:50 ` [PR REVIEW] " sgn
2021-04-08 9:53 ` Veganizer
2021-04-08 10:00 ` Veganizer
2021-04-08 12:39 ` [PR PATCH] [Updated] " sgn
2021-04-14 23:41 ` [PR PATCH] [Merged]: " 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-30086@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).