From 96aaa52d0c3eb36eaa2580e3b167731a24f061ba Mon Sep 17 00:00:00 2001 From: "J. Peter Mugaas" Date: Sun, 25 Feb 2018 23:24:54 -0500 Subject: [PATCH] mingw-w64-graphicsmagick 1.3.28 - Update to latest version and make sure that path references are valid for the user's system. (#3435) --- mingw-w64-graphicsmagick/PKGBUILD | 33 ++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/mingw-w64-graphicsmagick/PKGBUILD b/mingw-w64-graphicsmagick/PKGBUILD index 9645c395e0..711123f3a3 100644 --- a/mingw-w64-graphicsmagick/PKGBUILD +++ b/mingw-w64-graphicsmagick/PKGBUILD @@ -3,7 +3,7 @@ _realname=graphicsmagick pkgbase=mingw-w64-${_realname} pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=1.3.27 +pkgver=1.3.28 pkgrel=1 pkgdesc="An image viewing/manipulation program (mingw-w64)" arch=('any') @@ -36,13 +36,34 @@ optdepends=("${MINGW_PACKAGE_PREFIX}-ghostscript: for Ghostscript support" options=('staticlibs' 'strip' 'libtool') source=(https://sourceforge.net/projects/graphicsmagick/files/${_realname}/${pkgver}/GraphicsMagick-${pkgver}.tar.xz 001-relocate.patch) -sha256sums=('d03278d2790efc1dc72309f85a539810d2a81deb47932f7e6720d09ac72d0367' +sha256sums=('942a68a9a8a5af6f682b896fd4f0ad617d8b49907e474acfe59549956bcc994a' 'd960ba9ebb98acc922794315913e743938fb0b903aa3ab0652eb653e2641b232') +# Helper macros to help make tasks easier # +apply_patch_with_msg() { + for _patch in "$@" + do + msg2 "Applying $_patch" + patch -Nbp1 -i "${srcdir}/$_patch" + done +} + +del_file_exists() { + for _fname in "$@" + do + if [ -f $_fname ]; then + rm -rf $_fname + fi + done +} +# =========================================== # + prepare() { cd GraphicsMagick-${pkgver} + del_file_exists \ + magick/pathtools.c \ + magick/pathtools.h patch -p1 -i ${srcdir}/001-relocate.patch - autoreconf -fiv } @@ -78,4 +99,10 @@ build() { package() { cd ${srcdir}/build-${MINGW_CHOST} make -j1 DESTDIR="${pkgdir}" install + local PREFIX_WIN=$(cygpath -m ${MINGW_PREFIX}) + # fix path references in some files. + find ${pkgdir}${MINGW_PREFIX}/bin -name "*-config" -exec \ + sed "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i {} \; + find ${pkgdir}${MINGW_PREFIX}/ -name "*.la" -exec \ + sed "s|${PREFIX_WIN}|${MINGW_PREFIX}|g" -i {} \; }