Various fixes and improvements

3 files changed, 59 insertions, 105 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 70ab625f3024..4cbe24008a8c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = imagemagick-full-git
 	pkgdesc = An image viewing/manipulation program (Q32 HDRI with all features, git version)
-	pkgver = 7.0.8.68.r16153.g07fb0fdd5
+	pkgver = 7.0.10.62.r23.g923b9c180
 	pkgrel = 1
 	url = https://www.imagemagick.org/
 	arch = x86_64
@@ -14,6 +14,7 @@ pkgbase = imagemagick-full-git
 	makedepends = ghostxps
 	makedepends = zstd
 	makedepends = chrpath
+	makedepends = xorgproto
 	makedepends = lcms2
 	makedepends = libraqm
 	makedepends = liblqr
@@ -26,9 +27,8 @@ pkgbase = imagemagick-full-git
 	makedepends = bzip2
 	makedepends = zlib
 	makedepends = libltdl
-	makedepends = jemalloc
-	makedepends = gperftools
 	makedepends = djvulibre
+	makedepends = gperftools
 	makedepends = libraw
 	makedepends = graphviz
 	makedepends = openexr
@@ -50,16 +50,15 @@ pkgbase = imagemagick-full-git
 	makedepends = gsfonts
 	makedepends = ttf-dejavu
 	makedepends = perl
-	makedepends = gperftools
-	makedepends = pstoedit-nomagick
+	makedepends = libzip
 	makedepends = autotrace-nomagick
 	makedepends = flif
 	makedepends = libfpx
 	makedepends = libumem-git
-	source = git+https://github.com/ImageMagick/ImageMagick.git
+	source = git+https://github.com/ImageMagick/ImageMagick.git#branch=main
 	source = arch-fonts.diff
 	sha256sums = SKIP
-	sha256sums = a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73
+	sha256sums = 290c6a87845b419459fb552c0e7dcd81fbeafcecc370818d442fedf4d315b7fb
 
 pkgname = imagemagick-full-git
 	depends = lcms2
@@ -74,7 +73,6 @@ pkgname = imagemagick-full-git
 	depends = bzip2
 	depends = zlib
 	depends = libltdl
-	depends = jemalloc
 	depends = gperftools
 	depends = djvulibre
 	depends = libraw
@@ -98,13 +96,12 @@ pkgname = imagemagick-full-git
 	depends = gsfonts
 	depends = ttf-dejavu
 	depends = perl
-	depends = pstoedit-nomagick
 	depends = autotrace-nomagick
 	depends = flif
 	depends = libfpx
 	depends = libumem-git
 	optdepends = imagemagick-full-doc-git: manual and API docs
-	provides = imagemagick
+	provides = imagemagick=7.0.10.62.r23.g923b9c180
 	provides = imagemagick-git
 	provides = libmagick
 	provides = libmagick-git
@@ -115,20 +112,20 @@ pkgname = imagemagick-full-git
 	replaces = libmagick-full-git
 	options = !emptydirs
 	options = libtool
-	backup = etc//colors.xml
-	backup = etc//delegates.xml
-	backup = etc//log.xml
-	backup = etc//mime.xml
-	backup = etc//policy.xml
-	backup = etc//quantization-table.xml
-	backup = etc//thresholds.xml
-	backup = etc//type.xml
-	backup = etc//type-dejavu.xml
-	backup = etc//type-ghostscript.xml
+	backup = etc/ImageMagick-7/colors.xml
+	backup = etc/ImageMagick-7/delegates.xml
+	backup = etc/ImageMagick-7/log.xml
+	backup = etc/ImageMagick-7/mime.xml
+	backup = etc/ImageMagick-7/policy.xml
+	backup = etc/ImageMagick-7/quantization-table.xml
+	backup = etc/ImageMagick-7/thresholds.xml
+	backup = etc/ImageMagick-7/type.xml
+	backup = etc/ImageMagick-7/type-dejavu.xml
+	backup = etc/ImageMagick-7/type-ghostscript.xml
 
 pkgname = imagemagick-full-doc-git
 	pkgdesc = An image viewing/manipulation program (Q32 HDRI with all features, git version) (manual and API docs)
 	arch = any
