From c3f8fc41e282d78e87208f0ff4ba6b134022a70a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Apitzsch?= <git@apitzsch.eu>
Date: Tue, 16 Sep 2025 22:27:29 +0200
Subject: [PATCH] Flatpak: Update runtime + dependencies

---
 flatpak/org.gajim.Gajim.Plugin.openpgp.yaml | 30 ++++++++++-----------
 flatpak/org.gajim.Gajim.Plugin.pgp.yaml     |  6 ++---
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml b/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml
index 902cc16..6776c7a 100644
--- a/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml
+++ b/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml
@@ -1,6 +1,6 @@
 id: org.gajim.Gajim.Devel.Plugin.openpgp
 runtime: org.gajim.Gajim.Devel
-sdk: org.gnome.Sdk//48
+sdk: org.gnome.Sdk//49
 build-extension: true
 separate-locales: false
 appstream-compose: false
@@ -21,25 +21,23 @@ modules:
         url: https://downloads.sourceforge.net/swig/swig-4.3.1.tar.gz
         sha256: 44fc829f70f1e17d635a2b4d69acab38896699ecc24aa023e516e0eabbec61b8
 
-  - name: gpgme
-    cleanup:
-      - /bin
-      - /include
-      - /share
+  - name: python3-gpgme
+    buildsystem: simple
     build-options:
-      config-opts:
-        - --enable-languages=python
       env:
-        SWIG_LIB: "/app/plugins/openpgp/share/swig/4.3.0"
+        SWIG_LIB: "/app/plugins/openpgp/share/swig/4.3.1"
       prepend-path: "/app/plugins/openpgp/bin:"
-      prefix: ${FLATPAK_DEST}
-    post-install:
-      - mkdir -p ${FLATPAK_DEST}/site-packages
-      - mv ${FLATPAK_DEST}/lib/python3.12/site-packages/*.egg/gpg ${FLATPAK_DEST}/site-packages/
+    build-commands:
+      - sed -e 's|, \"swig\"||' -i pyproject.toml
+      - autoreconf -fiv
+      - ./configure  # Required to set the version number
+      - mv src gpg
+      - pip3 install --no-build-isolation .
     sources:
-      - type: archive
-        url: https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-1.24.3.tar.bz2
-        sha256: bfc17f5bd1b178c8649fdd918956d277080f33df006a2dc40acdecdce68c50dd
+      - type: git
+        url: https://dev.gnupg.org/source/gpgmepy.git
+        tag: gpgmepy-2.0.0
+        commit: 22e1cd5fdea1f62690fba55cf616bde97c1ac5d3
 
   - name: gajim-openpgp
     buildsystem: simple
diff --git a/flatpak/org.gajim.Gajim.Plugin.pgp.yaml b/flatpak/org.gajim.Gajim.Plugin.pgp.yaml
index b7959a4..d933384 100644
--- a/flatpak/org.gajim.Gajim.Plugin.pgp.yaml
+++ b/flatpak/org.gajim.Gajim.Plugin.pgp.yaml
@@ -1,6 +1,6 @@
 id: org.gajim.Gajim.Devel.Plugin.pgp
 runtime: org.gajim.Gajim.Devel
-sdk: org.gnome.Sdk//48
+sdk: org.gnome.Sdk//49
 build-extension: true
 separate-locales: false
 appstream-compose: false
@@ -17,8 +17,8 @@ modules:
       - pip3 install --no-build-isolation .
     sources:
       - type: archive
-        url: https://github.com/vsajip/python-gnupg/archive/refs/tags/0.5.4.tar.gz
-        sha512: 4b316ea925ef8892a743e81c907ff0c7f9b639ec2f92e614337765c0ddade80ad6b484ff75e7315bf1b6a71e3bb8e5e384f2b20bec4d27edb246c392ef4e7b94
+        url: https://github.com/vsajip/python-gnupg/archive/refs/tags/0.5.5.tar.gz
+        sha512: 0483cc4faac5fa1244e621fa56c2d4b0c4a0f74168fbd7e68e820f40b4ff2d79bf19866fb1020ee62290087b41c55d5257e3e78a68eb63276a5a586b28ce4f7c
 
   - name: gajim-pgp
     buildsystem: simple