From 8fb5509cba42f18bb069532c4b1a11d23655a7d1 Mon Sep 17 00:00:00 2001
From: Dan Yeaw <dan@yeaw.me>
Date: Wed, 23 Oct 2019 21:22:15 -0400
Subject: [PATCH] Update flatpak dependencies

Signed-off-by: Dan Yeaw <dan@yeaw.me>
---
 flatpak/build-depends.yaml    | 51 ++++++++++++++++++++++-------------
 flatpak/lockfile-depends.yaml | 31 ++++++++++++++-------
 2 files changed, 54 insertions(+), 28 deletions(-)

diff --git a/flatpak/build-depends.yaml b/flatpak/build-depends.yaml
index 67da88ae7..9bd946177 100644
--- a/flatpak/build-depends.yaml
+++ b/flatpak/build-depends.yaml
@@ -1,8 +1,18 @@
 name: python3-poetry
 buildsystem: simple
 build-commands:
-  - pip3 install --no-index --find-links "file://${PWD}" --prefix=${FLATPAK_DEST} poetry
+  - pip3 install --no-index --find-links="file://${PWD}" --prefix=${FLATPAK_DEST}
+    poetry
 sources:
+  - type: file
+    url: https://files.pythonhosted.org/packages/ce/6c/888d7c3c1fce3974c88a01a6bc553528c99d3586e098eee23e8383dd11c3/jsonschema-3.1.1-py2.py3-none-any.whl
+    sha256: 94c0a13b4a0616458b42529091624e66700a17f847453e52279e35509a5b7631
+  - type: file
+    url: https://files.pythonhosted.org/packages/f6/d2/40b3fa882147719744e6aa50ac39cf7a22a913cbcba86a0371176c425a3b/importlib_metadata-0.23-py2.py3-none-any.whl
+    sha256: d5f18a79777f3aa179c145737780282e27b508fc8fd688cb17c7a813e8bd39af
+  - type: file
+    url: https://files.pythonhosted.org/packages/74/0a/de673c1c987f5779b65ef69052331ec0b0ebd22958bda77a8284be831964/msgpack-0.6.2.tar.gz
+    sha256: ea3c2f859346fcd55fc46e96885301d9c2f7a36d453f5d8f2967840efa1e1830
   - type: file
     url: https://files.pythonhosted.org/packages/14/2c/cd551d81dbe15200be1cf41cd03869a46fe7226e7450af7a6545bfc474c9/idna-2.8-py2.py3-none-any.whl
     sha256: ea8b7f6188e6fa117537c3df7da9fc686d485087abf6ac197f9c46432f7e4a3c
@@ -16,17 +26,14 @@ sources:
     url: https://files.pythonhosted.org/packages/a7/b9/270301a3a87587f09bc3985973f2e362ffa45fa5fcd5128501516b2f5e31/cleo-0.6.8-py2.py3-none-any.whl
     sha256: 9b7f79f1aa470a025c0d28c76aa225ee9e65028d32f80032e871aa3500df61b8
   - type: file
-    url: https://files.pythonhosted.org/packages/29/22/716eb55bb154d2519752a2d91cf7e91d58dd24e8150c47aaaa67aae75aa6/tomlkit-0.5.5-py2.py3-none-any.whl
-    sha256: c6b0c11b85e888c12330c7605d43c1446aa148cd421163f90ca46ea813f2c336
+    url: https://files.pythonhosted.org/packages/e0/da/55f51ea951e1b7c63a579c09dd7db825bb730ec1fe9c0180fc77bfb31448/urllib3-1.25.6-py2.py3-none-any.whl
+    sha256: 3de946ffbed6e6746608990594d08faac602528ac7015ac28d33cee6a45b7398
   - type: file
-    url: https://files.pythonhosted.org/packages/9b/7e/7d701686013c0d7dae62e0977467232a6adc2e562c23878eb3cd4f97d02e/pastel-0.1.0-py3-none-any.whl
-    sha256: d1fee8079534f99f1805a044fef946d23eee6d6a7cd34292c30e6c16be9a80b9
+    url: https://files.pythonhosted.org/packages/45/dc/3241eef99eb45f1def35cf93af35d1cf9ef4c0991792583b8f33ea41b092/more_itertools-7.2.0-py3-none-any.whl
+    sha256: 92b8c4b06dac4f0611c0729b2f2ede52b2e1bac1ab48f089c7ddc12e26bb60c4
   - type: file
