From d42d493b99ce03dd1e6f25c2e30faf7cdfbec2e6 Mon Sep 17 00:00:00 2001 From: Alessio Sergi Date: Sat, 24 Jan 2015 00:00:00 +0100 Subject: [PATCH] ImageMagick: update to 6.9.0-4 Fix conf_files. Delete obsolete shlibs. Add update-check support. --- common/shlibs | 3 --- srcpkgs/ImageMagick/template | 35 ++++++++++++++++------------------- srcpkgs/ImageMagick/update | 2 ++ 3 files changed, 18 insertions(+), 22 deletions(-) create mode 100644 srcpkgs/ImageMagick/update diff --git a/common/shlibs b/common/shlibs index 0a6f7a7bcd2..7f887a9c06c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -332,9 +332,6 @@ liblcms.so.1 lcms-1.18_1 libgd.so.3 gd-2.1.0_1 libcroco-0.6.so.3 libcroco-0.6.2_1 libgsf-1.so.114 libgsf-1.14.11_1 -libMagickCore.so.6 libmagick-6.8.0.7_1 -libMagickWand.so.6 libmagick-6.8.0.7_1 -libMagick++.so.6 libmagick-6.8.0.7_1 libMagickCore-6.Q16.so.2 libmagick-6.8.8.4_1 libMagickWand-6.Q16.so.2 libmagick-6.8.8.4_1 libMagick++-6.Q16.so.5 libmagick-6.8.9.5_1 diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template index 3fa427497c7..a9a1c1143bd 100644 --- a/srcpkgs/ImageMagick/template +++ b/srcpkgs/ImageMagick/template @@ -1,7 +1,7 @@ # Template file for 'ImageMagick' pkgname=ImageMagick _majorver=6.9.0 -_patchver=0 +_patchver=4 version=${_majorver}.${_patchver} revision=1 wrksrc=${pkgname}-${_majorver}-${_patchver} @@ -9,38 +9,36 @@ build_style=gnu-configure configure_args="--without-autotrace --with-wmf=yes --without-dps --without-fpx --without-gvc --without-jbig --with-gslib=yes --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1 - --with-magick-plus-plus --with-modules -with-perl --enable-shared --with-rsvg + --with-magick-plus-plus --with-modules --with-perl --enable-shared --with-rsvg --with-dejavu-font-dir=/usr/share/fonts/TTF --enable-opencl --disable-static" short_desc="Package for display and interactive manipulation of images" maintainer="Juan RP " homepage="http://www.imagemagick.org/" license="ImageMagick" distfiles="http://mirror.searchdaimon.com/${pkgname}/${pkgname}-${_majorver}-${_patchver}.tar.xz" -checksum=12331c904c691cb128865fdc97e5f8a2654576f9b032e274b74dd7617aa1b9b6 +checksum=996aa8081dced3f3bbf23d90fca861b30332f734329f89367c6fc35173a74957 keep_libtool_archives=yes - hostmakedepends="pkg-config perl>=5.20" makedepends="perl>=5.20 libjpeg-turbo-devel libpng-devel>=1.6 tiff-devel lcms2-devel freetype-devel libwebp-devel>=0.4.0 fontconfig-devel libXext-devel libXt-devel libltdl-devel libxml2-devel glib-devel pango-devel gdk-pixbuf-devel libwmf-devel fftw-devel djvulibre-devel liblzma-devel libgomp-devel librsvg-devel ghostscript-devel ocl-icd-devel" - conf_files=" - /etc/ImageMagick/coder.xml - /etc/ImageMagick/colors.xml - /etc/ImageMagick/delegates.xml - /etc/ImageMagick/log.xml - /etc/ImageMagick/magic.xml - /etc/ImageMagick/mime.xml - /etc/ImageMagick/policy.xml - /etc/ImageMagick/sRGB.icc - /etc/ImageMagick/thresholds.xml - /etc/ImageMagick/type.xml - /etc/ImageMagick/type-dejavu.xml - /etc/ImageMagick/type-ghostscript.xml - /etc/ImageMagick/type-windows.xml" + /etc/ImageMagick-${_majorver%%.*}/coder.xml + /etc/ImageMagick-${_majorver%%.*}/colors.xml + /etc/ImageMagick-${_majorver%%.*}/delegates.xml + /etc/ImageMagick-${_majorver%%.*}/log.xml + /etc/ImageMagick-${_majorver%%.*}/magic.xml + /etc/ImageMagick-${_majorver%%.*}/mime.xml + /etc/ImageMagick-${_majorver%%.*}/policy.xml + /etc/ImageMagick-${_majorver%%.*}/quantization-table.xml + /etc/ImageMagick-${_majorver%%.*}/thresholds.xml + /etc/ImageMagick-${_majorver%%.*}/type.xml + /etc/ImageMagick-${_majorver%%.*}/type-dejavu.xml + /etc/ImageMagick-${_majorver%%.*}/type-ghostscript.xml + /etc/ImageMagick-${_majorver%%.*}/type-windows.xml" post_install() { vlicense LICENSE @@ -49,7 +47,6 @@ post_install() { libmagick_package() { short_desc="ImageMagick low-level image manipulation libraries" - replaces="ImageMagick<6.5.9" pkg_install() { vmove "usr/lib/libMagick*.so.*" vmove "usr/lib/ImageMagick*" diff --git a/srcpkgs/ImageMagick/update b/srcpkgs/ImageMagick/update new file mode 100644 index 00000000000..6823613abfe --- /dev/null +++ b/srcpkgs/ImageMagick/update @@ -0,0 +1,2 @@ +site="http://www.imagemagick.org/download/" +pattern="${pkgname}-\K[\d.-]+(?=\.tar\.xz)"