From 860cb62f7632ada2a2bd991aa8f1cf629f387d6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Apitzsch?= <git@apitzsch.eu>
Date: Sun, 8 May 2022 15:47:05 +0200
Subject: Flatpak: Fix plugin hashes

Archives have been recreated with renamed manifest.json.
---
 flatpak/org.gajim.Gajim.Plugin.omemo.yaml   | 9 ++++-----
 flatpak/org.gajim.Gajim.Plugin.openpgp.yaml | 3 +--
 flatpak/org.gajim.Gajim.Plugin.pgp.yaml     | 3 +--
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/flatpak/org.gajim.Gajim.Plugin.omemo.yaml b/flatpak/org.gajim.Gajim.Plugin.omemo.yaml
index 23e1db0..7d89b7e 100644
--- a/flatpak/org.gajim.Gajim.Plugin.omemo.yaml
+++ b/flatpak/org.gajim.Gajim.Plugin.omemo.yaml
@@ -13,11 +13,11 @@ modules:
   - name: protobuf
     buildsystem: simple
     build-commands:
-      - pip3 install --no-deps protobuf-3.19.4-py2.py3-none-any.whl
+      - pip3 install --no-deps protobuf-3.20.1-py2.py3-none-any.whl
     sources:
       - type: file
-        url: https://files.pythonhosted.org/packages/py2.py3/p/protobuf/protobuf-3.19.4-py2.py3-none-any.whl
-        sha256: 8961c3a78ebfcd000920c9060a262f082f29838682b1f7201889300c1fbe0616
+        url: https://files.pythonhosted.org/packages/py2.py3/p/protobuf/protobuf-3.20.1-py2.py3-none-any.whl
+        sha256: adfc6cf69c7f8c50fd24c793964eef18f0ac321315439d94945820612849c388
 
   - name: python3-axolotl-curve25519
     buildsystem: simple
@@ -50,7 +50,6 @@ modules:
     buildsystem: simple
     build-commands:
       - 'cp -R -t ${FLATPAK_DEST} *'
-      - 'mv ${FLATPAK_DEST}/{,plugin-}manifest.json'
     post-install:
       - install -Dm644 --target-directory=${FLATPAK_DEST}/share/metainfo org.gajim.Gajim.Plugin.omemo.metainfo.xml
       - appstream-compose --basename=org.gajim.Gajim.Devel.Plugin.omemo --prefix=${FLATPAK_DEST} --origin=flatpak org.gajim.Gajim.Plugin.omemo
@@ -58,7 +57,7 @@ modules:
       - type: archive
         strip-components: 0
         url: https://ftp.gajim.org/plugins/master/omemo/omemo_2.8.14.zip
-        sha256: 610602db8de8e124137342ca060e883a5a917529968e63bb95783e4a96f4a1e5
+        sha256: a16187122b09f37a8811a847235d197f12bc9d771811cc63d70a4f30befa89c2
       - type: shell
         commands:
           - sed -i "s+org.gajim.Gajim+org.gajim.Gajim.Devel+" org.gajim.Gajim.Plugin.*.metainfo.xml
diff --git a/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml b/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml
index 1e46f6e..f88a70f 100644
--- a/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml
+++ b/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml
@@ -45,7 +45,6 @@ modules:
     buildsystem: simple
     build-commands:
       - 'cp -R -t ${FLATPAK_DEST} *'
-      - 'mv ${FLATPAK_DEST}/{,plugin-}manifest.json'
     post-install:
       - install -Dm644 --target-directory=${FLATPAK_DEST}/share/metainfo org.gajim.Gajim.Plugin.openpgp.metainfo.xml
       - appstream-compose --basename=org.gajim.Gajim.Devel.Plugin.openpgp --prefix=${FLATPAK_DEST} --origin=flatpak org.gajim.Gajim.Plugin.openpgp
@@ -53,7 +52,7 @@ modules:
       - type: archive
         strip-components: 0
         url: https://ftp.gajim.org/plugins/master/openpgp/openpgp_1.4.9.zip
-        sha256: e80d4fbafe6b69d2ee5ba6a1acb6bf942ab719da70470dc9d15d5cbfd1e657a6
+        sha256: b881ed25942c89a5a647ec3fc08e68278f1365a74ffb704d4ffffc10957195f7
       - type: shell
         commands:
           - sed -i "s+org.gajim.Gajim+org.gajim.Gajim.Devel+" org.gajim.Gajim.Plugin.*.metainfo.xml
diff --git a/flatpak/org.gajim.Gajim.Plugin.pgp.yaml b/flatpak/org.gajim.Gajim.Plugin.pgp.yaml
index 58e023b..c282497 100644
--- a/flatpak/org.gajim.Gajim.Plugin.pgp.yaml
+++ b/flatpak/org.gajim.Gajim.Plugin.pgp.yaml
@@ -23,7 +23,6 @@ modules:
     buildsystem: simple
     build-commands:
       - 'cp -R -t ${FLATPAK_DEST} *'
-      - 'mv ${FLATPAK_DEST}/{,plugin-}manifest.json'
     post-install:
       - install -Dm644 --target-directory=${FLATPAK_DEST}/share/metainfo org.gajim.Gajim.Plugin.pgp.metainfo.xml
       - appstream-compose --basename=org.gajim.Gajim.Devel.Plugin.pgp --prefix=${FLATPAK_DEST} --origin=flatpak org.gajim.Gajim.Plugin.pgp
@@ -31,7 +30,7 @@ modules:
       - type: archive
         strip-components: 0
         url: https://ftp.gajim.org/plugins/master/pgp/pgp_1.4.5.zip
-        sha256: fb02a0a32f71874052a0203724f023a2373caeca7c0bedd41f3d5be636a824a7
+        sha256: 8f492406c1f49dc2cc22bfffa4aeb165b3079c4c8dbd90b6dcc3619256e94e59
       - type: shell
         commands:
           - sed -i "s+org.gajim.Gajim+org.gajim.Gajim.Devel+" org.gajim.Gajim.Plugin.*.metainfo.xml
-- 
cgit v1.2.3