Cosmetic changings

Also updated depends, provides and conflicts.

2 files changed, 152 insertions, 145 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8beb7b57873d..5eaf1707b960 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,55 +1,58 @@
 # Generated by mksrcinfo v8
-# Wed Aug 16 21:41:15 UTC 2017
+# Wed Aug 16 21:55:04 UTC 2017
 pkgbase = imagemagick-full-git
-	pkgdesc = An image viewing/manipulation program (Q32 HDRI with all libs and features, Git version)
-	pkgver = 7.0.6.0.r11980.g717789c2a
-	pkgrel = 2
+	pkgdesc = An image viewing/manipulation program (Q32 HDRI with all libs and features, git version)
+	pkgver = 7.0.6.8.r12369.g19dbe11c5
+	pkgrel = 1
 	url = http://www.imagemagick.org/
 	arch = i686
 	arch = x86_64
 	license = custom
 	makedepends = git
 	makedepends = opencl-headers
-	depends = jemalloc
-	depends = bzip2
-	depends = libx11
-	depends = libxext
+	depends = libltdl
+	depends = lcms2
 	depends = libxt
-	depends = libsm
-	depends = zlib
-	depends = autotrace-nomagick
-	depends = fftw
-	depends = flif
-	depends = libfpx
+	depends = fontconfig
+	depends = libxext
+	depends = ghostscript
+	depends = openexr
+	depends = libwmf
+	depends = librsvg
+	depends = libxml2
+	depends = liblqr
+	depends = openjpeg2
+	depends = libraw
+	depends = opencl-icd-loader
+	depends = libwebp
+	depends = glu
+	depends = bzip2
 	depends = djvulibre
 	depends = ttf-dejavu
-	depends = fontconfig
+	depends = fftw
 	depends = freetype2
-	depends = libraqm
+	depends = fontconfig
 	depends = ghostscript
 	depends = gsfonts
 	depends = graphviz
 	depends = jbigkit
+	depends = jemalloc
 	depends = libjpeg-turbo
-	depends = lcms
 	depends = lcms2
-	depends = openjpeg2
-	depends = liblqr
-	depends = xz
-	depends = glu
-	depends = openexr
-	depends = pango
 	depends = libpng
-	depends = librsvg
 	depends = libtiff
-	depends = libwebp
-	depends = libwmf
-	depends = libxml2
-	depends = libmpeg2
-	depends = opencl-icd-loader
+	depends = pango
+	depends = perl
+	depends = zlib
+	depends = xz
+	depends = autotrace-nomagick
+	depends = flif
+	depends = libfpx
+	depends = libraqm
 	depends = libumem-git
 	optdepends = ttf-mac-fonts: for Apple fonts support
 	provides = imagemagick
+	provides = imagemagick7
 	provides = imagemagick-full
 	provides = imagemagick-git
 	provides = imagemagick-fftw
@@ -57,6 +60,7 @@ pkgbase = imagemagick-full-git
 	provides = libMagickWand-7.Q32HDRI.so
 	provides = libMagick++-7.Q32HDRI.so
 	conflicts = imagemagick
+	conflicts = imagemagick7
 	conflicts = imagemagick-full
 	conflicts = imagemagick-git
 	conflicts = imagemagick-fftw
diff --git a/PKGBUILD b/PKGBUILD
index 7cc135fb9928..b6efd786915e 100755..100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,5 @@
 # Maintainer: Daniel Bermond < yahoo-com: danielbermond >
 
-# ImageMagick compiled with all features and delegate libraries.
-# Using quantum depth 32 (Q32) and HDRI.
-
-# AUR dependencies
-# ----------------
-# pstoedit-nomagick autotrace-nomagick flif libfpx libraqm libumem-git
-
 # NOTE (1):
 # DPS (Display PostScript) feature is obsolete and thus not enabled.
 # For more information about DPS being obsolete please visit:
@@ -19,32 +12,44 @@
 # This Windows font directory example is for people that copy/link fonts from a Windows
 # installation. If you prefer, you can choose an AUR package that provides the Windows fonts
 # as described in the Wiki and change the directory accordingly.
