Re: [PR PATCH] [Updated] Update gajim, python3-nbxmpp, gajim-omemo

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

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

There is an updated pull request by teldra against master on the void-packages repository

https://github.com/teldra/void-packages update-gajim
https://github.com/void-linux/void-packages/pull/37181

Update gajim, python3-nbxmpp, gajim-omemo
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


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

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

From 124f2c5242decbf1d69949c1da31eb9bf81d986d Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Wed, 18 May 2022 11:55:06 +0200
Subject: [PATCH 1/3] python3-nbxmpp: update to 3.1.1.

---
 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 e1ea0667bb57..c342e8a34873 100644
--- a/srcpkgs/python3-nbxmpp/template
+++ b/srcpkgs/python3-nbxmpp/template
@@ -1,6 +1,6 @@
 # Template file for 'python3-nbxmpp'
 pkgname=python3-nbxmpp
-version=2.0.4
+version=3.1.1
 revision=1
 wrksrc="${pkgname#*-}-${version}"
 build_style=python3-module
@@ -13,7 +13,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=2cc967808fe73d01adee59c084d17bf5f1d27e33e98ed4f2467a1e7c638457e8
+checksum=04b32a479f7615d163a491cc11c60b4c14fd745281d465564cc71007ced6c839
 
 do_check() {
 	coverage run --source=nbxmpp -m unittest discover -v

From c80c04cbde1bbf09d53827f44c7224bdc23b3898 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Wed, 18 May 2022 11:55:15 +0200
Subject: [PATCH 2/3] gajim: update to 1.4.7.

---
 srcpkgs/gajim/template | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/gajim/template b/srcpkgs/gajim/template
index ff3278df8e66..2566793ea3c3 100644
--- a/srcpkgs/gajim/template
+++ b/srcpkgs/gajim/template
@@ -1,24 +1,28 @@
 # Template file for 'gajim'
 pkgname=gajim
-version=1.3.3
+version=1.4.7
 revision=1
-wrksrc="gajim-gajim-${version}"
 build_style=python3-module
 hostmakedepends="gettext python3-setuptools"
-depends="python3-gobject python3-nbxmpp python3-setuptools python3-Pillow
- python3-cairo python3-precis-i18n python3-keyring python3-packaging
- python3-css-parser farstream python3-dbus python3-openssl"
+depends="python3-gobject python3-setuptools python3-Pillow
+ python3-cairo python3-dbus libsecret gupnp-igd gsound geoclue2 libnm
+ python3-nbxmpp python3-openssl python3-css-parser python3-keyring
+ python3-precis-i18n python3-packaging python3-setuptools python3-distro
+ python3-netifaces python3-pyasn1 libsoup farstream gst-plugins-base1
+ gst-plugins-ugly1 gst-libav gtksourceview4"
+checkdepends="${depends}"
 short_desc="Full featured Jabber/XMPP client"
 maintainer="teldra <teldra@rotce.de>"
 license="GPL-3.0-only"
 homepage="https://www.gajim.org"
-changelog="https://dev.gajim.org/gajim/gajim/raw/gajim-${version}/ChangeLog"
+changelog="https://dev.gajim.org/gajim/gajim/-/raw/master/ChangeLog"
 distfiles="https://gajim.org/downloads/${version%.*}/gajim-${version}.tar.gz"
-checksum=ddbcbe6aaf36c238e0ca7503034ed0870a5b059a96e9a4f973409ecdeec4678c
-# Does not find gdk, introspection typelib
-# even wtih gdk-pixbuf in checkdepends
-make_check=no
+checksum=1a4807bf3a34b31048824e4fff762bd1e1622f464e73a426c09684dc293684f3
 
 post_install() {
 	vdoc "${FILESDIR}/README.voidlinux"
 }
+
+do_check() {
+	python -m unittest discover -s test
+}

From bcf5515228c5f330032cf0f28262a334bf942384 Mon Sep 17 00:00:00 2001
From: teldra <teldra@rotce.de>
Date: Thu, 14 Jul 2022 14:28:53 +0200
Subject: [PATCH 3/3] gajim-omemo: update to 2.8.15.

---
 srcpkgs/gajim-omemo/template | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/gajim-omemo/template b/srcpkgs/gajim-omemo/template
index 531f7be7545d..ccc8673e3848 100644
--- a/srcpkgs/gajim-omemo/template
+++ b/srcpkgs/gajim-omemo/template
@@ -1,7 +1,7 @@
 # Template file for 'gajim-omemo'
 pkgname=gajim-omemo
-version=2.7.15
-revision=2
+version=2.8.15
+revision=1
 wrksrc="omemo"
 hostmakedepends="unzip"
 depends="python3 python3-setuptools python3-cryptography python3-axolotl
@@ -10,12 +10,10 @@ 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_releases/${pkgname#gajim-}_${version}.zip"
-checksum=7e8435125a4b566402e2531f4e73ab60647b2f88fb65d8da2955dfb1e3befede
-
+distfiles="https://ftp.gajim.org/plugins/master/omemo/omemo_${version}.zip"
+checksum=9639e6ddb76c4612ca43e74ee9d80d8d92c31fdfbb173f7c9976a2cc3d22c1c1
 
 do_install() {
-	rm CHANGELOG COPYING
 	install -d "${DESTDIR}/${py3_sitelib}/gajim/data/plugins/${pkgname#gajim-}"
 	cp -r * "${DESTDIR}/${py3_sitelib}/gajim/data/plugins/${pkgname#gajim-}"
 }