diff options
| author |   Marinus Schraal <foser@gentoo.org> | 2006-05-09 19:15:31 +0000 |
|---|---|---|
| committer | Marinus Schraal <foser@gentoo.org> | 2006-05-09 19:15:31 +0000 |
| commit | f3751de9aa2d0a68a4d701bc897121918ffb43b8 (patch) | |
| tree | 9f1ce1fab80cb0d3368d65a631613022cea6deb5 /gnome-base | |
| parent | Changed masking on VMware Workstation 3.x to ensure nobody has a vulnerable v... (diff) | |
| download | gentoo-2-f3751de9aa2d0a68a4d701bc897121918ffb43b8.tar.gz gentoo-2-f3751de9aa2d0a68a4d701bc897121918ffb43b8.tar.bz2 gentoo-2-f3751de9aa2d0a68a4d701bc897121918ffb43b8.zip | |
fix build issue with older libIDL versions
(Portage version: 2.1_pre9-r5)
Diffstat (limited to 'gnome-base')
| -rw-r--r-- | gnome-base/nautilus/ChangeLog | 6 | ||||
| -rw-r--r-- | gnome-base/nautilus/files/nautilus-2.14-idl_include.patch | 11 | ||||
| -rw-r--r-- | gnome-base/nautilus/nautilus-2.14.1.ebuild | 12 |
3 files changed, 27 insertions, 2 deletions
diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog index edfb51f48db8..a6ca9de205aa 100644 --- a/gnome-base/nautilus/ChangeLog +++ b/gnome-base/nautilus/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-base/nautilus # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.178 2006/05/06 12:53:36 allanonjl Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.179 2006/05/09 19:15:31 foser Exp $ + + 09 May 2006; Marinus Schraal <foser@gentoo.org> nautilus-2.14.1.ebuild, + files/nautilus-2.14-idl_include.patch : + Fix relative path causing problems compiling with older libIDL (#129366) 06 May 2006; John N. Laliberte <allanonjl@gentoo.org> -nautilus-2.14.0.ebuild, nautilus-2.14.1.ebuild: diff --git a/gnome-base/nautilus/files/nautilus-2.14-idl_include.patch b/gnome-base/nautilus/files/nautilus-2.14-idl_include.patch new file mode 100644 index 000000000000..f09b0b3b346f --- /dev/null +++ b/gnome-base/nautilus/files/nautilus-2.14-idl_include.patch @@ -0,0 +1,11 @@ +--- nautilus-shell-interface.idl 2005-10-19 09:53:43.000000000 +0200 ++++ nautilus-shell-interface.idl.new 2006-05-09 18:37:22.936041864 +0200 +@@ -5,7 +5,7 @@ + + #include <Bonobo.idl> + /* For URI define */ +-#include <../libnautilus-private/nautilus-metafile-server.idl> ++#include <libnautilus-private/nautilus-metafile-server.idl> + + module Nautilus { + typedef sequence<URI> URIList; diff --git a/gnome-base/nautilus/nautilus-2.14.1.ebuild b/gnome-base/nautilus/nautilus-2.14.1.ebuild index 31cceb328653..32e790463fd9 100644 --- a/gnome-base/nautilus/nautilus-2.14.1.ebuild +++ b/gnome-base/nautilus/nautilus-2.14.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.14.1.ebuild,v 1.2 2006/05/06 12:53:36 allanonjl Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.14.1.ebuild,v 1.3 2006/05/09 19:15:31 foser Exp $ inherit virtualx gnome2 eutils @@ -66,3 +66,13 @@ src_test() { Xmake check || die "Test phase failed" fi } + +src_unpack() { + + unpack ${A} + + # fix relative include path breaking libIDL (#129366) + cd ${S}/src + epatch ${FILESDIR}/${PN}-2.14-idl_include.patch + +} |