-	provides = imagemagick-doc
+	provides = imagemagick-doc=7.0.10.62.r23.g923b9c180
 	conflicts = imagemagick-doc
 
diff --git a/PKGBUILD b/PKGBUILD
index 2528f53af885..d65c566891d6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,83 +1,60 @@
-# Maintainer: Daniel Bermond < gmail-com: danielbermond >
+# Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
-# NOTE (1):
-# DPS (Display PostScript) feature is obsolete and thus not enabled.
-# For more information about DPS being obsolete please visit:
-# http://www.x.org/releases/X11R7.7/doc/xorg-docs/graphics/dps.html
+# DPS (Display PostScript) is obsolete and thus not enabled. See:
+# https://www.x.org/releases/X11R7.7/doc/xorg-docs/graphics/dps.html
 
-# NOTE (2): linking to ghostscript libs (gslib) is disabled due to
-# security issues. ImageMagick will call 'gs' executable directly
-# instead. See: https://bugs.archlinux.org/task/62171
+# Linking to ghostscript libs (gslib) is disabled due to security
+# issues. ImageMagick will call 'gs' executable directly instead.
+# See: https://bugs.archlinux.org/task/62171
 
-# NOTE (3):
 # change font directories in build() to match yours:
 #   - deJaVu and GhostScript font directories are the default ones
 #   - Windows font directory is set according to a Wiki example
 
-_qdepth='32'
-
 pkgbase=imagemagick-full-git
 pkgname=('imagemagick-full-git' 'imagemagick-full-doc-git')
-_srcname=ImageMagick
-pkgver=7.0.8.68.r16153.g07fb0fdd5
+pkgver=7.0.10.62.r23.g923b9c180
 pkgrel=1
 arch=('x86_64')
+_qdepth='32'
 pkgdesc="An image viewing/manipulation program (Q${_qdepth} HDRI with all features, git version)"
 url='https://www.imagemagick.org/'
 license=('custom')
 makedepends=(
     # official repositories:
         'git' 'perl' 'jbigkit' 'opencl-headers' 'glu' 'ghostpcl' 'ghostxps'
-        'zstd' 'chrpath'
+        'zstd' 'chrpath' 'xorgproto'
         'lcms2' 'libraqm' 'liblqr' 'fftw' 'libxml2' 'fontconfig' 'freetype2' 'libxext'
-        'libx11' 'bzip2' 'zlib' 'libltdl' 'jemalloc' 'gperftools' 'djvulibre' 'libraw'
+        'libx11' 'bzip2' 'zlib' 'libltdl' 'djvulibre' 'gperftools' 'libraw'
         'graphviz' 'openexr' 'libheif' 'openjpeg2' 'libjpeg-turbo' 'xz' 'glib2' 'pango'
         'cairo' 'libpng' 'ghostscript' 'ming' 'librsvg' 'libtiff' 'libwebp' 'libwmf'
-        'ocl-icd' 'gsfonts' 'ttf-dejavu' 'perl' 'gperftools'
+        'ocl-icd' 'gsfonts' 'ttf-dejavu' 'perl' 'libzip'
     # AUR:
-        'pstoedit-nomagick' 'autotrace-nomagick' 'flif' 'libfpx' 'libumem-git'
+        'autotrace-nomagick' 'flif' 'libfpx' 'libumem-git'
 )
