fix build issue with older libIDL versions

Package-Manager: portage-2.1_pre9-r5

4 files changed, 39 insertions, 10 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/Manifest b/gnome-base/nautilus/Manifest
index e4ae71a78049..7d3e722379d2 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -42,6 +42,10 @@ AUX nautilus-2.13.4-no-desktop.patch 1068 RMD160 a93b790c83317c78860196bcbb31556
 MD5 960a9426b4468f4f4c4eaad973674022 files/nautilus-2.13.4-no-desktop.patch 1068
 RMD160 a93b790c83317c78860196bcbb315567fba6cc49 files/nautilus-2.13.4-no-desktop.patch 1068
 SHA256 c26db48959f7949afe78658c2a4d8e561e7aaed68877aa510b5f28f79a2543e2 files/nautilus-2.13.4-no-desktop.patch 1068
+AUX nautilus-2.14-idl_include.patch 384 RMD160 0b040794d5b90baf662ff9d5fbdd8ab3168af5e4 SHA1 b7b0b325df513f63f83526d5e848d97e88e33a50 SHA256 f82e430fd9366e8d2306b586df90efc721f0cf17ea51987b747849c85f6b0116 size 384
+MD5 51f1e68a3c1b45c4b2188200398960f0 files/nautilus-2.14-idl_include.patch 384
+RMD160 0b040794d5b90baf662ff9d5fbdd8ab3168af5e4 files/nautilus-2.14-idl_include.patch 384
+SHA256 f82e430fd9366e8d2306b586df90efc721f0cf17ea51987b747849c85f6b0116 files/nautilus-2.14-idl_include.patch 384
 AUX nautilus-2.9.90-icon_view_gst.patch 8136 RMD160 adc024c514ce2dd2af2962caa8941fce250ab2b1 SHA1 ca768f9ba16908d487abbdbc941082a58a528ed9 SHA256 b6e7eef6e3ff11a9e3490e371ec06a9cd24b9251b7cad7262204071ff67a8a31 size 8136
 MD5 76cc1af40c4dc75ce99179ae9b25a2cd files/nautilus-2.9.90-icon_view_gst.patch 8136
 RMD160 adc024c514ce2dd2af2962caa8941fce250ab2b1 files/nautilus-2.9.90-icon_view_gst.patch 8136
@@ -67,14 +71,14 @@ EBUILD nautilus-2.12.2.ebuild 1906 RMD160 5bf56a63ccb19f07842c4041deffab7ad4d106
 MD5 2fab2391cd8020b9a80771d635a31576 nautilus-2.12.2.ebuild 1906
 RMD160 5bf56a63ccb19f07842c4041deffab7ad4d1066a nautilus-2.12.2.ebuild 1906
 SHA256 7c437bffe569bb08c96fbf44c2bb37ff3470147ff433305e60eba39ce4b112e6 nautilus-2.12.2.ebuild 1906
-EBUILD nautilus-2.14.1.ebuild 1882 RMD160 371353d10a6e3dc3d128316cdcfd206da0df537c SHA1 1303daee78a492323de38bee7d9f3d47fc4b8db6 SHA256 903e8227627c6fb26d25f5c3f4762f0f594c9ae7c88fa83b771c3117fc716ec7 size 1882
-MD5 2689a1fd6b0e7be0bb2a751b34c53f23 nautilus-2.14.1.ebuild 1882
-RMD160 371353d10a6e3dc3d128316cdcfd206da0df537c nautilus-2.14.1.ebuild 1882
-SHA256 903e8227627c6fb26d25f5c3f4762f0f594c9ae7c88fa83b771c3117fc716ec7 nautilus-2.14.1.ebuild 1882
-MISC ChangeLog 23779 RMD160 3ba86bed2e2b9d4e680fb7168579440c171938c8 SHA1 1333b0ee3241543ef3f537f641d7a85514d31b0e SHA256 4c4ed23bd942196ce533dd9fa34a66d8c47636e134a3be91200b8948a0899126 size 23779
-MD5 8b8f104490cf8c3e4720e46d6c50ec43 ChangeLog 23779
-RMD160 3ba86bed2e2b9d4e680fb7168579440c171938c8 ChangeLog 23779
-SHA256 4c4ed23bd942196ce533dd9fa34a66d8c47636e134a3be91200b8948a0899126 ChangeLog 23779
+EBUILD nautilus-2.14.1.ebuild 2029 RMD160 e849d36ec0d540299cc834a215c423275233fda3 SHA1 4a1a4dc08beca93ec8722d33a50b775c94624df1 SHA256 7ffcb4cf344a85f4e795db394e5034b88945c3e4e70b328693068fdc50995b3e size 2029
+MD5 027a72800085a378ef6a43bc9fbc53a2 nautilus-2.14.1.ebuild 2029
+RMD160 e849d36ec0d540299cc834a215c423275233fda3 nautilus-2.14.1.ebuild 2029
+SHA256 7ffcb4cf344a85f4e795db394e5034b88945c3e4e70b328693068fdc50995b3e nautilus-2.14.1.ebuild 2029
+MISC ChangeLog 23967 RMD160 617fd0203a03d885693cd81c5d916dededff8554 SHA1 42136c285729925d5aaea0060f8dd8caa6237206 SHA256 0ea272d2d8d5e428f4e427bbddf4ec1ea8cf5002ec28b0e06151859812c9bffd size 23967
+MD5 8d83ab8029617924c95c51a7367ed109 ChangeLog 23967
+RMD160 617fd0203a03d885693cd81c5d916dededff8554 ChangeLog 23967
+SHA256 0ea272d2d8d5e428f4e427bbddf4ec1ea8cf5002ec28b0e06151859812c9bffd ChangeLog 23967
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 size 158
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
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
+
+}