wok-next diff imagemagick/receipt @ rev 20424

linux-dev: move creation to compile_rules(), keep genpkg_rules() for copying/splitting only
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri Jan 12 17:02:57 2018 +0200 (2018-01-12)
parents f445ca69a6a7
children bce36a298f1e
line diff
     1.1 --- a/imagemagick/receipt	Mon Jun 19 15:13:40 2017 +0300
     1.2 +++ b/imagemagick/receipt	Fri Jan 12 17:02:57 2018 +0200
     1.3 @@ -1,22 +1,23 @@
     1.4  # SliTaz package receipt v2.
     1.5  
     1.6  PACKAGE="imagemagick"
     1.7 -VERSION="7.0.5-5"
     1.8 +VERSION="7.0.6-10"
     1.9  CATEGORY="graphics"
    1.10  SHORT_DESC="ImageMagick - convert, edit, and compose images"
    1.11  MAINTAINER="pankso@slitaz.org"
    1.12  LICENSE="Apache"
    1.13 -WEB_SITE="http://www.imagemagick.org/"
    1.14 +WEB_SITE="https://www.imagemagick.org/script/index.php"
    1.15 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/imagemagick.html"
    1.16  
    1.17  TARBALL="ImageMagick-$VERSION.tar.xz"
    1.18  WGET_URL="https://www.imagemagick.org/download/releases/$TARBALL"
    1.19  
    1.20  BUILD_DEPENDS="bzip2-dev xorg-libX11-dev xorg-libICE-dev xorg-libXext-dev \
    1.21  xorg-libXt-dev zlib-dev libtool fftw-dev fontconfig-dev freetype-dev \
    1.22 -libjpeg-turbo-dev lcms2-dev xz-dev pango-dev libpng-dev tiff-dev \
    1.23 -libxml2-dev librsvg-dev perl-dev util-linux-uuid-dev"
    1.24 -# jasper-dev ilmbase-dev openexr-dev graphviz-dev libgsf-dev
    1.25 -SPLIT="imagemagick-dev perl-image-magick"
    1.26 +libjpeg-turbo-dev lcms2-dev xz-dev pango-dev libpng16-dev tiff-dev \
    1.27 +libxml2-dev librsvg-dev perl-dev util-linux-uuid-dev jasper-dev ilmbase-dev \
    1.28 +openexr-dev libgsf-dev" # graphviz-dev
    1.29 +SPLIT="perl-image-magick imagemagick imagemagick-dev"
    1.30  
    1.31  # Rules to configure and make the package.
    1.32  compile_rules()
    1.33 @@ -40,8 +41,13 @@
    1.34  genpkg_rules()
    1.35  {
    1.36  	case $PACKAGE in
    1.37 +		perl-image-magick)
    1.38 +			copy perl5/
    1.39 +			CAT="perl|Image::Magick Perl module"
    1.40 +			DEPENDS="perl imagemagick"
    1.41 +			;;
    1.42  		imagemagick)
    1.43 -			copy @std
    1.44 +			copy @std @rm
    1.45  
    1.46  			# CVE-2016-3714 work around v5
    1.47  			sed -i '/<policymap>/r/dev/stdin' $fs/etc/ImageMagick-7/policy.xml <<EOT
    1.48 @@ -57,7 +63,7 @@
    1.49  EOT
    1.50  			DEPENDS="bzlib cairo fftw fontconfig freetype gdk-pixbuf glib \
    1.51  			harfbuzz lcms2 libcroco libffi libgomp libjpeg-turbo \
    1.52 -			libltdl liblzma libpng librsvg libxcb libxml2 pango pcre pixman \
    1.53 +			libltdl liblzma libpng16 librsvg libxcb libxml2 pango pcre pixman \
    1.54  			tiff util-linux-uuid xorg-libICE xorg-libSM xorg-libX11 \
    1.55  			xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXrender xorg-libXt \
    1.56  			zlib"
    1.57 @@ -68,16 +74,11 @@
    1.58  			DEPENDS="imagemagick bzip2-dev cairo-dev fftw-dev fontconfig-dev \
    1.59  			freetype-dev gdk-pixbuf-dev glib-dev glibc-dev harfbuzz-dev \
    1.60  			lcms2-dev libcroco-dev libffi-dev libjpeg-turbo-dev \
    1.61 -			liblzma-dev libpng-dev librsvg-dev libtool libxcb-dev libxml2-dev \
    1.62 +			liblzma-dev libpng16-dev librsvg-dev libtool libxcb-dev libxml2-dev \
    1.63  			pango-dev pcre-dev pixman-dev tiff-dev util-linux-uuid-dev \
    1.64  			xorg-libICE-dev xorg-libSM-dev xorg-libX11-dev xorg-libXau-dev \
    1.65  			xorg-libXdmcp-dev xorg-libXext-dev xorg-libXrender-dev \
    1.66  			xorg-libXt-dev zlib-dev"
    1.67  			;;
    1.68 -		perl-image-magick)
    1.69 -			copy perl5/
    1.70 -			CAT="perl|Image::Magick Perl module"
    1.71 -			DEPENDS="perl imagemagick"
    1.72 -			;;
    1.73  	esac
    1.74  }