Re: update: net/gajim (and net/py-nbxmpp)

ping ?

On Sat, 12 Dec 2020, Paco Esteban wrote:

> Hi ports@,
>
> This is an update for net/gajim. It includes also an easy dependency
> update for net/py-nbxmpp, as the new Gajim version needs the last one
> available.
>
> Tested on amd64 against a prosody running also on -current. All seems
> correct to me.
>
> For net/gajim, I added a README to point out that some modules need
> additional packages. This is because I spent some minutes with OMEMO
> not working with no errors at all, and list archives show me that this
> is not the first time I loose time on this ...
>
> comments / ok welcome.
>
> diff 465c580a1f2f0dbe84faa81fa7eff4f1e2ea50da 08e6724f53b5f9e8fc7e876eab271e65b0e97fa3
> blob - 71fbb026937949f7c28f00e69063289087dda935
> blob + e510b4b2ac52490114aeafd848d92d095bf46469
> --- net/gajim/Makefile
> +++ net/gajim/Makefile
> @@ -1,7 +1,7 @@
> # $OpenBSD: Makefile,v 1.90 2020/09/19 07:52:24 solene Exp $
>
> COMMENT= jabber client written in pygtk
> -MODPY_EGG_VERSION= 1.2.0
> +MODPY_EGG_VERSION= 1.2.2
> DISTNAME= gajim-${MODPY_EGG_VERSION}
> CATEGORIES= net x11
>
> @@ -25,7 +25,7 @@ RUN_DEPENDS= devel/desktop-file-utils \
> devel/libsoup \
> graphics/py-Pillow${MODPY_FLAVOR} \
> graphics/py-cairo${MODPY_FLAVOR} \
> - net/py-nbxmpp${MODPY_FLAVOR}>=1.0.0 \
> + net/py-nbxmpp${MODPY_FLAVOR}>=1.0.2 \
> security/py-cryptodome${MODPY_FLAVOR} \
> security/py-gnupg${MODPY_FLAVOR} \
> security/py-keyring${MODPY_FLAVOR} \
> blob - 35719ed14f25d3cd14f975fca839498d8a2dbdab
> blob + 26ffa35ef7e58eea29dcd52ad90d821f24d55dd6
> --- net/gajim/distinfo
> +++ net/gajim/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (gajim-1.2.0.tar.gz) = /dYOmco3TChJWpMT0bFi6TQL3tmOlSOZ5DryoMz80Tk=
> -SIZE (gajim-1.2.0.tar.gz) = 9605006
> +SHA256 (gajim-1.2.2.tar.gz) = /Q0WU/s/f5cgf+zDIY04kVrbHXQb+Vp+74NgW9a4zL0=
> +SIZE (gajim-1.2.2.tar.gz) = 9416794
> blob - 70147a06a20c032e0abb32cd68d16a0fa3eb7bc6
> blob + 05b394caeaec3dae71359041c2050f983928ad12
> --- net/gajim/pkg/PLIST
> +++ net/gajim/pkg/PLIST
> @@ -179,7 +179,6 @@ lib/python${MODPY_VERSION}/site-packages/gajim/common/
> lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}pep.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}ping.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}presence.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}privacylists.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}pubsub.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}receipts.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/${MODPY_PYCACHE}register.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -226,7 +225,6 @@ lib/python${MODPY_VERSION}/site-packages/gajim/common/
> lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/pep.py
> lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/ping.py
> lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/presence.py
> -lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/privacylists.py
> lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/pubsub.py
> lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/receipts.py
> lib/python${MODPY_VERSION}/site-packages/gajim/common/modules/register.py
> @@ -293,9 +291,6 @@ lib/python${MODPY_VERSION}/site-packages/gajim/data/gu
> lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/blocking_list.ui
> lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/bookmarks.ui
> lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/certificate_dialog.ui
> -lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/change_activity_dialog.ui
> -lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/change_mood_dialog.ui
> -lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/change_status_message_dialog.ui
> lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/chat_control.ui
> lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/chat_to_muc_window.ui
> lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/contact_context_menu.ui
> @@ -326,8 +321,6 @@ lib/python${MODPY_VERSION}/site-packages/gajim/data/gu
> lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/plugins_window.ui
> lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/popup_notification_window.ui
> lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/preferences_window.ui
> -lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/privacy_list_window.ui
> -lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/privacy_lists_window.ui
> lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/profile_window.ui
> lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/roster_item_exchange_window.ui
> lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/roster_window.ui
> @@ -337,6 +330,7 @@ lib/python${MODPY_VERSION}/site-packages/gajim/data/gu
> lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/single_message_window.ui
> lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/ssl_error_dialog.ui
> lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/start_chat_dialog.ui
> +lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/status_change_window.ui
> lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/subscription_request_window.ui
> lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/synchronise_select_account_dialog.ui
> lib/python${MODPY_VERSION}/site-packages/gajim/data/gui/synchronise_select_contacts_dialog.ui
> @@ -1079,7 +1073,6 @@ lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${M
> lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}notification.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}pep_config.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}preferences.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}privacy_list.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}profile.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}proxies.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}remove_account.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -1092,6 +1085,8 @@ lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${M
> lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}sounds.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}ssl_error_dialog.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}start_chat.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}status_change.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}status_selector.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}statusicon.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}subscription_request.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/gajim/gtk/${MODPY_PYCACHE}themes.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -1137,7 +1132,6 @@ lib/python${MODPY_VERSION}/site-packages/gajim/gtk/mes
> lib/python${MODPY_VERSION}/site-packages/gajim/gtk/notification.py
> lib/python${MODPY_VERSION}/site-packages/gajim/gtk/pep_config.py
> lib/python${MODPY_VERSION}/site-packages/gajim/gtk/preferences.py
> -lib/python${MODPY_VERSION}/site-packages/gajim/gtk/privacy_list.py
> lib/python${MODPY_VERSION}/site-packages/gajim/gtk/profile.py
> lib/python${MODPY_VERSION}/site-packages/gajim/gtk/proxies.py
> lib/python${MODPY_VERSION}/site-packages/gajim/gtk/remove_account.py
> @@ -1150,6 +1144,8 @@ lib/python${MODPY_VERSION}/site-packages/gajim/gtk/sin
> lib/python${MODPY_VERSION}/site-packages/gajim/gtk/sounds.py
> lib/python${MODPY_VERSION}/site-packages/gajim/gtk/ssl_error_dialog.py
> lib/python${MODPY_VERSION}/site-packages/gajim/gtk/start_chat.py
> +lib/python${MODPY_VERSION}/site-packages/gajim/gtk/status_change.py
> +lib/python${MODPY_VERSION}/site-packages/gajim/gtk/status_selector.py
> lib/python${MODPY_VERSION}/site-packages/gajim/gtk/statusicon.py
> lib/python${MODPY_VERSION}/site-packages/gajim/gtk/subscription_request.py
> lib/python${MODPY_VERSION}/site-packages/gajim/gtk/themes.py
> @@ -1211,9 +1207,6 @@ share/locale/kk/LC_MESSAGES/gajim.mo
> share/locale/lt/LC_MESSAGES/gajim.mo
> share/locale/nb_NO/LC_MESSAGES/gajim.mo
> share/locale/nl/LC_MESSAGES/gajim.mo
> -share/locale/nl_BE/
> -share/locale/nl_BE/LC_MESSAGES/
> -share/locale/nl_BE/LC_MESSAGES/gajim.mo
> share/locale/pl/LC_MESSAGES/gajim.mo
> share/locale/pt/LC_MESSAGES/gajim.mo
> share/locale/pt_BR/LC_MESSAGES/gajim.mo
> @@ -1232,3 +1225,4 @@ share/metainfo/
> share/metainfo/org.gajim.Gajim.appdata.xml
> @tag update-desktop-database
> @tag gtk-update-icon-cache %D/share/icons/hicolor
> +share/doc/pkg-readmes/${PKGSTEM}
> blob - /dev/null
> blob + affdc899e9db76a1342a0d1e0dd946e7679daa64 (mode 644)
> --- /dev/null
> +++ net/gajim/pkg/README
> @@ -0,0 +1,9 @@
> +$OpenBSD$
> +
> +Gajim Plugins
> +=============
> +
> +Some plugins in Gajim require additional Python modules to function
> +properly. For instance, in order to use the OMEMO plugin, axolotl is
> +required. This is available on OpenBSD via the py3-axolotl package or
> +net/py-axolotl,python3 port.
> blob - 1faa2750e6c7c611228d73065b73152e7dccabb9
> blob + 05960d448795b946941aeec3727a3f45bb0fd2ed
> --- net/py-nbxmpp/Makefile
> +++ net/py-nbxmpp/Makefile
> @@ -2,7 +2,7 @@
>
> COMMENT = Python XMPP and Jabber implementation
>
> -MODPY_EGG_VERSION = 1.0.0
> +MODPY_EGG_VERSION = 1.0.2
> DISTNAME = nbxmpp-${MODPY_EGG_VERSION}
> PKGNAME = py-${DISTNAME}
> CATEGORIES = net devel
> blob - 0293debfecd883746efad67bc7b43e85ca7e160e
> blob + c14d426df510105f5ec55e8087263ff669fa1be8
> --- net/py-nbxmpp/distinfo
> +++ net/py-nbxmpp/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (nbxmpp-1.0.0.tar.gz) = i36We8HQ8aH3zzOVtvXXAAmuVgetmvuN4y/5K2YWk60=
> -SIZE (nbxmpp-1.0.0.tar.gz) = 126523
> +SHA256 (nbxmpp-1.0.2.tar.gz) = mR8BSic2Ej6YnaRU1qRnvoxDFL+G28yInomfA3JuhW8=
> +SIZE (nbxmpp-1.0.2.tar.gz) = 127184
>
> --
> Paco Esteban.
> 0x5818130B8A6DBC03
>

--
Paco Esteban.
0x5818130B8A6DBC03