[pkgsrc/trunk]: pkgsrc/chat gajim: update to 1.3.2

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b82cfdd8dae9
branches:  trunk
changeset: 456854:b82cfdd8dae9
user:      nia <nia%pkgsrc.org@localhost>
date:      Tue Aug 10 12:03:37 2021 +0000

description:
gajim: update to 1.3.2

Release notes:
https://gajim.org/post/2021-04-24-gajim-1.3.2-released/

diffstat:

 chat/gajim-plugin-omemo/Makefile           |   14 +-
 chat/gajim-plugin-omemo/PLIST              |   29 ++---
 chat/gajim-plugin-omemo/distinfo           |   10 +-
 chat/gajim/Makefile                        |   26 ++---
 chat/gajim/PLIST                           |  135 ++++++++++++++++++++++------
 chat/gajim/distinfo                        |   14 +-
 chat/gajim/patches/patch-gajim___init__.py |   12 +-
 chat/gajim/patches/patch-setup.py          |   10 +-
 chat/py-nbxmpp/Makefile                    |    4 +-
 chat/py-nbxmpp/PLIST                       |   65 +++++++++++--
 chat/py-nbxmpp/distinfo                    |   10 +-
 11 files changed, 222 insertions(+), 107 deletions(-)

diffs (truncated from 743 to 300 lines):

diff -r 3ea7fb4aba4d -r b82cfdd8dae9 chat/gajim-plugin-omemo/Makefile
--- a/chat/gajim-plugin-omemo/Makefile  Tue Aug 10 11:56:27 2021 +0000
+++ b/chat/gajim-plugin-omemo/Makefile  Tue Aug 10 12:03:37 2021 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2020/12/04 20:45:01 nia Exp $
+# $NetBSD: Makefile,v 1.10 2021/08/10 12:03:37 nia Exp $
 
-PKGNAME=       gajim-plugin-omemo-2.6.28
-PKGREVISION=   1
+PKGNAME=       gajim-plugin-omemo-2.7.14
 DISTNAME=      omemo_${PKGVERSION_NOREV}
 CATEGORIES=    chat security python
 MASTER_SITES=  https://ftp.gajim.org/plugins_releases/
@@ -24,16 +23,19 @@
 PY_PATCHPLIST= yes
 
 INSTALLATION_DIRS+=    ${PYSITELIB}/gajim/data/plugins/omemo
+INSTALLATION_DIRS+=    ${PYSITELIB}/gajim/data/plugins/omemo/backend
 INSTALLATION_DIRS+=    ${PYSITELIB}/gajim/data/plugins/omemo/gtk
