From 89c42f51d3103948a5f4fd05dcf10175553542cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= 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 " @@ -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 74ebda92b8bf5495b91fa79b7ee6dbb96a927264 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Tue, 6 Apr 2021 22:46:16 +0700 Subject: [PATCH 2/2] recoll: update to 1.30.0. --- .../patches/{musl-pxattr.patch => musl.patch} | 14 +++++++++++++ srcpkgs/recoll/template | 21 +++++-------------- 2 files changed, 19 insertions(+), 16 deletions(-) rename srcpkgs/recoll/patches/{musl-pxattr.patch => musl.patch} (52%) diff --git a/srcpkgs/recoll/patches/musl-pxattr.patch b/srcpkgs/recoll/patches/musl.patch similarity index 52% rename from srcpkgs/recoll/patches/musl-pxattr.patch rename to srcpkgs/recoll/patches/musl.patch index 22cee3331302..c57aca4a565d 100644 --- a/srcpkgs/recoll/patches/musl-pxattr.patch +++ b/srcpkgs/recoll/patches/musl.patch @@ -1,3 +1,17 @@ +Index: utils/fstreewalk.cpp +=================================================================== +--- utils/fstreewalk.cpp.orig ++++ utils/fstreewalk.cpp +@@ -17,6 +17,7 @@ + + #include "autoconfig.h" + ++#include + #include + + #include +Index: utils/pxattr.cpp +=================================================================== --- utils/pxattr.cpp 2017-07-03 14:14:46.000000000 +0200 +++ utils/pxattr.cpp 2017-12-17 14:34:29.955674837 +0100 @@ -44,7 +44,7 @@ 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 " 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