diff options
author | Juergen Daubert <jue@jue.li> | 2015-07-28 13:31:34 +0200 |
---|---|---|
committer | Juergen Daubert <jue@jue.li> | 2015-07-28 13:31:34 +0200 |
commit | c725f431968130cc05f9012700a94a0c36ad7183 (patch) | |
tree | bc1ac0747830f0cfa48aa6a7ebe15989f7a0d67f /imagemagick | |
parent | 06a8ca0eac6dfecfd000fe07039275ae64161ce7 (diff) | |
parent | 646dba2ea78e1384b3a0142df1da773a11cbda14 (diff) | |
download | opt-c725f431968130cc05f9012700a94a0c36ad7183.tar.gz opt-c725f431968130cc05f9012700a94a0c36ad7183.tar.xz |
Merge branch '3.1' into 3.2
Diffstat (limited to 'imagemagick')
-rw-r--r-- | imagemagick/.footprint | 50 | ||||
-rw-r--r-- | imagemagick/.md5sum | 2 | ||||
-rw-r--r-- | imagemagick/Pkgfile | 5 |
3 files changed, 28 insertions, 29 deletions
diff --git a/imagemagick/.footprint b/imagemagick/.footprint index 8d84c427d..d6312674b 100644 --- a/imagemagick/.footprint +++ b/imagemagick/.footprint @@ -173,9 +173,9 @@ drwxr-xr-x root/root usr/include/ImageMagick-6/wand/ -rw-r--r-- root/root usr/include/ImageMagick-6/wand/stream.h -rw-r--r-- root/root usr/include/ImageMagick-6/wand/wand-view.h drwxr-xr-x root/root usr/lib/ -drwxr-xr-x root/root usr/lib/ImageMagick-6.9.0/ -drwxr-xr-x root/root usr/lib/ImageMagick-6.9.0/config-Q16/ --rw-r--r-- root/root usr/lib/ImageMagick-6.9.0/config-Q16/configure.xml +drwxr-xr-x root/root usr/lib/ImageMagick-6.9.1/ +drwxr-xr-x root/root usr/lib/ImageMagick-6.9.1/config-Q16/ +-rw-r--r-- root/root usr/lib/ImageMagick-6.9.1/config-Q16/configure.xml -rw-r--r-- root/root usr/lib/libMagick++-6.Q16.a -rwxr-xr-x root/root usr/lib/libMagick++-6.Q16.la lrwxrwxrwx root/root usr/lib/libMagick++-6.Q16.so -> libMagick++-6.Q16.so.6.0.0 @@ -220,30 +220,30 @@ drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/MagickWand.pc -rw-r--r-- root/root usr/lib/pkgconfig/Wand-6.Q16.pc -rw-r--r-- root/root usr/lib/pkgconfig/Wand.pc -drwxr-xr-x root/root usr/man/ -drwxr-xr-x root/root usr/man/man1/ --rw-r--r-- root/root usr/man/man1/ImageMagick.1.gz --rw-r--r-- root/root usr/man/man1/Magick++-config.1.gz --rw-r--r-- root/root usr/man/man1/Magick-config.1.gz --rw-r--r-- root/root usr/man/man1/MagickCore-config.1.gz --rw-r--r-- root/root usr/man/man1/MagickWand-config.1.gz --rw-r--r-- root/root usr/man/man1/Wand-config.1.gz --rw-r--r-- root/root usr/man/man1/animate.1.gz --rw-r--r-- root/root usr/man/man1/compare.1.gz --rw-r--r-- root/root usr/man/man1/composite.1.gz --rw-r--r-- root/root usr/man/man1/conjure.1.gz --rw-r--r-- root/root usr/man/man1/convert.1.gz --rw-r--r-- root/root usr/man/man1/display.1.gz --rw-r--r-- root/root usr/man/man1/identify.1.gz --rw-r--r-- root/root usr/man/man1/import.1.gz --rw-r--r-- root/root usr/man/man1/mogrify.1.gz --rw-r--r-- root/root usr/man/man1/montage.1.gz --rw-r--r-- root/root usr/man/man1/stream.1.gz -drwxr-xr-x root/root usr/man/man3/ --r--r--r-- root/root usr/man/man3/Image::Magick.3pm.gz --r--r--r-- root/root usr/man/man3/Image::Magick::Q16.3pm.gz drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/ImageMagick-6/ -rw-r--r-- root/root usr/share/ImageMagick-6/english.xml -rw-r--r-- root/root usr/share/ImageMagick-6/francais.xml -rw-r--r-- root/root usr/share/ImageMagick-6/locale.xml +drwxr-xr-x root/root usr/share/man/ +drwxr-xr-x root/root usr/share/man/man1/ +-rw-r--r-- root/root usr/share/man/man1/ImageMagick.1.gz +-rw-r--r-- root/root usr/share/man/man1/Magick++-config.1.gz +-rw-r--r-- root/root usr/share/man/man1/Magick-config.1.gz +-rw-r--r-- root/root usr/share/man/man1/MagickCore-config.1.gz +-rw-r--r-- root/root usr/share/man/man1/MagickWand-config.1.gz +-rw-r--r-- root/root usr/share/man/man1/Wand-config.1.gz +-rw-r--r-- root/root usr/share/man/man1/animate.1.gz +-rw-r--r-- root/root usr/share/man/man1/compare.1.gz +-rw-r--r-- root/root usr/share/man/man1/composite.1.gz +-rw-r--r-- root/root usr/share/man/man1/conjure.1.gz +-rw-r--r-- root/root usr/share/man/man1/convert.1.gz +-rw-r--r-- root/root usr/share/man/man1/display.1.gz +-rw-r--r-- root/root usr/share/man/man1/identify.1.gz +-rw-r--r-- root/root usr/share/man/man1/import.1.gz +-rw-r--r-- root/root usr/share/man/man1/mogrify.1.gz +-rw-r--r-- root/root usr/share/man/man1/montage.1.gz +-rw-r--r-- root/root usr/share/man/man1/stream.1.gz +drwxr-xr-x root/root usr/share/man/man3/ +-r--r--r-- root/root usr/share/man/man3/Image::Magick.3pm.gz +-r--r--r-- root/root usr/share/man/man3/Image::Magick::Q16.3pm.gz diff --git a/imagemagick/.md5sum b/imagemagick/.md5sum index e7b2ca4f4..4a349e66e 100644 --- a/imagemagick/.md5sum +++ b/imagemagick/.md5sum @@ -1 +1 @@ -906193d9da1205542a17f77b9541783d ImageMagick-6.9.0-10.tar.xz +cf5c663a31d0ca2975121d0803db0e61 ImageMagick-6.9.1-10.tar.xz diff --git a/imagemagick/Pkgfile b/imagemagick/Pkgfile index 8c010a125..f6697001a 100644 --- a/imagemagick/Pkgfile +++ b/imagemagick/Pkgfile @@ -5,15 +5,14 @@ # Depends on: util-linux lcms2 pango xorg-libxt name=imagemagick -version=6.9.0-10 -release=2 +version=6.9.1-10 +release=1 source=(ftp://ftp.imagemagick.org/pub/ImageMagick/releases/ImageMagick-$version.tar.xz) build () { cd ImageMagick-$version ./configure --prefix=/usr \ - --mandir=/usr/man \ --enable-shared \ --with-perl=yes \ --with-lcms=no --with-lcms2=yes |