From 4ace03be6c781cbbec596a74d0dcfd1fcf1e048b Mon Sep 17 00:00:00 2001
From: miruka <miruka@disroot.org>
Date: Mon, 1 Mar 2021 09:37:09 -0400
Subject: [PATCH] Update requirements and flatpak manifest

---
 packaging/flatpak/mirage.flatpak.base.yaml |  13 ++-
 packaging/flatpak/mirage.flatpak.yaml      | 104 +++++++++++++++++++--
 requirements.txt                           |   2 +-
 3 files changed, 107 insertions(+), 12 deletions(-)

diff --git a/packaging/flatpak/mirage.flatpak.base.yaml b/packaging/flatpak/mirage.flatpak.base.yaml
index 04a4f45c..b7ea7b06 100644
--- a/packaging/flatpak/mirage.flatpak.base.yaml
+++ b/packaging/flatpak/mirage.flatpak.base.yaml
@@ -9,6 +9,7 @@ finish-args:
   - --share=network
   - --socket=x11
   - --socket=wayland
+  - --socket=pulseaudio
   - --device=dri
   - --filesystem=host
   - --talk-name=org.freedesktop.Notifications
@@ -26,6 +27,7 @@ cleanup:
   - /app/bin/jsonschema
   - /app/bin/pasteurize
   - /app/bin/pwiz.py
+  - /app/bin/watchgod
 
 modules:
   - name: pyotherside
@@ -45,8 +47,8 @@ modules:
     sources:
       - type: git
         url: https://gitlab.matrix.org/matrix-org/olm.git
-        tag: 3.1.4
-        commit: 6753595300767dd70150831dbbe6f92d64e75038
+        tag: 3.2.2
+        commit: 3745ea57bbce319ac2f190e02062e45a46d23471
     disable-shallow-clone: true
     config-opts:
       - -DCMAKE_BUILD_TYPE=Release
@@ -89,12 +91,15 @@ modules:
   - name: python3-matrix-nio
     buildsystem: simple
     build-commands:
-      - rm pyproject.toml
       - pip3 install --prefix=${FLATPAK_DEST} .
+    # network access required for poetry
+    build-options:
+      build-args:
+        - --share=network
     sources:
       - type: git
         url: https://github.com/mirukana/matrix-nio.git
-        commit: 7cf488492d4f70632605f302e1ff75cef4973f02
+        commit: cd95f409ea2d4c20c619225e44245c178074da68
 
   - name: mirage
     buildsystem: qmake
diff --git a/packaging/flatpak/mirage.flatpak.yaml b/packaging/flatpak/mirage.flatpak.yaml
index 38a60ffb..3158e6e7 100644
--- a/packaging/flatpak/mirage.flatpak.yaml
+++ b/packaging/flatpak/mirage.flatpak.yaml
@@ -8,6 +8,7 @@ finish-args:
 - --share=network
 - --socket=x11
 - --socket=wayland
+- --socket=pulseaudio
 - --device=dri
 - --filesystem=host
 - --talk-name=org.freedesktop.Notifications
@@ -40,8 +41,8 @@ modules:
   sources:
   - type: git
     url: https://gitlab.matrix.org/matrix-org/olm.git
-    tag: 3.1.4
-    commit: 6753595300767dd70150831dbbe6f92d64e75038
+    tag: 3.2.2
+    commit: 3745ea57bbce319ac2f190e02062e45a46d23471
   disable-shallow-clone: true
   config-opts:
   - -DCMAKE_BUILD_TYPE=Release
@@ -86,18 +87,20 @@ modules:
   - type: file
     url: https://files.pythonhosted.org/packages/cb/ae/380e33d621ae301770358eb11a896a34c34f30db188847a561e8e39ee866/cffi-1.14.3.tar.gz
     sha256: f92f789e4f9241cd262ad7a555ca2c648a98178a953af117ef7fad46aa1d5591
+
 - name: python3-importlib-metadata
   buildsystem: simple
   build-commands:
   - pip3 install --exists-action=i --no-index --find-links="file://${PWD}" --prefix=${FLATPAK_DEST}
