Attachment 217135 Details for Bug 248559 – Patch against r532905 (fix PY_FLAVOR)

[patch] Patch against r532905 (fix PY_FLAVOR)

gajim-1.2.1.patch (text/plain), 4.24 KB, created by yzrh on 2020-08-10 18:56:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: yzrh

Created: 2020-08-10 18:56:21 UTC

Size: 4.24 KB

patch

obsolete

>diff -urN gajim.orig/Makefile gajim/Makefile
>--- gajim.orig/Makefile	2020-06-01 11:37:27.247330000 +0000
>+++ gajim/Makefile	2020-08-10 13:33:19.225414000 +0000
>@@ -2,10 +2,9 @@
> # $FreeBSD: head/net-im/gajim/Makefile 532905 2020-04-24 22:54:49Z rm $
> 
> PORTNAME=	gajim
>-DISTVERSION=	1.1.3
>-PORTREVISION=	1
>+DISTVERSION=	1.2.1
> CATEGORIES=	net-im
>-MASTER_SITES=	https://gajim.org/downloads/1.1/
>+MASTER_SITES=	https://gajim.org/downloads/1.2/
> 
> MAINTAINER=	rm@FreeBSD.org
> COMMENT=	GTK+ Jabber client
>@@ -13,39 +12,45 @@
> LICENSE=	GPLv3
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cssutils>=1.0.2:www/py-cssutils@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}nbxmpp>=0.6.9:net-im/py-nbxmpp@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}precis_i18n>=1.0.0:textproc/py-precis_i18n@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}openssl>=0.12:security/py-openssl@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
>+LIB_DEPENDS=	libsoup-2.4.so:devel/libsoup
>+
>+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gobject3>0:devel/py-gobject3@${PY_FLAVOR} \
> 		${PYTHON_PKGNAMEPREFIX}cairo>0:graphics/py-cairo@${PY_FLAVOR} \
>-		${PYTHON_PKGNAMEPREFIX}pyasn1>=0:devel/py-pyasn1@${PY_FLAVOR}
>+		${PYTHON_PKGNAMEPREFIX}nbxmpp>0:net-im/py-nbxmpp@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}css-parser>0:www/py-css-parser@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}keyring>0:security/py-keyring@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}precis_i18n>0:textproc/py-precis_i18n@${PY_FLAVOR} \
>+		${PYTHON_PKGNAMEPREFIX}packaging>0:devel/py-packaging@${PY_FLAVOR} \
> 
>-USES=		cpe dos2unix gettext gnome python:3.5+ tar:bzip2 xorg
>-USE_PYTHON=	autoplist distutils noflavors
>-USE_GNOME=	intltool pygobject3
>-USE_XORG=	x11 xext xscrnsaver
>+USES=		desktop-file-utils gettext gnome python:3.6+ xorg
>+USE_GNOME=	gtk30 glib20
>+USE_XORG=	x11
>+USE_PYTHON=	autoplist distutils
>+INSTALLS_ICONS=	yes
> 
> NO_ARCH=	yes
>-DOS2UNIX_FILES=	gajim/plugins/plugins_i18n.py
>-INSTALLS_ICONS=	yes
> 
>-OPTIONS_DEFINE=	DBUS DOCS SPELL OMEMO
>-OPTIONS_DEFAULT=DBUS SPELL OMEMO
>+OPTIONS_DEFINE=	OMEMO WEBP SPELL SECRET DBUS MULTIMEDIA UPNP LOCATION SOUND
>+OPTIONS_DEFAULT=OMEMO WEBP SPELL MULTIMEDIA SOUND
> 
>-SPELL_DESC=	Spell checking support
> OMEMO_DESC=	OMEMO end-to-end encryption support
>+SPELL_DESC=	Enable Spell checker
>+SECRET_DESC=	Password storage support
>+MULTIMEDIA_DESC=Audio and video call support
>+LOCATION_DESC=	Location sharing support
> 
>-# GUPNP_DESC=	UPnP IGD protocol support
>-
>-# net/py-avahi and net/gupnp-idg is python 2.x only right now
>-# AVAHI_RUN_DEPENDS=	avahi-discover:net/py-avahi@${PY_FLAVOR}
>-# GUPNP_RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gupnp/__init__.py:net/gupnp-igd@${PY_FLAVOR}
>-
>-OMEMO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}python-axolotl>0:security/py-python-axolotl@${PY_FLAVOR} \
>+OMEMO_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
>+			${PYTHON_PKGNAMEPREFIX}cryptography>0:security/py-cryptography@${PY_FLAVOR} \
>+			${PYTHON_PKGNAMEPREFIX}python-axolotl>0:security/py-python-axolotl@${PY_FLAVOR} \
> 			${PYTHON_PKGNAMEPREFIX}qrcode>0:textproc/py-qrcode@${PY_FLAVOR}
>-DBUS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>=0.82.2:devel/py-dbus@${PY_FLAVOR}
>+WEBP_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR}
> SPELL_LIB_DEPENDS=	libgspell-1.so:textproc/gspell
>+SECRET_LIB_DEPENDS=	libsecret-1.so:security/libsecret
>+DBUS_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dbus>0:devel/py-dbus@${PY_FLAVOR}
>+MULTIMEDIA_LIB_DEPENDS=	libfarstream-0.2.so:net-im/farstream
>+UPNP_LIB_DEPENDS=	libgupnp-igd-1.0.so:net/gupnp-igd
>+LOCATION_LIB_DEPENDS=	libgeoclue-2.so:net/geoclue
>+SOUND_LIB_DEPENDS=	libgsound.so:audio/gsound
> 
> .include <bsd.port.mk>
>diff -urN gajim.orig/distinfo gajim/distinfo
>--- gajim.orig/distinfo	2020-06-01 11:37:27.248440000 +0000
>+++ gajim/distinfo	2020-08-09 17:36:51.842413000 +0000
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1556108834
>-SHA256 (gajim-1.1.3.tar.bz2) = 261c85444b9cc150f775a5cc5b7dea6031c8fb03f9fe6a9a81cd93d62ee3fd2f
>-SIZE (gajim-1.1.3.tar.bz2) = 8013585
>+TIMESTAMP = 1596994611
>+SHA256 (gajim-1.2.1.tar.gz) = c4faed4557296e4350bfea551c6743375dbaca3e1e7c5a3077321a10b10e8d1d
>+SIZE (gajim-1.2.1.tar.gz) = 9421625

Actions: View | Diff

Attachments on bug 248559: 217117 | 217135 | 217381 | 217382 | 217383 | 217384 | 217555 | 217556 | 217557 | 217558 | 217559 | 217560 | 223149