[PR PATCH] gajim: update to 1.8.0.

[dexgs <dexgs@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 684 bytes --]

There is a new pull request by dexgs against master on the void-packages repository

https://github.com/dexgs/void-packages gajim
https://github.com/void-linux/void-packages/pull/44347

gajim: update to 1.8.0.
Since Gajim v1.8.0, `python3-axolotl` is dropped for `python3-omemo-dr` (new package).
Additionally, the OMEMO plugin's functionality has been merged into Gajim, so `gajim-omemo` is changed to a dummy package.

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)


A patch file from https://github.com/void-linux/void-packages/pull/44347.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-gajim-44347.patch --]
[-- Type: text/x-diff, Size: 6396 bytes --]

From 1cb55def46997b6484ad88d30534717894ddf740 Mon Sep 17 00:00:00 2001
From: Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>
Date: Sat, 10 Jun 2023 14:02:43 -0400
Subject: [PATCH 1/4] python3-nbxmpp: update to 4.3.0.

---
 srcpkgs/python3-nbxmpp/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/python3-nbxmpp/template b/srcpkgs/python3-nbxmpp/template
index c0b5750436b7..3243c1b3c6a8 100644
--- a/srcpkgs/python3-nbxmpp/template
+++ b/srcpkgs/python3-nbxmpp/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-nbxmpp'
 pkgname=python3-nbxmpp
-version=4.2.0
+version=4.3.0
 revision=1
 build_style=python3-pep517
 hostmakedepends="python3-wheel"
@@ -12,7 +12,7 @@ license="GPL-2.0-or-later"
 homepage="https://python-nbxmpp.gajim.org/"
 changelog="https://dev.gajim.org/gajim/python-nbxmpp/raw/master/ChangeLog"
 distfiles="${PYPI_SITE}/n/nbxmpp/nbxmpp-${version}.tar.gz"
