summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorlilac2020-09-28 12:37:19 +0800
committerlilac2020-09-28 12:38:44 +0800
commit2d3e764fc58d4e31380796e642a19fd2b947d4c2 (patch)
tree82c66e2e02ce2e1d2efef5c3996f3827076e43a5
parenta5b8339fe9da50ae4d856d3289173de1baef4b41 (diff)
downloadaur-2d3e764fc58d4e31380796e642a19fd2b947d4c2.tar.gz
[lilac] updated to 7.0.10.31-1
Diffstat
-rw-r--r--.SRCINFO10
-rw-r--r--IM7-GS-policy.patch10
-rw-r--r--PKGBUILD4
-rw-r--r--imagemagick-inkscape-1.0.patch13
-rw-r--r--imagemagick-underlink.patch13
-rw-r--r--perlmagick.rpath.patch11
6 files changed, 7 insertions, 54 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 21da98fe536b..da9020716f24 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = imagemagick-fftw
pkgdesc = An image viewing/manipulation program
- pkgver = 7.0.10.30
+ pkgver = 7.0.10.31
pkgrel = 1
url = https://www.imagemagick.org/
arch = x86_64
@@ -30,11 +30,11 @@ pkgbase = imagemagick-fftw
makedepends = libpng
makedepends = djvulibre
makedepends = fftw
- source = https://imagemagick.org/download/ImageMagick-7.0.10-30.tar.xz
- source = https://imagemagick.org/download/ImageMagick-7.0.10-30.tar.xz.asc
+ source = https://imagemagick.org/download/ImageMagick-7.0.10-31.tar.xz
+ source = https://imagemagick.org/download/ImageMagick-7.0.10-31.tar.xz.asc
source = arch-fonts.diff
validpgpkeys = D8272EF51DA223E4D05B466989AB63D48277377A
- sha256sums = 1b550e051f4472a64943718b7366855cdbda1b2b256ba0ee34f6d3589775f81f
+ sha256sums = c0d2b79dc959bb5f20c90596b41ac9baad34f659d9192f2abb3c06a0778f47d1
sha256sums = SKIP
sha256sums = a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73
@@ -62,7 +62,7 @@ pkgname = imagemagick-fftw
optdepends = imagemagick-doc: manual and API docs
provides = libmagick
provides = libmagick-fftw
- provides = imagemagick=7.0.10.30
+ provides = imagemagick=7.0.10.31
conflicts = imagemagick6
conflicts = imagemagick
replaces = libmagick-fftw
diff --git a/IM7-GS-policy.patch b/IM7-GS-policy.patch
deleted file mode 100644
index fb371bdcbe29..000000000000
--- a/IM7-GS-policy.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ImageMagick-7.0.8-13/config/policy.xml.orig 2018-10-22 15:13:51.713995553 +0000
-+++ ImageMagick-7.0.8-13/config/policy.xml 2018-10-22 15:14:22.650737457 +0000
-@@ -68,6 +68,7 @@
- <!-- <policy domain="resource" name="throttle" value="0"/> -->
- <!-- <policy domain="resource" name="time" value="3600"/> -->
- <!-- <policy domain="coder" rights="none" pattern="MVG" /> -->
-+ <policy domain="coder" rights="none" pattern="{PS,PS2,PS3,EPS,PDF,XPS}" />
- <!-- <policy domain="module" rights="none" pattern="{PS,PDF,XPS}" /> -->
- <!-- <policy domain="delegate" rights="none" pattern="HTTPS" /> -->
- <!-- <policy domain="path" rights="none" pattern="@*" /> -->
diff --git a/PKGBUILD b/PKGBUILD
index e1f5e0e8240e..62b28f4dabf9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgbase=imagemagick-fftw
pkgname=(imagemagick-fftw)
-pkgver=7.0.10.30
+pkgver=7.0.10.31
pkgrel=1
pkgdesc="An image viewing/manipulation program"
url="https://www.imagemagick.org/"
@@ -16,7 +16,7 @@ _relname=ImageMagick-${pkgver%%.*}
_tarname=ImageMagick-${pkgver%.*}-${pkgver##*.}
source=(https://imagemagick.org/download/$_tarname.tar.xz{,.asc}
arch-fonts.diff)
-sha256sums=('1b550e051f4472a64943718b7366855cdbda1b2b256ba0ee34f6d3589775f81f'
+sha256sums=('c0d2b79dc959bb5f20c90596b41ac9baad34f659d9192f2abb3c06a0778f47d1'
'SKIP'
'a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73')
validpgpkeys=(D8272EF51DA223E4D05B466989AB63D48277377A) # Lexie Parsimoniae
diff --git a/imagemagick-inkscape-1.0.patch b/imagemagick-inkscape-1.0.patch
deleted file mode 100644
index 02bbc9e77830..000000000000
--- a/imagemagick-inkscape-1.0.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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="&quot;@MrSIDDecodeDelegate@&quot; -if sid -i &quot;%i&quot; -of tif -o &quot;%o&quot; &gt; &quot;%u&quot;"/>
- <delegate decode="svg" command="&quot;@RSVGDecodeDelegate@&quot; -o &quot;%o&quot; &quot;%i&quot;"/>
- <!-- Change export-file to export-png for inkscape < 1.0 -->
-- <delegate decode="svg:decode" stealth="True" command="&quot;@SVGDecodeDelegate@&quot; &quot;%s&quot; --export-file=&quot;%s&quot; --export-dpi=&quot;%s&quot; --export-background=&quot;%s&quot; --export-background-opacity=&quot;%s&quot; &gt; &quot;%s&quot; 2&gt;&amp;1"/>
-+ <delegate decode="svg:decode" stealth="True" command="&quot;@SVGDecodeDelegate@&quot; &quot;%s&quot; --export-filename=&quot;%s&quot; --export-dpi=&quot;%s&quot; --export-background=&quot;%s&quot; --export-background-opacity=&quot;%s&quot; &gt; &quot;%s&quot; 2&gt;&amp;1"/>
- <delegate decode="tiff" encode="launch" mode="encode" command="&quot;@LaunchDelegate@&quot; &quot;%i&quot;"/>
- <delegate decode="wdp" command="@MVDelegate@ &quot;%i&quot; &quot;%i.jxr&quot;; &quot;@JXRDecodeDelegate@&quot; -i &quot;%i.jxr&quot; -o &quot;%o.bmp&quot;; @MVDelegate@ &quot;%i.jxr&quot; &quot;%i&quot;; @MVDelegate@ &quot;%o.bmp&quot; &quot;%o&quot;"/>
- <delegate decode="webp" command="&quot;@WebPDecodeDelegate@&quot; -pam &quot;%i&quot; -o &quot;%o&quot;"/>
diff --git a/imagemagick-underlink.patch b/imagemagick-underlink.patch
deleted file mode 100644
index be732ac34d36..000000000000
--- a/imagemagick-underlink.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/coders/Makefile.am b/coders/Makefile.am
-index e39ed031f..689728353 100644
---- a/coders/Makefile.am
-+++ b/coders/Makefile.am
-@@ -469,7 +469,7 @@ coders_djvu_la_LIBADD = $(MAGICKCORE_LIBS) $(DJVU_LIBS) $(JPEG_LIBS) $(LZMA
- coders_dng_la_SOURCES = coders/dng.c
- coders_dng_la_CPPFLAGS = $(MAGICK_CODER_CPPFLAGS)
- coders_dng_la_LDFLAGS = $(MODULECOMMONFLAGS)
--coders_dng_la_LIBADD = $(MAGICKCORE_LIBS) $(RAW_LIBS)
-+coders_dng_la_LIBADD = $(MAGICKCORE_LIBS) $(RAW_R_LIBS)
-
- # DPS coder module
- coders_dps_la_SOURCES = coders/dps.c
diff --git a/perlmagick.rpath.patch b/perlmagick.rpath.patch
deleted file mode 100644
index a5b1a82e23d2..000000000000
--- a/perlmagick.rpath.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig 2013-02-21 03:26:56.785156600 -0500
-+++ Makefile.in 2013-02-21 03:39:03.102411457 -0500
-@@ -10469,6 +10469,8 @@
-
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEMAKER)
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS)
-+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' Makefile
-+@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' quantum/Makefile
-
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(PERLMAKEFILE)
- @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \