* bug#27107: [PATCH] gnu: font-comic-neue: Add fontconfig alias.
@ 2017-05-27 18:54 Alex Griffin
2017-05-28 16:38 ` Arun Isaac
` (2 more replies)
0 siblings, 3 replies; 13+ messages in thread
From: Alex Griffin @ 2017-05-27 18:54 UTC (permalink / raw)
To: 27107
[-- Attachment #1: Type: text/plain, Size: 235 bytes --]
This patch adds a fontconfig alias to the Comic Neue patch, which must
be manually enabled (with a symlink in your fontconfig directory). If
Comic Sans is missing from the system, it displays using Comic Neue
instead.
--
Alex Griffin
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-font-comic-neue-Add-fontconfig-alias.patch --]
[-- Type: text/x-patch; name="0001-gnu-font-comic-neue-Add-fontconfig-alias.patch", Size: 4496 bytes --]
From 7f672ee40566990448ecbec49eae8892dd7729a3 Mon Sep 17 00:00:00 2001
From: Alex Griffin <a@ajgrf.com>
Date: Sat, 27 May 2017 11:43:18 -0500
Subject: [PATCH 3/4] gnu: font-comic-neue: Add fontconfig alias.
* gnu/packages/fonts.scm (font-comic-neue): Re-indent.
[arguments]: Add fontconfig alias for Comic Sans. Remove unnecessary
call to string-append.
---
gnu/packages/fonts.scm | 80 ++++++++++++++++++++++++++++++--------------------
1 file changed, 48 insertions(+), 32 deletions(-)
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 21054e53a..02ab4ad4b 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -1261,39 +1261,55 @@ 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)
+ (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"))
+ (conf-dir (string-append %output
+ "/share/fontconfig/conf.avail"))
+ (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 "Web"
+ (for-each (lambda (ttf)
+ (install-file ttf font-dir))
+ (find-files "." "\\.ttf$")))
+ (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")))))))
+ (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
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
^ permalink raw reply related [flat|nested] 13+ messages in thread
* bug#27107: [PATCH] gnu: font-comic-neue: Add fontconfig alias.
2017-05-27 18:54 bug#27107: [PATCH] gnu: font-comic-neue: Add fontconfig alias Alex Griffin
@ 2017-05-28 16:38 ` Arun Isaac
[not found] ` <971c125f.ADsAAg_HJlUAAAAAAAAAAAPFkxsAAAACwQwAAAAAAAW9WABZKv0R@mailjet.com>
2017-05-31 19:56 ` Alex Griffin
2 siblings, 0 replies; 13+ messages in thread
From: Arun Isaac @ 2017-05-28 16:38 UTC (permalink / raw)
To: Alex Griffin; +Cc: 27107
Thanks for the patch!
Could you rewrite the patch with the new font-build-system? That would
make the patch much shorter. Look at font-dejavu for an example. I
noticed that the source zip archive for font-comic-neue doesn't have a
top level directory. This might cause problems. If so, you'll have to
replace the 'unpack phase as well.
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.
^ permalink raw reply [flat|nested] 13+ messages in thread
[parent not found: <971c125f.ADsAAg_HJlUAAAAAAAAAAAPFkxsAAAACwQwAAAAAAAW9WABZKv0R@mailjet.com>]
* bug#27107: [PATCH] gnu: font-comic-neue: Add fontconfig alias.
[not found] ` <971c125f.ADsAAg_HJlUAAAAAAAAAAAPFkxsAAAACwQwAAAAAAAW9WABZKv0R@mailjet.com>
@ 2017-05-31 17:01 ` Alex Griffin
2017-06-01 13:50 ` Arun Isaac
[not found] ` <c757126b.AEEALPlfx1UAAAAAAAAAAAPFkxsAAAACwQwAAAAAAAW9WABZMBvE@mailjet.com>
0 siblings, 2 replies; 13+ messages in thread
From: Alex Griffin @ 2017-05-31 17:01 UTC (permalink / raw)
To: Arun Isaac; +Cc: 27107
[-- 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
^ permalink raw reply related [flat|nested] 13+ messages in thread
* bug#27107: [PATCH] gnu: font-comic-neue: Add fontconfig alias.
2017-05-31 17:01 ` Alex Griffin
@ 2017-06-01 13:50 ` Arun Isaac
[not found] ` <c757126b.AEEALPlfx1UAAAAAAAAAAAPFkxsAAAACwQwAAAAAAAW9WABZMBvE@mailjet.com>
1 sibling, 0 replies; 13+ messages in thread
From: Arun Isaac @ 2017-06-01 13:50 UTC (permalink / raw)
To: Alex Griffin; +Cc: 27107
The package builds fine without any problems. But, the alias does not
seem to be working. I installed font-comic-neue into my profile and
tried
$ export FC_DEBUG=1024
$ fc-match "Comic Sans MS"
And, got the following output. It does not even seem to be reading the
alias file from the font-comic-neue package. What am I missing? Is the
alias working on your machine?
FC_DEBUG=1024
Loading config file /gnu/store/1vpqn2xxgw8fnnwnjwczv8fwxhal11a7-fontconfig-2.12.1/etc/fonts/fonts.conf
Scanning config dir /gnu/store/1vpqn2xxgw8fnnwnjwczv8fwxhal11a7-fontconfig-2.12.1/etc/fonts/conf.d
Loading config file /gnu/store/1vpqn2xxgw8fnnwnjwczv8fwxhal11a7-fontconfig-2.12.1/etc/fonts/conf.d/10-hinting-slight.conf
Loading config file /gnu/store/1vpqn2xxgw8fnnwnjwczv8fwxhal11a7-fontconfig-2.12.1/etc/fonts/conf.d/10-scale-bitmap-fonts.conf
Loading config file /gnu/store/1vpqn2xxgw8fnnwnjwczv8fwxhal11a7-fontconfig-2.12.1/etc/fonts/conf.d/20-unhint-small-vera.conf
Loading config file /gnu/store/1vpqn2xxgw8fnnwnjwczv8fwxhal11a7-fontconfig-2.12.1/etc/fonts/conf.d/30-metric-aliases.conf
Loading config file /gnu/store/1vpqn2xxgw8fnnwnjwczv8fwxhal11a7-fontconfig-2.12.1/etc/fonts/conf.d/30-urw-aliases.conf
Loading config file /gnu/store/1vpqn2xxgw8fnnwnjwczv8fwxhal11a7-fontconfig-2.12.1/etc/fonts/conf.d/40-nonlatin.conf
Loading config file /gnu/store/1vpqn2xxgw8fnnwnjwczv8fwxhal11a7-fontconfig-2.12.1/etc/fonts/conf.d/45-latin.conf
Loading config file /gnu/store/1vpqn2xxgw8fnnwnjwczv8fwxhal11a7-fontconfig-2.12.1/etc/fonts/conf.d/49-sansserif.conf
Loading config file /gnu/store/1vpqn2xxgw8fnnwnjwczv8fwxhal11a7-fontconfig-2.12.1/etc/fonts/conf.d/50-user.conf
Loading config file /home/arun/.config/fontconfig/fonts.conf
Loading config file /gnu/store/1vpqn2xxgw8fnnwnjwczv8fwxhal11a7-fontconfig-2.12.1/etc/fonts/conf.d/51-local.conf
Loading config file /gnu/store/1vpqn2xxgw8fnnwnjwczv8fwxhal11a7-fontconfig-2.12.1/etc/fonts/conf.d/60-latin.conf
Loading config file /gnu/store/1vpqn2xxgw8fnnwnjwczv8fwxhal11a7-fontconfig-2.12.1/etc/fonts/conf.d/65-fonts-persian.conf
Loading config file /gnu/store/1vpqn2xxgw8fnnwnjwczv8fwxhal11a7-fontconfig-2.12.1/etc/fonts/conf.d/65-nonlatin.conf
Loading config file /gnu/store/1vpqn2xxgw8fnnwnjwczv8fwxhal11a7-fontconfig-2.12.1/etc/fonts/conf.d/69-unifont.conf
Loading config file /gnu/store/1vpqn2xxgw8fnnwnjwczv8fwxhal11a7-fontconfig-2.12.1/etc/fonts/conf.d/80-delicious.conf
Loading config file /gnu/store/1vpqn2xxgw8fnnwnjwczv8fwxhal11a7-fontconfig-2.12.1/etc/fonts/conf.d/90-synthetic.conf
DejaVuSans.ttf: "DejaVu Sans" "Book"
^ permalink raw reply [flat|nested] 13+ messages in thread
[parent not found: <c757126b.AEEALPlfx1UAAAAAAAAAAAPFkxsAAAACwQwAAAAAAAW9WABZMBvE@mailjet.com>]
* bug#27107: [PATCH] gnu: font-comic-neue: Add fontconfig alias.
[not found] ` <c757126b.AEEALPlfx1UAAAAAAAAAAAPFkxsAAAACwQwAAAAAAAW9WABZMBvE@mailjet.com>
@ 2017-06-01 14:03 ` Alex Griffin
2017-06-01 15:12 ` Arun Isaac
[not found] ` <ed110519.AEUAKvsBN2MAAAAAAAAAAAPFkxsAAAACwQwAAAAAAAW9WABZMC7e@mailjet.com>
0 siblings, 2 replies; 13+ messages in thread
From: Alex Griffin @ 2017-06-01 14:03 UTC (permalink / raw)
To: Arun Isaac; +Cc: 27107
On Thu, Jun 1, 2017, at 08:50 AM, Arun Isaac wrote:
> And, got the following output. It does not even seem to be reading the
> alias file from the font-comic-neue package. What am I missing? Is the
> alias working on your machine?
I could not find a way to change font configuration just by installing a
Guix package, so I installed the alias in the same place that the DejaVu
Sans package uses. So you need to activate the alias manually:
$ ln -s
~/.guix-profile/share/fontconfig/conf.avail/30-comic-neue.conf
~/.config/fontconfig/conf.d/30-comic-neue.conf
$ fc-cache -f
$ fc-match 'Comic Sans MS'
ComicNeue-Regular.ttf: "Comic Neue" "Regular"
--
Alex Griffin
^ permalink raw reply [flat|nested] 13+ messages in thread
* bug#27107: [PATCH] gnu: font-comic-neue: Add fontconfig alias.
2017-06-01 14:03 ` Alex Griffin
@ 2017-06-01 15:12 ` Arun Isaac
[not found] ` <ed110519.AEUAKvsBN2MAAAAAAAAAAAPFkxsAAAACwQwAAAAAAAW9WABZMC7e@mailjet.com>
1 sibling, 0 replies; 13+ messages in thread
From: Arun Isaac @ 2017-06-01 15:12 UTC (permalink / raw)
To: Alex Griffin; +Cc: 27107-done
Makes sense. Pushed! Thanks!
^ permalink raw reply [flat|nested] 13+ messages in thread
[parent not found: <ed110519.AEUAKvsBN2MAAAAAAAAAAAPFkxsAAAACwQwAAAAAAAW9WABZMC7e@mailjet.com>]
* bug#27107: [PATCH] gnu: font-comic-neue: Add fontconfig alias.
[not found] ` <ed110519.AEUAKvsBN2MAAAAAAAAAAAPFkxsAAAACwQwAAAAAAAW9WABZMC7e@mailjet.com>
@ 2017-06-01 15:34 ` Alex Griffin
2017-06-01 15:48 ` Alex Griffin
0 siblings, 1 reply; 13+ messages in thread
From: Alex Griffin @ 2017-06-01 15:34 UTC (permalink / raw)
To: Arun Isaac; +Cc: 27107-done
On Thu, Jun 1, 2017, at 10:12 AM, Arun Isaac wrote:
>
> Makes sense. Pushed! Thanks!
Can I ask why you removed my chdir phase before pushing? Without it, the
package now installs 4 duplicated copies of the same font.
--
Alex Griffin
^ permalink raw reply [flat|nested] 13+ messages in thread
* bug#27107: [PATCH] gnu: font-comic-neue: Add fontconfig alias.
2017-06-01 15:34 ` Alex Griffin
@ 2017-06-01 15:48 ` Alex Griffin
2017-06-01 16:01 ` Arun Isaac
` (2 more replies)
0 siblings, 3 replies; 13+ messages in thread
From: Alex Griffin @ 2017-06-01 15:48 UTC (permalink / raw)
To: Arun Isaac; +Cc: 27107-done
On Thu, Jun 1, 2017, at 10:34 AM, Alex Griffin wrote:
> Can I ask why you removed my chdir phase before pushing? Without it, the
> package now installs 4 duplicated copies of the same font.
Actually it installs just 2 copies: one TrueType and one OpenType. But
it also grabs some other files we don't want, which I think contain
metadata for the Mac OS X version of unzip.
$ ls -a $(guix build font-comic-neue)/share/fonts/{true,open}type
/gnu/store/cmrzcpgia6x6b38wpdri7jqwcw2gisxd-font-comic-neue-2.3/share/fonts/opentype:
./
._ComicNeue-Angular_Oblique.otf ComicNeue-Angular-Regular.otf
ComicNeue_Bold.otf
../ ._ComicNeue-Regular.otf
ComicNeue-Angular_Bold.otf ComicNeue_Bold_Oblique.otf
._ComicNeue-Angular-Regular.otf ._ComicNeue_Bold.otf
ComicNeue-Angular_Bold_Oblique.otf ComicNeue_Light.otf
._ComicNeue-Angular_Bold.otf ._ComicNeue_Bold_Oblique.otf
ComicNeue-Angular_Light.otf ComicNeue_Light_Oblique.otf
._ComicNeue-Angular_Bold_Oblique.otf ._ComicNeue_Light.otf
ComicNeue-Angular_Light_Oblique.otf ComicNeue_Oblique.otf
._ComicNeue-Angular_Light.otf ._ComicNeue_Light_Oblique.otf
ComicNeue-Angular_Oblique.otf
._ComicNeue-Angular_Light_Oblique.otf ._ComicNeue_Oblique.otf
ComicNeue-Regular.otf
/gnu/store/cmrzcpgia6x6b38wpdri7jqwcw2gisxd-font-comic-neue-2.3/share/fonts/truetype:
./ ._ComicNeue-Bold.ttf
ComicNeue-Angular-Regular-Oblique.ttf
../
._ComicNeue-Light-Oblique.ttf ComicNeue-Angular-Regular.ttf
._ComicNeue-Angular-Bold-Oblique.ttf ._ComicNeue-Light.ttf
ComicNeue-Bold-Oblique.ttf
._ComicNeue-Angular-Bold.ttf
._ComicNeue-Regular-Oblique.ttf ComicNeue-Bold.ttf
._ComicNeue-Angular-Light-Oblique.ttf ._ComicNeue-Regular.ttf
ComicNeue-Light-Oblique.ttf
._ComicNeue-Angular-Light.ttf
ComicNeue-Angular-Bold-Oblique.ttf ComicNeue-Light.ttf
._ComicNeue-Angular-Regular-Oblique.ttf ComicNeue-Angular-Bold.ttf
ComicNeue-Regular-Oblique.ttf
._ComicNeue-Angular-Regular.ttf
ComicNeue-Angular-Light-Oblique.ttf ComicNeue-Regular.ttf
._ComicNeue-Bold-Oblique.ttf ComicNeue-Angular-Light.ttf
--
Alex Griffin
^ permalink raw reply [flat|nested] 13+ messages in thread
* bug#27107: [PATCH] gnu: font-comic-neue: Add fontconfig alias.
2017-06-01 15:48 ` Alex Griffin
@ 2017-06-01 16:01 ` Arun Isaac
2017-06-01 16:50 ` Arun Isaac
[not found] ` <59879525.AEMAK8sFRAAAAAAAAAAAAAPFkxsAAAACwQwAAAAAAAW9WABZMEXM@mailjet.com>
2 siblings, 0 replies; 13+ messages in thread
From: Arun Isaac @ 2017-06-01 16:01 UTC (permalink / raw)
To: Alex Griffin; +Cc: 27107-done
Alex Griffin writes:
> On Thu, Jun 1, 2017, at 10:34 AM, Alex Griffin wrote:
>> Can I ask why you removed my chdir phase before pushing? Without it, the
>> package now installs 4 duplicated copies of the same font.
Oops! My bad! I should have asked before doing that. I didn't notice all
the hidden files beginning with a ".". I thought the package was
unchanged with or without the chdir phase. Sorry, I'll rectify this
error in a subsequent commit.
^ permalink raw reply [flat|nested] 13+ messages in thread
* bug#27107: [PATCH] gnu: font-comic-neue: Add fontconfig alias.
2017-06-01 15:48 ` Alex Griffin
2017-06-01 16:01 ` Arun Isaac
@ 2017-06-01 16:50 ` Arun Isaac
[not found] ` <59879525.AEMAK8sFRAAAAAAAAAAAAAPFkxsAAAACwQwAAAAAAAW9WABZMEXM@mailjet.com>
2 siblings, 0 replies; 13+ messages in thread
From: Arun Isaac @ 2017-06-01 16:50 UTC (permalink / raw)
To: Alex Griffin; +Cc: 27107-done
[-- Attachment #1: Type: text/plain, Size: 223 bytes --]
Please find attached a patch fixing the __MACOSX files issue. Let me
know if it's working and fine.
Instead of changing directory, I have deleted the __MACOSX directory. I
think this is a bit more explicit. WDYT?
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-font-comic-neue-Prevent-hidden-files-from-being-.patch --]
[-- Type: text/x-patch, Size: 1145 bytes --]
From 1370ab727fac3a2738f523a5697522b04411644f Mon Sep 17 00:00:00 2001
From: Arun Isaac <arunisaac@systemreboot.net>
Date: Thu, 1 Jun 2017 21:55:11 +0530
Subject: [PATCH] gnu: font-comic-neue: Prevent hidden files from being
installed.
* gnu/packages/fonts.scm (font-comic-neue)[arguments]: Add
'delete-macosx-files' phase.
---
gnu/packages/fonts.scm | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index cedf3573b..54b8b81e8 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -1121,6 +1121,12 @@ later hand-tweaked with the gbdfed(1) editor:
(arguments
`(#:phases
(modify-phases %standard-phases
+ ;; Delete Mac OS X specific files. If not deleted, these cause
+ ;; several hidden files to be installed.
+ (add-before 'install 'delete-macosx-files
+ (lambda _
+ (delete-file-recursively "__MACOSX")
+ #t))
(add-after 'install 'install-conf
(lambda* (#:key outputs #:allow-other-keys)
(let ((conf-dir (string-append (assoc-ref outputs "out")
--
2.12.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
[parent not found: <59879525.AEMAK8sFRAAAAAAAAAAAAAPFkxsAAAACwQwAAAAAAAW9WABZMEXM@mailjet.com>]
* bug#27107: [PATCH] gnu: font-comic-neue: Add fontconfig alias.
[not found] ` <59879525.AEMAK8sFRAAAAAAAAAAAAAPFkxsAAAACwQwAAAAAAAW9WABZMEXM@mailjet.com>
@ 2017-06-01 18:11 ` Alex Griffin
2017-06-01 18:46 ` Arun Isaac
0 siblings, 1 reply; 13+ messages in thread
From: Alex Griffin @ 2017-06-01 18:11 UTC (permalink / raw)
To: Arun Isaac; +Cc: 27107-done
On Thu, Jun 1, 2017, at 11:50 AM, Arun Isaac wrote:
>
> Please find attached a patch fixing the __MACOSX files issue. Let me
> know if it's working and fine.
>
> Instead of changing directory, I have deleted the __MACOSX directory. I
> think this is a bit more explicit. WDYT?
Yes, it is definitely easier to understand why that phase is there. The
only reason I didn't do it this way from the beginning is because I
didn't know if installing the same font in two different formats would
cause problems or not. It seems to work just fine though.
--
Alex Griffin
^ permalink raw reply [flat|nested] 13+ messages in thread
* bug#27107: [PATCH] gnu: font-comic-neue: Add fontconfig alias.
2017-06-01 18:11 ` Alex Griffin
@ 2017-06-01 18:46 ` Arun Isaac
0 siblings, 0 replies; 13+ messages in thread
From: Arun Isaac @ 2017-06-01 18:46 UTC (permalink / raw)
To: Alex Griffin; +Cc: 27107-done
> Yes, it is definitely easier to understand why that phase is there. The
> only reason I didn't do it this way from the beginning is because I
> didn't know if installing the same font in two different formats would
> cause problems or not. It seems to work just fine though.
Pushed! Thanks!
^ permalink raw reply [flat|nested] 13+ messages in thread
* bug#27107: [PATCH] gnu: font-comic-neue: Add fontconfig alias.
2017-05-27 18:54 bug#27107: [PATCH] gnu: font-comic-neue: Add fontconfig alias Alex Griffin
2017-05-28 16:38 ` Arun Isaac
[not found] ` <971c125f.ADsAAg_HJlUAAAAAAAAAAAPFkxsAAAACwQwAAAAAAAW9WABZKv0R@mailjet.com>
@ 2017-05-31 19:56 ` Alex Griffin
2 siblings, 0 replies; 13+ messages in thread
From: Alex Griffin @ 2017-05-31 19:56 UTC (permalink / raw)
To: 27107
[-- Attachment #1: Type: text/plain, Size: 145 bytes --]
I received feedback for another patch that my chdir phase should end
with #t, so I've updated these patches to do the same too.
--
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: 3184 bytes --]
From f07dd9e4cd7459cf1fb90d45410bac6cc9293af4 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/5] 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 | 54 ++++++++++++++++++++------------------------------
1 file changed, 22 insertions(+), 32 deletions(-)
diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index ef0642f79..e2551d073 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -1166,39 +1166,29 @@ 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")
+ #t)))))
+ (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: 1680 bytes --]
From b66243e79d531aefe0960f260d6406500c7944f9 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/5] 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 e2551d073..285717cde 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -1182,7 +1182,26 @@ later hand-tweaked with the gbdfed(1) editor:
(add-before 'install 'chdir
(lambda _
(chdir "Web")
- #t)))))
+ #t))
+ (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
^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2017-06-01 18:47 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-27 18:54 bug#27107: [PATCH] gnu: font-comic-neue: Add fontconfig alias Alex Griffin
2017-05-28 16:38 ` Arun Isaac
[not found] ` <971c125f.ADsAAg_HJlUAAAAAAAAAAAPFkxsAAAACwQwAAAAAAAW9WABZKv0R@mailjet.com>
2017-05-31 17:01 ` Alex Griffin
2017-06-01 13:50 ` Arun Isaac
[not found] ` <c757126b.AEEALPlfx1UAAAAAAAAAAAPFkxsAAAACwQwAAAAAAAW9WABZMBvE@mailjet.com>
2017-06-01 14:03 ` Alex Griffin
2017-06-01 15:12 ` Arun Isaac
[not found] ` <ed110519.AEUAKvsBN2MAAAAAAAAAAAPFkxsAAAACwQwAAAAAAAW9WABZMC7e@mailjet.com>
2017-06-01 15:34 ` Alex Griffin
2017-06-01 15:48 ` Alex Griffin
2017-06-01 16:01 ` Arun Isaac
2017-06-01 16:50 ` Arun Isaac
[not found] ` <59879525.AEMAK8sFRAAAAAAAAAAAAAPFkxsAAAACwQwAAAAAAAW9WABZMEXM@mailjet.com>
2017-06-01 18:11 ` Alex Griffin
2017-06-01 18:46 ` Arun Isaac
2017-05-31 19:56 ` Alex Griffin
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).