-# Apple fonts through AUR package 'tff-mac-fonts' are optional due to licensing issues. It
-# places fonts in directories '/usr/share/fonts/TTF' and '/usr/share/fonts/Type1'.
 
-_dejavu_font_dir="/usr/share/fonts/TTF"
-_gs_font_dir="/usr/share/fonts/Type1"
-_windows_font_dir="/usr/share/fonts/WindowsFonts"
-_1st_apple_font_dir="/usr/share/fonts/TTF"
-_2nd_apple_font_dir="/usr/share/fonts/Type1"
+_dejavu_font_dir='/usr/share/fonts/TTF'
+_gs_font_dir='/usr/share/fonts/Type1'
+_windows_font_dir='/usr/share/fonts/WindowsFonts'
+_1st_apple_font_dir='/usr/share/fonts/TTF'
+_2nd_apple_font_dir='/usr/share/fonts/Type1'
+_qdepth='32'
+
 pkgname=imagemagick-full-git
-pkgver=7.0.6.0.r11980.g717789c2a
-pkgrel=2
-pkgdesc="An image viewing/manipulation program (Q32 HDRI with all libs and features, Git version)"
+pkgver=7.0.6.8.r12369.g19dbe11c5
+pkgrel=1
+pkgdesc="An image viewing/manipulation program (Q${_qdepth} HDRI with all libs and features, git version)"
 arch=('i686' 'x86_64')
-url="http://www.imagemagick.org/"
+url='http://www.imagemagick.org/'
 license=('custom')
-depends=('jemalloc' 'bzip2' 'libx11' 'libxext' 'libxt' 'libsm' 'zlib' 'autotrace-nomagick' 'fftw' 'flif'
-         'libfpx' 'djvulibre' 'ttf-dejavu' 'fontconfig' 'freetype2' 'libraqm' 'ghostscript' 'gsfonts'
-         'graphviz' 'jbigkit' 'libjpeg-turbo' 'lcms' 'lcms2' 'openjpeg2' 'liblqr' 'xz' 'glu' 'openexr' 'pango'
-         'libpng' 'librsvg' 'libtiff' 'libwebp' 'libwmf' 'libxml2' 'libmpeg2' 'opencl-icd-loader' 'libumem-git')
-optdepends=('ttf-mac-fonts: for Apple fonts support')
+depends=(
+    # official repositories:
+        'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript'
+        'openexr' 'libwmf' 'librsvg' 'libxml2' 'liblqr' 'openjpeg2' 'libraw'
+        'opencl-icd-loader' 'libwebp' 'glu'
+        'bzip2' 'djvulibre' 'ttf-dejavu' 'fftw' 'freetype2' 'fontconfig'
+        'ghostscript' 'gsfonts' 'graphviz' 'jbigkit' 'jemalloc' 'libjpeg-turbo'
+        'lcms2' 'libpng' 'libtiff' 'pango' 'perl' 'zlib' 'xz'
+    # AUR:
+        'autotrace-nomagick' 'flif' 'libfpx' 'libraqm' 'libumem-git'
+)
+optdepends=(
+    # AUR:
+        'ttf-mac-fonts: for Apple fonts support'
+)
 makedepends=('git' 'opencl-headers')