-checksum=ba16ab684c678f15cb85f582a51be690e48330bbcb569aa32b7d104293392d28
+checksum=60124e8ad0f84ade76df44c54354c040c5d14bfdef262598988e7c9e31b4a6f7
 
 do_check() {
 	coverage run --source=nbxmpp -m unittest discover -v

From 881ef32a371587843fc0a432b47ab3dc766e639a Mon Sep 17 00:00:00 2001
From: Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>
Date: Sat, 10 Jun 2023 14:08:54 -0400
Subject: [PATCH 2/4] New package: python3-omemo-dr-1.0.0

This is the python library required by Gajim since v1.8.0
---
 srcpkgs/python3-omemo-dr/template | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 srcpkgs/python3-omemo-dr/template

diff --git a/srcpkgs/python3-omemo-dr/template b/srcpkgs/python3-omemo-dr/template
new file mode 100644
index 000000000000..929fbc42f50b
--- /dev/null
+++ b/srcpkgs/python3-omemo-dr/template
@@ -0,0 +1,13 @@
+# Template file for 'python3-omemo-dr'
+pkgname=python3-omemo-dr
+version=1.0.0
+revision=1
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-devel"
+depends="python3-cryptography python3-protobuf"
+short_desc="Python library implementing OMEMO cryptography"
+maintainer="Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>"
+license="GPL-3.0-only"
+homepage="https://dev.gajim.org/gajim/omemo-dr"
+distfiles="${PYPI_SITE}/o/omemo-dr/omemo-dr-${version}.tar.gz"
+checksum=b0fe5023e947a17b740fb7ed4aa246120d6f21d819b5812e94dfc9570520be61

From 884767b4c2e3f3cf798e2bb89bd05006636bcb74 Mon Sep 17 00:00:00 2001
From: Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>
Date: Sat, 10 Jun 2023 14:12:31 -0400
Subject: [PATCH 3/4] gajim: update to 1.8.0.

---
 srcpkgs/gajim/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gajim/template b/srcpkgs/gajim/template
index 918d84bec7e9..ea8982bcfbe3 100644
--- a/srcpkgs/gajim/template
+++ b/srcpkgs/gajim/template
@@ -1,6 +1,6 @@
 # Template file for 'gajim'
 pkgname=gajim
-version=1.7.1
+version=1.8.0
 revision=1
 build_style=python3-pep517
 hostmakedepends="gettext python3-wheel"
@@ -8,6 +8,7 @@ depends="python3-gobject python3-setuptools python3-Pillow
  python3-cairo python3-dbus libsecret gsound libnm
  python3-nbxmpp python3-openssl python3-css-parser python3-keyring
  python3-precis-i18n python3-packaging python3-setuptools python3-distro
+ python3-qrcode python3-omemo-dr
  python3-netifaces python3-pyasn1 python3-jeepney libsoup3 farstream gst-plugins-base1
  gst-plugins-ugly1 gst-libav gtksourceview4"
 checkdepends="${depends} python3-packaging"
@@ -17,7 +18,7 @@ license="GPL-3.0-only"
 homepage="https://www.gajim.org"
 changelog="https://dev.gajim.org/gajim/gajim/-/raw/master/ChangeLog"
 distfiles="https://gajim.org/downloads/${version%.*}/gajim-${version}.tar.gz"
-checksum=b9a26a353549189fe65e0bc130cf98cbc42bd7105e72ac2041cb4a7f9d7543c6
+checksum=1201fc9add1a9b697dcf872c1871faae92ea4f3162051cce3c1e0d0843fc4d43
 
 post_build() {
 	./pep517build/build_metadata.py -o dist/metadata

From 807649d7a9ddf343db798a56cc6a1fe8515f99dc Mon Sep 17 00:00:00 2001
From: Dexter Gaon-Shatford <dexter.gaonshatford@gmail.com>
Date: Sat, 10 Jun 2023 14:16:07 -0400
Subject: [PATCH 4/4] gajim-omemo: change to dummy package

The functionality of Gajim's OMEMO plugin has been merged into the
client since v1.8.0.
---
 srcpkgs/gajim-omemo          |  1 +
 srcpkgs/gajim-omemo/template | 19 -------------------
 srcpkgs/gajim-omemo/update   |  2 --
 srcpkgs/gajim/template       |  6 ++++++
 4 files changed, 7 insertions(+), 21 deletions(-)
 create mode 120000 srcpkgs/gajim-omemo
 delete mode 100644 srcpkgs/gajim-omemo/template
 delete mode 100644 srcpkgs/gajim-omemo/update

diff --git a/srcpkgs/gajim-omemo b/srcpkgs/gajim-omemo
new file mode 120000
index 000000000000..61722e706beb
--- /dev/null
+++ b/srcpkgs/gajim-omemo
@@ -0,0 +1 @@
+gajim
\ No newline at end of file
diff --git a/srcpkgs/gajim-omemo/template b/srcpkgs/gajim-omemo/template
deleted file mode 100644
index 917b9e7d676e..000000000000
--- a/srcpkgs/gajim-omemo/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'gajim-omemo'
-pkgname=gajim-omemo
-version=2.9.0
-revision=1
-create_wrksrc="omemo"
-hostmakedepends="unzip"
-depends="python3 python3-setuptools python3-cryptography python3-axolotl
- python3-qrcode gajim"
-short_desc="Gajim plugin for OMEMO Encryption"
-maintainer="Urs Schulz <voidpkgs@ursschulz.de>"
-license="GPL-3.0-or-later"
-homepage="https://dev.gajim.org/gajim/gajim-plugins/wikis/OmemoGajimPlugin"
-distfiles="https://ftp.gajim.org/plugins/master/omemo/omemo_${version}.zip"
-checksum=076396ac441b4e5bae62328575be85492a87229c7a214b23f7edd1ac5dcac97b
-
-do_install() {
-	install -d "${DESTDIR}/${py3_sitelib}/gajim/data/plugins/${pkgname#gajim-}"
-	cp -r * "${DESTDIR}/${py3_sitelib}/gajim/data/plugins/${pkgname#gajim-}"
-}
diff --git a/srcpkgs/gajim-omemo/update b/srcpkgs/gajim-omemo/update
deleted file mode 100644
index 693efdeaed67..000000000000
--- a/srcpkgs/gajim-omemo/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site=https://dev.gajim.org/gajim/gajim-plugins/raw/gajim_1.3/omemo/manifest.ini
-pattern="version: \K[\d.]+"
diff --git a/srcpkgs/gajim/template b/srcpkgs/gajim/template
index ea8982bcfbe3..16ba231c9064 100644
--- a/srcpkgs/gajim/template
+++ b/srcpkgs/gajim/template
@@ -32,3 +32,9 @@ post_install() {
 do_check() {
 	python -m unittest discover -s test
 }
+
+gajim-omemo_package() {
+	depends="gajim"
+	short_desc+=" (transitional dummy package)"
+	build_style=meta
+}