bug#27107: [PATCH] gnu: font-comic-neue: Add fontconfig alias.

[Alex Griffin <a@ajgrf.com>]

[-- Attachment #1: Type: text/plain, Size: 278 bytes --]

On Sun, May 28, 2017, at 11:38 AM, Arun Isaac wrote:
> Finally, we should have two patches -- the first patch to re-indent and
> switch to the new font-build-system, the second patch to add the
> fontconfig alias.

Okay, attached are the changes you asked for.
-- 
Alex Griffin

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-font-comic-neue-Use-font-build-system.patch --]
[-- Type: text/x-patch; name="0001-gnu-font-comic-neue-Use-font-build-system.patch", Size: 3167 bytes --]

From d64d948dabfde51dc982363168ac46ecddf84f10 Mon Sep 17 00:00:00 2001
From: Alex Griffin <a@ajgrf.com>
Date: Wed, 31 May 2017 11:41:52 -0500
Subject: [PATCH 1/2] gnu: font-comic-neue: Use 'font-build-system'.

* gnu/packages/fonts.scm (font-comic-neue): Switch to font-build-system.
Re-indent.
[source]: Use url-fetch/zipbomb.
[native-inputs]: Remove dependency on unzip.
---
 gnu/packages/fonts.scm | 53 ++++++++++++++++++++------------------------------
 1 file changed, 21 insertions(+), 32 deletions(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index ef0642f79..c2ce783c8 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -1166,39 +1166,28 @@ later hand-tweaked with the gbdfed(1) editor:
 
 (define-public font-comic-neue
   (package
-   (name "font-comic-neue")
-   (version "2.3")
-   (source (origin
-            (method url-fetch)
-            (uri (string-append
-                  "http://www.comicneue.com/comic-neue-" version ".zip"))
-            (sha256
-             (base32
-              "1695hkpd8kqnr2a88p8xs496slgzxjjkzpa9aa33ml3pnh7519zk"))))
-   (build-system trivial-build-system)
-   (arguments
-    `(#:modules ((guix build utils))
-      #:builder (begin
-                  (use-modules (guix build utils))
-                  (let ((font-dir (string-append %output
-                                                 "/share/fonts/truetype"))
-                        (source (assoc-ref %build-inputs "source"))
-                        (unzip  (string-append (assoc-ref %build-inputs "unzip")
-                                               "/bin/unzip")))
-                    (mkdir-p font-dir)
-                    (system* unzip source)
-                    (with-directory-excursion
-                     (string-append "Web")
-                     (for-each (lambda (ttf)
-                                 (install-file ttf font-dir))
-                               (find-files "." "\\.ttf$")))))))
-   (native-inputs `(("unzip" ,unzip)))
-   (home-page "http://www.comicneue.com/")
-   (synopsis "Font that fixes the shortcomings of Comic Sans")
-   (description
-    "Comic Neue is a font that attempts to create a respectable casual
+    (name "font-comic-neue")
+    (version "2.3")
+    (source (origin
+              (method url-fetch/zipbomb)
+              (uri (string-append
+                    "http://www.comicneue.com/comic-neue-" version ".zip"))
+              (sha256
+               (base32
+                "1695hkpd8kqnr2a88p8xs496slgzxjjkzpa9aa33ml3pnh7519zk"))))
+    (build-system font-build-system)
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'install 'chdir
+           (lambda _
+             (chdir "Web"))))))
+    (home-page "http://www.comicneue.com/")
+    (synopsis "Font that fixes the shortcomings of Comic Sans")
+    (description
+     "Comic Neue is a font that attempts to create a respectable casual
 typeface, by mimicking Comic Sans while fixing its most obvious shortcomings.")
-   (license license:silofl1.1)))
+    (license license:silofl1.1)))
 
 (define-public font-iosevka
   (package
-- 
2.13.0


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-font-comic-neue-Add-fontconfig-alias.patch --]
[-- Type: text/x-patch; name="0002-gnu-font-comic-neue-Add-fontconfig-alias.patch", Size: 1714 bytes --]

From 5e7d72d7a23eefd862273a0c57dadd11117d5abf Mon Sep 17 00:00:00 2001
From: Alex Griffin <a@ajgrf.com>
Date: Wed, 31 May 2017 11:51:41 -0500
Subject: [PATCH 2/2] gnu: font-comic-neue: Add fontconfig alias.

* gnu/packages/fonts.scm (font-comic-neue): Add fontconfig alias for
Comic Sans.
[arguments]: Add new 'install-conf' phase.
---
 gnu/packages/fonts.scm | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index c2ce783c8..746981806 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -1181,7 +1181,26 @@ later hand-tweaked with the gbdfed(1) editor:
        (modify-phases %standard-phases
          (add-before 'install 'chdir
            (lambda _
-             (chdir "Web"))))))
+             (chdir "Web")))
+         (add-after 'install 'install-conf
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((conf-dir (string-append (assoc-ref outputs "out")
+                                            "/share/fontconfig/conf.avail")))
+               (mkdir-p conf-dir)
+               (call-with-output-file
+                   (string-append conf-dir "/30-comic-neue.conf")
+                 (lambda (port)
+                   (format port "<?xml version=\"1.0\"?>
+<!DOCTYPE fontconfig SYSTEM \"fonts.dtd\">
+<fontconfig>
+  <!-- If Comic Sans is missing, use Comic Neue instead. -->
+  <alias>
+    <family>Comic Sans MS</family>
+    <prefer>
+      <family>Comic Neue</family>
+    </prefer>
+  </alias>
+</fontconfig>\n")))))))))
     (home-page "http://www.comicneue.com/")
     (synopsis "Font that fixes the shortcomings of Comic Sans")
     (description
-- 
2.13.0