bug fixes

4 files changed, 45 insertions, 8 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index 9670d3461001..da682b706a7a 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.84 2004/03/22 22:36:58 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.85 2004/03/25 23:06:50 foser Exp $
+
+  25 Mar 2004; foser <foser@gentoo.org> nautilus-2.{4.0,4.2,6.0}.ebuild :
+  2.4 : Add patch to fix build with gtk+2.4 (#45391)
+  2.6 : update libgnome* deps (#45687)
 
 *nautilus-2.6.0 (22 Mar 2004)
 
diff --git a/gnome-base/nautilus/files/nautilus-2.4-remove_deprecation_flags.patch b/gnome-base/nautilus/files/nautilus-2.4-remove_deprecation_flags.patch
new file mode 100644
index 000000000000..441b38e396f7
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-2.4-remove_deprecation_flags.patch
@@ -0,0 +1,30 @@
+diff -uNr nautilus-2.4.2/src/file-manager/Makefile.am nautilus-2.4.2.patched/src/file-manager/Makefile.am
+--- nautilus-2.4.2/src/file-manager/Makefile.am	2002-11-06 11:39:11.000000000 +0100
++++ nautilus-2.4.2.patched/src/file-manager/Makefile.am	2004-03-25 22:35:05.887636536 +0100
+@@ -9,11 +9,6 @@
+ 	-DVERSION="\"$(VERSION)\""		\
+ 	-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \
+ 	-DDATADIR=\""$(datadir)"\"		\
+-	-DG_DISABLE_DEPRECATED \
+-	-DGDK_DISABLE_DEPRECATED \
+-	-DGDK_PIXBUF_DISABLE_DEPRECATED \
+-	-DGTK_DISABLE_DEPRECATED \
+-	-DGNOME_DISABLE_DEPRECATED \
+ 	$(NULL)	
+ 
+ 
+diff -uNr nautilus-2.4.2/src/file-manager/Makefile.in nautilus-2.4.2.patched/src/file-manager/Makefile.in
+--- nautilus-2.4.2/src/file-manager/Makefile.in	2004-02-03 01:50:55.000000000 +0100
++++ nautilus-2.4.2.patched/src/file-manager/Makefile.in	2004-03-25 22:35:16.772981712 +0100
+@@ -166,11 +166,6 @@
+ 	-DVERSION="\"$(VERSION)\""		\
+ 	-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \
+ 	-DDATADIR=\""$(datadir)"\"		\
+-	-DG_DISABLE_DEPRECATED \
+-	-DGDK_DISABLE_DEPRECATED \
+-	-DGDK_PIXBUF_DISABLE_DEPRECATED \
+-	-DGTK_DISABLE_DEPRECATED \
+-	-DGNOME_DISABLE_DEPRECATED \
+ 	$(NULL)	
+ 
+ 
diff --git a/gnome-base/nautilus/nautilus-2.4.2.ebuild b/gnome-base/nautilus/nautilus-2.4.2.ebuild
index 6e23ff417663..b556bb1bca86 100644
--- a/gnome-base/nautilus/nautilus-2.4.2.ebuild
+++ b/gnome-base/nautilus/nautilus-2.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.4.2.ebuild,v 1.7 2004/03/16 02:39:24 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.4.2.ebuild,v 1.8 2004/03/25 23:06:50 foser Exp $
 
 inherit gnome2
 
@@ -34,8 +34,8 @@ RDEPEND=">=dev-libs/glib-2
 	!gstreamer? ( oggvorbis? ( media-sound/vorbis-tools ) )
 	cups? ( net-print/libgnomecups
 		net-print/gnome-cups-manager )
-	gstreamer? ( >=media-libs/gstreamer-0.6.3
-		>=media-libs/gst-plugins-0.6.3 )"
+	gstreamer? ( >=media-libs/gstreamer-0.6*
+		=media-libs/gst-plugins-0.6* )"
 
 DEPEND="${RDEPEND}
 	>=app-text/scrollkeeper-0.3.11
@@ -58,6 +58,9 @@ src_unpack() {
 	# Fix a cdda linking error. (it silently links to cdda)
 	epatch ${FILESDIR}/${PN}-2-disable-cdda.patch
 
+	# Fix compile vs gtk-2.4
+	epatch ${FILESDIR}/${PN}-2.4-remove_deprecation_flags.patch
+
 	# use gstreamer for audio preview (patch by <foser@gentoo.org>)
 	use gstreamer && epatch ${FILESDIR}/${PN}-2-icon_view_gst_audio_preview.patch
 	# add libgnomeprint support
diff --git a/gnome-base/nautilus/nautilus-2.6.0.ebuild b/gnome-base/nautilus/nautilus-2.6.0.ebuild
index a2dd5058c971..c7933e26100c 100644
--- a/gnome-base/nautilus/nautilus-2.6.0.ebuild
+++ b/gnome-base/nautilus/nautilus-2.6.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.6.0.ebuild,v 1.2 2004/03/24 01:43:08 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.6.0.ebuild,v 1.3 2004/03/25 23:06:50 foser Exp $
 
 inherit gnome2
 
@@ -19,8 +19,8 @@ RDEPEND=">=dev-libs/glib-2.3
 	>=gnome-base/gnome-vfs-2.5.1
 	>=media-sound/esound-0.2.27
 	>=gnome-base/gconf-2
-	>=gnome-base/libgnome-2.2
-	>=gnome-base/libgnomeui-2.4
+	>=gnome-base/libgnome-2.6
+	>=gnome-base/libgnomeui-2.6
 	>=gnome-base/gnome-desktop-2.2
 	>=media-libs/libart_lgpl-2.3.10
 	>=gnome-base/libbonobo-2.2
@@ -31,7 +31,7 @@ RDEPEND=">=dev-libs/glib-2.3
 	dev-libs/popt
 	app-admin/fam
 	sys-apps/eject
-	cups? ( net-print/libgnomecups 
+	cups? ( net-print/libgnomecups
 		net-print/gnome-cups-manager )
 	!gstreamer? ( oggvorbis? ( media-sound/vorbis-tools ) )
 	gstreamer? ( >=media-libs/gstreamer-0.6