From 27a236263d46e9b876c9d2430646eb21800f235f Mon Sep 17 00:00:00 2001 From: Juan RP <xtraeme@gmail.com> Date: Sun, 27 Nov 2011 16:34:31 +0100 Subject: [PATCH] ImageMagick: update to 6.7.3.8, bump a[bp]i_depends. --- common/shlibs | 6 ++--- srcpkgs/ImageMagick/ImageMagick.rshlibs | 4 +-- srcpkgs/ImageMagick/depends | 2 ++ srcpkgs/ImageMagick/libmagick-perl.rshlibs | 2 +- srcpkgs/ImageMagick/libmagick-perl.template | 8 ++---- srcpkgs/ImageMagick/libmagick.rshlibs | 2 ++ srcpkgs/ImageMagick/libmagick.template | 11 +++----- srcpkgs/ImageMagick/template | 29 +++++++++++++++------ 8 files changed, 36 insertions(+), 28 deletions(-) create mode 100644 srcpkgs/ImageMagick/depends diff --git a/common/shlibs b/common/shlibs index 0346686de3..93cf12d397 100644 --- a/common/shlibs +++ b/common/shlibs @@ -311,9 +311,9 @@ liblcms.so.1 lcms lcms-devel libgd.so.2 gd gd-devel libcroco-0.6.so.3 libcroco libcroco-devel libgsf-1.so.114 libgsf libgsf-devel -libMagickCore.so.4 libmagick libmagick-devel -libMagickWand.so.4 libmagick libmagick-devel -libMagick++.so.4 libmagick libmagick-devel +libMagickCore.so.5 libmagick libmagick-devel +libMagickWand.so.5 libmagick libmagick-devel +libMagick++.so.5 libmagick libmagick-devel libltdl.so.7 libltdl libltdl-devel libpoppler-glib.so.8 poppler-glib poppler-glib-devel libpoppler.so.18 poppler poppler-devel diff --git a/srcpkgs/ImageMagick/ImageMagick.rshlibs b/srcpkgs/ImageMagick/ImageMagick.rshlibs index 493344944b..b0cdfe1a54 100644 --- a/srcpkgs/ImageMagick/ImageMagick.rshlibs +++ b/srcpkgs/ImageMagick/ImageMagick.rshlibs @@ -1,4 +1,4 @@ -libMagickCore.so.4 -libMagickWand.so.4 libpthread.so.0 libc.so.6 +libMagickCore.so.5 +libMagickWand.so.5 diff --git a/srcpkgs/ImageMagick/depends b/srcpkgs/ImageMagick/depends new file mode 100644 index 0000000000..b3e59e2155 --- /dev/null +++ b/srcpkgs/ImageMagick/depends @@ -0,0 +1,2 @@ +abi_depends=">=6.7.3.8" +api_depends="${abi_depends}" diff --git a/srcpkgs/ImageMagick/libmagick-perl.rshlibs b/srcpkgs/ImageMagick/libmagick-perl.rshlibs index d85f7c693b..b60cb7ee79 100644 --- a/srcpkgs/ImageMagick/libmagick-perl.rshlibs +++ b/srcpkgs/ImageMagick/libmagick-perl.rshlibs @@ -1,4 +1,4 @@ -libMagickCore.so.4 libperl.so libm.so.6 libc.so.6 +libMagickCore.so.5 diff --git a/srcpkgs/ImageMagick/libmagick-perl.template b/srcpkgs/ImageMagick/libmagick-perl.template index 86fa0393f2..835fc77fd2 100644 --- a/srcpkgs/ImageMagick/libmagick-perl.template +++ b/srcpkgs/ImageMagick/libmagick-perl.template @@ -1,16 +1,12 @@ # Template file for 'libmagick-perl'. # -revision=1 short_desc="ImageMagick perl library bindings" long_desc="${long_desc} This package contains the perl bindings for libmagick." - do_install() { - mkdir -p ${DESTDIR}/usr/share/man ${DESTDIR}/usr/lib - - mv ${SRCPKGDESTDIR}/usr/lib/perl5 ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/share/man/man3 ${DESTDIR}/usr/share/man + vmove usr/lib/perl5 usr/lib + vmove usr/share/man/man3 usr/share/man } diff --git a/srcpkgs/ImageMagick/libmagick.rshlibs b/srcpkgs/ImageMagick/libmagick.rshlibs index 3dbeabb571..0fe996adf6 100644 --- a/srcpkgs/ImageMagick/libmagick.rshlibs +++ b/srcpkgs/ImageMagick/libmagick.rshlibs @@ -33,3 +33,5 @@ libwmflite-0.2.so.7 libpng14.so.14 libstdc++.so.6 libgcc_s.so.1 +libpangoft2-1.0.so.0 +libpango-1.0.so.0 diff --git a/srcpkgs/ImageMagick/libmagick.template b/srcpkgs/ImageMagick/libmagick.template index fd90cd4138..b14d6880e6 100644 --- a/srcpkgs/ImageMagick/libmagick.template +++ b/srcpkgs/ImageMagick/libmagick.template @@ -8,14 +8,9 @@ long_desc="${long_desc} replaces="ImageMagick<6.5.9" -revision=5 - do_install() { - mkdir -p ${DESTDIR}/usr/share ${DESTDIR}/usr/lib - - mv ${SRCPKGDESTDIR}/usr/lib/libMagick*.so* ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/libMagick*.la ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/ImageMagick* ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/share/ImageMagick* ${DESTDIR}/usr/share + vmove "usr/lib/libMagick*.so*" usr/lib + vmove "usr/lib/ImageMagick*" usr/lib + vmove "usr/share/ImageMagick*" usr/share } diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template index d278dad3c1..9209edb25a 100644 --- a/srcpkgs/ImageMagick/template +++ b/srcpkgs/ImageMagick/template @@ -1,9 +1,8 @@ # Template file for 'ImageMagick' pkgname=ImageMagick -_distver=6.7.0 -_distverpatch=10 +_distver=6.7.3 +_distverpatch=8 version=${_distver}.${_distverpatch} -revision=3 wrksrc=${pkgname}-${_distver}-${_distverpatch} distfiles="http://ftp.nluug.nl/$pkgname/$pkgname-${_distver}-${_distverpatch}.tar.xz" build_style=gnu-configure @@ -15,7 +14,7 @@ short_desc="Package for display and interactive manipulation of images" maintainer="Juan RP <xtraeme@gmail.com>" homepage="http://www.imagemagick.org/" license="${pkgname}, MIT" -checksum=8c10d2f2c382c0efdc1307591a5ab3bbabffa4a031253d56b207576736c6fac9 +checksum=e89a7113484bb90a226c44f9173271e8f77e24190ad73a83147ca0004c45ce49 long_desc=" ImageMagick TM, is a package for display and interactive manipulation of images for the X Window System. It is written in C and interfaces @@ -30,12 +29,25 @@ long_desc=" color reduce, or add special effects to an image and save your completed work in the same or differing image format." +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" + keep_libtool_archives=yes subpackages="libmagick libmagick-devel libmagick-perl" - Add_dependency build pkg-config -Add_dependency build lcms-devel Add_dependency build lcms2-devel Add_dependency build libwebp-devel Add_dependency build tiff-devel @@ -62,8 +74,9 @@ Add_dependency build libwmf-devel Add_dependency build libstdc++-devel Add_dependency build fftw-devel -post_install() -{ +post_install() { vinstall LICENSE 644 usr/share/licenses/${pkgname} vinstall NOTICE 644 usr/share/licenses/${pkgname} + # we don't need the libtool archives anymore + find ${DESTDIR} -type f -name *.la -delete }