wok-next rev 20224
Up inkscape and it's deps:
gtest, imagemagick, imagemagick6;
add libcdr, librevenge, libvisio, libwpd, libwpg, potrace.
gtest, imagemagick, imagemagick6;
add libcdr, librevenge, libvisio, libwpd, libwpg, potrace.
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Sun Nov 05 18:29:48 2017 +0200 (2017-11-05) |
| parents | d5f9530836a4 |
| children | 67cc287fb6da |
| files | gtest/receipt imagemagick/receipt imagemagick6/receipt imagemagick6/stuff/patches/ImageMagick-6.9.7-8-libs_only-1.patch imagemagick6/stuff/patches/ImageMagick-6.9.9-9-libs_only-1.patch imagemagick6/stuff/patches/series inkscape/receipt inkscape/stuff/README inkscape/stuff/patches/0002-Drop_PS_and_PDF_support_in_MimeType.patch inkscape/stuff/patches/inkscape-0.92.2-use_versioned_ImageMagick6-1.patch inkscape/stuff/patches/series libcdr/receipt librevenge/receipt libvisio/receipt libwpd/receipt libwpg/receipt potrace/receipt |
line diff
1.1 --- a/gtest/receipt Sun Nov 05 17:17:00 2017 +0100 1.2 +++ b/gtest/receipt Sun Nov 05 18:29:48 2017 +0200 1.3 @@ -1,29 +1,30 @@ 1.4 -# SliTaz package receipt. 1.5 +# SliTaz package receipt v2. 1.6 1.7 PACKAGE="gtest" 1.8 -VERSION="1.7.0" 1.9 +VERSION="1.8.0" 1.10 CATEGORY="development" 1.11 -SHORT_DESC="Google's framework for writing C++ tests." 1.12 +SHORT_DESC="Google's framework for writing C++ tests" 1.13 MAINTAINER="pascal.bellard@slitaz.org" 1.14 -LICENSE="other" 1.15 -TARBALL="$PACKAGE-$VERSION.zip" 1.16 -WEB_SITE="http://code.google.com/p/googletest/" 1.17 -WGET_URL="http://googletest.googlecode.com/files/$TARBALL" 1.18 +LICENSE="BSD" 1.19 +WEB_SITE="https://github.com/google/googletest" 1.20 1.21 -BUILD_DEPENDS="cmake" 1.22 +TARBALL="$PACKAGE-$VERSION.tar.gz" 1.23 +WGET_URL="https://github.com/google/googletest/archive/release-$VERSION.tar.gz" 1.24 1.25 -# Rules to configure and make the package. 1.26 -compile_rules() 1.27 -{ 1.28 - mkdir build && cd build 1.29 - cmake -DCMAKE_INSTALL_PREFIX=/usr .. 1.30 - make 1.31 +BUILD_DEPENDS="cmake python" 1.32 + 1.33 +compile_rules() { 1.34 + mkdir -p build 1.35 + cd build 1.36 + cmake \ 1.37 + -DCMAKE_INSTALL_PREFIX=/usr \ 1.38 + -DBUILD_SHARED_LIBS=ON \ 1.39 + -DCMAKE_SKIP_RPATH=ON \ 1.40 + .. && 1.41 + make && 1.42 + make install 1.43 } 1.44 1.45 -# Rules to gen a SliTaz package suitable for Tazpkg. 1.46 -genpkg_rules() 1.47 -{ 1.48 - mkdir -p $fs/usr/lib 1.49 - cp -a $src/include $fs/usr 1.50 - cp -a $src/build/*a $fs/usr/lib 1.51 +genpkg_rules() { 1.52 + copy @std @dev 1.53 }
2.1 --- a/imagemagick/receipt Sun Nov 05 17:17:00 2017 +0100 2.2 +++ b/imagemagick/receipt Sun Nov 05 18:29:48 2017 +0200 2.3 @@ -1,22 +1,23 @@ 2.4 # SliTaz package receipt v2. 2.5 2.6 PACKAGE="imagemagick" 2.7 -VERSION="7.0.5-5" 2.8 +VERSION="7.0.6-10" 2.9 CATEGORY="graphics" 2.10 SHORT_DESC="ImageMagick - convert, edit, and compose images" 2.11 MAINTAINER="pankso@slitaz.org" 2.12 LICENSE="Apache" 2.13 -WEB_SITE="http://www.imagemagick.org/" 2.14 +WEB_SITE="https://www.imagemagick.org/script/index.php" 2.15 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/imagemagick.html" 2.16 2.17 TARBALL="ImageMagick-$VERSION.tar.xz" 2.18 WGET_URL="https://www.imagemagick.org/download/releases/$TARBALL" 2.19 2.20 BUILD_DEPENDS="bzip2-dev xorg-libX11-dev xorg-libICE-dev xorg-libXext-dev \ 2.21 xorg-libXt-dev zlib-dev libtool fftw-dev fontconfig-dev freetype-dev \ 2.22 -libjpeg-turbo-dev lcms2-dev xz-dev pango-dev libpng-dev tiff-dev \ 2.23 -libxml2-dev librsvg-dev perl-dev util-linux-uuid-dev" 2.24 -# jasper-dev ilmbase-dev openexr-dev graphviz-dev libgsf-dev 2.25 -SPLIT="imagemagick-dev perl-image-magick" 2.26 +libjpeg-turbo-dev lcms2-dev xz-dev pango-dev libpng16-dev tiff-dev \ 2.27 +libxml2-dev librsvg-dev perl-dev util-linux-uuid-dev jasper-dev ilmbase-dev \ 2.28 +openexr-dev libgsf-dev" # graphviz-dev 2.29 +SPLIT="perl-image-magick imagemagick imagemagick-dev" 2.30 2.31 # Rules to configure and make the package. 2.32 compile_rules() 2.33 @@ -40,8 +41,13 @@ 2.34 genpkg_rules() 2.35 { 2.36 case $PACKAGE in 2.37 + perl-image-magick) 2.38 + copy perl5/ 2.39 + CAT="perl|Image::Magick Perl module" 2.40 + DEPENDS="perl imagemagick" 2.41 + ;; 2.42 imagemagick) 2.43 - copy @std 2.44 + copy @std @rm 2.45 2.46 # CVE-2016-3714 work around v5 2.47 sed -i '/<policymap>/r/dev/stdin' $fs/etc/ImageMagick-7/policy.xml <<EOT 2.48 @@ -57,7 +63,7 @@ 2.49 EOT 2.50 DEPENDS="bzlib cairo fftw fontconfig freetype gdk-pixbuf glib \ 2.51 harfbuzz lcms2 libcroco libffi libgomp libjpeg-turbo \ 2.52 - libltdl liblzma libpng librsvg libxcb libxml2 pango pcre pixman \ 2.53 + libltdl liblzma libpng16 librsvg libxcb libxml2 pango pcre pixman \ 2.54 tiff util-linux-uuid xorg-libICE xorg-libSM xorg-libX11 \ 2.55 xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXrender xorg-libXt \ 2.56 zlib" 2.57 @@ -68,16 +74,11 @@ 2.58 DEPENDS="imagemagick bzip2-dev cairo-dev fftw-dev fontconfig-dev \ 2.59 freetype-dev gdk-pixbuf-dev glib-dev glibc-dev harfbuzz-dev \ 2.60 lcms2-dev libcroco-dev libffi-dev libjpeg-turbo-dev \ 2.61 - liblzma-dev libpng-dev librsvg-dev libtool libxcb-dev libxml2-dev \ 2.62 + liblzma-dev libpng16-dev librsvg-dev libtool libxcb-dev libxml2-dev \ 2.63 pango-dev pcre-dev pixman-dev tiff-dev util-linux-uuid-dev \ 2.64 xorg-libICE-dev xorg-libSM-dev xorg-libX11-dev xorg-libXau-dev \ 2.65 xorg-libXdmcp-dev xorg-libXext-dev xorg-libXrender-dev \ 2.66 xorg-libXt-dev zlib-dev" 2.67 ;; 2.68 - perl-image-magick) 2.69 - copy perl5/ 2.70 - CAT="perl|Image::Magick Perl module" 2.71 - DEPENDS="perl imagemagick" 2.72 - ;; 2.73 esac 2.74 }
3.1 --- a/imagemagick6/receipt Sun Nov 05 17:17:00 2017 +0100 3.2 +++ b/imagemagick6/receipt Sun Nov 05 18:29:48 2017 +0200 3.3 @@ -1,21 +1,23 @@ 3.4 # SliTaz package receipt v2. 3.5 3.6 PACKAGE="imagemagick6" 3.7 -VERSION="6.9.8-4" 3.8 +VERSION="6.9.9-9" 3.9 CATEGORY="graphics" 3.10 SHORT_DESC="ImageMagick (v.6) - convert, edit, and compose images" 3.11 MAINTAINER="pankso@slitaz.org" 3.12 LICENSE="Apache" 3.13 -WEB_SITE="http://www.imagemagick.org/" 3.14 +WEB_SITE="https://www.imagemagick.org/script/index.php" 3.15 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/general/imagemagick6.html" 3.16 3.17 TARBALL="ImageMagick-$VERSION.tar.xz" 3.18 -WGET_URL="https://www.imagemagick.org/download/releases/$TARBALL" 3.19 +#WGET_URL="https://www.imagemagick.org/download/releases/$TARBALL" # not available here now 3.20 +WGET_URL="ftp://ftp.osuosl.org/pub/blfs/conglomeration/ImageMagick/$TARBALL" 3.21 3.22 BUILD_DEPENDS="bzip2-dev xorg-libX11-dev xorg-libICE-dev xorg-libXext-dev \ 3.23 xorg-libXt-dev zlib-dev libtool fftw-dev fontconfig-dev freetype-dev \ 3.24 -libjpeg-turbo-dev lcms2-dev xz-dev pango-dev libpng-dev tiff-dev \ 3.25 -libxml2-dev librsvg-dev perl-dev util-linux-uuid-dev" 3.26 -# jasper-dev ilmbase-dev openexr-dev graphviz-dev libgsf-dev 3.27 +libjpeg-turbo-dev lcms2-dev xz-dev pango-dev libpng16-dev tiff-dev \ 3.28 +libxml2-dev librsvg-dev perl-dev util-linux-uuid-dev jasper-dev ilmbase-dev \ 3.29 +openexr-dev libgsf-dev" # graphviz-dev 3.30 SPLIT="imagemagick6-dev" 3.31 3.32 # Rules to configure and make the package. 3.33 @@ -23,17 +25,12 @@ 3.34 { 3.35 ./configure \ 3.36 --sysconfdir=/etc \ 3.37 - --with-perl \ 3.38 - --with-magick-plus-plus \ 3.39 + --enable-hdri \ 3.40 --with-modules \ 3.41 - --enable-hdri \ 3.42 - --with-rsvg \ 3.43 --disable-static \ 3.44 $CONFIGURE_ARGS && 3.45 make $MAKEFLAGS && 3.46 - make DESTDIR=$DESTDIR install 3.47 - 3.48 - chmod -R u+w $install/usr/lib/perl5/ 3.49 + make DESTDIR=$DESTDIR install-libs-only 3.50 } 3.51 3.52 # Rules to gen a SliTaz package suitable for Tazpkg. 3.53 @@ -55,24 +52,22 @@ 3.54 <policy domain="coder" rights="none" pattern="WIN" /> 3.55 <policy domain="coder" rights="none" pattern="PLT" /> 3.56 EOT 3.57 - DEPENDS="bzlib cairo fftw fontconfig freetype gdk-pixbuf glib \ 3.58 - harfbuzz lcms2 libcroco libffi libgomp libjpeg-turbo \ 3.59 - libltdl liblzma libpng librsvg libxcb libxml2 pango pcre pixman \ 3.60 - tiff util-linux-uuid xorg-libICE xorg-libSM xorg-libX11 \ 3.61 - xorg-libXau xorg-libXdmcp xorg-libXext xorg-libXrender xorg-libXt \ 3.62 - zlib" 3.63 + DEPENDS="bzlib cairo fftw fontconfig freetype glib ilmbase lcms2 \ 3.64 + libffi libgomp libharfbuzz libjpeg-turbo libltdl liblzma libpng16 \ 3.65 + libxml2 openexr pango pcre tiff util-linux-uuid xorg-libICE \ 3.66 + xorg-libSM xorg-libX11 xorg-libXau xorg-libXdmcp xorg-libXext \ 3.67 + xorg-libXrender xorg-libXt xorg-libxcb xorg-pixman zlib" 3.68 TAGS="image photo toolkit" 3.69 ;; 3.70 *-dev) 3.71 copy @dev 3.72 DEPENDS="imagemagick6 bzip2-dev cairo-dev fftw-dev fontconfig-dev \ 3.73 - freetype-dev gdk-pixbuf-dev glib-dev glibc-dev harfbuzz-dev \ 3.74 - lcms2-dev libcroco-dev libffi-dev libjpeg-turbo-dev \ 3.75 - liblzma-dev libpng-dev librsvg-dev libtool libxcb-dev libxml2-dev \ 3.76 - pango-dev pcre-dev pixman-dev tiff-dev util-linux-uuid-dev \ 3.77 + freetype-dev glib-dev harfbuzz-dev ilmbase-dev lcms2-dev \ 3.78 + libffi-dev libjpeg-turbo-dev libpng16-dev libtool libxml2-dev \ 3.79 + openexr-dev pango-dev pcre-dev tiff-dev util-linux-uuid-dev \ 3.80 xorg-libICE-dev xorg-libSM-dev xorg-libX11-dev xorg-libXau-dev \ 3.81 xorg-libXdmcp-dev xorg-libXext-dev xorg-libXrender-dev \ 3.82 - xorg-libXt-dev zlib-dev" 3.83 + xorg-libXt-dev xorg-libxcb-dev xorg-pixman-dev xz-dev zlib-dev" 3.84 ;; 3.85 esac 3.86 }
4.1 --- a/imagemagick6/stuff/patches/ImageMagick-6.9.7-8-libs_only-1.patch Sun Nov 05 17:17:00 2017 +0100 4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 4.3 @@ -1,471 +0,0 @@ 4.4 -Submitted By: Ken Moffat <ken at linuxfromscratch dot org> 4.5 -Date: 2017-01-09 4.6 -Initial Package Version: 6.9.6-3 4.7 -Upstream Status: N/A 4.8 -Origin: Self 4.9 -Description: Allows the libraries of ImageMagick-6 to be installed 4.10 -without the programs or man-pages, and with versioned pkgconfig files 4.11 -so that ImageMagick-7 can be installed alongside this. Do not build 4.12 -perl here if doing this (the version from ImageMagick-7 will use the 4.13 -libraries from 7), and edit anyi cmake programs using this (e.g. 4.14 -inkscape-0.92) so that they look for the -6 pkgconfig files. 4.15 - 4.16 -Internally, ImageMagick-7 is a major change, and the names of the 4.17 -libraries and the include directories differ. 4.18 - 4.19 -For packages which use a conventional configure script, pass 4.20 -IMAGEMAGICK_CFLAGS=-I/usr/include/ImageMagick-6 and 4.21 -IMAGEMAGICK_LIBS="-lMagickCore-6.Q16HDRI -lMagick++-6.Q16HDRI -lMagickWand-6.Q16HDRI" 4.22 - 4.23 -In some places I have had to hardcode -6 because I could not persuade 4.24 -the build system to convert @MAGICK_CORE_VERSION@ in one file or for 4.25 -the names of the files. 4.26 - 4.27 -Also, my raw patch deletes wand/Wand.pc.in but gnu patch fails there, 4.28 -believing it is a reversal (not understood, a git patch would be 4.29 -easier if we all had git, mentioned because it will probably happen 4.30 -again if this has to be rediffed for future versions). 4.31 - 4.32 -diff -Naur ImageMagick-6.9.6-3.orig/configure ImageMagick-6.9.6-3/configure 4.33 ---- ImageMagick-6.9.6-3.orig/configure 2017-01-07 01:35:18.362869976 +0000 4.34 -+++ ImageMagick-6.9.6-3/configure 2017-01-07 20:50:59.735901975 +0000 4.35 -@@ -37452,7 +37452,7 @@ 4.36 - # ============================================================================== 4.37 - # Generate build environment 4.38 - # ============================================================================== 4.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" 4.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" 4.41 - 4.42 - cat >confcache <<\_ACEOF 4.43 - # This file is a shell script that caches the results of configure 4.44 -diff -Naur ImageMagick-6.9.6-3.orig/configure.ac ImageMagick-6.9.6-3/configure.ac 4.45 ---- ImageMagick-6.9.6-3.orig/configure.ac 2017-01-07 01:35:27.053787793 +0000 4.46 -+++ ImageMagick-6.9.6-3/configure.ac 2017-01-07 20:52:26.205101788 +0000 4.47 -@@ -3835,12 +3835,12 @@ 4.48 - config/type.xml \ 4.49 - ImageMagick.spec \ 4.50 - Magick++/bin/Magick++-config \ 4.51 -- magick/ImageMagick.pc \ 4.52 -- Magick++/lib/ImageMagick++.pc \ 4.53 -- Magick++/lib/Magick++.pc \ 4.54 -+ magick/ImageMagick-6.pc \ 4.55 -+ Magick++/lib/ImageMagick++-6.pc \ 4.56 -+ Magick++/lib/Magick++-6.pc \ 4.57 - magick/Magick-config \ 4.58 - magick/MagickCore-config \ 4.59 -- magick/MagickCore.pc \ 4.60 -+ magick/MagickCore-6.pc \ 4.61 - magick/version.h \ 4.62 - Makefile \ 4.63 - magick.sh \ 4.64 -@@ -3865,9 +3865,9 @@ 4.65 - utilities/montage.1 \ 4.66 - utilities/stream.1 \ 4.67 - wand/MagickWand-config \ 4.68 -- wand/MagickWand.pc \ 4.69 -+ wand/MagickWand-6.pc \ 4.70 - wand/Wand-config \ 4.71 -- wand/Wand.pc ]) 4.72 -+ wand/Wand-6.pc ]) 4.73 - AC_OUTPUT 4.74 - 4.75 - # ============================================================================== 4.76 -diff -Naur ImageMagick-6.9.6-3.orig/magick/ImageMagick-6.pc.in ImageMagick-6.9.6-3/magick/ImageMagick-6.pc.in 4.77 ---- ImageMagick-6.9.6-3.orig/magick/ImageMagick-6.pc.in 1970-01-01 01:00:00.000000000 +0100 4.78 -+++ ImageMagick-6.9.6-3/magick/ImageMagick-6.pc.in 2017-01-07 00:55:17.999483324 +0000 4.79 -@@ -0,0 +1,14 @@ 4.80 -+prefix=@prefix@ 4.81 -+exec_prefix=@exec_prefix@ 4.82 -+libdir=@libdir@ 4.83 -+includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ 4.84 -+includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@ 4.85 -+libname=MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ 4.86 -+ 4.87 -+Name: ImageMagick-@MAGICK_MAJOR_VERSION@ 4.88 -+Description: ImageMagick - convert, edit, and compose images (ABI @MAGICK_ABI_SUFFIX@) 4.89 -+URL: https://www.imagemagick.org 4.90 -+Version: @PACKAGE_VERSION@ 4.91 -+Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@ 4.92 -+Libs: -L${libdir} -l${libname} 4.93 -+Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@ 4.94 -diff -Naur ImageMagick-6.9.6-3.orig/magick/ImageMagick.pc.in ImageMagick-6.9.6-3/magick/ImageMagick.pc.in 4.95 ---- ImageMagick-6.9.6-3.orig/magick/ImageMagick.pc.in 2017-01-07 01:58:35.942633448 +0000 4.96 -+++ ImageMagick-6.9.6-3/magick/ImageMagick.pc.in 1970-01-01 01:00:00.000000000 +0100 4.97 -@@ -1,14 +0,0 @@ 4.98 --prefix=@prefix@ 4.99 --exec_prefix=@exec_prefix@ 4.100 --libdir=@libdir@ 4.101 --includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ 4.102 --includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@ 4.103 --libname=MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ 4.104 -- 4.105 --Name: ImageMagick 4.106 --Description: ImageMagick - convert, edit, and compose images (ABI @MAGICK_ABI_SUFFIX@) 4.107 --URL: https://www.imagemagick.org 4.108 --Version: @PACKAGE_VERSION@ 4.109 --Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@ 4.110 --Libs: -L${libdir} -l${libname} 4.111 --Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@ 4.112 -diff -Naur ImageMagick-6.9.6-3.orig/magick/MagickCore-6.pc.in ImageMagick-6.9.6-3/magick/MagickCore-6.pc.in 4.113 ---- ImageMagick-6.9.6-3.orig/magick/MagickCore-6.pc.in 1970-01-01 01:00:00.000000000 +0100 4.114 -+++ ImageMagick-6.9.6-3/magick/MagickCore-6.pc.in 2017-01-07 22:13:31.500562039 +0000 4.115 -@@ -0,0 +1,15 @@ 4.116 -+prefix=@prefix@ 4.117 -+exec_prefix=@exec_prefix@ 4.118 -+libdir=@libdir@ 4.119 -+includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ 4.120 -+includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@ 4.121 -+libname=MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ 4.122 -+moduledir=@libdir@/ImageMagick-@MAGICK_MAJOR_VERSION@.@MAGICK_MINOR_VERSION@.@MAGICK_MICRO_VERSION@/modules-@MAGICK_ABI_SUFFIX@ 4.123 -+ 4.124 -+Name: MagickCore-@MAGICK_MAJOR_VERSION@ 4.125 -+Description: MagickCore - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) 4.126 -+URL: https://www.imagemagick.org 4.127 -+Version: @PACKAGE_VERSION@ 4.128 -+Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@ 4.129 -+Libs: -L${libdir} -l${libname} 4.130 -+Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@ 4.131 -diff -Naur ImageMagick-6.9.6-3.orig/magick/MagickCore.pc.in ImageMagick-6.9.6-3/magick/MagickCore.pc.in 4.132 ---- ImageMagick-6.9.6-3.orig/magick/MagickCore.pc.in 2016-10-31 00:34:31.000000000 +0000 4.133 -+++ ImageMagick-6.9.6-3/magick/MagickCore.pc.in 1970-01-01 01:00:00.000000000 +0100 4.134 -@@ -1,15 +0,0 @@ 4.135 --prefix=@prefix@ 4.136 --exec_prefix=@exec_prefix@ 4.137 --libdir=@libdir@ 4.138 --includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ 4.139 --includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@ 4.140 --libname=MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ 4.141 --moduledir=@libdir@/ImageMagick-@MAGICK_MAJOR_VERSION@.@MAGICK_MINOR_VERSION@.@MAGICK_MICRO_VERSION@/modules-@MAGICK_ABI_SUFFIX@ 4.142 -- 4.143 --Name: MagickCore 4.144 --Description: MagickCore - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) 4.145 --URL: https://www.imagemagick.org 4.146 --Version: @PACKAGE_VERSION@ 4.147 --Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@ 4.148 --Libs: -L${libdir} -l${libname} 4.149 --Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@ 4.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 4.151 ---- ImageMagick-6.9.6-3.orig/Magick++/lib/ImageMagick++-6.pc.in 1970-01-01 01:00:00.000000000 +0100 4.152 -+++ ImageMagick-6.9.6-3/Magick++/lib/ImageMagick++-6.pc.in 2017-01-07 22:11:59.637428232 +0000 4.153 -@@ -0,0 +1,14 @@ 4.154 -+prefix=@prefix@ 4.155 -+exec_prefix=@exec_prefix@ 4.156 -+libdir=@libdir@ 4.157 -+includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ 4.158 -+includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@ 4.159 -+libname=Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ 4.160 -+ 4.161 -+Name: ImageMagick++-@MAGICK_MAJOR_VERSION@ 4.162 -+Description: Magick++ - C++ API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) 4.163 -+Version: @PACKAGE_VERSION@ 4.164 -+Requires: MagickWand-@MAGICK_MAJOR_VERSION@ 4.165 -+Libs: -L${libdir} -l${libname} 4.166 -+Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@ 4.167 -+Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@ 4.168 -diff -Naur ImageMagick-6.9.6-3.orig/Magick++/lib/ImageMagick++.pc.in ImageMagick-6.9.6-3/Magick++/lib/ImageMagick++.pc.in 4.169 ---- ImageMagick-6.9.6-3.orig/Magick++/lib/ImageMagick++.pc.in 2016-10-31 00:34:30.000000000 +0000 4.170 -+++ ImageMagick-6.9.6-3/Magick++/lib/ImageMagick++.pc.in 1970-01-01 01:00:00.000000000 +0100 4.171 -@@ -1,14 +0,0 @@ 4.172 --prefix=@prefix@ 4.173 --exec_prefix=@exec_prefix@ 4.174 --libdir=@libdir@ 4.175 --includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ 4.176 --includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@ 4.177 --libname=Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ 4.178 -- 4.179 --Name: ImageMagick++ 4.180 --Description: Magick++ - C++ API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) 4.181 --Version: @PACKAGE_VERSION@ 4.182 --Requires: MagickWand 4.183 --Libs: -L${libdir} -l${libname} 4.184 --Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@ 4.185 --Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@ 4.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 4.187 ---- ImageMagick-6.9.6-3.orig/Magick++/lib/Magick++-6.pc.in 1970-01-01 01:00:00.000000000 +0100 4.188 -+++ ImageMagick-6.9.6-3/Magick++/lib/Magick++-6.pc.in 2017-01-07 21:09:41.641487042 +0000 4.189 -@@ -0,0 +1,14 @@ 4.190 -+prefix=@prefix@ 4.191 -+exec_prefix=@exec_prefix@ 4.192 -+libdir=@libdir@ 4.193 -+includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ 4.194 -+includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@ 4.195 -+libname=Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ 4.196 -+ 4.197 -+Name: Magick++-@MAGICK_MAJOR_VERSION@ 4.198 -+Description: Magick++ - C++ API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) 4.199 -+Version: @PACKAGE_VERSION@ 4.200 -+Requires: MagickWand-@MAGICK_MAJOR_VERSION@ 4.201 -+Libs: -L${libdir} -l${libname} 4.202 -+Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@ 4.203 -+Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@ 4.204 -diff -Naur ImageMagick-6.9.6-3.orig/Magick++/lib/Magick++.pc.in ImageMagick-6.9.6-3/Magick++/lib/Magick++.pc.in 4.205 ---- ImageMagick-6.9.6-3.orig/Magick++/lib/Magick++.pc.in 2016-10-31 00:34:30.000000000 +0000 4.206 -+++ ImageMagick-6.9.6-3/Magick++/lib/Magick++.pc.in 1970-01-01 01:00:00.000000000 +0100 4.207 -@@ -1,14 +0,0 @@ 4.208 --prefix=@prefix@ 4.209 --exec_prefix=@exec_prefix@ 4.210 --libdir=@libdir@ 4.211 --includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ 4.212 --includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@ 4.213 --libname=Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ 4.214 -- 4.215 --Name: Magick++ 4.216 --Description: Magick++ - C++ API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) 4.217 --Version: @PACKAGE_VERSION@ 4.218 --Requires: MagickWand 4.219 --Libs: -L${libdir} -l${libname} 4.220 --Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@ 4.221 --Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@ 4.222 -diff -Naur ImageMagick-6.9.6-3.orig/Makefile.in ImageMagick-6.9.6-3/Makefile.in 4.223 ---- ImageMagick-6.9.6-3.orig/Makefile.in 2017-01-06 01:07:37.217002803 +0000 4.224 -+++ ImageMagick-6.9.6-3/Makefile.in 2017-01-08 00:24:45.777974561 +0000 4.225 -@@ -302,10 +302,10 @@ 4.226 - config/Magick++.dox config/type-apple.xml \ 4.227 - config/type-dejavu.xml config/type-ghostscript.xml \ 4.228 - config/type-windows.xml config/type.xml ImageMagick.spec \ 4.229 -- Magick++/bin/Magick++-config magick/ImageMagick.pc \ 4.230 -- Magick++/lib/ImageMagick++.pc Magick++/lib/Magick++.pc \ 4.231 -+ Magick++/bin/Magick++-config magick/ImageMagick-6.pc \ 4.232 -+ Magick++/lib/ImageMagick++-6.pc Magick++/lib/Magick++-6.pc \ 4.233 - magick/Magick-config magick/MagickCore-config \ 4.234 -- magick/MagickCore.pc magick/version.h magick.sh \ 4.235 -+ magick/MagickCore-6.pc magick/version.h magick.sh \ 4.236 - PerlMagick/check.sh PerlMagick/default/Magick.pm \ 4.237 - PerlMagick/Makefile.PL PerlMagick/default/Makefile.PL \ 4.238 - PerlMagick/quantum/Makefile.PL PerlMagick/quantum/quantum.pm \ 4.239 -@@ -314,8 +314,8 @@ 4.240 - utilities/conjure.1 utilities/convert.1 utilities/display.1 \ 4.241 - utilities/identify.1 utilities/ImageMagick.1 \ 4.242 - utilities/import.1 utilities/mogrify.1 utilities/montage.1 \ 4.243 -- utilities/stream.1 wand/MagickWand-config wand/MagickWand.pc \ 4.244 -- wand/Wand-config wand/Wand.pc 4.245 -+ utilities/stream.1 wand/MagickWand-config wand/MagickWand-6.pc \ 4.246 -+ wand/Wand-config wand/Wand-6.pc 4.247 - CONFIG_CLEAN_VPATH_FILES = 4.248 - am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; 4.249 - am__vpath_adj = case $$p in \ 4.250 -@@ -2471,8 +2471,8 @@ 4.251 - $(srcdir)/tests/Makefile.am $(srcdir)/utilities/Makefile.am \ 4.252 - $(srcdir)/wand/Makefile.am \ 4.253 - $(top_srcdir)/Magick++/bin/Magick++-config.in \ 4.254 -- $(top_srcdir)/Magick++/lib/ImageMagick++.pc.in \ 4.255 -- $(top_srcdir)/Magick++/lib/Magick++.pc.in \ 4.256 -+ $(top_srcdir)/Magick++/lib/ImageMagick++-6.pc.in \ 4.257 -+ $(top_srcdir)/Magick++/lib/Magick++-6.pc.in \ 4.258 - $(top_srcdir)/PerlMagick/Makefile.PL.in \ 4.259 - $(top_srcdir)/PerlMagick/check.sh.in \ 4.260 - $(top_srcdir)/PerlMagick/default/Magick.pm.in \ 4.261 -@@ -2501,10 +2501,10 @@ 4.262 - $(top_srcdir)/config/type-ghostscript.xml.in \ 4.263 - $(top_srcdir)/config/type-windows.xml.in \ 4.264 - $(top_srcdir)/config/type.xml.in \ 4.265 -- $(top_srcdir)/magick/ImageMagick.pc.in \ 4.266 -+ $(top_srcdir)/magick/ImageMagick-6.pc.in \ 4.267 - $(top_srcdir)/magick/Magick-config.in \ 4.268 - $(top_srcdir)/magick/MagickCore-config.in \ 4.269 -- $(top_srcdir)/magick/MagickCore.pc.in \ 4.270 -+ $(top_srcdir)/magick/MagickCore-6.pc.in \ 4.271 - $(top_srcdir)/magick/version.h.in \ 4.272 - $(top_srcdir)/utilities/ImageMagick.1.in \ 4.273 - $(top_srcdir)/utilities/animate.1.in \ 4.274 -@@ -2519,9 +2519,9 @@ 4.275 - $(top_srcdir)/utilities/montage.1.in \ 4.276 - $(top_srcdir)/utilities/stream.1.in \ 4.277 - $(top_srcdir)/wand/MagickWand-config.in \ 4.278 -- $(top_srcdir)/wand/MagickWand.pc.in \ 4.279 -+ $(top_srcdir)/wand/MagickWand-6.pc.in \ 4.280 - $(top_srcdir)/wand/Wand-config.in \ 4.281 -- $(top_srcdir)/wand/Wand.pc.in ChangeLog config/ar-lib \ 4.282 -+ $(top_srcdir)/wand/Wand.pc-6.in ChangeLog config/ar-lib \ 4.283 - config/compile config/config.guess config/config.sub \ 4.284 - config/depcomp config/install-sh config/ltmain.sh \ 4.285 - config/missing config/mkinstalldirs 4.286 -@@ -4185,8 +4185,8 @@ 4.287 - magick/MagickCore-config 4.288 - 4.289 - MAGICK_PKGCONFIG = \ 4.290 -- magick/ImageMagick.pc \ 4.291 -- magick/MagickCore.pc \ 4.292 -+ magick/ImageMagick-6.pc \ 4.293 -+ magick/MagickCore-6.pc \ 4.294 - magick/ImageMagick-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc \ 4.295 - magick/MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc 4.296 - 4.297 -@@ -4605,9 +4605,9 @@ 4.298 - magick/Magick-config.in \ 4.299 - magick/MagickCore-config.in \ 4.300 - $(MAGICK_MANS) \ 4.301 -- magick/ImageMagick.pc.in \ 4.302 -+ magick/ImageMagick-6.pc.in \ 4.303 - magick/libMagickCore.map \ 4.304 -- magick/MagickCore.pc.in \ 4.305 -+ magick/MagickCore-6.pc.in \ 4.306 - magick/config.h_vms \ 4.307 - magick/mac.c \ 4.308 - magick/nt-base.c \ 4.309 -@@ -4722,8 +4722,8 @@ 4.310 - wand/MagickWand-config 4.311 - 4.312 - WAND_PKGCONFIG = \ 4.313 -- wand/MagickWand.pc \ 4.314 -- wand/Wand.pc \ 4.315 -+ wand/MagickWand-6.pc \ 4.316 -+ wand/Wand-6.pc \ 4.317 - wand/MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc \ 4.318 - wand/Wand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc 4.319 - 4.320 -@@ -4747,9 +4747,9 @@ 4.321 - wand/ChangeLog \ 4.322 - wand/libMagickWand.map \ 4.323 - wand/MagickWand-config.1 \ 4.324 -- wand/MagickWand.pc.in \ 4.325 -+ wand/MagickWand-6.pc.in \ 4.326 - wand/Wand-config.1 \ 4.327 -- wand/Wand.pc.in 4.328 -+ wand/Wand-6.pc.in 4.329 - 4.330 - WAND_CLEANFILES = 4.331 - MAGICKPP_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/Magick++/lib 4.332 -@@ -4778,8 +4778,8 @@ 4.333 - Magick++/bin/Magick++-config.1 4.334 - 4.335 - MAGICKPP_PKGCONFIG_OPT = \ 4.336 -- Magick++/lib/Magick++.pc \ 4.337 -- Magick++/lib/ImageMagick++.pc \ 4.338 -+ Magick++/lib/Magick++-6.pc \ 4.339 -+ Magick++/lib/ImageMagick++-6.pc \ 4.340 - Magick++/lib/Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc \ 4.341 - Magick++/lib/ImageMagick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc 4.342 - 4.343 -@@ -4796,9 +4796,9 @@ 4.344 - Magick++/README \ 4.345 - Magick++/bin/Magick++-config.1 \ 4.346 - Magick++/bin/Magick++-config.in \ 4.347 -- Magick++/lib/ImageMagick++.pc.in \ 4.348 -+ Magick++/lib/ImageMagick++-6.pc.in \ 4.349 - Magick++/lib/libMagick++.map \ 4.350 -- Magick++/lib/Magick++.pc.in \ 4.351 -+ Magick++/lib/Magick++-6.pc.in \ 4.352 - Magick++/demo/model.miff \ 4.353 - Magick++/demo/smile.miff \ 4.354 - Magick++/demo/smile_anim.miff \ 4.355 -@@ -5286,17 +5286,17 @@ 4.356 - cd $(top_builddir) && $(SHELL) ./config.status $@ 4.357 - Magick++/bin/Magick++-config: $(top_builddir)/config.status $(top_srcdir)/Magick++/bin/Magick++-config.in 4.358 - cd $(top_builddir) && $(SHELL) ./config.status $@ 4.359 --magick/ImageMagick.pc: $(top_builddir)/config.status $(top_srcdir)/magick/ImageMagick.pc.in 4.360 -+magick/ImageMagick-6.pc: $(top_builddir)/config.status $(top_srcdir)/magick/ImageMagick-6.pc.in 4.361 - cd $(top_builddir) && $(SHELL) ./config.status $@ 4.362 --Magick++/lib/ImageMagick++.pc: $(top_builddir)/config.status $(top_srcdir)/Magick++/lib/ImageMagick++.pc.in 4.363 -+Magick++/lib/ImageMagick++-6.pc: $(top_builddir)/config.status $(top_srcdir)/Magick++/lib/ImageMagick++-6.pc.in 4.364 - cd $(top_builddir) && $(SHELL) ./config.status $@ 4.365 --Magick++/lib/Magick++.pc: $(top_builddir)/config.status $(top_srcdir)/Magick++/lib/Magick++.pc.in 4.366 -+Magick++/lib/Magick++-6.pc: $(top_builddir)/config.status $(top_srcdir)/Magick++/lib/Magick++-6.pc.in 4.367 - cd $(top_builddir) && $(SHELL) ./config.status $@ 4.368 - magick/Magick-config: $(top_builddir)/config.status $(top_srcdir)/magick/Magick-config.in 4.369 - cd $(top_builddir) && $(SHELL) ./config.status $@ 4.370 - magick/MagickCore-config: $(top_builddir)/config.status $(top_srcdir)/magick/MagickCore-config.in 4.371 - cd $(top_builddir) && $(SHELL) ./config.status $@ 4.372 --magick/MagickCore.pc: $(top_builddir)/config.status $(top_srcdir)/magick/MagickCore.pc.in 4.373 -+magick/MagickCore-6.pc: $(top_builddir)/config.status $(top_srcdir)/magick/MagickCore-6.pc.in 4.374 - cd $(top_builddir) && $(SHELL) ./config.status $@ 4.375 - magick/version.h: $(top_builddir)/config.status $(top_srcdir)/magick/version.h.in 4.376 - cd $(top_builddir) && $(SHELL) ./config.status $@ 4.377 -@@ -5344,11 +5344,11 @@ 4.378 - cd $(top_builddir) && $(SHELL) ./config.status $@ 4.379 - wand/MagickWand-config: $(top_builddir)/config.status $(top_srcdir)/wand/MagickWand-config.in 4.380 - cd $(top_builddir) && $(SHELL) ./config.status $@ 4.381 --wand/MagickWand.pc: $(top_builddir)/config.status $(top_srcdir)/wand/MagickWand.pc.in 4.382 -+wand/MagickWand-6.pc: $(top_builddir)/config.status $(top_srcdir)/wand/MagickWand-6.pc.in 4.383 - cd $(top_builddir) && $(SHELL) ./config.status $@ 4.384 - wand/Wand-config: $(top_builddir)/config.status $(top_srcdir)/wand/Wand-config.in 4.385 - cd $(top_builddir) && $(SHELL) ./config.status $@ 4.386 --wand/Wand.pc: $(top_builddir)/config.status $(top_srcdir)/wand/Wand.pc.in 4.387 -+wand/Wand-6.pc: $(top_builddir)/config.status $(top_srcdir)/wand/Wand-6.pc.in 4.388 - cd $(top_builddir) && $(SHELL) ./config.status $@ 4.389 - 4.390 - install-codersLTLIBRARIES: $(coders_LTLIBRARIES) 4.391 -@@ -11369,7 +11369,7 @@ 4.392 - install-data-local install-docDATA install-filtersLTLIBRARIES \ 4.393 - install-includeHEADERS install-magickincHEADERS \ 4.394 - install-magickincarchHEADERS install-magickppincHEADERS \ 4.395 -- install-magickpptopincHEADERS install-man \ 4.396 -+ install-magickpptopincHEADERS \ 4.397 - install-pkgconfigDATA install-wandincHEADERS 4.398 - 4.399 - install-dvi: install-dvi-am 4.400 -@@ -11387,6 +11387,8 @@ 4.401 - 4.402 - install-info-am: 4.403 - 4.404 -+install-libs-only: install-libLTLIBRARIES install-data-am 4.405 -+ 4.406 - install-man: install-man1 4.407 - 4.408 - install-pdf: install-pdf-am 4.409 -@@ -11563,7 +11565,7 @@ 4.410 - @WITH_PERL_FALSE@distclean-perl: 4.411 - 4.412 - # create a copy for pc file (ideally the non abi should be symlinked) 4.413 --%-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc: %.pc 4.414 -+%-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc: %-@MAGICK_MAJOR_VERSION@.pc 4.415 - cp -f $^ $@ 4.416 - 4.417 - all-local: $(MAGICKPP_LOCAL_TARGETS) $(PERLMAGICK_ALL_LOCAL_TARGETS) $(MAINTAINER_TARGETS) 4.418 -diff -Naur ImageMagick-6.9.6-3.orig/wand/MagickWand-6.pc.in ImageMagick-6.9.6-3/wand/MagickWand-6.pc.in 4.419 ---- ImageMagick-6.9.6-3.orig/wand/MagickWand-6.pc.in 1970-01-01 01:00:00.000000000 +0100 4.420 -+++ ImageMagick-6.9.6-3/wand/MagickWand-6.pc.in 2017-01-08 00:37:51.232515933 +0000 4.421 -@@ -0,0 +1,15 @@ 4.422 -+prefix=@prefix@ 4.423 -+exec_prefix=@exec_prefix@ 4.424 -+libdir=@libdir@ 4.425 -+includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ 4.426 -+includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@ 4.427 -+libname=MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ 4.428 -+ 4.429 -+Name: MagickWand-@MAGICK_MAJOR_VERSION@ 4.430 -+Description: MagickWand - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) 4.431 -+URL: https://www.imagemagick.org 4.432 -+Version: @PACKAGE_VERSION@ 4.433 -+Requires: MagickCore-@MAGICK_MAJOR_VERSION@ 4.434 -+Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@ 4.435 -+Libs: -L${libdir} -l${libname} 4.436 -+Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@ 4.437 -diff -Naur ImageMagick-6.9.6-3.orig/wand/MagickWand.pc.in ImageMagick-6.9.6-3/wand/MagickWand.pc.in 4.438 ---- ImageMagick-6.9.6-3.orig/wand/MagickWand.pc.in 2016-10-31 00:34:31.000000000 +0000 4.439 -+++ ImageMagick-6.9.6-3/wand/MagickWand.pc.in 1970-01-01 01:00:00.000000000 +0100 4.440 -@@ -1,15 +0,0 @@ 4.441 --prefix=@prefix@ 4.442 --exec_prefix=@exec_prefix@ 4.443 --libdir=@libdir@ 4.444 --includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ 4.445 --includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@ 4.446 --libname=MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ 4.447 -- 4.448 --Name: MagickWand 4.449 --Description: MagickWand - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) 4.450 --URL: https://www.imagemagick.org 4.451 --Version: @PACKAGE_VERSION@ 4.452 --Requires: MagickCore 4.453 --Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@ 4.454 --Libs: -L${libdir} -l${libname} 4.455 --Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@ 4.456 -diff -Naur ImageMagick-6.9.6-3.orig/wand/Wand-6.pc.in ImageMagick-6.9.6-3/wand/Wand-6.pc.in 4.457 ---- ImageMagick-6.9.6-3.orig/wand/Wand-6.pc.in 1970-01-01 01:00:00.000000000 +0100 4.458 -+++ ImageMagick-6.9.6-3/wand/Wand-6.pc.in 2017-01-08 00:39:23.169642808 +0000 4.459 -@@ -0,0 +1,15 @@ 4.460 -+prefix=@prefix@ 4.461 -+exec_prefix=@exec_prefix@ 4.462 -+libdir=@libdir@ 4.463 -+includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ 4.464 -+includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@ 4.465 -+libname=MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ 4.466 -+ 4.467 -+Name: MagickWand-6 4.468 -+Description: MagickCore - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) 4.469 -+URL: https://www.imagemagick.org 4.470 -+Version: @PACKAGE_VERSION@ 4.471 -+Requires: MagickCore-6 4.472 -+Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@ 4.473 -+Libs: -L${libdir} -l${libname} 4.474 -+Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/imagemagick6/stuff/patches/ImageMagick-6.9.9-9-libs_only-1.patch Sun Nov 05 18:29:48 2017 +0200 5.3 @@ -0,0 +1,471 @@ 5.4 +Submitted By: Ken Moffat <ken at linuxfromscratch dot org> 5.5 +Date: 2017-01-09 5.6 +Initial Package Version: 6.9.6-3 5.7 +Upstream Status: N/A 5.8 +Origin: Self 5.9 +Description: Allows the libraries of ImageMagick-6 to be installed 5.10 +without the programs or man-pages, and with versioned pkgconfig files 5.11 +so that ImageMagick-7 can be installed alongside this. Do not build 5.12 +perl here if doing this (the version from ImageMagick-7 will use the 5.13 +libraries from 7), and edit anyi cmake programs using this (e.g. 5.14 +inkscape-0.92) so that they look for the -6 pkgconfig files. 5.15 + 5.16 +Internally, ImageMagick-7 is a major change, and the names of the 5.17 +libraries and the include directories differ. 5.18 + 5.19 +For packages which use a conventional configure script, pass 5.20 +IMAGEMAGICK_CFLAGS=-I/usr/include/ImageMagick-6 and 5.21 +IMAGEMAGICK_LIBS="-lMagickCore-6.Q16HDRI -lMagick++-6.Q16HDRI -lMagickWand-6.Q16HDRI" 5.22 + 5.23 +In some places I have had to hardcode -6 because I could not persuade 5.24 +the build system to convert @MAGICK_CORE_VERSION@ in one file or for 5.25 +the names of the files. 5.26 + 5.27 +Also, my raw patch deletes wand/Wand.pc.in but gnu patch fails there, 5.28 +believing it is a reversal (not understood, a git patch would be 5.29 +easier if we all had git, mentioned because it will probably happen 5.30 +again if this has to be rediffed for future versions). 5.31 + 5.32 +diff -Naur ImageMagick-6.9.6-3.orig/configure ImageMagick-6.9.6-3/configure 5.33 +--- ImageMagick-6.9.6-3.orig/configure 2017-01-07 01:35:18.362869976 +0000 5.34 ++++ ImageMagick-6.9.6-3/configure 2017-01-07 20:50:59.735901975 +0000 5.35 +@@ -37452,7 +37452,7 @@ 5.36 + # ============================================================================== 5.37 + # Generate build environment 5.38 + # ============================================================================== 5.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" 5.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" 5.41 + 5.42 + cat >confcache <<\_ACEOF 5.43 + # This file is a shell script that caches the results of configure 5.44 +diff -Naur ImageMagick-6.9.6-3.orig/configure.ac ImageMagick-6.9.6-3/configure.ac 5.45 +--- ImageMagick-6.9.6-3.orig/configure.ac 2017-01-07 01:35:27.053787793 +0000 5.46 ++++ ImageMagick-6.9.6-3/configure.ac 2017-01-07 20:52:26.205101788 +0000 5.47 +@@ -3835,12 +3835,12 @@ 5.48 + config/type.xml \ 5.49 + ImageMagick.spec \ 5.50 + Magick++/bin/Magick++-config \ 5.51 +- magick/ImageMagick.pc \ 5.52 +- Magick++/lib/ImageMagick++.pc \ 5.53 +- Magick++/lib/Magick++.pc \ 5.54 ++ magick/ImageMagick-6.pc \ 5.55 ++ Magick++/lib/ImageMagick++-6.pc \ 5.56 ++ Magick++/lib/Magick++-6.pc \ 5.57 + magick/Magick-config \ 5.58 + magick/MagickCore-config \ 5.59 +- magick/MagickCore.pc \ 5.60 ++ magick/MagickCore-6.pc \ 5.61 + magick/version.h \ 5.62 + Makefile \ 5.63 + magick.sh \ 5.64 +@@ -3865,9 +3865,9 @@ 5.65 + utilities/montage.1 \ 5.66 + utilities/stream.1 \ 5.67 + wand/MagickWand-config \ 5.68 +- wand/MagickWand.pc \ 5.69 ++ wand/MagickWand-6.pc \ 5.70 + wand/Wand-config \ 5.71 +- wand/Wand.pc ]) 5.72 ++ wand/Wand-6.pc ]) 5.73 + AC_OUTPUT 5.74 + 5.75 + # ============================================================================== 5.76 +diff -Naur ImageMagick-6.9.6-3.orig/magick/ImageMagick-6.pc.in ImageMagick-6.9.6-3/magick/ImageMagick-6.pc.in 5.77 +--- ImageMagick-6.9.6-3.orig/magick/ImageMagick-6.pc.in 1970-01-01 01:00:00.000000000 +0100 5.78 ++++ ImageMagick-6.9.6-3/magick/ImageMagick-6.pc.in 2017-01-07 00:55:17.999483324 +0000 5.79 +@@ -0,0 +1,14 @@ 5.80 ++prefix=@prefix@ 5.81 ++exec_prefix=@exec_prefix@ 5.82 ++libdir=@libdir@ 5.83 ++includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ 5.84 ++includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@ 5.85 ++libname=MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ 5.86 ++ 5.87 ++Name: ImageMagick-@MAGICK_MAJOR_VERSION@ 5.88 ++Description: ImageMagick - convert, edit, and compose images (ABI @MAGICK_ABI_SUFFIX@) 5.89 ++URL: https://www.imagemagick.org 5.90 ++Version: @PACKAGE_VERSION@ 5.91 ++Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@ 5.92 ++Libs: -L${libdir} -l${libname} 5.93 ++Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@ 5.94 +diff -Naur ImageMagick-6.9.6-3.orig/magick/ImageMagick.pc.in ImageMagick-6.9.6-3/magick/ImageMagick.pc.in 5.95 +--- ImageMagick-6.9.6-3.orig/magick/ImageMagick.pc.in 2017-01-07 01:58:35.942633448 +0000 5.96 ++++ ImageMagick-6.9.6-3/magick/ImageMagick.pc.in 1970-01-01 01:00:00.000000000 +0100 5.97 +@@ -1,14 +0,0 @@ 5.98 +-prefix=@prefix@ 5.99 +-exec_prefix=@exec_prefix@ 5.100 +-libdir=@libdir@ 5.101 +-includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ 5.102 +-includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@ 5.103 +-libname=MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ 5.104 +- 5.105 +-Name: ImageMagick 5.106 +-Description: ImageMagick - convert, edit, and compose images (ABI @MAGICK_ABI_SUFFIX@) 5.107 +-URL: https://www.imagemagick.org 5.108 +-Version: @PACKAGE_VERSION@ 5.109 +-Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@ 5.110 +-Libs: -L${libdir} -l${libname} 5.111 +-Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@ 5.112 +diff -Naur ImageMagick-6.9.6-3.orig/magick/MagickCore-6.pc.in ImageMagick-6.9.6-3/magick/MagickCore-6.pc.in 5.113 +--- ImageMagick-6.9.6-3.orig/magick/MagickCore-6.pc.in 1970-01-01 01:00:00.000000000 +0100 5.114 ++++ ImageMagick-6.9.6-3/magick/MagickCore-6.pc.in 2017-01-07 22:13:31.500562039 +0000 5.115 +@@ -0,0 +1,15 @@ 5.116 ++prefix=@prefix@ 5.117 ++exec_prefix=@exec_prefix@ 5.118 ++libdir=@libdir@ 5.119 ++includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ 5.120 ++includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@ 5.121 ++libname=MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ 5.122 ++moduledir=@libdir@/ImageMagick-@MAGICK_MAJOR_VERSION@.@MAGICK_MINOR_VERSION@.@MAGICK_MICRO_VERSION@/modules-@MAGICK_ABI_SUFFIX@ 5.123 ++ 5.124 ++Name: MagickCore-@MAGICK_MAJOR_VERSION@ 5.125 ++Description: MagickCore - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) 5.126 ++URL: https://www.imagemagick.org 5.127 ++Version: @PACKAGE_VERSION@ 5.128 ++Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@ 5.129 ++Libs: -L${libdir} -l${libname} 5.130 ++Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@ 5.131 +diff -Naur ImageMagick-6.9.6-3.orig/magick/MagickCore.pc.in ImageMagick-6.9.6-3/magick/MagickCore.pc.in 5.132 +--- ImageMagick-6.9.6-3.orig/magick/MagickCore.pc.in 2016-10-31 00:34:31.000000000 +0000 5.133 ++++ ImageMagick-6.9.6-3/magick/MagickCore.pc.in 1970-01-01 01:00:00.000000000 +0100 5.134 +@@ -1,15 +0,0 @@ 5.135 +-prefix=@prefix@ 5.136 +-exec_prefix=@exec_prefix@ 5.137 +-libdir=@libdir@ 5.138 +-includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ 5.139 +-includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@ 5.140 +-libname=MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ 5.141 +-moduledir=@libdir@/ImageMagick-@MAGICK_MAJOR_VERSION@.@MAGICK_MINOR_VERSION@.@MAGICK_MICRO_VERSION@/modules-@MAGICK_ABI_SUFFIX@ 5.142 +- 5.143 +-Name: MagickCore 5.144 +-Description: MagickCore - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) 5.145 +-URL: https://www.imagemagick.org 5.146 +-Version: @PACKAGE_VERSION@ 5.147 +-Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@ 5.148 +-Libs: -L${libdir} -l${libname} 5.149 +-Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@ 5.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 5.151 +--- ImageMagick-6.9.6-3.orig/Magick++/lib/ImageMagick++-6.pc.in 1970-01-01 01:00:00.000000000 +0100 5.152 ++++ ImageMagick-6.9.6-3/Magick++/lib/ImageMagick++-6.pc.in 2017-01-07 22:11:59.637428232 +0000 5.153 +@@ -0,0 +1,14 @@ 5.154 ++prefix=@prefix@ 5.155 ++exec_prefix=@exec_prefix@ 5.156 ++libdir=@libdir@ 5.157 ++includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ 5.158 ++includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@ 5.159 ++libname=Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ 5.160 ++ 5.161 ++Name: ImageMagick++-@MAGICK_MAJOR_VERSION@ 5.162 ++Description: Magick++ - C++ API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) 5.163 ++Version: @PACKAGE_VERSION@ 5.164 ++Requires: MagickWand-@MAGICK_MAJOR_VERSION@ 5.165 ++Libs: -L${libdir} -l${libname} 5.166 ++Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@ 5.167 ++Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@ 5.168 +diff -Naur ImageMagick-6.9.6-3.orig/Magick++/lib/ImageMagick++.pc.in ImageMagick-6.9.6-3/Magick++/lib/ImageMagick++.pc.in 5.169 +--- ImageMagick-6.9.6-3.orig/Magick++/lib/ImageMagick++.pc.in 2016-10-31 00:34:30.000000000 +0000 5.170 ++++ ImageMagick-6.9.6-3/Magick++/lib/ImageMagick++.pc.in 1970-01-01 01:00:00.000000000 +0100 5.171 +@@ -1,14 +0,0 @@ 5.172 +-prefix=@prefix@ 5.173 +-exec_prefix=@exec_prefix@ 5.174 +-libdir=@libdir@ 5.175 +-includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ 5.176 +-includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@ 5.177 +-libname=Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ 5.178 +- 5.179 +-Name: ImageMagick++ 5.180 +-Description: Magick++ - C++ API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) 5.181 +-Version: @PACKAGE_VERSION@ 5.182 +-Requires: MagickWand 5.183 +-Libs: -L${libdir} -l${libname} 5.184 +-Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@ 5.185 +-Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@ 5.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 5.187 +--- ImageMagick-6.9.6-3.orig/Magick++/lib/Magick++-6.pc.in 1970-01-01 01:00:00.000000000 +0100 5.188 ++++ ImageMagick-6.9.6-3/Magick++/lib/Magick++-6.pc.in 2017-01-07 21:09:41.641487042 +0000 5.189 +@@ -0,0 +1,14 @@ 5.190 ++prefix=@prefix@ 5.191 ++exec_prefix=@exec_prefix@ 5.192 ++libdir=@libdir@ 5.193 ++includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ 5.194 ++includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@ 5.195 ++libname=Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ 5.196 ++ 5.197 ++Name: Magick++-@MAGICK_MAJOR_VERSION@ 5.198 ++Description: Magick++ - C++ API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) 5.199 ++Version: @PACKAGE_VERSION@ 5.200 ++Requires: MagickWand-@MAGICK_MAJOR_VERSION@ 5.201 ++Libs: -L${libdir} -l${libname} 5.202 ++Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@ 5.203 ++Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@ 5.204 +diff -Naur ImageMagick-6.9.6-3.orig/Magick++/lib/Magick++.pc.in ImageMagick-6.9.6-3/Magick++/lib/Magick++.pc.in 5.205 +--- ImageMagick-6.9.6-3.orig/Magick++/lib/Magick++.pc.in 2016-10-31 00:34:30.000000000 +0000 5.206 ++++ ImageMagick-6.9.6-3/Magick++/lib/Magick++.pc.in 1970-01-01 01:00:00.000000000 +0100 5.207 +@@ -1,14 +0,0 @@ 5.208 +-prefix=@prefix@ 5.209 +-exec_prefix=@exec_prefix@ 5.210 +-libdir=@libdir@ 5.211 +-includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ 5.212 +-includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@ 5.213 +-libname=Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ 5.214 +- 5.215 +-Name: Magick++ 5.216 +-Description: Magick++ - C++ API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) 5.217 +-Version: @PACKAGE_VERSION@ 5.218 +-Requires: MagickWand 5.219 +-Libs: -L${libdir} -l${libname} 5.220 +-Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@ 5.221 +-Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@ 5.222 +diff -Naur ImageMagick-6.9.6-3.orig/Makefile.in ImageMagick-6.9.6-3/Makefile.in 5.223 +--- ImageMagick-6.9.6-3.orig/Makefile.in 2017-01-06 01:07:37.217002803 +0000 5.224 ++++ ImageMagick-6.9.6-3/Makefile.in 2017-01-08 00:24:45.777974561 +0000 5.225 +@@ -302,10 +302,10 @@ 5.226 + config/Magick++.dox config/type-apple.xml \ 5.227 + config/type-dejavu.xml config/type-ghostscript.xml \ 5.228 + config/type-windows.xml config/type.xml ImageMagick.spec \ 5.229 +- Magick++/bin/Magick++-config magick/ImageMagick.pc \ 5.230 +- Magick++/lib/ImageMagick++.pc Magick++/lib/Magick++.pc \ 5.231 ++ Magick++/bin/Magick++-config magick/ImageMagick-6.pc \ 5.232 ++ Magick++/lib/ImageMagick++-6.pc Magick++/lib/Magick++-6.pc \ 5.233 + magick/Magick-config magick/MagickCore-config \ 5.234 +- magick/MagickCore.pc magick/version.h magick.sh \ 5.235 ++ magick/MagickCore-6.pc magick/version.h magick.sh \ 5.236 + PerlMagick/check.sh PerlMagick/default/Magick.pm \ 5.237 + PerlMagick/Makefile.PL PerlMagick/default/Makefile.PL \ 5.238 + PerlMagick/quantum/Makefile.PL PerlMagick/quantum/quantum.pm \ 5.239 +@@ -314,8 +314,8 @@ 5.240 + utilities/conjure.1 utilities/convert.1 utilities/display.1 \ 5.241 + utilities/identify.1 utilities/ImageMagick.1 \ 5.242 + utilities/import.1 utilities/mogrify.1 utilities/montage.1 \ 5.243 +- utilities/stream.1 wand/MagickWand-config wand/MagickWand.pc \ 5.244 +- wand/Wand-config wand/Wand.pc 5.245 ++ utilities/stream.1 wand/MagickWand-config wand/MagickWand-6.pc \ 5.246 ++ wand/Wand-config wand/Wand-6.pc 5.247 + CONFIG_CLEAN_VPATH_FILES = 5.248 + am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; 5.249 + am__vpath_adj = case $$p in \ 5.250 +@@ -2471,8 +2471,8 @@ 5.251 + $(srcdir)/tests/Makefile.am $(srcdir)/utilities/Makefile.am \ 5.252 + $(srcdir)/wand/Makefile.am \ 5.253 + $(top_srcdir)/Magick++/bin/Magick++-config.in \ 5.254 +- $(top_srcdir)/Magick++/lib/ImageMagick++.pc.in \ 5.255 +- $(top_srcdir)/Magick++/lib/Magick++.pc.in \ 5.256 ++ $(top_srcdir)/Magick++/lib/ImageMagick++-6.pc.in \ 5.257 ++ $(top_srcdir)/Magick++/lib/Magick++-6.pc.in \ 5.258 + $(top_srcdir)/PerlMagick/Makefile.PL.in \ 5.259 + $(top_srcdir)/PerlMagick/check.sh.in \ 5.260 + $(top_srcdir)/PerlMagick/default/Magick.pm.in \ 5.261 +@@ -2501,10 +2501,10 @@ 5.262 + $(top_srcdir)/config/type-ghostscript.xml.in \ 5.263 + $(top_srcdir)/config/type-windows.xml.in \ 5.264 + $(top_srcdir)/config/type.xml.in \ 5.265 +- $(top_srcdir)/magick/ImageMagick.pc.in \ 5.266 ++ $(top_srcdir)/magick/ImageMagick-6.pc.in \ 5.267 + $(top_srcdir)/magick/Magick-config.in \ 5.268 + $(top_srcdir)/magick/MagickCore-config.in \ 5.269 +- $(top_srcdir)/magick/MagickCore.pc.in \ 5.270 ++ $(top_srcdir)/magick/MagickCore-6.pc.in \ 5.271 + $(top_srcdir)/magick/version.h.in \ 5.272 + $(top_srcdir)/utilities/ImageMagick.1.in \ 5.273 + $(top_srcdir)/utilities/animate.1.in \ 5.274 +@@ -2519,9 +2519,9 @@ 5.275 + $(top_srcdir)/utilities/montage.1.in \ 5.276 + $(top_srcdir)/utilities/stream.1.in \ 5.277 + $(top_srcdir)/wand/MagickWand-config.in \ 5.278 +- $(top_srcdir)/wand/MagickWand.pc.in \ 5.279 ++ $(top_srcdir)/wand/MagickWand-6.pc.in \ 5.280 + $(top_srcdir)/wand/Wand-config.in \ 5.281 +- $(top_srcdir)/wand/Wand.pc.in ChangeLog config/ar-lib \ 5.282 ++ $(top_srcdir)/wand/Wand.pc-6.in ChangeLog config/ar-lib \ 5.283 + config/compile config/config.guess config/config.sub \ 5.284 + config/depcomp config/install-sh config/ltmain.sh \ 5.285 + config/missing config/mkinstalldirs 5.286 +@@ -4185,8 +4185,8 @@ 5.287 + magick/MagickCore-config 5.288 + 5.289 + MAGICK_PKGCONFIG = \ 5.290 +- magick/ImageMagick.pc \ 5.291 +- magick/MagickCore.pc \ 5.292 ++ magick/ImageMagick-6.pc \ 5.293 ++ magick/MagickCore-6.pc \ 5.294 + magick/ImageMagick-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc \ 5.295 + magick/MagickCore-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc 5.296 + 5.297 +@@ -4605,9 +4605,9 @@ 5.298 + magick/Magick-config.in \ 5.299 + magick/MagickCore-config.in \ 5.300 + $(MAGICK_MANS) \ 5.301 +- magick/ImageMagick.pc.in \ 5.302 ++ magick/ImageMagick-6.pc.in \ 5.303 + magick/libMagickCore.map \ 5.304 +- magick/MagickCore.pc.in \ 5.305 ++ magick/MagickCore-6.pc.in \ 5.306 + magick/config.h_vms \ 5.307 + magick/mac.c \ 5.308 + magick/nt-base.c \ 5.309 +@@ -4722,8 +4722,8 @@ 5.310 + wand/MagickWand-config 5.311 + 5.312 + WAND_PKGCONFIG = \ 5.313 +- wand/MagickWand.pc \ 5.314 +- wand/Wand.pc \ 5.315 ++ wand/MagickWand-6.pc \ 5.316 ++ wand/Wand-6.pc \ 5.317 + wand/MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc \ 5.318 + wand/Wand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc 5.319 + 5.320 +@@ -4747,9 +4747,9 @@ 5.321 + wand/ChangeLog \ 5.322 + wand/libMagickWand.map \ 5.323 + wand/MagickWand-config.1 \ 5.324 +- wand/MagickWand.pc.in \ 5.325 ++ wand/MagickWand-6.pc.in \ 5.326 + wand/Wand-config.1 \ 5.327 +- wand/Wand.pc.in 5.328 ++ wand/Wand-6.pc.in 5.329 + 5.330 + WAND_CLEANFILES = 5.331 + MAGICKPP_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/Magick++/lib 5.332 +@@ -4778,8 +4778,8 @@ 5.333 + Magick++/bin/Magick++-config.1 5.334 + 5.335 + MAGICKPP_PKGCONFIG_OPT = \ 5.336 +- Magick++/lib/Magick++.pc \ 5.337 +- Magick++/lib/ImageMagick++.pc \ 5.338 ++ Magick++/lib/Magick++-6.pc \ 5.339 ++ Magick++/lib/ImageMagick++-6.pc \ 5.340 + Magick++/lib/Magick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc \ 5.341 + Magick++/lib/ImageMagick++-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc 5.342 + 5.343 +@@ -4796,9 +4796,9 @@ 5.344 + Magick++/README \ 5.345 + Magick++/bin/Magick++-config.1 \ 5.346 + Magick++/bin/Magick++-config.in \ 5.347 +- Magick++/lib/ImageMagick++.pc.in \ 5.348 ++ Magick++/lib/ImageMagick++-6.pc.in \ 5.349 + Magick++/lib/libMagick++.map \ 5.350 +- Magick++/lib/Magick++.pc.in \ 5.351 ++ Magick++/lib/Magick++-6.pc.in \ 5.352 + Magick++/demo/model.miff \ 5.353 + Magick++/demo/smile.miff \ 5.354 + Magick++/demo/smile_anim.miff \ 5.355 +@@ -5286,17 +5286,17 @@ 5.356 + cd $(top_builddir) && $(SHELL) ./config.status $@ 5.357 + Magick++/bin/Magick++-config: $(top_builddir)/config.status $(top_srcdir)/Magick++/bin/Magick++-config.in 5.358 + cd $(top_builddir) && $(SHELL) ./config.status $@ 5.359 +-magick/ImageMagick.pc: $(top_builddir)/config.status $(top_srcdir)/magick/ImageMagick.pc.in 5.360 ++magick/ImageMagick-6.pc: $(top_builddir)/config.status $(top_srcdir)/magick/ImageMagick-6.pc.in 5.361 + cd $(top_builddir) && $(SHELL) ./config.status $@ 5.362 +-Magick++/lib/ImageMagick++.pc: $(top_builddir)/config.status $(top_srcdir)/Magick++/lib/ImageMagick++.pc.in 5.363 ++Magick++/lib/ImageMagick++-6.pc: $(top_builddir)/config.status $(top_srcdir)/Magick++/lib/ImageMagick++-6.pc.in 5.364 + cd $(top_builddir) && $(SHELL) ./config.status $@ 5.365 +-Magick++/lib/Magick++.pc: $(top_builddir)/config.status $(top_srcdir)/Magick++/lib/Magick++.pc.in 5.366 ++Magick++/lib/Magick++-6.pc: $(top_builddir)/config.status $(top_srcdir)/Magick++/lib/Magick++-6.pc.in 5.367 + cd $(top_builddir) && $(SHELL) ./config.status $@ 5.368 + magick/Magick-config: $(top_builddir)/config.status $(top_srcdir)/magick/Magick-config.in 5.369 + cd $(top_builddir) && $(SHELL) ./config.status $@ 5.370 + magick/MagickCore-config: $(top_builddir)/config.status $(top_srcdir)/magick/MagickCore-config.in 5.371 + cd $(top_builddir) && $(SHELL) ./config.status $@ 5.372 +-magick/MagickCore.pc: $(top_builddir)/config.status $(top_srcdir)/magick/MagickCore.pc.in 5.373 ++magick/MagickCore-6.pc: $(top_builddir)/config.status $(top_srcdir)/magick/MagickCore-6.pc.in 5.374 + cd $(top_builddir) && $(SHELL) ./config.status $@ 5.375 + magick/version.h: $(top_builddir)/config.status $(top_srcdir)/magick/version.h.in 5.376 + cd $(top_builddir) && $(SHELL) ./config.status $@ 5.377 +@@ -5344,11 +5344,11 @@ 5.378 + cd $(top_builddir) && $(SHELL) ./config.status $@ 5.379 + wand/MagickWand-config: $(top_builddir)/config.status $(top_srcdir)/wand/MagickWand-config.in 5.380 + cd $(top_builddir) && $(SHELL) ./config.status $@ 5.381 +-wand/MagickWand.pc: $(top_builddir)/config.status $(top_srcdir)/wand/MagickWand.pc.in 5.382 ++wand/MagickWand-6.pc: $(top_builddir)/config.status $(top_srcdir)/wand/MagickWand-6.pc.in 5.383 + cd $(top_builddir) && $(SHELL) ./config.status $@ 5.384 + wand/Wand-config: $(top_builddir)/config.status $(top_srcdir)/wand/Wand-config.in 5.385 + cd $(top_builddir) && $(SHELL) ./config.status $@ 5.386 +-wand/Wand.pc: $(top_builddir)/config.status $(top_srcdir)/wand/Wand.pc.in 5.387 ++wand/Wand-6.pc: $(top_builddir)/config.status $(top_srcdir)/wand/Wand-6.pc.in 5.388 + cd $(top_builddir) && $(SHELL) ./config.status $@ 5.389 + 5.390 + install-codersLTLIBRARIES: $(coders_LTLIBRARIES) 5.391 +@@ -11369,7 +11369,7 @@ 5.392 + install-data-local install-docDATA install-filtersLTLIBRARIES \ 5.393 + install-includeHEADERS install-magickincHEADERS \ 5.394 + install-magickincarchHEADERS install-magickppincHEADERS \ 5.395 +- install-magickpptopincHEADERS install-man \ 5.396 ++ install-magickpptopincHEADERS \ 5.397 + install-pkgconfigDATA install-wandincHEADERS 5.398 + 5.399 + install-dvi: install-dvi-am 5.400 +@@ -11387,6 +11387,8 @@ 5.401 + 5.402 + install-info-am: 5.403 + 5.404 ++install-libs-only: install-libLTLIBRARIES install-data-am 5.405 ++ 5.406 + install-man: install-man1 5.407 + 5.408 + install-pdf: install-pdf-am 5.409 +@@ -11563,7 +11565,7 @@ 5.410 + @WITH_PERL_FALSE@distclean-perl: 5.411 + 5.412 + # create a copy for pc file (ideally the non abi should be symlinked) 5.413 +-%-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc: %.pc 5.414 ++%-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@.pc: %-@MAGICK_MAJOR_VERSION@.pc 5.415 + cp -f $^ $@ 5.416 + 5.417 + all-local: $(MAGICKPP_LOCAL_TARGETS) $(PERLMAGICK_ALL_LOCAL_TARGETS) $(MAINTAINER_TARGETS) 5.418 +diff -Naur ImageMagick-6.9.6-3.orig/wand/MagickWand-6.pc.in ImageMagick-6.9.6-3/wand/MagickWand-6.pc.in 5.419 +--- ImageMagick-6.9.6-3.orig/wand/MagickWand-6.pc.in 1970-01-01 01:00:00.000000000 +0100 5.420 ++++ ImageMagick-6.9.6-3/wand/MagickWand-6.pc.in 2017-01-08 00:37:51.232515933 +0000 5.421 +@@ -0,0 +1,15 @@ 5.422 ++prefix=@prefix@ 5.423 ++exec_prefix=@exec_prefix@ 5.424 ++libdir=@libdir@ 5.425 ++includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ 5.426 ++includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@ 5.427 ++libname=MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ 5.428 ++ 5.429 ++Name: MagickWand-@MAGICK_MAJOR_VERSION@ 5.430 ++Description: MagickWand - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) 5.431 ++URL: https://www.imagemagick.org 5.432 ++Version: @PACKAGE_VERSION@ 5.433 ++Requires: MagickCore-@MAGICK_MAJOR_VERSION@ 5.434 ++Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@ 5.435 ++Libs: -L${libdir} -l${libname} 5.436 ++Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@ 5.437 +diff -Naur ImageMagick-6.9.6-3.orig/wand/MagickWand.pc.in ImageMagick-6.9.6-3/wand/MagickWand.pc.in 5.438 +--- ImageMagick-6.9.6-3.orig/wand/MagickWand.pc.in 2016-10-31 00:34:31.000000000 +0000 5.439 ++++ ImageMagick-6.9.6-3/wand/MagickWand.pc.in 1970-01-01 01:00:00.000000000 +0100 5.440 +@@ -1,15 +0,0 @@ 5.441 +-prefix=@prefix@ 5.442 +-exec_prefix=@exec_prefix@ 5.443 +-libdir=@libdir@ 5.444 +-includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ 5.445 +-includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@ 5.446 +-libname=MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ 5.447 +- 5.448 +-Name: MagickWand 5.449 +-Description: MagickWand - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) 5.450 +-URL: https://www.imagemagick.org 5.451 +-Version: @PACKAGE_VERSION@ 5.452 +-Requires: MagickCore 5.453 +-Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@ 5.454 +-Libs: -L${libdir} -l${libname} 5.455 +-Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@ 5.456 +diff -Naur ImageMagick-6.9.6-3.orig/wand/Wand-6.pc.in ImageMagick-6.9.6-3/wand/Wand-6.pc.in 5.457 +--- ImageMagick-6.9.6-3.orig/wand/Wand-6.pc.in 1970-01-01 01:00:00.000000000 +0100 5.458 ++++ ImageMagick-6.9.6-3/wand/Wand-6.pc.in 2017-01-08 00:39:23.169642808 +0000 5.459 +@@ -0,0 +1,15 @@ 5.460 ++prefix=@prefix@ 5.461 ++exec_prefix=@exec_prefix@ 5.462 ++libdir=@libdir@ 5.463 ++includedir=@includedir@/ImageMagick-@MAGICK_MAJOR_VERSION@ 5.464 ++includearchdir=@INCLUDEARCH_DIR@/ImageMagick-@MAGICK_MAJOR_VERSION@ 5.465 ++libname=MagickWand-@MAGICK_MAJOR_VERSION@.@MAGICK_ABI_SUFFIX@ 5.466 ++ 5.467 ++Name: MagickWand-6 5.468 ++Description: MagickCore - C API for ImageMagick (ABI @MAGICK_ABI_SUFFIX@) 5.469 ++URL: https://www.imagemagick.org 5.470 ++Version: @PACKAGE_VERSION@ 5.471 ++Requires: MagickCore-6 5.472 ++Cflags: -I${includearchdir} -I${includedir} @MAGICK_PCFLAGS@ 5.473 ++Libs: -L${libdir} -l${libname} 5.474 ++Libs.private: -L${libdir} -l${libname} @MAGICK_LIBS@ @MATH_LIBS@
6.1 --- a/imagemagick6/stuff/patches/series Sun Nov 05 17:17:00 2017 +0100 6.2 +++ b/imagemagick6/stuff/patches/series Sun Nov 05 18:29:48 2017 +0200 6.3 @@ -1,1 +1,1 @@ 6.4 -ImageMagick-6.9.7-8-libs_only-1.patch 6.5 +ImageMagick-6.9.9-9-libs_only-1.patch
7.1 --- a/inkscape/receipt Sun Nov 05 17:17:00 2017 +0100 7.2 +++ b/inkscape/receipt Sun Nov 05 18:29:48 2017 +0200 7.3 @@ -1,63 +1,61 @@ 7.4 -# SliTaz package receipt. 7.5 +# SliTaz package receipt v2. 7.6 7.7 PACKAGE="inkscape" 7.8 -VERSION="0.91" 7.9 +VERSION="0.92.2" 7.10 CATEGORY="graphics" 7.11 -SHORT_DESC="vector-based drawing program" 7.12 +SHORT_DESC="Professional quality vector graphics software" 7.13 MAINTAINER="pankso@slitaz.org" 7.14 LICENSE="GPL2" 7.15 +WEB_SITE="https://inkscape.org/en/" 7.16 +LFS="http://www.linuxfromscratch.org/blfs/view/stable/xsoft/inkscape.html" 7.17 + 7.18 TARBALL="$PACKAGE-$VERSION.tar.bz2" 7.19 -WEB_SITE="http://www.inkscape.org" 7.20 -#WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 7.21 -WGET_URL="$WEB_SITE/en/gallery/item/3860/$TARBALL" 7.22 -TAGS="image vector editor svg" 7.23 +WGET_URL="https://gitlab.com/inkscape/inkscape/repository/INKSCAPE_${VERSION//./_}/archive.tar.bz2" 7.24 7.25 -DEPENDS="gc gtk+ libxslt libsigc++ glibmm gtkmm libxml2 libpng popt \ 7.26 -xorg-libXdamage gsl aspell libgiomm lcms gtkspell libgomp poppler gcc-lib-base" 7.27 -BUILD_DEPENDS="gc-dev gtk+-dev libxslt-dev libsigc++-dev glibmm-dev \ 7.28 -gtkmm-dev atkmm-dev popt-dev libgiomm-dev gsl gsl-dev lcms-dev gtkspell \ 7.29 -gtkspell-dev cairomm-dev libboost-dev libxml2-dev zlib-dev autoconf pkg-config \ 7.30 -intltool xorg-libXau-dev xorg-libXdmcp-dev automake libtool" 7.31 +BUILD_DEPENDS="cmake gtest pango-dev fontconfig-dev glib-dev gsl-dev \ 7.32 +gnome-vfs-dev lcms2-dev gc-dev poppler-dev libwpg-dev libvisio-dev libcdr-dev \ 7.33 +libwpd-dev popt-dev potrace-dev gtkmm-dev gtk+-dev gtkspell-dev libboost-dev \ 7.34 +aspell-dev libxslt-dev imagemagick6-dev gettext dbus-dev" 7.35 +COOKOPTS="!svgz" # don't process svg or they will be broken 7.36 +SPLIT="inkscape-examples inkscape-tutorials inkscape" 7.37 7.38 -# Rules to configure and make the package. 7.39 -compile_rules() 7.40 -{ 7.41 - for patchfile in $(cat $stuff/patches/series); do 7.42 - patch -p1 -i $stuff/patches/$patchfile 7.43 - done 7.44 +compile_rules() { 7.45 + mkdir -p build 7.46 + cd build 7.47 + cmake \ 7.48 + -DCMAKE_INSTALL_PREFIX=/usr \ 7.49 + -DCMAKE_BUILD_TYPE=Release \ 7.50 + -DWITH_DBUS=ON \ 7.51 + .. && 7.52 + make && 7.53 + make install && 7.54 + rm $install/usr/lib/inkscape/lib*_LIB.a 7.55 7.56 - # hack to define '_' and 'Q_' functions 7.57 - for file in $(find $src/src -type f); do 7.58 - sed -i 's|glibmm/i18n.h|glib/gi18n.h|g' $file 7.59 - done 7.60 - 7.61 - ./configure \ 7.62 - --prefix=/usr \ 7.63 - --mandir=/usr/share/man \ 7.64 - $CONFIGURE_ARGS && 7.65 - make $MAKEFLAGS && 7.66 - make DESTDIR=$DESTDIR install 7.67 +# -DCMAKE_BUILD_TYPE=Release \ 7.68 +# -DCMAKE_INSTALL_PREFIX:PATH=/usr \ 7.69 +# -DINCLUDE_INSTALL_DIR:PATH=/usr/include \ 7.70 +# -DLIB_INSTALL_DIR:PATH=/usr/lib \ 7.71 +# -DSYSCONF_INSTALL_DIR:PATH=/etc \ 7.72 +# -DSHARE_INSTALL_PREFIX:PATH=/usr/share \ 7.73 +# -DCMAKE_ENABLE_LCMS=ON \ 7.74 +# -DCMAKE_ENABLE_POPPLER_CAIRO=ON \ 7.75 +# -DCMAKE_WITH_NLS=ON 7.76 } 7.77 7.78 -# Rules to gen a SliTaz package suitable for Tazpkg. 7.79 -genpkg_rules() 7.80 -{ 7.81 - mkdir -p $fs/usr/share 7.82 - cp -a $install/usr/bin $fs/usr 7.83 - 7.84 - # Copy all Inkscape files and remove tutorials (19,2 Mb) + misc files 7.85 - cp -a $install/usr/share/inkscape $fs/usr/share 7.86 - rm -rf $fs/usr/share/inkscape/clipart 7.87 - rm -rf $fs/usr/share/inkscape/tutorials 7.88 - rm -rf $fs/usr/share/inkscape/examples 7.89 - 7.90 - # Desktop file 7.91 - cp -a $install/usr/share/applications $fs/usr/share 7.92 - DESKTOP=$fs/usr/share/applications/inkscape.desktop 7.93 - sed -i '/^Name/d; s|X-GNOME-Full||g' $DESKTOP 7.94 - sdft $DESKTOP -g -tf -te -i 7.95 - 7.96 - # Icons 7.97 - cp -a $install/usr/share/icons $fs/usr/share 7.98 - rm -rf $fs/usr/share/icons/hicolor/256x256 7.99 +genpkg_rules() { 7.100 + case $PACKAGE in 7.101 + *-examples) 7.102 + copy examples/ 7.103 + CAT="graphics|examples" 7.104 + ;; 7.105 + *-tutorials) 7.106 + copy tutorials/ 7.107 + CAT="graphics|tutorials" 7.108 + ;; 7.109 + inkscape) 7.110 + copy @std @rm 7.111 + DEPENDS="" 7.112 + TAGS="image vector editor svg" 7.113 + ;; 7.114 + esac 7.115 }
8.1 --- a/inkscape/stuff/README Sun Nov 05 17:17:00 2017 +0100 8.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 8.3 @@ -1,2 +0,0 @@ 8.4 -Debian patches used: 8.5 -https://launchpad.net/debian/+source/inkscape/0.48.5-2
9.1 --- a/inkscape/stuff/patches/0002-Drop_PS_and_PDF_support_in_MimeType.patch Sun Nov 05 17:17:00 2017 +0100 9.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 9.3 @@ -1,22 +0,0 @@ 9.4 -From: Wolfram Quester <wolfi@sigxcpu.org> 9.5 -Date: Tue, 2 Jul 2013 10:57:33 +0200 9.6 -Subject: Drop_PS_and_PDF_support_in_MimeType 9.7 - 9.8 -Signed-off-by: Matteo F. Vescovi <mfv.debian@gmail.com> 9.9 ---- 9.10 - inkscape.desktop.in | 2 +- 9.11 - 1 file changed, 1 insertion(+), 1 deletion(-) 9.12 - 9.13 -diff --git a/inkscape.desktop.in b/inkscape.desktop.in 9.14 -index 5c0de64..62ce1e4 100644 9.15 ---- a/inkscape.desktop.in 9.16 -+++ b/inkscape.desktop.in 9.17 -@@ -6,7 +6,7 @@ _X-GNOME-FullName=Inkscape Vector Graphics Editor 9.18 - _Comment=Create and edit Scalable Vector Graphics images 9.19 - Type=Application 9.20 - Categories=Graphics;VectorGraphics;GTK; 9.21 --MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;application/pdf;application/postscript;image/x-eps;application/illustrator; 9.22 -+MimeType=image/svg+xml;image/svg+xml-compressed;application/vnd.corel-draw;image/x-eps;application/illustrator; 9.23 - Exec=inkscape %F 9.24 - TryExec=inkscape 9.25 - Terminal=false
10.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 10.2 +++ b/inkscape/stuff/patches/inkscape-0.92.2-use_versioned_ImageMagick6-1.patch Sun Nov 05 18:29:48 2017 +0200 10.3 @@ -0,0 +1,33 @@ 10.4 +Submitted By: Ken Moffat <ken at linuxfromscratch dot org> 10.5 +Date: 2017-01-09 10.6 +Initial Package Version: 0.92.0 10.7 +Upstream Status: N/A 10.8 +Origin: Self 10.9 +Description: Look for verisioned ImageMagick-6 pkgconfig files so that 10.10 +ImageMagick-6 libraries and be installed alongside a full ImageMagick-7. 10.11 +This requires a patched build of ImageMagick-6. 10.12 + 10.13 +diff -Naur inkscape-0.92.0.orig/CMakeScripts/DefineDependsandFlags.cmake inkscape-0.92.0/CMakeScripts/DefineDependsandFlags.cmake 10.14 +--- inkscape-0.92.0.orig/CMakeScripts/DefineDependsandFlags.cmake 2017-01-02 09:44:59.000000000 +0000 10.15 ++++ inkscape-0.92.0/CMakeScripts/DefineDependsandFlags.cmake 2017-01-08 03:03:50.171286138 +0000 10.16 +@@ -373,14 +373,14 @@ 10.17 + list(APPEND INKSCAPE_LIBS ${ZLIB_LIBRARIES}) 10.18 + 10.19 + if(WITH_IMAGE_MAGICK) 10.20 +- pkg_check_modules(ImageMagick ImageMagick MagickCore Magick++ ) 10.21 +- if(ImageMagick_FOUND) 10.22 ++ pkg_check_modules(ImageMagick-6 ImageMagick-6 MagickCore-6 Magick++-6 ) 10.23 ++ if(ImageMagick-6_FOUND) 10.24 + 10.25 +- list(APPEND INKSCAPE_LIBS ${ImageMagick_LDFLAGS}) 10.26 +- add_definitions(${ImageMagick_CFLAGS_OTHER}) 10.27 ++ list(APPEND INKSCAPE_LIBS ${ImageMagick-6_LDFLAGS}) 10.28 ++ add_definitions(${ImageMagick-6_CFLAGS_OTHER}) 10.29 + 10.30 +- list(APPEND INKSCAPE_INCS_SYS ${ImageMagick_INCLUDE_DIRS}) 10.31 +- list(APPEND INKSCAPE_LIBS ${ImageMagick_LIBRARIES}) 10.32 ++ list(APPEND INKSCAPE_INCS_SYS ${ImageMagick-6_INCLUDE_DIRS}) 10.33 ++ list(APPEND INKSCAPE_LIBS ${ImageMagick-6_LIBRARIES}) 10.34 + else() 10.35 + set(WITH_IMAGE_MAGICK OFF) # enable 'Extensions > Raster' 10.36 + endif()
11.1 --- a/inkscape/stuff/patches/series Sun Nov 05 17:17:00 2017 +0100 11.2 +++ b/inkscape/stuff/patches/series Sun Nov 05 18:29:48 2017 +0200 11.3 @@ -1,1 +1,1 @@ 11.4 -0002-Drop_PS_and_PDF_support_in_MimeType.patch 11.5 +inkscape-0.92.2-use_versioned_ImageMagick6-1.patch
12.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 12.2 +++ b/libcdr/receipt Sun Nov 05 18:29:48 2017 +0200 12.3 @@ -0,0 +1,33 @@ 12.4 +# SliTaz package receipt v2. 12.5 + 12.6 +PACKAGE="libcdr" 12.7 +VERSION="0.1.4" 12.8 +CATEGORY="graphics" 12.9 +SHORT_DESC="CorelDraw file format importer library" 12.10 +MAINTAINER="al.bobylev@gmail.com" 12.11 +LICENSE="GPL2 LGPL2.1 MPL" 12.12 +WEB_SITE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr" 12.13 + 12.14 +TARBALL="$PACKAGE-$VERSION.tar.xz" 12.15 +WGET_URL="https://dev-www.libreoffice.org/src/libcdr/$TARBALL" 12.16 + 12.17 +BUILD_DEPENDS="librevenge-dev lcms2-dev icu-dev libboost-dev cppunit-dev \ 12.18 +doxygen" 12.19 +SPLIT="libcdr-dev" 12.20 + 12.21 +compile_rules() { 12.22 + ./configure $CONFIGURE_ARGS && make && make install 12.23 +} 12.24 + 12.25 +genpkg_rules() { 12.26 + case $PACKAGE in 12.27 + libcdr) 12.28 + copy @std 12.29 + DEPENDS="icu lcms2 libicu librevenge zlib" 12.30 + ;; 12.31 + *-dev) 12.32 + copy @dev 12.33 + DEPENDS="libcdr icu-dev lcms2-dev librevenge-dev zlib-dev" 12.34 + ;; 12.35 + esac 12.36 +}
13.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 13.2 +++ b/librevenge/receipt Sun Nov 05 18:29:48 2017 +0200 13.3 @@ -0,0 +1,32 @@ 13.4 +# SliTaz package receipt v2. 13.5 + 13.6 +PACKAGE="librevenge" 13.7 +VERSION="0.0.4" 13.8 +CATEGORY="libs" 13.9 +SHORT_DESC="Library for REVerses ENGineered formats filters" 13.10 +MAINTAINER="al.bobylev@gmail.com" 13.11 +LICENSE="MPL" 13.12 +WEB_SITE="http://libwpd.sourceforge.net/" 13.13 + 13.14 +TARBALL="$PACKAGE-$VERSION.tar.xz" 13.15 +WGET_URL="$SF_MIRROR/libwpd/$TARBALL" 13.16 + 13.17 +BUILD_DEPENDS="libboost-dev cppunit-dev doxygen zlib-dev" 13.18 +SPLIT="librevenge-dev" 13.19 + 13.20 +compile_rules() { 13.21 + ./configure $CONFIGURE_ARGS && make && make install 13.22 +} 13.23 + 13.24 +genpkg_rules() { 13.25 + case $PACKAGE in 13.26 + librevenge) 13.27 + copy @std 13.28 + DEPENDS="zlib" 13.29 + ;; 13.30 + *-dev) 13.31 + copy @dev 13.32 + DEPENDS="librevenge zlib-dev" 13.33 + ;; 13.34 + esac 13.35 +}
14.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 14.2 +++ b/libvisio/receipt Sun Nov 05 18:29:48 2017 +0200 14.3 @@ -0,0 +1,34 @@ 14.4 +# SliTaz package receipt v2. 14.5 + 14.6 +PACKAGE="libvisio" 14.7 +VERSION="0.1.5" 14.8 +CATEGORY="graphics" 14.9 +SHORT_DESC="Interpret and import visio diagrams" 14.10 +MAINTAINER="al.bobylev@gmail.com" 14.11 +LICENSE="LGPL" 14.12 +WEB_SITE="https://wiki.documentfoundation.org/DLP/Libraries/libvisio" 14.13 + 14.14 +TARBALL="$PACKAGE-$VERSION.tar.xz" 14.15 +WGET_URL="https://dev-www.libreoffice.org/src/libvisio/$TARBALL" 14.16 + 14.17 +BUILD_DEPENDS="librevenge-dev libxml2-dev icu-dev libboost-dev cppunit-dev \ 14.18 +doxygen perl gperf" 14.19 +SPLIT="libvisio-dev" 14.20 + 14.21 +compile_rules() { 14.22 + ./configure $CONFIGURE_ARGS && make && make install 14.23 +} 14.24 + 14.25 +genpkg_rules() { 14.26 + case $PACKAGE in 14.27 + libvisio) 14.28 + copy @std 14.29 + DEPENDS="icu libicu liblzma librevenge libxml2 zlib" 14.30 + ;; 14.31 + *-dev) 14.32 + copy @dev 14.33 + DEPENDS="libvisio icu-dev librevenge-dev libxml2-dev xz-dev \ 14.34 + zlib-dev" 14.35 + ;; 14.36 + esac 14.37 +}
15.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 15.2 +++ b/libwpd/receipt Sun Nov 05 18:29:48 2017 +0200 15.3 @@ -0,0 +1,32 @@ 15.4 +# SliTaz package receipt v2. 15.5 + 15.6 +PACKAGE="libwpd" 15.7 +VERSION="0.10.2" 15.8 +CATEGORY="graphics" 15.9 +SHORT_DESC="Library for importing WordPerfect (tm) documents" 15.10 +MAINTAINER="al.bobylev@gmail.com" 15.11 +LICENSE="LGPL" 15.12 +WEB_SITE="http://libwpd.sourceforge.net/" 15.13 + 15.14 +TARBALL="$PACKAGE-$VERSION.tar.xz" 15.15 +WGET_URL="$SF_MIRROR/libwpd/$TARBALL" 15.16 + 15.17 +BUILD_DEPENDS="doxygen librevenge-dev libboost-dev" 15.18 +SPLIT="libwpd-dev" 15.19 + 15.20 +compile_rules() { 15.21 + ./configure $CONFIGURE_ARGS && make && make install 15.22 +} 15.23 + 15.24 +genpkg_rules() { 15.25 + case $PACKAGE in 15.26 + libwpd) 15.27 + copy @std 15.28 + DEPENDS="librevenge zlib" 15.29 + ;; 15.30 + *-dev) 15.31 + copy @dev 15.32 + DEPENDS="libwpd librevenge-dev" 15.33 + ;; 15.34 + esac 15.35 +}
16.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 16.2 +++ b/libwpg/receipt Sun Nov 05 18:29:48 2017 +0200 16.3 @@ -0,0 +1,32 @@ 16.4 +# SliTaz package receipt v2. 16.5 + 16.6 +PACKAGE="libwpg" 16.7 +VERSION="0.3.2" 16.8 +CATEGORY="graphics" 16.9 +SHORT_DESC="Importing and converting Corel WordPerfect(tm) Graphics images" 16.10 +MAINTAINER="al.bobylev@gmail.com" 16.11 +LICENSE="LGPL" 16.12 +WEB_SITE="http://libwpg.sourceforge.net/" 16.13 + 16.14 +TARBALL="$PACKAGE-$VERSION.tar.xz" 16.15 +WGET_URL="$SF_MIRROR/libwpg/$TARBALL" 16.16 + 16.17 +BUILD_DEPENDS="librevenge-dev libwpd-dev doxygen" 16.18 +SPLIT="libwpg-dev" 16.19 + 16.20 +compile_rules() { 16.21 + ./configure $CONFIGURE_ARGS && make && make install 16.22 +} 16.23 + 16.24 +genpkg_rules() { 16.25 + case $PACKAGE in 16.26 + libwpg) 16.27 + copy @std 16.28 + DEPENDS="librevenge libwpd perl zlib" 16.29 + ;; 16.30 + *-dev) 16.31 + copy @dev 16.32 + DEPENDS="libwpg librevenge-dev libwpd-dev" 16.33 + ;; 16.34 + esac 16.35 +}
17.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 17.2 +++ b/potrace/receipt Sun Nov 05 18:29:48 2017 +0200 17.3 @@ -0,0 +1,37 @@ 17.4 +# SliTaz package receipt v2. 17.5 + 17.6 +PACKAGE="potrace" 17.7 +VERSION="1.14" 17.8 +CATEGORY="graphics" 17.9 +SHORT_DESC="Transform bitmaps into vector graphics" 17.10 +MAINTAINER="al.bobylev@gmail.com" 17.11 +LICENSE="GPL" 17.12 +WEB_SITE="http://potrace.sourceforge.net/" 17.13 + 17.14 +TARBALL="$PACKAGE-$VERSION.tar.gz" 17.15 +WGET_URL="$SF_MIRROR/potrace/$TARBALL" 17.16 + 17.17 +BUILD_DEPENDS="zlib-dev" 17.18 +SPLIT="potrace-dev" 17.19 + 17.20 +compile_rules() { 17.21 + ./configure \ 17.22 + --enable-metric \ 17.23 + --enable-a4 \ 17.24 + --with-libpotrace \ 17.25 + $CONFIGURE_ARGS && 17.26 + make && 17.27 + make install 17.28 +} 17.29 + 17.30 +genpkg_rules() { 17.31 + case $PACKAGE in 17.32 + potrace) 17.33 + copy @std 17.34 + DEPENDS="zlib" 17.35 + ;; 17.36 + *-dev) 17.37 + copy @dev 17.38 + ;; 17.39 + esac 17.40 +}