bug#27183: [PATCH 0/2] gnu: font-cns11643: Update to 98.1.20170524.

bug#27183: [PATCH 0/2] gnu: font-cns11643: Update to 98.1.20170524.

[Brendan Tildesley]

bug#27183: [PATCH 1/2] gnu: font-cns11643: Update to 98.1.20170524.

[Brendan Tildesley]

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



[-- Attachment #2: 0001-gnu-font-cns11643-Update-to-98.1.20170524.patch --]
[-- Type: text/x-patch, Size: 1208 bytes --]

From 5ca7c441c8efe848888b64c0f2687790c5e76e6b Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Thu, 1 Jun 2017 22:55:00 +1000
Subject: [PATCH 1/2] gnu: font-cns11643: Update to 98.1.20170524.

* gnu/packages/fonts.scm (font-cns11643): Update to 98.1.20170524.
---
 gnu/packages/fonts.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 1145b3114..29f43f13d 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -403,13 +403,13 @@ text in Simplified Chinese, Traditional Chinese, Japanese, and Korean.")
 (define-public font-cns11643
   (package
     (name "font-cns11643")
-    (version "98.1.20170405")
+    (version "98.1.20170524")
     (source (origin
               (method url-fetch)
               (uri "http://www.cns11643.gov.tw/AIDB/Open_Data.zip")
               (sha256
                (base32
-                "02kb3bwjrra0k2hlr2p8xswd2y0xs6j8d9vm6yrby734h02a40qf"))))
+                "1iad6rklxkx03ji1fav9faq7cmqkci3i6pcyg2ilvh984j5qzhq3"))))
     (outputs '("out" "tw-kai" "tw-sung"))
     (build-system trivial-build-system)
     (native-inputs
-- 
2.13.0

bug#27183: [PATCH 2/2] gnu: font-cns11643: Use 'font-build-system'.

[Brendan Tildesley]

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



[-- Attachment #2: 0002-gnu-font-cns11643-Use-font-build-system.patch --]
[-- Type: text/x-patch, Size: 2271 bytes --]

From 6e48521ff2f7b435670db6937c3282da75ab4ae0 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Thu, 1 Jun 2017 22:59:45 +1000
Subject: [PATCH 2/2] gnu: font-cns11643: Use 'font-build-system'.

* gnu/packages/fonts.scm (font-cns16643): Use 'font-build-system'.
---
 gnu/packages/fonts.scm | 30 +-----------------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
index 29f43f13d..fbfe9843b 100644
--- a/gnu/packages/fonts.scm
+++ b/gnu/packages/fonts.scm
@@ -410,35 +410,7 @@ text in Simplified Chinese, Traditional Chinese, Japanese, and Korean.")
               (sha256
                (base32
                 "1iad6rklxkx03ji1fav9faq7cmqkci3i6pcyg2ilvh984j5qzhq3"))))
-    (outputs '("out" "tw-kai" "tw-sung"))
-    (build-system trivial-build-system)
-    (native-inputs
-     `(("unzip" ,unzip)))
-    (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         (let* ((font-dir "/share/fonts/truetype/cns11643")
-                (out (string-append
-                      (assoc-ref %outputs "out") font-dir))
-                (tw-kai (string-append
-                         (assoc-ref %outputs "tw-kai") font-dir))
-                (tw-sung (string-append
-                          (assoc-ref %outputs "tw-sung") font-dir))
-                (unzip (string-append
-                        (assoc-ref %build-inputs "unzip") "/bin/unzip")))
-           (system* unzip (assoc-ref %build-inputs "source"))
-           (chdir "Open_Data/Fonts/")
-           (install-file "TW-Kai-98_1.ttf" tw-kai)
-           (install-file "TW-Sung-98_1.ttf" tw-sung)
-           (install-file "TW-Kai-98_1.ttf" out)
-           (install-file "TW-Kai-Ext-B-98_1.ttf" out)
-           (install-file "TW-Kai-Plus-98_1.ttf" out)
-           (install-file "TW-Sung-98_1.ttf" out)
-           (install-file "TW-Sung-Ext-B-98_1.ttf" out)
-           (install-file "TW-Sung-Plus-98_1.ttf" out)
-           #t))))
+    (build-system font-build-system)
     (home-page "http://www.cns11643.gov.tw/AIDB/welcome.do")
     (synopsis "CJK TrueType fonts, TW-Kai and TW-Sung")
     (description
-- 
2.13.0

bug#27183: [PATCH 2/2] gnu: font-cns11643: Use 'font-build-system'.

[Arun Isaac]

Brendan Tildesley writes:

> From 6e48521ff2f7b435670db6937c3282da75ab4ae0 Mon Sep 17 00:00:00 2001
> From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
> Date: Thu, 1 Jun 2017 22:59:45 +1000
> Subject: [PATCH 2/2] gnu: font-cns11643: Use 'font-build-system'.
>
> * gnu/packages/fonts.scm (font-cns16643): Use 'font-build-system'.
> ---
>  gnu/packages/fonts.scm | 30 +-----------------------------
>  1 file changed, 1 insertion(+), 29 deletions(-)
>
> diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
> index 29f43f13d..fbfe9843b 100644
> --- a/gnu/packages/fonts.scm
> +++ b/gnu/packages/fonts.scm
> @@ -410,35 +410,7 @@ text in Simplified Chinese, Traditional Chinese, Japanese, and Korean.")
>                (sha256
>                 (base32
>                  "1iad6rklxkx03ji1fav9faq7cmqkci3i6pcyg2ilvh984j5qzhq3"))))
> -    (outputs '("out" "tw-kai" "tw-sung"))

Any particular reason you are collapsing the three outputs of this
package into one? I understand that this package is too small to be
split into three different outputs. But, I wonder what the original
packager was thinking when he did this.

bug#27183: [PATCH 2/2] gnu: font-cns11643: Use 'font-build-system'.

[Brendan Tildesley]

Arun Isaac 於 2017-06-02 01:19 寫道:
> Brendan Tildesley writes:
>
>> From 6e48521ff2f7b435670db6937c3282da75ab4ae0 Mon Sep 17 00:00:00 2001
>> From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
>> Date: Thu, 1 Jun 2017 22:59:45 +1000
>> Subject: [PATCH 2/2] gnu: font-cns11643: Use 'font-build-system'.
>>
>> * gnu/packages/fonts.scm (font-cns16643): Use 'font-build-system'.
>> ---
>>  gnu/packages/fonts.scm | 30 +-----------------------------
>>  1 file changed, 1 insertion(+), 29 deletions(-)
>>
>> diff --git a/gnu/packages/fonts.scm b/gnu/packages/fonts.scm
>> index 29f43f13d..fbfe9843b 100644
>> --- a/gnu/packages/fonts.scm
>> +++ b/gnu/packages/fonts.scm
>> @@ -410,35 +410,7 @@ text in Simplified Chinese, Traditional Chinese, Japanese, and Korean.")
>>                (sha256
>>                 (base32
>>                  "1iad6rklxkx03ji1fav9faq7cmqkci3i6pcyg2ilvh984j5qzhq3"))))
>> -    (outputs '("out" "tw-kai" "tw-sung"))
> Any particular reason you are collapsing the three outputs of this
> package into one? I understand that this package is too small to be
> split into three different outputs. But, I wonder what the original
> packager was thinking when he did this.

The original packager was me ^.^. I was never decisive about how it out
to be packaged, It's just that the font files are large but I was only
ever going to use one of them, so I split it up. It was easy to just
delete it all and swap in the font-build-system.

bug#27183: [PATCH 2/2] gnu: font-cns11643: Use 'font-build-system'.

[Arun Isaac]

Pushed! Thanks!

> The original packager was me ^.^.

That sure makes many things easier! :-)