Flatpak: Fix dependencies of OpenPGP

3 files changed, 39 insertions, 10 deletions

diff --git a/flatpak/modules/python3-python-gnupg.yaml b/flatpak/modules/python3-python-gnupg.yaml
deleted file mode 100644
index a7b7b24..0000000
--- a/flatpak/modules/python3-python-gnupg.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-name: python3-python-gnupg
-buildsystem: simple
-build-commands:
-  - pip3 install python_gnupg-0.4.6-py2.py3-none-any.whl
-sources:
-  - type: file
-    url: https://files.pythonhosted.org/packages/cb/85/8a1588a04172e0853352ecfe214264c65a62ab35374d9ad9c569cf94c2a3/python_gnupg-0.4.6-py2.py3-none-any.whl
-    sha256: cba3566e8a8fb7bb417d6897a6e17bfc7f9371052e57eb0057783c07d762a679
diff --git a/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml b/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml
index f3fbe5a..e09aa58 100644
--- a/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml
+++ b/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml
@@ -9,7 +9,37 @@ build-options:
     PIP_TARGET: /app/plugins/openpgp/site-packages
 
 modules:
-  - modules/python3-python-gnupg.yaml
+  - name: swig
+    cleanup:
+      - "*"
+    build-options:
+      prefix: ${FLATPAK_DEST}
+    sources:
+      - type: archive
+        url: https://downloads.sourceforge.net/swig/swig-4.0.2.tar.gz
+        sha256: d53be9730d8d58a16bf0cbd1f8ac0c0c3e1090573168bfa151b01eb47fa906fc
+
+  - name: python3-gpgme
+    cleanup:
+      - /bin
+      - /include
+      - /lib
+      - /share
+    build-options:
+      config-opts:
+        - --enable-languages=python
+      env:
+         SWIG_LIB: "/app/plugins/openpgp/share/swig/4.0.2"
+      prepend-path: "/app/plugins/openpgp/bin:"
+      prefix: ${FLATPAK_DEST}
+    post-install:
+      - mv ${FLATPAK_DEST}/lib/python3.8/site-packages ${FLATPAK_DEST}/site-packages
+    sources:
+      # used version should match runtime version of gpgme
+      # so we don't have to ship libs
+      - type: archive
+        url: https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-1.14.0.tar.bz2
+        sha256: cef1f710a6b0d28f5b44242713ad373702d1466dcbe512eb4e754d7f35cd4307
 
   - name: gajim-openpgp
     buildsystem: simple
diff --git a/flatpak/org.gajim.Gajim.Plugin.pgp.yaml b/flatpak/org.gajim.Gajim.Plugin.pgp.yaml
index 1caf1a5..39cf3d0 100644
--- a/flatpak/org.gajim.Gajim.Plugin.pgp.yaml
+++ b/flatpak/org.gajim.Gajim.Plugin.pgp.yaml
@@ -10,7 +10,14 @@ build-options:
     PIP_TARGET: /app/plugins/pgp/site-packages
 
 modules:
-  - modules/python3-python-gnupg.yaml
+  - name: python3-python-gnupg
+    buildsystem: simple
+    build-commands:
+      - pip3 install python_gnupg-0.4.6-py2.py3-none-any.whl
+    sources:
+      - type: file
+        url: https://files.pythonhosted.org/packages/cb/85/8a1588a04172e0853352ecfe214264c65a62ab35374d9ad9c569cf94c2a3/python_gnupg-0.4.6-py2.py3-none-any.whl
+        sha256: cba3566e8a8fb7bb417d6897a6e17bfc7f9371052e57eb0057783c07d762a679
 
   - name: gajim-pgp
     buildsystem: simple