From 48691928b1668a03c00e0b5bb47bb6a04e925847 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Wed, 16 Feb 2022 20:28:08 +0100 Subject: [PATCH] gl2ps: rebuild Fix reference to libm Port to ninja while at it --- mingw-w64-gl2ps/PKGBUILD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mingw-w64-gl2ps/PKGBUILD b/mingw-w64-gl2ps/PKGBUILD index 47ee446759..97d63fe6cb 100644 --- a/mingw-w64-gl2ps/PKGBUILD +++ b/mingw-w64-gl2ps/PKGBUILD @@ -7,7 +7,7 @@ _realname=gl2ps pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" pkgver=1.4.2 -pkgrel=1 +pkgrel=2 pkgdesc="an OpenGL to PostScript printing library (mingw-w64)" arch=('any') mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32') @@ -15,6 +15,7 @@ url='https://geuz.org/gl2ps/' license=('LGPL') depends=("${MINGW_PACKAGE_PREFIX}-libpng") makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" + "${MINGW_PACKAGE_PREFIX}-ninja" "${MINGW_PACKAGE_PREFIX}-cc") source=("https://geuz.org/gl2ps/src/gl2ps-${pkgver}.tgz" "0001-MSYS2-FHS-layout.patch") @@ -33,18 +34,17 @@ build() { MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \ ${MINGW_PREFIX}/bin/cmake \ - -G"MSYS Makefiles" \ + -GNinja \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ - -DMATH_LIBRARY=${MINGW_PREFIX}/${MINGW_CHOST}/lib/libm.a \ ../${_realname}-${pkgver} - make + "${MINGW_PREFIX}"/bin/cmake.exe --build . } package() { cd "${srcdir}/build-${MINGW_CHOST}" - make DESTDIR=${pkgdir} install + DESTDIR="${pkgdir}" "${MINGW_PREFIX}"/bin/cmake.exe --install . install -Dm644 ${srcdir}/${_realname}-${pkgver}/COPYING.LGPL ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING.LGPL install -Dm644 ${srcdir}/${_realname}-${pkgver}/COPYING.GL2PS ${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING.GL2PS }