-    url: https://files.pythonhosted.org/packages/23/96/d828354fa2dbdf216eaa7b7de0db692f12c234f7ef888cc14980ef40d1d2/attrs-19.1.0-py2.py3-none-any.whl
-    sha256: 69c0dbf2ed392de1cb5ec704444b08a5ef81680a61cb899dc08127123af36a79
-  - type: file
-    url: https://files.pythonhosted.org/packages/a8/7b/630049fc4af9e68a625738612edc264ce7cb586c5001a2d4d2209a4f61c1/msgpack-0.6.1-cp37-cp37m-manylinux1_x86_64.whl
-    sha256: 7c55649965c35eb32c499d17dadfb8f53358b961582846e1bc06f66b9bccc556
+    url: https://files.pythonhosted.org/packages/a2/db/4313ab3be961f7a763066401fb77f7748373b6094076ae2bda2806988af6/attrs-19.3.0-py2.py3-none-any.whl
+    sha256: 08a96c641c3a74e44eb59afb61a24f2cb9f4d7188748e76ba4bb5edfa3cb7d1c
   - type: file
     url: https://files.pythonhosted.org/packages/26/37/8ce3e7b330078b6797a34e79a80a8ad6935e404a3b903765417182c9ce19/cachy-0.2.0-py2.py3-none-any.whl
     sha256: b71e8e7ddb5b386e23e81befdfac8a93885406139b8681bedc17b3444fcb8fca
@@ -34,8 +41,8 @@ sources:
     url: https://files.pythonhosted.org/packages/5e/f0/2c193ed1f17c97ae539da7e1c2d48b80d8cccb1917163b26a91ca4355aa6/CacheControl-0.12.5.tar.gz
     sha256: cef77effdf51b43178f6a2d3b787e3734f98ade253fa3187f3bb7315aaa42ff7
   - type: file
-    url: https://files.pythonhosted.org/packages/e6/60/247f23a7121ae632d62811ba7f273d0e58972d75e58a94d329d51550a47d/urllib3-1.25.3-py2.py3-none-any.whl
-    sha256: b246607a25ac80bedac05c6f282e3cdaf3afb65420fd024ac94435cabe6e18d1
+    url: https://files.pythonhosted.org/packages/18/b0/8146a4f8dd402f60744fa380bc73ca47303cccf8b9190fd16a827281eac2/certifi-2019.9.11-py2.py3-none-any.whl
+    sha256: fd7c7c74727ddcf00e9acd26bba8da604ffec95bf1c2144e67aff7a8b50e6cef
   - type: file
     url: https://files.pythonhosted.org/packages/f4/24/2a3e3df732393fed8b3ebf2ec078f05546de641fe1b667ee316ec1dcf3b7/webencodings-0.5.1-py2.py3-none-any.whl
     sha256: a0af1213f3c2226497a97e2b3aa01a7e4bee4f403f95be16fc9acd2947514a78
@@ -49,20 +56,26 @@ sources:
     url: https://files.pythonhosted.org/packages/40/1c/7dff1d242bf1e19f9c6202f0ba4e6fd18cc7ecb8bc85b17b2d16c806e228/pylev-1.3.0-py2.py3-none-any.whl
     sha256: 1d29a87beb45ebe1e821e7a3b10da2b6b2f4c79b43f482c2df1a1f748a6e114e
   - type: file
-    url: https://files.pythonhosted.org/packages/69/1b/b853c7a9d4f6a6d00749e94eb6f3a041e342a885b87340b79c1ef73e3a78/certifi-2019.6.16-py2.py3-none-any.whl
-    sha256: 046832c04d4e752f37383b628bc601a7ea7211496b4638f6514d0e5b9acc4939
+    url: https://files.pythonhosted.org/packages/11/fa/0160cd525c62d7abd076a070ff02b2b94de589f1a9789774f17d7c54058e/pyparsing-2.4.2-py2.py3-none-any.whl
+    sha256: d9338df12903bbf5d65a0e4e87c2161968b10d2e489652bb47001d82a9b028b4
   - type: file
     url: https://files.pythonhosted.org/packages/a5/62/bbd2be0e7943ec8504b517e62bab011b4946e1258842bc159e5dfde15b96/html5lib-1.0.1-py2.py3-none-any.whl
     sha256: 20b159aa3badc9d5ee8f5c647e5efd02ed2a66ab8d354930bd9ff139fc1dc0a3
   - type: file
