updpkg 7.1.0.37; fix conflicts; add SO provides

3 files changed, 37 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1aa87f583495..a8dc788e9431 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = imagemagick-no-hdri
 	pkgdesc = An image viewing/manipulation program
-	pkgver = 7.1.0.36
-	pkgrel = 2
+	pkgver = 7.1.0.37
+	pkgrel = 1
 	url = https://www.imagemagick.org/
 	arch = i686
 	arch = x86_64
@@ -55,12 +55,14 @@ pkgbase = imagemagick-no-hdri
 	optdepends = djvulibre: DJVU support
 	optdepends = pango: Text rendering
 	optdepends = imagemagick-doc: manual and API docs
-	provides = imagemagick=7.1.0.36
-	provides = libmagick=7.1.0.36
+	provides = imagemagick=7.1.0.37
+	provides = libmagick=7.1.0.37
+	provides = libmagick7
+	provides = libMagick++-7.Q8.so
+	provides = libMagickCore-7.Q8.so
+	provides = libMagickWand-7.Q8.so
 	conflicts = imagemagick
 	conflicts = imagemagick6
-	conflicts = libmagick
-	conflicts = libmagick6
 	options = !docs
 	options = !emptydirs
 	options = libtool
@@ -74,11 +76,11 @@ pkgbase = imagemagick-no-hdri
 	backup = etc/ImageMagick-7/type.xml
 	backup = etc/ImageMagick-7/type-dejavu.xml
 	backup = etc/ImageMagick-7/type-ghostscript.xml
-	source = https://download.imagemagick.org/ImageMagick/download/releases/ImageMagick-7.1.0-36.tar.xz
-	source = https://download.imagemagick.org/ImageMagick/download/releases/ImageMagick-7.1.0-36.tar.xz.asc
+	source = https://download.imagemagick.org/ImageMagick/download/releases/ImageMagick-7.1.0-37.tar.xz
+	source = https://download.imagemagick.org/ImageMagick/download/releases/ImageMagick-7.1.0-37.tar.xz.asc
 	source = arch-fonts.diff
 	validpgpkeys = D8272EF51DA223E4D05B466989AB63D48277377A
-	sha256sums = 4911c5fc4106c3af029fa46420ab72aa5bcc9d228ead500fbdfc5a50f51793c8
+	sha256sums = 9a0cb5218ea687fad28eedf143dff9f0724eb62c73264231d690fe844ecce5ec
 	sha256sums = SKIP
 	sha256sums = a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73
 
diff --git a/.gitignore b/.gitignore
index 1871ca4b34b9..9a81e8f02ae6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@
 !.gitignore
 !.SRCINFO
 !PKGBUILD
-!arch-fonts.diff
+!*.diff
+!*.patch
diff --git a/PKGBUILD b/PKGBUILD
index ab33efc4e247..579ecdfa4947 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
 # Contributor: Cedric Brancourt <cedric.brancourt at gmail dot com>
 
 pkgname='imagemagick-no-hdri'
-pkgver=7.1.0.36
-pkgrel=2
+pkgver=7.1.0.37
+pkgrel=1
 pkgdesc='An image viewing/manipulation program'
 url='https://www.imagemagick.org/'
 arch=(i686 x86_64)
@@ -16,29 +16,36 @@ makedepends=(ghostscript openexr libwmf librsvg libxml2 openjpeg2 libraw opencl-
              chrpath ocl-icd glu ghostpcl ghostxps libheif jbigkit lcms2 libxext liblqr libraqm libpng djvulibre)
 checkdepends=(gsfonts ttf-dejavu)
 optdepends=('ghostscript: PS/PDF support'
-              'libheif: HEIF support'
-              'libraw: DNG support'
-              'librsvg: SVG support'
-              'libwebp: WEBP support'
-              'libxml2: Magick Scripting Language'
-              'libzip: OpenRaster support'
-              'ocl-icd: OpenCL support'
-              'openexr: OpenEXR support'
-              'openjpeg2: JPEG2000 support'
-              'djvulibre: DJVU support'
-              'pango: Text rendering'
-              'imagemagick-doc: manual and API docs')
+            'libheif: HEIF support'
+            'libraw: DNG support'
+            'librsvg: SVG support'
+            'libwebp: WEBP support'
+            'libxml2: Magick Scripting Language'
+            'libzip: OpenRaster support'
+            'ocl-icd: OpenCL support'
+            'openexr: OpenEXR support'
+            'openjpeg2: JPEG2000 support'
+            'djvulibre: DJVU support'
+            'pango: Text rendering'
+            'imagemagick-doc: manual and API docs')
 _relname=ImageMagick-${pkgver%%.*}
 _tarname=ImageMagick-${pkgver%.*}-${pkgver##*.}
 source=(https://download.imagemagick.org/ImageMagick/download/releases/$_tarname.tar.xz{,.asc}
         arch-fonts.diff)
-sha256sums=('4911c5fc4106c3af029fa46420ab72aa5bcc9d228ead500fbdfc5a50f51793c8'
+sha256sums=('9a0cb5218ea687fad28eedf143dff9f0724eb62c73264231d690fe844ecce5ec'
             'SKIP'
             'a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73')
 validpgpkeys=(D8272EF51DA223E4D05B466989AB63D48277377A)  # Lexie Parsimoniae
 options=(!docs !emptydirs libtool)
-provides=("imagemagick=${pkgver}" "libmagick=${pkgver}")
-conflicts=('imagemagick' 'imagemagick6' 'libmagick' 'libmagick6')
+provides=(
+  "imagemagick=${pkgver}"
+  "libmagick=${pkgver}"
+  "libmagick${pkgver%%.*}"
+  'libMagick++-7.Q8.so'
+  'libMagickCore-7.Q8.so'
+  'libMagickWand-7.Q8.so'
+)
+conflicts=('imagemagick' 'imagemagick6')
 backup=(etc/$_relname/{colors,delegates,log,mime,policy,quantization-table,thresholds,type,type-{dejavu,ghostscript}}.xml)
 
 shopt -s extglob