diff options
| author | Daniel Bermond | 2017-12-22 19:07:23 -0200 |
|---|---|---|
| committer | Daniel Bermond | 2017-12-22 19:07:23 -0200 |
| commit | bb500999e0c726bd314a237eb8b20650dca36d7c (patch) | |
| tree | d983b2d292893d0e0f3bafb4deb4b108f26d768d | |
| parent | 739a579c3fa8bf9ed47b243b9d35e0f20766c20a (diff) | |
| download | aur-bb500999e0c726bd314a237eb8b20650dca36d7c.tar.gz | |
Rewrite to match official repository changes
Official repository now provides ImageMagick version 7 and it has
splitted the package into libmagick and imagemagick binaries.
| -rw-r--r-- | .SRCINFO | 124 | ||||
| -rw-r--r-- | PKGBUILD | 175 | ||||
| -rw-r--r-- | arch-fonts.diff | 107 |
3 files changed, 285 insertions, 121 deletions
@@ -1,8 +1,9 @@ # Generated by mksrcinfo v8 -# Sun Sep 24 03:09:01 UTC 2017 +# Fri Dec 22 21:06:52 UTC 2017 pkgbase = imagemagick-full-git + pkgdesc = An image viewing/manipulation program (Q32 HDRI with all libs and features, git version) pkgver = 7.0.7.5.r12632.gabac32acf - pkgrel = 1 + pkgrel = 2 url = http://www.imagemagick.org/ arch = i686 arch = x86_64 @@ -10,108 +11,105 @@ pkgbase = imagemagick-full-git makedepends = git makedepends = libltdl makedepends = lcms2 - makedepends = libxt makedepends = fontconfig makedepends = libxext + makedepends = liblqr + makedepends = libraqm + makedepends = libpng + makedepends = gsfonts + makedepends = ttf-dejavu + makedepends = opencl-headers + makedepends = chrpath + makedepends = ghostpcl + makedepends = ghostxps makedepends = ghostscript - makedepends = openexr - makedepends = libwmf + makedepends = libraw makedepends = librsvg + makedepends = libwebp + makedepends = libwmf makedepends = libxml2 - makedepends = liblqr + makedepends = ocl-icd + makedepends = openexr makedepends = openjpeg2 - makedepends = libraw - makedepends = opencl-headers - makedepends = opencl-icd-loader - makedepends = libwebp + makedepends = pango makedepends = glu + makedepends = libxt makedepends = bzip2 makedepends = djvulibre - makedepends = ttf-dejavu makedepends = fftw makedepends = freetype2 - makedepends = fontconfig - makedepends = ghostscript - makedepends = gsfonts makedepends = graphviz makedepends = jbigkit makedepends = jemalloc makedepends = libjpeg-turbo - makedepends = lcms2 - makedepends = libpng makedepends = libtiff makedepends = pango - makedepends = perl - makedepends = zlib makedepends = xz + makedepends = zlib makedepends = autotrace-nomagick makedepends = flif makedepends = libfpx makedepends = libraqm makedepends = libumem-git - source = imagemagick-full-git::git+https://github.com/ImageMagick/ImageMagick.git - sha256sums = SKIP - -pkgname = imagemagick-full-git - pkgdesc = An image viewing/manipulation program (Q32 HDRI with all libs and features, git version) depends = libltdl depends = lcms2 - depends = libxt depends = fontconfig depends = libxext + depends = liblqr + depends = libraqm + depends = libpng + depends = gsfonts + depends = ttf-dejavu + depends = ghostpcl + depends = ghostxps depends = ghostscript - depends = openexr - depends = libwmf + depends = libraw depends = librsvg + depends = libwebp + depends = libwmf depends = libxml2 - depends = liblqr + depends = ocl-icd + depends = openexr depends = openjpeg2 - depends = libraw - depends = opencl-icd-loader - depends = libwebp + depends = pango depends = glu + depends = libxt depends = bzip2 depends = djvulibre - depends = ttf-dejavu depends = fftw depends = freetype2 - depends = fontconfig - depends = ghostscript - depends = gsfonts depends = graphviz depends = jbigkit depends = jemalloc depends = libjpeg-turbo - depends = lcms2 - depends = libpng depends = libtiff depends = pango - depends = perl - depends = zlib depends = xz + depends = zlib 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 + source = imagemagick-full-git::git+https://github.com/ImageMagick/ImageMagick.git + source = arch-fonts.diff + sha256sums = SKIP + sha256sums = a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73 + +pkgname = libmagick-full-git + pkgdesc = An image viewing/manipulation program (Q32 HDRI with all libs and features, git version) (library) + provides = libmagick + provides = libmagick-git provides = libMagickCore-7.Q32HDRI.so provides = libMagickWand-7.Q32HDRI.so provides = libMagick++-7.Q32HDRI.so - conflicts = imagemagick - conflicts = imagemagick7 - conflicts = imagemagick-fftw - conflicts = imagemagick-no-hdri - conflicts = imagemagick-full - conflicts = imagemagick-git - options = !docs - options = libtool + conflicts = libmagick + conflicts = libmagick-fftw + conflicts = libmagick-no-hdri + conflicts = libmagick-git + conflicts = libmagick-full options = !emptydirs + options = libtool backup = etc/ImageMagick-7/coder.xml backup = etc/ImageMagick-7/colors.xml backup = etc/ImageMagick-7/delegates.xml @@ -124,15 +122,27 @@ pkgname = imagemagick-full-git backup = etc/ImageMagick-7/type.xml backup = etc/ImageMagick-7/type-dejavu.xml backup = etc/ImageMagick-7/type-ghostscript.xml - backup = etc/ImageMagick-7/type-windows.xml + +pkgname = imagemagick-full-git + depends = libmagick-full-git=7.0.7.5.r12632.gabac32acf-2 + depends = perl>= + depends = perl< + optdepends = imagemagick-full-doc-git: 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 + options = !emptydirs pkgname = imagemagick-full-doc-git - pkgdesc = The ImageMagick documentation (utilities manuals and libraries API, git version) + pkgdesc = An image viewing/manipulation program (Q32 HDRI with all libs and features, git version) (utilities manuals and libraries API) arch = any provides = imagemagick-doc - provides = imagemagick-full-doc - provides = imagemagick-git-doc conflicts = imagemagick-doc - conflicts = imagemagick-full-doc conflicts = imagemagick-git-doc + conflicts = imagemagick-full-doc @@ -15,32 +15,56 @@ _dejavu_font_dir='/usr/share/fonts/TTF' _gs_font_dir='/usr/share/fonts/Type1' +_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' _qdepth='32' pkgbase=imagemagick-full-git -pkgname=('imagemagick-full-git' 'imagemagick-full-doc-git') +pkgname=('libmagick-full-git' 'imagemagick-full-git' 'imagemagick-full-doc-git') pkgver=7.0.7.5.r12632.gabac32acf -pkgrel=1 +_majorver="${pkgver%%.*}" +_etcdir="ImageMagick-${_majorver}" +pkgrel=2 arch=('i686' 'x86_64') +pkgdesc="An image viewing/manipulation program (Q${_qdepth} HDRI with all libs and features, git version)" url='http://www.imagemagick.org/' license=('custom') +depends=( + # official repositories: + 'libltdl' 'lcms2' 'fontconfig' 'libxext' 'liblqr' 'libraqm' 'libpng' + 'gsfonts' 'ttf-dejavu' 'ghostpcl' 'ghostxps' + 'ghostscript' 'libraw' 'librsvg' 'libwebp' 'libwmf' 'libxml2' + 'ocl-icd' 'openexr' 'openjpeg2' 'pango' + 'glu' 'libxt' 'bzip2' 'djvulibre' 'fftw' 'freetype2' 'graphviz' + 'jbigkit' 'jemalloc' 'libjpeg-turbo' 'libtiff' 'pango' 'xz' 'zlib' + # AUR: + 'autotrace-nomagick' 'flif' 'libfpx' 'libraqm' 'libumem-git' +) makedepends=( # official repositories: 'git' - 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' - 'openexr' 'libwmf' 'librsvg' 'libxml2' 'liblqr' 'openjpeg2' 'libraw' - 'opencl-headers' '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' + 'libltdl' 'lcms2' 'fontconfig' 'libxext' 'liblqr' 'libraqm' 'libpng' + 'gsfonts' 'ttf-dejavu' 'opencl-headers' 'chrpath' 'ghostpcl' 'ghostxps' + 'ghostscript' 'libraw' 'librsvg' 'libwebp' 'libwmf' 'libxml2' + 'ocl-icd' 'openexr' 'openjpeg2' 'pango' + 'glu' 'libxt' 'bzip2' 'djvulibre' 'fftw' 'freetype2' 'graphviz' + 'jbigkit' 'jemalloc' 'libjpeg-turbo' 'libtiff' 'pango' 'xz' 'zlib' # AUR: 'autotrace-nomagick' 'flif' 'libfpx' 'libraqm' 'libumem-git' ) -source=("$pkgname"::'git+https://github.com/ImageMagick/ImageMagick.git') -sha256sums=('SKIP') +source=("$pkgbase"::'git+https://github.com/ImageMagick/ImageMagick.git' + 'arch-fonts.diff') +sha256sums=('SKIP' + 'a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73') + +prepare() { + cd "$pkgbase" + + # fix up typemaps to match Arch Linux packages, where possible + patch -Np1 -i "${srcdir}/arch-fonts.diff" +} pkgver() { cd "$pkgbase" @@ -55,7 +79,7 @@ pkgver() { build() { cd "$pkgbase" - CPPFLAGS='-I/usr/include/FLIF' \ + CFLAGS="${CFLAGS} -I/usr/include/FLIF" \ ./configure \ --prefix='/usr' \ --sysconfdir='/etc' \ @@ -72,7 +96,7 @@ build() { --enable-docs \ --with-threads \ --with-modules \ - --with-quantum-depth="$_qdepth" \ + --with-quantum-depth="${_qdepth}" \ --with-magick-plus-plus \ --with-perl \ --with-perl-options='INSTALLDIRS=vendor' \ @@ -101,6 +125,7 @@ build() { --with-openexr \ --with-pango \ --with-png \ + --with-raw \ --with-rsvg \ --with-tiff \ --with-webp \ @@ -108,82 +133,104 @@ build() { --with-xml \ --with-dejavu-font-dir="$_dejavu_font_dir" \ --with-gs-font-dir="$_gs_font_dir" \ + --with-urw-base35-font-dir="$_urw_font_dir" \ --with-windows-font-dir="$_windows_font_dir" \ --with-apple-font-dir="$_1st_apple_font_dir" \ - --with-fontpath="$_2nd_apple_font_dir" + --with-fontpath="$_2nd_apple_font_dir" \ + PSDelegate='/usr/bin/gs' \ + XPSDelegate='/usr/bin/gxps' \ + PCLDelegate='/usr/bin/gpcl6' \ make } -package_imagemagick-full-git() { - pkgdesc="An image viewing/manipulation program (Q${_qdepth} HDRI with all libs and features, git version)" - 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' - ) - provides=('imagemagick' 'imagemagick7' 'imagemagick-full' - 'imagemagick-git' 'imagemagick-fftw' +package_libmagick-full-git() { + pkgdesc+=" (library)" + backup=(etc/"$_etcdir"/{coder,colors,delegates,log,magic,mime,policy,quantization-table,thresholds,type,type-{dejavu,ghostscript}}.xml) + options=('!emptydirs' 'libtool') + provides=('libmagick' 'libmagick-git' "libMagickCore-${pkgver%%.*}.Q${_qdepth}HDRI.so" "libMagickWand-${pkgver%%.*}.Q${_qdepth}HDRI.so" "libMagick++-${pkgver%%.*}.Q${_qdepth}HDRI.so") - conflicts=('imagemagick' 'imagemagick7' 'imagemagick-fftw' 'imagemagick-no-hdri' - 'imagemagick-full' 'imagemagick-git') - backup=("etc/ImageMagick-${pkgver%%.*}/coder.xml" - "etc/ImageMagick-${pkgver%%.*}/colors.xml" - "etc/ImageMagick-${pkgver%%.*}/delegates.xml" - "etc/ImageMagick-${pkgver%%.*}/log.xml" - "etc/ImageMagick-${pkgver%%.*}/magic.xml" - "etc/ImageMagick-${pkgver%%.*}/mime.xml" - "etc/ImageMagick-${pkgver%%.*}/policy.xml" - "etc/ImageMagick-${pkgver%%.*}/quantization-table.xml" - "etc/ImageMagick-${pkgver%%.*}/thresholds.xml" - "etc/ImageMagick-${pkgver%%.*}/type.xml" - "etc/ImageMagick-${pkgver%%.*}/type-dejavu.xml" - "etc/ImageMagick-${pkgver%%.*}/type-ghostscript.xml" - "etc/ImageMagick-${pkgver%%.*}/type-windows.xml") - options=('!docs' 'libtool' '!emptydirs') + conflicts=('libmagick' 'libmagick-fftw' 'libmagick-no-hdri' + 'libmagick-git' 'libmagick-full') cd "$pkgbase" - make DESTDIR="$pkgdir" install + rm -f "$pkgdir"/usr/lib/*.la + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" install -D -m644 NOTICE "${pkgdir}/usr/share/licenses/${pkgname}/NOTICE" - # Security fix + rm -rf binpkg/* docpkg/* + + mkdir -p binpkg/usr/lib {binpkg,docpkg}/usr/share + + # split 'imagemagick' + cd binpkg + mv -f "${pkgdir}/usr/bin" usr/ + mv -f "${pkgdir}/usr/lib/perl5" usr/lib/ + mv -f "${pkgdir}/usr/share/man" usr/share/ + + # split docs + cd "${srcdir}/${pkgbase}/docpkg" + mv -f "${pkgdir}/usr/share/doc" usr/share/ + + # 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" + # https://imagetragick.com/ + sed -i '65i\ \<policy domain="coder" rights="none" pattern="EPHEMERAL" />' "${pkgdir}/etc/${_etcdir}/policy.xml" + sed -i '66i\ \<policy domain="coder" rights="none" pattern="URL" />' "${pkgdir}/etc/${_etcdir}/policy.xml" + sed -i '67i\ \<policy domain="coder" rights="none" pattern="HTTPS" />' "${pkgdir}/etc/${_etcdir}/policy.xml" + sed -i '68i\ \<policy domain="coder" rights="none" pattern="MVG" />' "${pkgdir}/etc/${_etcdir}/policy.xml" + sed -i '69i\ \<policy domain="coder" rights="none" pattern="MSL" />' "${pkgdir}/etc/${_etcdir}/policy.xml" + sed -i '70i\ \<policy domain="coder" rights="none" pattern="TEXT" />' "${pkgdir}/etc/${_etcdir}/policy.xml" + sed -i '71i\ \<policy domain="coder" rights="none" pattern="SHOW" />' "${pkgdir}/etc/${_etcdir}/policy.xml" + sed -i '72i\ \<policy domain="coder" rights="none" pattern="WIN" />' "${pkgdir}/etc/${_etcdir}/policy.xml" + sed -i '73i\ \<policy domain="coder" rights="none" pattern="PLT" />' "${pkgdir}/etc/${_etcdir}/policy.xml" +} + +package_imagemagick-full-git() { + depends=("libmagick-full-git=${pkgver}-${pkgrel}") + optdepends=( + # AUR: + 'imagemagick-full-doc-git: manual and API docs' + 'ttf-mac-fonts: for Apple fonts support' + ) + provides=('imagemagick' 'imagemagick-fftw') + conflicts=('imagemagick' 'imagemagick-fftw' 'imagemagick-no-hdri' + 'imagemagick-git' 'imagemagick-full') + options=('!emptydirs') + + cd "$pkgbase" + + mv -f binpkg/* "$pkgdir" + + find "$pkgdir/usr/lib/perl5" -name '*.so' -exec chrpath -d {} + + + # template start; name=perl-binary-module-dependency; version=1; + if [ $(find "${pkgdir}/usr/lib/perl5/" -name '*.so') ] + then + local _perlver_min="$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]);')" + local _perlver_max="$(perl -e '$v = $^V->{version}; print $v->[0].".".($v->[1]+1);')" + depends+=("perl>=${_perlver_min}" "perl<${_perlver_max}") + fi + # template end; + + install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" + install -D -m644 NOTICE "${pkgdir}/usr/share/licenses/${pkgname}/NOTICE" } package_imagemagick-full-doc-git() { - pkgdesc='The ImageMagick documentation (utilities manuals and libraries API, git version)' + pkgdesc+=" (utilities manuals and libraries API)" arch=('any') - provides=('imagemagick-doc' 'imagemagick-full-doc' 'imagemagick-git-doc') - conflicts=('imagemagick-doc' 'imagemagick-full-doc' 'imagemagick-git-doc') + provides=('imagemagick-doc') + conflicts=('imagemagick-doc' 'imagemagick-git-doc' 'imagemagick-full-doc') cd "$pkgbase" - make DESTDIR="$pkgdir" install-data-html + mv -f docpkg/* "$pkgdir" install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" install -D -m644 NOTICE "${pkgdir}/usr/share/licenses/${pkgname}/NOTICE" diff --git a/arch-fonts.diff b/arch-fonts.diff new file mode 100644 index 000000000000..63a547c4d4d6 --- /dev/null +++ b/arch-fonts.diff @@ -0,0 +1,107 @@ +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 +@@ -13,27 +13,6 @@ + ImageMagick DejaVU font configuration. + --> + <typemap> +- <type name="DejaVu-LGC-Sans-Bold" fullname="DejaVu LGC Sans Bold" family="DejaVuGC Sans" style="Normal" stretch="Normal" weight="700" glyphs="@dejavu_font_dir@DejaVuLGCSans-Bold.ttf"/> +- <type name="DejaVu-LGC-Sans-Bold-Oblique" fullname="DejaVu LGC Sans Bold Oblique" family="DejaVuGC Sans" style="Oblique" stretch="Normal" weight="700" glyphs="@dejavu_font_dir@DejaVuLGCSans-BoldOblique.ttf"/> +- <type name="DejaVu-LGC-Sans-Book" fullname="DejaVu LGC Sans Book" family="DejaVuGC Sans" style="Normal" stretch="Normal" weight="400" glyphs="@dejavu_font_dir@DejaVuLGCSans.ttf"/> +- <type name="DejaVu-LGC-Sans-Condensed" fullname="DejaVu LGC Sans Condensed" family="DejaVuGC Sans" style="Normal" stretch="SemiCondensed" weight="400" glyphs="@dejavu_font_dir@DejaVuLGCSansCondensed.ttf"/> +- <type name="DejaVu-LGC-Sans-Condensed-Bold" fullname="DejaVu LGC Sans Condensed Bold" family="DejaVuGC Sans" style="Normal" stretch="SemiCondensed" weight="700" glyphs="@dejavu_font_dir@DejaVuLGCSansCondensed-Bold.ttf"/> +- <type name="DejaVu-LGC-Sans-Condensed-Bold-Oblique" fullname="DejaVu LGC Sans Condensed Bold Oblique" family="DejaVuGC Sans" style="Oblique" stretch="SemiCondensed" weight="700" glyphs="@dejavu_font_dir@DejaVuLGCSansCondensed-BoldOblique.ttf"/> +- <type name="DejaVu-LGC-Sans-Condensed-Oblique" fullname="DejaVu LGC Sans Condensed Oblique" family="DejaVuGC Sans" style="Oblique" stretch="SemiCondensed" weight="400" glyphs="@dejavu_font_dir@DejaVuLGCSansCondensed-Oblique.ttf"/> +- <type name="DejaVu-LGC-Sans-ExtraLight" fullname="DejaVu LGC Sans ExtraLight" family="DejaVuGC Sans" style="Normal" stretch="Normal" weight="200" glyphs="@dejavu_font_dir@DejaVuLGCSans-ExtraLight.ttf"/> +- <type name="DejaVu-LGC-Sans-Mono-Bold" fullname="DejaVu LGC Sans Mono Bold" family="DejaVuGC Sans Mono" style="Normal" stretch="Normal" weight="700" glyphs="@dejavu_font_dir@DejaVuLGCSansMono-Bold.ttf"/> +- <type name="DejaVu-LGC-Sans-Mono-Bold-Oblique" fullname="DejaVu LGC Sans Mono Bold Oblique" family="DejaVuGC Sans Mono" style="Oblique" stretch="Normal" weight="700" glyphs="@dejavu_font_dir@DejaVuLGCSansMono-BoldOblique.ttf"/> +- <type name="DejaVu-LGC-Sans-Mono-Book" fullname="DejaVu LGC Sans Mono Book" family="DejaVuGC Sans Mono" style="Normal" stretch="Normal" weight="400" glyphs="@dejavu_font_dir@DejaVuLGCSansMono.ttf"/> +- <type name="DejaVu-LGC-Sans-Mono-Oblique" fullname="DejaVu LGC Sans Mono Oblique" family="DejaVuGC Sans Mono" style="Oblique" stretch="Normal" weight="400" glyphs="@dejavu_font_dir@DejaVuLGCSansMono-Oblique.ttf"/> +- <type name="DejaVu-LGC-Sans-Oblique" fullname="DejaVu LGC Sans Oblique" family="DejaVuGC Sans" style="Oblique" stretch="Normal" weight="400" glyphs="@dejavu_font_dir@DejaVuLGCSans-Oblique.ttf"/> +- <type name="DejaVu-LGC-Serif-Bold" fullname="DejaVu LGC Serif Bold" family="DejaVuGC Serif" style="Normal" stretch="Normal" weight="700" glyphs="@dejavu_font_dir@DejaVuLGCSerif-Bold.ttf"/> +- <type name="DejaVu-LGC-Serif-Bold-Italic" fullname="DejaVu LGC Serif Bold Italic" family="DejaVuGC Serif" style="Italic" stretch="Normal" weight="700" glyphs="@dejavu_font_dir@DejaVuLGCSerif-BoldItalic.ttf"/> +- <type name="DejaVu-LGC-Serif-Book" fullname="DejaVu LGC Serif Book" family="DejaVuGC Serif" style="Normal" stretch="Normal" weight="400" glyphs="@dejavu_font_dir@DejaVuLGCSerif.ttf"/> +- <type name="DejaVu-LGC-Serif-Condensed" fullname="DejaVu LGC Serif Condensed" family="DejaVuGC Serif" style="Normal" stretch="SemiCondensed" weight="400" glyphs="@dejavu_font_dir@DejaVuLGCSerifCondensed.ttf"/> +- <type name="DejaVu-LGC-Serif-Condensed-Bold" fullname="DejaVu LGC Serif Condensed Bold" family="DejaVuGC Serif" style="Normal" stretch="SemiCondensed" weight="700" glyphs="@dejavu_font_dir@DejaVuLGCSerifCondensed-Bold.ttf"/> +- <type name="DejaVu-LGC-Serif-Condensed-Bold-Italic" fullname="DejaVu LGC Serif Condensed Bold Italic" family="DejaVuGC Serif" style="Italic" stretch="SemiCondensed" weight="700" glyphs="@dejavu_font_dir@DejaVuLGCSerifCondensed-BoldItalic.ttf"/> +- <type name="DejaVu-LGC-Serif-Condensed-Italic" fullname="DejaVu LGC Serif -Condensed Italic" family="DejaVuGC Serif" style="Italic" stretch="SemiCondensed" weight="400" glyphs="@dejavu_font_dir@DejaVuLGCSerifCondensed-Italic.ttf"/> +- <type name="DejaVu-LGC-Serif-Italic" fullname="DejaVu LGC Serif Italic" family="DejaVuGC Serif" style="Italic" stretch="Normal" weight="400" glyphs="@dejavu_font_dir@DejaVuLGCSerif-Italic.ttf"/> + <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 +@@ -13,38 +13,38 @@ + ImageMagick Ghostscript font configuration. + --> + <typemap> +- <type name="AvantGarde-Book" fullname="AvantGarde Book" family="AvantGarde" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@a010013l.afm" glyphs="@ghostscript_font_dir@a010013l.pfb"/> +- <type name="AvantGarde-BookOblique" fullname="AvantGarde Book Oblique" family="AvantGarde" foundry="URW" weight="400" style="oblique" stretch="normal" format="type1" metrics="@ghostscript_font_dir@a010033l.afm" glyphs="@ghostscript_font_dir@a010033l.pfb"/> +- <type name="AvantGarde-Demi" fullname="AvantGarde DemiBold" family="AvantGarde" foundry="URW" weight="600" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@a010015l.afm" glyphs="@ghostscript_font_dir@a010015l.pfb"/> +- <type name="AvantGarde-DemiOblique" fullname="AvantGarde DemiOblique" family="AvantGarde" foundry="URW" weight="600" style="oblique" stretch="normal" format="type1" metrics="@ghostscript_font_dir@a010035l.afm" glyphs="@ghostscript_font_dir@a010035l.pfb"/> +- <type name="Bookman-Demi" fullname="Bookman DemiBold" family="Bookman" foundry="URW" weight="600" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@b018015l.afm" glyphs="@ghostscript_font_dir@b018015l.pfb"/> +- <type name="Bookman-DemiItalic" fullname="Bookman DemiBold Italic" family="Bookman" foundry="URW" weight="600" style="italic" stretch="normal" format="type1" metrics="@ghostscript_font_dir@b018035l.afm" glyphs="@ghostscript_font_dir@b018035l.pfb"/> +- <type name="Bookman-Light" fullname="Bookman Light" family="Bookman" foundry="URW" weight="300" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@b018012l.afm" glyphs="@ghostscript_font_dir@b018012l.pfb"/> +- <type name="Bookman-LightItalic" fullname="Bookman Light Italic" family="Bookman" foundry="URW" weight="300" style="italic" stretch="normal" format="type1" metrics="@ghostscript_font_dir@b018032l.afm" glyphs="@ghostscript_font_dir@b018032l.pfb"/> +- <type name="Courier" fullname="Courier Regular" family="Courier" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n022003l.afm" glyphs="@ghostscript_font_dir@n022003l.pfb"/> +- <type name="Courier-Bold" fullname="Courier Bold" family="Courier" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n022004l.afm" glyphs="@ghostscript_font_dir@n022004l.pfb"/> +- <type name="Courier-Oblique" fullname="Courier Regular Oblique" family="Courier" foundry="URW" weight="400" style="oblique" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n022023l.afm" glyphs="@ghostscript_font_dir@n022023l.pfb"/> +- <type name="Courier-BoldOblique" fullname="Courier Bold Oblique" family="Courier" foundry="URW" weight="700" style="oblique" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n022024l.afm" glyphs="@ghostscript_font_dir@n022024l.pfb"/> +- <type name="fixed" fullname="Helvetica Regular" family="Helvetica" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n019003l.afm" glyphs="@ghostscript_font_dir@n019003l.pfb"/> +- <type name="Helvetica" fullname="Helvetica Regular" family="Helvetica" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n019003l.afm" glyphs="@ghostscript_font_dir@n019003l.pfb"/> +- <type name="Helvetica-Bold" fullname="Helvetica Bold" family="Helvetica" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n019004l.afm" glyphs="@ghostscript_font_dir@n019004l.pfb"/> +- <type name="Helvetica-Oblique" fullname="Helvetica Regular Italic" family="Helvetica" foundry="URW" weight="400" style="italic" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n019023l.afm" glyphs="@ghostscript_font_dir@n019023l.pfb"/> +- <type name="Helvetica-BoldOblique" fullname="Helvetica Bold Italic" family="Helvetica" foundry="URW" weight="700" style="italic" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n019024l.afm" glyphs="@ghostscript_font_dir@n019024l.pfb"/> +- <type name="Helvetica-Narrow" fullname="Helvetica Narrow" family="Helvetica Narrow" foundry="URW" weight="400" style="normal" stretch="condensed" format="type1" metrics="@ghostscript_font_dir@n019043l.afm" glyphs="@ghostscript_font_dir@n019043l.pfb"/> +- <type name="Helvetica-Narrow-Oblique" fullname="Helvetica Narrow Oblique" family="Helvetica Narrow" foundry="URW" weight="400" style="oblique" stretch="condensed" format="type1" metrics="@ghostscript_font_dir@n019063l.afm" glyphs="@ghostscript_font_dir@n019063l.pfb"/> +- <type name="Helvetica-Narrow-Bold" fullname="Helvetica Narrow Bold" family="Helvetica Narrow" foundry="URW" weight="700" style="normal" stretch="condensed" format="type1" metrics="@ghostscript_font_dir@n019044l.afm" glyphs="@ghostscript_font_dir@n019044l.pfb"/> +- <type name="Helvetica-Narrow-BoldOblique" fullname="Helvetica Narrow Bold Oblique" family="Helvetica Narrow" foundry="URW" weight="700" style="oblique" stretch="condensed" format="type1" metrics="@ghostscript_font_dir@n019064l.afm" glyphs="@ghostscript_font_dir@n019064l.pfb"/> +- <type name="NewCenturySchlbk-Roman" fullname="New Century Schoolbook" family="NewCenturySchlbk" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@c059013l.afm" glyphs="@ghostscript_font_dir@c059013l.pfb"/> +- <type name="NewCenturySchlbk-Italic" fullname="New Century Schoolbook Italic" family="NewCenturySchlbk" foundry="URW" weight="400" style="italic" stretch="normal" format="type1" metrics="@ghostscript_font_dir@c059033l.afm" glyphs="@ghostscript_font_dir@c059033l.pfb"/> +- <type name="NewCenturySchlbk-Bold" fullname="New Century Schoolbook Bold" family="NewCenturySchlbk" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@c059016l.afm" glyphs="@ghostscript_font_dir@c059016l.pfb"/> +- <type name="NewCenturySchlbk-BoldItalic" fullname="New Century Schoolbook Bold Italic" family="NewCenturySchlbk" foundry="URW" weight="700" style="italic" stretch="normal" format="type1" metrics="@ghostscript_font_dir@c059036l.afm" glyphs="@ghostscript_font_dir@c059036l.pfb"/> +- <type name="Palatino-Roman" fullname="Palatino Regular" family="Palatino" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@p052003l.afm" glyphs="@ghostscript_font_dir@p052003l.pfb"/> +- <type name="Palatino-Italic" fullname="Palatino Italic" family="Palatino" foundry="URW" weight="400" style="italic" stretch="normal" format="type1" metrics="@ghostscript_font_dir@p052023l.afm" glyphs="@ghostscript_font_dir@p052023l.pfb"/> +- <type name="Palatino-Bold" fullname="Palatino Bold" family="Palatino" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@p052004l.afm" glyphs="@ghostscript_font_dir@p052004l.pfb"/> +- <type name="Palatino-BoldItalic" fullname="Palatino Bold Italic" family="Palatino" foundry="URW" weight="700" style="italic" stretch="normal" format="type1" metrics="@ghostscript_font_dir@p052024l.afm" glyphs="@ghostscript_font_dir@p052024l.pfb"/> +- <type name="Times-Roman" fullname="Times Regular" family="Times" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n021003l.afm" glyphs="@ghostscript_font_dir@n021003l.pfb"/> +- <type name="Times-Bold" fullname="Times Medium" family="Times" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n021004l.afm" glyphs="@ghostscript_font_dir@n021004l.pfb"/> +- <type name="Times-Italic" fullname="Times Regular Italic" family="Times" foundry="URW" weight="400" style="italic" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n021023l.afm" glyphs="@ghostscript_font_dir@n021023l.pfb"/> +- <type name="Times-BoldItalic" fullname="Times Medium Italic" family="Times" foundry="URW" weight="700" style="italic" stretch="normal" format="type1" metrics="@ghostscript_font_dir@n021024l.afm" glyphs="@ghostscript_font_dir@n021024l.pfb"/> +- <type name="Symbol" fullname="Symbol" family="Symbol" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_dir@s050000l.afm" glyphs="@ghostscript_font_dir@s050000l.pfb" version="0.1" encoding="AdobeCustom"/> ++ <type name="AvantGarde-Book" fullname="AvantGarde Book" family="AvantGarde" foundry="URW" weight="400" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@URWGothic-Book.otf"/> ++ <type name="AvantGarde-BookOblique" fullname="AvantGarde Book Oblique" family="AvantGarde" foundry="URW" weight="400" style="oblique" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@URWGothic-BookOblique.otf"/> ++ <type name="AvantGarde-Demi" fullname="AvantGarde DemiBold" family="AvantGarde" foundry="URW" weight="600" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@URWGothic-Demi.otf"/> ++ <type name="AvantGarde-DemiOblique" fullname="AvantGarde DemiOblique" family="AvantGarde" foundry="URW" weight="600" style="oblique" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@URWGothic-DemiOblique.otf"/> ++ <type name="Bookman-Demi" fullname="Bookman DemiBold" family="Bookman" foundry="URW" weight="600" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@URWBookman-Demi.otf"/> ++ <type name="Bookman-DemiItalic" fullname="Bookman DemiBold Italic" family="Bookman" foundry="URW" weight="600" style="italic" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@URWBookman-DemiItalic.otf"/> ++ <type name="Bookman-Light" fullname="Bookman Light" family="Bookman" foundry="URW" weight="300" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@URWBookman-Light.otf"/> ++ <type name="Bookman-LightItalic" fullname="Bookman Light Italic" family="Bookman" foundry="URW" weight="300" style="italic" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@URWBookman-LightItalic.otf"/> ++ <type name="Courier" fullname="Courier Regular" family="Courier" foundry="URW" weight="400" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusMonoPS-Regular.otf"/> ++ <type name="Courier-Bold" fullname="Courier Bold" family="Courier" foundry="URW" weight="700" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusMonoPS-Bold.otf"/> ++ <type name="Courier-Oblique" fullname="Courier Regular Oblique" family="Courier" foundry="URW" weight="400" style="oblique" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusMonoPS-Italic.otf"/> ++ <type name="Courier-BoldOblique" fullname="Courier Bold Oblique" family="Courier" foundry="URW" weight="700" style="oblique" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusMonoPS-BoldItalic.otf"/> ++ <type name="fixed" fullname="Helvetica Regular" family="Helvetica" foundry="URW" weight="400" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusSans-Regular.otf"/> ++ <type name="Helvetica" fullname="Helvetica Regular" family="Helvetica" foundry="URW" weight="400" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusSans-Regular.otf"/> ++ <type name="Helvetica-Bold" fullname="Helvetica Bold" family="Helvetica" foundry="URW" weight="700" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusSans-Bold.otf"/> ++ <type name="Helvetica-Oblique" fullname="Helvetica Regular Italic" family="Helvetica" foundry="URW" weight="400" style="italic" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusSans-Italic.otf"/> ++ <type name="Helvetica-BoldOblique" fullname="Helvetica Bold Italic" family="Helvetica" foundry="URW" weight="700" style="italic" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusSans-BoldItalic.otf"/> ++ <type name="Helvetica-Narrow" fullname="Helvetica Narrow" family="Helvetica Narrow" foundry="URW" weight="400" style="normal" stretch="condensed" format="cff" glyphs="@ghostscript_font_dir@NimbusSansNarrow-Regular.otf"/> ++ <type name="Helvetica-Narrow-Oblique" fullname="Helvetica Narrow Oblique" family="Helvetica Narrow" foundry="URW" weight="400" style="oblique" stretch="condensed" format="cff" glyphs="@ghostscript_font_dir@NimbusSansNarrow-Oblique.otf"/> ++ <type name="Helvetica-Narrow-Bold" fullname="Helvetica Narrow Bold" family="Helvetica Narrow" foundry="URW" weight="700" style="normal" stretch="condensed" format="cff" glyphs="@ghostscript_font_dir@NimbusSansNarrow-Bold.otf"/> ++ <type name="Helvetica-Narrow-BoldOblique" fullname="Helvetica Narrow Bold Oblique" family="Helvetica Narrow" foundry="URW" weight="700" style="oblique" stretch="condensed" format="cff" glyphs="@ghostscript_font_dir@NimbusSansNarrow-BdOblique.otf"/> ++ <type name="NewCenturySchlbk-Roman" fullname="New Century Schoolbook" family="NewCenturySchlbk" foundry="URW" weight="400" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@C059-Roman.otf"/> ++ <type name="NewCenturySchlbk-Italic" fullname="New Century Schoolbook Italic" family="NewCenturySchlbk" foundry="URW" weight="400" style="italic" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@C059-Italic.otf"/> ++ <type name="NewCenturySchlbk-Bold" fullname="New Century Schoolbook Bold" family="NewCenturySchlbk" foundry="URW" weight="700" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@C059-Bold.otf"/> ++ <type name="NewCenturySchlbk-BoldItalic" fullname="New Century Schoolbook Bold Italic" family="NewCenturySchlbk" foundry="URW" weight="700" style="italic" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@C059-BdIta.otf"/> ++ <type name="Palatino-Roman" fullname="Palatino Regular" family="Palatino" foundry="URW" weight="400" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@P052-Roman.otf"/> ++ <type name="Palatino-Italic" fullname="Palatino Italic" family="Palatino" foundry="URW" weight="400" style="italic" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@P052-Italic.otf"/> ++ <type name="Palatino-Bold" fullname="Palatino Bold" family="Palatino" foundry="URW" weight="700" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@P052-Bold.otf"/> ++ <type name="Palatino-BoldItalic" fullname="Palatino Bold Italic" family="Palatino" foundry="URW" weight="700" style="italic" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@P052-BoldItalic.otf"/> ++ <type name="Times-Roman" fullname="Times Regular" family="Times" foundry="URW" weight="400" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusRoman-Regular.otf"/> ++ <type name="Times-Bold" fullname="Times Medium" family="Times" foundry="URW" weight="700" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusRoman-Bold.otf"/> ++ <type name="Times-Italic" fullname="Times Regular Italic" family="Times" foundry="URW" weight="400" style="italic" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusRoman-Italic.otf"/> ++ <type name="Times-BoldItalic" fullname="Times Medium Italic" family="Times" foundry="URW" weight="700" style="italic" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@NimbusRoman-BoldItalic.otf"/> ++ <type name="Symbol" fullname="Symbol" family="Symbol" foundry="URW" weight="400" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_dir@StandardSymbolsPS.otf" version="2.0" encoding="AdobeCustom"/> + </typemap> |