-    url: https://files.pythonhosted.org/packages/ff/2c/afc36631a9e0dc9f2b8bd4c19fa2d330cbe07d6679a1c0910418a200acad/pyparsing-2.4.1.1-py2.py3-none-any.whl
-    sha256: 43c5486cefefa536c9aab528881c992328f020eefe4f6d06332449c365218580
+    url: https://files.pythonhosted.org/packages/74/3d/1ee25a26411ba0401b43c6376d2316a71addcc72ef8690b101b4ea56d76a/zipp-0.6.0-py2.py3-none-any.whl
+    sha256: f06903e9f1f43b12d371004b4ac7b06ab39a44adc747266928ae6debfa7b3335
   - type: file
     url: https://files.pythonhosted.org/packages/bc/a9/01ffebfb562e4274b6487b4bb1ddec7ca55ec7510b22e4c51f14098443b8/chardet-3.0.4-py2.py3-none-any.whl
     sha256: fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691
   - type: file
     url: https://files.pythonhosted.org/packages/8c/46/4e93ab8a379d7efe93f20a0fb8a27bdfe88942cc954ab0210c3164e783e0/pyrsistent-0.14.11.tar.gz
     sha256: 3ca82748918eb65e2d89f222b702277099aca77e34843c5eb9d52451173970e2
+  - type: file
+    url: https://files.pythonhosted.org/packages/3e/30/7c2693fc50bd466285ec22bf02ee344be1bde3e2e8267e302fdc82d11f2d/tomlkit-0.5.8-py2.py3-none-any.whl
+    sha256: 96e6369288571799a3052c1ef93b9de440e1ab751aa045f435b55e9d3bcd0690
+  - type: file
+    url: https://files.pythonhosted.org/packages/09/b9/ca6434777928cc4e25cd17a8d2a913f3c2877ce54c5a7b7c18bf646ff257/pastel-0.1.1-py2.py3-none-any.whl
+    sha256: a904e1659512cc9880a028f66de77cc813a4c32f7ceb68725cbc8afad57ef7ef
   - type: file
     url: https://files.pythonhosted.org/packages/c8/22/9460e311f340cb62d26a38c419b1381b8593b0bb6b5d1f056938b086d362/lockfile-0.12.2-py2.py3-none-any.whl
     sha256: 6c3cb24f344923d30b2785d5ad75182c8ea7ac1b6171b08657258ec7429d50fa
@@ -72,6 +85,6 @@ sources:
   - type: file
     url: https://files.pythonhosted.org/packages/73/fb/00a976f728d0d1fecfe898238ce23f502a721c0ac0ecfedb80e0d88c64e9/six-1.12.0-py2.py3-none-any.whl
     sha256: 3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c
-  - type: file
-    url: https://files.pythonhosted.org/packages/aa/69/df679dfbdd051568b53c38ec8152a3ab6bc533434fc7ed11ab034bf5e82f/jsonschema-3.0.1-py2.py3-none-any.whl
-    sha256: a5f6559964a3851f59040d3b961de5e68e70971afb88ba519d27e6a039efff1a
+cleanup:
+  - /bin
+  - /share/man/man1
diff --git a/flatpak/lockfile-depends.yaml b/flatpak/lockfile-depends.yaml
index e69eb1cc0..d3ef61dee 100644
--- a/flatpak/lockfile-depends.yaml
+++ b/flatpak/lockfile-depends.yaml
@@ -2,8 +2,12 @@ name: poetry-deps
 buildsystem: simple
 build-commands:
   - pip3 install --no-index --find-links="file://${PWD}" --prefix=${FLATPAK_DEST}
-    future gaphas importlib-metadata pycairo pygobject tomlkit zipp
+    colorama future gaphas importlib-metadata more-itertools packaging pycairo pygobject
+    pyparsing six zipp
 sources:
+  - type: file
+    url: https://files.pythonhosted.org/packages/76/53/e785891dce0e2f2b9f4b4ff5bc6062a53332ed28833c7afede841f46a5db/colorama-0.4.1.tar.gz
+    sha256: 05eed71e2e327246ad6b38c540c4a3117230b19679b875190486ddd2d721422d
   - type: file
     url: https://files.pythonhosted.org/packages/90/52/e20466b85000a181e1e144fd8305caf2cf475e2f9674e797b222f8105f5f/future-0.17.1.tar.gz
     sha256: 67045236dcfd6816dc439556d009594abf643e5eb48992e36beac09c2ca659b8
