From fa122a764dd859ed4d5e570a9f28ba5727db70ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Apitzsch?= <git@apitzsch.eu>
Date: Thu, 13 Feb 2025 22:26:22 +0100
Subject: [PATCH] Flatpak: openpgp: Fix import error

ImportError: cannot import name 'gpgme' from partially initialized module 'gpg'
---
 flatpak/org.gajim.Gajim.Plugin.openpgp.yaml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml b/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml
index d905324..03ec73e 100644
--- a/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml
+++ b/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml
@@ -18,31 +18,28 @@ modules:
       prefix: ${FLATPAK_DEST}
     sources:
       - type: archive
-        url: https://downloads.sourceforge.net/swig/swig-4.2.1.tar.gz
-        sha256: fa045354e2d048b2cddc69579e4256245d4676894858fcf0bab2290ecf59b7d8
+        url: https://downloads.sourceforge.net/swig/swig-4.3.0.tar.gz
+        sha256: f7203ef796f61af986c70c05816236cbd0d31b7aa9631e5ab53020ab7804aa9e
 
   - name: gpgme
     cleanup:
       - /bin
       - /include
-      - /lib
       - /share
     build-options:
       config-opts:
         - --enable-languages=python
       env:
-        SWIG_LIB: "/app/plugins/openpgp/share/swig/4.2.1"
+        SWIG_LIB: "/app/plugins/openpgp/share/swig/4.3.0"
       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/
     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.23.2.tar.bz2
-        sha256: 9499e8b1f33cccb6815527a1bc16049d35a6198a6c5fae0185f2bd561bce5224
+        url: https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-1.24.2.tar.bz2
+        sha256: e11b1a0e361777e9e55f48a03d89096e2abf08c63d84b7017cfe1dce06639581
 
   - name: gajim-openpgp
     buildsystem: simple