summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Timo Gurr <tgurr@exherbo.org> 2017-10-05 13:35:49 +0200
committerAvatar Timo Gurr <tgurr@exherbo.org> 2017-10-05 14:01:58 +0200
commit220a43ca5387c4d270a6ec063851534c78577ce3 (patch)
tree8f9defb73ceb5f269a9a979e601fb5d08f2570c3
parentdae606dda969c714b75158c9337868b06020d1cb (diff)
downloadarbor-220a43ca5387c4d270a6ec063851534c78577ce3.tar.gz
arbor-220a43ca5387c4d270a6ec063851534c78577ce3.tar.xz
urw-fonts: version bump to 20170801
Change-Id: Iee3f41bd2b4b483883199a6f6c64ca0d6276ad13 Reviewed-on: https://galileo.mailstation.de/gerrit/10193 Reviewed-by: Jenkins <wk@mailstation.de> Reviewed-by: Timo Gurr <tgurr@exherbo.org>
-rw-r--r--packages/fonts/urw-fonts/files/70aaae73a0dba9c94c001bfc464b6cb6d1f3d0f9.patch755
-rw-r--r--packages/fonts/urw-fonts/files/766d77767fc912742f3e7236f083e2de8fdfc0e9.patch305
-rw-r--r--packages/fonts/urw-fonts/urw-fonts-20160926.exheres-028
-rw-r--r--packages/fonts/urw-fonts/urw-fonts-20170801.exheres-050
4 files changed, 1110 insertions, 28 deletions
diff --git a/packages/fonts/urw-fonts/files/70aaae73a0dba9c94c001bfc464b6cb6d1f3d0f9.patch b/packages/fonts/urw-fonts/files/70aaae73a0dba9c94c001bfc464b6cb6d1f3d0f9.patch
new file mode 100644
index 0000000..c83b8cf
--- /dev/null
+++ b/packages/fonts/urw-fonts/files/70aaae73a0dba9c94c001bfc464b6cb6d1f3d0f9.patch
@@ -0,0 +1,755 @@
+Source/Upstream: Yes, fixed in git master, https://github.com/ArtifexSoftware/urw-base35-fonts/commit/70aaae73a0dba9c94c001bfc464b6cb6d1f3d0f9
+Reason: split urw-fallback.conf into 3 files
+
+From 70aaae73a0dba9c94c001bfc464b6cb6d1f3d0f9 Mon Sep 17 00:00:00 2001
+From: "David Kaspar [Dee'Kej]" <dkaspar@redhat.com>
+Date: Mon, 25 Sep 2017 14:50:09 +0200
+Subject: [PATCH] fontconfig: split urw-fallback.conf into 3 files
+
+ According to fontconfig upstream, this provides a better granularity,
+ so some distributions do not have to ship all of these mappings.
+---
+ fontconfig/urw-fallback-backwards.conf | 136 ++++++++++++++
+ fontconfig/urw-fallback-generics.conf | 104 +++++++++++
+ fontconfig/urw-fallback-specifics.conf | 138 ++++++++++++++
+ fontconfig/urw-fallback.conf | 332 ---------------------------------
+ 4 files changed, 378 insertions(+), 332 deletions(-)
+ create mode 100644 fontconfig/urw-fallback-backwards.conf
+ create mode 100644 fontconfig/urw-fallback-generics.conf
+ create mode 100644 fontconfig/urw-fallback-specifics.conf
+ delete mode 100644 fontconfig/urw-fallback.conf
+
+diff --git a/fontconfig/urw-fallback-backwards.conf b/fontconfig/urw-fallback-backwards.conf
+new file mode 100644
+index 0000000..d714ac6
+--- /dev/null
++++ b/fontconfig/urw-fallback-backwards.conf
+@@ -0,0 +1,136 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
++
++<!--
++This file is used to alias/map previous versions of font families from (URW)++
++to similar/metric-conmpatible font families of latest font versions from
++(URW)++ itself.
++
++Most likely this aliasing/mapping will be useful for people who:
++ * have latest versions of (URW)++ fonts, but their documents still reference
++ or requires older versions of these fonts
++
++latest URW fonts: previous URW fonts:
++==================== =============================================
++Nimbus Mono PS Nimbus Mono L | Nimbus Mono
++URW Gothic URW Gothic L
++URW Bookman URW Bookman L | Bookman URW
++Z003 URW Chancery L | Chancery URW
++D050000L Dingbats
++Nimbus Sans Nimbus Sans L
++Nimbus Sans Narrow Nimbus Sans Narrow (same as current name)
++C059 Century Schoolbook L | Century SchoolBook URW
++P052 URW Palladio L | Palladio URW
++Standard Symbols PS Standard Symbols L
++Nimbus Roman Nimbus Roman No9 L
++-->
++
++<fontconfig>
++ <!-- Substitutions for backward compatibility with previous versions -->
++ <alias binding="same">
++ <family>Century Schoolbook L</family>
++ <accept>
++ <family>C059</family>
++ </accept>
++ </alias>
++
++ <alias binding="same">
++ <family>Century SchoolBook URW</family>
++ <accept>
++ <family>C059</family>
++ </accept>
++ </alias>
++
++ <alias binding="same">
++ <family>Dingbats</family>
++ <accept>
++ <family>D050000L</family>
++ </accept>
++ </alias>
++
++ <alias binding="same">
++ <family>Nimbus Mono</family>
++ <accept>
++ <family>Nimbus Mono PS</family>
++ </accept>
++ </alias>
++
++ <alias binding="same">
++ <family>Nimbus Mono L</family>
++ <accept>
++ <family>Nimbus Mono PS</family>
++ </accept>
++ </alias>
++
++ <alias binding="same">
++ <family>Nimbus Roman No9 L</family>
++ <accept>
++ <family>Nimbus Roman</family>
++ </accept>
++ </alias>
++
++ <alias binding="same">
++ <family>Nimbus Sans L</family>
++ <accept>
++ <family>Nimbus Sans</family>
++ </accept>
++ </alias>
++
++ <!-- NOTE: Currently there are no previous versions for Nimbus Sans Narrow -->
++
++ <alias binding="same">
++ <family>Palladio URW</family>
++ <accept>
++ <family>P052</family>
++ </accept>
++ </alias>
++
++ <alias binding="same">
++ <family>URW Palladio L</family>
++ <accept>
++ <family>P052</family>
++ </accept>
++ </alias>
++
++ <alias binding="same">
++ <family>Standard Symbols L</family>
++ <accept>
++ <family>Standard Symbols PS</family>
++ </accept>
++ </alias>
++
++ <alias binding="same">
++ <family>Bookman URW</family>
++ <accept>
++ <family>URW Bookman</family>
++ </accept>
++ </alias>
++
++ <alias binding="same">
++ <family>URW Bookman L</family>
++ <accept>
++ <family>URW Bookman</family>
++ </accept>
++ </alias>
++
++ <alias binding="same">
++ <family>URW Gothic L</family>
++ <accept>
++ <family>URW Gothic</family>
++ </accept>
++ </alias>
++
++ <alias binding="same">
++ <family>Chancery URW</family>
++ <accept>
++ <family>Z003</family>
++ </accept>
++ </alias>
++
++ <alias binding="same">
++ <family>URW Chancery L</family>
++ <accept>
++ <family>Z003</family>
++ </accept>
++ </alias>
++</fontconfig>
+diff --git a/fontconfig/urw-fallback-generics.conf b/fontconfig/urw-fallback-generics.conf
+new file mode 100644
+index 0000000..5a51868
+--- /dev/null
++++ b/fontconfig/urw-fallback-generics.conf
+@@ -0,0 +1,104 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
++
++<!--
++This file is used to alias/map previous versions of font families from (URW)++
++to similar/metric-compatible font families - in this case the original
++PostScript fonts (as generics).
++
++Most likely this aliasing/mapping will be useful for people who:
++ * have original PostScript fonts installed, but their documents require some
++ older versions of (URW)++ fonts
++
++PostScript fonts: previous URW fonts:
++====================== =============================================
++Courier Nimbus Mono L | Nimbus Mono
++ITC Avant Garde Gothic URW Gothic L
++ITC Bookman URW Bookman L | Bookman URW
++ITC Zapf Chancery URW Chancery L | Chancery URW
++ITC Zapf Dingbats Dingbats
++Helvetica Nimbus Sans L
++Helvetica Narrow Nimbus Sans Narrow (same as current name)
++New Century Schoolbook Century Schoolbook L | Century SchoolBook URW
++Palatino URW Palladio L | Palladio URW
++Symbol Standard Symbols L
++Times Nimbus Roman No9 L
++-->
++
++<fontconfig>
++ <!-- Map generics to specifics -->
++ <alias binding="same">
++ <family>Courier</family>
++ <accept>
++ <family>Nimbus Mono</family>
++ <family>Nimbus Mono L</family>
++ </accept>
++ </alias>
++
++ <alias binding="same">
++ <family>Helvetica</family>
++ <accept>
++ <family>Nimbus Sans L</family>
++ </accept>
++ </alias>
++
++ <alias binding="same">
++ <family>ITC Avant Garde Gothic</family>
++ <accept>
++ <family>URW Gothic L</family>
++ </accept>
++ </alias>
++
++ <alias binding="same">
++ <family>ITC Bookman</family>
++ <accept>
++ <family>Bookman URW</family>
++ <family>URW Bookman L</family>
++ </accept>
++ </alias>
++
++ <alias binding="same">
++ <family>ITC Zapf Chancery</family>
++ <accept>
++ <family>Chancery URW</family>
++ <family>URW Chancery L</family>
++ </accept>
++ </alias>
++
++ <alias binding="same">
++ <family>ITC Zapf Dingbats</family>
++ <accept>
++ <family>Dingbats</family>
++ </accept>
++ </alias>
++
++ <alias binding="same">
++ <family>New Century Schoolbook</family>
++ <accept>
++ <family>Century Schoolbook L</family>
++ <family>Century SchoolBook URW</family>
++ </accept>
++ </alias>
++
++ <alias binding="same">
++ <family>Palatino</family>
++ <accept>
++ <family>Palladio URW</family>
++ <family>URW Palladio L</family>
++ </accept>
++ </alias>
++
++ <alias binding="same">
++ <family>Symbol</family>
++ <accept>
++ <family>Standard Symbols L</family>
++ </accept>
++ </alias>
++
++ <alias binding="same">
++ <family>Times</family>
++ <accept>
++ <family>Nimbus Roman No9 L</family>
++ </accept>
++ </alias>
++</fontconfig>
+diff --git a/fontconfig/urw-fallback-specifics.conf b/fontconfig/urw-fallback-specifics.conf
+new file mode 100644
+index 0000000..04241a9
+--- /dev/null
++++ b/fontconfig/urw-fallback-specifics.conf
+@@ -0,0 +1,138 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
++
++<!--
++This file is used to alias/map previous versions of font families from (URW)++
++to similar/metric-compatible font families - in this case as original PostScript
++fonts (as specifics).
++
++NOTE: These mappings are already part of fontconfig's config files by default.
++ We are keeping this file just to be complete, or if some distribution
++ needs it in some special case.
++
++Most likely this aliasing/mapping will be useful for people who:
++ * have documents referencing older versions of the (URW)++ fonts, and need to
++ map their similar/metric-compatible fonts via generic font names
++
++PostScript fonts: latest URW fonts: previous URW fonts:
++====================== ==================== =============================================
++Courier Nimbus Mono PS Nimbus Mono L | Nimbus Mono
++ITC Avant Garde Gothic URW Gothic URW Gothic L
++ITC Bookman URW Bookman URW Bookman L | Bookman URW
++ITC Zapf Chancery Z003 URW Chancery L | Chancery URW
++ITC Zapf Dingbats D050000L Dingbats
++Helvetica Nimbus Sans Nimbus Sans L
++Helvetica Narrow Nimbus Sans Narrow Nimbus Sans Narrow (same as current name)
++New Century Schoolbook C059 Century Schoolbook L | Century SchoolBook URW
++Palatino P052 URW Palladio L | Palladio URW
++Symbol Standard Symbols PS Standard Symbols L
++Times Nimbus Roman Nimbus Roman No9 L
++-->
++
++<fontconfig>
++ <!-- Original PostScript base font mapping -->
++ <alias binding="same">
++ <family>Nimbus Mono</family>
++ <default>
++ <family>Courier</family>
++ </default>
++ </alias>
++
++ <alias binding="same">
++ <family>Nimbus Mono L</family>
++ <default>
++ <family>Courier</family>
++ </default>
++ </alias>
++
++ <alias binding="same">
++ <family>Nimbus Sans L</family>
++ <default>
++ <family>Helvetica</family>
++ </default>
++ </alias>
++
++ <alias binding="same">
++ <family>URW Gothic L</family>
++ <default>
++ <family>ITC Avant Garde Gothic</family>
++ </default>
++ </alias>
++
++ <alias binding="same">
++ <family>Bookman URW</family>
++ <default>
++ <family>ITC Bookman</family>
++ </default>
++ </alias>
++
++ <alias binding="same">
++ <family>URW Bookman L</family>
++ <default>
++ <family>ITC Bookman</family>
++ </default>
++ </alias>
++
++ <alias binding="same">
++ <family>Chancery URW</family>
++ <default>
++ <family>ITC Zapf Chancery</family>
++ </default>
++ </alias>
++
++ <alias binding="same">
++ <family>URW Chancery L</family>
++ <default>
++ <family>ITC Zapf Chancery</family>
++ </default>
++ </alias>
++
++ <alias binding="same">
++ <family>Dingbats</family>
++ <default>
++ <family>ITC Zapf Dingbats</family>
++ </default>
++ </alias>
++
++ <alias binding="same">
++ <family>Century Schoolbook L</family>
++ <default>
++ <family>New Century Schoolbook</family>
++ </default>
++ </alias>
++
++ <alias binding="same">
++ <family>Century SchoolBook URW</family>
++ <default>
++ <family>New Century Schoolbook</family>
++ </default>
++ </alias>
++
++ <alias binding="same">
++ <family>Palladio URW</family>
++ <default>
++ <family>Palatino</family>
++ </default>
++ </alias>
++
++ <alias binding="same">
++ <family>URW Palladio L</family>
++ <default>
++ <family>Palatino</family>
++ </default>
++ </alias>
++
++ <alias binding="same">
++ <family>Standard Symbols L</family>
++ <default>
++ <family>Symbol</family>
++ </default>
++ </alias>
++
++ <alias binding="same">
++ <family>Nimbus Roman No9 L</family>
++ <default>
++ <family>Times</family>
++ </default>
++ </alias>
++</fontconfig>
+diff --git a/fontconfig/urw-fallback.conf b/fontconfig/urw-fallback.conf
+deleted file mode 100644
+index b9771b1..0000000
+--- a/fontconfig/urw-fallback.conf
++++ /dev/null
+@@ -1,332 +0,0 @@
+-<?xml version="1.0" encoding="UTF-8"?>
+-<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+-
+-<!--
+-This file is used to alias/map previous versions of font families from (URW)++
+-to similar/metric-compatible font families - either original PostScript fonts
+-(as generics), or newer font versions from (URW)++ itself.
+-
+-Most likely this aliasing/mapping will be useful for people who:
+- * have latest versions of (URW)++ fonts, but their documents still reference
+- or requires older versions of these fonts
+- * have original PostScript fons installed, but their documents require some
+- older versions of (URW)++ fonts
+-
+-PostScript fonts: latest URW fonts: previous URW fonts:
+-====================== ==================== =============================================
+-Courier Nimbus Mono PS Nimbus Mono L | Nimbus Mono
+-ITC Avant Garde Gothic URW Gothic URW Gothic L
+-ITC Bookman URW Bookman URW Bookman L | Bookman URW
+-ITC Zapf Chancery Z003 URW Chancery L | Chancery URW
+-ITC Zapf Dingbats D050000L Dingbats
+-Helvetica Nimbus Sans Nimbus Sans L
+-Helvetica Narrow Nimbus Sans Narrow Nimbus Sans Narrow (same as current name)
+-New Century Schoolbook C059 Century Schoolbook L | Century SchoolBook URW
+-Palatino P052 URW Palladio L | Palladio URW
+-Symbol Standard Symbols PS Standard Symbols L
+-Times Nimbus Roman Nimbus Roman No9 L
+-
+-We want for each of them to fallback to any of these available,
+-but in an order preferring similar designs first. We do this in three steps:
+-
+-1) Map each specific font to original PostScript font family,
+- e.g. Nimbus Mono to Courier
+-
+-2) Map each original PostScript family to its specific font,
+- e.g. Courier to Nimbus Mono
+-
+-3) Alias all previous names of URW fonts to the latest released version,
+- e.g. Nimbus Mono to Nimbus Mono PS
+--->
+-
+-<fontconfig>
+- <!-- Original PostScript base font mapping -->
+- <alias binding="same">
+- <family>Nimbus Mono</family>
+- <default>
+- <family>Courier</family>
+- </default>
+- </alias>
+-
+- <alias binding="same">
+- <family>Nimbus Mono L</family>
+- <default>
+- <family>Courier</family>
+- </default>
+- </alias>
+-
+- <alias binding="same">
+- <family>Nimbus Sans L</family>
+- <default>
+- <family>Helvetica</family>
+- </default>
+- </alias>
+-
+- <alias binding="same">
+- <family>URW Gothic L</family>
+- <default>
+- <family>ITC Avant Garde Gothic</family>
+- </default>
+- </alias>
+-
+- <alias binding="same">
+- <family>Bookman URW</family>
+- <default>
+- <family>ITC Bookman</family>
+- </default>
+- </alias>
+-
+- <alias binding="same">
+- <family>URW Bookman L</family>
+- <default>
+- <family>ITC Bookman</family>
+- </default>
+- </alias>
+-
+- <alias binding="same">
+- <family>Chancery URW</family>
+- <default>
+- <family>ITC Zapf Chancery</family>
+- </default>
+- </alias>
+-
+- <alias binding="same">
+- <family>URW Chancery L</family>
+- <default>
+- <family>ITC Zapf Chancery</family>
+- </default>
+- </alias>
+-
+- <alias binding="same">
+- <family>Dingbats</family>
+- <default>
+- <family>ITC Zapf Dingbats</family>
+- </default>
+- </alias>
+-
+- <alias binding="same">
+- <family>Century Schoolbook L</family>
+- <default>
+- <family>New Century Schoolbook</family>
+- </default>
+- </alias>
+-
+- <alias binding="same">
+- <family>Century SchoolBook URW</family>
+- <default>
+- <family>New Century Schoolbook</family>
+- </default>
+- </alias>
+-
+- <alias binding="same">
+- <family>Palladio URW</family>
+- <default>
+- <family>Palatino</family>
+- </default>
+- </alias>
+-
+- <alias binding="same">
+- <family>URW Palladio L</family>
+- <default>
+- <family>Palatino</family>
+- </default>
+- </alias>
+-
+- <alias binding="same">
+- <family>Standard Symbols L</family>
+- <default>
+- <family>Symbol</family>
+- </default>
+- </alias>
+-
+- <alias binding="same">
+- <family>Nimbus Roman No9 L</family>
+- <default>
+- <family>Times</family>
+- </default>
+- </alias>
+-
+- <!-- Map generics to specifics -->
+- <alias binding="same">
+- <family>Courier</family>
+- <accept>
+- <family>Nimbus Mono</family>
+- <family>Nimbus Mono L</family>
+- </accept>
+- </alias>
+-
+- <alias binding="same">
+- <family>Helvetica</family>
+- <accept>
+- <family>Nimbus Sans L</family>
+- </accept>
+- </alias>
+-
+- <alias binding="same">
+- <family>ITC Avant Garde Gothic</family>
+- <accept>
+- <family>URW Gothic L</family>
+- </accept>
+- </alias>
+-
+- <alias binding="same">
+- <family>ITC Bookman</family>
+- <accept>
+- <family>Bookman URW</family>
+- <family>URW Bookman L</family>
+- </accept>
+- </alias>
+-
+- <alias binding="same">
+- <family>ITC Zapf Chancery</family>
+- <accept>
+- <family>Chancery URW</family>
+- <family>URW Chancery L</family>
+- </accept>
+- </alias>
+-
+- <alias binding="same">
+- <family>ITC Zapf Dingbats</family>
+- <accept>
+- <family>Dingbats</family>
+- </accept>
+- </alias>
+-
+- <alias binding="same">
+- <family>New Century Schoolbook</family>
+- <accept>
+- <family>Century Schoolbook L</family>
+- <family>Century SchoolBook URW</family>
+- </accept>
+- </alias>
+-
+- <alias binding="same">
+- <family>Palatino</family>
+- <accept>
+- <family>Palladio URW</family>
+- <family>URW Palladio L</family>
+- </accept>
+- </alias>
+-
+- <alias binding="same">
+- <family>Symbol</family>
+- <accept>
+- <family>Standard Symbols L</family>
+- </accept>
+- </alias>
+-
+- <alias binding="same">
+- <family>Times</family>
+- <accept>
+- <family>Nimbus Roman No9 L</family>
+- </accept>
+- </alias>
+-
+- <!-- Substitutions for backward compatibility with previous versions -->
+- <alias binding="same">
+- <family>Century Schoolbook L</family>
+- <accept>
+- <family>C059</family>
+- </accept>
+- </alias>
+-
+- <alias binding="same">
+- <family>Century SchoolBook URW</family>
+- <accept>
+- <family>C059</family>
+- </accept>
+- </alias>
+-
+- <alias binding="same">
+- <family>Dingbats</family>
+- <accept>
+- <family>D050000L</family>
+- </accept>
+- </alias>
+-
+- <alias binding="same">
+- <family>Nimbus Mono</family>
+- <accept>
+- <family>Nimbus Mono PS</family>
+- </accept>
+- </alias>
+-
+- <alias binding="same">
+- <family>Nimbus Mono L</family>
+- <accept>
+- <family>Nimbus Mono PS</family>
+- </accept>
+- </alias>
+-
+- <alias binding="same">
+- <family>Nimbus Roman No9 L</family>
+- <accept>
+- <family>Nimbus Roman</family>
+- </accept>
+- </alias>
+-
+- <alias binding="same">
+- <family>Nimbus Sans L</family>
+- <accept>
+- <family>Nimbus Sans</family>
+- </accept>
+- </alias>
+-
+- <!-- NOTE: Currently there are no previous versions for Nimbus Sans Narrow -->
+-
+- <alias binding="same">
+- <family>Palladio URW</family>
+- <accept>
+- <family>P052</family>
+- </accept>
+- </alias>
+-
+- <alias binding="same">
+- <family>URW Palladio L</family>
+- <accept>
+- <family>P052</family>
+- </accept>
+- </alias>
+-
+- <alias binding="same">
+- <family>Standard Symbols L</family>
+- <accept>
+- <family>Standard Symbols PS</family>
+- </accept>
+- </alias>
+-
+- <alias binding="same">
+- <family>Bookman URW</family>
+- <accept>
+- <family>URW Bookman</family>
+- </accept>
+- </alias>
+-
+- <alias binding="same">
+- <family>URW Bookman L</family>
+- <accept>
+- <family>URW Bookman</family>
+- </accept>
+- </alias>
+-
+- <alias binding="same">
+- <family>URW Gothic L</family>
+- <accept>
+- <family>URW Gothic</family>
+- </accept>
+- </alias>
+-
+- <alias binding="same">
+- <family>Chancery URW</family>
+- <accept>
+- <family>Z003</family>
+- </accept>
+- </alias>
+-
+- <alias binding="same">
+- <family>URW Chancery L</family>
+- <accept>
+- <family>Z003</family>
+- </accept>
+- </alias>
+-</fontconfig>
diff --git a/packages/fonts/urw-fonts/files/766d77767fc912742f3e7236f083e2de8fdfc0e9.patch b/packages/fonts/urw-fonts/files/766d77767fc912742f3e7236f083e2de8fdfc0e9.patch
new file mode 100644
index 0000000..a55fab5
--- /dev/null
+++ b/packages/fonts/urw-fonts/files/766d77767fc912742f3e7236f083e2de8fdfc0e9.patch
@@ -0,0 +1,305 @@
+Source/Upstream: Yes, fixed in git master, https://github.com/ArtifexSoftware/urw-base35-fonts/commit/766d77767fc912742f3e7236f083e2de8fdfc0e9
+Reason: appstream: fix typos and syntax errors
+
+From 766d77767fc912742f3e7236f083e2de8fdfc0e9 Mon Sep 17 00:00:00 2001
+From: Fabian Greffrath <fabian@greffrath.com>
+Date: Mon, 2 Oct 2017 11:08:26 +0200
+Subject: [PATCH] appstream: fix typos and syntax errors
+
+ * "update_conctact" should be "update_contact"
+ * XML comments are closed with "-->", i.e. without an extra
+ exclamation mark
+
+Fixes https://github.com/ArtifexSoftware/urw-base35-fonts/issues/10
+---
+ appstream/de.urwpp.C059.metainfo.xml | 4 ++--
+ appstream/de.urwpp.D050000L.metainfo.xml | 4 ++--
+ appstream/de.urwpp.NimbusMonoPS.metainfo.xml | 4 ++--
+ appstream/de.urwpp.NimbusRoman.metainfo.xml | 4 ++--
+ appstream/de.urwpp.NimbusSans.metainfo.xml | 4 ++--
+ appstream/de.urwpp.NimbusSansNarrow.metainfo.xml | 4 ++--
+ appstream/de.urwpp.P052.metainfo.xml | 4 ++--
+ appstream/de.urwpp.StandardSymbolsPS.metainfo.xml | 4 ++--
+ appstream/de.urwpp.URWBookman.metainfo.xml | 4 ++--
+ appstream/de.urwpp.URWCoreFontSetLevel2.metainfo.xml | 10 +++++-----
+ appstream/de.urwpp.URWGothic.metainfo.xml | 4 ++--
+ appstream/de.urwpp.Z003.metainfo.xml | 4 ++--
+ 12 files changed, 27 insertions(+), 27 deletions(-)
+
+diff --git a/appstream/de.urwpp.C059.metainfo.xml b/appstream/de.urwpp.C059.metainfo.xml
+index a022a0e..318e115 100644
+--- a/appstream/de.urwpp.C059.metainfo.xml
++++ b/appstream/de.urwpp.C059.metainfo.xml
+@@ -9,7 +9,7 @@
+ <url type="homepage">https://www.urwpp.de/en/</url>
+ <url type="bugtracker">https://bugs.ghostscript.com/</url>
+
+- <update_conctact>dkaspar@redhat.com</update_contact>
++ <update_contact>dkaspar@redhat.com</update_contact>
+
+ <name>C059</name>
+ <summary>An alternative font family for New Century Schoolbook typeface</summary>
+@@ -45,7 +45,7 @@
+ <id>de.urwpp.Z003</id>
+ </suggests>
+
+- <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream --!>
++ <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream -->
+ <releases>
+ <release version="20170801" date="2017-08-01" />
+ <release version="20160926" date="2016-09-26" />
+diff --git a/appstream/de.urwpp.D050000L.metainfo.xml b/appstream/de.urwpp.D050000L.metainfo.xml
+index 107519b..dce5db7 100644
+--- a/appstream/de.urwpp.D050000L.metainfo.xml
++++ b/appstream/de.urwpp.D050000L.metainfo.xml
+@@ -9,7 +9,7 @@
+ <url type="homepage">https://www.urwpp.de/en/</url>
+ <url type="bugtracker">https://bugs.ghostscript.com/</url>
+
+- <update_conctact>dkaspar@redhat.com</update_contact>
++ <update_contact>dkaspar@redhat.com</update_contact>
+
+ <name>D050000L</name>
+ <summary>An alternative font for ITC Zapf Dingbats typeface</summary>
+@@ -42,7 +42,7 @@
+ <id>de.urwpp.Z003</id>
+ </suggests>
+
+- <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream --!>
++ <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream -->
+ <releases>
+ <release version="20170801" date="2017-08-01" />
+ <release version="20160926" date="2016-09-26" />
+diff --git a/appstream/de.urwpp.NimbusMonoPS.metainfo.xml b/appstream/de.urwpp.NimbusMonoPS.metainfo.xml
+index 5db4919..4cdf5e1 100644
+--- a/appstream/de.urwpp.NimbusMonoPS.metainfo.xml
++++ b/appstream/de.urwpp.NimbusMonoPS.metainfo.xml
+@@ -9,7 +9,7 @@
+ <url type="homepage">https://www.urwpp.de/en/</url>
+ <url type="bugtracker">https://bugs.ghostscript.com/</url>
+
+- <update_conctact>dkaspar@redhat.com</update_contact>
++ <update_contact>dkaspar@redhat.com</update_contact>
+
+ <name>Nimbus Mono PS</name>
+ <summary>An alternative font family for Courier typeface</summary>
+@@ -45,7 +45,7 @@
+ <id>de.urwpp.Z003</id>
+ </suggests>
+
+- <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream --!>
++ <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream -->
+ <releases>
+ <release version="20170801" date="2017-08-01" />
+ <release version="20160926" date="2016-09-26" />
+diff --git a/appstream/de.urwpp.NimbusRoman.metainfo.xml b/appstream/de.urwpp.NimbusRoman.metainfo.xml
+index 447857f..a085577 100644
+--- a/appstream/de.urwpp.NimbusRoman.metainfo.xml
++++ b/appstream/de.urwpp.NimbusRoman.metainfo.xml
+@@ -9,7 +9,7 @@
+ <url type="homepage">https://www.urwpp.de/en/</url>
+ <url type="bugtracker">https://bugs.ghostscript.com/</url>
+
+- <update_conctact>dkaspar@redhat.com</update_contact>
++ <update_contact>dkaspar@redhat.com</update_contact>
+
+ <name>Nimbus Roman</name>
+ <summary>An alternative font family for Times New Roman typeface</summary>
+@@ -45,7 +45,7 @@
+ <id>de.urwpp.Z003</id>
+ </suggests>
+
+- <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream --!>
++ <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream -->
+ <releases>
+ <release version="20170801" date="2017-08-01" />
+ <release version="20160926" date="2016-09-26" />
+diff --git a/appstream/de.urwpp.NimbusSans.metainfo.xml b/appstream/de.urwpp.NimbusSans.metainfo.xml
+index 1aa3468..28d9c96 100644
+--- a/appstream/de.urwpp.NimbusSans.metainfo.xml
++++ b/appstream/de.urwpp.NimbusSans.metainfo.xml
+@@ -9,7 +9,7 @@
+ <url type="homepage">https://www.urwpp.de/en/</url>
+ <url type="bugtracker">https://bugs.ghostscript.com/</url>
+
+- <update_conctact>dkaspar@redhat.com</update_contact>
++ <update_contact>dkaspar@redhat.com</update_contact>
+
+ <name>Nimbus Sans</name>
+ <summary>An alternative font family for Helvetica typeface</summary>
+@@ -45,7 +45,7 @@
+ <id>de.urwpp.Z003</id>
+ </suggests>
+
+- <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream --!>
++ <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream -->
+ <releases>
+ <release version="20170801" date="2017-08-01" />
+ <release version="20160926" date="2016-09-26" />
+diff --git a/appstream/de.urwpp.NimbusSansNarrow.metainfo.xml b/appstream/de.urwpp.NimbusSansNarrow.metainfo.xml
+index cdc133b..3db3163 100644
+--- a/appstream/de.urwpp.NimbusSansNarrow.metainfo.xml
++++ b/appstream/de.urwpp.NimbusSansNarrow.metainfo.xml
+@@ -9,7 +9,7 @@
+ <url type="homepage">https://www.urwpp.de/en/</url>
+ <url type="bugtracker">https://bugs.ghostscript.com/</url>
+
+- <update_conctact>dkaspar@redhat.com</update_contact>
++ <update_contact>dkaspar@redhat.com</update_contact>
+
+ <name>Nimbus Sans Narrow</name>
+ <summary>An alternative font family for Helvetica Condensed typeface</summary>
+@@ -45,7 +45,7 @@
+ <id>de.urwpp.Z003</id>
+ </suggests>
+
+- <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream --!>
++ <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream -->
+ <releases>
+ <release version="20170801" date="2017-08-01" />
+ <release version="20160926" date="2016-09-26" />
+diff --git a/appstream/de.urwpp.P052.metainfo.xml b/appstream/de.urwpp.P052.metainfo.xml
+index 32dbb35..c7dc06a 100644
+--- a/appstream/de.urwpp.P052.metainfo.xml
++++ b/appstream/de.urwpp.P052.metainfo.xml
+@@ -9,7 +9,7 @@
+ <url type="homepage">https://www.urwpp.de/en/</url>
+ <url type="bugtracker">https://bugs.ghostscript.com/</url>
+
+- <update_conctact>dkaspar@redhat.com</update_contact>
++ <update_contact>dkaspar@redhat.com</update_contact>
+
+ <name>P052</name>
+ <summary>An alternative font family for Palatino typeface</summary>
+@@ -45,7 +45,7 @@
+ <id>de.urwpp.Z003</id>
+ </suggests>
+
+- <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream --!>
++ <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream -->
+ <releases>
+ <release version="20170801" date="2017-08-01" />
+ <release version="20160926" date="2016-09-26" />
+diff --git a/appstream/de.urwpp.StandardSymbolsPS.metainfo.xml b/appstream/de.urwpp.StandardSymbolsPS.metainfo.xml
+index aaab157..88c102e 100644
+--- a/appstream/de.urwpp.StandardSymbolsPS.metainfo.xml
++++ b/appstream/de.urwpp.StandardSymbolsPS.metainfo.xml
+@@ -9,7 +9,7 @@
+ <url type="homepage">https://www.urwpp.de/en/</url>
+ <url type="bugtracker">https://bugs.ghostscript.com/</url>
+
+- <update_conctact>dkaspar@redhat.com</update_contact>
++ <update_contact>dkaspar@redhat.com</update_contact>
+
+ <name>Standard Symbols PS</name>
+ <summary>An alternative font for Symbol typeface</summary>
+@@ -42,7 +42,7 @@
+ <id>de.urwpp.Z003</id>
+ </suggests>
+
+- <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream --!>
++ <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream -->
+ <releases>
+ <release version="20170801" date="2017-08-01" />
+ <release version="20160926" date="2016-09-26" />
+diff --git a/appstream/de.urwpp.URWBookman.metainfo.xml b/appstream/de.urwpp.URWBookman.metainfo.xml
+index bd3211f..369dc52 100644
+--- a/appstream/de.urwpp.URWBookman.metainfo.xml
++++ b/appstream/de.urwpp.URWBookman.metainfo.xml
+@@ -9,7 +9,7 @@
+ <url type="homepage">https://www.urwpp.de/en/</url>
+ <url type="bugtracker">https://bugs.ghostscript.com/</url>
+
+- <update_conctact>dkaspar@redhat.com</update_contact>
++ <update_contact>dkaspar@redhat.com</update_contact>
+
+ <name>URW Bookman</name>
+ <summary>An alternative font family for ITC Bookman typeface</summary>
+@@ -45,7 +45,7 @@
+ <id>de.urwpp.Z003</id>
+ </suggests>
+
+- <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream --!>
++ <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream -->
+ <releases>
+ <release version="20170801" date="2017-08-01" />
+ <release version="20160926" date="2016-09-26" />
+diff --git a/appstream/de.urwpp.URWCoreFontSetLevel2.metainfo.xml b/appstream/de.urwpp.URWCoreFontSetLevel2.metainfo.xml
+index 0a0c19a..ba2988a 100644
+--- a/appstream/de.urwpp.URWCoreFontSetLevel2.metainfo.xml
++++ b/appstream/de.urwpp.URWCoreFontSetLevel2.metainfo.xml
+@@ -9,9 +9,9 @@
+ <url type="homepage">https://www.urwpp.de/en/</url>
+ <url type="bugtracker">https://bugs.ghostscript.com/</url>
+
+- <update_conctact>dkaspar@redhat.com</update_contact>
++ <update_contact>dkaspar@redhat.com</update_contact>
+
+- <!-- NOTE: This is a meta-package to install all the Level 2 fonts --!>
++ <!-- NOTE: This is a meta-package to install all the Level 2 fonts -->
+ <name>(URW)++ Core Font Set [Level 2]</name>
+ <summary>An alternative font family for New Century Schoolbook typeface</summary>
+ <description>
+@@ -64,15 +64,15 @@
+ <font>Z003 Medium Italic</font>
+ </provides>
+
+- <!-- NOTE: No <suggests/> tag here, this metapackages provides all fonts ^--!>
++ <!-- NOTE: No <suggests/> tag here, this metapackages provides all fonts ^-->
+
+- <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream --!>
++ <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream -->
+ <releases>
+ <release version="20170801" date="2017-08-01" />
+ <release version="20160926" date="2016-09-26" />
+ </releases>
+
+- <!-- NOTE: These font locales are superset of all languages supported --!>
++ <!-- NOTE: These font locales are superset of all languages supported -->
+ <languages>
+ <lang>aa</lang>
+ <lang>af</lang>
+diff --git a/appstream/de.urwpp.URWGothic.metainfo.xml b/appstream/de.urwpp.URWGothic.metainfo.xml
+index 699f169..9fe308d 100644
+--- a/appstream/de.urwpp.URWGothic.metainfo.xml
++++ b/appstream/de.urwpp.URWGothic.metainfo.xml
+@@ -9,7 +9,7 @@
+ <url type="homepage">https://www.urwpp.de/en/</url>
+ <url type="bugtracker">https://bugs.ghostscript.com/</url>
+
+- <update_conctact>dkaspar@redhat.com</update_contact>
++ <update_contact>dkaspar@redhat.com</update_contact>
+
+ <name>URW Gothic</name>
+ <summary>An alternative font family for ITC Avant Garde Gothic typeface</summary>
+@@ -45,7 +45,7 @@
+ <id>de.urwpp.Z003</id>
+ </suggests>
+
+- <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream --!>
++ <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream -->
+ <releases>
+ <release version="20170801" date="2017-08-01" />
+ <release version="20160926" date="2016-09-26" />
+diff --git a/appstream/de.urwpp.Z003.metainfo.xml b/appstream/de.urwpp.Z003.metainfo.xml
+index b36065f..f1a4cd7 100644
+--- a/appstream/de.urwpp.Z003.metainfo.xml
++++ b/appstream/de.urwpp.Z003.metainfo.xml
+@@ -9,7 +9,7 @@
+ <url type="homepage">https://www.urwpp.de/en/</url>
+ <url type="bugtracker">https://bugs.ghostscript.com/</url>
+
+- <update_conctact>dkaspar@redhat.com</update_contact>
++ <update_contact>dkaspar@redhat.com</update_contact>
+
+ <name>Z003</name>
+ <summary>An alternative font for ITC Zapf Chancery typeface</summary>
+@@ -42,7 +42,7 @@
+ <id>de.urwpp.URWGothic</id>
+ </suggests>
+
+- <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream --!>
++ <!-- NOTE: Medium urgency of updates is implicitly assumed with AppStream -->
+ <releases>
+ <release version="20170801" date="2017-08-01" />
+ <release version="20160926" date="2016-09-26" />
diff --git a/packages/fonts/urw-fonts/urw-fonts-20160926.exheres-0 b/packages/fonts/urw-fonts/urw-fonts-20160926.exheres-0
deleted file mode 100644
index 68efb91..0000000
--- a/packages/fonts/urw-fonts/urw-fonts-20160926.exheres-0
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2011-2016 Timo Gurr <tgurr@exherbo.org>
-# Distributed under the terms of the GNU General Public License v2
-
-MY_PN=${PN/fonts/base35}
-
-SUMMARY="Free versions of the 35 standard PostScript fonts"
-HOMEPAGE="http://git.ghostscript.com/?p=urw-core35-fonts.git"
-DOWNLOADS="http://downloads.ghostscript.com/public/fonts/${MY_PN}-${PV}.zip"
-
-LICENCES="AGPL-3"
-SLOT="0"
-PLATFORMS="~amd64 ~x86"
-MYOPTIONS=""
-
-DEPENDENCIES="
- build:
- app-arch/unzip
-"
-
-WORK=${WORKBASE}
-
-src_install() {
- default
-
- insinto /usr/share/fonts/X11/${PN}
- doins *.{afm,t1}
-}
-
diff --git a/packages/fonts/urw-fonts/urw-fonts-20170801.exheres-0 b/packages/fonts/urw-fonts/urw-fonts-20170801.exheres-0
new file mode 100644
index 0000000..a45ec67
--- /dev/null
+++ b/packages/fonts/urw-fonts/urw-fonts-20170801.exheres-0
@@ -0,0 +1,50 @@
+# Copyright 2011-2017 Timo Gurr <tgurr@exherbo.org>
+# Distributed under the terms of the GNU General Public License v2
+
+MY_PN=${PN/fonts/base35-fonts}
+
+require github [ user=ArtifexSoftware pn=${MY_PN} tag=${PV} ]
+
+SUMMARY="Free versions of the 35 standard PostScript fonts"
+
+LICENCES="AGPL-3"
+SLOT="0"
+PLATFORMS="~amd64 ~x86"
+MYOPTIONS=""
+
+DEPENDENCIES=""
+
+DEFAULT_SRC_PREPARE_PATCHES=(
+ "${FILES}"/70aaae73a0dba9c94c001bfc464b6cb6d1f3d0f9.patch
+ "${FILES}"/766d77767fc912742f3e7236f083e2de8fdfc0e9.patch
+)
+
+src_install() {
+ default
+
+ insinto /usr/share/fonts/X11/${PN}
+ doins fonts/*.{afm,t1}
+
+ # No use-cases for this as far as we know
+ edo rm fontconfig/urw-fallback-generics.conf
+
+ # Install the fontconfig files with correct priority for our distribution
+ local fontconfig_prio=60
+ for file in fontconfig/*.conf; do
+ # Rename
+ DISTRO_FILENAME="${fontconfig_prio}-$(basename $file)"
+ edo mv $file $DISTRO_FILENAME
+
+ # Install
+ insinto /usr/share/fontconfig/conf.avail
+ doins *.conf
+
+ # Enable by default
+ dodir /etc/fonts/conf.d
+ edo ln -sf /usr/share/fontconfig/conf.avail/$DISTRO_FILENAME "${IMAGE}"/etc/fonts/conf.d/$DISTRO_FILENAME
+ done
+
+ insinto /usr/share/metainfo
+ doins appstream/*.xml
+}
+