diff options
| -rw-r--r-- | .SRCINFO | 14 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | imagemagick-inkscape-1.0.patch | 13 |
3 files changed, 30 insertions, 10 deletions
@@ -1,6 +1,6 @@ pkgbase = imagemagick-full pkgdesc = An image viewing/manipulation program (Q32 HDRI with all features) - pkgver = 7.0.10.10 + pkgver = 7.0.10.11 pkgrel = 1 url = https://www.imagemagick.org/ arch = x86_64 @@ -57,10 +57,12 @@ pkgbase = imagemagick-full makedepends = libfpx makedepends = libumem-git makedepends = brunsli - source = git+https://github.com/ImageMagick/ImageMagick.git#commit=0c8d393a2f3f7605dab38d382c21052b87ed3576 + source = git+https://github.com/ImageMagick/ImageMagick.git#commit=5f07d65ddcb06b3a8a63d734a822ef5c1d93b30b source = arch-fonts.diff + source = imagemagick-inkscape-1.0.patch sha256sums = SKIP sha256sums = a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73 + sha256sums = dd856b0d7b5b98535d2bc61dfa995f4162677486c1eac14b384668a28a60af30 pkgname = imagemagick-full depends = lcms2 @@ -106,9 +108,9 @@ pkgname = imagemagick-full depends = libumem-git depends = brunsli optdepends = imagemagick-full-doc: manual and API docs - provides = imagemagick=7.0.10.10 - provides = libmagick=7.0.10.10 - provides = libmagick-full=7.0.10.10 + provides = imagemagick=7.0.10.11 + provides = libmagick=7.0.10.11 + provides = libmagick-full=7.0.10.11 conflicts = imagemagick conflicts = libmagick replaces = libmagick-full @@ -128,6 +130,6 @@ pkgname = imagemagick-full pkgname = imagemagick-full-doc pkgdesc = An image viewing/manipulation program (Q32 HDRI with all features) (manual and API docs) arch = any - provides = imagemagick-doc=7.0.10.10 + provides = imagemagick-doc=7.0.10.11 conflicts = imagemagick-doc @@ -14,13 +14,13 @@ # - deJaVu and GhostScript font directories are the default ones # - Windows font directory is set according to a Wiki example -_commit='0c8d393a2f3f7605dab38d382c21052b87ed3576' +_commit='5f07d65ddcb06b3a8a63d734a822ef5c1d93b30b' _qdepth='32' pkgbase=imagemagick-full pkgname=('imagemagick-full' 'imagemagick-full-doc') _srcname=ImageMagick -pkgver=7.0.10.10 +pkgver=7.0.10.11 pkgrel=1 arch=('x86_64') pkgdesc="An image viewing/manipulation program (Q${_qdepth} HDRI with all features)" @@ -40,9 +40,11 @@ makedepends=( 'brunsli' ) source=("git+https://github.com/ImageMagick/ImageMagick.git#commit=${_commit}" - 'arch-fonts.diff') + 'arch-fonts.diff' + 'imagemagick-inkscape-1.0.patch') sha256sums=('SKIP' - 'a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73') + 'a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73' + 'dd856b0d7b5b98535d2bc61dfa995f4162677486c1eac14b384668a28a60af30') prepare() { cd "$_srcname" @@ -52,6 +54,9 @@ prepare() { # fix up typemaps to match Arch Linux packages, where possible patch -Np1 -i "${srcdir}/arch-fonts.diff" + # use correct parameter for inkscape 1.0 + patch -Np1 -i "${srcdir}/imagemagick-inkscape-1.0.patch" + # fix for 'sh: gitversion.sh: command not found' during autoreconf sed -i 's|(gitversion|(./gitversion|' configure.ac diff --git a/imagemagick-inkscape-1.0.patch b/imagemagick-inkscape-1.0.patch new file mode 100644 index 000000000000..02bbc9e77830 --- /dev/null +++ b/imagemagick-inkscape-1.0.patch @@ -0,0 +1,13 @@ +diff --git a/config/delegates.xml.in b/config/delegates.xml.in +index 442fa1aca..19baaee91 100644 +--- a/config/delegates.xml.in ++++ b/config/delegates.xml.in +@@ -111,7 +111,7 @@ + <delegate decode="sid" command=""@MrSIDDecodeDelegate@" -if sid -i "%i" -of tif -o "%o" > "%u""/> + <delegate decode="svg" command=""@RSVGDecodeDelegate@" -o "%o" "%i""/> + <!-- Change export-file to export-png for inkscape < 1.0 --> +- <delegate decode="svg:decode" stealth="True" command=""@SVGDecodeDelegate@" "%s" --export-file="%s" --export-dpi="%s" --export-background="%s" --export-background-opacity="%s" > "%s" 2>&1"/> ++ <delegate decode="svg:decode" stealth="True" command=""@SVGDecodeDelegate@" "%s" --export-filename="%s" --export-dpi="%s" --export-background="%s" --export-background-opacity="%s" > "%s" 2>&1"/> + <delegate decode="tiff" encode="launch" mode="encode" command=""@LaunchDelegate@" "%i""/> + <delegate decode="wdp" command="@MVDelegate@ "%i" "%i.jxr"; "@JXRDecodeDelegate@" -i "%i.jxr" -o "%o.bmp"; @MVDelegate@ "%i.jxr" "%i"; @MVDelegate@ "%o.bmp" "%o""/> + <delegate decode="webp" command=""@WebPDecodeDelegate@" -pam "%i" -o "%o""/> |