git: 32072ddc448a - main - net-im/gajim: update to 2.6.0

From: Ruslan Makhmatkhanov <rm_at_FreeBSD.org>
Date: Tue, 06 Oct 2026 12:46:59 UTC
The branch main has been updated by rm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=32072ddc448ad19f4b149276bbce168c25a2a72f

commit 32072ddc448ad19f4b149276bbce168c25a2a72f
Author:     Polarian <polarian@polarian.dev>
AuthorDate: 2026-10-06 12:45:13 +0000
Commit:     Ruslan Makhmatkhanov <rm@FreeBSD.org>
CommitDate: 2026-10-06 12:46:34 +0000

    net-im/gajim: update to 2.6.0
    
    * Update to 2.6.0, depends on
    * Add missing dependencies which were listed upstream
    * Update dependency version requirements
    * Patch out the new version string in pytoml, as we are using an older version of setuptools
    * Add missing OPTIONS for optional features gajim supports
    
    Upstream blogpost: https://gajim.org/posts/2026-08-27-gajim-2.6.0-released/
    
    PR:             298502
    Reported by:    Polarian <polarian@polarian.dev>
---
 net-im/gajim/Makefile                   | 36 ++++++++++++++++++---------------
 net-im/gajim/distinfo                   |  6 +++---
 net-im/gajim/files/patch-pyproject.toml | 23 ++++++++++++++++++---
 3 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/net-im/gajim/Makefile b/net-im/gajim/Makefile
index d426cbd4db0a..1a3250af5c07 100644
--- a/net-im/gajim/Makefile
+++ b/net-im/gajim/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	gajim
-DISTVERSION=	2.4.6
+DISTVERSION=	2.6.0
 CATEGORIES=	net-im
 MASTER_SITES=	https://gajim.org/downloads/${DISTVERSION:R}/
 
@@ -14,14 +14,13 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}build>0:devel/py-build@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 LIB_DEPENDS=	libgsound.so:audio/gsound \
-		libsoup-3.0.so:devel/libsoup3 \
-		libspelling-1.so:x11-toolkits/libspelling
+		libsoup-3.0.so:devel/libsoup3
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}css-parser>0:www/py-css-parser@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}emoji>=2.6.0:misc/py-emoji@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}httpx>=0.28.1:www/py-httpx@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}nbxmpp>=7.2.0:net-im/py-nbxmpp@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}omemo-dr>=1.0.0:security/py-omemo-dr@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}nbxmpp>=7.4.0:net-im/py-nbxmpp@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}omemo-dr>=1.2.0:security/py-omemo-dr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pillow>=9.1.0:graphics/py-pillow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}precis_i18n>=1.0.0:textproc/py-precis_i18n@${PY_FLAVOR} \
@@ -29,33 +28,38 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}css-parser>0:www/py-css-parser@${PY_FLAVOR}
 		${PYTHON_PKGNAMEPREFIX}qrcode>=7.3.1:textproc/py-qrcode@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlalchemy20>=2.0.0:databases/py-sqlalchemy20@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \
-		gnome-keyring>=0:security/gnome-keyring \
+		${PYTHON_PKGNAMEPREFIX}h2>0:www/py-h2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}socksio>0:net/py-socksio@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pysequoia>=0.1.33:security/py-pysequoia@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}truststore>0:security/py-truststore@${PY_FLAVOR} \
 		pango>0:x11-toolkits/pango
 
-USES=		cpe gettext gnome python:3.11+ xorg
+USES=		cpe gettext gnome python:3.12+ xorg gstreamer
+USE=		GSTREAMER=core good bad libav rust
 USE_GNOME=	gtksourceview5 libadwaita pygobject3
 USE_PYTHON=	autoplist cryptography noflavors pep517 pytest
 USE_XORG=	x11 xext xscrnsaver
 
 NO_ARCH=	yes
 
