diff options
| author | Juergen Daubert <jue@jue.li> | 2020-09-29 12:26:33 +0000 |
|---|---|---|
| committer | Juergen Daubert <jue@jue.li> | 2020-09-29 12:26:33 +0000 |
| commit | e2f368ff2d65664b820cc208726f87a0d25b248c (patch) | |
| tree | d0c5b4a4d4a27ac00d2a0ea6a43930bce27515e7 /imagemagick | |
| parent | 2b5fd2b88e08ed8020ea7f495cb7c1f01cc5af4c (diff) | |
| parent | aa48c838ed2df5faf2daf922f96b108dad7ceaa2 (diff) | |
| download | opt-e2f368ff2d65664b820cc208726f87a0d25b248c.tar.gz opt-e2f368ff2d65664b820cc208726f87a0d25b248c.tar.xz | |
Merge branch '3.5' into 3.6
Conflicts:
htop/.signature
htop/Pkgfile
imagemagick/.signature
Diffstat (limited to 'imagemagick')
| -rw-r--r-- | imagemagick/.footprint | 4 | ||||
| -rw-r--r-- | imagemagick/.signature | 8 | ||||
| -rw-r--r-- | imagemagick/Pkgfile | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/imagemagick/.footprint b/imagemagick/.footprint index 83ed536c4..fdf00a01e 100644 --- a/imagemagick/.footprint +++ b/imagemagick/.footprint @@ -281,8 +281,6 @@ drwxr-xr-x root/root usr/lib/ImageMagick-7.0.10/modules-Q16HDRI/coders/ -rwxr-xr-x root/root usr/lib/ImageMagick-7.0.10/modules-Q16HDRI/coders/mono.so -rwxr-xr-x root/root usr/lib/ImageMagick-7.0.10/modules-Q16HDRI/coders/mpc.la -rwxr-xr-x root/root usr/lib/ImageMagick-7.0.10/modules-Q16HDRI/coders/mpc.so --rwxr-xr-x root/root usr/lib/ImageMagick-7.0.10/modules-Q16HDRI/coders/mpeg.la --rwxr-xr-x root/root usr/lib/ImageMagick-7.0.10/modules-Q16HDRI/coders/mpeg.so -rwxr-xr-x root/root usr/lib/ImageMagick-7.0.10/modules-Q16HDRI/coders/mpr.la -rwxr-xr-x root/root usr/lib/ImageMagick-7.0.10/modules-Q16HDRI/coders/mpr.so -rwxr-xr-x root/root usr/lib/ImageMagick-7.0.10/modules-Q16HDRI/coders/msl.la @@ -389,6 +387,8 @@ drwxr-xr-x root/root usr/lib/ImageMagick-7.0.10/modules-Q16HDRI/coders/ -rwxr-xr-x root/root usr/lib/ImageMagick-7.0.10/modules-Q16HDRI/coders/vicar.so -rwxr-xr-x root/root usr/lib/ImageMagick-7.0.10/modules-Q16HDRI/coders/vid.la -rwxr-xr-x root/root usr/lib/ImageMagick-7.0.10/modules-Q16HDRI/coders/vid.so +-rwxr-xr-x root/root usr/lib/ImageMagick-7.0.10/modules-Q16HDRI/coders/video.la +-rwxr-xr-x root/root usr/lib/ImageMagick-7.0.10/modules-Q16HDRI/coders/video.so -rwxr-xr-x root/root usr/lib/ImageMagick-7.0.10/modules-Q16HDRI/coders/viff.la -rwxr-xr-x root/root usr/lib/ImageMagick-7.0.10/modules-Q16HDRI/coders/viff.so -rwxr-xr-x root/root usr/lib/ImageMagick-7.0.10/modules-Q16HDRI/coders/vips.la diff --git a/imagemagick/.signature b/imagemagick/.signature index 899d9e773..d163a5dd8 100644 --- a/imagemagick/.signature +++ b/imagemagick/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/ZvmiZQxhBz3qHY9OMmPrTiMxFZSy3ElzMzO9tLhHCiUGx/MMkxEeRRQNizJz321Rl481Uq6uF9Zuqt692pJfwE= -SHA256 (Pkgfile) = 6c528302fb23b38c993702c58961c15c0b5515c1ccdbd138dbdfcd2d905ea553 -SHA256 (.footprint) = 894967cf6c16c46a702e43e4059001b7009d53ca74878c00839ec3c8e9e2fcaf -SHA256 (ImageMagick-7.0.10-30.tar.xz) = 1b550e051f4472a64943718b7366855cdbda1b2b256ba0ee34f6d3589775f81f +RWSE3ohX2g5d/ebTAkcxwpWWzZGfDFo/VIyKptWn9Nin6G4nekFpr+Mv7IoosKoIwjqhshat00D1EX7+m1pZnBRQzPXdlEjFYAw= +SHA256 (Pkgfile) = 9788145cfa19311f8e23bcb04af33fe9eb424cbf6f019283c0b27ba6fe5f12f7 +SHA256 (.footprint) = 2d7daa023589e45594c69862026e99d67070a4752617ec2e9119ab69ff96abca +SHA256 (ImageMagick-7.0.10-31.tar.xz) = c0d2b79dc959bb5f20c90596b41ac9baad34f659d9192f2abb3c06a0778f47d1 diff --git a/imagemagick/Pkgfile b/imagemagick/Pkgfile index 06f63f120..ef6348966 100644 --- a/imagemagick/Pkgfile +++ b/imagemagick/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libtool lcms2 pango xorg-libxt chrpath name=imagemagick -version=7.0.10-30 +version=7.0.10-31 release=1 source=(https://www.imagemagick.org/download/releases/ImageMagick-$version.tar.xz) |