-    "importlib-metadata==2.0.0"
+    "importlib-metadata==1.7.0"
   sources:
   - type: file
     url: https://files.pythonhosted.org/packages/c4/79/3b770d51254a31bb85ba56ea70d7428d0c2c659a233cc9722352e028b539/zipp-3.2.0-py3-none-any.whl
     sha256: 43f4fa8d8bb313e65d8323a3952ef8756bf40f9a5c3ea7334be23ee4ec8278b6
   - type: file
-    url: https://files.pythonhosted.org/packages/6d/6d/f4bb28424bc677bce1210bc19f69a43efe823e294325606ead595211f93e/importlib_metadata-2.0.0-py2.py3-none-any.whl
-    sha256: cefa1a2f919b866c5beb7c9f7b0ebb4061f30a8a9bf16d609b000e2dfaceb9c3
+    url: https://files.pythonhosted.org/packages/8e/58/cdea07eb51fc2b906db0968a94700866fc46249bdc75cac23f9d13168929/importlib_metadata-1.7.0-py2.py3-none-any.whl
+    sha256: dc15b2969b4ce36305c51eebe62d418ac7791e9a157911d58bfb1f9ccd8e2070
+
 - name: python3-multidict
   buildsystem: simple
   build-commands:
@@ -614,6 +617,67 @@ modules:
   - type: file
     url: https://files.pythonhosted.org/packages/23/8c/22a47a4bf8c5289e4ed946d2b0e4df62bca385b9599cc1e46878f2e2529c/sortedcontainers-2.2.2-py2.py3-none-any.whl
     sha256: c633ebde8580f241f274c1f8994a665c0e54a17724fecd0cae2f079e09c36d3f
+
+- name: python3-watchgod
+  buildsystem: simple
+  build-commands:
+  - pip3 install --exists-action=i --no-index --find-links="file://${PWD}" --prefix=${FLATPAK_DEST}
+    "watchgod==0.7"
+  sources:
+  - type: file
+    url: https://files.pythonhosted.org/packages/57/35/9a8da3fb6681e6eba662b2d249eea58cebf575e392271efac3344c172c5f/watchgod-0.7-py3-none-any.whl
+    sha256: d6c1ea21df37847ac0537ca0d6c2f4cdf513562e95f77bb93abbcf05573407b7
+
+- name: python3-hsluv
+  buildsystem: simple
+  build-commands:
+  - pip3 install --exists-action=i --no-index --find-links="file://${PWD}" --prefix=${FLATPAK_DEST}
+    "hsluv==5.0.2"
+  sources:
+  - type: file
+    url: https://files.pythonhosted.org/packages/ea/85/027dfe4fe20fdfef78373050764948ff8d78d9a17c95c20f2dfd478091a4/hsluv-5.0.2-py2.py3-none-any.whl
+    sha256: f31a72317926a985fee9c08cf18d26acd1fc3983b47c042c4da2eb4d7b57fa09
+
+- name: python3-simpleaudio
+  buildsystem: simple
+  build-commands:
+  - pip3 install --exists-action=i --no-index --find-links="file://${PWD}" --prefix=${FLATPAK_DEST}
+    "simpleaudio==1.0.4"
+  sources:
+  - type: file
+    url: https://files.pythonhosted.org/packages/94/1b/4dc29653733202b68c09d9c6ca085cf67ac54859ee860647ef21ac1ff3dc/simpleaudio-1.0.4.tar.gz
+    sha256: 691c88649243544db717e7edf6a9831df112104e1aefb5f6038a5d071e8cf41d
+
+- name: python3-rply
+  buildsystem: simple
+  build-commands:
+  - pip3 install --exists-action=i --no-index --find-links="file://${PWD}" --prefix=${FLATPAK_DEST}
+    "rply==0.7.8"
+  sources:
+  - type: file
+    url: https://files.pythonhosted.org/packages/c0/7c/f66be9e75485ae6901ae77d8bdbc3c0e99ca748ab927b3e18205759bde09/rply-0.7.8-py2.py3-none-any.whl
+    sha256: 28ffd11d656c48aeb8c508eb382acd6a0bd906662624b34388751732a27807e7
+
+- name: python3-baron
+  buildsystem: simple
+  build-commands:
+  - pip3 install --exists-action=i --no-index --find-links="file://${PWD}" --prefix=${FLATPAK_DEST}
+    "baron==0.9"
+  sources:
+  - type: file
+    url: https://files.pythonhosted.org/packages/90/1e/74a712ce3d559411ad640415f0bc75b17d5ea61d63b99a529712e8f02a49/baron-0.9-py2.py3-none-any.whl
+    sha256: 05bac85913c1ebc44986f6915bf6a043ce5ce1e5c4d392a209f73845181e9452
+
+- name: python3-redbaron
+  buildsystem: simple
+  build-commands:
+  - pip3 install --exists-action=i --no-index --find-links="file://${PWD}" --prefix=${FLATPAK_DEST}
+    "redbaron==0.9.2"
+  sources:
+  - type: file
+    url: https://files.pythonhosted.org/packages/d8/06/c1c97efe5d30593337721923c5813b3b4eaffcffb706e523acf3d3bc9e8c/redbaron-0.9.2-py2.py3-none-any.whl
+    sha256: d01032b6a848b5521a8d6ef72486315c2880f420956870cdd742e2b5a09b9bab
+
 - name: python3-tinycss2
   buildsystem: simple
   build-commands:
