Flatpak: Update runtime + dependencies

3 files changed, 10 insertions, 344 deletions

diff --git a/flatpak/gpgme_python310.patch b/flatpak/gpgme_python310.patch
deleted file mode 100644
index b8e0923..0000000
--- a/flatpak/gpgme_python310.patch
+++ /dev/null
@@ -1,332 +0,0 @@
-diff -upr gpgme-1.16.0.orig/configure gpgme-1.16.0/configure
---- gpgme-1.16.0.orig/configure	2021-06-24 20:10:50.000000000 +0300
-+++ gpgme-1.16.0/configure	2021-12-01 00:12:24.383952330 +0200
-@@ -19625,7 +19625,7 @@ $as_echo_n "checking for $am_display_PYT
- if ${am_cv_python_version+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
--  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
-+  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
- $as_echo "$am_cv_python_version" >&6; }
-@@ -19666,7 +19666,7 @@ else:
- # <https://github.com/pypa/virtualenv/issues/118>
- try:
-     from platform import python_implementation
--    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
-+    if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
-         can_use_sysconfig = 0
- except ImportError:
-     pass"
-@@ -19875,7 +19875,7 @@ variable to configure. See \`\`configure
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
- $as_echo_n "checking for the distutils Python package... " >&6; }
- 	ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
--	if test -z "$ac_distutils_result"; then
-+	if test $? -eq 0; then
- 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	else
-@@ -19933,7 +19933,7 @@ EOD`
- 				ac_python_version=$PYTHON_VERSION
- 			else
- 				ac_python_version=`$PYTHON -c "import sys; \
--					print (sys.version[:3])"`
-+					print (sys.version[:4])"`
- 			fi
- 		fi
- 
-@@ -20255,7 +20255,7 @@ $as_echo_n "checking for $am_display_PYT
- if ${am_cv_python_version+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
--  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
-+  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
- $as_echo "$am_cv_python_version" >&6; }
-@@ -20296,7 +20296,7 @@ else:
- # <https://github.com/pypa/virtualenv/issues/118>
- try:
-     from platform import python_implementation
--    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
-+    if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
-         can_use_sysconfig = 0
- except ImportError:
-     pass"
-@@ -20505,7 +20505,7 @@ variable to configure. See \`\`configure
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
- $as_echo_n "checking for the distutils Python package... " >&6; }
- 	ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
--	if test -z "$ac_distutils_result"; then
-+	if test $? -eq 0; then
- 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	else
-@@ -20563,7 +20563,7 @@ EOD`
- 				ac_python_version=$PYTHON_VERSION
- 			else
- 				ac_python_version=`$PYTHON -c "import sys; \
--					print (sys.version[:3])"`
-+					print (sys.version[:4])"`
- 			fi
- 		fi
- 
-@@ -20885,7 +20885,7 @@ $as_echo_n "checking for $am_display_PYT
- if ${am_cv_python_version+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
--  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
-+  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
- $as_echo "$am_cv_python_version" >&6; }
-@@ -20926,7 +20926,7 @@ else:
- # <https://github.com/pypa/virtualenv/issues/118>
- try:
-     from platform import python_implementation
--    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
-+    if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
-         can_use_sysconfig = 0
- except ImportError:
-     pass"
-@@ -21135,7 +21135,7 @@ variable to configure. See \`\`configure
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
- $as_echo_n "checking for the distutils Python package... " >&6; }
- 	ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
--	if test -z "$ac_distutils_result"; then
-+	if test $? -eq 0; then
- 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	else
-@@ -21193,7 +21193,7 @@ EOD`
- 				ac_python_version=$PYTHON_VERSION
- 			else
- 				ac_python_version=`$PYTHON -c "import sys; \
--					print (sys.version[:3])"`
-+					print (sys.version[:4])"`
- 			fi
- 		fi
- 
-@@ -21515,7 +21515,7 @@ $as_echo_n "checking for $am_display_PYT
- if ${am_cv_python_version+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
--  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
-+  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
- $as_echo "$am_cv_python_version" >&6; }
-@@ -21556,7 +21556,7 @@ else:
- # <https://github.com/pypa/virtualenv/issues/118>
- try:
-     from platform import python_implementation
--    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
-+    if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
-         can_use_sysconfig = 0
- except ImportError:
-     pass"
-@@ -21765,7 +21765,7 @@ variable to configure. See \`\`configure
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
- $as_echo_n "checking for the distutils Python package... " >&6; }
- 	ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
--	if test -z "$ac_distutils_result"; then
-+	if test $? -eq 0; then
- 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	else
-@@ -21823,7 +21823,7 @@ EOD`
- 				ac_python_version=$PYTHON_VERSION
- 			else
- 				ac_python_version=`$PYTHON -c "import sys; \
--					print (sys.version[:3])"`
-+					print (sys.version[:4])"`
- 			fi
- 		fi
- 
-@@ -22145,7 +22145,7 @@ $as_echo_n "checking for $am_display_PYT
- if ${am_cv_python_version+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
--  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
-+  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
- $as_echo "$am_cv_python_version" >&6; }
-@@ -22186,7 +22186,7 @@ else:
- # <https://github.com/pypa/virtualenv/issues/118>
- try:
-     from platform import python_implementation
--    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
-+    if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
-         can_use_sysconfig = 0
- except ImportError:
-     pass"
-@@ -22395,7 +22395,7 @@ variable to configure. See \`\`configure
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
- $as_echo_n "checking for the distutils Python package... " >&6; }
- 	ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
--	if test -z "$ac_distutils_result"; then
-+	if test $? -eq 0; then
- 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	else
-@@ -22453,7 +22453,7 @@ EOD`
- 				ac_python_version=$PYTHON_VERSION
- 			else
- 				ac_python_version=`$PYTHON -c "import sys; \
--					print (sys.version[:3])"`
-+					print (sys.version[:4])"`
- 			fi
- 		fi
- 
-@@ -22775,7 +22775,7 @@ $as_echo_n "checking for $am_display_PYT
- if ${am_cv_python_version+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
--  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
-+  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
- $as_echo "$am_cv_python_version" >&6; }
-@@ -22816,7 +22816,7 @@ else:
- # <https://github.com/pypa/virtualenv/issues/118>
- try:
-     from platform import python_implementation
--    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
-+    if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
-         can_use_sysconfig = 0
- except ImportError:
-     pass"
-@@ -23025,7 +23025,7 @@ variable to configure. See \`\`configure
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
- $as_echo_n "checking for the distutils Python package... " >&6; }
- 	ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
--	if test -z "$ac_distutils_result"; then
-+	if test $? -eq 0; then
- 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	else
-@@ -23083,7 +23083,7 @@ EOD`
- 				ac_python_version=$PYTHON_VERSION
- 			else
- 				ac_python_version=`$PYTHON -c "import sys; \
--					print (sys.version[:3])"`
-+					print (sys.version[:4])"`
- 			fi
- 		fi
- 
-@@ -23291,13 +23291,13 @@ $as_echo "$as_me: WARNING:
- 
-         if test -n "$PYTHON"; then
-       # If the user set $PYTHON, use it and don't search something else.
--      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.9" >&5
--$as_echo_n "checking whether $PYTHON version is >= 3.9... " >&6; }
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version is >= 3.10" >&5
-+$as_echo_n "checking whether $PYTHON version is >= 3.10... " >&6; }
-       prog="import sys
- # split strings by '.' and convert to numeric.  Append some zeros
- # because we need at least 4 digits for the hex conversion.
- # map returns an iterator in Python 3.0 and a list in 2.x
--minver = list(map(int, '3.9'.split('.'))) + [0, 0, 0]
-+minver = list(map(int, '3.10'.split('.'))) + [0, 0, 0]
- minverhex = 0
- # xrange is not present in Python 3.0 and range returns an iterator
- for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
-@@ -23318,19 +23318,19 @@ fi
-     else
-       # Otherwise, try each interpreter until we find one that satisfies
-       # VERSION.
--      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.9" >&5
--$as_echo_n "checking for a Python interpreter with version >= 3.9... " >&6; }
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 3.10" >&5
-+$as_echo_n "checking for a Python interpreter with version >= 3.10... " >&6; }
- if ${am_cv_pathless_PYTHON+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
- 
--	for am_cv_pathless_PYTHON           in python3.9 none; do
-+	for am_cv_pathless_PYTHON           in python3.10 none; do
- 	  test "$am_cv_pathless_PYTHON" = none && break
- 	  prog="import sys
- # split strings by '.' and convert to numeric.  Append some zeros
- # because we need at least 4 digits for the hex conversion.
- # map returns an iterator in Python 3.0 and a list in 2.x
--minver = list(map(int, '3.9'.split('.'))) + [0, 0, 0]
-+minver = list(map(int, '3.10'.split('.'))) + [0, 0, 0]
- minverhex = 0
- # xrange is not present in Python 3.0 and range returns an iterator
- for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i]
-@@ -23405,7 +23405,7 @@ $as_echo_n "checking for $am_display_PYT
- if ${am_cv_python_version+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
--  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
-+  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
- $as_echo "$am_cv_python_version" >&6; }
-@@ -23446,7 +23446,7 @@ else:
- # <https://github.com/pypa/virtualenv/issues/118>
- try:
-     from platform import python_implementation
--    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
-+    if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
-         can_use_sysconfig = 0
- except ImportError:
-     pass"
-@@ -23655,7 +23655,7 @@ variable to configure. See \`\`configure
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
- $as_echo_n "checking for the distutils Python package... " >&6; }
- 	ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
--	if test -z "$ac_distutils_result"; then
-+	if test $? -eq 0; then
- 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	else
-@@ -23713,7 +23713,7 @@ EOD`
- 				ac_python_version=$PYTHON_VERSION
- 			else
- 				ac_python_version=`$PYTHON -c "import sys; \
--					print (sys.version[:3])"`
-+					print (sys.version[:4])"`
- 			fi
- 		fi
- 
-@@ -24035,7 +24035,7 @@ $as_echo_n "checking for $am_display_PYT
- if ${am_cv_python_version+:} false; then :
-   $as_echo_n "(cached) " >&6
- else
--  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
-+  am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:4])"`
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
- $as_echo "$am_cv_python_version" >&6; }
-@@ -24076,7 +24076,7 @@ else:
- # <https://github.com/pypa/virtualenv/issues/118>
- try:
-     from platform import python_implementation
--    if python_implementation() == 'CPython' and sys.version[:3] == '2.7':
-+    if python_implementation() == 'CPython' and sys.version[:4] == '2.7':
-         can_use_sysconfig = 0
- except ImportError:
-     pass"
-@@ -24285,7 +24285,7 @@ variable to configure. See \`\`configure
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the distutils Python package" >&5
- $as_echo_n "checking for the distutils Python package... " >&6; }
- 	ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
--	if test -z "$ac_distutils_result"; then
-+	if test $? -eq 0; then
- 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	else
-@@ -24343,7 +24343,7 @@ EOD`
- 				ac_python_version=$PYTHON_VERSION
- 			else
- 				ac_python_version=`$PYTHON -c "import sys; \
--					print (sys.version[:3])"`
-+					print (sys.version[:4])"`
- 			fi
- 		fi
- 
diff --git a/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml b/flatpak/org.gajim.Gajim.Plugin.openpgp.yaml
index 7eca4fe..b59beab 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//44
+sdk: org.gnome.Sdk//45
 build-extension: true
 separate-locales: false
 appstream-compose: false
