wok-next rev 19713

Up fftw, imagemagick (with latest version, currently 7.*), tango-icon-theme; add imagemagick6 (from version 6.* series)
author Aleksej Bobylev <al.bobylev@gmail.com>
date Fri May 12 16:18:42 2017 +0300 (2017-05-12)
parents 00611afb6342
children 102de32490ac
files fftw-dev/receipt fftw/receipt imagemagick-dev/receipt imagemagick/receipt imagemagick6-dev/receipt imagemagick6/receipt imagemagick6/stuff/patches/ImageMagick-6.9.7-8-libs_only-1.patch imagemagick6/stuff/patches/series tango-icon-theme/receipt tango-icon-theme/stuff/patches/series tango-icon-theme/stuff/patches/tango-icon-theme-0.8.90-rsvg-convert.patch
line diff
     1.1 --- a/fftw-dev/receipt	Fri May 12 11:26:54 2017 +0200
     1.2 +++ b/fftw-dev/receipt	Fri May 12 16:18:42 2017 +0300
     1.3 @@ -1,21 +1,19 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="fftw-dev"
     1.7 -VERSION="3.3.4"
     1.8 +VERSION="3.3.6-pl2"
     1.9  CATEGORY="development"
    1.10 +SHORT_DESC="A library for computing the discrete Fourier transform (DFT) \
    1.11 +(development files)"
    1.12  MAINTAINER="jozee@slitaz.org"
    1.13  LICENSE="GPL2"
    1.14 -SHORT_DESC="fftw devel files"
    1.15  WEB_SITE="http://www.fftw.org/"
    1.16 +
    1.17  WANTED="fftw"
    1.18 -
    1.19 -DEPENDS="fftw pkg-config"
    1.20 +DEPENDS="fftw"
    1.21  
    1.22  # Rules to gen a SliTaz package suitable for Tazpkg.
    1.23  genpkg_rules()
    1.24  {
    1.25 -	mkdir -p $fs/usr/lib
    1.26 -	cp -a $install/usr/lib/*.*a $fs/usr/lib
    1.27 -	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
    1.28 -	cp -a $install/usr/include $fs/usr
    1.29 +	copy @dev
    1.30  }
     2.1 --- a/fftw/receipt	Fri May 12 11:26:54 2017 +0200
     2.2 +++ b/fftw/receipt	Fri May 12 16:18:42 2017 +0300
     2.3 @@ -1,47 +1,51 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="fftw"
     2.7 -VERSION="3.3.4"
     2.8 +VERSION="3.3.6-pl2"
     2.9  CATEGORY="multimedia"
    2.10 +SHORT_DESC="A library for computing the discrete Fourier transform (DFT)"
    2.11  MAINTAINER="jozee@slitaz.org"
    2.12  LICENSE="GPL2"
    2.13 -SHORT_DESC="A library for computing the discrete Fourier transform (DFT)"
    2.14 +WEB_SITE="http://www.fftw.org/"
    2.15 +
    2.16 +TARBALL="$PACKAGE-$VERSION.tar.gz"
    2.17 +WGET_URL="http://www.fftw.org/$TARBALL"
    2.18 +
    2.19  BUILD_DEPENDS="gfortran"
    2.20 -WEB_SITE="http://www.fftw.org/"
    2.21 -TARBALL="$PACKAGE-$VERSION.tar.gz"
    2.22 -WGET_URL="$WEB_SITE/$TARBALL"
    2.23 -TAGS=""
    2.24  
    2.25  # Rules to configure and make the package.
    2.26 +compile_rules() {
    2.27 +	# build double precision
    2.28 +	./configure \
    2.29 +		F77=gfortran \
    2.30 +		--enable-shared \
    2.31 +		$CONFIGURE_ARGS &&
    2.32 +	make $MAKEFLAGS &&
    2.33 +	make DESTDIR=$DESTDIR install
    2.34  
    2.35 -compile_rules() {
    2.36 -  cd $src
    2.37 -  
    2.38 -  # build double precision
    2.39 -  ./configure F77=gfortran --prefix=/usr --enable-shared \
    2.40 -	$CONFIGURE_ARGS &&
    2.41 -  make $MAKEFLAGS &&
    2.42 -  make DESTDIR=$DESTDIR install 
    2.43 - 
    2.44 -  # build long double precission
    2.45 -  make clean
    2.46 -  ./configure F77=gfortran --prefix=/usr --enable-long-double  --enable-shared \
    2.47 -	$CONFIGURE_ARGS &&
    2.48 -  make $MAKEFLAGS &&
    2.49 -  make DESTDIR=$DESTDIR install 
    2.50 -  
    2.51 -  # build single precision
    2.52 -  make clean
    2.53 -  ./configure F77=gfortran --prefix=/usr --enable-float --enable-shared \
    2.54 -	$CONFIGURE_ARGS &&
    2.55 -  make $MAKEFLAGS &&
    2.56 -  make DESTDIR=$DESTDIR install 
    2.57 +	# build long double precission
    2.58 +	make clean
    2.59 +	./configure \
    2.60 +		F77=gfortran \
    2.61 +		--enable-long-double \
    2.62 +		--enable-shared \
    2.63 +		$CONFIGURE_ARGS &&
    2.64 +	make $MAKEFLAGS &&
    2.65 +	make DESTDIR=$DESTDIR install
    2.66 +
    2.67 +	# build single precision
    2.68 +	make clean
    2.69 +	./configure \
    2.70 +		F77=gfortran \
    2.71 +		--enable-float \
    2.72 +		--enable-shared \
    2.73 +		$CONFIGURE_ARGS &&
    2.74 +	make $MAKEFLAGS &&
    2.75 +	make DESTDIR=$DESTDIR install
    2.76  }
    2.77 -	
    2.78 +
    2.79  # Rules to gen a SliTaz package suitable for Tazpkg.
    2.80  genpkg_rules()
    2.81  {
    2.82 -	mkdir -p $fs/usr/lib $fs/usr/share
    2.83 -	cp -a $install/usr/bin $fs/usr
    2.84 -	cp -a $install/usr/lib/*so* $fs/usr/lib/
    2.85 +	copy @std
    2.86  }
     3.1 --- a/imagemagick-dev/receipt	Fri May 12 11:26:54 2017 +0200
     3.2 +++ b/imagemagick-dev/receipt	Fri May 12 16:18:42 2017 +0300
     3.3 @@ -1,23 +1,24 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="imagemagick-dev"
     3.7 -VERSION="6.8.4-10"
     3.8 +VERSION="7.0.5-5"
     3.9  CATEGORY="development"
    3.10 -SHORT_DESC="ImagesMagick devel files."
    3.11 +SHORT_DESC="ImageMagick - convert, edit, and compose images (development files)"
    3.12  MAINTAINER="pankso@slitaz.org"
    3.13  LICENSE="Apache"
    3.14 -SOURCE="ImageMagick"
    3.15 -WANTED="imagemagick"
    3.16  WEB_SITE="http://www.imagemagick.org/"
    3.17  
    3.18 -DEPENDS="imagemagick jpeg-dev ilmbase-dev openexr-dev libpng-dev tiff-dev \
    3.19 -libxml2-dev lcms-dev graphviz-dev fftw-dev util-linux-uuid-dev pkg-config"
    3.20 +WANTED="imagemagick"
    3.21 +DEPENDS="imagemagick bzip2-dev cairo-dev fftw-dev fontconfig-dev freetype-dev \
    3.22 +gdk-pixbuf-dev glib-dev glibc-dev harfbuzz-dev lcms2-dev libcroco-dev \
    3.23 +libffi-dev libgio-dev libjpeg-turbo-dev liblzma-dev libpng-dev librsvg-dev \
    3.24 +libtool libxcb-dev libxml2-dev pango-dev pcre-dev pixman-dev tiff-dev \
    3.25 +util-linux-uuid-dev xorg-libICE-dev xorg-libSM-dev xorg-libX11-dev \
    3.26 +xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev xorg-libXrender-dev \
    3.27 +xorg-libXt-dev zlib-dev"
    3.28  
    3.29  # Rules to gen a SliTaz package suitable for Tazpkg.
    3.30  genpkg_rules()
    3.31  {
    3.32 -	mkdir -p $fs/usr/lib
    3.33 -	cp -a $install/usr/include $fs/usr
    3.34 -	cp -a $install/usr/lib/*.*a $fs/usr/lib
    3.35 -	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
    3.36 +	copy @dev
    3.37  }
     4.1 --- a/imagemagick/receipt	Fri May 12 11:26:54 2017 +0200
     4.2 +++ b/imagemagick/receipt	Fri May 12 16:18:42 2017 +0300
     4.3 @@ -1,56 +1,53 @@
     4.4  # SliTaz package receipt.
     4.5  
     4.6  PACKAGE="imagemagick"
     4.7 -VERSION="6.8.4-10"
     4.8 -SHORT_VERSION="${VERSION%-*}"
     4.9 +VERSION="7.0.5-5"
    4.10  CATEGORY="graphics"
    4.11 -SHORT_DESC="Images manipulation programs."
    4.12 +SHORT_DESC="ImageMagick - convert, edit, and compose images"
    4.13  MAINTAINER="pankso@slitaz.org"
    4.14  LICENSE="Apache"
    4.15 -SOURCE="ImageMagick"
    4.16 -TARBALL="$SOURCE-$VERSION.tar.xz"
    4.17  WEB_SITE="http://www.imagemagick.org/"
    4.18 -WGET_URL="http://mirror.checkdomain.de/$PACKAGE/$TARBALL"
    4.19  TAGS="image photo toolkit"
    4.20  
    4.21 -DEPENDS="xorg-libXext jpeg libpng tiff libxml2 freetype libgomp bzlib expat \
    4.22 -fontconfig lcms jasper ilmbase openexr graphviz librsvg libgsf libgio cairo \
    4.23 -pango gcc-lib-base jbigkit libcroco fftw libltdl"
    4.24 -BUILD_DEPENDS="xorg-libXext-dev jpeg-dev libpng-dev tiff-dev libxml2-dev \
    4.25 -freetype-dev bzip2-dev expat-dev fontconfig-dev lcms-dev jasper-dev \
    4.26 -ilmbase-dev openexr-dev graphviz-dev librsvg-dev libgsf-dev libgio-dev \
    4.27 -perl cairo-dev pango-dev libcroco-dev fftw-dev util-linux-uuid-dev libtool"
    4.28 +TARBALL="ImageMagick-$VERSION.tar.xz"
    4.29 +WGET_URL="https://www.imagemagick.org/download/releases/$TARBALL"
    4.30 +
    4.31 +DEPENDS="bzlib cairo fftw fontconfig freetype gdk-pixbuf glib harfbuzz lcms2 \
    4.32 +libcroco libffi libgio libgomp libjpeg-turbo libltdl liblzma libpng librsvg \
    4.33 +libxcb libxml2 pango pcre pixman tiff util-linux-uuid xorg-libICE xorg-libSM \
    4.34 +xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXrender xorg-libXt \
    4.35 +zlib"
    4.36 +BUILD_DEPENDS="bzip2-dev xorg-libX11-dev xorg-libICE-dev xorg-libXext-dev \
    4.37 +xorg-libXt-dev zlib-dev libtool fftw-dev fontconfig-dev freetype-dev \
    4.38 +libjpeg-turbo-dev lcms2-dev liblzma-dev pango-dev libpng-dev tiff-dev \
    4.39 +libxml2-dev librsvg-dev perl util-linux-uuid-dev"
    4.40 +# jasper-dev ilmbase-dev openexr-dev graphviz-dev libgsf-dev
    4.41  
    4.42  # Rules to configure and make the package.
    4.43  compile_rules()
    4.44  {
    4.45 -	cd $src
    4.46  	./configure \
    4.47 -		--prefix=/usr \
    4.48 -		--infodir=/usr/share/info \
    4.49 -		--mandir=/usr/share/man \
    4.50  		--sysconfdir=/etc \
    4.51  		--with-perl \
    4.52  		--with-magick-plus-plus \
    4.53  		--with-modules \
    4.54  		--enable-hdri \
    4.55 +		--with-rsvg \
    4.56 +		--disable-static \
    4.57  		$CONFIGURE_ARGS &&
    4.58  	make $MAKEFLAGS &&
    4.59  	make DESTDIR=$DESTDIR install
    4.60 +
    4.61 +	chmod -R u+w $install/usr/lib/perl5/
    4.62  }
    4.63  
    4.64  # Rules to gen a SliTaz package suitable for Tazpkg.
    4.65  genpkg_rules()
    4.66  {
    4.67 -	mkdir -p $fs/usr/lib $fs/usr/share
    4.68 -	cp -a $install/etc $fs
    4.69 -	cp -a $install/usr/bin $fs/usr
    4.70 -	cp -a $install/usr/lib/*.so* $fs/usr/lib
    4.71 -	cp -a $install/usr/lib/$SOURCE-$SHORT_VERSION $fs/usr/lib
    4.72 -	cp -a $install/usr/share/$SOURCE-* $fs/usr/share
    4.73 +	copy @std
    4.74  
    4.75  	# CVE-2016-3714 work around v5
    4.76 -	sed -i '/<policymap>/r/dev/stdin' $fs/etc/ImageMagick-6/policy.xml <<EOT
    4.77 +	sed -i '/<policymap>/r/dev/stdin' $fs/etc/ImageMagick-7/policy.xml <<EOT
    4.78    <policy domain="coder" rights="none" pattern="EPHEMERAL" />
    4.79    <policy domain="coder" rights="none" pattern="URL" />
    4.80    <policy domain="coder" rights="none" pattern="HTTPS" />
    4.81 @@ -62,4 +59,3 @@
    4.82    <policy domain="coder" rights="none" pattern="PLT" />
    4.83  EOT
    4.84  }
    4.85 -
     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/imagemagick6-dev/receipt	Fri May 12 16:18:42 2017 +0300
     5.3 @@ -0,0 +1,25 @@
     5.4 +# SliTaz package receipt.
     5.5 +
     5.6 +PACKAGE="imagemagick6-dev"
     5.7 +VERSION="6.9.8-4"
     5.8 +CATEGORY="development"
     5.9 +SHORT_DESC="ImageMagick (v.6) - convert, edit, and compose images (development \
    5.10 +files)"
    5.11 +MAINTAINER="pankso@slitaz.org"
    5.12 +LICENSE="Apache"
    5.13 +WEB_SITE="http://www.imagemagick.org/"
    5.14 +
    5.15 +WANTED="imagemagick6"
    5.16 +DEPENDS="imagemagick6 bzip2-dev cairo-dev fftw-dev fontconfig-dev freetype-dev \
    5.17 +gdk-pixbuf-dev glib-dev glibc-dev harfbuzz-dev lcms2-dev libcroco-dev \
    5.18 +libffi-dev libgio-dev libjpeg-turbo-dev liblzma-dev libpng-dev librsvg-dev \
    5.19 +libtool libxcb-dev libxml2-dev pango-dev pcre-dev pixman-dev tiff-dev \
    5.20 +util-linux-uuid-dev xorg-libICE-dev xorg-libSM-dev xorg-libX11-dev \
    5.21 +xorg-libXau-dev xorg-libXdmcp-dev xorg-libXext-dev xorg-libXrender-dev \
    5.22 +xorg-libXt-dev zlib-dev"
    5.23 +
    5.24 +# Rules to gen a SliTaz package suitable for Tazpkg.
    5.25 +genpkg_rules()
    5.26 +{
    5.27 +	copy @dev
    5.28 +}
     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/imagemagick6/receipt	Fri May 12 16:18:42 2017 +0300
     6.3 @@ -0,0 +1,61 @@
     6.4 +# SliTaz package receipt.
     6.5 +
     6.6 +PACKAGE="imagemagick6"
     6.7 +VERSION="6.9.8-4"
     6.8 +CATEGORY="graphics"
     6.9 +SHORT_DESC="ImageMagick (v.6) - convert, edit, and compose images"
    6.10 +MAINTAINER="pankso@slitaz.org"
    6.11 +LICENSE="Apache"
    6.12 +WEB_SITE="http://www.imagemagick.org/"
    6.13 +TAGS="image photo toolkit"
    6.14 +
    6.15 +TARBALL="ImageMagick-$VERSION.tar.xz"
    6.16 +WGET_URL="https://www.imagemagick.org/download/releases/$TARBALL"
    6.17 +
    6.18 +DEPENDS="bzlib cairo fftw fontconfig freetype gdk-pixbuf glib harfbuzz lcms2 \
    6.19 +libcroco libffi libgio libgomp libjpeg-turbo libltdl liblzma libpng librsvg \
    6.20 +libxcb libxml2 pango pcre pixman tiff util-linux-uuid xorg-libICE xorg-libSM \
    6.21 +xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXrender xorg-libXt \
    6.22 +zlib"
    6.23 +BUILD_DEPENDS="bzip2-dev xorg-libX11-dev xorg-libICE-dev xorg-libXext-dev \
    6.24 +xorg-libXt-dev zlib-dev libtool fftw-dev fontconfig-dev freetype-dev \
    6.25 +libjpeg-turbo-dev lcms2-dev liblzma-dev pango-dev libpng-dev tiff-dev \
    6.26 +libxml2-dev librsvg-dev perl util-linux-uuid-dev"
    6.27 +# jasper-dev ilmbase-dev openexr-dev graphviz-dev libgsf-dev
    6.28 +
    6.29 +# Rules to configure and make the package.
    6.30 +compile_rules()
    6.31 +{
    6.32 +	./configure \
    6.33 +		--sysconfdir=/etc \
    6.34 +		--with-perl \
    6.35 +		--with-magick-plus-plus \
    6.36 +		--with-modules \
    6.37 +		--enable-hdri \
    6.38 +		--with-rsvg \
    6.39 +		--disable-static \
    6.40 +		$CONFIGURE_ARGS &&
    6.41 +	make $MAKEFLAGS &&
    6.42 +	make DESTDIR=$DESTDIR install
    6.43 +
    6.44 +	chmod -R u+w $install/usr/lib/perl5/
    6.45 +}
    6.46 +
    6.47 +# Rules to gen a SliTaz package suitable for Tazpkg.
    6.48 +genpkg_rules()
    6.49 +{
    6.50 +	copy @std
    6.51 +
    6.52 +	# CVE-2016-3714 work around v5
    6.53 +	sed -i '/<policymap>/r/dev/stdin' $fs/etc/ImageMagick-6/policy.xml <<EOT
    6.54 +  <policy domain="coder" rights="none" pattern="EPHEMERAL" />
    6.55 +  <policy domain="coder" rights="none" pattern="URL" />
    6.56 +  <policy domain="coder" rights="none" pattern="HTTPS" />
    6.57 +  <policy domain="coder" rights="none" pattern="MVG" />
    6.58 +  <policy domain="coder" rights="none" pattern="MSL" />
    6.59 +  <policy domain="coder" rights="none" pattern="TEXT" />
    6.60 +  <policy domain="coder" rights="none" pattern="SHOW" />
    6.61 +  <policy domain="coder" rights="none" pattern="WIN" />
    6.62 +  <policy domain="coder" rights="none" pattern="PLT" />
    6.63 +EOT
    6.64 +}
     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/imagemagick6/stuff/patches/ImageMagick-6.9.7-8-libs_only-1.patch	Fri May 12 16:18:42 2017 +0300
     7.3 @@ -0,0 +1,471 @@
     7.4 +Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
     7.5 +Date: 2017-01-09
     7.6 +Initial Package Version: 6.9.6-3
     7.7 +Upstream Status: N/A
     7.8 +Origin: Self
     7.9 +Description: Allows the libraries of ImageMagick-6 to be installed
    7.10 +without the programs or man-pages, and with versioned pkgconfig files
    7.11 +so that ImageMagick-7 can be installed alongside this.  Do not build
    7.12 +perl here if doing this (the version from ImageMagick-7 will use the
    7.13 +libraries from 7), and edit anyi cmake programs using this (e.g.
    7.14 +inkscape-0.92) so that they look for the -6 pkgconfig files.
    7.15 +
    7.16 +Internally, ImageMagick-7 is a major change, and the names of the
    7.17 +libraries and the include directories differ.
    7.18 +
    7.19 +For packages which use a conventional configure script, pass
    7.20 +IMAGEMAGICK_CFLAGS=-I/usr/include/ImageMagick-6 and
    7.21 +IMAGEMAGICK_LIBS="-lMagickCore-6.Q16HDRI -lMagick++-6.Q16HDRI -lMagickWand-6.Q16HDRI"
    7.22 +
    7.23 +In some places I have had to hardcode -6 because I could not persuade
    7.24 +the build system to convert @MAGICK_CORE_VERSION@ in one file or for
    7.25 +the names of the files.
    7.26 +
    7.27 +Also, my raw patch deletes wand/Wand.pc.in but gnu patch fails there,
    7.28 +believing it is a reversal (not understood, a git patch would be
    7.29 +easier if we all had git, mentioned because it will probably happen
    7.30 +again if this has to be rediffed for future versions).
    7.31 +
    7.32 +diff -Naur ImageMagick-6.9.6-3.orig/configure ImageMagick-6.9.6-3/configure
    7.33 +--- ImageMagick-6.9.6-3.orig/configure	2017-01-07 01:35:18.362869976 +0000
    7.34 ++++ ImageMagick-6.9.6-3/configure	2017-01-07 20:50:59.735901975 +0000
    7.35 +@@ -37452,7 +37452,7 @@
    7.36 + # ==============================================================================
    7.37 + # Generate build environment
    7.38 + # ==============================================================================
    7.39 +-ac_config_files="$ac_config_files common.shi config/configure.xml config/delegates.xml config/ImageMagick.rdf config/MagickCore.dox config/MagickWand.dox config/Magick++.dox config/type-apple.xml config/type-dejavu.xml config/type-ghostscript.xml config/type-windows.xml config/type.xml ImageMagick.spec Magick++/bin/Magick++-config magick/ImageMagick.pc Magick++/lib/ImageMagick++.pc Magick++/lib/Magick++.pc magick/Magick-config magick/MagickCore-config magick/MagickCore.pc magick/version.h Makefile magick.sh PerlMagick/check.sh PerlMagick/default/Magick.pm PerlMagick/Makefile.PL PerlMagick/default/Makefile.PL PerlMagick/quantum/Makefile.PL PerlMagick/quantum/quantum.pm PerlMagick/quantum/quantum.xs PerlMagick/quantum/typemap utilities/animate.1 utilities/compare.1 utilities/composite.1 utilities/conjure.1 utilities/convert.1 utilities/display.1 utilities/identify.1 utilities/ImageMagick.1 utilities/import.1 utilities/mogrify.1 utilities/montage.1 utilities/stream.1 wand/MagickWand-config wand/MagickWand.pc wand/Wand-config wand/Wand.pc"
    7.40 ++ac_config_files="$ac_config_files common.shi config/configure.xml config/delegates.xml config/ImageMagick.rdf config/MagickCore.dox config/MagickWand.dox config/Magick++.dox config/type-apple.xml config/type-dejavu.xml config/type-ghostscript.xml config/type-windows.xml config/type.xml ImageMagick.spec Magick++/bin/Magick++-config magick/ImageMagick-6.pc Magick++/lib/ImageMagick++-6.pc Magick++/lib/Magick++-6.pc magick/Magick-config magick/MagickCore-config magick/MagickCore-6.pc magick/version.h Makefile magick.sh PerlMagick/check.sh PerlMagick/default/Magick.pm PerlMagick/Makefile.PL PerlMagick/default/Makefile.PL PerlMagick/quantum/Makefile.PL PerlMagick/quantum/quantum.pm PerlMagick/quantum/quantum.xs PerlMagick/quantum/typemap utilities/animate.1 utilities/compare.1 utilities/composite.1 utilities/conjure.1 utilities/convert.1 utilities/display.1 utilities/identify.1 utilities/ImageMagick.1 utilities/import.1 utilities/mogrify.1 utilities/montage.1 utilities/stream.1 wand/MagickWand-config wand/MagickWand-6.pc wand/Wand-config wand/Wand-6.pc"
    7.41 + 
    7.42 + cat >confcache <<\_ACEOF
    7.43 + # This file is a shell script that caches the results of configure
    7.44 +diff -Naur ImageMagick-6.9.6-3.orig/configure.ac ImageMagick-6.9.6-3/configure.ac
    7.45 +--- ImageMagick-6.9.6-3.orig/configure.ac	2017-01-07 01:35:27.053787793 +0000
    7.46 ++++ ImageMagick-6.9.6-3/configure.ac	2017-01-07 20:52:26.205101788 +0000
    7.47 +@@ -3835,12 +3835,12 @@
    7.48 +     config/type.xml \
    7.49 +     ImageMagick.spec \
    7.50 +     Magick++/bin/Magick++-config \
    7.51 +-    magick/ImageMagick.pc \
    7.52 +-    Magick++/lib/ImageMagick++.pc \
    7.53 +-    Magick++/lib/Magick++.pc \
    7.54 ++    magick/ImageMagick-6.pc \
    7.55 ++    Magick++/lib/ImageMagick++-6.pc \
    7.56 ++    Magick++/lib/Magick++-6.pc \
    7.57 +     magick/Magick-config \
    7.58 +     magick/MagickCore-config \
    7.59 +-    magick/MagickCore.pc \
    7.60 ++    magick/MagickCore-6.pc \
    7.61 +     magick/version.h \
    7.62 +     Makefile \
    7.63 +     magick.sh \
    7.64 +@@ -3865,9 +3865,9 @@
    7.65 +     utilities/montage.1 \
    7.66 +     utilities/stream.1 \
    7.67 +     wand/MagickWand-config \
    7.68 +-    wand/MagickWand.pc \
    7.69 ++    wand/MagickWand-6.pc \
    7.70 +     wand/Wand-config \
    7.71 +-    wand/Wand.pc ])
    7.72 ++    wand/Wand-6.pc ])
    7.73 + AC_OUTPUT
    7.74 + 
    7.75 + # ==============================================================================
    7.76 +diff -Naur ImageMagick-6.9.6-3.orig/magick/ImageMagick-6.pc.in ImageMagick-6.9.6-3/magick/ImageMagick-6.pc.in
    7.77 +--- ImageMagick-6.9.6-3.orig/magick/ImageMagick-6.pc.in	1970-01-01 01:00:00.000000000 +0100
    7.78 ++++ ImageMagick-6.9.6-3/magick/ImageMagick-6.pc.in	2017-01-07 00:55:17.999483324 +0000
    7.79 +@@ -0,0 +1,14 @@
    7.80 ++prefix=@prefix@
    7.81 ++exec_prefix=@exec_prefix@
    7.82 ++libdir=@libdir@
    7.83 ++includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@
    7.84 ++includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@
    7.85 ++libname=MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
    7.86 ++ 
    7.87 ++Name: ImageMagick-@MAGICK_MAJOR_VERSION@
    7.88 ++Description: ImageMagick - convert, edit, and compose images (ABI @MAGICK_ABI_SUFFIX@)
    7.89 ++URL: https://www.imagemagick.org
    7.90 ++Version: @PACKAGE_VERSION@
    7.91 ++Cflags:  -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@
    7.92 ++Libs: -L${libdir} -l${libname}
    7.93 ++Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
    7.94 +diff -Naur ImageMagick-6.9.6-3.orig/magick/ImageMagick.pc.in ImageMagick-6.9.6-3/magick/ImageMagick.pc.in
    7.95 +--- ImageMagick-6.9.6-3.orig/magick/ImageMagick.pc.in	2017-01-07 01:58:35.942633448 +0000
    7.96 ++++ ImageMagick-6.9.6-3/magick/ImageMagick.pc.in	1970-01-01 01:00:00.000000000 +0100
    7.97 +@@ -1,14 +0,0 @@
    7.98 +-prefix=@prefix@
    7.99 +-exec_prefix=@exec_prefix@
   7.100 +-libdir=@libdir@
   7.101 +-includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@
   7.102 +-includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@
   7.103 +-libname=MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
   7.104 +- 
   7.105 +-Name: ImageMagick
   7.106 +-Description: ImageMagick - convert, edit, and compose images (ABI @MAGICK_ABI_SUFFIX@)
   7.107 +-URL: https://www.imagemagick.org
   7.108 +-Version: @PACKAGE_VERSION@
   7.109 +-Cflags:  -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@
   7.110 +-Libs: -L${libdir} -l${libname}
   7.111 +-Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
   7.112 +diff -Naur ImageMagick-6.9.6-3.orig/magick/MagickCore-6.pc.in ImageMagick-6.9.6-3/magick/MagickCore-6.pc.in
   7.113 +--- ImageMagick-6.9.6-3.orig/magick/MagickCore-6.pc.in	1970-01-01 01:00:00.000000000 +0100
   7.114 ++++ ImageMagick-6.9.6-3/magick/MagickCore-6.pc.in	2017-01-07 22:13:31.500562039 +0000
   7.115 +@@ -0,0 +1,15 @@
   7.116 ++prefix=@prefix@
   7.117 ++exec_prefix=@exec_prefix@
   7.118 ++libdir=@libdir@
   7.119 ++includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@
   7.120 ++includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@
   7.121 ++libname=MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
   7.122 ++moduledir=@libdir@/ImageMagick-@MAGICK_MAJOR_VERSION@.@MAGICK_MINOR_VERSION@.@MAGICK_MICRO_VERSION@/modules-@MAGICK_ABI_SUFFIX@
   7.123 ++
   7.124 ++Name: MagickCore-@MAGICK_MAJOR_VERSION@
   7.125 ++Description: MagickCore - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)
   7.126 ++URL: https://www.imagemagick.org
   7.127 ++Version: @PACKAGE_VERSION@
   7.128 ++Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@
   7.129 ++Libs: -L${libdir} -l${libname}
   7.130 ++Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
   7.131 +diff -Naur ImageMagick-6.9.6-3.orig/magick/MagickCore.pc.in ImageMagick-6.9.6-3/magick/MagickCore.pc.in
   7.132 +--- ImageMagick-6.9.6-3.orig/magick/MagickCore.pc.in	2016-10-31 00:34:31.000000000 +0000
   7.133 ++++ ImageMagick-6.9.6-3/magick/MagickCore.pc.in	1970-01-01 01:00:00.000000000 +0100
   7.134 +@@ -1,15 +0,0 @@
   7.135 +-prefix=@prefix@
   7.136 +-exec_prefix=@exec_prefix@
   7.137 +-libdir=@libdir@
   7.138 +-includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@
   7.139 +-includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@
   7.140 +-libname=MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
   7.141 +-moduledir=@libdir@/ImageMagick-@MAGICK_MAJOR_VERSION@.@MAGICK_MINOR_VERSION@.@MAGICK_MICRO_VERSION@/modules-@MAGICK_ABI_SUFFIX@
   7.142 +-
   7.143 +-Name: MagickCore
   7.144 +-Description: MagickCore - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)
   7.145 +-URL: https://www.imagemagick.org
   7.146 +-Version: @PACKAGE_VERSION@
   7.147 +-Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@
   7.148 +-Libs: -L${libdir} -l${libname}
   7.149 +-Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
   7.150 +diff -Naur ImageMagick-6.9.6-3.orig/Magick++/lib/ImageMagick++-6.pc.in ImageMagick-6.9.6-3/Magick++/lib/ImageMagick++-6.pc.in
   7.151 +--- ImageMagick-6.9.6-3.orig/Magick++/lib/ImageMagick++-6.pc.in	1970-01-01 01:00:00.000000000 +0100
   7.152 ++++ ImageMagick-6.9.6-3/Magick++/lib/ImageMagick++-6.pc.in	2017-01-07 22:11:59.637428232 +0000
   7.153 +@@ -0,0 +1,14 @@
   7.154 ++prefix=@prefix@
   7.155 ++exec_prefix=@exec_prefix@
   7.156 ++libdir=@libdir@
   7.157 ++includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@
   7.158 ++includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@
   7.159 ++libname=Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
   7.160 ++ 
   7.161 ++Name: ImageMagick++-@MAGICK_MAJOR_VERSION@
   7.162 ++Description: Magick++ - C++ API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)
   7.163 ++Version: @PACKAGE_VERSION@
   7.164 ++Requires: MagickWand-@MAGICK_MAJOR_VERSION@
   7.165 ++Libs: -L${libdir} -l${libname}
   7.166 ++Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
   7.167 ++Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@
   7.168 +diff -Naur ImageMagick-6.9.6-3.orig/Magick++/lib/ImageMagick++.pc.in ImageMagick-6.9.6-3/Magick++/lib/ImageMagick++.pc.in
   7.169 +--- ImageMagick-6.9.6-3.orig/Magick++/lib/ImageMagick++.pc.in	2016-10-31 00:34:30.000000000 +0000
   7.170 ++++ ImageMagick-6.9.6-3/Magick++/lib/ImageMagick++.pc.in	1970-01-01 01:00:00.000000000 +0100
   7.171 +@@ -1,14 +0,0 @@
   7.172 +-prefix=@prefix@
   7.173 +-exec_prefix=@exec_prefix@
   7.174 +-libdir=@libdir@
   7.175 +-includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@
   7.176 +-includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@
   7.177 +-libname=Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
   7.178 +- 
   7.179 +-Name: ImageMagick++
   7.180 +-Description: Magick++ - C++ API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)
   7.181 +-Version: @PACKAGE_VERSION@
   7.182 +-Requires: MagickWand
   7.183 +-Libs: -L${libdir} -l${libname}
   7.184 +-Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
   7.185 +-Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@
   7.186 +diff -Naur ImageMagick-6.9.6-3.orig/Magick++/lib/Magick++-6.pc.in ImageMagick-6.9.6-3/Magick++/lib/Magick++-6.pc.in
   7.187 +--- ImageMagick-6.9.6-3.orig/Magick++/lib/Magick++-6.pc.in	1970-01-01 01:00:00.000000000 +0100
   7.188 ++++ ImageMagick-6.9.6-3/Magick++/lib/Magick++-6.pc.in	2017-01-07 21:09:41.641487042 +0000
   7.189 +@@ -0,0 +1,14 @@
   7.190 ++prefix=@prefix@
   7.191 ++exec_prefix=@exec_prefix@
   7.192 ++libdir=@libdir@
   7.193 ++includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@
   7.194 ++includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@
   7.195 ++libname=Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
   7.196 ++ 
   7.197 ++Name: Magick++-@MAGICK_MAJOR_VERSION@
   7.198 ++Description: Magick++ - C++ API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)
   7.199 ++Version: @PACKAGE_VERSION@
   7.200 ++Requires: MagickWand-@MAGICK_MAJOR_VERSION@
   7.201 ++Libs: -L${libdir} -l${libname}
   7.202 ++Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
   7.203 ++Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@
   7.204 +diff -Naur ImageMagick-6.9.6-3.orig/Magick++/lib/Magick++.pc.in ImageMagick-6.9.6-3/Magick++/lib/Magick++.pc.in
   7.205 +--- ImageMagick-6.9.6-3.orig/Magick++/lib/Magick++.pc.in	2016-10-31 00:34:30.000000000 +0000
   7.206 ++++ ImageMagick-6.9.6-3/Magick++/lib/Magick++.pc.in	1970-01-01 01:00:00.000000000 +0100
   7.207 +@@ -1,14 +0,0 @@
   7.208 +-prefix=@prefix@
   7.209 +-exec_prefix=@exec_prefix@
   7.210 +-libdir=@libdir@
   7.211 +-includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@
   7.212 +-includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@
   7.213 +-libname=Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
   7.214 +- 
   7.215 +-Name: Magick++
   7.216 +-Description: Magick++ - C++ API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)
   7.217 +-Version: @PACKAGE_VERSION@
   7.218 +-Requires: MagickWand
   7.219 +-Libs: -L${libdir} -l${libname}
   7.220 +-Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
   7.221 +-Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@
   7.222 +diff -Naur ImageMagick-6.9.6-3.orig/Makefile.in ImageMagick-6.9.6-3/Makefile.in
   7.223 +--- ImageMagick-6.9.6-3.orig/Makefile.in	2017-01-06 01:07:37.217002803 +0000
   7.224 ++++ ImageMagick-6.9.6-3/Makefile.in	2017-01-08 00:24:45.777974561 +0000
   7.225 +@@ -302,10 +302,10 @@
   7.226 + 	config/Magick++.dox config/type-apple.xml \
   7.227 + 	config/type-dejavu.xml config/type-ghostscript.xml \
   7.228 + 	config/type-windows.xml config/type.xml ImageMagick.spec \
   7.229 +-	Magick++/bin/Magick++-config magick/ImageMagick.pc \
   7.230 +-	Magick++/lib/ImageMagick++.pc Magick++/lib/Magick++.pc \
   7.231 ++	Magick++/bin/Magick++-config magick/ImageMagick-6.pc \
   7.232 ++	Magick++/lib/ImageMagick++-6.pc Magick++/lib/Magick++-6.pc \
   7.233 + 	magick/Magick-config magick/MagickCore-config \
   7.234 +-	magick/MagickCore.pc magick/version.h magick.sh \
   7.235 ++	magick/MagickCore-6.pc magick/version.h magick.sh \
   7.236 + 	PerlMagick/check.sh PerlMagick/default/Magick.pm \
   7.237 + 	PerlMagick/Makefile.PL PerlMagick/default/Makefile.PL \
   7.238 + 	PerlMagick/quantum/Makefile.PL PerlMagick/quantum/quantum.pm \
   7.239 +@@ -314,8 +314,8 @@
   7.240 + 	utilities/conjure.1 utilities/convert.1 utilities/display.1 \
   7.241 + 	utilities/identify.1 utilities/ImageMagick.1 \
   7.242 + 	utilities/import.1 utilities/mogrify.1 utilities/montage.1 \
   7.243 +-	utilities/stream.1 wand/MagickWand-config wand/MagickWand.pc \
   7.244 +-	wand/Wand-config wand/Wand.pc
   7.245 ++	utilities/stream.1 wand/MagickWand-config wand/MagickWand-6.pc \
   7.246 ++	wand/Wand-config wand/Wand-6.pc
   7.247 + CONFIG_CLEAN_VPATH_FILES =
   7.248 + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
   7.249 + am__vpath_adj = case $$p in \
   7.250 +@@ -2471,8 +2471,8 @@
   7.251 + 	$(srcdir)/tests/Makefile.am $(srcdir)/utilities/Makefile.am \
   7.252 + 	$(srcdir)/wand/Makefile.am \
   7.253 + 	$(top_srcdir)/Magick++/bin/Magick++-config.in \
   7.254 +-	$(top_srcdir)/Magick++/lib/ImageMagick++.pc.in \
   7.255 +-	$(top_srcdir)/Magick++/lib/Magick++.pc.in \
   7.256 ++	$(top_srcdir)/Magick++/lib/ImageMagick++-6.pc.in \
   7.257 ++	$(top_srcdir)/Magick++/lib/Magick++-6.pc.in \
   7.258 + 	$(top_srcdir)/PerlMagick/Makefile.PL.in \
   7.259 + 	$(top_srcdir)/PerlMagick/check.sh.in \
   7.260 + 	$(top_srcdir)/PerlMagick/default/Magick.pm.in \
   7.261 +@@ -2501,10 +2501,10 @@
   7.262 + 	$(top_srcdir)/config/type-ghostscript.xml.in \
   7.263 + 	$(top_srcdir)/config/type-windows.xml.in \
   7.264 + 	$(top_srcdir)/config/type.xml.in \
   7.265 +-	$(top_srcdir)/magick/ImageMagick.pc.in \
   7.266 ++	$(top_srcdir)/magick/ImageMagick-6.pc.in \
   7.267 + 	$(top_srcdir)/magick/Magick-config.in \
   7.268 + 	$(top_srcdir)/magick/MagickCore-config.in \
   7.269 +-	$(top_srcdir)/magick/MagickCore.pc.in \
   7.270 ++	$(top_srcdir)/magick/MagickCore-6.pc.in \
   7.271 + 	$(top_srcdir)/magick/version.h.in \
   7.272 + 	$(top_srcdir)/utilities/ImageMagick.1.in \
   7.273 + 	$(top_srcdir)/utilities/animate.1.in \
   7.274 +@@ -2519,9 +2519,9 @@
   7.275 + 	$(top_srcdir)/utilities/montage.1.in \
   7.276 + 	$(top_srcdir)/utilities/stream.1.in \
   7.277 + 	$(top_srcdir)/wand/MagickWand-config.in \
   7.278 +-	$(top_srcdir)/wand/MagickWand.pc.in \
   7.279 ++	$(top_srcdir)/wand/MagickWand-6.pc.in \
   7.280 + 	$(top_srcdir)/wand/Wand-config.in \
   7.281 +-	$(top_srcdir)/wand/Wand.pc.in ChangeLog config/ar-lib \
   7.282 ++	$(top_srcdir)/wand/Wand.pc-6.in ChangeLog config/ar-lib \
   7.283 + 	config/compile config/config.guess config/config.sub \
   7.284 + 	config/depcomp config/install-sh config/ltmain.sh \
   7.285 + 	config/missing config/mkinstalldirs
   7.286 +@@ -4185,8 +4185,8 @@
   7.287 +   magick/MagickCore-config
   7.288 + 
   7.289 + MAGICK_PKGCONFIG = \
   7.290 +-  magick/ImageMagick.pc \
   7.291 +-  magick/MagickCore.pc \
   7.292 ++  magick/ImageMagick-6.pc \
   7.293 ++  magick/MagickCore-6.pc \
   7.294 +   magick/ImageMagick-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc \
   7.295 +   magick/MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc
   7.296 + 
   7.297 +@@ -4605,9 +4605,9 @@
   7.298 + 	magick/Magick-config.in \
   7.299 + 	magick/MagickCore-config.in \
   7.300 + 	$(MAGICK_MANS) \
   7.301 +-	magick/ImageMagick.pc.in \
   7.302 ++	magick/ImageMagick-6.pc.in \
   7.303 + 	magick/libMagickCore.map \
   7.304 +-	magick/MagickCore.pc.in \
   7.305 ++	magick/MagickCore-6.pc.in \
   7.306 + 	magick/config.h_vms \
   7.307 + 	magick/mac.c \
   7.308 + 	magick/nt-base.c \
   7.309 +@@ -4722,8 +4722,8 @@
   7.310 + 	wand/MagickWand-config
   7.311 + 
   7.312 + WAND_PKGCONFIG = \
   7.313 +-	wand/MagickWand.pc \
   7.314 +-	wand/Wand.pc \
   7.315 ++	wand/MagickWand-6.pc \
   7.316 ++	wand/Wand-6.pc \
   7.317 + 	wand/MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc \
   7.318 + 	wand/Wand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc
   7.319 + 
   7.320 +@@ -4747,9 +4747,9 @@
   7.321 + 	wand/ChangeLog \
   7.322 + 	wand/libMagickWand.map \
   7.323 + 	wand/MagickWand-config.1 \
   7.324 +-	wand/MagickWand.pc.in \
   7.325 ++	wand/MagickWand-6.pc.in \
   7.326 + 	wand/Wand-config.1 \
   7.327 +-	wand/Wand.pc.in
   7.328 ++	wand/Wand-6.pc.in
   7.329 + 
   7.330 + WAND_CLEANFILES = 
   7.331 + MAGICKPP_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/Magick++/lib
   7.332 +@@ -4778,8 +4778,8 @@
   7.333 + 	Magick++/bin/Magick++-config.1
   7.334 + 
   7.335 + MAGICKPP_PKGCONFIG_OPT = \
   7.336 +-	Magick++/lib/Magick++.pc \
   7.337 +-	Magick++/lib/ImageMagick++.pc \
   7.338 ++	Magick++/lib/Magick++-6.pc \
   7.339 ++	Magick++/lib/ImageMagick++-6.pc \
   7.340 + 	Magick++/lib/Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc \
   7.341 + 	Magick++/lib/ImageMagick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc
   7.342 + 
   7.343 +@@ -4796,9 +4796,9 @@
   7.344 + 	Magick++/README \
   7.345 + 	Magick++/bin/Magick++-config.1 \
   7.346 + 	Magick++/bin/Magick++-config.in \
   7.347 +-	Magick++/lib/ImageMagick++.pc.in \
   7.348 ++	Magick++/lib/ImageMagick++-6.pc.in \
   7.349 + 	Magick++/lib/libMagick++.map \
   7.350 +-	Magick++/lib/Magick++.pc.in \
   7.351 ++	Magick++/lib/Magick++-6.pc.in \
   7.352 + 	Magick++/demo/model.miff \
   7.353 + 	Magick++/demo/smile.miff \
   7.354 + 	Magick++/demo/smile_anim.miff \
   7.355 +@@ -5286,17 +5286,17 @@
   7.356 + 	cd $(top_builddir) && $(SHELL) ./config.status $@
   7.357 + Magick++/bin/Magick++-config: $(top_builddir)/config.status $(top_srcdir)/Magick++/bin/Magick++-config.in
   7.358 + 	cd $(top_builddir) && $(SHELL) ./config.status $@
   7.359 +-magick/ImageMagick.pc: $(top_builddir)/config.status $(top_srcdir)/magick/ImageMagick.pc.in
   7.360 ++magick/ImageMagick-6.pc: $(top_builddir)/config.status $(top_srcdir)/magick/ImageMagick-6.pc.in
   7.361 + 	cd $(top_builddir) && $(SHELL) ./config.status $@
   7.362 +-Magick++/lib/ImageMagick++.pc: $(top_builddir)/config.status $(top_srcdir)/Magick++/lib/ImageMagick++.pc.in
   7.363 ++Magick++/lib/ImageMagick++-6.pc: $(top_builddir)/config.status $(top_srcdir)/Magick++/lib/ImageMagick++-6.pc.in
   7.364 + 	cd $(top_builddir) && $(SHELL) ./config.status $@
   7.365 +-Magick++/lib/Magick++.pc: $(top_builddir)/config.status $(top_srcdir)/Magick++/lib/Magick++.pc.in
   7.366 ++Magick++/lib/Magick++-6.pc: $(top_builddir)/config.status $(top_srcdir)/Magick++/lib/Magick++-6.pc.in
   7.367 + 	cd $(top_builddir) && $(SHELL) ./config.status $@
   7.368 + magick/Magick-config: $(top_builddir)/config.status $(top_srcdir)/magick/Magick-config.in
   7.369 + 	cd $(top_builddir) && $(SHELL) ./config.status $@
   7.370 + magick/MagickCore-config: $(top_builddir)/config.status $(top_srcdir)/magick/MagickCore-config.in
   7.371 + 	cd $(top_builddir) && $(SHELL) ./config.status $@
   7.372 +-magick/MagickCore.pc: $(top_builddir)/config.status $(top_srcdir)/magick/MagickCore.pc.in
   7.373 ++magick/MagickCore-6.pc: $(top_builddir)/config.status $(top_srcdir)/magick/MagickCore-6.pc.in
   7.374 + 	cd $(top_builddir) && $(SHELL) ./config.status $@
   7.375 + magick/version.h: $(top_builddir)/config.status $(top_srcdir)/magick/version.h.in
   7.376 + 	cd $(top_builddir) && $(SHELL) ./config.status $@
   7.377 +@@ -5344,11 +5344,11 @@
   7.378 + 	cd $(top_builddir) && $(SHELL) ./config.status $@
   7.379 + wand/MagickWand-config: $(top_builddir)/config.status $(top_srcdir)/wand/MagickWand-config.in
   7.380 + 	cd $(top_builddir) && $(SHELL) ./config.status $@
   7.381 +-wand/MagickWand.pc: $(top_builddir)/config.status $(top_srcdir)/wand/MagickWand.pc.in
   7.382 ++wand/MagickWand-6.pc: $(top_builddir)/config.status $(top_srcdir)/wand/MagickWand-6.pc.in
   7.383 + 	cd $(top_builddir) && $(SHELL) ./config.status $@
   7.384 + wand/Wand-config: $(top_builddir)/config.status $(top_srcdir)/wand/Wand-config.in
   7.385 + 	cd $(top_builddir) && $(SHELL) ./config.status $@
   7.386 +-wand/Wand.pc: $(top_builddir)/config.status $(top_srcdir)/wand/Wand.pc.in
   7.387 ++wand/Wand-6.pc: $(top_builddir)/config.status $(top_srcdir)/wand/Wand-6.pc.in
   7.388 + 	cd $(top_builddir) && $(SHELL) ./config.status $@
   7.389 + 
   7.390 + install-codersLTLIBRARIES: $(coders_LTLIBRARIES)
   7.391 +@@ -11369,7 +11369,7 @@
   7.392 + 	install-data-local install-docDATA install-filtersLTLIBRARIES \
   7.393 + 	install-includeHEADERS install-magickincHEADERS \
   7.394 + 	install-magickincarchHEADERS install-magickppincHEADERS \
   7.395 +-	install-magickpptopincHEADERS install-man \
   7.396 ++	install-magickpptopincHEADERS \
   7.397 + 	install-pkgconfigDATA install-wandincHEADERS
   7.398 + 
   7.399 + install-dvi: install-dvi-am
   7.400 +@@ -11387,6 +11387,8 @@
   7.401 + 
   7.402 + install-info-am:
   7.403 + 
   7.404 ++install-libs-only: install-libLTLIBRARIES install-data-am
   7.405 ++
   7.406 + install-man: install-man1
   7.407 + 
   7.408 + install-pdf: install-pdf-am
   7.409 +@@ -11563,7 +11565,7 @@
   7.410 + @WITH_PERL_FALSE@distclean-perl:
   7.411 + 
   7.412 + # create a copy for pc file (ideally the non abi should be symlinked)
   7.413 +-%-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc: %.pc
   7.414 ++%-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc: %-@MAGICK_MAJOR_VERSION@.pc
   7.415 + 	cp -f $^ $@
   7.416 + 
   7.417 + all-local: $(MAGICKPP_LOCAL_TARGETS) $(PERLMAGICK_ALL_LOCAL_TARGETS) $(MAINTAINER_TARGETS)
   7.418 +diff -Naur ImageMagick-6.9.6-3.orig/wand/MagickWand-6.pc.in ImageMagick-6.9.6-3/wand/MagickWand-6.pc.in
   7.419 +--- ImageMagick-6.9.6-3.orig/wand/MagickWand-6.pc.in	1970-01-01 01:00:00.000000000 +0100
   7.420 ++++ ImageMagick-6.9.6-3/wand/MagickWand-6.pc.in	2017-01-08 00:37:51.232515933 +0000
   7.421 +@@ -0,0 +1,15 @@
   7.422 ++prefix=@prefix@
   7.423 ++exec_prefix=@exec_prefix@
   7.424 ++libdir=@libdir@
   7.425 ++includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@
   7.426 ++includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@
   7.427 ++libname=MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
   7.428 ++ 
   7.429 ++Name: MagickWand-@MAGICK_MAJOR_VERSION@
   7.430 ++Description: MagickWand - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)
   7.431 ++URL: https://www.imagemagick.org
   7.432 ++Version: @PACKAGE_VERSION@
   7.433 ++Requires: MagickCore-@MAGICK_MAJOR_VERSION@
   7.434 ++Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@
   7.435 ++Libs: -L${libdir} -l${libname} 
   7.436 ++Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
   7.437 +diff -Naur ImageMagick-6.9.6-3.orig/wand/MagickWand.pc.in ImageMagick-6.9.6-3/wand/MagickWand.pc.in
   7.438 +--- ImageMagick-6.9.6-3.orig/wand/MagickWand.pc.in	2016-10-31 00:34:31.000000000 +0000
   7.439 ++++ ImageMagick-6.9.6-3/wand/MagickWand.pc.in	1970-01-01 01:00:00.000000000 +0100
   7.440 +@@ -1,15 +0,0 @@
   7.441 +-prefix=@prefix@
   7.442 +-exec_prefix=@exec_prefix@
   7.443 +-libdir=@libdir@
   7.444 +-includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@
   7.445 +-includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@
   7.446 +-libname=MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
   7.447 +- 
   7.448 +-Name: MagickWand
   7.449 +-Description: MagickWand - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)
   7.450 +-URL: https://www.imagemagick.org
   7.451 +-Version: @PACKAGE_VERSION@
   7.452 +-Requires: MagickCore
   7.453 +-Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@
   7.454 +-Libs: -L${libdir} -l${libname} 
   7.455 +-Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
   7.456 +diff -Naur ImageMagick-6.9.6-3.orig/wand/Wand-6.pc.in ImageMagick-6.9.6-3/wand/Wand-6.pc.in
   7.457 +--- ImageMagick-6.9.6-3.orig/wand/Wand-6.pc.in	1970-01-01 01:00:00.000000000 +0100
   7.458 ++++ ImageMagick-6.9.6-3/wand/Wand-6.pc.in	2017-01-08 00:39:23.169642808 +0000
   7.459 +@@ -0,0 +1,15 @@
   7.460 ++prefix=@prefix@
   7.461 ++exec_prefix=@exec_prefix@
   7.462 ++libdir=@libdir@
   7.463 ++includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@
   7.464 ++includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@
   7.465 ++libname=MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@
   7.466 ++ 
   7.467 ++Name: MagickWand-6
   7.468 ++Description: MagickCore - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@)
   7.469 ++URL: https://www.imagemagick.org
   7.470 ++Version: @PACKAGE_VERSION@
   7.471 ++Requires: MagickCore-6
   7.472 ++Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@
   7.473 ++Libs: -L${libdir} -l${libname}
   7.474 ++Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/imagemagick6/stuff/patches/series	Fri May 12 16:18:42 2017 +0300
     8.3 @@ -0,0 +1,1 @@
     8.4 +ImageMagick-6.9.7-8-libs_only-1.patch
     9.1 --- a/tango-icon-theme/receipt	Fri May 12 11:26:54 2017 +0200
     9.2 +++ b/tango-icon-theme/receipt	Fri May 12 16:18:42 2017 +0300
     9.3 @@ -13,7 +13,7 @@
     9.4  
     9.5  DEPENDS=""
     9.6  BUILD_DEPENDS="intltool gettext perl icon-naming-utils imagemagick-dev \
     9.7 -librsvg-dev perl-xml-simple"
     9.8 +librsvg-dev librsvg-apps perl-xml-simple"
     9.9  
    9.10  # Rules to configure and make the package.
    9.11  compile_rules()
    9.12 @@ -27,5 +27,5 @@
    9.13  # Rules to gen a SliTaz package suitable for Tazpkg.
    9.14  genpkg_rules()
    9.15  {
    9.16 -	cp -a $install/* $fs
    9.17 +	copy @std
    9.18  }
    10.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.2 +++ b/tango-icon-theme/stuff/patches/series	Fri May 12 16:18:42 2017 +0300
    10.3 @@ -0,0 +1,1 @@
    10.4 +tango-icon-theme-0.8.90-rsvg-convert.patch
    11.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.2 +++ b/tango-icon-theme/stuff/patches/tango-icon-theme-0.8.90-rsvg-convert.patch	Fri May 12 16:18:42 2017 +0300
    11.3 @@ -0,0 +1,32 @@
    11.4 +Based on https://build.opensuse.org/package/view_file?file=tango-icon-theme-rsvg-2_35_2.patch&package=tango-icon-theme&project=openSUSE%3A12.2&rev=faf71bf8278d5df6ec8a31726e5b8542
    11.5 +
    11.6 +--- a/configure
    11.7 ++++ b/configure
    11.8 +@@ -6554,7 +6554,7 @@
    11.9 +   enable_large_bitmaps=no
   11.10 + fi
   11.11 +    if test "x$enable_large_bitmaps" = "xyes"; then
   11.12 +-      svgconvert_prog="rsvg"
   11.13 ++      svgconvert_prog="rsvg-convert"
   11.14 +    else
   11.15 +       svgconvert_prog="ksvgtopng"
   11.16 +    fi
   11.17 +--- a/svg2png.sh.in
   11.18 ++++ b/svg2png.sh.in
   11.19 +@@ -9,12 +9,14 @@
   11.20 + 
   11.21 + ICONFILE=`basename ${3}`
   11.22 + ICONNAME=`echo ${ICONFILE} | sed -e "s/.svg//"`
   11.23 +-if test `basename $SVGCONVERT` = "rsvg"; then
   11.24 ++if test `basename $SVGCONVERT` = "rsvg-convert"; then
   11.25 +     OPTIONS="-w ${1} -h ${1}"
   11.26 ++    OUTPUT="-o"
   11.27 + else
   11.28 +     OPTIONS="${1} ${1}"
   11.29 ++    OUTPUT=""
   11.30 + fi
   11.31 + 
   11.32 + echo "${SVGCONVERT} ${OPTIONS} ${3} ${2}/${ICONNAME}.png"
   11.33 +-${SVGCONVERT} ${OPTIONS} ${3} ${2}/${ICONNAME}.png
   11.34 ++${SVGCONVERT} ${OPTIONS} ${3} ${OUTPUT} ${2}/${ICONNAME}.png
   11.35 +