-OPTIONS_DEFINE=		AVCALLS DBUS DOCS LIBSECRET OPENPGP SENTRY VOICEMESSAGES
-OPTIONS_DEFAULT=	DBUS OPENPGP
+OPTIONS_DEFINE=		AVCALLS DBUS LIBSECRET SENTRY SPELLING GPS DISTRO
+OPTIONS_DEFAULT=	DBUS AVCALLS LIBSECRET SPELLING GPS DISTRO
 
 AVCALLS_DESC=		Audio/Video calling support
 LIBSECRET_DESC=		GNOME Keyring or KDE secure password storage
 OPENPGP_DESC=		GPG encryption per XEP-0373
 SENTRY_DESC=		Sentry error reporting to dev.gajim.org.
-VOICEMESSAGES_DESC=	Voice messages support
+SPELLING_DESC=		Enables spell checking
+GPS_DESC=		Enables location sharing
+DISTRO_DESC=		Enables OS info in device info
 
 AVCALLS_RUN_DEPENDS=	farstream>0:net-im/farstream
-AVCALLS_USES=		gstreamer
-AVCALLS_USE=		GSTREAMER=core libav rust ugly
 DBUS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.82.2:devel/py-dbus@${PY_FLAVOR}
-LIBSECRET_RUN_DEPENDS=	libsecret>0:security/libsecret
-OPENPGP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gpg>=2.0.0:security/py-gpg@${PY_FLAVOR}
+LIBSECRET_RUN_DEPENDS=	libsecret>0:security/libsecret \
+			gnome-keyring>=0:security/gnome-keyring
 SENTRY_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sentry-sdk>0:devel/py-sentry-sdk@${PY_FLAVOR}
-VOICEMESSAGES_USES=	gstreamer
-VOICEMESSAGES_USE=	GSTREAMER=core good
+SPELLING_LIB_DEPENDS=	libspelling-1.so:x11-toolkits/libspelling
+GPS_LIB_DEPENDS=	libgeoclue-2.so:net/geoclue
+DISTRO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}distro>0:sysutils/py-distro@${PY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/net-im/gajim/distinfo b/net-im/gajim/distinfo
index 80923479ee35..eb06ef22dd09 100644
--- a/net-im/gajim/distinfo
+++ b/net-im/gajim/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1778005473
-SHA256 (gajim-2.4.6.tar.gz) = cce08def13e4b4c2852a91c108f8d949986bcd4697a4a72c954c17c2ff7c9746
-SIZE (gajim-2.4.6.tar.gz) = 5105111
+TIMESTAMP = 1789211799
+SHA256 (gajim-2.6.0.tar.gz) = 4d8c7d1ddaffa5e96a18a6ca684f4df14019b96bdc8288b0052807eb4f95ce2e
+SIZE (gajim-2.6.0.tar.gz) = 5301805
diff --git a/net-im/gajim/files/patch-pyproject.toml b/net-im/gajim/files/patch-pyproject.toml
index 21c08ba6ef75..aa21922c9ee7 100644
--- a/net-im/gajim/files/patch-pyproject.toml
+++ b/net-im/gajim/files/patch-pyproject.toml
@@ -1,4 +1,4 @@
---- pyproject.toml.orig	2023-10-22 09:46:07 UTC
+--- pyproject.toml.orig	2026-08-27 20:11:54 UTC
 +++ pyproject.toml
 @@ -1,6 +1,6 @@ requires = [
  [build-system]
@@ -6,5 +6,22 @@
 -  "setuptools >= 65.0.0",
 +  "setuptools >= 63.0.0",
  ]
- build-backend = "backend"
- backend-path = ["pep517build"]
+ build-backend = "setuptools.build_meta"
+ 
+@@ -9,7 +9,7 @@ requires-python = ">=3.12"
+ description = "A GTK XMPP Client"
+ readme = "README.md"
+ requires-python = ">=3.12"
+-license = "GPL-3.0-or-later"
++license = {text = "GPL-3.0-or-later"}
+ authors = [
+   {name = "Philipp Hörist", email = "philipp@hoerist.com"},
+   {name = "Yann Leboulanger", email = "yann@leboulanger.org"},
+@@ -18,6 +18,7 @@ classifiers = [
+ classifiers = [
+   "Development Status :: 5 - Production/Stable",
+   "Environment :: X11 Applications :: GTK",
++  "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
+   "Operating System :: OS Independent",
+   "Programming Language :: Python :: 3.12",
+   "Topic :: Communications :: Chat",