diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2014-01-05 17:27:53 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2014-01-05 17:27:53 +0000 |
| commit | b6b70c8a293d6f823304b5b99ccde3bdd6391b42 (patch) | |
| tree | 5ab8388f2dcac599567acce9818514ebd5a248d5 /net-misc/vinagre | |
| parent | Make nvidia-drivers mask more stringent, since according to user reports also... (diff) | |
| download | gentoo-2-b6b70c8a293d6f823304b5b99ccde3bdd6391b42.tar.gz gentoo-2-b6b70c8a293d6f823304b5b99ccde3bdd6391b42.tar.bz2 gentoo-2-b6b70c8a293d6f823304b5b99ccde3bdd6391b42.zip | |
Fix underlinking failure (bug #497116, thanks to d_dart).
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Diffstat (limited to 'net-misc/vinagre')
| -rw-r--r-- | net-misc/vinagre/ChangeLog | 8 | ||||
| -rw-r--r-- | net-misc/vinagre/files/vinagre-2.30.3-gmodule.patch | 12 | ||||
| -rw-r--r-- | net-misc/vinagre/vinagre-2.30.3.ebuild | 21 |
3 files changed, 33 insertions, 8 deletions
diff --git a/net-misc/vinagre/ChangeLog b/net-misc/vinagre/ChangeLog index 9004e13e92dd..54ce7d872242 100644 --- a/net-misc/vinagre/ChangeLog +++ b/net-misc/vinagre/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/vinagre -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/ChangeLog,v 1.96 2013/12/24 17:35:43 pacho Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/ChangeLog,v 1.97 2014/01/05 17:27:53 tetromino Exp $ + + 05 Jan 2014; Alexandre Rostovtsev <tetromino@gentoo.org> + vinagre-2.30.3.ebuild, +files/vinagre-2.30.3-gmodule.patch: + Fix underlinking failure (bug #497116, thanks to d_dart). *vinagre-3.10.2 (24 Dec 2013) diff --git a/net-misc/vinagre/files/vinagre-2.30.3-gmodule.patch b/net-misc/vinagre/files/vinagre-2.30.3-gmodule.patch new file mode 100644 index 000000000000..8b8837ac0de8 --- /dev/null +++ b/net-misc/vinagre/files/vinagre-2.30.3-gmodule.patch @@ -0,0 +1,12 @@ +diff --git a/configure.ac b/configure.ac +index cb10398..7af7895 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -104,6 +104,7 @@ PKG_CHECK_MODULES(VINAGRE, \ + glib-2.0 >= $GLIB_REQUIRED \ + gio-2.0 >= $GLIB_REQUIRED \ + gio-unix-2.0 >= $GLIB_REQUIRED \ ++ gmodule-2.0 >= $GLIB_REQUIRED \ + gtk+-2.0 >= $GTK_REQUIRED \ + gconf-2.0 >= $GCONF_REQUIRED \ + gthread-2.0 >= $GTHREAD_REQUIRED \ diff --git a/net-misc/vinagre/vinagre-2.30.3.ebuild b/net-misc/vinagre/vinagre-2.30.3.ebuild index f250fbec1dca..fcc7a4a5ec27 100644 --- a/net-misc/vinagre/vinagre-2.30.3.ebuild +++ b/net-misc/vinagre/vinagre-2.30.3.ebuild @@ -1,11 +1,13 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-2.30.3.ebuild,v 1.11 2013/01/07 13:44:54 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/vinagre/vinagre-2.30.3.ebuild,v 1.12 2014/01/05 17:27:53 tetromino Exp $ -EAPI="2" +EAPI="4" GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" +GNOME_TARBALL_SUFFIX="bz2" -inherit gnome2 +inherit autotools gnome2 DESCRIPTION="VNC client for the GNOME desktop" HOMEPAGE="http://www.gnome.org/projects/vinagre/" @@ -52,11 +54,18 @@ pkg_setup() { $(use_enable telepathy)" } +src_prepare() { + # underlinking failure, bug #497116 + epatch "${FILESDIR}/${P}-gmodule.patch" + + rm missing || die # old missing script causes autoreconf warnings + eautoreconf + gnome2_src_prepare +} + src_install() { gnome2_src_install - find "${D}" -name "*.la" -delete || die "remove of la files failed" - # Remove it's own installation of DOCS that go to $PN instead of $P and aren't ecompressed rm -rf "${D}"/usr/share/doc/vinagre } |