wok rev 21044

updated imagemagick and imagemagick-dev (6.8.4-10 -> 7.0.8.33)
author Hans-G?nter Theisgen
date Tue Mar 12 15:54:52 2019 +0100 (2019-03-12)
parents eecd843ce61a
children 9f3e54f3f1fc
files imagemagick-dev/receipt imagemagick/receipt
line diff
     1.1 --- a/imagemagick-dev/receipt	Tue Mar 12 14:13:45 2019 +0100
     1.2 +++ b/imagemagick-dev/receipt	Tue Mar 12 15:54:52 2019 +0100
     1.3 @@ -1,23 +1,26 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="imagemagick-dev"
     1.7 -VERSION="6.8.4-10"
     1.8 +VERSION="7.0.8.33"
     1.9  CATEGORY="development"
    1.10 -SHORT_DESC="ImagesMagick devel files."
    1.11 +SHORT_DESC="ImagesMagick development files."
    1.12  MAINTAINER="pankso@slitaz.org"
    1.13  LICENSE="Apache"
    1.14 +WEB_SITE="https://www.imagemagick.org/"
    1.15 +
    1.16  SOURCE="ImageMagick"
    1.17  WANTED="imagemagick"
    1.18 -WEB_SITE="http://www.imagemagick.org/"
    1.19  
    1.20 -DEPENDS="imagemagick jpeg-dev ilmbase-dev openexr-dev libpng-dev tiff-dev \
    1.21 -libxml2-dev lcms-dev graphviz-dev fftw-dev util-linux-uuid-dev pkg-config"
    1.22 +DEPENDS="fftw-dev graphviz-dev ilmbase-dev imagemagick jpeg-dev \
    1.23 +	lcms-dev libpng-dev libxml2-dev openexr-dev pkg-config \
    1.24 +	tiff-dev util-linux-uuid-dev"
    1.25  
    1.26  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.27  genpkg_rules()
    1.28  {
    1.29  	mkdir -p $fs/usr/lib
    1.30 -	cp -a $install/usr/include $fs/usr
    1.31 -	cp -a $install/usr/lib/*.*a $fs/usr/lib
    1.32 -	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
    1.33 +
    1.34 +	cp -a $install/usr/include		$fs/usr
    1.35 +	cp -a $install/usr/lib/*.*a		$fs/usr/lib
    1.36 +	cp -a $install/usr/lib/pkgconfig	$fs/usr/lib
    1.37  }
     2.1 --- a/imagemagick/receipt	Tue Mar 12 14:13:45 2019 +0100
     2.2 +++ b/imagemagick/receipt	Tue Mar 12 15:54:52 2019 +0100
     2.3 @@ -1,56 +1,60 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="imagemagick"
     2.7 -VERSION="6.8.4-10"
     2.8 -SHORT_VERSION="${VERSION%-*}"
     2.9 +VERSION="7.0.8.33"
    2.10 +SHORT_VERSION="${VERSION%.*}"
    2.11  CATEGORY="graphics"
    2.12 +TAGS="image photo toolkit"
    2.13  SHORT_DESC="Images manipulation programs."
    2.14  MAINTAINER="pankso@slitaz.org"
    2.15  LICENSE="Apache"
    2.16 +WEB_SITE="https://www.imagemagick.org/"
    2.17 +
    2.18  SOURCE="ImageMagick"
    2.19 -TARBALL="$SOURCE-$VERSION.tar.xz"
    2.20 -WEB_SITE="http://www.imagemagick.org/"
    2.21 -WGET_URL="http://mirror.checkdomain.de/$PACKAGE/$TARBALL"
    2.22 -TAGS="image photo toolkit"
    2.23 +TARBALL="$SOURCE-${VERSION%8./8-}.tar.xz"
    2.24 +WGET_URL="${WEB_SITE}download/releases/$TARBALL"
    2.25  
    2.26 -DEPENDS="xorg-libXext jpeg libpng tiff libxml2 freetype libgomp bzlib expat \
    2.27 -fontconfig lcms jasper ilmbase openexr graphviz librsvg libgsf libgio cairo \
    2.28 -pango gcc-lib-base jbigkit libcroco fftw libltdl"
    2.29 -BUILD_DEPENDS="xorg-libXext-dev jpeg-dev libpng-dev tiff-dev libxml2-dev \
    2.30 -freetype-dev bzip2-dev expat-dev fontconfig-dev lcms-dev jasper-dev \
    2.31 -ilmbase-dev openexr-dev graphviz-dev librsvg-dev libgsf-dev libgio-dev \
    2.32 -perl cairo-dev pango-dev libcroco-dev fftw-dev util-linux-uuid-dev libtool"
    2.33 +DEPENDS="bzlib cairo expat fftw fontconfig freetype gcc-lib-base \
    2.34 +	graphviz ilmbase jasper jbigkit jpeg lcms libcroco libgio \
    2.35 +	libgomp libgsf libltdl libpng librsvg libxml2 openexr \
    2.36 +	pango tiff xorg-libXext"
    2.37 +BUILD_DEPENDS="bzip2-dev cairo-dev expat-dev fftw-dev fontconfig-dev \
    2.38 +	freetype-dev graphviz-dev ilmbase-dev jasper-dev jpeg-dev \
    2.39 +	lcms-dev libcroco-dev libgio-dev libgsf-dev libpng-dev \
    2.40 +	librsvg-dev libtool libxml2-dev openexr-dev pango-dev perl \
    2.41 +	tiff-dev util-linux-uuid-dev xorg-libXext-dev"
    2.42  
    2.43  # Rules to configure and make the package.
    2.44  compile_rules()
    2.45  {
    2.46 -	cd $src
    2.47 -	./configure \
    2.48 -		--prefix=/usr \
    2.49 -		--infodir=/usr/share/info \
    2.50 -		--mandir=/usr/share/man \
    2.51 -		--sysconfdir=/etc \
    2.52 -		--with-perl \
    2.53 -		--with-magick-plus-plus \
    2.54 -		--with-modules \
    2.55 -		--enable-hdri \
    2.56 +	./configure				\
    2.57 +		--prefix=/usr			\
    2.58 +		--infodir=/usr/share/info	\
    2.59 +		--mandir=/usr/share/man		\
    2.60 +		--sysconfdir=/etc		\
    2.61 +		--with-magick-plus-plus		\
    2.62 +		--with-modules			\
    2.63 +		--with-perl			\
    2.64 +		--enable-hdri			\
    2.65  		$CONFIGURE_ARGS &&
    2.66 -	make $MAKEFLAGS &&
    2.67 +	make $MAKEFLAGS -j 1 &&
    2.68  	make DESTDIR=$DESTDIR install
    2.69  }
    2.70  
    2.71  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.72  genpkg_rules()
    2.73  {
    2.74 -	mkdir -p $fs/usr/lib $fs/usr/share
    2.75 -	cp -a $install/etc $fs
    2.76 -	cp -a $install/usr/bin $fs/usr
    2.77 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
    2.78 -	cp -a $install/usr/lib/$SOURCE-$SHORT_VERSION $fs/usr/lib
    2.79 -	cp -a $install/usr/share/$SOURCE-* $fs/usr/share
    2.80 +	mkdir -p $fs/usr/lib
    2.81 +	mkdir -p $fs/usr/share
    2.82 +
    2.83 +	cp -a $install/etc				$fs
    2.84 +	cp -a $install/usr/bin				$fs/usr
    2.85 +	cp -a $install/usr/lib/*.so*			$fs/usr/lib
    2.86 +	cp -a $install/usr/lib/$SOURCE-$SHORT_VERSION	$fs/usr/lib
    2.87 +	cp -a $install/usr/share/$SOURCE-*		$fs/usr/share
    2.88  
    2.89  	# CVE-2016-3714 work around v5
    2.90 -	sed -i '/<policymap>/r/dev/stdin' $fs/etc/ImageMagick-6/policy.xml <<EOT
    2.91 +	sed -i '/<policymap>/r/dev/stdin' $fs/etc/ImageMagick-7/policy.xml <<EOT
    2.92    <policy domain="coder" rights="none" pattern="EPHEMERAL" />
    2.93    <policy domain="coder" rights="none" pattern="URL" />
    2.94    <policy domain="coder" rights="none" pattern="HTTPS" />
    2.95 @@ -62,4 +66,3 @@
    2.96    <policy domain="coder" rights="none" pattern="PLT" />
    2.97  EOT
    2.98  }
    2.99 -