From 10bd0dc7ef10ccfa94449288a955ddf350ae0095 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 27 May 2012 13:01:14 +0200 Subject: [PATCH] ImageMagick: rebuild against perl-5.16 and glib-2.32. --- srcpkgs/ImageMagick/libmagick-devel.template | 22 +++++++------------- srcpkgs/ImageMagick/libmagick-perl.template | 4 ++-- srcpkgs/ImageMagick/libmagick.rshlibs | 3 --- srcpkgs/ImageMagick/template | 4 ++-- 4 files changed, 12 insertions(+), 21 deletions(-) diff --git a/srcpkgs/ImageMagick/libmagick-devel.template b/srcpkgs/ImageMagick/libmagick-devel.template index 4f47450e649..35f9f7fb96c 100644 --- a/srcpkgs/ImageMagick/libmagick-devel.template +++ b/srcpkgs/ImageMagick/libmagick-devel.template @@ -1,23 +1,17 @@ # Template file for 'libmagick-devel'. # -depends="pkg-config lcms-devel tiff-devel freetype-devel jpeg-devel fontconfig-devel libXext-devel libXt-devel bzip2-devel zlib-devel glibc-devel libltdl-devel libSM-devel libICE-devel libX11-devel libgomp libxml2-devel libpng-devel librsvg-devel gtk+-devel cairo-devel glib-devel libwmf-devel libstdc++-devel libmagick" +depends="libmagick>=$version" short_desc="ImageMagick low-level image manipulation development files" long_desc="${long_desc} This package contains headers and other related development files with MagickCore." - -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib ${DESTDIR}/usr/bin \ - ${DESTDIR}/usr/share/man/man1 - - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/bin/*-config ${DESTDIR}/usr/bin - mv ${SRCPKGDESTDIR}/usr/share/doc ${DESTDIR}/usr/share - mv ${SRCPKGDESTDIR}/usr/share/man/man1/*-config.1 \ - ${DESTDIR}/usr/share/man/man1 +do_install() { + vmove usr/include usr + vmove "usr/lib/*.a" usr/lib + vmove usr/lib/pkgconfig usr/lib + vmove "usr/bin/*-config" usr/bin + vmove usr/share/doc usr/share + vmove "usr/share/man/man1/*-config.1" usr/share/man/man1 } diff --git a/srcpkgs/ImageMagick/libmagick-perl.template b/srcpkgs/ImageMagick/libmagick-perl.template index 835fc77fd22..e5f45967386 100644 --- a/srcpkgs/ImageMagick/libmagick-perl.template +++ b/srcpkgs/ImageMagick/libmagick-perl.template @@ -1,12 +1,12 @@ # Template file for 'libmagick-perl'. # +depends="perl>=5.16" short_desc="ImageMagick perl library bindings" long_desc="${long_desc} This package contains the perl bindings for libmagick." -do_install() -{ +do_install() { 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 7346bfbf50a..6d1e86c0f7c 100644 --- a/srcpkgs/ImageMagick/libmagick.rshlibs +++ b/srcpkgs/ImageMagick/libmagick.rshlibs @@ -20,10 +20,7 @@ librsvg-2.so.2 libgio-2.0.so.0 libgdk_pixbuf-2.0.so.0 libcairo.so.2 -libgmodule-2.0.so.0 libgobject-2.0.so.0 -libgthread-2.0.so.0 -librt.so.1 libglib-2.0.so.0 libxml2.so.2 libwebp.so.2 diff --git a/srcpkgs/ImageMagick/template b/srcpkgs/ImageMagick/template index cecd2ed9b95..454fceb6ee7 100644 --- a/srcpkgs/ImageMagick/template +++ b/srcpkgs/ImageMagick/template @@ -3,6 +3,7 @@ pkgname=ImageMagick _distver=6.7.5 _distverpatch=3 version=${_distver}.${_distverpatch} +revision=1 wrksrc=${pkgname}-${_distver}-${_distverpatch} distfiles="http://ftp.nluug.nl/$pkgname/$pkgname-${_distver}-${_distverpatch}.tar.xz" build_style=gnu-configure @@ -10,7 +11,7 @@ configure_args="--without-gslib --without-jp2 --without-autotrace --without-dps --without-fpx --without-gvc --without-jbig --without-lqr --without-openexr --with-gs-font-dir=/usr/share/fonts/Type1 --with-magick-plus-plus --with-modules -with-perl --enable-shared" -makedepends="pkg-config jpeg-devel libpng-devel tiff-devel lcms2-devel freetype-devel libwebp-devel fontconfig-devel libXext-devel libXt-devel libltdl-devel libxml2-devel glib-devel cairo-devel librsvg-devel gtk+-devel libwmf-devel fftw-devel djvulibre-devel" +makedepends="pkg-config perl>=5.16 jpeg-devel libpng-devel tiff-devel lcms2-devel freetype-devel libwebp-devel fontconfig-devel libXext-devel libXt-devel libltdl-devel libxml2-devel glib-devel cairo-devel librsvg-devel gtk+-devel libwmf-devel fftw-devel djvulibre-devel liblzma-devel libgomp-devel" short_desc="Package for display and interactive manipulation of images" maintainer="Juan RP " homepage="http://www.imagemagick.org/" @@ -48,7 +49,6 @@ conf_files=" keep_libtool_archives=yes subpackages="libmagick libmagick-devel libmagick-perl" - post_install() { vinstall LICENSE 644 usr/share/licenses/${pkgname} vinstall NOTICE 644 usr/share/licenses/${pkgname}