[PATCH 1/2] gnu: Add the X color name database file.

[PATCH 1/2] gnu: Add the X color name database file.

[Federico Beffa]

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

This package provides the X 'rgb.txt' color name database.  It is not
needed anymore by Xorg, but some packages (e.g. netpbm) still rely on
it.

Regards,
Fede

[-- Attachment #2: 0001-gnu-Add-the-X-color-name-database-file.patch --]
[-- Type: text/x-patch, Size: 1479 bytes --]

From be30973db650aba34323900806adb30d2fe74b1d Mon Sep 17 00:00:00 2001
From: Federico Beffa <beffa@fbengineering.ch>
Date: Fri, 13 May 2016 09:22:44 +0200
Subject: [PATCH 1/2] gnu: Add the X color name database file.

* gnu/packages/xorg.scm (xorg-rgb): New variable.
---
 gnu/packages/xorg.scm | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index fd933e3..9323286 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -4281,7 +4281,30 @@ Various information is displayed depending on which options are selected.")
 formatted dump file, such as produced by xwd.")
     (license license:x11)))
 
-
+(define-public xorg-rgb
+  (package
+    (name "xorg-rgb")
+    (version "1.0.6")
+    (source
+      (origin
+        (method url-fetch)
+        (uri (string-append
+               "mirror://xorg/individual/app/rgb-"
+               version
+               ".tar.bz2"))
+        (sha256
+          (base32
+            "1c76zcjs39ljil6f6jpx1x17c8fnvwazz7zvl3vbjfcrlmm7rjmv"))))
+    (build-system gnu-build-system)
+    (inputs
+      `(("xproto" ,xproto)))
+    (native-inputs
+       `(("pkg-config" ,pkg-config)))
+    (home-page "http://www.x.org/wiki/")
+    (synopsis "X color name database")
+    (description
+     "This package provides the X color name database.")
+    (license license:x11)))
 
 ;; packages of height 1 in the propagated-inputs tree
 
-- 
2.7.4

Re: [PATCH 1/2] gnu: Add the X color name database file.

[Alex Kost]

Federico Beffa (2016-05-13 19:51 +0300) wrote:

> This package provides the X 'rgb.txt' color name database.  It is not
> needed anymore by Xorg, but some packages (e.g. netpbm) still rely on
> it.

Great, thanks!  This package even has a binary (showrgb); I never knew
this.  I have only a couple of nit-pickings that can be ignored.

> From be30973db650aba34323900806adb30d2fe74b1d Mon Sep 17 00:00:00 2001
> From: Federico Beffa <beffa@fbengineering.ch>
> Date: Fri, 13 May 2016 09:22:44 +0200
> Subject: [PATCH 1/2] gnu: Add the X color name database file.
>
> * gnu/packages/xorg.scm (xorg-rgb): New variable.
> ---
>  gnu/packages/xorg.scm | 25 ++++++++++++++++++++++++-
>  1 file changed, 24 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
> index fd933e3..9323286 100644
> --- a/gnu/packages/xorg.scm
> +++ b/gnu/packages/xorg.scm
> @@ -4281,7 +4281,30 @@ Various information is displayed depending on which options are selected.")
>  formatted dump file, such as produced by xwd.")
>      (license license:x11)))
>  
> -
> +(define-public xorg-rgb
> +  (package
> +    (name "xorg-rgb")
> +    (version "1.0.6")
> +    (source
> +      (origin
> +        (method url-fetch)
> +        (uri (string-append
> +               "mirror://xorg/individual/app/rgb-"
> +               version
> +               ".tar.bz2"))

It's your choice of course, but I would put version and ".tar.bz2" on a
single line; I find it more good-looking in such cases.

> +        (sha256
> +          (base32
> +            "1c76zcjs39ljil6f6jpx1x17c8fnvwazz7zvl3vbjfcrlmm7rjmv"))))
> +    (build-system gnu-build-system)
> +    (inputs
> +      `(("xproto" ,xproto)))
> +    (native-inputs
> +       `(("pkg-config" ,pkg-config)))

These inputs are indented too much.  I guess you made this package
definition by copying 'xwud' (the previous one in "xorg.scm" file) and
modifying it.  Make sure to reindent this xorg-rgb package sexp.
Otherwise looks good to me, thanks!

> +    (home-page "http://www.x.org/wiki/")
> +    (synopsis "X color name database")
> +    (description
> +     "This package provides the X color name database.")
> +    (license license:x11)))
>  
>  ;; packages of height 1 in the propagated-inputs tree

-- 
Alex

Re: [PATCH 1/2] gnu: Add the X color name database file.

[Federico Beffa]

On Fri, May 13, 2016 at 8:03 PM, Alex Kost <alezost@gmail.com> wrote:
> Federico Beffa (2016-05-13 19:51 +0300) wrote:
>
>> This package provides the X 'rgb.txt' color name database.  It is not
>> needed anymore by Xorg, but some packages (e.g. netpbm) still rely on
>> it.
>
> Great, thanks!  This package even has a binary (showrgb); I never knew
> this.  I have only a couple of nit-pickings that can be ignored.
>
>> From be30973db650aba34323900806adb30d2fe74b1d Mon Sep 17 00:00:00 2001
>> From: Federico Beffa <beffa@fbengineering.ch>
>> Date: Fri, 13 May 2016 09:22:44 +0200
>> Subject: [PATCH 1/2] gnu: Add the X color name database file.
>>
>> * gnu/packages/xorg.scm (xorg-rgb): New variable.
>> ---
>>  gnu/packages/xorg.scm | 25 ++++++++++++++++++++++++-
>>  1 file changed, 24 insertions(+), 1 deletion(-)
>>
>> diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
>> index fd933e3..9323286 100644
>> --- a/gnu/packages/xorg.scm
>> +++ b/gnu/packages/xorg.scm
>> @@ -4281,7 +4281,30 @@ Various information is displayed depending on which options are selected.")
>>  formatted dump file, such as produced by xwd.")
>>      (license license:x11)))
>>
>> -
>> +(define-public xorg-rgb
>> +  (package
>> +    (name "xorg-rgb")
>> +    (version "1.0.6")
>> +    (source
>> +      (origin
>> +        (method url-fetch)
>> +        (uri (string-append
>> +               "mirror://xorg/individual/app/rgb-"
>> +               version
>> +               ".tar.bz2"))
>
> It's your choice of course, but I would put version and ".tar.bz2" on a
> single line; I find it more good-looking in such cases.

I like better what you propose, but I've followed the style of all the
other definitions in the same file for consistency.

>
>> +        (sha256
>> +          (base32
>> +            "1c76zcjs39ljil6f6jpx1x17c8fnvwazz7zvl3vbjfcrlmm7rjmv"))))
>> +    (build-system gnu-build-system)
>> +    (inputs
>> +      `(("xproto" ,xproto)))
>> +    (native-inputs
>> +       `(("pkg-config" ,pkg-config)))
>
> These inputs are indented too much.  I guess you made this package
> definition by copying 'xwud' (the previous one in "xorg.scm" file) and
> modifying it.  Make sure to reindent this xorg-rgb package sexp.
> Otherwise looks good to me, thanks!
>

Fixed.

Fede