[arch-commits] Commit in ghostscript/trunk (2 files)

[Jan Steffens]

    Date: Monday, December 25, 2017 @ 23:10:45
  Author: heftig
Revision: 313626

Return to bundled fonts (FS#56849)

Modified:
  ghostscript/trunk/PKGBUILD
Deleted:
  ghostscript/trunk/ghostscript-9.22-fix-Fontmap.GS.patch

---------------------------------------+
 PKGBUILD                              |   21 ++--------
 ghostscript-9.22-fix-Fontmap.GS.patch |   63 --------------------------------
 2 files changed, 4 insertions(+), 80 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-25 22:42:44 UTC (rev 313625)
+++ PKGBUILD	2017-12-25 23:10:45 UTC (rev 313626)
@@ -4,29 +4,23 @@
 pkgbase=ghostscript
 pkgname=(ghostscript ghostxps ghostpcl)
 pkgver=9.22
-pkgrel=4
+pkgrel=5
 pkgdesc="An interpreter for the PostScript language"
 url="https://www.ghostscript.com/"
 arch=('x86_64')
 license=('AGPL' 'custom')
 depends=('libxt' 'libcups' 'fontconfig' 'zlib' 'libpng' 'libjpeg' 'jbig2dec'
-         'libtiff' 'lcms2' 'dbus' 'libpaper' 'ijs' 'gsfonts' 'poppler-data'
-         'openjpeg2')
+         'libtiff' 'lcms2' 'dbus' 'libpaper' 'ijs' 'poppler-data' 'openjpeg2')
 makedepends=('gtk3' 'gnutls' 'glu' 'freeglut')
 # https://github.com/ArtifexSoftware/ghostpdl-downloads/releases
 source=(https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${pkgver/./}/ghostpdl-${pkgver}.tar.xz
-        ghostscript-9.22-fix-Fontmap.GS.patch ghostscript-9.22-restore-flushpage.patch)
+        ghostscript-9.22-restore-flushpage.patch)
 sha256sums=('f4e46bc1f8285a61ab036007705fc2b532cc40f4448fe6bc156bd130733f306b'
-            '77018e388fb56761eb3d8966b3fe0d6f2313c17964e38077395b34e39549551c'
             '22156c892ea27572386f5211f51a10a17079a9974ded9ec9af3f37a93a1bb8ca')
 
 prepare() {
   cd ghostpdl-${pkgver}
 
-  # https://bugs.archlinux.org/task/56778
-  # https://bugzilla.redhat.com/show_bug.cgi?id=1517518
-  patch -Np1 --no-backup-if-mismatch -i ../ghostscript-9.22-fix-Fontmap.GS.patch
-
   # http://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=19ebb5f1f497b6f2d50fe13d17d3e627dfb6c868
   patch -Np1 --no-backup-if-mismatch -i ../ghostscript-9.22-restore-flushpage.patch
 
@@ -40,11 +34,7 @@
   cd ghostpdl-${pkgver}
 
   local fontpath p
-  for p in \
-    /usr/share/fonts/gsfonts \
-    /usr/share/fonts \
-    /usr/share/poppler/cMap/*
-  do
+  for p in /usr/share/poppler/cMap/*; do
     fontpath="${fontpath}${fontpath:+:}${p}"
   done
 
@@ -85,9 +75,6 @@
   # remove unwanted localized manpages
   rm -r "${pkgdir}"/usr/share/man/de
 
-  # remove fonts we already ship in gsfonts
-  rm -r "${pkgdir}"/usr/share/ghostscript/${pkgver}/Resource/Font
-
   # remove cmaps we already ship in poppler-data
   local f
   for f in "${pkgdir}"/usr/share/ghostscript/${pkgver}/Resource/CMap/*; do

Deleted: ghostscript-9.22-fix-Fontmap.GS.patch
===================================================================
--- ghostscript-9.22-fix-Fontmap.GS.patch	2017-12-25 22:42:44 UTC (rev 313625)
+++ ghostscript-9.22-fix-Fontmap.GS.patch	2017-12-25 23:10:45 UTC (rev 313626)
@@ -1,63 +0,0 @@
-From efc24229b0ba4b2f6a39fe89a4c9c576dbe7e124 Mon Sep 17 00:00:00 2001
-From: "David Kaspar [Dee'Kej]" <dkaspar at redhat.com>
-Date: Mon, 27 Nov 2017 10:30:52 +0100
-Subject: [PATCH] Bug 698784: Fix the alias for Helvetica-Narrow-Bold-Oblique
-
-Init/Fontmap.GS:
-
-There was a misalignment between the filename of the
-NimbusSansNarrow-BdOblique and its /Fontname in the T1 font itself.
-
-Filename:   NimbusSansNarrow-BdOblique
-/Fontname: /NimbusSansNarrow-BoldOblique
-
-This worked correctly if the fonts were located directly in
-/usr/share/ghostcript/Resources/Font folder on the filesystem.
-
-However, on Fedora we are using /usr/share/fonts/urw-base35/ folder,
-which is part of Ghostscript's Search Path. In this case it was
-causing the Ghostscript being unable to locate the correct font, thus
-crashing while opening any document containing Helvetica Narrow Bold
-Oblique font...
-
-*In addition*, rename the font file so it matches.
----
- ...busSansNarrow-BdOblique => NimbusSansNarrow-BoldOblique} | Bin
- Resource/Init/Fontmap.GS                                    |   2 +-
- psi/psromfs.mak                                             |   2 +-
- 3 files changed, 2 insertions(+), 2 deletions(-)
- rename Resource/Font/{NimbusSansNarrow-BdOblique => NimbusSansNarrow-BoldOblique} (100%)
-
-diff --git a/Resource/Font/NimbusSansNarrow-BdOblique b/Resource/Font/NimbusSansNarrow-BoldOblique
-similarity index 100%
-rename from Resource/Font/NimbusSansNarrow-BdOblique
-rename to Resource/Font/NimbusSansNarrow-BoldOblique
-diff --git a/Resource/Init/Fontmap.GS b/Resource/Init/Fontmap.GS
-index 7770c67..cbda218 100644
---- a/Resource/Init/Fontmap.GS
-+++ b/Resource/Init/Fontmap.GS
-@@ -96,7 +96,7 @@
- /Helvetica-Bold			/NimbusSans-Bold ;
- /Helvetica-BoldOblique		/NimbusSans-BoldItalic      ;
- /Helvetica-Narrow-Bold		/NimbusSansNarrow-Bold    ;
--/Helvetica-Narrow-BoldOblique	/NimbusSansNarrow-BdOblique        ;
-+/Helvetica-Narrow-BoldOblique	/NimbusSansNarrow-BoldOblique        ;
- /Helvetica-Narrow		/NimbusSansNarrow-Regular    ;
- /Helvetica-Narrow-Oblique	/NimbusSansNarrow-Oblique        ;
- /Helvetica			/NimbusSans-Regular ;
-diff --git a/psi/psromfs.mak b/psi/psromfs.mak
-index cbb1163..34e5b5f 100644
---- a/psi/psromfs.mak
-+++ b/psi/psromfs.mak
-@@ -333,7 +333,7 @@ PS_FONT_DEPS=\
- 	$(PSRESDIR)$(D)Font$(D)NimbusRoman-Regular \
- 	$(PSRESDIR)$(D)Font$(D)NimbusSans-Bold \
- 	$(PSRESDIR)$(D)Font$(D)NimbusSans-BoldItalic \
--	$(PSRESDIR)$(D)Font$(D)NimbusSansNarrow-BdOblique \
-+	$(PSRESDIR)$(D)Font$(D)NimbusSansNarrow-BoldOblique \
- 	$(PSRESDIR)$(D)Font$(D)NimbusSansNarrow-Bold \
- 	$(PSRESDIR)$(D)Font$(D)NimbusSansNarrow-Oblique \
- 	$(PSRESDIR)$(D)Font$(D)NimbusSansNarrow-Regular \
--- 
-2.9.5
-