07/09: gnu: streamlink: Fix build.

[guix-commits]

efraim pushed a commit to branch master
in repository guix.

commit 87fd7a35c2c8af364fe783947a2232a646d009cb
Author: Efraim Flashner <address@hidden>
Date:   Sat Jan 5 22:04:24 2019 +0200

    gnu: streamlink: Fix build.
    
    * gnu/packages/video.scm (streamlink)[source]: Add patch.
    * gnu/packages/patches/streamlink-update-test.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Register it.
---
 gnu/local.mk                                      |  1 +
 gnu/packages/patches/streamlink-update-test.patch | 70 +++++++++++++++++++++++
 gnu/packages/video.scm                            |  5 +-
 3 files changed, 74 insertions(+), 2 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 6d4159e..7ccef8a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1175,6 +1175,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/soundtouch-CVE-2018-14044-14045.patch   \
   %D%/packages/patches/soundtouch-CVE-2018-1000223.patch       \
   %D%/packages/patches/steghide-fixes.patch                    \
+  %D%/packages/patches/streamlink-update-test.patch            \
   %D%/packages/patches/superlu-dist-scotchmetis.patch          \
   %D%/packages/patches/swig-guile-gc.patch                     \
   %D%/packages/patches/swish-e-search.patch                    \
diff --git a/gnu/packages/patches/streamlink-update-test.patch 
b/gnu/packages/patches/streamlink-update-test.patch
new file mode 100644
index 0000000..2d90009
--- /dev/null
+++ b/gnu/packages/patches/streamlink-update-test.patch
@@ -0,0 +1,70 @@
+https://github.com/streamlink/streamlink/commit/a3123346824ee7b9c461110f292ea6987ea9a78d.patch
+This is taken from upstream, and can be removed at the next release
+
+From c6f3994e177a42792238f2edd07ba9053c10abc9 Mon Sep 17 00:00:00 2001
+From: back-to <address@hidden>
+Date: Sat, 21 Jul 2018 14:30:51 +0200
+Subject: [PATCH] tests.localization: use en_CA instead of en_US for
+ test_equivalent
+
+**python-iso3166** got an update which breaks the Streamlink tests.
+https://pypi.org/project/iso3166/#history
+
+**python-iso3166** and **pycountry** have now a different `name` for _the 
United States of America_
+
+> python-iso3166: United States of America
+https://github.com/deactivated/python-iso3166/commit/e5f8b37f18b01fcb5fa0e8130d8296fc7a7b5a9f
+
+> pycountry: United States
+https://bitbucket.org/flyingcircus/pycountry/src/5aa4bb47e33798cb631a81521b7b5b18f7d6c919/src/pycountry/databases/iso3166-1.json?at=default&fileviewer=file-view-default#iso3166-1.json-1572:1578
+
+https://www.iso.org/obp/ui/#iso:code:3166:US
+
+---
+
+use **en_CA** instead of **en_US** for backwards compatibility,
+as changing the **US** name would fail with older versions of 
**python-iso3166** / **pycountry**
+---
+ tests/test_localization.py | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/tests/test_localization.py b/tests/test_localization.py
+index 0b81ae591..90bb3ac31 100644
+--- a/tests/test_localization.py
++++ b/tests/test_localization.py
+@@ -32,11 +32,12 @@ def test_bad_language_code(self):
+         self.assertRaises(LookupError, l10n.Localization, "enUS")
+ 
+     def test_equivalent(self):
+-        l = l10n.Localization("en_US")
++        l = l10n.Localization("en_CA")
+         self.assertTrue(l.equivalent(language="eng"))
+         self.assertTrue(l.equivalent(language="en"))
+-        self.assertTrue(l.equivalent(language="en", country="US"))
+-        self.assertTrue(l.equivalent(language="en", country="United States"))
++        self.assertTrue(l.equivalent(language="en", country="CA"))
++        self.assertTrue(l.equivalent(language="en", country="CAN"))
++        self.assertTrue(l.equivalent(language="en", country="Canada"))
+ 
+     def test_equivalent_remap(self):
+         l = l10n.Localization("fr_FR")
+@@ -48,7 +49,7 @@ def test_not_equivalent(self):
+         self.assertFalse(l.equivalent(language="eng"))
+         self.assertFalse(l.equivalent(language="en"))
+         self.assertFalse(l.equivalent(language="en", country="US"))
+-        self.assertFalse(l.equivalent(language="en", country="United States"))
++        self.assertFalse(l.equivalent(language="en", country="Canada"))
+         self.assertFalse(l.equivalent(language="en", country="ES"))
+         self.assertFalse(l.equivalent(language="en", country="Spain"))
+ 
+@@ -71,8 +72,8 @@ def test_get_country(self):
+                          l10n.Localization.get_country("USA").alpha2)
+         self.assertEqual("GB",
+                          l10n.Localization.get_country("GB").alpha2)
+-        self.assertEqual("United States",
+-                         l10n.Localization.get_country("United States").name)
++        self.assertEqual("Canada",
++                         l10n.Localization.get_country("Canada").name)
+ 
+     def test_get_country_miss(self):
+         self.assertRaises(LookupError, l10n.Localization.get_country, "XE")
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index b8ac09d..52faceb 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -3,7 +3,7 @@
 ;;; Copyright © 2014, 2015, 2016 David Thompson <address@hidden>
 ;;; Copyright © 2014, 2015, 2016, 2018 Mark H Weaver <address@hidden>
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <address@hidden>
-;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <address@hidden>
+;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <address@hidden>
 ;;; Copyright © 2015 Andy Patterson <address@hidden>
 ;;; Copyright © 2015, 2018 Ricardo Wurmus <address@hidden>
 ;;; Copyright © 2015, 2016, 2017, 2018 Alex Vong <address@hidden>
@@ -1924,7 +1924,8 @@ and custom quantization matrices.")
         (uri (pypi-uri "streamlink" version))
         (sha256
          (base32
-          "0l2145fd60i76afjisfxd48cwhwyir07i7s3bnimdq5db2kzkix8"))))
+          "0l2145fd60i76afjisfxd48cwhwyir07i7s3bnimdq5db2kzkix8"))
+        (patches (search-patches "streamlink-update-test.patch"))))
     (build-system python-build-system)
     (home-page "https://github.com/streamlink/streamlink";)
     (native-inputs