diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2014-10-07 08:16:14 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2014-10-07 08:16:14 +0000 |
| commit | e7c49f20ef4bf8fda0092e57ff67a5645055da2d (patch) | |
| tree | f2c6925da6996ed65aa8adfb139b3461682b6145 /net-im | |
| parent | new slot added (diff) | |
| download | gentoo-2-e7c49f20ef4bf8fda0092e57ff67a5645055da2d.tar.gz gentoo-2-e7c49f20ef4bf8fda0092e57ff67a5645055da2d.tar.bz2 gentoo-2-e7c49f20ef4bf8fda0092e57ff67a5645055da2d.zip | |
net-im/gajim: Fix .desktop file, #516846; fix dependency on dev-python/python-nbxmpp, #524646
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
Diffstat (limited to 'net-im')
| -rw-r--r-- | net-im/gajim/ChangeLog | 7 | ||||
| -rw-r--r-- | net-im/gajim/files/gajim-0.16-desktop.patch | 16 | ||||
| -rw-r--r-- | net-im/gajim/gajim-0.16.ebuild | 6 |
3 files changed, 26 insertions, 3 deletions
diff --git a/net-im/gajim/ChangeLog b/net-im/gajim/ChangeLog index 15a8903df0c2..3f3d2f4996fb 100644 --- a/net-im/gajim/ChangeLog +++ b/net-im/gajim/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-im/gajim # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.212 2014/10/06 07:12:32 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/ChangeLog,v 1.213 2014/10/07 08:16:14 jlec Exp $ + + 07 Oct 2014; Justin Lecher <jlec@gentoo.org> gajim-0.16.ebuild, + +files/gajim-0.16-desktop.patch: + Fix .desktop file, #516846; fix dependency on dev-python/python-nbxmpp, + #524646 *gajim-0.16 (06 Oct 2014) diff --git a/net-im/gajim/files/gajim-0.16-desktop.patch b/net-im/gajim/files/gajim-0.16-desktop.patch new file mode 100644 index 000000000000..142c98972808 --- /dev/null +++ b/net-im/gajim/files/gajim-0.16-desktop.patch @@ -0,0 +1,16 @@ + data/gajim.desktop.in.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/data/gajim.desktop.in.in b/data/gajim.desktop.in.in +index 8a93ee8..ea0b1da 100644 +--- a/data/gajim.desktop.in.in ++++ b/data/gajim.desktop.in.in +@@ -3,7 +3,7 @@ Categories=Network;InstantMessaging;GTK;GNOME; + _Name=Gajim + _GenericName=Jabber IM Client + _Comment=A GTK+ Jabber client +-_Keywords=chat;messaging;im;jabber;xmpp;bonjour;voip ++_Keywords=chat;messaging;im;jabber;xmpp;bonjour;voip; + Version=1.0 + Exec=gajim + Icon=gajim diff --git a/net-im/gajim/gajim-0.16.ebuild b/net-im/gajim/gajim-0.16.ebuild index 807f3125dcb2..52e48554286a 100644 --- a/net-im/gajim/gajim-0.16.ebuild +++ b/net-im/gajim/gajim-0.16.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.16.ebuild,v 1.1 2014/10/06 07:12:32 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gajim/gajim-0.16.ebuild,v 1.2 2014/10/07 08:16:14 jlec Exp $ EAPI=5 @@ -42,7 +42,7 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} dev-python/pyasn1[${PYTHON_USEDEP}] >=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}] - >=dev-python/python-nbxmpp-0.5[${PYTHON_USEDEP}] + >=dev-python/python-nbxmpp-0.5.1[${PYTHON_USEDEP}] crypt? ( app-crypt/gnupg dev-python/pycrypto[${PYTHON_USEDEP}] @@ -77,6 +77,8 @@ RESTRICT="test" S="${WORKDIR}"/${MY_P} +PATCHES=( "${FILESDIR}"/${P}-desktop.patch ) + src_prepare() { autotools-utils_src_prepare python_copy_sources |