@@ -35,15 +35,13 @@ modules:
       prefix: ${FLATPAK_DEST}
     post-install:
       - mkdir -p ${FLATPAK_DEST}/site-packages
-      - mv ${FLATPAK_DEST}/lib/python3.10/site-packages/*.egg/gpg ${FLATPAK_DEST}/site-packages/
+      - mv ${FLATPAK_DEST}/lib/python3.11/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.18.0.tar.bz2
-        sha256: 361d4eae47ce925dba0ea569af40e7b52c645c4ae2e65e5621bf1b6cdd8b0e9e
-      - type: patch
-        path: gpgme_python310.patch
+        url: https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-1.19.0.tar.bz2
+        sha256: cb58494dc415fba9eeb12b826550ad3190dc92e265c5bb2ae1a21c92841cfd38
 
   - name: gajim-openpgp
     buildsystem: simple
@@ -56,8 +54,8 @@ modules:
     sources:
       - type: archive
         strip-components: 0
-        url: https://ftp.gajim.org/plugins/master/openpgp/openpgp_1.5.0.zip
-        sha256: 848d8349dfe6785d289dc46cfd70ecfd9787a219e272b9ab9aebc41c135c77a4
+        url: https://ftp.gajim.org/plugins/master/openpgp/openpgp_1.5.1.zip
+        sha256: b47831566b276f29c251f2bc05ab6a1a043510b99e471af4d5721f2b00cd780f
       - 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 9779ec1..5cd7ce5 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//44
+sdk: org.gnome.Sdk//45
 build-extension: true
 separate-locales: false
 appstream-compose: false
@@ -14,11 +14,11 @@ modules:
   - name: python3-python-gnupg
     buildsystem: simple
     build-commands:
-      - pip3 install python_gnupg-0.5.0-py2.py3-none-any.whl
+      - pip3 install python_gnupg-0.5.1-py2.py3-none-any.whl
     sources:
       - type: file
-        url: https://files.pythonhosted.org/packages/py2.py3/p/python_gnupg/python_gnupg-0.5.0-py2.py3-none-any.whl
-        sha256: 345723a03e67b82aba0ea8ae2328b2e4a3906fbe2c18c4082285c3b01068f270
+        url: https://files.pythonhosted.org/packages/py2.py3/p/python_gnupg/python_gnupg-0.5.1-py2.py3-none-any.whl
+        sha256: bf9b2d9032ef38139b7d64184176cd0b293eaeae6e4f93f50e304c7051174482
 
   - name: gajim-pgp
     buildsystem: simple