Flatpak: Update dependencies

and convert files to yaml to improve readability

5 files changed, 112 insertions, 176 deletions

diff --git a/flatpak/modules/python3-pillow.yaml b/flatpak/modules/python3-pillow.yaml
new file mode 100644
index 0000000..7852d32
--- /dev/null
+++ b/flatpak/modules/python3-pillow.yaml
@@ -0,0 +1,11 @@
+name: python3-pillow
+ensure-writable:
+  - easy-install.pth
+buildsystem: simple
+build-commands:
+  - install -d ${FLATPAK_DEST}/lib/python3.7/site-packages/
+  - python3 setup.py install --prefix=${FLATPAK_DEST}
+sources:
+  - type: archive
+    url: https://files.pythonhosted.org/packages/1b/e1/1118d60e9946e4e77872b69c58bc2f28448ec02c99a2ce456cd1a272c5fd/Pillow-5.3.0.tar.gz
+    sha256: 2ea3517cd5779843de8a759c2349a3cd8d3893e03ab47053b66d5ec6f8bc4f93
diff --git a/flatpak/org.gajim.Gajim.Plugin.omemo.json b/flatpak/org.gajim.Gajim.Plugin.omemo.json
deleted file mode 100644
index 0e3b69b..0000000
--- a/flatpak/org.gajim.Gajim.Plugin.omemo.json
+++ /dev/null
@@ -1,123 +0,0 @@
-{
-    "id": "org.gajim.Gajim.Plugin.omemo",
-    "runtime": "org.gajim.Gajim",
-    "sdk": "org.gnome.Sdk//3.28",
-    "build-extension": true,
-    "separate-locales": false,
-    "appstream-compose": false,
-    "build-options": {
-        "env": {
-            "PYTHONPATH": "/app/plugins/omemo/lib/python3.5/site-packages/"
-        }
-    },
-    "modules": [
-        {
-            "name": "protobuf",
-            "buildsystem": "simple",
-            "build-commands": [
-                "install -d ${FLATPAK_DEST}/lib/python3.5/site-packages/",
-                "pip3 install --prefix=${FLATPAK_DEST} protobuf-3.6.0-py2.py3-none-any.whl"
-            ],
-            "sources": [
-                {
-                    "type": "file",
-                    "url": "https://files.pythonhosted.org/packages/85/f8/d09e4bf21c4de65405ce053e90542e728c5b7cf296b9df36b0bf0488f534/protobuf-3.6.0-py2.py3-none-any.whl",
-                    "sha256": "9f1087abb67b34e55108bc610936b34363a7aac692023bcbb17e065c253a1f80"
-                }
-            ]
-        },
-        {
-            "name": "python3-axolotl-curve25519",
-            "ensure-writable": [
-                "easy-install.pth"
-            ],
-            "buildsystem": "simple",
-            "build-commands": [
-                "install -d ${FLATPAK_DEST}/lib/python3.5/site-packages/",
-                "python3 setup.py install --prefix=${FLATPAK_DEST}"
-            ],
-            "sources": [
-                {
-                    "type": "archive",
-                    "url": "https://files.pythonhosted.org/packages/59/ca/c8111718bcc8da18e9b9868e784293232a58c57159a5ea18f00ee967258f/python-axolotl-curve25519-0.4.1.post2.tar.gz",
-                    "sha256": "0705a66297ebd2f508a60dc94e22881c754301eb81db93963322f6b3bdcb63a3"
-                }
-            ]
-        },
-        {
-            "name": "python3-axolotl",
-            "ensure-writable": [
-                "easy-install.pth",
-                "setuptools.pth"
-            ],
-            "buildsystem": "simple",
-            "build-commands": [
-                "install -d ${FLATPAK_DEST}/lib/python3.5/site-packages/",
-                "python3 setup.py install --prefix=${FLATPAK_DEST}"
-            ],
-            "sources": [
-                {
-                    "type": "archive",
-                    "url": "https://files.pythonhosted.org/packages/27/99/3b905f0061aba53526408d286e53cee3b00c9fd256eed7d21d5d41033690/python-axolotl-0.1.42.tar.gz",
-                    "sha256": "ef78c2efabcd4c33741669334bdda04710a3ef0e00b653f00127acff6460a7f0"
-                }
-            ]
-        },
-        {
-            "name": "python3-pillow",
-            "ensure-writable": [
-                "easy-install.pth"
-            ],
-            "buildsystem": "simple",
-            "build-commands": [
-                "install -d ${FLATPAK_DEST}/lib/python3.5/site-packages/",
-                "python3 setup.py install --prefix=${FLATPAK_DEST}"
-            ],
-            "sources": [
-                {
-                    "type": "archive",
-                    "url": "https://files.pythonhosted.org/packages/89/b8/2f49bf71cbd0e9485bb36f72d438421b69b7356180695ae10bd4fd3066f5/Pillow-5.1.0.tar.gz",
-                    "sha256": "cee9bc75bff455d317b6947081df0824a8f118de2786dc3d74a3503fd631f4ef"
-                }
-            ]
-        },
-        {
-            "name": "python3-qrcode",
-            "buildsystem": "simple",
-            "build-commands": [
-                "install -d ${FLATPAK_DEST}/lib/python3.5/site-packages/",
-                "pip3 install --prefix=${FLATPAK_DEST} qrcode-6.0-py2.py3-none-any.whl"
-            ],
-            "sources": [
-                {
-                    "type": "file",
-                    "url": "https://files.pythonhosted.org/packages/79/be/11999004f7e6e5db0fa410c2feacd67c07f472f4500fde0026101f31d0df/qrcode-6.0-py2.py3-none-any.whl",
-                    "sha256": "de4ffc15065e6ff20a551ad32b6b41264f3c75275675406ddfa8e3530d154be3"
-                }
-            ]
-        },
-        {
-            "name": "gajim-omemo",
-            "buildsystem": "simple",
-            "build-commands": [
-                "cp -R -t ${FLATPAK_DEST} *"
-            ],
-            "post-install": [
-                "install -Dm644 --target-directory=${FLATPAK_DEST}/share/metainfo org.gajim.Gajim.Plugin.omemo.metainfo.xml",
-                "appstream-compose --basename=org.gajim.Gajim.Plugin.omemo --prefix=${FLATPAK_DEST} --origin=flatpak org.gajim.Gajim.Plugin.omemo"
-            ],
-            "sources": [
-                {
-                    "type": "archive",
-                    "url": "https://ftp.gajim.org/plugins_releases/omemo_2.5.13.zip",
-                    "sha256": "edfbb1de429fb6f63a1fbdef139bfe695577eff0faf7f38503617da2f4377cd1"
-                },
-                {
-                    "type": "file",
-                    "path": "org.gajim.Gajim.Plugin.omemo.metainfo.xml",
-                    "sha256": "d7ef976ee4239d5c6b0da7b5e3bcc85d99db7d860c0329347a9522e8a176c69e"
-                }
-            ]
-        }
-    ]
-}
diff --git a/flatpak/org.gajim.Gajim.Plugin.omemo.yaml b/flatpak/org.gajim.Gajim.Plugin.omemo.yaml
new file mode 100644
index 0000000..6a0e2f2
--- /dev/null
+++ b/flatpak/org.gajim.Gajim.Plugin.omemo.yaml
@@ -0,0 +1,73 @@
+id: org.gajim.Gajim.Plugin.omemo
+runtime: org.gajim.Gajim
+sdk: org.gnome.Sdk//3.30
+build-extension: true
+separate-locales: false
+appstream-compose: false
+
+build-options:
+  env:
+    PYTHONPATH: /app/plugins/omemo/lib/python3.7/site-packages/
+
+modules:
+  - modules/python3-pillow.yaml
+
+  - name: protobuf
+    buildsystem: simple
+    build-commands:
+      - install -d ${FLATPAK_DEST}/lib/python3.7/site-packages/
+      - pip3 install --prefix=${FLATPAK_DEST} protobuf-3.6.1-py2.py3-none-any.whl
+    sources:
+      - type: file
+        url: https://files.pythonhosted.org/packages/77/78/a7f1ce761e2c738e209857175cd4f90a8562d1bde32868a8cd5290d58926/protobuf-3.6.1-py2.py3-none-any.whl
+        sha256: 196d3a80f93c537f27d2a19a4fafb826fb4c331b0b99110f985119391d170f96
+
+  - name: python3-axolotl-curve25519
+    ensure-writable:
+      - easy-install.pth
+    buildsystem: simple
+    build-commands:
+      - install -d ${FLATPAK_DEST}/lib/python3.7/site-packages/
+      - python3 setup.py install --prefix=${FLATPAK_DEST}
+    sources:
+      - type: archive
+        url: https://files.pythonhosted.org/packages/59/ca/c8111718bcc8da18e9b9868e784293232a58c57159a5ea18f00ee967258f/python-axolotl-curve25519-0.4.1.post2.tar.gz
+        sha256: 0705a66297ebd2f508a60dc94e22881c754301eb81db93963322f6b3bdcb63a3
+
+  - name: python3-axolotl
+    ensure-writable:
+      - easy-install.pth
+      - setuptools.pth
+    buildsystem: simple
+    build-commands:
+      - install -d ${FLATPAK_DEST}/lib/python3.7/site-packages/
+      - python3 setup.py install --prefix=${FLATPAK_DEST}
+    sources:
+      - type: archive
+        url: https://files.pythonhosted.org/packages/27/99/3b905f0061aba53526408d286e53cee3b00c9fd256eed7d21d5d41033690/python-axolotl-0.1.42.tar.gz
+        sha256: ef78c2efabcd4c33741669334bdda04710a3ef0e00b653f00127acff6460a7f0
+
+  - name: python3-qrcode
+    buildsystem: simple
+    build-commands:
+      - install -d ${FLATPAK_DEST}/lib/python3.7/site-packages/
+      - pip3 install --prefix=${FLATPAK_DEST} qrcode-6.0-py2.py3-none-any.whl
+    sources:
+      - type: file
+        url: https://files.pythonhosted.org/packages/79/be/11999004f7e6e5db0fa410c2feacd67c07f472f4500fde0026101f31d0df/qrcode-6.0-py2.py3-none-any.whl
+        sha256: de4ffc15065e6ff20a551ad32b6b41264f3c75275675406ddfa8e3530d154be3
+
+  - name: gajim-omemo
+    buildsystem: simple
+    build-commands:
+      - 'cp -R -t ${FLATPAK_DEST} *'
+    post-install:
+      - install -Dm644 --target-directory=${FLATPAK_DEST}/share/metainfo org.gajim.Gajim.Plugin.omemo.metainfo.xml
+      - appstream-compose --basename=org.gajim.Gajim.Plugin.omemo --prefix=${FLATPAK_DEST} --origin=flatpak org.gajim.Gajim.Plugin.omemo
+    sources:
+      - type: archive
+        url: https://ftp.gajim.org/plugins_releases/omemo_2.6.1.zip
+        sha256: 52900457b10c55c2a7e4f67bb17861a1d769f909819e464fc3503842defb4b7f
+      - type: file
+        path: org.gajim.Gajim.Plugin.omemo.metainfo.xml
+        sha256: d7ef976ee4239d5c6b0da7b5e3bcc85d99db7d860c0329347a9522e8a176c69e
diff --git a/flatpak/org.gajim.Gajim.Plugin.url_image_preview.json b/flatpak/org.gajim.Gajim.Plugin.url_image_preview.json
deleted file mode 100644
index d3198c9..0000000
--- a/flatpak/org.gajim.Gajim.Plugin.url_image_preview.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-    "id": "org.gajim.Gajim.Plugin.url_image_preview",
-    "runtime": "org.gajim.Gajim",
-    "sdk": "org.gnome.Sdk//3.28",
-    "build-extension": true,
-    "separate-locales": false,
-    "appstream-compose": false,
-    "build-options": {
-        "env": {
-            "PYTHONPATH": "/app/plugins/url_image_preview/lib/python3.5/site-packages/"
-        }
-    },
-    "modules": [
-        {
-            "name": "python3-pillow",
-            "buildsystem": "simple",
-            "build-commands": [
-                "install -d ${FLATPAK_DEST}/lib/python3.5/site-packages/",
-                "python3 setup.py install --prefix=${FLATPAK_DEST}"
-            ],
-            "sources": [
-                {
-                    "type": "archive",
-                    "url": "https://files.pythonhosted.org/packages/89/b8/2f49bf71cbd0e9485bb36f72d438421b69b7356180695ae10bd4fd3066f5/Pillow-5.1.0.tar.gz",
-                    "sha256": "cee9bc75bff455d317b6947081df0824a8f118de2786dc3d74a3503fd631f4ef"
-                }
-            ]
-        },
-        {
-            "name": "gajim-url_image_preview",
-            "buildsystem": "simple",
-            "build-commands": [
-                "cp -R -t ${FLATPAK_DEST} *"
-            ],
-            "post-install": [
-                "install -Dm644 --target-directory=${FLATPAK_DEST}/share/metainfo org.gajim.Gajim.Plugin.url_image_preview.metainfo.xml",
-                "appstream-compose --basename=org.gajim.Gajim.Plugin.url_image_preview --prefix=${FLATPAK_DEST} --origin=flatpak org.gajim.Gajim.Plugin.url_image_preview"
-            ],
-            "sources": [
-                {
-                    "type": "archive",
-                    "url": "https://ftp.gajim.org/plugins_releases/url_image_preview_2.2.0.zip",
-                    "sha256": "1f2f0f908e7c493fa153f7cf513f598807978b7ebdc7af9fad232d95023b4fd3"
-                },
-                {
-                    "type": "file",
-                    "path": "org.gajim.Gajim.Plugin.url_image_preview.metainfo.xml",
-                    "sha256": "3babf6d51115b18c8743c9a78ff7fbd66338c496376ae24a217085ae1543ef0b"
-                }
-            ]
-        }
-    ]
-}
diff --git a/flatpak/org.gajim.Gajim.Plugin.url_image_preview.yaml b/flatpak/org.gajim.Gajim.Plugin.url_image_preview.yaml
new file mode 100644
index 0000000..810391f
--- /dev/null
+++ b/flatpak/org.gajim.Gajim.Plugin.url_image_preview.yaml
@@ -0,0 +1,28 @@
+id: org.gajim.Gajim.Plugin.url_image_preview
+runtime: org.gajim.Gajim
+sdk: org.gnome.Sdk//3.30
+build-extension: true
+separate-locales: false
+appstream-compose: false
+
+build-options:
+  env:
+    PYTHONPATH: /app/plugins/url_image_preview/lib/python3.7/site-packages/
+
+modules:
+  - modules/python3-pillow.yaml
+
+  - name: gajim-url_image_preview
+    buildsystem: simple
+    build-commands:
+      - 'cp -R -t ${FLATPAK_DEST} *'
+    post-install:
+      - install -Dm644 --target-directory=${FLATPAK_DEST}/share/metainfo org.gajim.Gajim.Plugin.url_image_preview.metainfo.xml
+      - appstream-compose --basename=org.gajim.Gajim.Plugin.url_image_preview --prefix=${FLATPAK_DEST} --origin=flatpak org.gajim.Gajim.Plugin.url_image_preview
+    sources:
+      - type: archive
+        url: https://ftp.gajim.org/plugins_releases/url_image_preview_2.3.1.zip
+        sha256: b90d50f5e7aaa46f8eff8bf531a98f208e48e771ac81b3d36a23d44ae13a0500
+      - type: file
+        path: org.gajim.Gajim.Plugin.url_image_preview.metainfo.xml
+        sha256: 3b11c6bcb9c349bb6b831031da6740f5da6fc1e925ab98c5c06a62d787ca26fc