@@ -11,17 +15,26 @@ sources:
     url: https://files.pythonhosted.org/packages/65/81/d1d7c68c7ad64b0ef35659fe7a6aaa47635dab6aec0cf12dcf7d0ee5932a/gaphas-1.1.1-py2.py3-none-any.whl
     sha256: 210d36249f56ade49d394c79ae7f62a2ecec85ef75b87ac3f2ff231ce6fcaaa2
   - type: file
-    url: https://files.pythonhosted.org/packages/bd/23/dce4879ec58acf3959580bfe769926ed8198727250c5e395e6785c764a02/importlib_metadata-0.18-py2.py3-none-any.whl
-    sha256: 6dfd58dfe281e8d240937776065dd3624ad5469c835248219bd16cf2e12dbeb7
+    url: https://files.pythonhosted.org/packages/f6/d2/40b3fa882147719744e6aa50ac39cf7a22a913cbcba86a0371176c425a3b/importlib_metadata-0.23-py2.py3-none-any.whl
+    sha256: d5f18a79777f3aa179c145737780282e27b508fc8fd688cb17c7a813e8bd39af
+  - type: file
+    url: https://files.pythonhosted.org/packages/45/dc/3241eef99eb45f1def35cf93af35d1cf9ef4c0991792583b8f33ea41b092/more_itertools-7.2.0-py3-none-any.whl
+    sha256: 92b8c4b06dac4f0611c0729b2f2ede52b2e1bac1ab48f089c7ddc12e26bb60c4
+  - type: file
+    url: https://files.pythonhosted.org/packages/cf/94/9672c2d4b126e74c4496c6b3c58a8b51d6419267be9e70660ba23374c875/packaging-19.2-py2.py3-none-any.whl
+    sha256: d9551545c6d761f3def1677baf08ab2a3ca17c56879e70fecba2fc4dde4ed108
   - type: file
     url: https://files.pythonhosted.org/packages/48/20/5e83af98eb897935bf7dc39455e892ba866feebb9b7c3b392982866f9958/pycairo-1.18.1.tar.gz
     sha256: 70172e58b6bad7572a3518c26729b074acdde15e6fee6cbab6d3528ad552b786
   - type: file
-    url: https://files.pythonhosted.org/packages/40/ee/8daf797cda4ffe7724b9d47cbb5e2b44ca6235764622d163c586bd9bd7c5/PyGObject-3.32.2.tar.gz
-    sha256: fa82746df059b9e0dcf473e0a9ff0693aa5e064f1ca1e2c46b5ac815bceda1ad
+    url: https://files.pythonhosted.org/packages/46/8a/b183f3edc812d4d28c8b671a922b5bc2863be5d38c56b3ad9155815e78dd/PyGObject-3.34.0.tar.gz
+    sha256: 2acb0daf2b3a23a90f52066cc23d1053339fee2f5f7f4275f8baa3704ae0c543
   - type: file
-    url: https://files.pythonhosted.org/packages/29/22/716eb55bb154d2519752a2d91cf7e91d58dd24e8150c47aaaa67aae75aa6/tomlkit-0.5.5-py2.py3-none-any.whl
-    sha256: c6b0c11b85e888c12330c7605d43c1446aa148cd421163f90ca46ea813f2c336
+    url: https://files.pythonhosted.org/packages/11/fa/0160cd525c62d7abd076a070ff02b2b94de589f1a9789774f17d7c54058e/pyparsing-2.4.2-py2.py3-none-any.whl
+    sha256: d9338df12903bbf5d65a0e4e87c2161968b10d2e489652bb47001d82a9b028b4
   - type: file
-    url: https://files.pythonhosted.org/packages/da/bd/1a5fdf15aa44231fd09f63ecf175b60f057ae37ec65b343bb009364923f3/zipp-0.5.2-py2.py3-none-any.whl
-    sha256: 8a5712cfd3bb4248015eb3b0b3c54a5f6ee3f2425963ef2a0125b8bc40aafaec
+    url: https://files.pythonhosted.org/packages/73/fb/00a976f728d0d1fecfe898238ce23f502a721c0ac0ecfedb80e0d88c64e9/six-1.12.0-py2.py3-none-any.whl
+    sha256: 3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c
+  - type: file
+    url: https://files.pythonhosted.org/packages/74/3d/1ee25a26411ba0401b43c6376d2316a71addcc72ef8690b101b4ea56d76a/zipp-0.6.0-py2.py3-none-any.whl
+    sha256: f06903e9f1f43b12d371004b4ac7b06ab39a44adc747266928ae6debfa7b3335