-INSTALLATION_DIRS+=    ${PYSITELIB}/gajim/data/plugins/omemo/omemo
+INSTALLATION_DIRS+=    ${PYSITELIB}/gajim/data/plugins/omemo/modules
 
 do-install:
        ${INSTALL_DATA} ${WRKSRC}/*.py ${WRKSRC}/*.png ${WRKSRC}/*.ini \
            ${DESTDIR}${PREFIX}/${PYSITELIB}/gajim/data/plugins/omemo
+       ${INSTALL_DATA} ${WRKSRC}/backend/* \
+           ${DESTDIR}${PREFIX}/${PYSITELIB}/gajim/data/plugins/omemo/backend
        ${INSTALL_DATA} ${WRKSRC}/gtk/*.ui ${WRKSRC}/gtk/*.css ${WRKSRC}/gtk/*.py \
            ${DESTDIR}${PREFIX}/${PYSITELIB}/gajim/data/plugins/omemo/gtk
-       ${INSTALL_DATA} ${WRKSRC}/omemo/* \
-           ${DESTDIR}${PREFIX}/${PYSITELIB}/gajim/data/plugins/omemo/omemo
+       ${INSTALL_DATA} ${WRKSRC}/modules/* \
+           ${DESTDIR}${PREFIX}/${PYSITELIB}/gajim/data/plugins/omemo/modules
 
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 3ea7fb4aba4d -r b82cfdd8dae9 chat/gajim-plugin-omemo/PLIST
--- a/chat/gajim-plugin-omemo/PLIST     Tue Aug 10 11:56:27 2021 +0000
+++ b/chat/gajim-plugin-omemo/PLIST     Tue Aug 10 12:03:37 2021 +0000
@@ -1,29 +1,24 @@
-@comment $NetBSD: PLIST,v 1.3 2018/11/16 00:04:14 nia Exp $
+@comment $NetBSD: PLIST,v 1.4 2021/08/10 12:03:37 nia Exp $
 ${PYSITELIB}/gajim/data/plugins/omemo/__init__.py
+${PYSITELIB}/gajim/data/plugins/omemo/backend/__init__.py
+${PYSITELIB}/gajim/data/plugins/omemo/backend/aes.py
+${PYSITELIB}/gajim/data/plugins/omemo/backend/devices.py
+${PYSITELIB}/gajim/data/plugins/omemo/backend/liteaxolotlstore.py
+${PYSITELIB}/gajim/data/plugins/omemo/backend/state.py
+${PYSITELIB}/gajim/data/plugins/omemo/backend/util.py
 ${PYSITELIB}/gajim/data/plugins/omemo/file_crypto.py
 ${PYSITELIB}/gajim/data/plugins/omemo/gtk/__init__.py
 ${PYSITELIB}/gajim/data/plugins/omemo/gtk/config.py
 ${PYSITELIB}/gajim/data/plugins/omemo/gtk/config.ui
 ${PYSITELIB}/gajim/data/plugins/omemo/gtk/key.py
+${PYSITELIB}/gajim/data/plugins/omemo/gtk/key.ui
 ${PYSITELIB}/gajim/data/plugins/omemo/gtk/progress.py
 ${PYSITELIB}/gajim/data/plugins/omemo/gtk/progress.ui
 ${PYSITELIB}/gajim/data/plugins/omemo/gtk/style.css
-${PYSITELIB}/gajim/data/plugins/omemo/gtk/util.py
 ${PYSITELIB}/gajim/data/plugins/omemo/manifest.ini
+${PYSITELIB}/gajim/data/plugins/omemo/modules/__init__.py
+${PYSITELIB}/gajim/data/plugins/omemo/modules/omemo.py
+${PYSITELIB}/gajim/data/plugins/omemo/modules/util.py
 ${PYSITELIB}/gajim/data/plugins/omemo/omemo.png
-${PYSITELIB}/gajim/data/plugins/omemo/omemo/__init__.py
-${PYSITELIB}/gajim/data/plugins/omemo/omemo/aes_gcm.py
-${PYSITELIB}/gajim/data/plugins/omemo/omemo/aes_gcm_native.py
-${PYSITELIB}/gajim/data/plugins/omemo/omemo/db_helpers.py
-${PYSITELIB}/gajim/data/plugins/omemo/omemo/encryption.py
-${PYSITELIB}/gajim/data/plugins/omemo/omemo/liteaxolotlstore.py
-${PYSITELIB}/gajim/data/plugins/omemo/omemo/liteidentitykeystore.py
-${PYSITELIB}/gajim/data/plugins/omemo/omemo/liteprekeystore.py
-${PYSITELIB}/gajim/data/plugins/omemo/omemo/litesessionstore.py
-${PYSITELIB}/gajim/data/plugins/omemo/omemo/litesignedprekeystore.py
-${PYSITELIB}/gajim/data/plugins/omemo/omemo/sql.py
-${PYSITELIB}/gajim/data/plugins/omemo/omemo/state.py
 ${PYSITELIB}/gajim/data/plugins/omemo/omemo16x16.png
-${PYSITELIB}/gajim/data/plugins/omemo/omemo_connection.py
-${PYSITELIB}/gajim/data/plugins/omemo/omemoplugin.py
-${PYSITELIB}/gajim/data/plugins/omemo/xmpp.py
+${PYSITELIB}/gajim/data/plugins/omemo/plugin.py
diff -r 3ea7fb4aba4d -r b82cfdd8dae9 chat/gajim-plugin-omemo/distinfo
--- a/chat/gajim-plugin-omemo/distinfo  Tue Aug 10 11:56:27 2021 +0000
+++ b/chat/gajim-plugin-omemo/distinfo  Tue Aug 10 12:03:37 2021 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2019/04/25 13:35:01 nia Exp $
+$NetBSD: distinfo,v 1.7 2021/08/10 12:03:37 nia Exp $
 
-SHA1 (omemo_2.6.28.zip) = a67018ad5040f8ee173af8aff8ae4a40ee21f810
-RMD160 (omemo_2.6.28.zip) = d72d36401faf69c17fbab9b402c05b5b14045316
-SHA512 (omemo_2.6.28.zip) = 708c99f285b48539645523cd9df7373227b3a1e385d9d041444f8680e838bff2bf4bcb030bce82e0112f83464329a20bbf0ac57928fbb1887ccdb85bbfb85441
-Size (omemo_2.6.28.zip) = 65114 bytes
+SHA1 (omemo_2.7.14.zip) = 74656262bff10bf3879adf9fee5480a8cfc8bff9
+RMD160 (omemo_2.7.14.zip) = 074a4345b980074b2bdd4bc2887d44b7954baffa
+SHA512 (omemo_2.7.14.zip) = 33347369189eb21f2a5fb017cac9404b2a21ef77162076d51c5e086b9ffdcd67c5a856f992ec44b2e24c95eef43daf3445447c3c09f420ded59d481e7dec2c64
+Size (omemo_2.7.14.zip) = 58870 bytes
diff -r 3ea7fb4aba4d -r b82cfdd8dae9 chat/gajim/Makefile
--- a/chat/gajim/Makefile       Tue Aug 10 11:56:27 2021 +0000
+++ b/chat/gajim/Makefile       Tue Aug 10 12:03:37 2021 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2020/12/04 20:45:01 nia Exp $
+# $NetBSD: Makefile,v 1.57 2021/08/10 12:03:37 nia Exp $
 
-DISTNAME=      gajim-1.2.0
-PKGREVISION=   2
-CATEGORIES=    chat python
+DISTNAME=      gajim-1.3.2
+CATEGORIES=    chat
 MASTER_SITES=  https://www.gajim.org/downloads/${PKGVERSION_NOREV:R}/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -12,18 +11,22 @@
 
 USE_TOOLS+=    gettext
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
+# needs --desktop
+TOOLS_PLATFORM.msgfmt=
+.endif
+
 MANCOMPRESSED= yes
 MAKE_ENV+=     PKGMANDIR=${PKGMANDIR}
 
-# needs --desktop
-_TOOLS_USE_PKGSRC.msgfmt=      yes
-
 PYTHON_VERSIONS_INCOMPATIBLE=  27 36
 
 DEPENDS+=      ${PYPKGPREFIX}-cairo>=1.16.0:../../graphics/py-cairo
 DEPENDS+=      ${PYPKGPREFIX}-css-parser-[0-9]*:../../textproc/py-css-parser
 DEPENDS+=      ${PYPKGPREFIX}-keyring-[0-9]*:../../security/py-keyring
-DEPENDS+=      ${PYPKGPREFIX}-nbxmpp-[0-9]*:../../chat/py-nbxmpp
+DEPENDS+=      ${PYPKGPREFIX}-nbxmpp>=2.0.1:../../chat/py-nbxmpp
 DEPENDS+=      ${PYPKGPREFIX}-packaging-[0-9]*:../../devel/py-packaging
 DEPENDS+=      ${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL
 DEPENDS+=      ${PYPKGPREFIX}-precis-i18n-[0-9]*:../../textproc/py-precis-i18n
@@ -34,14 +37,7 @@
 DEPENDS+=      ${PYPKGPREFIX}-pyobjc-framework-Cocoa-[0-9]*:../../devel/py-pyobjc-framework-Cocoa
 .endif
 
-SUBST_CLASSES+=                paths
-SUBST_STAGE.paths=     pre-configure
-SUBST_MESSAGE.paths=   Fixing absolute paths.
-SUBST_FILES.paths=     gajim/common/i18n.py
-SUBST_SED.paths=        -e 's,/usr/local,${PREFIX},g'
-
 .include "options.mk"
-
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 .include "../../x11/gtk3/buildlink3.mk"
diff -r 3ea7fb4aba4d -r b82cfdd8dae9 chat/gajim/PLIST
--- a/chat/gajim/PLIST  Tue Aug 10 11:56:27 2021 +0000
+++ b/chat/gajim/PLIST  Tue Aug 10 12:03:37 2021 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2020/07/08 11:57:12 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2021/08/10 12:03:37 nia Exp $
 bin/gajim
 bin/gajim-history-manager
 bin/gajim-remote
@@ -155,9 +155,6 @@
 ${PYSITELIB}/gajim/common/jingle_xtls.py
 ${PYSITELIB}/gajim/common/jingle_xtls.pyc
 ${PYSITELIB}/gajim/common/jingle_xtls.pyo
-${PYSITELIB}/gajim/common/logger.py
-${PYSITELIB}/gajim/common/logger.pyc
-${PYSITELIB}/gajim/common/logger.pyo
 ${PYSITELIB}/gajim/common/logging_helpers.py
 ${PYSITELIB}/gajim/common/logging_helpers.pyc
 ${PYSITELIB}/gajim/common/logging_helpers.pyo
@@ -194,6 +191,9 @@
 ${PYSITELIB}/gajim/common/modules/carbons.py
 ${PYSITELIB}/gajim/common/modules/carbons.pyc
 ${PYSITELIB}/gajim/common/modules/carbons.pyo
+${PYSITELIB}/gajim/common/modules/chat_markers.py
+${PYSITELIB}/gajim/common/modules/chat_markers.pyc
+${PYSITELIB}/gajim/common/modules/chat_markers.pyo
 ${PYSITELIB}/gajim/common/modules/chatstates.py
 ${PYSITELIB}/gajim/common/modules/chatstates.pyc
 ${PYSITELIB}/gajim/common/modules/chatstates.pyo
@@ -251,9 +251,6 @@
 ${PYSITELIB}/gajim/common/modules/presence.py
 ${PYSITELIB}/gajim/common/modules/presence.pyc
 ${PYSITELIB}/gajim/common/modules/presence.pyo
-${PYSITELIB}/gajim/common/modules/privacylists.py
-${PYSITELIB}/gajim/common/modules/privacylists.pyc
-${PYSITELIB}/gajim/common/modules/privacylists.pyo
 ${PYSITELIB}/gajim/common/modules/pubsub.py
 ${PYSITELIB}/gajim/common/modules/pubsub.pyc
 ${PYSITELIB}/gajim/common/modules/pubsub.pyo
@@ -299,6 +296,9 @@
 ${PYSITELIB}/gajim/common/modules/util.py
 ${PYSITELIB}/gajim/common/modules/util.pyc
 ${PYSITELIB}/gajim/common/modules/util.pyo
+${PYSITELIB}/gajim/common/modules/vcard4.py
+${PYSITELIB}/gajim/common/modules/vcard4.pyc
+${PYSITELIB}/gajim/common/modules/vcard4.pyo
 ${PYSITELIB}/gajim/common/modules/vcard_avatars.py
 ${PYSITELIB}/gajim/common/modules/vcard_avatars.pyc
 ${PYSITELIB}/gajim/common/modules/vcard_avatars.pyo
@@ -320,9 +320,30 @@
 ${PYSITELIB}/gajim/common/proxy65_manager.py
 ${PYSITELIB}/gajim/common/proxy65_manager.pyc
 ${PYSITELIB}/gajim/common/proxy65_manager.pyo
+${PYSITELIB}/gajim/common/regex.py
+${PYSITELIB}/gajim/common/regex.pyc
+${PYSITELIB}/gajim/common/regex.pyo
+${PYSITELIB}/gajim/common/setting_values.py
+${PYSITELIB}/gajim/common/setting_values.pyc
+${PYSITELIB}/gajim/common/setting_values.pyo
+${PYSITELIB}/gajim/common/settings.py
+${PYSITELIB}/gajim/common/settings.pyc
+${PYSITELIB}/gajim/common/settings.pyo
 ${PYSITELIB}/gajim/common/socks5.py
 ${PYSITELIB}/gajim/common/socks5.pyc
 ${PYSITELIB}/gajim/common/socks5.pyo
+${PYSITELIB}/gajim/common/storage/__init__.py
+${PYSITELIB}/gajim/common/storage/__init__.pyc
+${PYSITELIB}/gajim/common/storage/__init__.pyo
+${PYSITELIB}/gajim/common/storage/archive.py
+${PYSITELIB}/gajim/common/storage/archive.pyc
+${PYSITELIB}/gajim/common/storage/archive.pyo
+${PYSITELIB}/gajim/common/storage/base.py
+${PYSITELIB}/gajim/common/storage/base.pyc
+${PYSITELIB}/gajim/common/storage/base.pyo
+${PYSITELIB}/gajim/common/storage/cache.py
+${PYSITELIB}/gajim/common/storage/cache.pyc
+${PYSITELIB}/gajim/common/storage/cache.pyo
 ${PYSITELIB}/gajim/common/structs.py
 ${PYSITELIB}/gajim/common/structs.pyc
 ${PYSITELIB}/gajim/common/structs.pyo
@@ -372,17 +393,12 @@
 ${PYSITELIB}/gajim/data/gui/advanced_configuration.ui
 ${PYSITELIB}/gajim/data/gui/application_menu.ui
 ${PYSITELIB}/gajim/data/gui/assistant.ui
-${PYSITELIB}/gajim/data/gui/blocked_contacts_window.ui
 ${PYSITELIB}/gajim/data/gui/blocking_list.ui
 ${PYSITELIB}/gajim/data/gui/bookmarks.ui
 ${PYSITELIB}/gajim/data/gui/certificate_dialog.ui
-${PYSITELIB}/gajim/data/gui/change_activity_dialog.ui
-${PYSITELIB}/gajim/data/gui/change_mood_dialog.ui
-${PYSITELIB}/gajim/data/gui/change_status_message_dialog.ui
 ${PYSITELIB}/gajim/data/gui/chat_control.ui
 ${PYSITELIB}/gajim/data/gui/chat_to_muc_window.ui
 ${PYSITELIB}/gajim/data/gui/contact_context_menu.ui
-${PYSITELIB}/gajim/data/gui/data_form_window.ui
 ${PYSITELIB}/gajim/data/gui/edit_groups_dialog.ui
 ${PYSITELIB}/gajim/data/gui/emoji_chooser.ui
 ${PYSITELIB}/gajim/data/gui/exception_dialog.ui
@@ -393,25 +409,22 @@
 ${PYSITELIB}/gajim/data/gui/groupchat_control.ui
 ${PYSITELIB}/gajim/data/gui/groupchat_creation.ui
 ${PYSITELIB}/gajim/data/gui/groupchat_info_scrolled.ui
-${PYSITELIB}/gajim/data/gui/groupchat_invitation_received.ui
 ${PYSITELIB}/gajim/data/gui/groupchat_invite.ui
+${PYSITELIB}/gajim/data/gui/groupchat_nick_chooser.ui
 ${PYSITELIB}/gajim/data/gui/groupchat_roster.ui
 ${PYSITELIB}/gajim/data/gui/groups_post_window.ui
 ${PYSITELIB}/gajim/data/gui/history_manager.ui
 ${PYSITELIB}/gajim/data/gui/history_window.ui
-${PYSITELIB}/gajim/data/gui/join_groupchat_window.ui
 ${PYSITELIB}/gajim/data/gui/mam_preferences.ui
 ${PYSITELIB}/gajim/data/gui/manage_pep_services_window.ui
 ${PYSITELIB}/gajim/data/gui/manage_proxies.ui
-${PYSITELIB}/gajim/data/gui/manage_sounds_window.ui
+${PYSITELIB}/gajim/data/gui/manage_sounds.ui
 ${PYSITELIB}/gajim/data/gui/message_window.ui
 ${PYSITELIB}/gajim/data/gui/passphrase_dialog.ui
 ${PYSITELIB}/gajim/data/gui/plugins_window.ui
 ${PYSITELIB}/gajim/data/gui/popup_notification_window.ui
-${PYSITELIB}/gajim/data/gui/preferences_window.ui
-${PYSITELIB}/gajim/data/gui/privacy_list_window.ui
-${PYSITELIB}/gajim/data/gui/privacy_lists_window.ui
-${PYSITELIB}/gajim/data/gui/profile_window.ui
+${PYSITELIB}/gajim/data/gui/preferences.ui
+${PYSITELIB}/gajim/data/gui/profile.ui
 ${PYSITELIB}/gajim/data/gui/roster_item_exchange_window.ui
 ${PYSITELIB}/gajim/data/gui/roster_window.ui
 ${PYSITELIB}/gajim/data/gui/server_info.ui
@@ -420,6 +433,7 @@
 ${PYSITELIB}/gajim/data/gui/single_message_window.ui
 ${PYSITELIB}/gajim/data/gui/ssl_error_dialog.ui
 ${PYSITELIB}/gajim/data/gui/start_chat_dialog.ui
+${PYSITELIB}/gajim/data/gui/status_change_window.ui
 ${PYSITELIB}/gajim/data/gui/subscription_request_window.ui
 ${PYSITELIB}/gajim/data/gui/synchronise_select_account_dialog.ui
 ${PYSITELIB}/gajim/data/gui/synchronise_select_contacts_dialog.ui
@@ -428,16 +442,23 @@
 ${PYSITELIB}/gajim/data/gui/tooltip_gc_contact.ui
 ${PYSITELIB}/gajim/data/gui/tooltip_roster_contact.ui
 ${PYSITELIB}/gajim/data/gui/vcard_information_window.ui
-${PYSITELIB}/gajim/data/gui/voip_call_received_dialog.ui
+${PYSITELIB}/gajim/data/gui/video_preview.ui
 ${PYSITELIB}/gajim/data/gui/xml_console.ui
 ${PYSITELIB}/gajim/data/gui/zeroconf_context_menu.ui
 ${PYSITELIB}/gajim/data/gui/zeroconf_information_window.ui
 ${PYSITELIB}/gajim/data/icons/hicolor/16x16/actions/gajim-kbd_input.png
+${PYSITELIB}/gajim/data/icons/hicolor/16x16/devices/feather-briefcase-symbolic.symbolic.png