diff options
| author |   Daniel Gryniewicz <dang@gentoo.org> | 2006-09-07 18:12:05 +0000 |
|---|---|---|
| committer | Daniel Gryniewicz <dang@gentoo.org> | 2006-09-07 18:12:05 +0000 |
| commit | 9b798e03ec92b5f6732b4c51b8ce4b825e23eab1 (patch) | |
| tree | 09bba0ff2375dbd171f0b9ce86fb62a9843110e6 /gnome-base/nautilus | |
| parent | Stable on ppc64; bug #146725 (diff) | |
| download | gentoo-2-9b798e03ec92b5f6732b4c51b8ce4b825e23eab1.tar.gz gentoo-2-9b798e03ec92b5f6732b4c51b8ce4b825e23eab1.tar.bz2 gentoo-2-9b798e03ec92b5f6732b4c51b8ce4b825e23eab1.zip | |
Rebase patch on root directory. Bug #146663
(Portage version: 2.1.1_rc1-r6)
Diffstat (limited to 'gnome-base/nautilus')
| -rw-r--r-- | gnome-base/nautilus/ChangeLog | 6 | ||||
| -rw-r--r-- | gnome-base/nautilus/files/nautilus-2.16.0-idl_include.patch | 12 | ||||
| -rw-r--r-- | gnome-base/nautilus/nautilus-2.16.0.ebuild | 4 |
3 files changed, 19 insertions, 3 deletions
diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog index dc421f9a6de9..f6ef4872a607 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.193 2006/09/07 04:12:13 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.194 2006/09/07 18:12:05 dang Exp $ + + 07 Sep 2006; Daniel Gryniewicz <dang@gentoo.org> + +files/nautilus-2.16.0-idl_include.patch, nautilus-2.16.0.ebuild: + Rebase patch on root directory. Bug #146663 *nautilus-2.16.0 (07 Sep 2006) diff --git a/gnome-base/nautilus/files/nautilus-2.16.0-idl_include.patch b/gnome-base/nautilus/files/nautilus-2.16.0-idl_include.patch new file mode 100644 index 000000000000..27d7507b8ac9 --- /dev/null +++ b/gnome-base/nautilus/files/nautilus-2.16.0-idl_include.patch @@ -0,0 +1,12 @@ +diff --exclude-from=/home/dang/.diffrc -u -ruN nautilus-2.16.0.orig/src/nautilus-shell-interface.idl nautilus-2.16.0/src/nautilus-shell-interface.idl +--- nautilus-2.16.0.orig/src/nautilus-shell-interface.idl 2006-07-21 13:18:59.000000000 -0400 ++++ nautilus-2.16.0/src/nautilus-shell-interface.idl 2006-09-07 14:08:49.000000000 -0400 +@@ -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.16.0.ebuild b/gnome-base/nautilus/nautilus-2.16.0.ebuild index 537b930489d0..084bbf0b5e70 100644 --- a/gnome-base/nautilus/nautilus-2.16.0.ebuild +++ b/gnome-base/nautilus/nautilus-2.16.0.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.16.0.ebuild,v 1.1 2006/09/07 04:12:13 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.16.0.ebuild,v 1.2 2006/09/07 18:12:05 dang Exp $ inherit virtualx gnome2 eutils @@ -72,5 +72,5 @@ src_unpack() { gnome2_src_unpack # fix relative include path breaking libIDL (#129366) - epatch ${FILESDIR}/${PN}-2.14-idl_include.patch + epatch ${FILESDIR}/${PN}-2.16.0-idl_include.patch } |