-source=('git+https://github.com/ImageMagick/ImageMagick.git'
+source=('git+https://github.com/ImageMagick/ImageMagick.git#branch=main'
         'arch-fonts.diff')
 sha256sums=('SKIP'
-            'a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73')
+            '290c6a87845b419459fb552c0e7dcd81fbeafcecc370818d442fedf4d315b7fb')
 
 prepare() {
-    cd "$_srcname"
-    
-    mkdir -p docpkg/usr/share
-    
     # fix up typemaps to match Arch Linux packages, where possible
-    patch -Np1 -i "${srcdir}/arch-fonts.diff"
-    
-    # fix for 'sh: gitversion.sh: command not found' during autoreconf
-    sed -i 's|(gitversion|(./gitversion|' configure.ac
-    
-    autoreconf -fis
+    patch -d ImageMagick -Np1 -i "${srcdir}/arch-fonts.diff"
 }
 
 pkgver() {
-    cd "$_srcname"
-    
-    local _version
-    local _release
-    local _revision
-    
-    _version="$(grep 'PACKAGE_VERSION=' version.sh | sed 's/[^0-9\.]*//g')"
-    _release="$(grep 'PACKAGE_RELEASE=' version.sh | sed 's/[^0-9]*//g')"
-    _revision="$(printf 'r%s.g%s' "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)")"
-    
-    printf '%s.%s.%s' "$_version" "$_release" "$_revision"
+    git -C ImageMagick describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/^v//'
 }
 
 build() {
-    cd "$_srcname"
-    
-    export CFLAGS="${CFLAGS} -I/usr/include/FLIF"
+    cd ImageMagick
+    export CFLAGS+=' -I/usr/include/FLIF'
     
     ./configure \
         --prefix='/usr' \
         --sysconfdir='/etc' \
+        --enable-shared \
+        --disable-static \
         --enable-openmp \
         --enable-opencl \
         --disable-delegate-build \
@@ -90,7 +67,7 @@ build() {
         --with-magick-plus-plus \
         --with-perl \
         --with-perl-options='INSTALLDIRS=vendor' \
-        --with-jemalloc \
+        --without-jemalloc \
         --with-tcmalloc \
         --with-umem \
         --with-bzlib \
@@ -111,6 +88,7 @@ build() {
         --with-heic \
         --with-jbig \
         --with-jpeg \
+        --without-jxl \
         --with-lcms \
         --with-openjp2 \
         --with-lqr \
@@ -135,66 +113,47 @@ build() {
         PCLDelegate='/usr/bin/gpcl6'
         
     sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-            
     make
 }
 
-check() (
-   cd "$_srcname"
-   ulimit -n 4096
-   sed -e '/validate-formats/d' -i Makefile
-   make check
-)
+check() {
+    make -C ImageMagick check
+}
 
 package_imagemagick-full-git() {
-    local _majorver="${pkgver%%.*}"
-    local _etcdir="ImageMagick-${_majorver}"
     depends=(
         # official repositories:
             'lcms2' 'libraqm' 'liblqr' 'fftw' 'libxml2' 'fontconfig' 'freetype2' 'libxext'
-            'libx11' 'bzip2' 'zlib' 'libltdl' 'jemalloc' 'gperftools' 'djvulibre' 'libraw'
+            'libx11' 'bzip2' 'zlib' 'libltdl' 'gperftools' 'djvulibre' 'libraw'
             'graphviz' 'openexr' 'libheif' 'openjpeg2' 'libjpeg-turbo' 'xz' 'glib2' 'pango'
             'cairo' 'libpng' 'ghostscript' 'ming' 'librsvg' 'libtiff' 'libwebp' 'libwmf'
             'ocl-icd' 'gsfonts' 'ttf-dejavu' 'perl'
         # AUR:
-            'pstoedit-nomagick' 'autotrace-nomagick' 'flif' 'libfpx' 'libumem-git'
-    )
-    optdepends=(
-        # AUR:
-            'imagemagick-full-doc-git: manual and API docs'
+            'autotrace-nomagick' 'flif' 'libfpx' 'libumem-git'
     )
-    backup=(etc/"$_etcdir"/{colors,delegates,log,mime,policy,quantization-table,thresholds,type,type-{dejavu,ghostscript}}.xml)
+    optdepends=('imagemagick-full-doc-git: manual and API docs')
+    backup=("etc/ImageMagick-${pkgver%%.*}"/{colors,delegates,log,mime,policy,quantization-table,thresholds,type{,-dejavu,-ghostscript}}.xml)
     options=('!emptydirs' 'libtool')
-    provides=('imagemagick' 'imagemagick-git' 'libmagick' 'libmagick-git' 'libmagick-full' 'libmagick-full-git')
+    provides=("imagemagick=${pkgver}" 'imagemagick-git' 'libmagick' 'libmagick-git' 'libmagick-full' 'libmagick-full-git')
     conflicts=('imagemagick' 'libmagick')
     replaces=('libmagick-full-git')
     
-    cd "$_srcname"
-    make DESTDIR="$pkgdir" install
-    
+    make -C ImageMagick DESTDIR="$pkgdir" install
     find "${pkgdir}/usr/lib/perl5" -name '*.so' -exec chrpath -d {} +
     rm "$pkgdir"/usr/lib/*.la
-    
-    # split docs
-    mv "${pkgdir}/usr/share/doc" docpkg/usr/share/
+    mv "${pkgdir}/usr/share/doc" .
+    install -D -m644 ImageMagick/{LICENSE,NOTICE} -t "${pkgdir}/usr/share/licenses/${pkgname}"
     
     # harden security policy: https://bugs.archlinux.org/task/62785
-    sed -e '/<\/policymap>/i \ \ <policy domain="delegate" rights="none" pattern="gs" \/>' -i "${pkgdir}/etc/ImageMagick-7/policy.xml"
-    
-    install -D -m644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
-    install -D -m644 NOTICE  -t "${pkgdir}/usr/share/licenses/${pkgname}"
+    sed -e '/<\/policymap>/i \ \ <policy domain="delegate" rights="none" pattern="gs" \/>' -i "${pkgdir}/etc/ImageMagick-${pkgver%%.*}/policy.xml"
 }
 
 package_imagemagick-full-doc-git() {
     pkgdesc+=' (manual and API docs)'
     arch=('any')
-    provides=('imagemagick-doc')
+    provides=("imagemagick-doc=${pkgver}")
     conflicts=('imagemagick-doc')
     
-    cd "$_srcname"
-    
-    cp -a docpkg/* "$pkgdir"
-    
-    install -D -m644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
-    install -D -m644 NOTICE  -t "${pkgdir}/usr/share/licenses/${pkgname}"
+    install -D -m644 ImageMagick/{LICENSE,NOTICE} -t "${pkgdir}/usr/share/licenses/${pkgname}"
+    mv doc "${pkgdir}/usr/share"
 }
diff --git a/arch-fonts.diff b/arch-fonts.diff
index 63a547c4d4d6..108ad82dca03 100644
--- a/arch-fonts.diff
+++ b/arch-fonts.diff
@@ -1,6 +1,5 @@
-diff -u -r ImageMagick-6.9.9-25/config/type-dejavu.xml.in ImageMagick-6.9.9-25-archfonts/config/type-dejavu.xml.in
---- ImageMagick-6.9.9-25/config/type-dejavu.xml.in	2017-11-30 19:24:05.000000000 +0100
-+++ ImageMagick-6.9.9-25-archfonts/config/type-dejavu.xml.in	2017-12-02 18:44:53.410304554 +0100
+--- a/config/type-dejavu.xml.in
++++ b/config/type-dejavu.xml.in
 @@ -13,27 +13,6 @@
    ImageMagick DejaVU font configuration.
  -->
@@ -29,9 +28,8 @@ diff -u -r ImageMagick-6.9.9-25/config/type-dejavu.xml.in ImageMagick-6.9.9-25-a
    <type name="DejaVu-Sans-Bold" fullname="DejaVu Sans Bold" family="DejaVu Sans" style="Normal" stretch="Normal" weight="700" glyphs="@dejavu_font_dir@DejaVuSans-Bold.ttf"/>
    <type name="DejaVu-Sans-Bold-Oblique" fullname="DejaVu Sans Bold Oblique" family="DejaVu Sans" style="Oblique" stretch="Normal" weight="700" glyphs="@dejavu_font_dir@DejaVuSans-BoldOblique.ttf"/>
    <type name="DejaVu-Sans-Book" fullname="DejaVu Sans Book" family="DejaVu Sans" style="Normal" stretch="Normal" weight="400" glyphs="@dejavu_font_dir@DejaVuSans.ttf"/>
-diff -u -r ImageMagick-6.9.9-25/config/type-ghostscript.xml.in ImageMagick-6.9.9-25-archfonts/config/type-ghostscript.xml.in
---- ImageMagick-6.9.9-25/config/type-ghostscript.xml.in	2017-11-30 19:24:05.000000000 +0100
-+++ ImageMagick-6.9.9-25-archfonts/config/type-ghostscript.xml.in	2017-12-02 19:08:05.669243822 +0100
+--- a/config/type-ghostscript.xml.in
++++ b/config/type-ghostscript.xml.in
 @@ -13,38 +13,38 @@
    ImageMagick Ghostscript font configuration.
  -->