summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2018-10-24 23:59:39 +0000
committerDaniel Bermond2018-10-24 23:59:39 +0000
commit7f0a5dae51addb6362a7edefd811845903c44d6a (patch)
tree87778e7d03d854e2258729ed5fcdcf2707ad88a8
parent9ba6ea074fe8f6429e532f372a4df8be1d81785b (diff)
downloadaur-7f0a5dae51addb6362a7edefd811845903c44d6a.tar.gz
Updated to version 7.0.8.14
-rw-r--r--.SRCINFO17
-rw-r--r--PKGBUILD14
2 files changed, 9 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 758c82468eed..d49a15a018d3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = imagemagick-full
pkgdesc = An image viewing/manipulation program (Q32 HDRI with all libs and features)
- pkgver = 7.0.8.12
+ pkgver = 7.0.8.14
pkgrel = 1
url = http://www.imagemagick.org/
arch = i686
@@ -52,7 +52,7 @@ pkgbase = imagemagick-full
depends = autotrace-nomagick
depends = flif
depends = libfpx
- source = imagemagick-full-git::git+https://github.com/ImageMagick/ImageMagick.git#commit=cb5cf1959c5229389ac57aae11f87f7d7e55c74c
+ source = imagemagick-full-git::git+https://github.com/ImageMagick/ImageMagick.git#commit=ba0aedf286650098de0d51a493c679adeb39a4ac
source = arch-fonts.diff
sha256sums = SKIP
sha256sums = a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73
@@ -64,10 +64,6 @@ pkgname = libmagick-full
provides = libMagickWand-7.Q32HDRI.so
provides = libMagick++-7.Q32HDRI.so
conflicts = libmagick
- conflicts = libmagick-fftw
- conflicts = libmagick-no-hdri
- conflicts = libmagick-git
- conflicts = libmagick-full-git
options = !emptydirs
options = libtool
backup = etc//coder.xml
@@ -84,17 +80,12 @@ pkgname = libmagick-full
backup = etc//type-ghostscript.xml
pkgname = imagemagick-full
- depends = libmagick-full=7.0.8.12-1
+ depends = libmagick-full=7.0.8.14-1
depends = perl
optdepends = imagemagick-full-doc: manual and API docs
optdepends = ttf-mac-fonts: for Apple fonts support
provides = imagemagick
- provides = imagemagick-fftw
conflicts = imagemagick
- conflicts = imagemagick-fftw
- conflicts = imagemagick-no-hdri
- conflicts = imagemagick-git
- conflicts = imagemagick-full-git
options = !emptydirs
pkgname = imagemagick-full-doc
@@ -103,6 +94,4 @@ pkgname = imagemagick-full-doc
depends =
provides = imagemagick-doc
conflicts = imagemagick-doc
- conflicts = imagemagick-git-doc
- conflicts = imagemagick-full-doc-git
diff --git a/PKGBUILD b/PKGBUILD
index bcd3041e67b3..4319b3321b58 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,12 +22,12 @@ _urw_font_dir='/usr/share/fonts/gsfonts'
_windows_font_dir='/usr/share/fonts/WindowsFonts'
_1st_apple_font_dir='/usr/share/fonts/TTF'
_2nd_apple_font_dir='/usr/share/fonts/Type1'
-_commit='cb5cf1959c5229389ac57aae11f87f7d7e55c74c'
+_commit='ba0aedf286650098de0d51a493c679adeb39a4ac'
_qdepth='32'
pkgbase=imagemagick-full
pkgname=('libmagick-full' 'imagemagick-full' 'imagemagick-full-doc')
-pkgver=7.0.8.12
+pkgver=7.0.8.14
pkgrel=1
arch=('i686' 'x86_64')
pkgdesc="An image viewing/manipulation program (Q${_qdepth} HDRI with all libs and features)"
@@ -142,8 +142,7 @@ package_libmagick-full() {
"libMagickCore-${pkgver%%.*}.Q${_qdepth}HDRI.so"
"libMagickWand-${pkgver%%.*}.Q${_qdepth}HDRI.so"
"libMagick++-${pkgver%%.*}.Q${_qdepth}HDRI.so")
- conflicts=('libmagick' 'libmagick-fftw' 'libmagick-no-hdri'
- 'libmagick-git' 'libmagick-full-git')
+ conflicts=('libmagick')
cd "${pkgbase}-git"
make DESTDIR="$pkgdir" install
@@ -189,9 +188,8 @@ package_imagemagick-full() {
'ttf-mac-fonts: for Apple fonts support'
)
options=('!emptydirs')
- provides=('imagemagick' 'imagemagick-fftw')
- conflicts=('imagemagick' 'imagemagick-fftw' 'imagemagick-no-hdri'
- 'imagemagick-git' 'imagemagick-full-git')
+ provides=('imagemagick')
+ conflicts=('imagemagick')
cd "${pkgbase}-git"
@@ -208,7 +206,7 @@ package_imagemagick-full-doc() {
arch=('any')
depends=()
provides=('imagemagick-doc')
- conflicts=('imagemagick-doc' 'imagemagick-git-doc' 'imagemagick-full-doc-git')
+ conflicts=('imagemagick-doc')
cd "${pkgbase}-git"