From b260db59bbe84293ec875b0f63201354708a7117 Mon Sep 17 00:00:00 2001 From: Christoph Mende Date: Sun, 29 Jul 2012 18:38:14 +0000 Subject: Fix underlinking (bug #369153) (Portage version: 2.2.0_alpha120/cvs/Linux x86_64) --- x11-misc/launchy/ChangeLog | 9 ++++++--- x11-misc/launchy/files/launchy-2.5-underlink.patch | 12 ++++++++++++ x11-misc/launchy/launchy-2.5.ebuild | 7 +++++-- 3 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 x11-misc/launchy/files/launchy-2.5-underlink.patch (limited to 'x11-misc/launchy') diff --git a/x11-misc/launchy/ChangeLog b/x11-misc/launchy/ChangeLog index 89b2604554e8..6427b25c1f81 100644 --- a/x11-misc/launchy/ChangeLog +++ b/x11-misc/launchy/ChangeLog @@ -1,10 +1,13 @@ # ChangeLog for x11-misc/launchy -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/launchy/ChangeLog,v 1.1 2011/04/15 22:02:15 angelos Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/launchy/ChangeLog,v 1.2 2012/07/29 18:38:14 angelos Exp $ + + 29 Jul 2012; Christoph Mende + +files/launchy-2.5-underlink.patch, launchy-2.5.ebuild: + Fix underlinking (bug #369153) *launchy-2.5 (15 Apr 2011) 15 Apr 2011; Christoph Mende +launchy-2.5.ebuild, +metadata.xml: Initial import - diff --git a/x11-misc/launchy/files/launchy-2.5-underlink.patch b/x11-misc/launchy/files/launchy-2.5-underlink.patch new file mode 100644 index 000000000000..f14110d581b5 --- /dev/null +++ b/x11-misc/launchy/files/launchy-2.5-underlink.patch @@ -0,0 +1,12 @@ +diff --git a/src/src.pro b/src/src.pro +index 13a627d..f720a22 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -72,6 +72,7 @@ unix:!macx { + platform_base_hottrigger.h + + PREFIX = /usr ++ LIBS += -lX11 -lXext -lXrender + DEFINES += SKINS_PATH=\\\"$$PREFIX/share/launchy/skins/\\\" \ + PLUGINS_PATH=\\\"$$PREFIX/lib64/launchy/plugins/\\\" \ + PLATFORMS_PATH=\\\"$$PREFIX/lib64/launchy/\\\" diff --git a/x11-misc/launchy/launchy-2.5.ebuild b/x11-misc/launchy/launchy-2.5.ebuild index b6aa66dfc3a4..37ebcee645a8 100644 --- a/x11-misc/launchy/launchy-2.5.ebuild +++ b/x11-misc/launchy/launchy-2.5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/launchy/launchy-2.5.ebuild,v 1.1 2011/04/15 22:02:15 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/launchy/launchy-2.5.ebuild,v 1.2 2012/07/29 18:38:14 angelos Exp $ EAPI=4 inherit fdo-mime gnome2-utils qt4-r2 @@ -18,10 +18,13 @@ RDEPEND="x11-libs/qt-gui:4" DEPEND="${RDEPEND} dev-libs/boost" +PATCHES=( "${FILESDIR}"/${P}-underlink.patch ) + src_prepare() { sed -i -e "s:lib/launchy:$(get_libdir)/launchy:" src/src.pro \ platforms/unix/unix.pro \ plugins/*/*.pro || die "sed failed" + qt4-r2_src_prepare } pkg_preinst() { -- cgit v1.2.3-65-gdbad