From 2984d9bfe55355dd215ad8286892603dfd3cd316 Mon Sep 17 00:00:00 2001
From: j1nx
Date: Wed, 17 Feb 2021 13:59:44 +0100
Subject: [PATCH] Bump mycroft-core and gtts dependency
---
buildroot-external/package/python-gtts/python-gtts.hash | 2 +-
buildroot-external/package/python-gtts/python-gtts.mk | 4 ++--
...-requests-requirement-to-2.24.0-inline-with-buil.patch | 8 ++++----
.../package/python-mycroft/python-mycroft.hash | 2 +-
.../package/python-mycroft/python-mycroft.mk | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/buildroot-external/package/python-gtts/python-gtts.hash b/buildroot-external/package/python-gtts/python-gtts.hash
index 56076466..7e4d19dc 100644
--- a/buildroot-external/package/python-gtts/python-gtts.hash
+++ b/buildroot-external/package/python-gtts/python-gtts.hash
@@ -1,6 +1,6 @@
# md5, sha256 from https://pypi.org/pypi/gTTS/json
md5 a74588d23840f07badb195bda8138b2d gTTS-2.0.1.tar.gz
-sha256 eaa69ccc87254704b5f2a3ed345c9425cc6e973e4e33616fd55788c37fc67d25 gTTS-2.2.0.tar.gz
+sha256 b53714d8377afb66df9f112158a6a832de26bc72cee3b8af321575d85f820a0f gTTS-2.2.2.tar.gz
sha256 124dfc447056cc622989319ebb553d56cfd5c197c345cee3397b675a6da84f58 gTTS-1.1.7.tar.gz
# Locally computed sha256 checksums
sha256 d762ddea99fa1eddb0a03d040a97e4e1404f432f7c70d4b49d391858230a22aa LICENSE
diff --git a/buildroot-external/package/python-gtts/python-gtts.mk b/buildroot-external/package/python-gtts/python-gtts.mk
index af7b1963..a90f49fe 100644
--- a/buildroot-external/package/python-gtts/python-gtts.mk
+++ b/buildroot-external/package/python-gtts/python-gtts.mk
@@ -4,9 +4,9 @@
#
################################################################################
-PYTHON_GTTS_VERSION = 2.2.0
+PYTHON_GTTS_VERSION = 2.2.2
PYTHON_GTTS_SOURCE = gTTS-$(PYTHON_GTTS_VERSION).tar.gz
-PYTHON_GTTS_SITE = https://files.pythonhosted.org/packages/f8/a2/826a16210ccaba75c48414428bb4ca3cc2fddee5935fc3e49a8af417af92
+PYTHON_GTTS_SITE = https://files.pythonhosted.org/packages/ec/fa/cc7d5d6669f893b976be10fe9fb2cce2be0947db9916eb3fbdabcd4a2a31
PYTHON_GTTS_SETUP_TYPE = setuptools
PYTHON_GTTS_LICENSE = MIT
PYTHON_GTTS_LICENSE_FILES = LICENSE
diff --git a/buildroot-external/package/python-mycroft/0001-Bump-requests-requirement-to-2.24.0-inline-with-buil.patch b/buildroot-external/package/python-mycroft/0001-Bump-requests-requirement-to-2.24.0-inline-with-buil.patch
index 4d27bb03..f7ce099c 100644
--- a/buildroot-external/package/python-mycroft/0001-Bump-requests-requirement-to-2.24.0-inline-with-buil.patch
+++ b/buildroot-external/package/python-mycroft/0001-Bump-requests-requirement-to-2.24.0-inline-with-buil.patch
@@ -1,6 +1,6 @@
-From 2342dde59f02b3cab1a961f74eaf06889fb8d175 Mon Sep 17 00:00:00 2001
+From d0e630337d7b81abfe7fdf018252e8c6b06f741d Mon Sep 17 00:00:00 2001
From: j1nx
-Date: Tue, 29 Dec 2020 10:29:43 +0100
+Date: Wed, 17 Feb 2021 13:53:37 +0100
Subject: [PATCH 1/1] Bump requests requirement to >= 2.24.0 inline with
buildroot. This to prevent issues with the urllib3 package in combination
with the HASS skill.
@@ -10,13 +10,13 @@ Subject: [PATCH 1/1] Bump requests requirement to >= 2.24.0 inline with
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
-index abe48fa508..8dc55a9756 100644
+index 8c22b4a4c5..dab7856965 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -1,4 +1,4 @@
-requests==2.20.0
+requests>=2.24.0
- gTTS==2.2.0
+ gTTS>=2.2.2,<2.3.0
PyAudio==0.2.11
pyee==8.1.0
--
diff --git a/buildroot-external/package/python-mycroft/python-mycroft.hash b/buildroot-external/package/python-mycroft/python-mycroft.hash
index be2825c7..7b32fb04 100644
--- a/buildroot-external/package/python-mycroft/python-mycroft.hash
+++ b/buildroot-external/package/python-mycroft/python-mycroft.hash
@@ -1 +1 @@
-sha256 82363752716005e082c0533380d5dc11c25a7a1cf595765faa8b8df4b64c666e python-mycroft-bfd6be347f0c88aabad8f287081a860b09359f3d.tar.gz
+sha256 48e54c3e05347667e068cf6db5cd0905647b85bea32533d8e4aedf0611776185 python-mycroft-a976bd1094dbfba155811df1ca227b40be9422ff.tar.gz
diff --git a/buildroot-external/package/python-mycroft/python-mycroft.mk b/buildroot-external/package/python-mycroft/python-mycroft.mk
index e6b4edba..d2087c18 100644
--- a/buildroot-external/package/python-mycroft/python-mycroft.mk
+++ b/buildroot-external/package/python-mycroft/python-mycroft.mk
@@ -4,7 +4,7 @@
#
################################################################################
-PYTHON_MYCROFT_VERSION = bfd6be347f0c88aabad8f287081a860b09359f3d
+PYTHON_MYCROFT_VERSION = a976bd1094dbfba155811df1ca227b40be9422ff
PYTHON_MYCROFT_SITE = $(call github,MycroftAI,mycroft-core,$(PYTHON_MYCROFT_VERSION))
PYTHON_MYCROFT_SETUP_TYPE = setuptools
PYTHON_MYCROFT_LICENSE_FILES = LICENSE