@@ -680,15 +744,41 @@ modules:
   - type: file
     url: https://files.pythonhosted.org/packages/c4/79/3b770d51254a31bb85ba56ea70d7428d0c2c659a233cc9722352e028b539/zipp-3.2.0-py3-none-any.whl
     sha256: 43f4fa8d8bb313e65d8323a3952ef8756bf40f9a5c3ea7334be23ee4ec8278b6
+
+- name: python3-socks
+  buildsystem: simple
+  build-commands:
+  - pip3 install --exists-action=i --no-index --find-links="file://${PWD}" --prefix=${FLATPAK_DEST}
+    "python-socks==1.2.2"
+  sources:
+  - type: file
+    url: https://files.pythonhosted.org/packages/f7/39/ce05e2772d9ec266644484ced4f9f6207b488b7670adcc9ddacf8ca78f91/python_socks-1.2.2-py3-none-any.whl
+    sha256: 41100508d6a3723c2e9884d3330d8bd022a7ef0a953e826637833bf882550fc7
+
+- name: python3-aiohttp-socks
+  buildsystem: simple
+  build-commands:
+  - pip3 install --exists-action=i --no-index --find-links="file://${PWD}" --prefix=${FLATPAK_DEST}
+    "aiohttp-socks==0.6.0"
+  sources:
+  - type: file
+    url: https://files.pythonhosted.org/packages/9a/6c/d302e5a8097fee1e83b9f8e9da10d7752fbf27c74db18b3cc9528b3479be/aiohttp_socks-0.6.0-py3-none-any.whl
+    sha256: db7aa48c0758ee45d7dbc1fde499912ec6fb77eab77a6e2808825d1f41d4e300
+
 - name: python3-matrix-nio
   buildsystem: simple
   build-commands:
-  - rm pyproject.toml
   - pip3 install --prefix=${FLATPAK_DEST} .
+  build-options:
+    build-args:
+      - --share=network
   sources:
+  - type: file
+    url: https://files.pythonhosted.org/packages/a0/56/d7923fb39395c662bab9e6044e290458a77204ea3cafc3b1ea88e27b8f4c/poetry_core-1.0.2-py2.py3-none-any.whl
+    sha256: ee0ed4164440eeab27d1b01bc7b9b3afdc3124f68d4ea28d0821a402a9c7c044
   - type: git
     url: https://github.com/mirukana/matrix-nio.git
-    commit: 7cf488492d4f70632605f302e1ff75cef4973f02
+    commit: cd95f409ea2d4c20c619225e44245c178074da68
 - name: mirage
   buildsystem: qmake
   sources:
diff --git a/requirements.txt b/requirements.txt
index d5b2e8a1..74b5a778 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ mistune           >= 0.8.4,  < 0.9
 pymediainfo       >= 4.2.1,  < 5
 plyer             >= 1.4.3,  < 2
 sortedcontainers  >= 2.2.2,  < 3
-watchgod          >= 0.6,    < 0.7
+watchgod          >= 0.7,    < 0.8
 redbaron          >= 0.9.2,  < 1
 hsluv             >= 5.0.0,  < 6
 simpleaudio       >= 1.0.4,  < 2