bug#37708: [PATCH] gnu: add uchardet

["Ludovic Courtès" <ludo@gnu.org>]

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

Hi Reza,

Reza Alizadeh Majd <r.majd@pantherx.org> skribis:

> From 5bbab834e617c0bfb14d384e05af390d05728b6e Mon Sep 17 00:00:00 2001
> From: Reza Alizadeh Majd <r.majd@pantherx.org>
> Date: Fri, 11 Oct 2019 23:23:21 +0330
> Subject: [PATCH] gnu: add uchardet
>
> * gnu/packages/freedesktop.scm (uchardet) New variable.

Applied with the modifications below, which address ‘guix lint’ warnings
(remember to run it next time :-)), enable tests, and clarify the
license.

Thank you for the patch!

Ludo’.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1450 bytes --]

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 17736aa537..4339f14f35 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1423,16 +1423,18 @@ their MIME type.
     (source
       (origin
         (method url-fetch)
-        (uri (string-append "https://www.freedesktop.org/software/" 
+        (uri (string-append "https://www.freedesktop.org/software/"
                             name "/releases/" name "-" version ".tar.xz"))
         (sha256
           (base32 "0q9c02b6nmw41yfsiqsnphgc3f0yg3fj31wkccp47cmwvy634lc3"))))
     (build-system cmake-build-system)
-    (arguments `(#:tests? #f))
     (home-page "https://www.freedesktop.org/wiki/Software/uchardet/")
-    (synopsis "encoding detector library")
-    (description "uchardet is an encoding detector library, which takes a 
-sequence of bytes in an unknown character encoding without any additional 
-information, and attempts to determine the encoding of the text. Returned 
+    (synopsis "Encoding detector library")
+    (description "uchardet is an encoding detector library, which takes a
+sequence of bytes in an unknown character encoding without any additional
+information, and attempts to determine the encoding of the text.  Returned
 encoding names are iconv-compatible.")
+
+    ;; This combines code under MPL 1.1, LGPL 2.1+, and GPL 2.0+, so the
+    ;; combination is GPL 2.0+.
     (license license:gpl2+)))