-provides=("imagemagick" "imagemagick-full" "imagemagick-git" "imagemagick-fftw"
-          "libMagickCore-${pkgver%%.*}.Q32HDRI.so"
-          "libMagickWand-${pkgver%%.*}.Q32HDRI.so"
-            "libMagick++-${pkgver%%.*}.Q32HDRI.so")
-conflicts=('imagemagick' 'imagemagick-full' 'imagemagick-git' 'imagemagick-fftw' 'imagemagick-no-hdri')
+provides=('imagemagick' 'imagemagick7' 'imagemagick-full'
+          'imagemagick-git' 'imagemagick-fftw'
+          "libMagickCore-${pkgver%%.*}.Q${_qdepth}HDRI.so"
+          "libMagickWand-${pkgver%%.*}.Q${_qdepth}HDRI.so"
+            "libMagick++-${pkgver%%.*}.Q${_qdepth}HDRI.so")
+conflicts=('imagemagick' 'imagemagick7' 'imagemagick-full' 'imagemagick-git'
+           'imagemagick-fftw' 'imagemagick-no-hdri')
 backup=("etc/ImageMagick-${pkgver%%.*}/coder.xml"
         "etc/ImageMagick-${pkgver%%.*}/colors.xml"
         "etc/ImageMagick-${pkgver%%.*}/delegates.xml"
@@ -63,98 +68,96 @@ source=("$pkgname"::'git+https://github.com/ImageMagick/ImageMagick.git')
 sha256sums=('SKIP')
 
 pkgver() {
-	cd "${srcdir}/${pkgname}"
-	
-	# Git, no tags available
-	
-	local _version="$(grep "PACKAGE_VERSION=" ./version.sh | sed 's/[^0-9\.]*//g')"
-	local _release="$(grep "PACKAGE_RELEASE=" ./version.sh | sed 's/[^0-9]*//g')"
-	local _revision="$(printf "r%s.g%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)")"
-	
-	printf "%s.%s.%s" "$_version" "$_release" "$_revision"
+    cd "$pkgname"
+    
+    local _version="$(grep 'PACKAGE_VERSION=' version.sh | sed 's/[^0-9\.]*//g')"
+    local _release="$(grep 'PACKAGE_RELEASE=' version.sh | sed 's/[^0-9]*//g')"
+    local _revision="$(printf 'r%s.g%s' "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)")"
+    
+    printf '%s.%s.%s' "$_version" "$_release" "$_revision"
 }
 
 build() {
-	cd "${srcdir}/${pkgname}"
-	
-	CPPFLAGS="-I/usr/include/FLIF" \
-	./configure \
-	        --prefix=/usr \
-	        --sysconfdir=/etc \
-	        --enable-openmp \
-	        --enable-opencl \
-	        --enable-largefile \
-	        --enable-static=no \
-	        --enable-shared=yes \
-	        --enable-fast-install=yes \
-	        --disable-delegate-build \
-	        --enable-cipher \
-	        --enable-hdri \
-	        --enable-hugepages \
-	        --enable-docs \
-	        --with-threads \
-	        --with-modules \
-	        --with-quantum-depth=32 \
-	        --with-magick-plus-plus \
-	        --with-perl \
-	        --with-perl-options="INSTALLDIRS=vendor" \
-	        --with-jemalloc \
-	        --with-umem \
-	        --with-bzlib \
-	        --with-x \
-	        --with-zlib \
-	        --with-autotrace \
-	        --without-dps \
-	        --with-fftw \
-	        --with-flif \
-	        --with-fpx \
-	        --with-djvu \
-	        --with-fontconfig \
-	        --with-freetype \
-	        --with-raqm \
-	        --with-gslib \
-	        --with-gvc \
-	        --with-jbig \
-	        --with-jpeg \
-	        --with-lcms \
-	        --with-openjp2 \
-	        --with-lqr \
-	        --with-lzma \
-	        --with-openexr \
-	        --with-pango \
-	        --with-png \
-	        --with-rsvg \
-	        --with-tiff \
-	        --with-webp \
-	        --with-wmf \
-	        --with-xml \
-	        --with-dejavu-font-dir="$_dejavu_font_dir" \
-	        --with-gs-font-dir="$_gs_font_dir" \
-	        --with-windows-font-dir="$_windows_font_dir" \
-	        --with-apple-font-dir="$_1st_apple_font_dir" \
-	        --with-fontpath="$_2nd_apple_font_dir"
-	        
-	        make
+    cd "$pkgname"
+    
+    CPPFLAGS='-I/usr/include/FLIF' \
+    ./configure \
+        --prefix='/usr' \
+        --sysconfdir='/etc' \
+        --enable-openmp \
+        --enable-opencl \
+        --enable-largefile \
+        --enable-static='no' \
+        --enable-shared='yes' \
+        --enable-fast-install='yes' \
+        --disable-delegate-build \
+        --enable-cipher \
+        --enable-hdri \
+        --enable-hugepages \
+        --enable-docs \
+        --with-threads \
+        --with-modules \
+        --with-quantum-depth="$_qdepth" \
+        --with-magick-plus-plus \
+        --with-perl \
+        --with-perl-options='INSTALLDIRS=vendor' \
+        --with-jemalloc \
+        --with-umem \
+        --with-bzlib \
+        --with-x \
+        --with-zlib \
+        --with-autotrace \
+        --without-dps \
+        --with-fftw \
+        --with-flif \
+        --with-fpx \
+        --with-djvu \
+        --with-fontconfig \
+        --with-freetype \
+        --with-raqm \
+        --with-gslib \
+        --with-gvc \
+        --with-jbig \
+        --with-jpeg \
+        --with-lcms \
+        --with-openjp2 \
+        --with-lqr \
+        --with-lzma \
+        --with-openexr \
+        --with-pango \
+        --with-png \
+        --with-rsvg \
+        --with-tiff \
+        --with-webp \
+        --with-wmf \
+        --with-xml \
+        --with-dejavu-font-dir="$_dejavu_font_dir" \
+        --with-gs-font-dir="$_gs_font_dir" \
+        --with-windows-font-dir="$_windows_font_dir" \
+        --with-apple-font-dir="$_1st_apple_font_dir" \
+        --with-fontpath="$_2nd_apple_font_dir"
+            
+    make
 }
 
 package() {
-	cd "${srcdir}/${pkgname}"
-	
-	make -j1 DESTDIR="$pkgdir/" install
-	
-	install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-	install -D -m644 NOTICE  "${pkgdir}/usr/share/licenses/${pkgname}/NOTICE"
-	
-	# Security fix
-	# https://www.imagemagick.org/discourse-server/viewtopic.php?f=4&t=29588
-	# https://www.imagetragick.com/
-	sed -i '65i\  \<policy domain="coder" rights="none" pattern="EPHEMERAL" />' "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
-	sed -i '66i\  \<policy domain="coder" rights="none" pattern="URL" />'       "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
-	sed -i '67i\  \<policy domain="coder" rights="none" pattern="HTTPS" />'     "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
-	sed -i '68i\  \<policy domain="coder" rights="none" pattern="MVG" />'       "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
-	sed -i '69i\  \<policy domain="coder" rights="none" pattern="MSL" />'       "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
-	sed -i '70i\  \<policy domain="coder" rights="none" pattern="TEXT" />'      "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
-	sed -i '71i\  \<policy domain="coder" rights="none" pattern="SHOW" />'      "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
-	sed -i '72i\  \<policy domain="coder" rights="none" pattern="WIN" />'       "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
-	sed -i '73i\  \<policy domain="coder" rights="none" pattern="PLT" />'       "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
+    cd "$pkgname"
+    
+    make DESTDIR="$pkgdir" install
+    
+    install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    install -D -m644 NOTICE  "${pkgdir}/usr/share/licenses/${pkgname}/NOTICE"
+    
+    # Security fix
+    # https://www.imagemagick.org/discourse-server/viewtopic.php?f=4&t=29588
+    # https://www.imagetragick.com/
+    sed -i '65i\  \<policy domain="coder" rights="none" pattern="EPHEMERAL" />' "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
+    sed -i '66i\  \<policy domain="coder" rights="none" pattern="URL" />'       "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
+    sed -i '67i\  \<policy domain="coder" rights="none" pattern="HTTPS" />'     "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
+    sed -i '68i\  \<policy domain="coder" rights="none" pattern="MVG" />'       "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
+    sed -i '69i\  \<policy domain="coder" rights="none" pattern="MSL" />'       "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
+    sed -i '70i\  \<policy domain="coder" rights="none" pattern="TEXT" />'      "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
+    sed -i '71i\  \<policy domain="coder" rights="none" pattern="SHOW" />'      "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
+    sed -i '72i\  \<policy domain="coder" rights="none" pattern="WIN" />'       "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
+    sed -i '73i\  \<policy domain="coder" rights="none" pattern="PLT" />'       "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
 }