From c00e09ecd9c78e4662474367b28e33edbdfd6539 Mon Sep 17 00:00:00 2001 From: Alexey Pavlov Date: Tue, 13 Oct 2020 12:24:57 +0300 Subject: [PATCH] libxml++2.6: Update to 2.42.0, port to meson --- mingw-w64-libxml++2.6/PKGBUILD | 37 ++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/mingw-w64-libxml++2.6/PKGBUILD b/mingw-w64-libxml++2.6/PKGBUILD index 8678dcba52..959f4d251b 100644 --- a/mingw-w64-libxml++2.6/PKGBUILD +++ b/mingw-w64-libxml++2.6/PKGBUILD @@ -3,19 +3,22 @@ _realname=libxml++ pkgbase=mingw-w64-${_realname}2.6 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}2.6" -pkgver=2.40.1 +pkgver=2.42.0 pkgrel=1 arch=('any') pkgdesc="C++ wrapper for the libxml2 XML parser library (mingw-w64)" depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs" "${MINGW_PACKAGE_PREFIX}-libxml2" "${MINGW_PACKAGE_PREFIX}-glibmm") -makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config") +makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" + "${MINGW_PACKAGE_PREFIX}-meson" + "${MINGW_PACKAGE_PREFIX}-ninja" + "${MINGW_PACKAGE_PREFIX}-pkg-config") options=('strip' 'staticlibs') license=('LGPL') url="https://libxmlplusplus.sourceforge.io/" source=("https://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz") -sha256sums=('4ad4abdd3258874f61c2e2a41d08e9930677976d303653cd1670d3e9f35463e9') +sha256sums=('3d032aede98a033eb5e815b4bfa9fa7b4e745268e6fd1ce8b1d0f70bcaf4736d') prepare() { cd "${srcdir}/${_realname}-${pkgver}" @@ -25,21 +28,25 @@ build() { [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}" mkdir "${srcdir}/build-${MINGW_CHOST}" cd "${srcdir}/build-${MINGW_CHOST}" - ../${_realname}-${pkgver}/configure \ - --prefix=${MINGW_PREFIX} \ - --host=${MINGW_CHOST} \ - --target=${MINGW_CHOST} \ - --build="${MINGW_CHOST}" \ - --disable-static \ - --enable-shared + + meson \ + --buildtype plain \ + --auto-features=enabled \ + --prefix=${MINGW_PREFIX} \ + -Dbuild-documentation=true \ + ../${_realname}-${pkgver} - # Hack for mingw python - local PREFIX_DEPS=$(cygpath -am ${MINGW_PREFIX}) - find . -type f -name "Makefile" -exec sed -i "s|${PREFIX_DEPS}|${MINGW_PREFIX}|g" {} \; - make + ninja } package() { cd "${srcdir}/build-${MINGW_CHOST}" - make install DESTDIR="${pkgdir}" + DESTDIR=${pkgdir}${MINGW_PREFIX} ninja install + + local _PRE_WIN="$(cygpath -m ${MINGW_PREFIX})" + for pcfile in "${pkgdir}${MINGW_PREFIX}"/lib/pkgconfig/*.pc; do + sed -s "s|${_PRE_WIN}|${MINGW_PREFIX}|g" -i "${pcfile}" + done + + install -Dm644 ${srcdir}/${_realname}-${pkgver}/COPYING "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}2.6/COPYING" }