Date: Monday, June 1, 2020 @ 07:34:37 Author: arojas Revision: 387993
archrelease: copy trunk to extra-x86_64 Added: imagemagick/repos/extra-x86_64/PKGBUILD (from rev 387992, imagemagick/trunk/PKGBUILD) imagemagick/repos/extra-x86_64/arch-fonts.diff (from rev 387992, imagemagick/trunk/arch-fonts.diff) imagemagick/repos/extra-x86_64/imagemagick-inkscape-1.0.patch (from rev 387992, imagemagick/trunk/imagemagick-inkscape-1.0.patch) Deleted: imagemagick/repos/extra-x86_64/PKGBUILD imagemagick/repos/extra-x86_64/arch-fonts.diff imagemagick/repos/extra-x86_64/imagemagick-inkscape-1.0.patch --------------------------------+ PKGBUILD | 247 +++++++++++++++++++-------------------- arch-fonts.diff | 214 ++++++++++++++++----------------- imagemagick-inkscape-1.0.patch | 26 ++-- 3 files changed, 244 insertions(+), 243 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-06-01 07:33:59 UTC (rev 387992) +++ PKGBUILD 2020-06-01 07:34:37 UTC (rev 387993) @@ -1,123 +0,0 @@ -# Maintainer: Antonio Rojas <aro...@archlinux.org> -# Contributor: Eric Bélanger <e...@archlinux.org> - -pkgbase=imagemagick -pkgname=(imagemagick imagemagick-doc) -pkgver=7.0.10.16 -pkgrel=1 -pkgdesc="An image viewing/manipulation program" -url="https://www.imagemagick.org/" -arch=(x86_64) -license=(custom) -makedepends=(ghostscript openexr libwmf librsvg libxml2 openjpeg2 libraw opencl-headers libwebp - chrpath ocl-icd glu ghostpcl ghostxps libheif jbigkit lcms2 libxext liblqr libraqm libpng) -checkdepends=(gsfonts ttf-dejavu) -_relname=ImageMagick-${pkgver%%.*} -_tarname=ImageMagick-${pkgver%.*}-${pkgver##*.} -source=(https://imagemagick.org/download/$_tarname.tar.xz{,.asc} - arch-fonts.diff - imagemagick-inkscape-1.0.patch) -sha256sums=('7f97da9e14c68ec291afbd5f97f9df91593dd2df7e96bc306cc60fb08d5bd195' - 'SKIP' - 'a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73' - 'dd856b0d7b5b98535d2bc61dfa995f4162677486c1eac14b384668a28a60af30') -validpgpkeys=(D8272EF51DA223E4D05B466989AB63D48277377A) # Lexie Parsimoniae - -shopt -s extglob - -prepare() { - mkdir -p docpkg/usr/share - - cd $_tarname - - # Fix up typemaps to match our packages, where possible - patch -p1 -i ../arch-fonts.diff - - # Use correct parameter for inkscape 1.0 - patch -p1 -i ../imagemagick-inkscape-1.0.patch -} - -build() { - cd $_tarname - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --with-dejavu-font-dir=/usr/share/fonts/TTF \ - --with-gs-font-dir=/usr/share/fonts/gsfonts \ - PSDelegate=/usr/bin/gs \ - XPSDelegate=/usr/bin/gxps \ - PCLDelegate=/usr/bin/gpcl6 \ - --enable-hdri \ - --enable-opencl \ - --without-gslib \ - --with-lqr \ - --with-modules \ - --with-openexr \ - --with-openjp2 \ - --with-perl \ - --with-perl-options=INSTALLDIRS=vendor \ - --with-rsvg \ - --with-webp \ - --with-wmf \ - --with-xml \ - --without-autotrace \ - --without-djvu \ - --without-dps \ - --without-fftw \ - --without-fpx \ - --without-gcc-arch \ - --without-gvc - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - make -} - -check() ( - cd $_tarname - ulimit -n 4096 - make check -) - -package_imagemagick() { - depends=(libltdl lcms2 fontconfig libxext liblqr libraqm libpng libxml2) - optdepends=('ghostscript: PS/PDF support' - 'libheif: HEIF support' - 'libraw: DNG support' - 'librsvg: SVG support' - 'libwebp: WEBP support' - 'libwmf: WMF support' - 'libxml2: Magick Scripting Language' - 'ocl-icd: OpenCL support' - 'openexr: OpenEXR support' - 'openjpeg2: JPEG2000 support' - 'pango: Text rendering' - 'imagemagick-doc: manual and API docs') - options=(!emptydirs libtool) - backup=(etc/$_relname/{colors,delegates,log,mime,policy,quantization-table,thresholds,type,type-{dejavu,ghostscript}}.xml) - conflicts=(imagemagick6) - provides=(libmagick) - replaces=(imagemagick6 libmagick) - - cd $_tarname - make DESTDIR="$pkgdir" install - - find "$pkgdir/usr/lib/perl5" -name '*.so' -exec chrpath -d {} + - rm "$pkgdir"/etc/$_relname/type-{apple,urw-base35,windows}.xml - rm "$pkgdir"/usr/lib/*.la - - install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 LICENSE NOTICE - -# Split docs - mv "$pkgdir/usr/share/doc" "$srcdir/docpkg/usr/share/" - -# 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 -} - -package_imagemagick-doc() { - pkgdesc+=" (manual and API docs)" - - mv docpkg/* "$pkgdir" - - cd $_tarname - install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 LICENSE NOTICE -} Copied: imagemagick/repos/extra-x86_64/PKGBUILD (from rev 387992, imagemagick/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-06-01 07:34:37 UTC (rev 387993) @@ -0,0 +1,124 @@ +# Maintainer: Antonio Rojas <aro...@archlinux.org> +# Contributor: Eric Bélanger <e...@archlinux.org> + +pkgbase=imagemagick +pkgname=(imagemagick imagemagick-doc) +pkgver=7.0.10.16 +pkgrel=2 +pkgdesc="An image viewing/manipulation program" +url="https://www.imagemagick.org/" +arch=(x86_64) +license=(custom) +makedepends=(ghostscript openexr libwmf librsvg libxml2 openjpeg2 libraw opencl-headers libwebp + chrpath ocl-icd glu ghostpcl ghostxps libheif jbigkit lcms2 libxext liblqr libraqm libpng djvulibre) +checkdepends=(gsfonts ttf-dejavu) +_relname=ImageMagick-${pkgver%%.*} +_tarname=ImageMagick-${pkgver%.*}-${pkgver##*.} +source=(https://imagemagick.org/download/$_tarname.tar.xz{,.asc} + arch-fonts.diff + imagemagick-inkscape-1.0.patch) +sha256sums=('7f97da9e14c68ec291afbd5f97f9df91593dd2df7e96bc306cc60fb08d5bd195' + 'SKIP' + 'a85b744c61b1b563743ecb7c7adad999d7ed9a8af816650e3ab9321b2b102e73' + 'dd856b0d7b5b98535d2bc61dfa995f4162677486c1eac14b384668a28a60af30') +validpgpkeys=(D8272EF51DA223E4D05B466989AB63D48277377A) # Lexie Parsimoniae + +shopt -s extglob + +prepare() { + mkdir -p docpkg/usr/share + + cd $_tarname + + # Fix up typemaps to match our packages, where possible + patch -p1 -i ../arch-fonts.diff + + # Use correct parameter for inkscape 1.0 + patch -p1 -i ../imagemagick-inkscape-1.0.patch +} + +build() { + cd $_tarname + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --with-dejavu-font-dir=/usr/share/fonts/TTF \ + --with-gs-font-dir=/usr/share/fonts/gsfonts \ + PSDelegate=/usr/bin/gs \ + XPSDelegate=/usr/bin/gxps \ + PCLDelegate=/usr/bin/gpcl6 \ + --enable-hdri \ + --enable-opencl \ + --without-gslib \ + --with-djvu \ + --with-lqr \ + --with-modules \ + --with-openexr \ + --with-openjp2 \ + --with-perl \ + --with-perl-options=INSTALLDIRS=vendor \ + --with-rsvg \ + --with-webp \ + --with-wmf \ + --with-xml \ + --without-autotrace \ + --without-dps \ + --without-fftw \ + --without-fpx \ + --without-gcc-arch \ + --without-gvc + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool + make +} + +check() ( + cd $_tarname + ulimit -n 4096 + make check +) + +package_imagemagick() { + depends=(libltdl lcms2 fontconfig libxext liblqr libraqm libpng libxml2) + optdepends=('ghostscript: PS/PDF support' + 'libheif: HEIF support' + 'libraw: DNG support' + 'librsvg: SVG support' + 'libwebp: WEBP support' + 'libwmf: WMF support' + 'libxml2: Magick Scripting Language' + 'ocl-icd: OpenCL support' + 'openexr: OpenEXR support' + 'openjpeg2: JPEG2000 support' + 'djvulibre: DJVU support' + 'pango: Text rendering' + 'imagemagick-doc: manual and API docs') + options=(!emptydirs libtool) + backup=(etc/$_relname/{colors,delegates,log,mime,policy,quantization-table,thresholds,type,type-{dejavu,ghostscript}}.xml) + conflicts=(imagemagick6) + provides=(libmagick) + replaces=(imagemagick6 libmagick) + + cd $_tarname + make DESTDIR="$pkgdir" install + + find "$pkgdir/usr/lib/perl5" -name '*.so' -exec chrpath -d {} + + rm "$pkgdir"/etc/$_relname/type-{apple,urw-base35,windows}.xml + rm "$pkgdir"/usr/lib/*.la + + install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 LICENSE NOTICE + +# Split docs + mv "$pkgdir/usr/share/doc" "$srcdir/docpkg/usr/share/" + +# 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 +} + +package_imagemagick-doc() { + pkgdesc+=" (manual and API docs)" + + mv docpkg/* "$pkgdir" + + cd $_tarname + install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 LICENSE NOTICE +} Deleted: arch-fonts.diff =================================================================== --- arch-fonts.diff 2020-06-01 07:33:59 UTC (rev 387992) +++ arch-fonts.diff 2020-06-01 07:34:37 UTC (rev 387993) @@ -1,107 +0,0 @@ -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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@dejavulgcserif-italic.ttf"/> - <type name="DejaVu-Sans-Bold" fullname="DejaVu Sans Bold" family="DejaVu Sans" style="Normal" stretch="Normal" weight="700" glyphs="@dejavu_font_...@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_...@dejavusans-boldoblique.ttf"/> - <type name="DejaVu-Sans-Book" fullname="DejaVu Sans Book" family="DejaVu Sans" style="Normal" stretch="Normal" weight="400" glyphs="@dejavu_font_...@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_...@a010013l.afm" glyphs="@ghostscript_font_...@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_...@a010033l.afm" glyphs="@ghostscript_font_...@a010033l.pfb"/> -- <type name="AvantGarde-Demi" fullname="AvantGarde DemiBold" family="AvantGarde" foundry="URW" weight="600" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_...@a010015l.afm" glyphs="@ghostscript_font_...@a010015l.pfb"/> -- <type name="AvantGarde-DemiOblique" fullname="AvantGarde DemiOblique" family="AvantGarde" foundry="URW" weight="600" style="oblique" stretch="normal" format="type1" metrics="@ghostscript_font_...@a010035l.afm" glyphs="@ghostscript_font_...@a010035l.pfb"/> -- <type name="Bookman-Demi" fullname="Bookman DemiBold" family="Bookman" foundry="URW" weight="600" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_...@b018015l.afm" glyphs="@ghostscript_font_...@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_...@b018035l.afm" glyphs="@ghostscript_font_...@b018035l.pfb"/> -- <type name="Bookman-Light" fullname="Bookman Light" family="Bookman" foundry="URW" weight="300" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_...@b018012l.afm" glyphs="@ghostscript_font_...@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_...@b018032l.afm" glyphs="@ghostscript_font_...@b018032l.pfb"/> -- <type name="Courier" fullname="Courier Regular" family="Courier" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_...@n022003l.afm" glyphs="@ghostscript_font_...@n022003l.pfb"/> -- <type name="Courier-Bold" fullname="Courier Bold" family="Courier" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_...@n022004l.afm" glyphs="@ghostscript_font_...@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_...@n022023l.afm" glyphs="@ghostscript_font_...@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_...@n022024l.afm" glyphs="@ghostscript_font_...@n022024l.pfb"/> -- <type name="fixed" fullname="Helvetica Regular" family="Helvetica" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_...@n019003l.afm" glyphs="@ghostscript_font_...@n019003l.pfb"/> -- <type name="Helvetica" fullname="Helvetica Regular" family="Helvetica" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_...@n019003l.afm" glyphs="@ghostscript_font_...@n019003l.pfb"/> -- <type name="Helvetica-Bold" fullname="Helvetica Bold" family="Helvetica" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_...@n019004l.afm" glyphs="@ghostscript_font_...@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_...@n019023l.afm" glyphs="@ghostscript_font_...@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_...@n019024l.afm" glyphs="@ghostscript_font_...@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_...@n019043l.afm" glyphs="@ghostscript_font_...@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_...@n019063l.afm" glyphs="@ghostscript_font_...@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_...@n019044l.afm" glyphs="@ghostscript_font_...@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_...@n019064l.afm" glyphs="@ghostscript_font_...@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_...@c059013l.afm" glyphs="@ghostscript_font_...@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_...@c059033l.afm" glyphs="@ghostscript_font_...@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_...@c059016l.afm" glyphs="@ghostscript_font_...@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_...@c059036l.afm" glyphs="@ghostscript_font_...@c059036l.pfb"/> -- <type name="Palatino-Roman" fullname="Palatino Regular" family="Palatino" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_...@p052003l.afm" glyphs="@ghostscript_font_...@p052003l.pfb"/> -- <type name="Palatino-Italic" fullname="Palatino Italic" family="Palatino" foundry="URW" weight="400" style="italic" stretch="normal" format="type1" metrics="@ghostscript_font_...@p052023l.afm" glyphs="@ghostscript_font_...@p052023l.pfb"/> -- <type name="Palatino-Bold" fullname="Palatino Bold" family="Palatino" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_...@p052004l.afm" glyphs="@ghostscript_font_...@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_...@p052024l.afm" glyphs="@ghostscript_font_...@p052024l.pfb"/> -- <type name="Times-Roman" fullname="Times Regular" family="Times" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_...@n021003l.afm" glyphs="@ghostscript_font_...@n021003l.pfb"/> -- <type name="Times-Bold" fullname="Times Medium" family="Times" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_...@n021004l.afm" glyphs="@ghostscript_font_...@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_...@n021023l.afm" glyphs="@ghostscript_font_...@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_...@n021024l.afm" glyphs="@ghostscript_font_...@n021024l.pfb"/> -- <type name="Symbol" fullname="Symbol" family="Symbol" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_...@s050000l.afm" glyphs="@ghostscript_font_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@urwbookman-lightitalic.otf"/> -+ <type name="Courier" fullname="Courier Regular" family="Courier" foundry="URW" weight="400" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_...@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_...@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_...@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_...@nimbusmonops-bolditalic.otf"/> -+ <type name="fixed" fullname="Helvetica Regular" family="Helvetica" foundry="URW" weight="400" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_...@nimbussans-regular.otf"/> -+ <type name="Helvetica" fullname="Helvetica Regular" family="Helvetica" foundry="URW" weight="400" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@nimbusroman-bolditalic.otf"/> -+ <type name="Symbol" fullname="Symbol" family="Symbol" foundry="URW" weight="400" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_...@standardsymbolsps.otf" version="2.0" encoding="AdobeCustom"/> - </typemap> Copied: imagemagick/repos/extra-x86_64/arch-fonts.diff (from rev 387992, imagemagick/trunk/arch-fonts.diff) =================================================================== --- arch-fonts.diff (rev 0) +++ arch-fonts.diff 2020-06-01 07:34:37 UTC (rev 387993) @@ -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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@dejavulgcserif-italic.ttf"/> + <type name="DejaVu-Sans-Bold" fullname="DejaVu Sans Bold" family="DejaVu Sans" style="Normal" stretch="Normal" weight="700" glyphs="@dejavu_font_...@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_...@dejavusans-boldoblique.ttf"/> + <type name="DejaVu-Sans-Book" fullname="DejaVu Sans Book" family="DejaVu Sans" style="Normal" stretch="Normal" weight="400" glyphs="@dejavu_font_...@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_...@a010013l.afm" glyphs="@ghostscript_font_...@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_...@a010033l.afm" glyphs="@ghostscript_font_...@a010033l.pfb"/> +- <type name="AvantGarde-Demi" fullname="AvantGarde DemiBold" family="AvantGarde" foundry="URW" weight="600" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_...@a010015l.afm" glyphs="@ghostscript_font_...@a010015l.pfb"/> +- <type name="AvantGarde-DemiOblique" fullname="AvantGarde DemiOblique" family="AvantGarde" foundry="URW" weight="600" style="oblique" stretch="normal" format="type1" metrics="@ghostscript_font_...@a010035l.afm" glyphs="@ghostscript_font_...@a010035l.pfb"/> +- <type name="Bookman-Demi" fullname="Bookman DemiBold" family="Bookman" foundry="URW" weight="600" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_...@b018015l.afm" glyphs="@ghostscript_font_...@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_...@b018035l.afm" glyphs="@ghostscript_font_...@b018035l.pfb"/> +- <type name="Bookman-Light" fullname="Bookman Light" family="Bookman" foundry="URW" weight="300" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_...@b018012l.afm" glyphs="@ghostscript_font_...@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_...@b018032l.afm" glyphs="@ghostscript_font_...@b018032l.pfb"/> +- <type name="Courier" fullname="Courier Regular" family="Courier" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_...@n022003l.afm" glyphs="@ghostscript_font_...@n022003l.pfb"/> +- <type name="Courier-Bold" fullname="Courier Bold" family="Courier" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_...@n022004l.afm" glyphs="@ghostscript_font_...@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_...@n022023l.afm" glyphs="@ghostscript_font_...@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_...@n022024l.afm" glyphs="@ghostscript_font_...@n022024l.pfb"/> +- <type name="fixed" fullname="Helvetica Regular" family="Helvetica" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_...@n019003l.afm" glyphs="@ghostscript_font_...@n019003l.pfb"/> +- <type name="Helvetica" fullname="Helvetica Regular" family="Helvetica" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_...@n019003l.afm" glyphs="@ghostscript_font_...@n019003l.pfb"/> +- <type name="Helvetica-Bold" fullname="Helvetica Bold" family="Helvetica" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_...@n019004l.afm" glyphs="@ghostscript_font_...@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_...@n019023l.afm" glyphs="@ghostscript_font_...@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_...@n019024l.afm" glyphs="@ghostscript_font_...@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_...@n019043l.afm" glyphs="@ghostscript_font_...@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_...@n019063l.afm" glyphs="@ghostscript_font_...@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_...@n019044l.afm" glyphs="@ghostscript_font_...@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_...@n019064l.afm" glyphs="@ghostscript_font_...@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_...@c059013l.afm" glyphs="@ghostscript_font_...@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_...@c059033l.afm" glyphs="@ghostscript_font_...@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_...@c059016l.afm" glyphs="@ghostscript_font_...@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_...@c059036l.afm" glyphs="@ghostscript_font_...@c059036l.pfb"/> +- <type name="Palatino-Roman" fullname="Palatino Regular" family="Palatino" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_...@p052003l.afm" glyphs="@ghostscript_font_...@p052003l.pfb"/> +- <type name="Palatino-Italic" fullname="Palatino Italic" family="Palatino" foundry="URW" weight="400" style="italic" stretch="normal" format="type1" metrics="@ghostscript_font_...@p052023l.afm" glyphs="@ghostscript_font_...@p052023l.pfb"/> +- <type name="Palatino-Bold" fullname="Palatino Bold" family="Palatino" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_...@p052004l.afm" glyphs="@ghostscript_font_...@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_...@p052024l.afm" glyphs="@ghostscript_font_...@p052024l.pfb"/> +- <type name="Times-Roman" fullname="Times Regular" family="Times" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_...@n021003l.afm" glyphs="@ghostscript_font_...@n021003l.pfb"/> +- <type name="Times-Bold" fullname="Times Medium" family="Times" foundry="URW" weight="700" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_...@n021004l.afm" glyphs="@ghostscript_font_...@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_...@n021023l.afm" glyphs="@ghostscript_font_...@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_...@n021024l.afm" glyphs="@ghostscript_font_...@n021024l.pfb"/> +- <type name="Symbol" fullname="Symbol" family="Symbol" foundry="URW" weight="400" style="normal" stretch="normal" format="type1" metrics="@ghostscript_font_...@s050000l.afm" glyphs="@ghostscript_font_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@urwbookman-lightitalic.otf"/> ++ <type name="Courier" fullname="Courier Regular" family="Courier" foundry="URW" weight="400" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_...@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_...@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_...@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_...@nimbusmonops-bolditalic.otf"/> ++ <type name="fixed" fullname="Helvetica Regular" family="Helvetica" foundry="URW" weight="400" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_...@nimbussans-regular.otf"/> ++ <type name="Helvetica" fullname="Helvetica Regular" family="Helvetica" foundry="URW" weight="400" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@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_...@nimbusroman-bolditalic.otf"/> ++ <type name="Symbol" fullname="Symbol" family="Symbol" foundry="URW" weight="400" style="normal" stretch="normal" format="cff" glyphs="@ghostscript_font_...@standardsymbolsps.otf" version="2.0" encoding="AdobeCustom"/> + </typemap> Deleted: imagemagick-inkscape-1.0.patch =================================================================== --- imagemagick-inkscape-1.0.patch 2020-06-01 07:33:59 UTC (rev 387992) +++ imagemagick-inkscape-1.0.patch 2020-06-01 07:34:37 UTC (rev 387993) @@ -1,13 +0,0 @@ -diff --git a/config/delegates.xml.in b/config/delegates.xml.in -index 442fa1aca..19baaee91 100644 ---- a/config/delegates.xml.in -+++ b/config/delegates.xml.in -@@ -111,7 +111,7 @@ - <delegate decode="sid" command=""@MrSIDDecodeDelegate@" -if sid -i "%i" -of tif -o "%o" > "%u""/> - <delegate decode="svg" command=""@RSVGDecodeDelegate@" -o "%o" "%i""/> - <!-- Change export-file to export-png for inkscape < 1.0 --> -- <delegate decode="svg:decode" stealth="True" command=""@SVGDecodeDelegate@" "%s" --export-file="%s" --export-dpi="%s" --export-background="%s" --export-background-opacity="%s" > "%s" 2>&1"/> -+ <delegate decode="svg:decode" stealth="True" command=""@SVGDecodeDelegate@" "%s" --export-filename="%s" --export-dpi="%s" --export-background="%s" --export-background-opacity="%s" > "%s" 2>&1"/> - <delegate decode="tiff" encode="launch" mode="encode" command=""@LaunchDelegate@" "%i""/> - <delegate decode="wdp" command="@MVDelegate@ "%i" "%i.jxr"; "@JXRDecodeDelegate@" -i "%i.jxr" -o "%o.bmp"; @MVDelegate@ "%i.jxr" "%i"; @MVDelegate@ "%o.bmp" "%o""/> - <delegate decode="webp" command=""@WebPDecodeDelegate@" -pam "%i" -o "%o""/> Copied: imagemagick/repos/extra-x86_64/imagemagick-inkscape-1.0.patch (from rev 387992, imagemagick/trunk/imagemagick-inkscape-1.0.patch) =================================================================== --- imagemagick-inkscape-1.0.patch (rev 0) +++ imagemagick-inkscape-1.0.patch 2020-06-01 07:34:37 UTC (rev 387993) @@ -0,0 +1,13 @@ +diff --git a/config/delegates.xml.in b/config/delegates.xml.in +index 442fa1aca..19baaee91 100644 +--- a/config/delegates.xml.in ++++ b/config/delegates.xml.in +@@ -111,7 +111,7 @@ + <delegate decode="sid" command=""@MrSIDDecodeDelegate@" -if sid -i "%i" -of tif -o "%o" > "%u""/> + <delegate decode="svg" command=""@RSVGDecodeDelegate@" -o "%o" "%i""/> + <!-- Change export-file to export-png for inkscape < 1.0 --> +- <delegate decode="svg:decode" stealth="True" command=""@SVGDecodeDelegate@" "%s" --export-file="%s" --export-dpi="%s" --export-background="%s" --export-background-opacity="%s" > "%s" 2>&1"/> ++ <delegate decode="svg:decode" stealth="True" command=""@SVGDecodeDelegate@" "%s" --export-filename="%s" --export-dpi="%s" --export-background="%s" --export-background-opacity="%s" > "%s" 2>&1"/> + <delegate decode="tiff" encode="launch" mode="encode" command=""@LaunchDelegate@" "%i""/> + <delegate decode="wdp" command="@MVDelegate@ "%i" "%i.jxr"; "@JXRDecodeDelegate@" -i "%i.jxr" -o "%o.bmp"; @MVDelegate@ "%i.jxr" "%i"; @MVDelegate@ "%o.bmp" "%o""/> + <delegate decode="webp" command=""@WebPDecodeDelegate@" -pam "%i" -o "%o""/>